diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 01:47:36 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 01:47:36 -0400 |
commit | 038abf80ba30a277420e0381312c0cfc2296811e (patch) | |
tree | ab951530e74209c0da170bc74ddd8b5a456bab9a | |
parent | d7ec1d234b260df869213e195055dd75bcbe5cf3 (diff) |
Give songs meaningful english names
986 files changed, 41737 insertions, 41731 deletions
diff --git a/charmap.txt b/charmap.txt index d7138d82a..705a2108e 100644 --- a/charmap.txt +++ b/charmap.txt @@ -407,242 +407,242 @@ WHITE2 = 0F @ duplicate of white? @ sound and music -SE_STOP = 00 00 -SE_KAIFUKU = 01 00 -SE_PC_LOGON = 02 00 +MUS_DUMMY = 00 00 +SE_USE_ITEM = 01 00 +SE_PC_LOGIN = 02 00 SE_PC_OFF = 03 00 SE_PC_ON = 04 00 SE_SELECT = 05 00 SE_WIN_OPEN = 06 00 SE_WALL_HIT = 07 00 SE_DOOR = 08 00 -SE_KAIDAN = 09 00 -SE_DANSA = 0A 00 -SE_JITENSYA = 0B 00 -SE_KOUKA_L = 0C 00 -SE_KOUKA_M = 0D 00 -SE_KOUKA_H = 0E 00 -SE_BOWA2 = 0F 00 -SE_POKE_DEAD = 10 00 -SE_NIGERU = 11 00 -SE_JIDO_DOA = 12 00 -SE_NAMINORI = 13 00 -SE_BAN = 14 00 +SE_EXIT = 09 00 +SE_LEDGE = 0A 00 +SE_BIKE_BELL = 0B 00 +SE_NOT_EFFECTIVE = 0C 00 +SE_EFFECTIVE = 0D 00 +SE_SUPER_EFFECTIVE = 0E 00 +SE_BALL_OPEN = 0F 00 +SE_FAINT = 10 00 +SE_FLEE = 11 00 +SE_SLIDING_DOOR = 12 00 +SE_SHIP = 13 00 +SE_BANG = 14 00 SE_PIN = 15 00 SE_BOO = 16 00 -SE_BOWA = 17 00 -SE_JYUNI = 18 00 +SE_BALL = 17 00 +SE_CONTEST_PLACE = 18 00 SE_A = 19 00 SE_I = 1A 00 SE_U = 1B 00 SE_E = 1C 00 SE_O = 1D 00 SE_N = 1E 00 -SE_SEIKAI = 1F 00 -SE_HAZURE = 20 00 +SE_SUCCESS = 1F 00 +SE_FAILURE = 20 00 SE_EXP = 21 00 -SE_JITE_PYOKO = 22 00 -SE_MU_PACHI = 23 00 -SE_TK_KASYA = 24 00 +SE_BIKE_HOP = 22 00 +SE_SWITCH = 23 00 +SE_CLICK = 24 00 SE_FU_ZAKU = 25 00 -SE_FU_ZAKU2 = 26 00 -SE_FU_ZUZUZU = 27 00 -SE_RU_GASHIN = 28 00 -SE_RU_GASYAN = 29 00 -SE_RU_BARI = 2A 00 -SE_RU_HYUU = 2B 00 -SE_KI_GASYAN = 2C 00 -SE_TK_WARPIN = 2D 00 -SE_TK_WARPOUT = 2E 00 -SE_TU_SAA = 2F 00 -SE_HI_TURUN = 30 00 -SE_TRACK_MOVE = 31 00 -SE_TRACK_STOP = 32 00 -SE_TRACK_HAIK = 33 00 -SE_TRACK_DOOR = 34 00 -SE_MOTER = 35 00 +SE_CONTEST_CONDITION_LOSE = 26 00 +SE_LAVARIDGE_FALL_WARP = 27 00 +SE_ICE_STAIRS = 28 00 +SE_ICE_BREAK = 29 00 +SE_ICE_CRACK = 2A 00 +SE_FALL = 2B 00 +SE_UNLOCK = 2C 00 +SE_WARP_IN = 2D 00 +SE_WARP_OUT = 2E 00 +SE_REPEL = 2F 00 +SE_ROTATING_GATE = 30 00 +SE_TRUCK_MOVE = 31 00 +SE_TRUCK_STOP = 32 00 +SE_TRUCK_UNLOAD = 33 00 +SE_TRUCK_DOOR = 34 00 +SE_BERRY_BLENDER = 35 00 SE_CARD = 36 00 SE_SAVE = 37 00 -SE_KON = 38 00 -SE_KON2 = 39 00 -SE_KON3 = 3A 00 -SE_KON4 = 3B 00 -SE_SUIKOMU = 3C 00 -SE_NAGERU = 3D 00 -SE_TOY_C = 3E 00 -SE_TOY_D = 3F 00 -SE_TOY_E = 40 00 -SE_TOY_F = 41 00 -SE_TOY_G = 42 00 -SE_TOY_A = 43 00 -SE_TOY_B = 44 00 -SE_TOY_C1 = 45 00 -SE_MIZU = 46 00 -SE_HASHI = 47 00 -SE_DAUGI = 48 00 -SE_PINPON = 49 00 -SE_FUUSEN1 = 4A 00 -SE_FUUSEN2 = 4B 00 -SE_FUUSEN3 = 4C 00 -SE_TOY_KABE = 4D 00 -SE_TOY_DANGO = 4E 00 -SE_DOKU = 4F 00 -SE_ESUKA = 50 00 -SE_T_AME = 51 00 -SE_T_AME_E = 52 00 -SE_T_OOAME = 53 00 -SE_T_OOAME_E = 54 00 -SE_T_KOAME = 55 00 -SE_T_KOAME_E = 56 00 -SE_T_KAMI = 57 00 -SE_T_KAMI2 = 58 00 -SE_ELEBETA = 59 00 -SE_HINSI = 5A 00 -SE_EXPMAX = 5B 00 -SE_TAMAKORO = 5C 00 -SE_TAMAKORO_E = 5D 00 -SE_BASABASA = 5E 00 -SE_REGI = 5F 00 -SE_C_GAJI = 60 00 -SE_C_MAKU_U = 61 00 -SE_C_MAKU_D = 62 00 -SE_C_PASI = 63 00 -SE_C_SYU = 64 00 -SE_C_PIKON = 65 00 -SE_REAPOKE = 66 00 -SE_OP_BASYU = 67 00 -SE_BT_START = 68 00 -SE_DENDOU = 69 00 -SE_JIHANKI = 6A 00 -SE_TAMA = 6B 00 -SE_Z_SCROLL = 6C 00 -SE_Z_PAGE = 6D 00 -SE_PN_ON = 6E 00 -SE_PN_OFF = 6F 00 -SE_Z_SEARCH = 70 00 -SE_TAMAGO = 71 00 -SE_TB_START = 72 00 -SE_TB_KON = 73 00 -SE_TB_KARA = 74 00 -SE_BIDORO = 75 00 +SE_BALL_BOUNCE_1 = 38 00 +SE_BALL_BOUNCE_2 = 39 00 +SE_BALL_BOUNCE_3 = 3A 00 +SE_BALL_BOUNCE_4 = 3B 00 +SE_BALL_TRADE = 3C 00 +SE_BALL_THROW = 3D 00 +SE_NOTE_C = 3E 00 +SE_NOTE_D = 3F 00 +SE_NOTE_E = 40 00 +SE_NOTE_F = 41 00 +SE_NOTE_G = 42 00 +SE_NOTE_A = 43 00 +SE_NOTE_B = 44 00 +SE_NOTE_C_HIGH = 45 00 +SE_PUDDLE = 46 00 +SE_BRIDGE_WALK = 47 00 +SE_ITEMFINDER = 48 00 +SE_DING_DONG = 49 00 +SE_BALLOON_RED = 4A 00 +SE_BALLOON_BLUE = 4B 00 +SE_BALLOON_YELLOW = 4C 00 +SE_BREAKABLE_DOOR = 4D 00 +SE_MUD_BALL = 4E 00 +SE_FIELD_POISON = 4F 00 +SE_ESCALATOR = 50 00 +SE_THUNDERSTORM = 51 00 +SE_THUNDERSTORM_STOP = 52 00 +SE_DOWNPOUR = 53 00 +SE_DOWNPOUR_STOP = 54 00 +SE_RAIN = 55 00 +SE_RAIN_STOP = 56 00 +SE_THUNDER = 57 00 +SE_THUNDER2 = 58 00 +SE_ELEVATOR = 59 00 +SE_LOW_HEALTH = 5A 00 +SE_EXP_MAX = 5B 00 +SE_ROULETTE_BALL = 5C 00 +SE_ROULETTE_BALL2 = 5D 00 +SE_TAILLOW_WING_FLAP = 5E 00 +SE_SHOP = 5F 00 +SE_CONTEST_HEART = 60 00 +SE_CONTEST_CURTAIN_RISE = 61 00 +SE_CONTEST_CURTAIN_FALL = 62 00 +SE_CONTEST_ICON_CHANGE = 63 00 +SE_CONTEST_ICON_CLEAR = 64 00 +SE_CONTEST_MONS_TURN = 65 00 +SE_SHINY = 66 00 +SE_INTRO_BLAST = 67 00 +SE_MUGSHOT = 68 00 +SE_APPLAUSE = 69 00 +SE_VEND = 6A 00 +SE_ORB = 6B 00 +SE_DEX_SCROLL = 6C 00 +SE_DEX_PAGE = 6D 00 +SE_POKENAV_ON = 6E 00 +SE_POKENAV_OFF = 6F 00 +SE_DEX_SEARCH = 70 00 +SE_EGG_HATCH = 71 00 +SE_BALL_TRAY_ENTER = 72 00 +SE_BALL_TRAY_BALL = 73 00 +SE_BALL_TRAY_EXIT = 74 00 +SE_GLASS_FLUTE = 75 00 MUS_STOP = 5D 01 -MUS_TETSUJI = 5E 01 -MUS_FIELD13 = 5F 01 -MUS_KACHI22 = 60 01 -MUS_KACHI2 = 61 01 -MUS_KACHI3 = 62 01 -MUS_KACHI5 = 63 01 -MUS_PCC = 64 01 -MUS_NIBI = 65 01 -MUS_SUIKUN = 66 01 -MUS_DOORO1 = 67 01 -MUS_DOORO_X1 = 68 01 -MUS_DOORO_X3 = 69 01 -MUS_MACHI_S2 = 6A 01 -MUS_MACHI_S4 = 6B 01 -MUS_GIM = 6C 01 -MUS_NAMINORI = 6D 01 -MUS_DAN01 = 6E 01 -MUS_FANFA1 = 6F 01 -MUS_ME_ASA = 70 01 -MUS_ME_BACHI = 71 01 -MUS_FANFA4 = 72 01 -MUS_FANFA5 = 73 01 -MUS_ME_WAZA = 74 01 -MUS_BIJYUTU = 75 01 -MUS_DOORO_X4 = 76 01 -MUS_FUNE_KAN = 77 01 -MUS_ME_SHINKA = 78 01 -MUS_SHINKA = 79 01 -MUS_ME_WASURE = 7A 01 -MUS_SYOUJOEYE = 7B 01 -MUS_BOYEYE = 7C 01 -MUS_DAN02 = 7D 01 -MUS_MACHI_S3 = 7E 01 -MUS_ODAMAKI = 7F 01 +MUS_LITTLEROOT_TEST = 5E 01 +MUS_GSC_ROUTE38 = 5F 01 +MUS_CAUGHT = 60 01 +MUS_VICTORY_WILD = 61 01 +MUS_VICTORY_GYM_LEADER = 62 01 +MUS_VICTORY_LEAGUE = 63 01 +MUS_C_COMM_CENTER = 64 01 +MUS_GSC_PEWTER = 65 01 +MUS_C_VS_LEGEND_BEAST = 66 01 +MUS_ROUTE101 = 67 01 +MUS_ROUTE110 = 68 01 +MUS_ROUTE120 = 69 01 +MUS_PETALBURG = 6A 01 +MUS_OLDALE = 6B 01 +MUS_GYM = 6C 01 +MUS_SURF = 6D 01 +MUS_PETALBURG_WOODS = 6E 01 +MUS_LEVEL_UP = 6F 01 +MUS_HEAL = 70 01 +MUS_OBTAIN_BADGE = 71 01 +MUS_OBTAIN_ITEM = 72 01 +MUS_EVOLVED = 73 01 +MUS_OBTAIN_TMHM = 74 01 +MUS_LILYCOVE_MUSEUM = 75 01 +MUS_ROUTE122 = 76 01 +MUS_OCEANIC_MUSEUM = 77 01 +MUS_EVOLUTION_INTRO = 78 01 +MUS_EVOLUTION = 79 01 +MUS_MOVE_DELETED = 7A 01 +MUS_ENCOUNTER_GIRL = 7B 01 +MUS_ENCOUNTER_MALE = 7C 01 +MUS_ABANDONED_SHIP = 7D 01 +MUS_FORTREE = 7E 01 +MUS_BIRCH_LAB = 7F 01 MUS_B_TOWER = 80 01 -MUS_SWIMEYE = 81 01 -MUS_DAN03 = 82 01 -MUS_ME_KINOMI = 83 01 -MUS_ME_TAMA = 84 01 -MUS_ME_B_BIG = 85 01 -MUS_ME_B_SMALL = 86 01 -MUS_ME_ZANNEN = 87 01 -MUS_BD_TIME = 88 01 -MUS_TEST1 = 89 01 -MUS_TEST2 = 8A 01 -MUS_TEST3 = 8B 01 -MUS_TEST4 = 8C 01 -MUS_TEST = 8D 01 -MUS_GOMACHI0 = 8E 01 -MUS_GOTOWN = 8F 01 -MUS_POKECEN = 90 01 -MUS_NEXTROAD = 91 01 -MUS_GRANROAD = 92 01 +MUS_ENCOUNTER_SWIMMER = 81 01 +MUS_CAVE_OF_ORIGIN = 82 01 +MUS_OBTAIN_BERRY = 83 01 +MUS_AWAKEN_LEGEND = 84 01 +MUS_SLOTS_JACKPOT = 85 01 +MUS_SLOTS_WIN = 86 01 +MUS_TOO_BAD = 87 01 +MUS_ROULETTE = 88 01 +MUS_LINK_CONTEST_P1 = 89 01 +MUS_LINK_CONTEST_P2 = 8A 01 +MUS_LINK_CONTEST_P3 = 8B 01 +MUS_LINK_CONTEST_P4 = 8C 01 +MUS_ENCOUNTER_RICH = 8D 01 +MUS_VERDANTURF = 8E 01 +MUS_RUSTBORO = 8F 01 +MUS_POKE_CENTER = 90 01 +MUS_ROUTE104 = 91 01 +MUS_ROUTE119 = 92 01 MUS_CYCLING = 93 01 -MUS_FRIENDLY = 94 01 -MUS_MISHIRO = 95 01 -MUS_TOZAN = 96 01 -MUS_GIRLEYE = 97 01 -MUS_MINAMO = 98 01 -MUS_ASHROAD = 99 01 -MUS_EVENT0 = 9A 01 -MUS_DEEPDEEP = 9B 01 -MUS_KACHI1 = 9C 01 -MUS_TITLE3 = 9D 01 -MUS_DEMO1 = 9E 01 -MUS_GIRL_SUP = 9F 01 -MUS_HAGESHII = A0 01 -MUS_KAKKOII = A1 01 -MUS_KAZANBAI = A2 01 -MUS_AQA_0 = A3 01 -MUS_TSURETEK = A4 01 -MUS_BOY_SUP = A5 01 -MUS_RAINBOW = A6 01 -MUS_AYASII = A7 01 -MUS_KACHI4 = A8 01 -MUS_ROPEWAY = A9 01 -MUS_CASINO = AA 01 -MUS_HIGHTOWN = AB 01 -MUS_SAFARI = AC 01 -MUS_C_ROAD = AD 01 -MUS_AJITO = AE 01 -MUS_M_BOAT = AF 01 -MUS_M_DUNGON = B0 01 -MUS_FINECITY = B1 01 -MUS_MACHUPI = B2 01 -MUS_P_SCHOOL = B3 01 -MUS_DENDOU = B4 01 -MUS_TONEKUSA = B5 01 -MUS_MABOROSI = B6 01 -MUS_CON_FAN = B7 01 -MUS_CONTEST0 = B8 01 -MUS_MGM0 = B9 01 -MUS_T_BATTLE = BA 01 -MUS_OOAME = BB 01 -MUS_HIDERI = BC 01 -MUS_RUNECITY = BD 01 -MUS_CON_K = BE 01 -MUS_EIKOU_R = BF 01 -MUS_KARAKURI = C0 01 -MUS_HUTAGO = C1 01 -MUS_SITENNOU = C2 01 -MUS_YAMA_EYE = C3 01 -MUS_CONLOBBY = C4 01 -MUS_INTER_V = C5 01 -MUS_DAIGO = C6 01 -MUS_THANKFOR = C7 01 +MUS_POKE_MART = 94 01 +MUS_LITTLEROOT = 95 01 +MUS_MT_CHIMNEY = 96 01 +MUS_ENCOUNTER_FEMALE = 97 01 +MUS_LILYCOVE = 98 01 +MUS_ROUTE111 = 99 01 +MUS_HELP = 9A 01 +MUS_UNDERWATER = 9B 01 +MUS_VICTORY_TRAINER = 9C 01 +MUS_TITLE = 9D 01 +MUS_INTRO = 9E 01 +MUS_ENCOUNTER_MAY = 9F 01 +MUS_ENCOUNTER_INTENSE = A0 01 +MUS_ENCOUNTER_COOL = A1 01 +MUS_ROUTE113 = A2 01 +MUS_ENCOUNTER_AQUA = A3 01 +MUS_FOLLOW_ME = A4 01 +MUS_ENCOUNTER_BRENDAN = A5 01 +MUS_EVER_GRANDE = A6 01 +MUS_ENCOUNTER_SUSPICIOUS = A7 01 +MUS_VICTORY_AQUA_MAGMA = A8 01 +MUS_CABLE_CAR = A9 01 +MUS_GAME_CORNER = AA 01 +MUS_DEWFORD = AB 01 +MUS_SAFARI_ZONE = AC 01 +MUS_VICTORY_ROAD = AD 01 +MUS_AQUA_MAGMA_HIDEOUT = AE 01 +MUS_SAILING = AF 01 +MUS_MT_PYRE = B0 01 +MUS_SLATEPORT = B1 01 +MUS_MT_PYRE_EXTERIOR = B2 01 +MUS_SCHOOL = B3 01 +MUS_HALL_OF_FAME = B4 01 +MUS_FALLARBOR = B5 01 +MUS_SEALED_CHAMBER = B6 01 +MUS_CONTEST_WINNER = B7 01 +MUS_CONTEST = B8 01 +MUS_ENCOUNTER_MAGMA = B9 01 +MUS_INTRO_BATTLE = BA 01 +MUS_WEATHER_KYOGRE = BB 01 +MUS_WEATHER_GROUDON = BC 01 +MUS_SOOTOPOLIS = BD 01 +MUS_CONTEST_RESULTS = BE 01 +MUS_HALL_OF_FAME_ROOM = BF 01 +MUS_TRICK_HOUSE = C0 01 +MUS_ENCOUNTER_TWINS = C1 01 +MUS_ENCOUNTER_ELITE_FOUR = C2 01 +MUS_ENCOUNTER_HIKER = C3 01 +MUS_CONTEST_LOBBY = C4 01 +MUS_ENCOUNTER_INTERVIEWER = C5 01 +MUS_ENCOUNTER_CHAMPION = C6 01 +MUS_CREDITS = C7 01 MUS_END = C8 01 -MUS_BATTLE27 = C9 01 -MUS_BATTLE31 = CA 01 -MUS_BATTLE20 = CB 01 -MUS_BATTLE32 = CC 01 -MUS_BATTLE33 = CD 01 -MUS_BATTLE36 = CE 01 -MUS_BATTLE34 = CF 01 -MUS_BATTLE35 = D0 01 -MUS_BATTLE38 = D1 01 -MUS_BATTLE30 = D2 01 +MUS_VS_WILD = C9 01 +MUS_VS_AQUA_MAGMA = CA 01 +MUS_VS_TRAINER = CB 01 +MUS_VS_GYM_LEADER = CC 01 +MUS_VS_CHAMPION = CD 01 +MUS_VS_REGI = CE 01 +MUS_VS_KYOGRE_GROUDON = CF 01 +MUS_VS_RIVAL = D0 01 +MUS_VS_ELITE_FOUR = D1 01 +MUS_VS_AQUA_MAGMA_LEADER = D2 01 '\l' = FA @ scroll up window text '\p' = FB @ new paragraph diff --git a/constants/version.inc b/constants/version.inc index 09df3503c..21ab704f5 100644 --- a/constants/version.inc +++ b/constants/version.inc @@ -5,11 +5,11 @@ .endif .ifdef SAPPHIRE - .set MUS_EVIL_TEAM, MUS_AQA_0 - .set MUS_GOOD_TEAM, MUS_MGM0 + .set MUS_EVIL_TEAM, MUS_ENCOUNTER_AQUA + .set MUS_GOOD_TEAM, MUS_ENCOUNTER_MAGMA .else - .set MUS_EVIL_TEAM, MUS_MGM0 - .set MUS_GOOD_TEAM, MUS_AQA_0 + .set MUS_EVIL_TEAM, MUS_ENCOUNTER_MAGMA + .set MUS_GOOD_TEAM, MUS_ENCOUNTER_AQUA .endc .ifdef SAPPHIRE diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index e76fca923..60c24fc57 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -868,13 +868,13 @@ Common_EventScript_SetLegendaryWeather:: @ 81A02C1 return Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE waitfanfare return Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special ScrSpecial_HealPlayerParty fadescreen FADE_FROM_BLACK @@ -891,7 +891,7 @@ EventScript_RegionMap:: @ 81A02D6 Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7 setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_M_BOAT, FALSE + playbgm MUS_SAILING, FALSE return Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF @@ -974,7 +974,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 81A0678 Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F bufferitemname 0, VAR_0x8004 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index cb478ad7d..0dc199a6e 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -427,7 +427,7 @@ Move_POUND: @ 81C7794 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -442,7 +442,7 @@ Move_DOUBLE_SLAP: @ 81C77C5 choosetwoturnanim Move_DOUBLE_SLAP_FirstHit, Move_DOUBLE_SLAP_SecondHit Move_DOUBLE_SLAP_End: createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -457,7 +457,7 @@ Move_DOUBLE_SLAP_SecondHit: Move_POISON_POWDER: @ 81C7818 loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -481,7 +481,7 @@ Move_POISON_POWDER: @ 81C7818 Move_STUN_SPORE: @ 81C7949 loadspritegfx ANIM_TAG_STUN_SPORE - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -505,7 +505,7 @@ Move_STUN_SPORE: @ 81C7949 Move_SLEEP_POWDER: @ 81C7A77 loadspritegfx ANIM_TAG_SLEEP_POWDER - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -532,21 +532,21 @@ Move_SWIFT: @ 81C7BA5 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 18, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 18, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish @@ -558,20 +558,20 @@ Move_STRENGTH: @ 81C7C5E loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_BATTLER_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_TARGET, 18, 6, 2, 4 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 16, 12, 1, 1 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -16, -12, 1, 1 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 3, 4, 1, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 @@ -588,7 +588,7 @@ Move_TACKLE: @ 81C7CF2 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -598,14 +598,14 @@ Move_BODY_SLAM: @ 81C7D30 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createsprite gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER waitforvisualfinish delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, -10, 0, 1, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 10, 2 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish @@ -637,7 +637,7 @@ Move_SUPERSONIC: @ 81C7DBD blendoff end Move_SUPERSONIC_CreateWaveSprite: - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createsprite gSupersonicWaveSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -652,7 +652,7 @@ Move_SCREECH: @ 81C7E15 waitforvisualfinish end Move_SCREECH_CreateWaveSprite: - playsewithpan SE_W103, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCREECH, SOUND_PAN_ATTACKER createsprite gScreechWaveSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -662,31 +662,31 @@ Move_FLAME_WHEEL: @ 81C7E62 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_2A ANIM_BATTLER_TARGET createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 0 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 4 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 8 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 12 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 16 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 20 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 24 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 8, 1 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BATTLER_TARGET, 31, 12, 1, 1 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET call _81D11A2 delay 7 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 9 @@ -705,22 +705,22 @@ Move_PIN_MISSILE: @ 81C7F5C monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 9 createsprite gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -734,22 +734,22 @@ Move_ICICLE_SPEAR: @ 81C8021 monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W196, SOUND_PAN_ATTACKER + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER createsprite gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 9 createsprite gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -761,12 +761,12 @@ Move_TAKE_DOWN: @ 81C80E6 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -24, 8, 23, 10, 40, 10 delay 35 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 0, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, -10, 0, 1, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish @@ -783,19 +783,19 @@ Move_TAKE_DOWN: @ 81C80E6 Move_DOUBLE_EDGE: @ 81C817A loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 2, 4, 2, 32767, 10, 0, 0 waitforvisualfinish delay 10 - playsewithpan SE_W207, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 2, 4 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 16, 16, rgb(31, 31, 31) createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish @@ -821,12 +821,12 @@ Move_POISON_STING: @ 81C828D monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 5, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish call PoisonBubblesAnim waitforvisualfinish @@ -840,13 +840,13 @@ Move_TWINEEDLE: @ 81C82E2 monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 6, 2 createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -4, 0, -4, 20 createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 12, 10, 12, 20 delay 20 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 5, 1 createsprite gBattleAnimSpriteTemplate_83DB4C0, ANIM_BATTLER_ATTACKER, 3, 0, -4, 1, 3 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 2 delay 1 createsprite gBattleAnimSpriteTemplate_83DB4C0, ANIM_BATTLER_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish @@ -904,29 +904,29 @@ Move_FIRE_BLAST_CreateFireCross: Move_LEECH_SEED: @ 81C8483 loadspritegfx ANIM_TAG_SEED - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish end Move_EMBER: @ 81C84D9 loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 + loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 5, 2 createsprite gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, 16, 24, 20, 1 delay 16 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET call Move_EMBER_CreateFlare call Move_EMBER_CreateFlare call Move_EMBER_CreateFlare @@ -943,7 +943,7 @@ Move_MEGA_PUNCH: @ 81C854D delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 16, rgb(0, 0, 0) setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 50 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 50 @@ -952,7 +952,7 @@ Move_MEGA_PUNCH: @ 81C854D createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 22, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -986,11 +986,11 @@ Move_MEGA_KICK: @ 81C8627 delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 16, rgb(0, 0, 0) setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 50 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 50 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET call _81C85E9 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 22, 1 @@ -1012,7 +1012,7 @@ Move_COMET_PUNCH: @ 81C86C3 choosetwoturnanim Move_COMET_PUNCH_Even, Move_COMET_PUNCH_Odd Move_COMET_PUNCH_End: createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -1042,7 +1042,7 @@ Move_SONIC_BOOM: @ 81C873B blendoff end Move_SONIC_BOOM_CreateBlast: - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gSonicBoomSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return @@ -1058,7 +1058,7 @@ Move_THUNDER_SHOCK: @ 81C879C waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 0, -44, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 9 createvisualtask sub_80E2A38, 10, 4, 0, 0, 13, 0 waitforvisualfinish @@ -1080,13 +1080,13 @@ Move_THUNDERBOLT: @ 81C880A waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 24, -52, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 7 createvisualtask sub_80D681C, 5, -24, -52, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 7 createvisualtask sub_80D681C, 5, 0, -60, 1 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 9 createvisualtask sub_80E2A38, 10, 4, 0, 0, 13, 0 waitforvisualfinish @@ -1102,7 +1102,7 @@ Move_THUNDERBOLT: @ 81C880A createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 0 createvisualtask sub_80E2A38, 10, 1, 0, 2, 2, 0 delay 6 @@ -1113,7 +1113,7 @@ Move_THUNDERBOLT: @ 81C880A createvisualtask sub_80E2A38, 10, 1, 0, 6, 6, 0 waitforvisualfinish delay 20 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish delay 20 @@ -1129,9 +1129,9 @@ Move_THUNDER_WAVE: @ 81C89C0 waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 0, -48, 0 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 20 - loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 + loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 10, 4 createsprite gBattleAnimSpriteTemplate_83D9950, ANIM_BATTLER_TARGET, 2, -16, -16 delay 4 createsprite gBattleAnimSpriteTemplate_83D9950, ANIM_BATTLER_TARGET, 2, -16, 0 @@ -1157,23 +1157,23 @@ Move_BEAT_UP_Even: createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 0, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto Move_BEAT_UP_End Move_BEAT_UP_Odd: createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 12, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -12, 0, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, -12, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto Move_BEAT_UP_End Move_STOMP: @ 81C8B2A @@ -1181,19 +1181,19 @@ Move_STOMP: @ 81C8B2A loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET createsprite gStompFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -32, 15 delay 19 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -8, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 4, 9, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff end Move_TAIL_WHIP: @ 81C8B71 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end @@ -1202,7 +1202,7 @@ Move_CUT: @ 81C8B8A loadspritegfx ANIM_TAG_CUT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET createsprite gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 @@ -1214,14 +1214,14 @@ Move_CUT: @ 81C8B8A Move_HIDDEN_POWER: @ 81C8BBC loadspritegfx ANIM_TAG_RED_ORB - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 20479, 12, 5, 1 delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 - playsewithpan SE_W179, SOUND_PAN_ATTACKER + playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER createsprite gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 0 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 42 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 84 @@ -1230,7 +1230,7 @@ Move_HIDDEN_POWER: @ 81C8BBC createsprite gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 210 delay 52 setarg ARG_RET_ID, -1 - playsewithpan SE_W115, SOUND_PAN_ATTACKER + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 32 @@ -1246,13 +1246,13 @@ Move_REVERSAL: @ 81C8CA5 loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 3, 32767, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask sub_80E1F8C, 2, 31, 3, 2, 0, 10, 32767 delay 10 - playsewithpan SE_W179, SOUND_PAN_ATTACKER + playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_8402738, ANIM_BATTLER_ATTACKER, 2, 26, 0 createsprite gBattleAnimSpriteTemplate_8402738, ANIM_BATTLER_ATTACKER, 2, 26, 42 createsprite gBattleAnimSpriteTemplate_8402738, ANIM_BATTLER_ATTACKER, 2, 26, 84 @@ -1263,7 +1263,7 @@ Move_REVERSAL: @ 81C8CA5 delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 32767, 8, 0, 0 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 @@ -1287,12 +1287,12 @@ _81C8D96: waitbgfadein end _81C8D9F: - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask sub_80A9058, 5, 0, 1, 6, 1, 0 goto _81C8D96 _81C8DC8: - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createvisualtask sub_80A9058, 5, 0, 1, 6, 1, 0 goto _81C8D96 @@ -1305,7 +1305,7 @@ Move_SPIKE_CANNON: @ 81C8DF1 setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 5, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -8, -8, -8, 20 createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 18, 0, 0, 0, 20 @@ -1315,7 +1315,7 @@ Move_SPIKE_CANNON: @ 81C8DF1 createsprite gBattleAnimSpriteTemplate_83DB4C0, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB4C0, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 7, 1 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -1325,7 +1325,7 @@ Move_SWORDS_DANCE: @ 81C8EA4 loadspritegfx ANIM_TAG_SWORD monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 - playsewithpan SE_W014, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 16, 6, 1, 4 createsprite gBattleAnimSpriteTemplate_83D748C, ANIM_BATTLER_ATTACKER, 2, 0, 0 delay 22 @@ -1341,12 +1341,12 @@ Move_PSYCH_UP: @ 81C8EEA monbg ANIM_BATTLER_ATK_PARTNER createvisualtask sub_80E1F8C, 2, 25, 2, 6, 1, 11, 0 setalpha 12, 8 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 5, 10 createsprite gBattleAnimSpriteTemplate_83DA690, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, 0 createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, 0 delay 127 delay 4 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 createvisualtask sub_80E2A38, 9, 2, 2, 10, 0, 1023 delay 30 @@ -1364,7 +1364,7 @@ Move_DIZZY_PUNCH: @ 81C8F5C call _81C9077 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 5, 16, 8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 16, 0, 1, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, 16, 8, 160, -32 createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, 16, 8, -256, -40 createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, 16, 8, 128, -16 @@ -1375,7 +1375,7 @@ Move_DIZZY_PUNCH: @ 81C8F5C call _81C9077 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 5, -16, -8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -16, -16, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, -16, -8, 160, -32 createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, -16, -8, -256, -40 createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, -16, -8, 128, -16 @@ -1394,7 +1394,7 @@ _81C9077: Move_FIRE_SPIN: @ 81C9096 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 call _81C90BF call _81C90BF @@ -1420,7 +1420,7 @@ Move_FURY_CUTTER: @ 81C914A loadspritegfx ANIM_TAG_CUT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask UpdateFuryCutterAnimDirection, 2 jumpargeq 7, 0, _81C91A7 goto _81C91B9 @@ -1468,19 +1468,19 @@ Move_SELF_DESTRUCT: @ 81C9219 createvisualtask sub_80E2A38, 10, 2, 1, 9, 0, 31 end _81C929F: - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1490,12 +1490,12 @@ Move_SLAM: @ 81C9309 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W004, SOUND_PAN_ATTACKER + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 createsprite gBattleAnimSpriteTemplate_83D69DC, ANIM_BATTLER_ATTACKER, 2, 0, 0 delay 3 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 @@ -1511,10 +1511,10 @@ Move_SLAM: @ 81C9309 Move_VINE_WHIP: @ 81C9391 loadspritegfx ANIM_TAG_WHIP_HIT - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 6 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D69F4, ANIM_BATTLER_TARGET, 2, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 6, 1 @@ -1524,12 +1524,12 @@ Move_DRILL_PECK: @ 81C93C8 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 1 delay 2 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 4, 8 createvisualtask sub_80DB0E8, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 waitforvisualfinish @@ -1547,28 +1547,28 @@ Move_WATERFALL: @ 81C9421 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1 delay 5 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 10, 10, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, -15, 0, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 20, 10, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 0, -10, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, -10, 15, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 25, 20, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, -20, 20, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 @@ -1580,7 +1580,7 @@ Move_WATERFALL: @ 81C9421 blendoff end _81C9502: - playsewithpan SE_W127, SOUND_PAN_TARGET + playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 17, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, ANIM_BATTLER_ATTACKER, 3, 0, 20, 1, 1 createsprite gBattleAnimSpriteTemplate_83D9360, ANIM_BATTLER_ATTACKER, 4, 0, 20 @@ -1635,26 +1635,26 @@ Move_EXPLOSION: @ 81C9675 createvisualtask sub_80E2A38, 10, 1, 3, 16, 0, 32767 end _81C9712: - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_DEFENSE_CURL: @ 81C977C loadspritegfx ANIM_TAG_ECLIPSING_ORB - loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 + loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 createvisualtask sub_80E0E24, 5, 0, 0 createvisualtask sub_812D350, 5 waitforvisualfinish @@ -1668,7 +1668,7 @@ Move_PROTECT: @ 81C97B5 loadspritegfx ANIM_TAG_PROTECT monbg ANIM_BATTLER_ATK_PARTNER monbgprio_28 0 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 16 createsprite gBattleAnimSpriteTemplate_83D6BE8, ANIM_BATTLER_ATTACKER, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -1680,7 +1680,7 @@ Move_DETECT: @ 81C97D2 waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 1, 0, 9, 32767 delay 18 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930F4, ANIM_BATTLER_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 @@ -1705,15 +1705,15 @@ _81C985F: blendoff end _81C9864: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask sub_80E2A38, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 @@ -1721,65 +1721,65 @@ _81C9864: delay 5 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 30, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 24, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -24, -16, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 4, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -16, 19, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, -18, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31 goto _81C985F _81C996A: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask sub_80E2A38, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask sub_812E498, 5 delay 7 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 8, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31 goto _81C985F _81C9A37: - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 4, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 goto _81C985F @@ -1789,7 +1789,7 @@ _81C9AB3: delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 2 delay 12 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 goto _81C985F @@ -1798,14 +1798,14 @@ Move_SAFEGUARD: @ 81C9AF7 loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_BATTLER_ATK_PARTNER setalpha 8, 8 - playsewithpan SE_W208, SOUND_PAN_ATTACKER + playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7D74, ANIM_BATTLER_ATTACKER, 2 delay 4 createsprite gBattleAnimSpriteTemplate_83D7D74, ANIM_BATTLER_ATTACKER, 2 delay 4 createsprite gBattleAnimSpriteTemplate_83D7D74, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 10, 0, 2, 0, 10, 32767 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -1817,21 +1817,21 @@ Move_PAIN_SPLIT: @ 81C9B39 createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_ATTACKER, 2, -8, -42, 0 createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_TARGET, 2, -8, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask sub_812EB10, 2, 0, 0 createvisualtask sub_812EB10, 2, 1, 0 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_ATTACKER, 2, -24, -42, 0 createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_TARGET, 2, -24, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask sub_812EB10, 2, 0, 1 createvisualtask sub_812EB10, 2, 1, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_ATTACKER, 2, 8, -42, 0 createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_TARGET, 2, 8, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask sub_812EB10, 2, 0, 2 createvisualtask sub_812EB10, 2, 1, 2 end @@ -1841,7 +1841,7 @@ Move_VICE_GRIP: @ 81C9BE1 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D769C, ANIM_BATTLER_ATTACKER, 2, 0 createsprite gBattleAnimSpriteTemplate_83D769C, ANIM_BATTLER_ATTACKER, 2, 1 delay 9 @@ -1859,7 +1859,7 @@ Move_GUILLOTINE: @ 81C9C29 setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D76DC, ANIM_BATTLER_ATTACKER, 2, 0 createsprite gBattleAnimSpriteTemplate_83D76DC, ANIM_BATTLER_ATTACKER, 2, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 16, 0 @@ -1869,7 +1869,7 @@ Move_GUILLOTINE: @ 81C9C29 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 8, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -1883,10 +1883,10 @@ Move_PAY_DAY: @ 81C9CB5 monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D75E4, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, SOUND_PAN_TARGET + playsewithpan SE_M_PAY_DAY, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83D75FC, ANIM_BATTLER_ATTACKER, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 @@ -1897,7 +1897,7 @@ Move_PAY_DAY: @ 81C9CB5 Move_OUTRAGE: @ 81C9D08 loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3 + loopsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER, 8, 3 createvisualtask sub_80E1F8C, 2, 7, 2, 5, 3, 8, 430 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 6, 5, 4 delay 0 @@ -1945,7 +1945,7 @@ Move_SPARK: @ 81C9EA3 loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D985C, ANIM_BATTLER_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 createsprite gBattleAnimSpriteTemplate_83D985C, ANIM_BATTLER_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 @@ -1954,7 +1954,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 delay 10 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D985C, ANIM_BATTLER_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_83D985C, ANIM_BATTLER_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 @@ -1963,7 +1963,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 delay 20 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 7, 7, 23551 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 @@ -1977,7 +1977,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 4 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -1988,12 +1988,12 @@ Move_SPARK: @ 81C9EA3 Move_ATTRACT: @ 81CA0BA loadspritegfx ANIM_TAG_RED_HEART - loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 + loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 createsprite gBattleAnimSpriteTemplate_83D7AB0, ANIM_BATTLER_TARGET, 3, 20, -8 waitforvisualfinish - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 160, -32 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, -256, -40 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 128, -16 @@ -2001,7 +2001,7 @@ Move_ATTRACT: @ 81CA0BA createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, -128, -22 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, -384, -31 waitforvisualfinish - waitplaysewithpan SE_W213B, 0, 15 + waitplaysewithpan SE_M_ATTRACT2, 0, 15 createvisualtask sub_80D2100, 5 createsprite gBattleAnimSpriteTemplate_83D7AE0, ANIM_BATTLER_ATTACKER, 40, 16, 256, 0 createsprite gBattleAnimSpriteTemplate_83D7AE0, ANIM_BATTLER_ATTACKER, 40, 224, 240, 15 @@ -2023,7 +2023,7 @@ Move_GROWTH: @ 81CA1B3 end _81CA1C0: createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_BATTLER_ATTACKER, 0 return @@ -2036,12 +2036,12 @@ Move_WHIRLWIND: @ 81CA1E9 createsprite gBattleAnimSpriteTemplate_83DA51C, ANIM_BATTLER_ATTACKER, 2, 0, 24, 1, 60, 4 createsprite gBattleAnimSpriteTemplate_83DA51C, ANIM_BATTLER_ATTACKER, 2, 0, 32, 1, 60, 0 delay 5 - loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 + loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 delay 29 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_TARGET, 12, 6, 1, 5 delay 7 - playsewithpan SE_W081, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET createvisualtask sub_80A8A80, 5, 1, 8 waitforvisualfinish end @@ -2056,7 +2056,7 @@ Move_CONFUSE_RAY: @ 81CA291 createsprite gBattleAnimSpriteTemplate_83DAE64, ANIM_BATTLER_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAE7C, ANIM_BATTLER_TARGET, 2, 0, -16 waitforvisualfinish delay 0 @@ -2081,10 +2081,10 @@ Move_LOCK_ON: @ 81CA2E4 Move_MEAN_LOOK: @ 81CA31A loadspritegfx ANIM_TAG_EYE monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 16, rgb(0, 0, 0) - loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 - waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 85 + loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET, 15, 4 + waitplaysewithpan SE_M_LEER, SOUND_PAN_TARGET, 85 createsprite gBattleAnimSpriteTemplate_8402264, ANIM_BATTLER_ATTACKER, 2 delay 120 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, rgb(0, 0, 0) @@ -2097,20 +2097,20 @@ Move_ROCK_THROW: @ 81CA35F loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_TARGET, 2, 6, 1, 15, 1 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 0, 1, 0, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 19, 1, 10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -23, 2, -10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 5, 20, 1 delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -15, 1, -10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 23, 2, 10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET waitforvisualfinish end @@ -2119,16 +2119,16 @@ Move_ROCK_SLIDE: @ 81CA3EB monbg ANIM_BATTLER_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, 7, 1, 11, 1 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -5, 1, -5, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 5, 0, 6, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 19, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -23, 2, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 5, 50, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_DEF_PARTNER, 0, 5, 50, 1 delay 2 @@ -2139,28 +2139,28 @@ Move_ROCK_SLIDE: @ 81CA3EB end _81CA483: createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 28, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -10, 1, -5, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 10, 0, 6, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 24, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -32, 2, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 30, 2, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 return @@ -2173,7 +2173,7 @@ Move_THIEF: @ 81CA52C setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 6 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 8, 1 waitforvisualfinish @@ -2203,22 +2203,22 @@ Move_BUBBLE_BEAM: @ 81CA573 end _81CA5AD: createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 return @@ -2229,14 +2229,14 @@ Move_ICY_WIND: @ 81CA650 createvisualtask sub_80E2A38, 10, 11, 4, 0, 4, 0 fadetobg BG_ICE waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CA6A8 delay 5 call _81CA6A8 - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET delay 55 call Unknown_81D5E0E waitforvisualfinish @@ -2261,12 +2261,12 @@ _81CA6A8: Move_SMOKESCREEN: @ 81CA710 loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84021B0, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask sub_812C1D0, 2 delay 2 - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402198, ANIM_BATTLER_TARGET, 4, 0, -12, 104, 0, 75 createsprite gBattleAnimSpriteTemplate_8402198, ANIM_BATTLER_TARGET, 4, 0, -12, 72, 1, 75 createsprite gBattleAnimSpriteTemplate_8402198, ANIM_BATTLER_TARGET, 4, 0, -6, 56, 1, 75 @@ -2288,7 +2288,7 @@ Move_CONVERSION: @ 81CA809 monbgprio_28 0 setalpha 16, 0 delay 0 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -24, -24 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -8, -24 @@ -2297,7 +2297,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, 24, -24 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -24, -8 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -8, -8 @@ -2306,7 +2306,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, 24, -8 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -24, 8 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -8, 8 @@ -2315,7 +2315,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, 24, 8 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -24, 24 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -8, 24 @@ -2324,7 +2324,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, 24, 24 delay 20 - playsewithpan SE_W112, SOUND_PAN_ATTACKER + playsewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER createvisualtask sub_80E21A8, 2, 10018, 1, 1, 14335, 12, 0, 0 delay 6 createvisualtask sub_80CE108, 5 @@ -2340,7 +2340,7 @@ Move_CONVERSION_2: @ 81CA91E monbgprio_2A ANIM_BATTLER_TARGET setalpha 0, 16 delay 0 - playsewithpan SE_W112, SOUND_PAN_TARGET + playsewithpan SE_M_BARRIER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6FB0, ANIM_BATTLER_ATTACKER, 2, -24, -24, 60 createsprite gBattleAnimSpriteTemplate_83D6FB0, ANIM_BATTLER_ATTACKER, 2, -8, -24, 65 createsprite gBattleAnimSpriteTemplate_83D6FB0, ANIM_BATTLER_ATTACKER, 2, 8, -24, 70 @@ -2359,21 +2359,21 @@ Move_CONVERSION_2: @ 81CA91E createsprite gBattleAnimSpriteTemplate_83D6FB0, ANIM_BATTLER_ATTACKER, 2, 24, 24, 135 createvisualtask sub_80CE210, 5 delay 60 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -2385,14 +2385,14 @@ Move_ROLLING_KICK: @ 81CAA3A monbg ANIM_BATTLER_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 6 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 createsprite gBattleAnimSpriteTemplate_83D9FF0, ANIM_BATTLER_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 waitforvisualfinish @@ -2404,7 +2404,7 @@ Move_ROLLING_KICK: @ 81CAA3A Move_HEADBUTT: @ 81CAABD loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 1 @@ -2413,7 +2413,7 @@ Move_HEADBUTT: @ 81CAABD createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 2 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish end @@ -2421,7 +2421,7 @@ Move_HORN_ATTACK: @ 81CAB1A loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 1 @@ -2431,7 +2431,7 @@ Move_HORN_ATTACK: @ 81CAB1A createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 2 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish end @@ -2448,13 +2448,13 @@ _81CABB8: createsprite gBattleAnimSpriteTemplate_83D7050, ANIM_BATTLER_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto _81CABA5 _81CABDE: createsprite gBattleAnimSpriteTemplate_83D7050, ANIM_BATTLER_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto _81CABA5 Move_HORN_DRILL: @ 81CAC04 @@ -2468,47 +2468,47 @@ _81CAC21: waitbgfadein setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 1 createsprite gBattleAnimSpriteTemplate_83D7050, ANIM_BATTLER_TARGET, 4, 0, 0, 12 waitforvisualfinish - playse SE_BAN + playse SE_BANG createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 2, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -4, 3, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -8, -5, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 4, -12, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 16, 0, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 5, 18, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -17, 12, 1, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -21, -15, 1, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 8, -27, 1, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 32, 0, 1, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 2 waitforvisualfinish @@ -2530,15 +2530,15 @@ Move_THRASH: @ 81CAD81 createvisualtask sub_80D0AB8, 2 createsprite gBattleAnimSpriteTemplate_83D9FC0, ANIM_BATTLER_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 28 createsprite gBattleAnimSpriteTemplate_83D9FC0, ANIM_BATTLER_TARGET, 3, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 28 createsprite gBattleAnimSpriteTemplate_83D9FC0, ANIM_BATTLER_TARGET, 3, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET end Move_SING: @ 81CAE00 @@ -2546,7 +2546,7 @@ Move_SING: @ 81CAE00 monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80CEA20, 2 waitforvisualfinish - panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SING, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7114, ANIM_BATTLER_TARGET, 2, 7, 0, 12 delay 5 createsprite gBattleAnimSpriteTemplate_83D7114, ANIM_BATTLER_TARGET, 2, 6, 1, 12 @@ -2585,7 +2585,7 @@ Move_LOW_KICK: @ 81CAED4 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -8, 8, 1, 2 createvisualtask sub_80A8E04, 2, 6, 384, 1, 2 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 4 end @@ -2593,7 +2593,7 @@ Move_LOW_KICK: @ 81CAED4 Move_EARTHQUAKE: @ 81CAF31 createvisualtask sub_80E1864, 5, 5, 10, 50 createvisualtask sub_80E1864, 5, 4, 10, 50 - playsewithpan SE_W089, 0 + playsewithpan SE_M_EARTHQUAKE, 0 delay 10 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 delay 16 @@ -2604,7 +2604,7 @@ Move_FISSURE: @ 81CAF7E loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_80E1864, 3, 5, 10, 50 createvisualtask sub_80E1864, 3, 1, 10, 50 - playsewithpan SE_W089, SOUND_PAN_TARGET + playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET delay 8 call _81CAFFF delay 15 @@ -2631,14 +2631,14 @@ _81CAFFF: createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 0, 16, -16, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 1, 14, -52, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 1, 12, -32, -16, 24 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET return _81CB050: createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 0, 12, -24, -16, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 0, 16, -38, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 1, 14, -20, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 1, 12, -36, -16, 24 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET return Move_DIG: @ 81CB0A1 @@ -2677,7 +2677,7 @@ _81CB106: delay 16 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 - playsewithpan SE_W025B, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER clearmonbg ANIM_BATTLER_ATTACKER goto _81CB0AA _81CB16A: @@ -2685,16 +2685,16 @@ _81CB16A: createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 16, 4, -10, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 14, 4, -18, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 12, 4, -16, 18 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 return Move_MEDITATE: @ 81CB1BD call SetPsychicBackground createvisualtask sub_80DBC94, 2 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish call BackgroundRestore end @@ -2704,15 +2704,15 @@ Move_AGILITY: @ 81CB1DA setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 4, 4 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 10 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -2726,11 +2726,11 @@ Move_QUICK_ATTACK: @ 81CB224 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 1, 5 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff @@ -2744,16 +2744,16 @@ Move_RAGE: @ 81CB27C setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BATTLER_ATTACKER, 31, 10, 0, 2 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER delay 20 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_80A9058, 2, 1, 1, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET end @@ -2761,7 +2761,7 @@ Move_RAGE: @ 81CB27C Move_TELEPORT: @ 81CB2F2 call SetPsychicBackground createvisualtask sub_80DBCFC, 2 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 15 call BackgroundRestore waitforvisualfinish @@ -2771,23 +2771,23 @@ Move_DOUBLE_TEAM: @ 81CB30B monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 createvisualtask sub_80CE7E0, 2 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 32 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 24 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff @@ -2797,7 +2797,7 @@ Move_DOUBLE_TEAM: @ 81CB30B Move_MINIMIZE: @ 81CB352 setalpha 10, 8 createvisualtask AnimTask_Minimize, 2 - loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3 + loopsewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 34, 3 waitforvisualfinish blendoff end @@ -2806,11 +2806,11 @@ Move_METRONOME: @ 81CB365 loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gBattleAnimSpriteTemplate_83D7220, ANIM_BATTLER_ATTACKER, 11, 0, 100 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_83D72C8, ANIM_BATTLER_ATTACKER, 12, 0 delay 24 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish end @@ -2825,7 +2825,7 @@ _81CB399: goto _81CB398 _81CB3A9: createsprite gBattleAnimSpriteTemplate_83C2010, ANIM_BATTLER_ATTACKER, 2, 0, -24, 0, 0, 10, 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80A8E04, 2, 16, 96, 0, 2 waitforvisualfinish @@ -2835,14 +2835,14 @@ _81CB3A9: _81CB3E6: loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_80CDAC8, 2, 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish - playse SE_BAN + playse SE_BANG createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish createvisualtask sub_80CDAC8, 2, 1 goto _81CB398 @@ -2852,9 +2852,9 @@ Move_AMNESIA: @ 81CB455 call SetPsychicBackground delay 8 createsprite gBattleAnimSpriteTemplate_83DA88C, ANIM_BATTLER_ATTACKER, 20 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 54 - loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 + loopsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER, 16, 3 waitforvisualfinish call BackgroundRestore end @@ -2862,18 +2862,18 @@ Move_AMNESIA: @ 81CB455 Move_KINESIS: @ 81CB479 loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createsprite gBattleAnimSpriteTemplate_83DA824, ANIM_BATTLER_ATTACKER, 20 createsprite gBattleAnimSpriteTemplate_83D7450, ANIM_BATTLER_ATTACKER, 19, 32, -8, 0 createsprite gBattleAnimSpriteTemplate_83D7450, ANIM_BATTLER_ATTACKER, 19, 32, 16, 1 - loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 + loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER, 21, 2 delay 60 - playsewithpan SE_W146, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER delay 30 - loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER, 20, 2 delay 70 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER waitforvisualfinish call BackgroundRestore end @@ -2882,14 +2882,14 @@ Move_GLARE: @ 81CB4CA loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask sub_81301EC, 5, 0 - playsewithpan SE_W060B, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E2A38, 5, 1, 0, 0, 16, 0 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, 16, -8 createvisualtask sub_80D23B4, 5 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER delay 2 createvisualtask sub_80D60B4, 3, 20, 1, 0 waitforvisualfinish @@ -2899,12 +2899,12 @@ Move_GLARE: @ 81CB4CA Move_BARRAGE: @ 81CB533 loadspritegfx ANIM_TAG_RED_BALL createvisualtask sub_8130554, 3 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_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, SOUND_PAN_TARGET, 8, 2 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 2 end Move_SKY_ATTACK: @ 81CB57B @@ -2923,7 +2923,7 @@ _81CB5A0: delay 12 createvisualtask sub_80E2A38, 10, 2, 1, 8, 0, 0 createvisualtask sub_80E1864, 5, 0, 2, 16 - loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8 + loopsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER, 4, 8 createvisualtask sub_80E2A38, 10, 2, 1, 0, 15, 32767 delay 20 createvisualtask sub_80E2A38, 10, 2, 1, 15, 0, 32767 @@ -2939,7 +2939,7 @@ _81CB617: delay 12 createvisualtask sub_80E2A38, 10, 2, 1, 8, 0, 0 createvisualtask sub_80E1864, 5, 0, 2, 16 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80E2A38, 10, 2, 1, 0, 15, 32767 delay 20 @@ -2974,7 +2974,7 @@ _81CB68E: goto _81CB584 Move_FLASH: @ 81CB713 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask sub_80E388C, 2 waitforvisualfinish end @@ -2982,7 +2982,7 @@ Move_FLASH: @ 81CB713 Move_SPLASH: @ 81CB720 createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish end @@ -2990,7 +2990,7 @@ Move_ACID_ARMOR: @ 81CB735 monbg ANIM_BATTLER_ATTACKER setalpha 15, 0 createvisualtask sub_812F314, 2, 0 - playsewithpan SE_W151, SOUND_PAN_ATTACKER + playsewithpan SE_M_ACID_ARMOR, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BATTLER_ATTACKER @@ -3006,7 +3006,7 @@ Move_SHARPEN: @ 81CB74E Move_SUPER_FANG: @ 81CB75A loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 1, 0, 20, 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 3, 0, 48, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATTACKER, 1247, 12, 4, 1 @@ -3015,7 +3015,7 @@ Move_SUPER_FANG: @ 81CB75A createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 4 createsprite gBattleAnimSpriteTemplate_83D7080, ANIM_BATTLER_TARGET, 2 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, 2143, 14, 32767, 14 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 7, 12, 1 @@ -3026,11 +3026,11 @@ Move_SUPER_FANG: @ 81CB75A Move_SLASH: @ 81CB7DB loadspritegfx ANIM_TAG_SLASH createsprite gBattleAnimSpriteTemplate_83D6E38, ANIM_BATTLER_TARGET, 2, 1, -8, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83D6E38, ANIM_BATTLER_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish end @@ -3042,11 +3042,11 @@ Move_STRUGGLE: @ 81CB815 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 3, 0, 12, 4 createsprite gBattleAnimSpriteTemplate_83D7C90, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 createsprite gBattleAnimSpriteTemplate_83D7C90, ANIM_BATTLER_ATTACKER, 2, 0, 1, 2 - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 + loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -3060,7 +3060,7 @@ Move_SKETCH: @ 81CB87B waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET createvisualtask AnimTask_Splash, 2, 0, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 2 end Move_NIGHTMARE: @ 81CB8A3 @@ -3070,7 +3070,7 @@ Move_NIGHTMARE: @ 81CB8A3 monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80DE1B0, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 40, 1 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER restorebg @@ -3079,7 +3079,7 @@ Move_NIGHTMARE: @ 81CB8A3 _81CB8CF: createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATTACKER, 32767, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 3, 0, 32, 1 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3090,11 +3090,11 @@ Move_FLAIL: @ 81CB8F9 monbg ANIM_BATTLER_TARGET setalpha 12, 8 createvisualtask sub_812E860, 2, 0 - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 + loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB4F0, ANIM_BATTLER_TARGET, 3, 1, 3 createvisualtask sub_80A9058, 2, 0, 1, 30, 1, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -3102,12 +3102,12 @@ Move_FLAIL: @ 81CB8F9 Move_SPITE: @ 81CB936 fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80E1F8C, 2, 2, 2, 6, 0, 8, 32767 createvisualtask sub_80DE3AC, 2 - loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 + loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3128,11 +3128,11 @@ _81CB97E: delay 0 setalpha 9, 8 createvisualtask sub_807A69C, 2, 28968, 10 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -3153,13 +3153,13 @@ Move_FORESIGHT: @ 81CB9ED setalpha 16, 0 createsprite gBattleAnimSpriteTemplate_8402A24, ANIM_BATTLER_TARGET, 2, 1 delay 17 - loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 + loopsewithpan SE_M_SKETCH, SOUND_PAN_TARGET, 16, 4 delay 48 delay 24 - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET delay 10 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_TARGET, 32767, 12, 2, 1 - playsewithpan SE_W197, SOUND_PAN_TARGET + playsewithpan SE_M_DETECT, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -3168,16 +3168,16 @@ Move_FORESIGHT: @ 81CB9ED Move_DESTINY_BOND: @ 81CBA2C loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_80DE918, 5, 0, 48 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 24, 1 createvisualtask sub_80E2A7C, 2, 6, 1, 0, 12, 30653 delay 24 createvisualtask sub_80E2A7C, 2, 6, 1, 12, 0, 30653 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3187,7 +3187,7 @@ Move_DESTINY_BOND: @ 81CBA2C Move_ENDURE: @ 81CBA87 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 @@ -3214,13 +3214,13 @@ Move_CHARM: @ 81CBB1B loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_812E568, 5, 0, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER waitforvisualfinish end @@ -3235,7 +3235,7 @@ Move_ROLLOUT: @ 81CBB5E waitforvisualfinish createvisualtask sub_80A9058, 2, 0, 1, 30, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 2 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -3245,44 +3245,44 @@ Move_FALSE_SWIPE: @ 81CBB9F loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83D6E50, ANIM_BATTLER_TARGET, 2 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 16 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 0 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 32 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 48 delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 64 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end Move_SWAGGER: @ 81CBC26 loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask sub_80D08C8, 2 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7764, ANIM_BATTLER_ATTACKER, 2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET delay 12 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET waitforvisualfinish end @@ -3293,14 +3293,14 @@ Move_MILK_DRINK: @ 81CBC6E monbg ANIM_BATTLER_TARGET createsprite gBattleAnimSpriteTemplate_83D6C48, ANIM_BATTLER_ATTACKER, 2 delay 40 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W208, SOUND_PAN_ATTACKER + playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET call Unknown_81D5F3E @@ -3317,12 +3317,12 @@ _81CBCC8: _81CBCC9: createvisualtask sub_80E1864, 5, 5, 0, 50 createvisualtask sub_80E1864, 5, 4, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 goto _81CBCC8 _81CBCEE: createvisualtask sub_80E1864, 5, 5, 0, 50 createvisualtask sub_80E1864, 5, 4, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 delay 10 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 delay 16 @@ -3335,15 +3335,15 @@ Move_RAPID_SPIN: @ 81CBD41 monbg ANIM_BATTLER_ATTACKER createsprite gBattleAnimSpriteTemplate_84023E8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_812CDC8, 2, 0, 2, 0 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask sub_80A9058, 2, 0, 1, 10, 1, 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish delay 8 createvisualtask sub_812CDC8, 2, 0, 2, 1 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER end @@ -3357,7 +3357,7 @@ Move_MOONLIGHT: @ 81CBDAE waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D6FC8, ANIM_BATTLER_ATTACKER, 2, 120, 56 createvisualtask sub_8079670, 3, 0, 16, 16, 0, 1 - playsewithpan SE_W236, 0 + playsewithpan SE_M_MOONLIGHT, 0 delay 30 createsprite gBattleAnimSpriteTemplate_83D6FF8, ANIM_BATTLER_ATTACKER, 40, -12, 0 delay 30 @@ -3386,7 +3386,7 @@ _81CBE55: createvisualtask sub_80E3A58, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask sub_80D15A4, 2 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 3 waitforvisualfinish delay 1 createvisualtask sub_80E4300, 2 @@ -3395,19 +3395,19 @@ _81CBE55: delay 18 createvisualtask sub_80D1638, 2 delay 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, ANIM_BATTLER_TARGET, 2, 1, 0, -12, 3 delay 10 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, ANIM_BATTLER_TARGET, 2, 1, 0, 12, 3 delay 10 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, ANIM_BATTLER_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish createvisualtask sub_80D18D4, 2 delay 10 createvisualtask sub_80D17C4, 2 - loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish restorebg waitbgfadeout @@ -3429,19 +3429,19 @@ Move_UPROAR: @ 81CBEFC monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, 29, -12, 0 createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, 12, -29, 1 createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, 24, -24, 1 createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish @@ -3453,7 +3453,7 @@ Move_HEAT_WAVE: @ 81CBFC6 createvisualtask AnimTask_BlendSpriteColor, 5, 10261, 0, 6, 6, rgb(31, 0, 0) createvisualtask do_boulder_dust, 5, 1 createvisualtask AnimTask_BlendInterfaceColor, 6, 6, 31 - panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_HEAT_WAVE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 delay 4 createvisualtask sub_80D5DDC, 5 delay 12 @@ -3478,7 +3478,7 @@ Move_HAIL: @ 81CC076 createvisualtask sub_80E2A38, 10, 1, 3, 0, 6, 0 waitforvisualfinish createvisualtask AnimTask_Hail1, 5 - loopsewithpan SE_W258, 0, 8, 10 + loopsewithpan SE_M_HAIL, 0, 8, 10 waitforvisualfinish createvisualtask sub_80E2A38, 10, 1, 3, 6, 0, 0 end @@ -3490,10 +3490,10 @@ Move_TORMENT: @ 81CC0AE waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_TARGET, 31, 10, 1, 1 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET delay 20 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end Move_MEMENTO: @ 81CC0F2 @@ -3502,9 +3502,9 @@ Move_MEMENTO: @ 81CC0F2 createvisualtask sub_80E0918, 2 delay 1 createvisualtask sub_80E00EC, 5 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER delay 48 - playsewithpan SE_W060B, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E09C4, 2 delay 12 @@ -3512,7 +3512,7 @@ Move_MEMENTO: @ 81CC0F2 delay 1 monbg_22 ANIM_BATTLER_TARGET createvisualtask sub_80E03BC, 5 - playsewithpan SE_W060, SOUND_PAN_TARGET + playsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET waitforvisualfinish clearmonbg_23 ANIM_BATTLER_TARGET delay 1 @@ -3524,7 +3524,7 @@ Move_FACADE: @ 81CC136 loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask sub_812FD7C, 2, 0, 3 createvisualtask sub_812FFE4, 2, 0, 72 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: @ 81CC156 @@ -3534,22 +3534,22 @@ Move_SMELLING_SALT: @ 81CC156 createsprite gBattleAnimSpriteTemplate_84029C4, ANIM_BATTLER_TARGET, 2, 1, 1, 2 delay 32 createvisualtask sub_8130918, 3, 1, 2 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 + loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 6, 2 createsprite gBattleAnimSpriteTemplate_84029F4, ANIM_BATTLER_TARGET, 2, 1, 8, 3 - loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 + loopsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: @ 81CC1B1 loadspritegfx ANIM_TAG_FINGER createsprite gBattleAnimSpriteTemplate_83D72E0, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 18 - playsewithpan SE_W213, SOUND_PAN_ATTACKER + playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER delay 71 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 end Move_CHARGE: @ 81CC1D0 @@ -3561,26 +3561,26 @@ Move_CHARGE: @ 81CC1D0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, rgb(0, 0, 0) waitforvisualfinish createvisualtask sub_80D6B3C, 2, 0, 60, 2, 12 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9A6C, ANIM_BATTLER_ATTACKER, 2, 0 delay 25 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 15 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 10 delay 6 - loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 + loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -16 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, rgb(0, 0, 0) clearmonbg ANIM_BATTLER_ATTACKER @@ -3592,19 +3592,19 @@ Move_TAUNT: @ 81CC26B loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gBattleAnimSpriteTemplate_83D7220, ANIM_BATTLER_ATTACKER, 11, 0, 45 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_83D7358, ANIM_BATTLER_ATTACKER, 12, 0 delay 4 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET waitforvisualfinish delay 12 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end Move_HELPING_HAND: @ 81CC2BF @@ -3613,13 +3613,13 @@ Move_HELPING_HAND: @ 81CC2BF createsprite gBattleAnimSpriteTemplate_8402A0C, ANIM_BATTLER_ATTACKER, 40, 0 createsprite gBattleAnimSpriteTemplate_8402A0C, ANIM_BATTLER_ATTACKER, 40, 1 delay 19 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 2, 0, 5, 1 delay 14 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 2, 0, 5, 1 delay 20 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 3, 0, 10, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATK_PARTNER, 1023, 12, 1, 1 end @@ -3629,16 +3629,16 @@ Move_ASSIST: @ 81CC332 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, 208, 128, -16, 48, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, -16, 112, 256, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, 108, 128, 84, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, -16, 56, 256, 56, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 end Move_SUPERPOWER: @ 81CC3A3 @@ -3649,7 +3649,7 @@ Move_SUPERPOWER: @ 81CC3A3 monbgprio_28 0 setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DA0FC, ANIM_BATTLER_TARGET, 2, 0 - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER delay 20 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, 4, 1, 180, 1 createvisualtask sub_812B340, 5, 234, 0 @@ -3665,10 +3665,10 @@ Move_SUPERPOWER: @ 81CC3A3 createsprite gBattleAnimSpriteTemplate_83DA114, ANIM_BATTLER_ATTACKER, 41, 60, 288, 3, 88 delay 74 createsprite gBattleAnimSpriteTemplate_83DA12C, ANIM_BATTLER_TARGET, 3, 0 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 16 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff @@ -3681,10 +3681,10 @@ Move_RECYCLE: @ 81CC45E setalpha 0, 16 delay 1 createsprite gBattleAnimSpriteTemplate_8402B10, ANIM_BATTLER_ATTACKER, 2 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 32767, 12, 2, 1 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BATTLER_ATTACKER @@ -3705,20 +3705,20 @@ _81CC4A7: delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_BATTLER_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 6, rgb(0, 0, 0) delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 6, 0, rgb(0, 0, 0) waitforvisualfinish @@ -3733,26 +3733,26 @@ _81CC576: delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_BATTLER_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 6, rgb(0, 0, 0) delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DA0B8, ANIM_BATTLER_ATTACKER, 2, 1, 0, -8, -12 createsprite gBattleAnimSpriteTemplate_83DA0B8, ANIM_BATTLER_ATTACKER, 2, 1, 1, 8, -12 createsprite gBattleAnimSpriteTemplate_83DA0B8, ANIM_BATTLER_ATTACKER, 2, 1, 2, -8, 12 createsprite gBattleAnimSpriteTemplate_83DA0B8, ANIM_BATTLER_ATTACKER, 2, 1, 3, 8, 12 - playsewithpan SE_W280, SOUND_PAN_TARGET + playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 6, 0, rgb(0, 0, 0) waitforvisualfinish @@ -3762,33 +3762,33 @@ _81CC576: Move_YAWN: @ 81CC697 loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask sub_812F724, 2, 0 - playsewithpan SE_W281, SOUND_PAN_ATTACKER + playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_84027EC, ANIM_BATTLER_TARGET, 5, 2 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER delay 4 createsprite gBattleAnimSpriteTemplate_84027EC, ANIM_BATTLER_TARGET, 5, 1 delay 4 createsprite gBattleAnimSpriteTemplate_84027EC, ANIM_BATTLER_TARGET, 5, 0 waitforvisualfinish createvisualtask sub_812F724, 2, 1 - playsewithpan SE_W281, SOUND_PAN_TARGET + playsewithpan SE_M_YAWN, SOUND_PAN_TARGET end Move_ENDEAVOR: @ 81CC6DA loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_812FD7C, 2, 0, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 703, 12, 1, 2 delay 6 createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 12, -12, 1, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 24 createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -12, 12, 1, 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end Move_ERUPTION: @ 81CC74F @@ -3796,10 +3796,10 @@ Move_ERUPTION: @ 81CC74F createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 2, 0, 4, rgb(31, 0, 0) waitforvisualfinish createvisualtask sub_80D5470, 2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60 waitforvisualfinish createvisualtask sub_80D5470, 2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60 waitforvisualfinish delay 30 createsprite gBattleAnimSpriteTemplate_83D96F8, ANIM_BATTLER_ATTACKER, 40, 200, -32, 0, 100, 0 @@ -3811,7 +3811,7 @@ Move_ERUPTION: @ 81CC74F delay 22 createvisualtask sub_80E1864, 5, 5, 8, 60 createvisualtask sub_80E1864, 5, 4, 8, 60 - loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12 + loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 40, 31, 4, 4, 0, rgb(31, 0, 0) end @@ -3821,7 +3821,7 @@ Move_SKILL_SWAP: @ 81CC81C call SetPsychicBackground createvisualtask sub_80DC0B0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_TARGET, 32767, 12, 3, 1 - loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER, 24, 3 delay 16 createvisualtask sub_80DC0B0, 3, 0 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 32767, 12, 3, 1 @@ -3836,12 +3836,12 @@ Move_IMPRISON: @ 81CC867 monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80DBE00, 5 delay 8 - loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish delay 4 createsprite gBattleAnimSpriteTemplate_83DA8F4, ANIM_BATTLER_ATTACKER, 5, 0, 40 createvisualtask sub_80E1864, 5, 4, 1, 10 - playsewithpan SE_W063, SOUND_PAN_ATTACKER + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER clearmonbg ANIM_BATTLER_DEF_PARTNER call BackgroundRestore end @@ -3851,13 +3851,13 @@ Move_GRUDGE: @ 81CC8AA monbg ANIM_BATTLER_ATTACKER monbgprio_29 fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_80DF1A4, 3 - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4 + loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 16, 4 delay 10 delay 80 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3871,7 +3871,7 @@ Move_CAMOUFLAGE: @ 81CC8D2 createvisualtask sub_80E2B74, 5, 2, 3, 0, 14 delay 16 createvisualtask sub_80DFC24, 2, 4 - playsewithpan SE_W185, SOUND_PAN_ATTACKER + playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER waitforvisualfinish delay 8 createvisualtask sub_80E2B74, 5, 2, 0, 0, 0 @@ -3890,7 +3890,7 @@ Move_TAIL_GLOW: @ 81CC918 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DAC10, ANIM_BATTLER_ATTACKER, 66, 0 delay 18 - loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 + loopsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, rgb(0, 0, 0) clearmonbg ANIM_BATTLER_ATTACKER @@ -3907,7 +3907,7 @@ Move_LUSTER_PURGE: @ 81CC95B waitbgfadein monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 - playsewithpan SE_W076, SOUND_PAN_ATTACKER + playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA9E0, ANIM_BATTLER_ATTACKER, 41, 0, 0, 0, 0 delay 20 createvisualtask sub_80E2A7C, 5, 5, 2, 0, 16, -1 @@ -3945,14 +3945,14 @@ Move_MIST_BALL: @ 81CCA72 loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 - playsewithpan SE_W081, SOUND_PAN_ATTACKER + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER createsprite gMistBallSpriteTemplate, ANIM_BATTLER_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 10, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 0, 1, 1, 1, 32279, 16, 32767, 16 delay 0 - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_LoadMistTiles, 5 createvisualtask sub_80E2A38, 10, 4, 3, 0, 16, 32767 delay 8 @@ -3965,7 +3965,7 @@ Move_FEATHER_DANCE: @ 81CCB01 loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 - playsewithpan SE_W080, SOUND_PAN_TARGET + playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_TARGET delay 0 createsprite gBattleAnimSpriteTemplate_83DA498, ANIM_BATTLER_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 @@ -3988,19 +3988,19 @@ Move_TEETER_DANCE: @ 81CCBD1 loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 0, 16, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 0, 0, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 1, -8, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 2, 8, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER end Move_MUD_SPORT: @ 81CCC3C @@ -4009,52 +4009,52 @@ Move_MUD_SPORT: @ 81CCC3C delay 24 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -4, -16 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 4, -12 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -3, -12 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 5, -14 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -5, -18 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 3, -14 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 16 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 220, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 60, 100 - waitplaysewithpan SE_W145B, 0, 25 + waitplaysewithpan SE_M_BUBBLE2, 0, 25 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 140, 55 - waitplaysewithpan SE_W145B, 0, 14 + waitplaysewithpan SE_M_BUBBLE2, 0, 14 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 180, 50 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 20, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 90, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 160, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 30, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 120, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 200, 40 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 end Move_NEEDLE_ARM: @ 81CCD73 loadspritegfx ANIM_TAG_GREEN_SPIKE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 2, 16 createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 0, 0, -32, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 0, 22, -22, 16 @@ -4082,7 +4082,7 @@ Move_NEEDLE_ARM: @ 81CCD73 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 1, 0, -24, 10 createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 1, 17, -17, 10 createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 1, 24, 0, 10 @@ -4096,7 +4096,7 @@ Move_NEEDLE_ARM: @ 81CCD73 Move_SLACK_OFF: @ 81CCF23 loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, 0 - playsewithpan SE_W281, SOUND_PAN_ATTACKER + playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER waitforvisualfinish call Unknown_81D5EF5 waitforvisualfinish @@ -4113,11 +4113,11 @@ Move_CRUSH_CLAW: @ 81CCF3B createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 18, 1 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, -10, -10, 0 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, -10, 10, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET delay 12 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, 10, -10, 1 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, 10, 10, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish waitforvisualfinish blendoff @@ -4125,7 +4125,7 @@ Move_CRUSH_CLAW: @ 81CCF3B end Move_AROMATHERAPY: @ 81CCFAB - playsewithpan SE_W080, 0 + playsewithpan SE_M_PETAL_DANCE, 0 loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 @@ -4149,15 +4149,15 @@ Move_AROMATHERAPY: @ 81CCFAB delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 0, 7, 0, rgb(13, 31, 12) delay 1 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER createvisualtask sub_81300A4, 2, 1 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6CA0, ANIM_BATTLER_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gBattleAnimSpriteTemplate_83D6CA0, ANIM_BATTLER_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 43, 3, 10, 0, rgb(13, 31, 12) createsprite gBattleAnimSpriteTemplate_83D7974, ANIM_BATTLER_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish @@ -4170,7 +4170,7 @@ Move_FAKE_TEARS: @ 81CD10D createvisualtask AnimTask_BlendSpriteColor, 5, 10155, 0, 4, 4, rgb(12, 11, 31) waitforvisualfinish createvisualtask sub_812E568, 5, 0, 2, 1 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 12, 4 delay 8 createsprite gBattleAnimSpriteTemplate_83DB238, ANIM_BATTLER_ATTACKER, 2, 0, 0 createsprite gBattleAnimSpriteTemplate_83DB238, ANIM_BATTLER_ATTACKER, 2, 0, 1 @@ -4196,7 +4196,7 @@ Move_AIR_CUTTER: @ 81CD19D delay 0 createvisualtask sub_80CFB04, 2, 32, -24, 1536, 2, 128 waitforvisualfinish - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6B40, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 @@ -4212,15 +4212,15 @@ Move_ODOR_SLEUTH: @ 81CD1FF createvisualtask sub_81316F8, 5 delay 24 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, -1, 16, -1, 0 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: @ 81CD249 @@ -4229,7 +4229,7 @@ Move_GRASS_WHISTLE: @ 81CD249 waitforvisualfinish createvisualtask sub_80CEA20, 2 waitforvisualfinish - panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_GRASSWHISTLE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7114, ANIM_BATTLER_TARGET, 2, 7, 1, 0 delay 5 createsprite gBattleAnimSpriteTemplate_83D7114, ANIM_BATTLER_TARGET, 2, 6, 1, 0 @@ -4266,7 +4266,7 @@ Move_TICKLE: @ 81CD33C waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, 16, -8 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 16, 0, rgb(0, 0, 0) waitforvisualfinish @@ -4274,7 +4274,7 @@ Move_TICKLE: @ 81CD33C createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, 0 delay 12 createvisualtask sub_812E568, 3, 1, 6, 2 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 8, 8 waitforvisualfinish end @@ -4284,13 +4284,13 @@ Move_WATER_SPOUT: @ 81CD3A8 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80D40F4, 5 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W291, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER waitforvisualfinish delay 16 createvisualtask sub_80D45D8, 5 - playsewithpan SE_W057, SOUND_PAN_TARGET + playsewithpan SE_M_SURF, SOUND_PAN_TARGET clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -4303,11 +4303,11 @@ Move_SHADOW_PUNCH: @ 81CD3D6 monbg ANIM_BATTLER_ATK_PARTNER setalpha 9, 8 createvisualtask sub_807A69C, 2, 0, 13 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -4322,15 +4322,15 @@ Move_EXTRASENSORY: @ 81CD431 setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 891, 12, 1, 1 createvisualtask sub_80DC2D4, 5, 0 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 891, 12, 1, 1 createvisualtask sub_80DC2D4, 5, 1 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80DC4F4, 5, 0 createvisualtask sub_80DC2D4, 5, 2 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -4344,18 +4344,18 @@ Move_AERIAL_ACE: @ 81CD499 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 1, 5 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 0, 10, 0, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff end Move_IRON_DEFENSE: @ 81CD503 - loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish @@ -4364,7 +4364,7 @@ Move_IRON_DEFENSE: @ 81CD503 Move_BLOCK: @ 81CD52D loadspritegfx ANIM_TAG_X_SIGN createsprite gBattleAnimSpriteTemplate_8402A6C, ANIM_BATTLER_TARGET, 66 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET end Move_HOWL: @ 81CD53C @@ -4380,10 +4380,10 @@ Move_HOWL: @ 81CD53C Move_BULK_UP: @ 81CD55E loadspritegfx ANIM_TAG_BREATH createvisualtask sub_80D08C8, 2 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7764, ANIM_BATTLER_ATTACKER, 2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end @@ -4392,16 +4392,16 @@ Move_COVET: @ 81CD57C loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_812E568, 5, 0, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 4, 3 end Move_VOLT_TACKLE: @ 81CD5D9 @@ -4413,28 +4413,28 @@ Move_VOLT_TACKLE: @ 81CD5D9 createvisualtask sub_80E2A38, 10, 1, 0, 0, 8, 0 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D9AB4, ANIM_BATTLER_ATTACKER, 1 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER blendoff delay 8 createvisualtask sub_80D700C, 5, 0 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D700C, 5, 1 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D700C, 5, 2 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D700C, 5, 3 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D700C, 5, 4 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 10, 0, 18, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 1, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 1, -16, -16 @@ -4442,7 +4442,7 @@ Move_VOLT_TACKLE: @ 81CD5D9 createvisualtask sub_80D6E9C, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 3, 0, 9, 1 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -16 @@ -4455,13 +4455,13 @@ Move_WATER_SPORT: @ 81CD6D1 loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_80D48F4, 5 delay 8 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 end Move_CALM_MIND: @ 81CD6F7 @@ -4472,13 +4472,13 @@ Move_CALM_MIND: @ 81CD6F7 createvisualtask sub_80E3BDC, 5, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D795C, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gBattleAnimSpriteTemplate_83D795C, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gBattleAnimSpriteTemplate_83D795C, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E3BDC, 5, 0 waitforvisualfinish @@ -4493,20 +4493,20 @@ Move_LEAF_BLADE: @ 81CD775 createvisualtask sub_80CBDF4, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET waitforvisualfinish monbg ANIM_BATTLER_TARGET setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 8, 0, 18, 1 createsprite gBattleAnimSpriteTemplate_83DB520, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 36 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -4518,7 +4518,7 @@ Move_DRAGON_DANCE: @ 81CD7F8 monbgprio_28 0 delay 1 createvisualtask sub_80DF924, 5 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80798AC, 5, 10249, 19456, 14, 0, 3 createsprite gBattleAnimSpriteTemplate_83DB0E8, ANIM_BATTLER_ATTACKER, 2, 0 @@ -4528,9 +4528,9 @@ Move_DRAGON_DANCE: @ 81CD7F8 createsprite gBattleAnimSpriteTemplate_83DB0E8, ANIM_BATTLER_ATTACKER, 2, 170 createsprite gBattleAnimSpriteTemplate_83DB0E8, ANIM_BATTLER_ATTACKER, 2, 213 delay 30 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER delay 1 @@ -4546,7 +4546,7 @@ Move_SHOCK_WAVE: @ 81CD867 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, rgb(0, 0, 0) waitforvisualfinish createvisualtask sub_80D6B3C, 2, 0, 20, 0, 2 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 12 createsprite gBattleAnimSpriteTemplate_83D9B28, ANIM_BATTLER_ATTACKER, 2 delay 30 @@ -4554,7 +4554,7 @@ Move_SHOCK_WAVE: @ 81CD867 delay 12 waitforvisualfinish createvisualtask sub_80D759C, 5 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 6, 18, 1 createvisualtask sub_80E2A38, 5, 1, 3, 16, 0, 32767 @@ -4567,7 +4567,7 @@ Move_SHOCK_WAVE: @ 81CD867 end Move_HARDEN: @ 81CD909 - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish end @@ -4579,27 +4579,27 @@ Move_BELLY_DRUM: @ 81CD91E waitforvisualfinish call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 15 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 1, 1, 1, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 15 call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 0, 3, 3, 128 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 128 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 0, 1, 1, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 1, 0, 3, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80CEAD8, 2 waitforvisualfinish @@ -4618,11 +4618,11 @@ Move_MIND_READER: @ 81CDA06 loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg 4 - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_84021DC, ANIM_BATTLER_ATTACKER, 5, 0, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_84021F4, ANIM_BATTLER_ATTACKER, 5 delay 40 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET createvisualtask sub_80E1F8C, 2, 1, 1, 2, 0, 10, 0 call _81CDA4D waitforvisualfinish @@ -4661,7 +4661,7 @@ Move_ICE_PUNCH: @ 81CDB3E createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 7, rgb(0, 0, 0) createvisualtask sub_80E2A38, 10, 4, 2, 0, 9, 32588 delay 20 - playsewithpan SE_W081, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET createsprite gSmallIcePunchCrystalSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0 createsprite gSmallIcePunchCrystalSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 64 createsprite gSmallIcePunchCrystalSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 128 @@ -4674,7 +4674,7 @@ Move_ICE_PUNCH: @ 81CDB3E delay 17 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, -10, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -10, 1, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 3, 1 waitforvisualfinish @@ -4690,7 +4690,7 @@ Move_ICE_PUNCH: @ 81CDB3E end Move_REST: @ 81CDC29 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z createsprite gBattleAnimSpriteTemplate_83D6D94, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 @@ -4707,7 +4707,7 @@ Move_CONFUSION: @ 81CDC69 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 waitforvisualfinish - playsewithpan SE_W048, SOUND_PAN_TARGET + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -4724,7 +4724,7 @@ Move_PSYCHIC: @ 81CDCCA createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 767 waitforvisualfinish - loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3 + loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 10, 3 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -4743,10 +4743,10 @@ _81CDD32: end _81CDD3B: monbg ANIM_BATTLER_ATK_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish @@ -4756,11 +4756,11 @@ _81CDD3B: Unknown_81CDD7A: @ 81CDD7A monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_TARGET - waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET + waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -4779,7 +4779,7 @@ Move_THUNDER: @ 81CDDCE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, rgb(0, 0, 0) delay 16 createvisualtask sub_80E2324, 2, 257, 257, 257 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 16, -36 delay 1 @@ -4788,12 +4788,12 @@ Move_THUNDER: @ 81CDDCE createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 16, 12 delay 20 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 6, -16, -32 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 6, -16, -16 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 6, -16, 16 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 5 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 @@ -4808,7 +4808,7 @@ Move_THUNDER: @ 81CDDCE createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 0, -32 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 0, -16 delay 1 @@ -4836,7 +4836,7 @@ Move_THUNDER_PUNCH: @ 81CDF28 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 delay 1 @@ -4848,7 +4848,7 @@ Move_THUNDER_PUNCH: @ 81CDF28 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_ATTACKER, 2, 0, 16 delay 1 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET createvisualtask sub_80E2324, 2, 257, 257, 257 delay 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 15, 1 @@ -4864,7 +4864,7 @@ Move_THUNDER_PUNCH: @ 81CDF28 Move_SACRED_FIRE: @ 81CDFF1 loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME - loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 + loopsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER, 7, 5 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 66, -20, -10, 50, 5, -1, -1 @@ -4885,13 +4885,13 @@ Move_SACRED_FIRE: @ 81CDFF1 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 waitforvisualfinish - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, ANIM_BATTLER_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, ANIM_BATTLER_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, ANIM_BATTLER_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask sub_80E2324, 2, 257, 257, 257 @@ -4899,7 +4899,7 @@ Move_SACRED_FIRE: @ 81CDFF1 waitforvisualfinish createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 0, 1 @@ -4922,7 +4922,7 @@ Move_SCRATCH: @ 81CE1D8 loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402180, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -4935,7 +4935,7 @@ Move_DRAGON_BREATH: @ 81CE20A loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 + loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 7, 7 createsprite gBattleAnimSpriteTemplate_83DB044, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createsprite gBattleAnimSpriteTemplate_83DB044, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 @@ -5014,7 +5014,7 @@ Move_SNORE: @ 81CE3EA blendoff end _81CE403: - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_BATTLER_ATTACKER, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, 6, 1, 14, 0, 0 @@ -5027,7 +5027,7 @@ Move_LIGHT_SCREEN: @ 81CE47A loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6A8, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10166 delay 10 call _81CE4A1 @@ -5055,7 +5055,7 @@ Move_MIRROR_COAT: @ 81CE506 setalpha 0, 16 createsprite gBattleAnimSpriteTemplate_83DA6D8, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10168 delay 10 - playsewithpan SE_W115, SOUND_PAN_ATTACKER + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER call _81CE4A1 waitforvisualfinish delay 1 @@ -5066,7 +5066,7 @@ Move_REFLECT: @ 81CE52C loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6C0, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10167 delay 20 createsprite gBattleAnimSpriteTemplate_83DA73C, ANIM_BATTLER_ATTACKER, 2, 30, 0, 0, 1 @@ -5082,7 +5082,7 @@ Move_REFLECT: @ 81CE52C Move_BARRIER: @ 81CE57F loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6F0, ANIM_BATTLER_ATTACKER, 3, 40, 0, 10169 waitforvisualfinish delay 1 @@ -5096,28 +5096,28 @@ Move_BUBBLE: @ 81CE59C setalpha 12, 8 delay 1 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 waitforvisualfinish call WaterBubbleEffect2 waitforvisualfinish @@ -5130,7 +5130,7 @@ Move_SMOG: @ 81CE672 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 setalpha 12, 8 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 + loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 17, 10 call _81CE6D7 call _81CE6D7 call _81CE6D7 @@ -5139,7 +5139,7 @@ Move_SMOG: @ 81CE672 call _81CE6D7 call _81CE6D7 delay 120 - loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 + loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 18, 2 createvisualtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 26650 delay 10 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 15, 1 @@ -5158,7 +5158,7 @@ Move_FAINT_ATTACK: @ 81CE6ED fadetobg BG_DARK waitbgfadein delay 0 - playsewithpan SE_W185, SOUND_PAN_ATTACKER + playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 3 createvisualtask sub_80DFC24, 2, 1 waitforvisualfinish @@ -5169,7 +5169,7 @@ Move_FAINT_ATTACK: @ 81CE6ED monbg ANIM_BATTLER_TARGET setalpha 12, 8 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 9, 1 waitforvisualfinish @@ -5193,7 +5193,7 @@ Move_SAND_ATTACK: @ 81CE774 monbg ANIM_BATTLER_ATK_PARTNER monbgprio_28 0 setalpha 12, 8 - playsewithpan SE_W028, SOUND_PAN_ATTACKER + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 @@ -5218,7 +5218,7 @@ Move_SAND_ATTACK_CreateDirtSpray: Move_MUD_SLAP: @ 81CE81C loadspritegfx ANIM_TAG_MUD_SAND - playsewithpan SE_W028, SOUND_PAN_ATTACKER + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 @@ -5242,14 +5242,14 @@ Move_MUD_SLAP_CreateMudSpray: Move_DRAGON_RAGE: @ 81CE8BA loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 15, 0, 0, 4 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB0D0, ANIM_BATTLER_TARGET, 2, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3 + loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 25, 1 createsprite gBattleAnimSpriteTemplate_83DB078, ANIM_BATTLER_TARGET, 66, 1, 5, 0 delay 1 @@ -5273,7 +5273,7 @@ Move_DRAGON_RAGE: @ 81CE8BA Move_RAIN_DANCE: @ 81CE997 loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 waitforvisualfinish createvisualtask CreateAnimRaindrops, 2, 0, 3, 120 @@ -5290,7 +5290,7 @@ Move_BITE: @ 81CE9E2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, 0, -32, 0, 0, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 @@ -5309,14 +5309,14 @@ Move_CRUNCH: @ 81CEA40 fadetobg BG_DARK waitbgfadein setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, -32, -32, 1, 819, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, 32, 32, 5, -819, -819, 10 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, 32, -32, 7, -819, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 @@ -5335,7 +5335,7 @@ Move_CLAMP: @ 81CEAF0 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1E8, ANIM_BATTLER_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB1E8, ANIM_BATTLER_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -5392,7 +5392,7 @@ _81CEC4E: return Move_WITHDRAW: @ 81CEC84 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createvisualtask sub_80CF4D8, 5 waitforvisualfinish end @@ -5401,7 +5401,7 @@ Move_AURORA_BEAM: @ 81CEC91 loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORABEAM waitbgfadein - playsewithpan SE_W062, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER setarg ARG_RET_ID, 0 createvisualtask AnimTask_RotateMonPalette1, 10, 130 call _81CED18 @@ -5443,7 +5443,7 @@ _81CED73: monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 createvisualtask sub_80E1F8C, 2, 2, 1, 4, 0, 11, 12287 - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call _81CED9D waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -5481,7 +5481,7 @@ _81CED9D: return _81CEE70: call Unknown_81D6233 - panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_80CA928, 5 createsprite gBattleAnimSpriteTemplate_83D6304, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 0 delay 4 @@ -5533,10 +5533,10 @@ _81CEFD0: createvisualtask sub_80E3A58, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_BLIZZARD, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CF00A call _81CF00A - playsewithpan SE_W059B, SOUND_PAN_TARGET + playsewithpan SE_M_BLIZZARD2, SOUND_PAN_TARGET waitforvisualfinish call Effect_HeavyIceDamage waitforvisualfinish @@ -5579,10 +5579,10 @@ Move_POWDER_SNOW: @ 81CF146 monbg ANIM_BATTLER_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 1, 0, 3, rgb(0, 0, 0) waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CF190 call _81CF190 - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET waitforvisualfinish waitsound call Effect_HeavyIceDamage @@ -5616,7 +5616,7 @@ Move_HYDRO_PUMP: @ 81CF240 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 delay 6 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_80D3630, 5, 100 call _81CF2DF call _81CF2DF @@ -5661,7 +5661,7 @@ Move_SIGNAL_BEAM: @ 81CF33F loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1 delay 6 - panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 + panse_1B SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 createvisualtask sub_80D3630, 5, 100 call _81CF406 call _81CF406 @@ -5705,7 +5705,7 @@ Move_ABSORB: @ 81CF427 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5722,28 +5722,28 @@ Move_ABSORB: @ 81CF427 blendoff end _81CF496: - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5757,7 +5757,7 @@ Move_MEGA_DRAIN: @ 81CF53F setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 8, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5774,35 +5774,35 @@ Move_MEGA_DRAIN: @ 81CF53F blendoff end _81CF5AE: - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 @@ -5817,7 +5817,7 @@ Move_GIGA_DRAIN: @ 81CF6CF setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 12, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5834,42 +5834,42 @@ Move_GIGA_DRAIN: @ 81CF6CF blendoff end _81CF73E: - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -40, 35 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 28, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 36, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 @@ -5889,7 +5889,7 @@ Move_LEECH_LIFE: @ 81CF8D7 createsprite gBattleAnimSpriteTemplate_83DAB10, ANIM_BATTLER_ATTACKER, 2, -20, 15, 12 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 waitforvisualfinish @@ -5910,7 +5910,7 @@ Move_SYNTHESIS: @ 81CF959 loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 16, 19451 - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish call Unknown_81D5EF5 @@ -5929,22 +5929,22 @@ Move_TOXIC: @ 81CF983 end _81CF99D: createsprite gBattleAnimSpriteTemplate_83DA244, ANIM_BATTLER_TARGET, 2, -24, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, ANIM_BATTLER_TARGET, 2, 8, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, ANIM_BATTLER_TARGET, 2, -8, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, ANIM_BATTLER_TARGET, 2, 24, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 return Move_SLUDGE: @ 81CF9F2 loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA2B8, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1 @@ -5971,19 +5971,19 @@ Move_SLUDGE_BOMB: @ 81CFA34 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -27, 44, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 39, -28, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -42, -42, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 0, 40, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -8, -44, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -46, -28, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 46, 9, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 42, 0, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -43, -12, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 16, -46, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -16, 44, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 0 waitsound waitforvisualfinish @@ -5991,7 +5991,7 @@ Move_SLUDGE_BOMB: @ 81CFA34 waitforvisualfinish end _81CFB44: - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA2B8, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 0 delay 3 return @@ -6000,31 +6000,31 @@ Move_ACID: @ 81CFB5A loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_BATTLER_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_83DA2D0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83DA2D0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83DA2D0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 15 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, 3, 2, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 20, 2, 2, 0, 12, 31774 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, 0, -22, 0, 15, 55 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, -26, -24, 0, 15, 55 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, 15, -27, 0, 15, 50 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, -15, -17, 0, 10, 45 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, 27, -22, 0, 15, 50 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER end @@ -6035,14 +6035,14 @@ Move_BONEMERANG: @ 81CFC54 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_ATTACKER + playsewithpan SE_M_BONEMERANG, SOUND_PAN_ATTACKER createsprite gBonemerangSpriteTemplate, ANIM_BATTLER_ATTACKER, 2 delay 20 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 5, 1 delay 17 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -6055,13 +6055,13 @@ Move_BONE_CLUB: @ 81CFCA8 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_TARGET + playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET createsprite gBoneHitSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 7, 5, 1, 0, 10, 0, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6072,12 +6072,12 @@ Move_BONE_RUSH: @ 81CFD0A loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_TARGET + playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET createsprite gBoneHitSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 5, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6086,15 +6086,15 @@ Move_BONE_RUSH: @ 81CFD0A Move_SPIKES: @ 81CFD55 loadspritegfx ANIM_TAG_SPIKES monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 24, 30 delay 10 - playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, ANIM_BATTLER_TARGET, 2, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, ANIM_BATTLER_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -6104,7 +6104,7 @@ Move_MEGAHORN: @ 81CFDAC loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER jumpifcontest _81CFE83 fadetobg BG_DRILL waitbgfadeout @@ -6119,7 +6119,7 @@ _81CFDCF: delay 3 createsprite gBattleAnimSpriteTemplate_83DAABC, ANIM_BATTLER_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish @@ -6150,13 +6150,13 @@ Move_GUST: @ 81CFE9A monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W016, SOUND_PAN_TARGET + playsewithpan SE_M_GUST, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA380, ANIM_BATTLER_ATTACKER, 2, 0, -16 createvisualtask sub_80DA09C, 5, 1, 70 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 7, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6168,7 +6168,7 @@ Move_WING_ATTACK: @ 81CFEEB monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BATTLER_ATTACKER, 12, 4, 1, 4 createvisualtask sub_80DA09C, 5, 1, 70 createsprite gBattleAnimSpriteTemplate_83DA3B4, ANIM_BATTLER_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -6178,7 +6178,7 @@ Move_WING_ATTACK: @ 81CFEEB delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -16, 0, 1, 1 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 + loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -6188,7 +6188,7 @@ Move_WING_ATTACK: @ 81CFEEB Move_PECK: @ 81CFF88 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createvisualtask sub_80A8EFC, 2, 3, -768, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -12, 0, 1, 3 waitforvisualfinish @@ -6209,7 +6209,7 @@ Move_AEROBLAST: @ 81CFFAF call _81D000B waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6217,19 +6217,19 @@ Move_AEROBLAST: @ 81CFFAF call Unknown_81D622B end _81D000B: - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 @@ -6242,18 +6242,18 @@ Move_WATER_GUN: @ 81D00CC monbgprio_28 1 setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D9318, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 8, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83D9330, ANIM_BATTLER_ATTACKER, 2, 0, -15, 0, 15, 55 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D9330, ANIM_BATTLER_ATTACKER, 2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D9330, ANIM_BATTLER_ATTACKER, 2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6265,7 +6265,7 @@ Move_CRABHAMMER: @ 81D0159 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB4D8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 32429, 10, 0, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -24, 0, 0, 4 @@ -6274,7 +6274,7 @@ Move_CRABHAMMER: @ 81D0159 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3 + loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 4, 8, 1 createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 10, 10, 20, 1 delay 4 @@ -6299,7 +6299,7 @@ Move_CRABHAMMER: @ 81D0159 Move_SURF: @ 81D0253 createvisualtask AnimTask_CreateSurfWave, 2, 0 delay 24 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish end @@ -6311,7 +6311,7 @@ Move_FLAMETHROWER: @ 81D0267 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask sub_80D3630, 5, 100 - panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81D02E1 call _81D02E1 call _81D02E1 @@ -6337,7 +6337,7 @@ _81D02E1: Move_SANDSTORM: @ 81D0304 loadspritegfx ANIM_TAG_FLYING_DIRT - playsewithpan SE_W201, 0 + playsewithpan SE_M_SANDSTORM, 0 createvisualtask do_boulder_dust, 5, 0 delay 16 createsprite gFlyingDirtSpriteTemplate, ANIM_BATTLER_ATTACKER, 40, 10, 2304, 96, 0 @@ -6362,7 +6362,7 @@ Move_WHIRLPOOL: @ 81D038C setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, rgb(0, 13, 23) - playsewithpan SE_W250, SOUND_PAN_TARGET + playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 50, 1 call _81D03E4 call _81D03E4 @@ -6395,18 +6395,18 @@ _81D047E: waitforvisualfinish end _81D0480: - playsewithpan SE_W019, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA450, ANIM_BATTLER_ATTACKER, 2, 0, 0, 13, 336 goto _81D047E _81D0498: monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA468, ANIM_BATTLER_ATTACKER, 2, 20 delay 20 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6419,16 +6419,16 @@ Move_BOUNCE: @ 81D04D9 _81D04E8: end _81D04E9: - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA568, ANIM_BATTLER_ATTACKER, 2, 0, 0 goto _81D04E8 _81D04FD: monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA594, ANIM_BATTLER_TARGET, 3 delay 7 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 11, 1 waitforvisualfinish @@ -6442,10 +6442,10 @@ Move_KARATE_CHOP: @ 81D053C monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9F78, ANIM_BATTLER_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -6458,11 +6458,11 @@ Move_CROSS_CHOP: @ 81D058E loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9FD8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9FD8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1 delay 40 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 32767, 10, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB520, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, 1, 7, 0, 9, 1 @@ -6479,11 +6479,11 @@ Move_JUMP_KICK: @ 81D05F7 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 3 createsprite gBattleAnimSpriteTemplate_83D9F90, ANIM_BATTLER_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, SOUND_PAN_TARGET + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6500,10 +6500,10 @@ Move_HI_JUMP_KICK: @ 81D0654 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 3 delay 2 createsprite gBattleAnimSpriteTemplate_83D9F90, ANIM_BATTLER_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, SOUND_PAN_TARGET + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 11, 1 @@ -6522,7 +6522,7 @@ Move_DOUBLE_KICK: @ 81D06EA setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D9FC0, ANIM_BATTLER_ATTACKER, 3, 1, 20, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -6534,7 +6534,7 @@ Move_TRIPLE_KICK: @ 81D071D loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET jumpifmoveturn 0, _81D0742 jumpifmoveturn 1, _81D0778 goto _81D07AE @@ -6567,26 +6567,26 @@ Move_DYNAMIC_PUNCH: @ 81D07E4 delay 1 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 delay 1 waitsound - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, 1, 5, 0, 28, 1 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -6599,23 +6599,23 @@ Move_COUNTER: @ 81D08AC monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -15, 18, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 25, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -4, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 15, 9, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 @@ -6629,13 +6629,13 @@ Move_VITAL_THROW: @ 81D097B loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 4, 1, 2 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish @@ -6657,10 +6657,10 @@ Move_ROCK_SMASH: @ 81D09F6 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_ATTACKER, 2, 0, 0, 20, 24, 14, 2 createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_ATTACKER, 2, 5, 0, -20, 24, 14, 1 createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_ATTACKER, 2, 0, 5, 20, -24, 14, 2 @@ -6679,16 +6679,16 @@ Move_SUBMISSION: @ 81D0AEE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 90 + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 10 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 20 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 30 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 40 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 50 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 70 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 80 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 90 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BATTLER_ATTACKER, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BATTLER_TARGET, 18, 6, 6, 4 call _81D0B5D @@ -6713,7 +6713,7 @@ Move_SUNNY_DAY: @ 81D0B91 setalpha 13, 3 createvisualtask sub_80E2A38, 10, 1921, 1, 0, 6, 32767 waitforvisualfinish - panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 + panse_26 SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 call _81D0BDD call _81D0BDD call _81D0BDD @@ -6733,7 +6733,7 @@ Move_COTTON_SPORE: @ 81D0BE7 loadspritegfx ANIM_TAG_SPORE monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 18, 10 call _81D0C07 call _81D0C07 call _81D0C07 @@ -6754,7 +6754,7 @@ Move_SPORE: @ 81D0C41 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80CACEC, 2 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 16, 11 call _81D0C6C call _81D0C6C call _81D0C6C @@ -6777,7 +6777,7 @@ Move_PETAL_DANCE: @ 81D0CA6 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W080, SOUND_PAN_ATTACKER + playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 6, 6, 3 createsprite gBattleAnimSpriteTemplate_83D6428, ANIM_BATTLER_ATTACKER, 2, 0, -24, 8, 140 createsprite gBattleAnimSpriteTemplate_83D6440, ANIM_BATTLER_ATTACKER, 2, 16, -24, 8, 100 @@ -6799,7 +6799,7 @@ Move_PETAL_DANCE: @ 81D0CA6 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 6, 0, 8, 1 waitforvisualfinish @@ -6817,7 +6817,7 @@ Move_RAZOR_LEAF: @ 81D0DDE monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -3, -2, 10 delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -1, -1, 15 @@ -6838,11 +6838,11 @@ Move_RAZOR_LEAF: @ 81D0DDE delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D64E4, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 createsprite gBattleAnimSpriteTemplate_83D64E4, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish @@ -6863,7 +6863,7 @@ Move_ANCIENT_POWER: @ 81D0EE5 createsprite gAncientPowerRockSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, 32, -28, 60, 1 createsprite gAncientPowerRockSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 32, -28, 30, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 30, 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER delay 10 createsprite gAncientPowerRockSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 15, 32, -48, 25, 5 createsprite gAncientPowerRockSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, 32, -42, 30, 4 @@ -6873,7 +6873,7 @@ Move_ANCIENT_POWER: @ 81D0EE5 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -6886,10 +6886,10 @@ Move_ANCIENT_POWER: @ 81D0EE5 Move_OCTAZOOKA: @ 81D100D loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W025B, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F08, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6F3C, ANIM_BATTLER_TARGET, 2, 8, 8, 1, 0 delay 2 createsprite gBattleAnimSpriteTemplate_83D6F3C, ANIM_BATTLER_TARGET, 2, -8, -8, 1, 0 @@ -6904,7 +6904,7 @@ Move_MIST: @ 81D1073 loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 + loopsewithpan SE_M_MIST, SOUND_PAN_ATTACKER, 20, 15 call _81D10BE call _81D10BE call _81D10BE @@ -6925,7 +6925,7 @@ _81D10BE: Move_HAZE: @ 81D10D4 waitforvisualfinish - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_Haze1, 5 delay 30 createvisualtask sub_80E2A38, 10, 1920, 2, 0, 16, 0 @@ -6944,14 +6944,14 @@ Move_FIRE_PUNCH: @ 81D1107 createsprite gBattleAnimSpriteTemplate_83D9478, ANIM_BATTLER_TARGET, 1, 64 createsprite gBattleAnimSpriteTemplate_83D9478, ANIM_BATTLER_TARGET, 1, 128 createsprite gBattleAnimSpriteTemplate_83D9478, ANIM_BATTLER_TARGET, 1, 196 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 15, 1 call _81D11A2 delay 4 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E2A38, 10, 4, 0, 9, 0, 31 waitforvisualfinish @@ -6973,7 +6973,7 @@ Move_LEER: @ 81D121A monbg ANIM_BATTLER_ATTACKER monbgprio_28 0 setalpha 8, 8 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84022B0, ANIM_BATTLER_ATTACKER, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish @@ -6992,10 +6992,10 @@ Move_DREAM_EATER: @ 81D1271 loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BATTLER_DEF_PARTNER monbgprio_2A ANIM_BATTLER_TARGET - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W107, SOUND_PAN_TARGET + playsewithpan SE_M_MINIMIZE, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -7012,42 +7012,42 @@ Move_DREAM_EATER: @ 81D1271 call BackgroundRestore end _81D12DB: - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -40, 35 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 28, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 36, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 @@ -7062,25 +7062,25 @@ Move_POISON_GAS: @ 81D1474 monbgprio_29 setalpha 12, 8 delay 0 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6 + loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 28, 6 createvisualtask sub_80E1F8C, 2, 4, 6, 2, 0, 12, 26650 waitforvisualfinish blendoff @@ -7092,7 +7092,7 @@ Move_BIND: @ 81D1552 createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, 0 goto _81D1568 _81D1568: - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET call _81D1578 call _81D1578 waitforvisualfinish @@ -7108,7 +7108,7 @@ Move_WRAP: @ 81D158C Move_PSYBEAM: @ 81D15A2 loadspritegfx ANIM_TAG_GOLD_RING - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createsoundtask sub_812B058, 200, -64, 63, 3, 4, 0, 15 call _81D1626 @@ -7145,7 +7145,7 @@ Move_HYPNOSIS: @ 81D163C call BackgroundRestore end _81D166F: - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA784, ANIM_BATTLER_TARGET, 2, 0, 8, 0, 8, 27, 0 createsprite gBattleAnimSpriteTemplate_83DA784, ANIM_BATTLER_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 @@ -7153,7 +7153,7 @@ _81D166F: Move_PSYWAVE: @ 81D169C loadspritegfx ANIM_TAG_BLUE_RING - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createvisualtask sub_80D3630, 5, 100 createsoundtask sub_812B058, 203, -64, 63, 2, 9, 0, 10 @@ -7178,7 +7178,7 @@ _81D16FF: Move_ZAP_CANNON: @ 81D1722 loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 - playsewithpan SE_W086, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9874, ANIM_BATTLER_TARGET, 3, 10, 0, 0, 0, 30, 0 createsprite gBattleAnimSpriteTemplate_83D98A0, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 createsprite gBattleAnimSpriteTemplate_83D98A0, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 @@ -7191,7 +7191,7 @@ Move_ZAP_CANNON: @ 81D1722 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 delay 15 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish end @@ -7199,13 +7199,13 @@ Move_ZAP_CANNON: @ 81D1722 Move_STEEL_WING: @ 81D1807 loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BATTLER_ATTACKER, 12, 4, 1, 4 createvisualtask sub_80DA09C, 5, 1, 70 createsprite gBattleAnimSpriteTemplate_83DA3B4, ANIM_BATTLER_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -7215,7 +7215,7 @@ Move_STEEL_WING: @ 81D1807 delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -16, 0, 1, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -7225,7 +7225,7 @@ Move_STEEL_WING: @ 81D1807 Move_IRON_TAIL: @ 81D18B6 loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_BATTLER_TARGET @@ -7234,7 +7234,7 @@ Move_IRON_TAIL: @ 81D18B6 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E0E24, 5, 0, 1 clearmonbg ANIM_BATTLER_TARGET @@ -7245,7 +7245,7 @@ Move_IRON_TAIL: @ 81D18B6 Move_POISON_TAIL: @ 81D1914 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 1, 1, 23768 waitforvisualfinish monbg ANIM_BATTLER_TARGET @@ -7254,7 +7254,7 @@ Move_POISON_TAIL: @ 81D1914 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E0E24, 5, 0, 1 clearmonbg ANIM_BATTLER_TARGET @@ -7265,19 +7265,19 @@ Move_POISON_TAIL: @ 81D1914 Move_METAL_CLAW: @ 81D197A loadspritegfx ANIM_TAG_CLAW_SLASH - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, -10, -10, 0 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, -10, 10, 0 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 delay 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, 10, -10, 1 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, 10, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 @@ -7287,11 +7287,11 @@ Move_METAL_CLAW: @ 81D197A Move_NIGHT_SHADE: @ 81D1A0D monbg ANIM_BATTLER_ATTACKER monbgprio_28 0 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein delay 10 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask sub_80DDDF0, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 12, 1 @@ -7306,24 +7306,24 @@ Move_NIGHT_SHADE: @ 81D1A0D Move_EGG_BOMB: @ 81D1A55 loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7594, ANIM_BATTLER_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 16, 1 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, 6, 5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, -16, -15, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, 16, -5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, -12, 18, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, 0, 5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 waitforvisualfinish end @@ -7336,7 +7336,7 @@ Move_SHADOW_BALL: @ 81D1AEF createsoundtask sub_812B058, 168, -64, 63, 5, 5, 0, 5 createsprite gShadowBallSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7346,7 +7346,7 @@ Move_SHADOW_BALL: @ 81D1AEF Move_LICK: @ 81D1B32 loadspritegfx ANIM_TAG_LICK delay 15 - playsewithpan SE_W122, SOUND_PAN_TARGET + playsewithpan SE_M_LICK, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAEDC, ANIM_BATTLER_TARGET, 2, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 16, 1 waitforvisualfinish @@ -7354,7 +7354,7 @@ Move_LICK: @ 81D1B32 Move_FOCUS_ENERGY: @ 81D1B59 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 32767 @@ -7369,7 +7369,7 @@ Move_BIDE: @ 81D1B99 choosetwoturnanim _81D1BA3, _81D1BCF end _81D1BA3: - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7378,7 +7378,7 @@ _81D1BCF: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_80E2A38, 10, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7386,13 +7386,13 @@ _81D1BCF: waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 12, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 16, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 18, -8, 1, 1 delay 5 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, -18, 8, 1, 1 delay 5 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 @@ -7411,7 +7411,7 @@ Move_STRING_SHOT: @ 81D1C98 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 0, 9, rgb(0, 0, 0) waitforvisualfinish - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6 call _81D1D56 call _81D1D56 call _81D1D56 @@ -7431,7 +7431,7 @@ Move_STRING_SHOT: @ 81D1C98 call _81D1D56 call _81D1D56 waitforvisualfinish - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAB40, ANIM_BATTLER_TARGET, 2, 0, 10 delay 4 createsprite gBattleAnimSpriteTemplate_83DAB40, ANIM_BATTLER_TARGET, 2, 0, -2 @@ -7456,7 +7456,7 @@ Move_SPIDER_WEB: @ 81D1D6A createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 0, 9, rgb(0, 0, 0) waitforvisualfinish monbgprio_28 1 - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6 call _81D1DF7 call _81D1DF7 call _81D1DF7 @@ -7472,7 +7472,7 @@ Move_SPIDER_WEB: @ 81D1D6A call _81D1DF7 call _81D1DF7 waitforvisualfinish - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAB74, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -7491,28 +7491,28 @@ _81D1E14: end _81D1E16: loadspritegfx ANIM_TAG_GUST - playsewithpan SE_W016, SOUND_PAN_ATTACKER + playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D765C, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gBattleAnimSpriteTemplate_83D765C, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 createsprite gBattleAnimSpriteTemplate_83D765C, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish - playsewithpan SE_W016B, SOUND_PAN_ATTACKER + playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER goto _81D1E14 _81D1E66: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish @@ -7525,11 +7525,11 @@ Move_DISABLE: @ 81D1EF1 monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 8, 8 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930F4, ANIM_BATTLER_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask sub_80D03C4, 5 - loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 + loopsewithpan SE_M_BIND, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 clearmonbg ANIM_BATTLER_TARGET @@ -7541,7 +7541,7 @@ Move_RECOVER: @ 81D1F1F loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 + loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 13, 3 createvisualtask sub_80E1F8C, 2, 2, 0, 6, 0, 11, 12287 call _81D1F5F call _81D1F5F @@ -7574,14 +7574,14 @@ Move_MIMIC: @ 81D1FC9 loadspritegfx ANIM_TAG_ORBS monbg_22 ANIM_BATTLER_DEF_PARTNER setalpha 11, 5 - panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 + panse_1B SE_M_MINIMIZE, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 createvisualtask sub_80CB340, 5, 128, 24 delay 15 createsprite gBattleAnimSpriteTemplate_83D65E8, ANIM_BATTLER_TARGET, 2, -12, 24 delay 10 setarg ARG_RET_ID, -1 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 11, 32767 waitforvisualfinish clearmonbg_23 ANIM_BATTLER_DEF_PARTNER @@ -7590,7 +7590,7 @@ Move_MIMIC: @ 81D1FC9 Move_CONSTRICT: @ 81D2013 loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 4 createsprite gBattleAnimSpriteTemplate_83D65A0, ANIM_BATTLER_TARGET, 4, 0, 16, 0, 2 delay 7 createsprite gBattleAnimSpriteTemplate_83D65A0, ANIM_BATTLER_TARGET, 3, 0, 0, 0, 2 @@ -7600,7 +7600,7 @@ Move_CONSTRICT: @ 81D2013 delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 delay 20 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET setarg ARG_RET_ID, -1 waitforvisualfinish end @@ -7625,7 +7625,7 @@ _81D2084: clearmonbg ANIM_BATTLER_ATK_PARTNER delay 1 monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF38, ANIM_BATTLER_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -7635,7 +7635,7 @@ _81D2084: end _81D20EB: createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 4, 0, 10, 0 - playsewithpan SE_W020, SOUND_PAN_ATTACKER + playsewithpan SE_M_BIND, SOUND_PAN_ATTACKER return _81D2101: createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, 0 @@ -7645,7 +7645,7 @@ _81D2101: waitforvisualfinish end _81D211C: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask sub_80E2F2C, 5 createvisualtask sub_80E1F8C, 5, 2, 4, 2, 0, 10, 31 return @@ -7655,13 +7655,13 @@ Move_SOFT_BOILED: @ 81D213B loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BATTLER_ATK_PARTNER - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 2, 6, 1 createsprite gBattleAnimSpriteTemplate_83D78BC, ANIM_BATTLER_ATTACKER, 4, 0, 16, 0 createsprite gBattleAnimSpriteTemplate_83D78BC, ANIM_BATTLER_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 - playsewithpan SE_W030, SOUND_PAN_ATTACKER + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 10, 0, rgb(12, 24, 30) createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 3, 31, 16, 0, 1 delay 8 @@ -7703,12 +7703,12 @@ Move_HEAL_BELL: @ 81D21BD waitforvisualfinish createvisualtask sub_80D1B80, 5 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6CA0, ANIM_BATTLER_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gBattleAnimSpriteTemplate_83D6CA0, ANIM_BATTLER_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createvisualtask sub_80E2A7C, 10, 4, 3, 10, 0, 31500 createvisualtask sub_80E2A38, 10, 10, 3, 10, 0, 32767 createsprite gBattleAnimSpriteTemplate_83D7974, ANIM_BATTLER_ATTACKER, 16, 0, 0, 0, 1 @@ -7717,14 +7717,14 @@ _81D2372: createvisualtask sub_80E2A7C, 10, 4, 3, 8, 0, 31500 createvisualtask sub_80E2A38, 10, 10, 3, 2, 10, 32767 createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 40, 0, -24, 0, 1 - playsewithpan SE_W215, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER return Move_FAKE_OUT: @ 81D23A8 - playsewithpan SE_W260, 0 + playsewithpan SE_M_FLATTER, 0 createvisualtask sub_80D1CD0, 5 waitforvisualfinish - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 createvisualtask sub_80D1E38, 3 waitforvisualfinish @@ -7734,17 +7734,17 @@ Move_FAKE_OUT: @ 81D23A8 Move_SCARY_FACE: @ 81D23E3 loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 3, 0, 16, rgb(0, 0, 0) - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitforvisualfinish delay 10 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask sub_80D23B4, 5 delay 13 createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask sub_80D60B4, 3, 20, 1, 0 - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 3, 16, 0, rgb(0, 0, 0) waitforvisualfinish end @@ -7753,14 +7753,14 @@ Move_SWEET_KISS: @ 81D2446 loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gBattleAnimSpriteTemplate_83D7BB8, ANIM_BATTLER_TARGET, 2, 16, -48 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 160, -30 - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, -256, -42 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 128, -14 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 416, -38 @@ -7772,9 +7772,9 @@ Move_LOVELY_KISS: @ 81D24AF loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL createsprite gBattleAnimSpriteTemplate_83D7C00, ANIM_BATTLER_TARGET, 2, 0, -24 - playsewithpan SE_W060B, SOUND_PAN_TARGET + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7BD0, ANIM_BATTLER_TARGET, 3, -256, -42 createsprite gBattleAnimSpriteTemplate_83D7BD0, ANIM_BATTLER_TARGET, 3, 128, -14 createsprite gBattleAnimSpriteTemplate_83D7BD0, ANIM_BATTLER_TARGET, 3, 416, -38 @@ -7785,13 +7785,13 @@ Move_FURY_SWIPES: @ 81D24F6 loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 5 delay 4 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7C48, ANIM_BATTLER_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, 5 delay 4 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7C48, ANIM_BATTLER_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 end @@ -7800,28 +7800,28 @@ Move_INGRAIN: @ 81D255A loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS createsprite gBattleAnimSpriteTemplate_83D6658, ANIM_BATTLER_ATTACKER, 2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, ANIM_BATTLER_ATTACKER, 2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, ANIM_BATTLER_ATTACKER, 2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, ANIM_BATTLER_ATTACKER, 2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 40 createsprite gBattleAnimSpriteTemplate_83D6698, ANIM_BATTLER_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6698, ANIM_BATTLER_ATTACKER, 3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6698, ANIM_BATTLER_ATTACKER, 3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish end @@ -7830,38 +7830,38 @@ Move_PRESENT: @ 81D260B loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_812C960, 2 createsprite gBattleAnimSpriteTemplate_83D671C, ANIM_BATTLER_TARGET, 2, 0, -5, 10, 2, -1 - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE2, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, 0 + playsewithpan SE_M_BUBBLE2, 0 delay 20 - playsewithpan SE_W145B, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET waitforvisualfinish jumpargeq 7, 0, _81D264E jumpargeq 7, 1, _81D26B9 end _81D264E: loadspritegfx ANIM_TAG_EXPLOSION - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, 16, 16, 1, 1 end _81D26B9: loadspritegfx ANIM_TAG_SPARKLE_5 loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W234, SOUND_PAN_TARGET + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6764, ANIM_BATTLER_TARGET, 4, -16, 32, -3, 1 delay 3 createsprite gBattleAnimSpriteTemplate_83D6764, ANIM_BATTLER_TARGET, 4, 16, 32, -3, -1 @@ -7886,7 +7886,7 @@ _81D26B9: Move_BATON_PASS: @ 81D2762 loadspritegfx ANIM_TAG_POKEBALL - playsewithpan SE_W226, SOUND_PAN_ATTACKER + playsewithpan SE_M_BATON_PASS, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 31, 1, 2, 0, 11, 31455 createsprite gBattleAnimSpriteTemplate_84024D0, ANIM_BATTLER_ATTACKER, 2 end @@ -7911,7 +7911,7 @@ Move_PERISH_SONG: @ 81D2784 createsprite gBattleAnimSpriteTemplate_83D7D1C, ANIM_BATTLER_ATTACKER, 4, 15, 0, 240 createsprite gBattleAnimSpriteTemplate_83D7D34, ANIM_BATTLER_ATTACKER, 4, 15, 0, 0 delay 20 - panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 16, rgb(0, 0, 0) createvisualtask sub_80E0E24, 5, 4, 0 @@ -7932,21 +7932,21 @@ Move_SLEEP_TALK: @ 81D28ED createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 delay 6 @@ -7956,7 +7956,7 @@ Move_SLEEP_TALK: @ 81D28ED Move_HYPER_FANG: @ 81D29A8 loadspritegfx ANIM_TAG_FANG_ATTACK - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 1 delay 2 createvisualtask sub_80E4200, 2 @@ -7969,7 +7969,7 @@ _81D29D6: createsprite gBattleAnimSpriteTemplate_840233C, ANIM_BATTLER_TARGET, 2 waitbgfadein createvisualtask AnimTask_ShakeMon, 3, 1, 0, 10, 10, 1 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET delay 20 restorebg waitbgfadein @@ -7988,9 +7988,9 @@ _81D2A08: Move_TRI_ATTACK: @ 81D2A0F loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gBattleAnimSpriteTemplate_8402458, ANIM_BATTLER_TARGET, 2, 16, 0 - playsewithpan SE_W161, SOUND_PAN_ATTACKER + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W161, SOUND_PAN_ATTACKER + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER delay 20 createsoundtask sub_812B058, 220, -64, 63, 5, 6, 0, 7 waitforvisualfinish @@ -7998,7 +7998,7 @@ Move_TRI_ATTACK: @ 81D2A0F delay 16 loadspritegfx ANIM_TAG_FIRE createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, -1 @@ -8017,7 +8017,7 @@ Move_TRI_ATTACK: @ 81D2A0F waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_80E2324, 2, 257, 257, 257 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 0, -48 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 0, -16 @@ -8039,8 +8039,8 @@ Move_WILL_O_WISP: @ 81D2B83 loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_BATTLER_DEF_PARTNER monbgprio_2A ANIM_BATTLER_TARGET - playsewithpan SE_W052, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 + playsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 10 createvisualtask sub_812B374, 2, -64, -64, 1, 0 createsprite gBattleAnimSpriteTemplate_83D974C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 delay 3 @@ -8053,7 +8053,7 @@ Move_WILL_O_WISP: @ 81D2B83 createvisualtask sub_812B374, 2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 13, 1 createsprite gBattleAnimSpriteTemplate_83D977C, ANIM_BATTLER_ATTACKER, 2, 0 createsprite gBattleAnimSpriteTemplate_83D977C, ANIM_BATTLER_ATTACKER, 2, 42 @@ -8091,23 +8091,23 @@ Move_TRICK: @ 81D2CE8 createsprite gBattleAnimSpriteTemplate_83D67F4, ANIM_BATTLER_ATTACKER, 2, -40, 80 createsprite gBattleAnimSpriteTemplate_83D67F4, ANIM_BATTLER_ATTACKER, 2, -40, 208 delay 16 - playsewithpan SE_W166, 0 + playsewithpan SE_M_SKETCH, 0 createvisualtask sub_80D1E38, 3 createvisualtask sub_80D1EC8, 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 @@ -8118,11 +8118,11 @@ Move_WISH: @ 81D2D66 loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 10, rgb(0, 0, 0) waitforvisualfinish - panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 + panse_27 SE_M_REFLECT, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 createsprite gBattleAnimSpriteTemplate_84024E8, ANIM_BATTLER_ATTACKER, 40 waitforvisualfinish delay 60 - loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 + loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 16, 3 call Unknown_81D5ECA waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 10, 0, rgb(0, 0, 0) @@ -8131,7 +8131,7 @@ Move_WISH: @ 81D2D66 Move_STOCKPILE: @ 81D2DAE loadspritegfx ANIM_TAG_GRAY_ORB - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 8, 1, 0, 12, 32767 createvisualtask sub_812D674, 5 call _81D2DEC @@ -8161,11 +8161,11 @@ _81D2DEC: Move_SPIT_UP: @ 81D2E65 loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_812D6CC, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 8, 2 delay 45 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D7B60, ANIM_BATTLER_ATTACKER, 2, 0, 12 createsprite gBattleAnimSpriteTemplate_83D7B60, ANIM_BATTLER_ATTACKER, 2, 32, 12 @@ -8181,10 +8181,10 @@ Move_SPIT_UP: @ 81D2E65 _81D2EF5: delay 5 createvisualtask sub_80A9058, 2, 0, 1, 8, 1, 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -12, 10, 1, 1 delay 5 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 12, -10, 1, 1 waitforvisualfinish end @@ -8208,11 +8208,11 @@ _81D2F5B: Move_SWALLOW: @ 81D2FA8 loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_812D790, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 8, 2 delay 38 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 2, 0, 12, 1 call _81D2FF9 jumpifmoveturn 2, _81D303B @@ -8243,8 +8243,8 @@ _81D3045: Move_TRANSFORM: @ 81D3054 monbg ANIM_BATTLER_ATTACKER - playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 createvisualtask sub_812D7E8, 2, 0 waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER @@ -8284,7 +8284,7 @@ _81D30F2: Move_SWEET_SCENT: @ 81D3100 loadspritegfx ANIM_TAG_PINK_PETAL - playsewithpan SE_W230, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWEET_SCENT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84026A4, ANIM_BATTLER_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 @@ -8325,7 +8325,7 @@ Move_HYPER_BEAM: @ 81D31EA createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 0, 16, rgb(0, 0, 0) waitforvisualfinish delay 10 - playsewithpan SE_W063, SOUND_PAN_ATTACKER + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 @@ -8420,8 +8420,8 @@ Move_ROLE_PLAY: @ 81D3428 createvisualtask sub_80E2A38, 10, 4, 2, 0, 16, 32767 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 10, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W161, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_DETECT, SOUND_PAN_ATTACKER, 30 createvisualtask AnimTask_RolePlaySilhouette, 2 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -8433,13 +8433,13 @@ Move_ROLE_PLAY: @ 81D3428 Move_REFRESH: @ 81D3485 loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER createvisualtask sub_81300A4, 2, 0 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 10, 0, rgb(12, 24, 30) createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0 end @@ -8450,11 +8450,11 @@ Move_BLAZE_KICK: @ 81D34C8 loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA024, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 30 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 30 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 14, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767 @@ -8487,7 +8487,7 @@ Move_SAND_TOMB: @ 81D35D2 loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 - playsewithpan SE_W328, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET call _81D361F call _81D361F call _81D361F @@ -8513,14 +8513,14 @@ _81D361F: Move_SHEER_COLD: @ 81D36AA fadetobg BG_ICE waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createvisualtask sub_807B920, 2 - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -8537,11 +8537,11 @@ Move_ARM_THRUST: @ 81D36CF delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 3 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA144, ANIM_BATTLER_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask sub_80A8E04, 5, 8, 5, 0, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET choosetwoturnanim _81D373C, _81D3750 _81D3728: createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 @@ -8556,7 +8556,7 @@ _81D3750: goto _81D3728 Move_MUDDY_WATER: @ 81D3764 - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask AnimTask_CreateSurfWave, 2, 1 waitforvisualfinish end @@ -8589,7 +8589,7 @@ Move_BULLET_SEED: @ 81D3776 Move_DRAGON_CLAW: @ 81D380C loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH - playsewithpan SE_W221B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 2, 4, 0, 8, 639 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 call _81D39E9 @@ -8656,7 +8656,7 @@ Move_MUD_SHOT: @ 81D3A75 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask sub_80D3630, 5, 100 - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 + panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 call _81D3AEF call _81D3AEF call _81D3AEF @@ -8684,7 +8684,7 @@ Move_METEOR_MASH: @ 81D3B12 loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 0 + panse_1B SE_M_BARRIER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 0 fadetobg BG_COSMIC waitbgfadein waitforvisualfinish @@ -8695,7 +8695,7 @@ Move_METEOR_MASH: @ 81D3B12 createsprite gBattleAnimSpriteTemplate_83DA024, ANIM_BATTLER_TARGET, 3, 0, 0, 0, 30 createsprite gBattleAnimSpriteTemplate_8402A3C, ANIM_BATTLER_TARGET, 3, -80, -64, 40, 32, 30 delay 20 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 5, 0, 20, 1 waitforvisualfinish @@ -8709,7 +8709,7 @@ Move_REVENGE: @ 81D3B99 loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA198, ANIM_BATTLER_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask sub_80E1F8C, 2, 2, 0, 4, 2, 8, 31 @@ -8718,17 +8718,17 @@ Move_REVENGE: @ 81D3B99 loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA1E0, ANIM_BATTLER_TARGET, 2, 10, -10 waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SWIPE loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB550, ANIM_BATTLER_TARGET, 3, -10, -8, 1, 1, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DB550, ANIM_BATTLER_TARGET, 3, 10, 8, 1, 1, 8 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -8737,7 +8737,7 @@ Move_REVENGE: @ 81D3B99 Move_POISON_FANG: @ 81D3C30 loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_840233C, ANIM_BATTLER_TARGET, 2 delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 @@ -8748,7 +8748,7 @@ Move_POISON_FANG: @ 81D3C30 end Move_SUBSTITUTE: @ 81D3C6F - playsewithpan SE_W213, SOUND_PAN_ATTACKER + playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER createvisualtask sub_81312E4, 2 end @@ -8761,50 +8761,50 @@ Move_FRENZY_PLANT: @ 81D3C7B createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 2, 0, 5, rgb(0, 0, 0) waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 20, -8, -2, 0, 1, 95 - playsewithpan SE_W010, 213 + playsewithpan SE_M_SCRATCH, 213 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 30, 8, -4, 0, 0, 90 - playsewithpan SE_W010, 234 + playsewithpan SE_M_SCRATCH, 234 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 40, -8, 4, 0, 1, 85 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 50, 8, 0, 0, 0, 85 - playsewithpan SE_W010, 21 + playsewithpan SE_M_SCRATCH, 21 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 60, -8, -2, 0, 1, 85 - playsewithpan SE_W010, 42 + playsewithpan SE_M_SCRATCH, 42 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 75, 8, 0, 0, 0, 85 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -10, 1, 3 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 3, 1, 8, 0, 20, 1 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 8, 1, 3 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -3, 1, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -3, 1, 1, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, 1, 1, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 10, 1, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 2, 5, 0, rgb(0, 0, 0) waitforvisualfinish @@ -8827,7 +8827,7 @@ Move_METAL_SOUND: @ 81D3E1F waitforvisualfinish end _81D3E52: - panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7564, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -8850,20 +8850,20 @@ _81D3EA4: waitbgfadein monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA214, ANIM_BATTLER_TARGET, 2 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 8, 0, 24, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 2, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -6, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -9020,7 +9020,7 @@ _81D4371: Move_COSMIC_POWER: @ 81D43C5 loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_812B340, 5, 243, 0 - playsewithpan SE_W322, 0 + playsewithpan SE_M_COSMIC_POWER, 0 createvisualtask sub_80E3A08, 2, 0, 0, 15, 0 waitforvisualfinish fadetobg BG_COSMIC @@ -9047,7 +9047,7 @@ Move_BLAST_BURN: @ 81D444A loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W221, SOUND_PAN_ATTACKER + playsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -32, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -20, -10, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 66, 0, -16, 24, 0, 0, 0 @@ -9057,7 +9057,7 @@ Move_BLAST_BURN: @ 81D444A createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, 0, 16, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -20, 10, 24, 0, 0, 0 delay 25 - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -64, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 6, -40, -20, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 70, 0, -32, 24, 0, 0, 0 @@ -9069,7 +9069,7 @@ Move_BLAST_BURN: @ 81D444A createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 25 - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -96, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 6, -60, -30, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 70, 0, -48, 24, 0, 0, 0 @@ -9095,24 +9095,24 @@ Move_ROCK_TOMB: @ 81D468C createsprite gBattleAnimSpriteTemplate_83DADA8, ANIM_BATTLER_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, ANIM_BATTLER_TARGET, 2, -20, 12, 64, 98, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, ANIM_BATTLER_TARGET, 66, 3, 6, 64, 82, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, ANIM_BATTLER_TARGET, 2, -3, 13, 64, 66, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 24 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA8F4, ANIM_BATTLER_TARGET, 5, 1, 50 createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 20, 1 createvisualtask sub_80E26BC, 2, 2, 0, 10, 1 @@ -9121,8 +9121,8 @@ Move_ROCK_TOMB: @ 81D468C Move_SILVER_WIND: @ 81D4773 loadspritegfx ANIM_TAG_SPARKLE_6 - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 - playsewithpan SE_W234, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + playsewithpan SE_M_MORNING_SUN, 0 delay 0 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 @@ -9161,7 +9161,7 @@ _81D47BA: createsprite gBattleAnimSpriteTemplate_83D696C, ANIM_BATTLER_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 createsprite gBattleAnimSpriteTemplate_83D696C, ANIM_BATTLER_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET clearmonbg ANIM_BATTLER_DEF_PARTNER delay 0 restorebg @@ -9177,7 +9177,7 @@ _81D4974: goto _81D47BA Move_SNATCH: @ 81D498B - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -12, 4, 10, 10, 12, 6 end @@ -9187,10 +9187,10 @@ Move_DIVE: @ 81D49A5 choosetwoturnanim _81D49B4, _81D4A09 _81D49B4: loadspritegfx ANIM_TAG_ROUND_SHADOW - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA5D8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA614, ANIM_BATTLER_ATTACKER, 3, 0 call _81D49F2 call _81D49F2 @@ -9207,7 +9207,7 @@ _81D4A09: loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W153, SOUND_PAN_TARGET + playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA614, ANIM_BATTLER_TARGET, 3, 1 call _81D4A48 call _81D4A48 @@ -9231,11 +9231,11 @@ Move_ROCK_BLAST: @ 81D4A5F loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 3 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DADE8, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_TARGET, 2, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_TARGET, 2, 5, 0, -20, 24, 14, 1 @@ -9255,13 +9255,13 @@ Move_OVERHEAT: @ 81D4AFC delay 1 createvisualtask sub_80E4178, 5, 0 delay 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask sub_80E4028, 5, 1, 0 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 1, 0, 13, rgb(28, 0, 0) createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB100, ANIM_BATTLER_ATTACKER, 2, 1, 0, 30, 25, -20 createsprite gBattleAnimSpriteTemplate_83DB100, ANIM_BATTLER_ATTACKER, 2, 1, 32, 30, 25, -20 createsprite gBattleAnimSpriteTemplate_83DB100, ANIM_BATTLER_ATTACKER, 2, 1, 64, 30, 25, -20 @@ -9291,17 +9291,17 @@ Move_OVERHEAT: @ 81D4AFC delay 5 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -5, 3, 1, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 10, 0, 25, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, -5, 1, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 10, 10, 1, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createvisualtask sub_80E4178, 5, 1 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, -1, 0, 13, rgb(18, 18, 18) @@ -9326,12 +9326,12 @@ Move_HYDRO_CANNON: @ 81D4DDE loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D92D0, ANIM_BATTLER_TARGET, 2 delay 10 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 30 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81D4EA8 createvisualtask AnimTask_ShakeMon, 5, 1, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 @@ -9365,11 +9365,11 @@ _81D4EA8: Move_ASTONISH: @ 81D4F10 loadspritegfx ANIM_TAG_SWEAT_BEAD - playsewithpan SE_W227, SOUND_PAN_ATTACKER + playsewithpan SE_M_ENCORE, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 25 createsprite gBattleAnimSpriteTemplate_83DA62C, ANIM_BATTLER_TARGET, 5, 0, 1 - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA62C, ANIM_BATTLER_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 createvisualtask sub_80D1E38, 3 @@ -9388,7 +9388,7 @@ Move_SEISMIC_TOSS: @ 81D4F58 fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout createvisualtask sub_80DDA8C, 3 - playsewithpan SE_W327, 0 + playsewithpan SE_M_SKY_UPPERCUT, 0 waitbgfadein waitforvisualfinish createvisualtask sub_80DDAF0, 3 @@ -9426,7 +9426,7 @@ _81D4FD4: goto _81D4FA0 _81D4FF3: createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -10, -8, 1, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, -12, 27, 2, 3 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, 8, 28, 3, 4 @@ -9435,7 +9435,7 @@ _81D4FF3: return _81D5054: createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 10, -8, 1, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, -12, 32, 3, 4 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, 8, 31, 2, 2 @@ -9446,7 +9446,7 @@ _81D5054: Move_MAGIC_COAT: @ 81D50B5 loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA708, ANIM_BATTLER_ATTACKER, 3, 40, 0, 10170 waitforvisualfinish delay 1 @@ -9458,7 +9458,7 @@ Move_WATER_PULSE: @ 81D50D2 loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_BATTLER_TARGET monbgprio_28 1 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 7, rgb(0, 25, 28) delay 10 createsprite gBattleAnimSpriteTemplate_83D9408, ANIM_BATTLER_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 @@ -9466,15 +9466,15 @@ Move_WATER_PULSE: @ 81D50D2 createsprite gBattleAnimSpriteTemplate_83D9408, ANIM_BATTLER_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 createsprite gBattleAnimSpriteTemplate_83D9408, ANIM_BATTLER_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 createsprite gBattleAnimSpriteTemplate_83D9408, ANIM_BATTLER_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 8, 18, 1 @@ -9498,13 +9498,13 @@ Move_PSYCHO_BOOST: @ 81D51C7 setalpha 8, 8 delay 10 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 3, 0, 240, 0 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 14, 10 createsprite gBattleAnimSpriteTemplate_83DAA68, ANIM_BATTLER_ATTACKER, 2 delay 110 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, -8, 1, 24, 1 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff @@ -9516,12 +9516,12 @@ Move_KNOCK_OFF: @ 81D523B loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 4 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402AE4, ANIM_BATTLER_TARGET, 2, -16, -16 delay 8 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 delay 3 @@ -9540,7 +9540,7 @@ Move_DOOM_DESIRE: @ 81D52CB createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, rgb(0, 0, 0) waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish delay 20 @@ -9558,26 +9558,26 @@ Move_DOOM_DESIRE_Activate: @ 81D532F delay 10 createvisualtask sub_812E14C, 5 delay 5 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 10 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 10 - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET delay 23 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, rgb(31, 31, 31) @@ -9590,7 +9590,7 @@ Move_SKY_UPPERCUT: @ 81D53ED monbgprio_28 1 fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout - playsewithpan SE_W327, SOUND_PAN_ATTACKER + playsewithpan SE_M_SKY_UPPERCUT, SOUND_PAN_ATTACKER createvisualtask sub_80D9C80, 5, 55 waitbgfadein setalpha 12, 8 @@ -9598,20 +9598,20 @@ Move_SKY_UPPERCUT: @ 81D53ED createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -28, 28, 1, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -15, 8, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -5, -12, 1, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, -32, 1, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 5, -52, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 @@ -9647,7 +9647,7 @@ Move_TWISTER: @ 81D553A loadspritegfx ANIM_TAG_ROCKS monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 - playsewithpan SE_W239, SOUND_PAN_TARGET + playsewithpan SE_M_TWISTER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D64B4, ANIM_BATTLER_TARGET, 2, 120, 70, 5, 70, 30 delay 1 createsprite gBattleAnimSpriteTemplate_83D64B4, ANIM_BATTLER_TARGET, 2, 115, 55, 6, 60, 25 @@ -9670,18 +9670,18 @@ Move_TWISTER: @ 81D553A createsprite gBattleAnimSpriteTemplate_83D64B4, ANIM_BATTLER_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -32, -16, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_DEF_PARTNER, 3, 0, 12, 1 delay 4 createsprite gBattleAnimSpriteTemplate_83DB4F0, ANIM_BATTLER_TARGET, 3, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB4F0, ANIM_BATTLER_TARGET, 3, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 32, 20, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -9694,7 +9694,7 @@ Move_MAGICAL_LEAF: @ 81D5699 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5 createvisualtask sub_80CC5F8, 5 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -3, -2, 10 delay 2 @@ -9716,11 +9716,11 @@ Move_MAGICAL_LEAF: @ 81D5699 delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D64E4, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 createsprite gBattleAnimSpriteTemplate_83D64E4, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, -4, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 10, 4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 @@ -9737,10 +9737,10 @@ Move_ICE_BALL: @ 81D57BA createvisualtask AnimTask_CountIceBallThrows, 5, 0 jumpargeq 0, 4, _81D5831 _81D57D1: - playsewithpan SE_W196, SOUND_PAN_ATTACKER + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER createsprite gIceBallSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 - playsewithpan SE_W280, SOUND_PAN_TARGET + playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET createvisualtask AnimTask_CountIceBallThrows, 5, 0 jumpargeq 0, 0, _81D5842 jumpargeq 0, 1, _81D5871 @@ -9825,11 +9825,11 @@ Move_WEATHER_BALL: @ 81D5989 loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 1, ANIM_BATTLER_ATTACKER delay 8 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930A8, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish delay 15 - playsewithpan SE_W197, 0 + playsewithpan SE_M_DETECT, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2 @@ -9843,7 +9843,7 @@ _81D59F4: loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83930C0, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 waitforvisualfinish @@ -9851,45 +9851,45 @@ _81D59F4: _81D5A31: loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gBattleAnimSpriteTemplate_83D96AC, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D96AC, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D96AC, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 waitforvisualfinish end _81D5A95: loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gBattleAnimSpriteTemplate_83D9438, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83D9438, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 13 createsprite gBattleAnimSpriteTemplate_83D9438, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET waitforvisualfinish end _81D5AF9: loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_83DAE30, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DAE30, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 14 createsprite gBattleAnimSpriteTemplate_83DAE30, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, -12, 27, 2, 3 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, 8, 28, 3, 4 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, -4, 30, 2, 3 @@ -9901,16 +9901,16 @@ _81D5B99: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallHailSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallHailSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallHailSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET call Effect_LightIceDamage waitforvisualfinish end @@ -9919,7 +9919,7 @@ PoundCopy: @ 81D5C05 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -9929,64 +9929,64 @@ PoundCopy: @ 81D5C05 Effect_LightIceDamage: @ 81D5C36 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -10, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, 20, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, 10, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 17, -12, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, 15, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 2, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET return Effect_HeavyIceDamage: @ 81D5CBA createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -10, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, 20, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -29, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 29, -20, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, 10, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 17, -12, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, 15, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 26, -5, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 2, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET return Unknown_81D5D8A: @ 81D5D8A - loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4 createsprite gIceSpikeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 24, 0 delay 4 createsprite gIceSpikeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 24, 0 @@ -10003,7 +10003,7 @@ Unknown_81D5D8A: @ 81D5D8A return Unknown_81D5E0E: @ 81D5E0E Icy Wind animates end bit with the wavy shiz - loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4 createsprite gIceSpikeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 24, 1 delay 4 createsprite gIceSpikeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 24, 1 @@ -10033,7 +10033,7 @@ Unknown_81D5ECA: @ 81D5ECA return Unknown_81D5EF5: @ 81D5EF5 - playsewithpan SE_W071B, SOUND_PAN_ATTACKER + playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7038, ANIM_BATTLER_ATTACKER, 2, 0, -5, 0, 0 delay 7 createsprite gBattleAnimSpriteTemplate_83D7038, ANIM_BATTLER_ATTACKER, 2, -15, 10, 0, 0 @@ -10045,7 +10045,7 @@ Unknown_81D5EF5: @ 81D5EF5 return Unknown_81D5F3E: @ 81D5F3E - playsewithpan SE_W071B, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB_2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7038, ANIM_BATTLER_TARGET, 2, 0, -5, 1, 0 delay 7 createsprite gBattleAnimSpriteTemplate_83D7038, ANIM_BATTLER_TARGET, 2, -15, 10, 1, 0 @@ -10058,72 +10058,72 @@ Unknown_81D5F3E: @ 81D5F3E PoisonBubblesAnim: @ 81D5F87 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, 10, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -20, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, 15, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, -20, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, -8, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET return WaterBubbleEffect: @ 81D5FF8 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -20, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, 15, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, -20, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, -8, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET return WaterBubbleEffect2: @ 81D6069 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -28, -10, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -20, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, 15, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 8, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, -20, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, -8, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET return ElectricityEffect: @ 81D6100 - playsewithpan SE_W085B, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET createsprite gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, 0, 5, 0 delay 2 createsprite gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, 10, 5, 1 @@ -10142,7 +10142,7 @@ ElectricityEffect: @ 81D6100 return ConfusionEffect: @ 81D618B - loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 13, 6 createsprite gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 0, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 51, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 102, 3, 90 @@ -10214,7 +10214,7 @@ Unknown_81D626D: @ 81D626D return StatusCondition_Poison: @ 81D6270 - loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 + loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 18, 2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 12, 31774 end @@ -10226,7 +10226,7 @@ StatusCondition_Confusion: @ 81D629B StatusCondition_Burn: @ 81D62A4 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET call ConditionBurnFire call ConditionBurnFire call ConditionBurnFire @@ -10239,19 +10239,19 @@ ConditionBurnFire: StatusCondition_Love: @ 81D62D4 loadspritegfx ANIM_TAG_MAGENTA_HEART - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 0, 20 delay 15 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, -20, 20 delay 15 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 20, 20 end StatusCondition_Sleep: @ 81D6309 loadspritegfx ANIM_TAG_LETTER_Z - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6D94, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 createsprite gBattleAnimSpriteTemplate_83D6D94, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -10264,11 +10264,11 @@ StatusCondition_Paralysis: @ 81D6335 end StatusCondition_Ice: @ 81D634F - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17 createvisualtask sub_807B920, 2 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -10277,7 +10277,7 @@ StatusCondition_Ice: @ 81D634F StatusCondition_Curse: @ 81D636A loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF38, ANIM_BATTLER_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10287,7 +10287,7 @@ StatusCondition_Curse: @ 81D636A StatusCondition_Nightmare: @ 81D638F loadspritegfx ANIM_TAG_DEVIL monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF50, ANIM_BATTLER_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10300,8 +10300,8 @@ General_CastformChange: @ 81D63B4 goto _81D63C8 _81D63C8: monbg ANIM_BATTLER_ATTACKER - playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 createvisualtask sub_812D7E8, 2, 1 waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER @@ -10336,10 +10336,10 @@ General_PokeblockThrow: @ 81D6438 createvisualtask sub_8141D7C, 2 createvisualtask sub_8141BD4, 2 delay 0 - waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 + waitplaysewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER, 22 createsprite gBattleAnimSpriteTemplate_840B4FC, ANIM_BATTLER_TARGET, 3, -16, 7, 0, 32 delay 50 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish createvisualtask sub_8141C08, 2 @@ -10359,7 +10359,7 @@ General_TurnTrap: @ 81D6489 goto WrapHit WrapHit: loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 + loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 2 createsprite gBattleAnimSpriteTemplate_83D65A0, ANIM_BATTLER_TARGET, 4, 0, 16, 0, 1 delay 7 createsprite gBattleAnimSpriteTemplate_83D65A0, ANIM_BATTLER_TARGET, 2, 0, 8, 1, 1 @@ -10367,12 +10367,12 @@ WrapHit: createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 delay 20 setarg ARG_RET_ID, -1 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish end FireSpinHit: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call _81C90BF call _81C90BF @@ -10386,7 +10386,7 @@ WhirlpoolHit: setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, rgb(0, 13, 23) - playsewithpan SE_W250, SOUND_PAN_TARGET + playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call _81D03E4 call _81D03E4 @@ -10401,7 +10401,7 @@ ClampHit: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1E8, ANIM_BATTLER_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB1E8, ANIM_BATTLER_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -10416,7 +10416,7 @@ SandTombHit: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 - playsewithpan SE_W328, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET call _81D361F call _81D361F delay 22 @@ -10429,19 +10429,19 @@ General_ItemEffect: @ 81D661C loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 3, 7, 0, rgb(17, 31, 25) createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish @@ -10452,24 +10452,24 @@ General_SmokeballEscape: @ 81D6690 monbg ANIM_BATTLER_ATTACKER setalpha 12, 4 delay 0 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_TARGET, 0, 0, 32, 28, 30 delay 4 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 127, 2, 12, 20, 30 delay 12 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 126, 2, -28, 4, 30 delay 4 delay 8 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 124, 2, 14, -20, 30 delay 4 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createvisualtask sub_80DFC24, 2, 2 createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 123, 3, 4, 4, 30 delay 14 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 122, 3, -14, 18, 46 delay 0 createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 121, 3, 14, -14, 46 @@ -10488,7 +10488,7 @@ General_SmokeballEscape: @ 81D6690 General_HangedOn: @ 81D676E createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 2, 7, 0, 9, rgb(31, 0, 0) - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask sub_812FC68, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 2, 4, 9, 0, rgb(31, 0, 0) @@ -10499,7 +10499,7 @@ General_HangedOn: @ 81D676E General_Rain: @ 81D67BB loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 waitforvisualfinish createvisualtask CreateAnimRaindrops, 2, 0, 3, 60 @@ -10528,7 +10528,7 @@ General_MonHit: @ 81D6821 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -10559,22 +10559,22 @@ _81D68AE: call Unknown_81D6AD6 end _81D68B5: - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_SnatchOpposingMonMove, 2 goto _81D68AE _81D68C5: - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_SnatchPartnerMove, 2 goto _81D68AE General_FutureSightHit: @ 81D68D5 createvisualtask sub_80E42B0, 2 monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_TARGET - waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET + waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -10595,26 +10595,26 @@ General_DoomDesireHit: @ 81D6934 delay 10 createvisualtask sub_812E14C, 5 delay 9 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 9 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 9 - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, rgb(31, 31, 31) @@ -10623,7 +10623,7 @@ General_DoomDesireHit: @ 81D6934 General_FocusPunchSetUp: @ 81D69F9 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 @@ -10658,7 +10658,7 @@ General_WishHeal: @ 81D6A7C loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 10, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish call Unknown_81D5EF5 @@ -10689,7 +10689,7 @@ _81D6AE7: goto _81D6AE5 Special_LevelUp: @ 81D6AF6 - playsewithpan SE_EXPMAX, 0 + playsewithpan SE_EXP_MAX, 0 createvisualtask sub_813F4EC, 2 delay 0 createvisualtask sub_813F6A0, 5, 0, 0 @@ -10712,7 +10712,7 @@ Special_SwitchOutOpponentMon: @ 81D6B28 Special_BallThrow: @ 81D6B39 createvisualtask sub_813F990, 2 delay 0 - playsewithpan SE_NAGERU, 0 + playsewithpan SE_BALL_THROW, 0 createvisualtask sub_813FA94, 2 createvisualtask sub_813F9E0, 2 jumpargeq 7, -1, _81D6B65 @@ -10726,7 +10726,7 @@ _81D6B65: monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a62b74fe5..ecc01d41d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3193,7 +3193,7 @@ BattleScript_Pausex20:: @ 81D8EEF return BattleScript_LevelUp:: @ 81D8EF3 - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring BATTLE_TEXT_GrewLevel setbyte sLVLBOX_STATE, 0 drawlvlupbox @@ -3225,7 +3225,7 @@ BattleScript_ForgotAndLearnedNewMove: @ 81D8F46 BattleScript_LearnedNewMove: @ 81D8F4F buffermovetolearn - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring BATTLE_TEXT_LearnedMove waitmessage 64 updatechoicemoveonlvlup USER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index cc7a58d1c..a707bfa2f 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -112,7 +112,7 @@ BattleScript_PlayerUsesItem: @ 81D9F45 BattleScript_OpponentUsesHealItem: @ 81D9F4F pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent @@ -128,7 +128,7 @@ BattleScript_OpponentUsesHealItem: @ 81D9F4F BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent @@ -141,7 +141,7 @@ BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B BattleScript_OpponentUsesXItem: @ 81D9F9C pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent @@ -153,7 +153,7 @@ BattleScript_OpponentUsesXItem: @ 81D9F9C BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent @@ -164,7 +164,7 @@ BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB finishaction BattleScript_RunByUsingItem: @ 81D9FDA - playse SE_NIGERU + playse SE_FLEE setbyte gBattleOutcome, B_OUTCOME_RAN finishturn diff --git a/data/event_scripts.s b/data/event_scripts.s index 83e558714..f6b62b32c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -867,13 +867,13 @@ Common_EventScript_SetLegendaryWeather:: @ 81A02C1 return Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE waitfanfare return Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special ScrSpecial_HealPlayerParty fadescreen FADE_FROM_BLACK @@ -890,7 +890,7 @@ EventScript_RegionMap:: @ 81A02D6 Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7 setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_M_BOAT, FALSE + playbgm MUS_SAILING, FALSE return Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF @@ -973,7 +973,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 81A0678 Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F bufferitemname 0, VAR_0x8004 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 9a504ae6d..a2aa1c82a 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", "name": "AbandonedShip_CaptainsOffice", "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 637081cd8..837d70cd8 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "name": "AbandonedShip_Corridors_1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index edc74fe01..18ef1f87c 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "name": "AbandonedShip_Corridors_B1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index 73c3a0e96..876a1e724 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_DECK", "name": "AbandonedShip_Deck", "layout": "LAYOUT_ABANDONED_SHIP_DECK", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 78abf1e20..b8372f9fb 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "name": "AbandonedShip_HiddenFloorCorridors", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 3c4865d81..7a057a488 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "name": "AbandonedShip_HiddenFloorRooms", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index 1b8dd19f1..f360a8faa 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOM_B1F", "name": "AbandonedShip_Room_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index e861d2c04..9ecc1d333 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_1F", "name": "AbandonedShip_Rooms2_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index c6429948f..73022386f 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F", "name": "AbandonedShip_Rooms2_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 45c54b174..44b8109d0 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_1F", "name": "AbandonedShip_Rooms_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 6955c5c91..9f1e39d2e 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_B1F", "name": "AbandonedShip_Rooms_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index 8e891b65d..4b7b9619d 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER1", "name": "AbandonedShip_Underwater1", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index 72b161120..821273e1a 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER2", "name": "AbandonedShip_Underwater2", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 387c32246..fc378e98a 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -2,7 +2,7 @@ "id": "MAP_ANCIENT_TOMB", "name": "AncientTomb", "layout": "LAYOUT_ANCIENT_TOMB", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ANCIENT_TOMB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 4077c76c8..7bf28f768 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_1F", "name": "AquaHideout_1F", "layout": "LAYOUT_AQUA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index e0e661b7a..408fe9a61 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B1F", "name": "AquaHideout_B1F", "layout": "LAYOUT_AQUA_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index c6f99621b..0ffe08dd9 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B2F", "name": "AquaHideout_B2F", "layout": "LAYOUT_AQUA_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 99cbf517d..a16f876fe 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special SetBattleTowerParty - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special ScrSpecial_HealPlayerParty diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index e30502fb6..a3c2e7974 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -82,7 +82,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox BattleTower_Lobby_Text_19A719, MSGBOX_DEFAULT @@ -112,7 +112,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare setvar VAR_0x8004, 9 special BattleTowerUtil diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index a111c1a10..f6599e285 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_1F", "name": "CaveOfOrigin_1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_1F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 71220abe6..79ff6564c 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B1F", "name": "CaveOfOrigin_B1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B2F/map.json b/data/maps/CaveOfOrigin_B2F/map.json index 0a2f03ae2..9fa080629 100644 --- a/data/maps/CaveOfOrigin_B2F/map.json +++ b/data/maps/CaveOfOrigin_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B2F", "name": "CaveOfOrigin_B2F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B2F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json index 4546d50f8..5f28936d9 100644 --- a/data/maps/CaveOfOrigin_B3F/map.json +++ b/data/maps/CaveOfOrigin_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B3F", "name": "CaveOfOrigin_B3F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B3F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json index 5270d384b..729d68639 100644 --- a/data/maps/CaveOfOrigin_B4F/map.json +++ b/data/maps/CaveOfOrigin_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B4F", "name": "CaveOfOrigin_B4F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B4F", - "music": "SE_STOP", + "music": "MUS_DUMMY", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index 96cf8610d..5134e8f5a 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -35,7 +35,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 doweather special WaitWeather waitstate - playse SE_W197 + playse SE_M_DETECT setfieldeffectargument 0, 9 setfieldeffectargument 1, 13 setfieldeffectargument 2, 0 @@ -46,7 +46,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else setvar VAR_RESULT, 2 .endif - playse SE_TAMA + playse SE_ORB special sub_80818A4 waitstate special sub_80818FC diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 12df1094b..74ea88d7f 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE", "name": "CaveOfOrigin_Entrance", "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index d545443f8..271eabd9c 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_DESERT_RUINS", "name": "DesertRuins", "layout": "LAYOUT_DESERT_RUINS", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_DESERT_RUINS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 4e130a9df..4e70621ab 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN", "name": "DewfordTown", "layout": "LAYOUT_DEWFORD_TOWN", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index f440d1a5c..076828af7 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_GYM", "name": "DewfordTown_Gym", "layout": "LAYOUT_DEWFORD_TOWN_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 30f7b2b6d..d4a5372dd 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -55,25 +55,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C - playse SE_MU_PACHI + playse SE_SWITCH animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index ee688c9c3..5fb5ebf63 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HALL", "name": "DewfordTown_Hall", "layout": "LAYOUT_DEWFORD_TOWN_HALL", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index 48d1a10dd..53f16b6fa 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE1", "name": "DewfordTown_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index ec2145201..7cf7a90b2 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE2", "name": "DewfordTown_House2", "layout": "LAYOUT_HOUSE4", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index e1cacefb1..be7c8d24d 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", "name": "DewfordTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 061d5228e..03ee1c40d 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", "name": "DewfordTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index 3ce7e8570..f963c8154 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -2,7 +2,7 @@ "id": "MAP_DOUBLE_BATTLE_COLOSSEUM", "name": "DoubleBattleColosseum", "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 06fb9c275..96c441cca 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY", "name": "EverGrandeCity", "layout": "LAYOUT_EVER_GRANDE_CITY", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index fb425c537..8f73c582d 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", "name": "EverGrandeCity_ChampionsRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 5fdb9e18d..c53b2821e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -38,7 +38,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playbgm MUS_DAIGO, FALSE + playbgm MUS_ENCOUNTER_CHAMPION, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 @@ -67,11 +67,11 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playbgm MUS_GIRL_SUP, FALSE + playbgm MUS_ENCOUNTER_MAY, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playbgm MUS_BOY_SUP, FALSE + playbgm MUS_ENCOUNTER_BRENDAN, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 diff --git a/data/maps/EverGrandeCity_Corridor1/map.json b/data/maps/EverGrandeCity_Corridor1/map.json index 86723c0f2..8a498bc69 100644 --- a/data/maps/EverGrandeCity_Corridor1/map.json +++ b/data/maps/EverGrandeCity_Corridor1/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR1", "name": "EverGrandeCity_Corridor1", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor2/map.json b/data/maps/EverGrandeCity_Corridor2/map.json index 692e6daa7..5107218c8 100644 --- a/data/maps/EverGrandeCity_Corridor2/map.json +++ b/data/maps/EverGrandeCity_Corridor2/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR2", "name": "EverGrandeCity_Corridor2", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor3/map.json b/data/maps/EverGrandeCity_Corridor3/map.json index aa5544f4d..9d74e674d 100644 --- a/data/maps/EverGrandeCity_Corridor3/map.json +++ b/data/maps/EverGrandeCity_Corridor3/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR3", "name": "EverGrandeCity_Corridor3", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor4/map.json b/data/maps/EverGrandeCity_Corridor4/map.json index 9c0daf82f..6657a887d 100644 --- a/data/maps/EverGrandeCity_Corridor4/map.json +++ b/data/maps/EverGrandeCity_Corridor4/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR4", "name": "EverGrandeCity_Corridor4", "layout": "LAYOUT_EVER_GRANDE_CITY_CORRIDOR4", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor5/map.json b/data/maps/EverGrandeCity_Corridor5/map.json index c310da938..ddc78db25 100644 --- a/data/maps/EverGrandeCity_Corridor5/map.json +++ b/data/maps/EverGrandeCity_Corridor5/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR5", "name": "EverGrandeCity_Corridor5", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 719451beb..33e700a39 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", "name": "EverGrandeCity_DrakesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index fcf09914b..e1550a32a 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 7938c77d2..b87ef8dd8 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "name": "EverGrandeCity_GlaciasRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index d4b5c8582..25eab43a1 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index d35d5c2d9..05ef799ec 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", "name": "EverGrandeCity_HallOfFame", "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", - "music": "MUS_EIKOU_R", + "music": "MUS_HALL_OF_FAME_ROOM", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index c65c87385..149cc1cba 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "name": "EverGrandeCity_PhoebesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index c5394ecb0..9c075efe9 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 2ac4d15b9..14a28f31b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", "name": "EverGrandeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index 7266578b8..31c4ee85c 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", "name": "EverGrandeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.json b/data/maps/EverGrandeCity_PokemonLeague/map.json index 7583323bc..fe6b3aa3a 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE", "name": "EverGrandeCity_PokemonLeague", "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index d13f20f1d..dfa6e2657 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -61,7 +61,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE message EverGrandeCity_PokemonLeague_Text_191804 waitmessage waitfanfare @@ -83,7 +83,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A - playse SE_HAZURE + playse SE_FAILURE msgbox EverGrandeCity_PokemonLeague_Text_19179C, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 733266cfa..1f039f73f 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "name": "EverGrandeCity_SidneysRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 7bd896364..42b91a9c8 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 71e07b7c3..003305be1 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN", "name": "FallarborTown", "layout": "LAYOUT_FALLARBOR_TOWN", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index b87d95542..cc915bf9b 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_CONTEST_HALL", "name": "FallarborTown_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index 770a14a65..bdb84d24b 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_CONTEST_LOBBY", "name": "FallarborTown_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index f9a2cccce..ac38ff349 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index e809610c8..8447b9a40 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_HOUSE1", "name": "FallarborTown_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index bd522be27..16a5a997e 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_HOUSE2", "name": "FallarborTown_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index e325134c4..78ddc53c9 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_MART", "name": "FallarborTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index ee1a96ba7..a8bc85cc8 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", "name": "FallarborTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 133b4626a..93b87791d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playse SE_JIDO_DOA + playse SE_SLIDING_DOOR removeobject 4 clearflag FLAG_HIDE_LANETTE release diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 4dec245fe..b49f288e8 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", "name": "FallarborTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index c02965a1d..f21b4d1f3 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIERY_PATH", "name": "FieryPath", "layout": "LAYOUT_FIERY_PATH", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_FIERY_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index a3e85f687..17797b153 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY", "name": "FortreeCity", "layout": "LAYOUT_FORTREE_CITY", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 896aa737e..0b2ab9859 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_DECORATION_SHOP", "name": "FortreeCity_DecorationShop", "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index c967fd6c8..bd9c03ddd 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_GYM", "name": "FortreeCity_Gym", "layout": "LAYOUT_FORTREE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 1043bec20..8c0e4eb13 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE1", "name": "FortreeCity_House1", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 47ccdfbb3..576d3ac19 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE2", "name": "FortreeCity_House2", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 85509eed4..ff1476700 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE3", "name": "FortreeCity_House3", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index c0256d8a4..737366a2c 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE4", "name": "FortreeCity_House4", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 5324d59f2..b47d16a59 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE5", "name": "FortreeCity_House5", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index ebf83b274..26085efe2 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_MART", "name": "FortreeCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index e5ab2916d..2f197c811 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", "name": "FortreeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 169f5ac1c..411643cdd 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", "name": "FortreeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index c19b0e793..f5c8f32b3 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_1F", "name": "GraniteCave_1F", "layout": "LAYOUT_GRANITE_CAVE_1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 0d8e71457..e89e54af4 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B1F", "name": "GraniteCave_B1F", "layout": "LAYOUT_GRANITE_CAVE_B1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index fc4993edc..1e3715ff3 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B2F", "name": "GraniteCave_B2F", "layout": "LAYOUT_GRANITE_CAVE_B2F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 18ddac4b3..f906ecc71 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_STEVENS_ROOM", "name": "GraniteCave_StevensRoom", "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 861b0eccb..584f64818 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare VAR_FACING, 4 call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D - playse SE_KAIDAN + playse SE_EXIT removeobject 1 release end diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 2847ebb9c..799e03a18 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -2,7 +2,7 @@ "id": "MAP_INSIDE_OF_TRUCK", "name": "InsideOfTruck", "layout": "LAYOUT_INSIDE_OF_TRUCK", - "music": "SE_STOP", + "music": "MUS_DUMMY", "region_map_section": "MAPSEC_INSIDE_OF_TRUCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index 405f2699c..e596171d1 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_ISLAND_CAVE", "name": "IslandCave", "layout": "LAYOUT_ISLAND_CAVE", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ISLAND_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 1b5d84086..ad7895bf8 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -37,7 +37,7 @@ S_OpenRegiceChamber:: @ 815EF19 setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0 setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setflag FLAG_SYS_BRAILLE_WAIT end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 6076e813d..c9249944e 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -2,7 +2,7 @@ "id": "MAP_JAGGED_PASS", "name": "JaggedPass", "layout": "LAYOUT_JAGGED_PASS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_JAGGED_PASS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index dffded86a..891d6f5f6 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN", "name": "LavaridgeTown", "layout": "LAYOUT_LAVARIDGE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 7a868e72e..6d1038f86 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -57,11 +57,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return LavaridgeTown_EventScript_14E570:: @ 814E570 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -280,7 +280,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LavaridgeTown_Text_16C2EA waitfanfare waitmessage diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 7d1979893..dce2f6a9c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_1F", "name": "LavaridgeTown_Gym_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 4f11e429f..2f71b1ab9 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_B1F", "name": "LavaridgeTown_Gym_B1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 385573370..19844ca33 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP", "name": "LavaridgeTown_HerbShop", "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 119f2f10f..e26429d11 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HOUSE", "name": "LavaridgeTown_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index a19b8bf95..aa7c903af 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_MART", "name": "LavaridgeTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 6f722df89..3bdeb893d 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", "name": "LavaridgeTown_PokemonCenter_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index b6dbb1b47..9757ba74b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", "name": "LavaridgeTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 7da6b4d91..12acd197c 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY", "name": "LilycoveCity", "layout": "LAYOUT_LILYCOVE_CITY", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 38fbd3472..22f980016 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -245,7 +245,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 compare VAR_RESULT, NO @@ -274,7 +274,7 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C compare VAR_RESULT, NO diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index d0f411d54..50c564c38 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_HALL", "name": "LilycoveCity_ContestHall", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 83697d1e8..e02316d09 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", "name": "LilycoveCity_ContestLobby", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index dc3031bda..5dabc84a3 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -77,7 +77,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_188C03, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, MSGBOX_DEFAULT @@ -249,7 +249,7 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_188C03, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, MSGBOX_DEFAULT @@ -492,13 +492,13 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 9, 2, METATILE_Contest_WallShadow, 1 setmetatile 9, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 9, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 9, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView @@ -631,13 +631,13 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 4bcb4ab57..7b8e0fc18 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", "name": "LilycoveCity_CoveLilyMotel_1F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 954635fbd..b64205eb1 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", "name": "LilycoveCity_CoveLilyMotel_2F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 1b48e4b4d..c6fa2f6c0 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -18,7 +18,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag FLAG_TEMP_2 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 4f3fd5189..5b5479ac3 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "LilycoveCity_DepartmentStoreElevator", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 83412d697..c27ac3f66 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", "name": "LilycoveCity_DepartmentStoreRooftop", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 5b7fafb87..4578313b5 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 77d3eb262..461c299a4 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", "name": "LilycoveCity_DepartmentStore_1F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index 503dc35c5..3d0ec8c37 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", "name": "LilycoveCity_DepartmentStore_2F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index 49b978443..a09224702 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", "name": "LilycoveCity_DepartmentStore_3F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index f6d7ea584..8e39d129c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", "name": "LilycoveCity_DepartmentStore_4F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 951ccadab..141fea32b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", "name": "LilycoveCity_DepartmentStore_5F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_EmptyMap/map.json b/data/maps/LilycoveCity_EmptyMap/map.json index 555c36be7..56d65fb07 100644 --- a/data/maps/LilycoveCity_EmptyMap/map.json +++ b/data/maps/LilycoveCity_EmptyMap/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_EMPTY_MAP", "name": "LilycoveCity_EmptyMap", "layout": "LAYOUT_LILYCOVE_CITY_EMPTY_MAP", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 5b31c8129..e4fc39663 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HARBOR", "name": "LilycoveCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index f3e5f9062..21cd211ef 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE1", "name": "LilycoveCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 37c25007d..2f13f9c2a 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE2", "name": "LilycoveCity_House2", "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 4c8b928e4..c7e9c3a21 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE3", "name": "LilycoveCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 874f8f6df..0fc561101 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE4", "name": "LilycoveCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 4fd29b047..b980a1cec 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", "name": "LilycoveCity_LilycoveMuseum_1F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index fc1a594d4..a8b1b0ec2 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", "name": "LilycoveCity_LilycoveMuseum_2F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index 1893cbd0d..142157ed7 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", "name": "LilycoveCity_MoveDeletersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 39ab9984a..0c2b38dcf 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special DeleteMonMove - playfanfare MUS_ME_WASURE + playfanfare MUS_MOVE_DELETED waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, MSGBOX_DEFAULT releaseall diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 96bebc00d..131b59dbc 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", "name": "LilycoveCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index 8d6ec1169..16d807a00 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", "name": "LilycoveCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 9d58bfc29..9e68c0a00 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "LilycoveCity_PokemonTrainerFanClub", "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index f66009546..fa9b85c24 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_UNUSED_MART", "name": "LilycoveCity_UnusedMart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index 35a00a498..65df32217 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM1", "name": "LinkContestRoom1", "layout": "LAYOUT_LINK_CONTEST_ROOM1", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index df95d1e41..2acb2a444 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - savebgm MUS_TEST1 + savebgm MUS_LINK_CONTEST_P1 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - savebgm MUS_TEST2 + savebgm MUS_LINK_CONTEST_P2 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - savebgm MUS_TEST3 + savebgm MUS_LINK_CONTEST_P3 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - savebgm MUS_TEST4 + savebgm MUS_LINK_CONTEST_P4 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - savebgm MUS_CONTEST0 + savebgm MUS_CONTEST return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json index c018394a4..535623613 100644 --- a/data/maps/LinkContestRoom2/map.json +++ b/data/maps/LinkContestRoom2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM2", "name": "LinkContestRoom2", "layout": "LAYOUT_LINK_CONTEST_ROOM2", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json index 2cd4ac89e..5e8910662 100644 --- a/data/maps/LinkContestRoom3/map.json +++ b/data/maps/LinkContestRoom3/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM3", "name": "LinkContestRoom3", "layout": "LAYOUT_LINK_CONTEST_ROOM3", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json index 0c1bd764f..5540b6c4b 100644 --- a/data/maps/LinkContestRoom4/map.json +++ b/data/maps/LinkContestRoom4/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM4", "name": "LinkContestRoom4", "layout": "LAYOUT_LINK_CONTEST_ROOM4", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json index c2360ee23..27506a462 100644 --- a/data/maps/LinkContestRoom5/map.json +++ b/data/maps/LinkContestRoom5/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM5", "name": "LinkContestRoom5", "layout": "LAYOUT_LINK_CONTEST_ROOM5", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json index cc556b5ca..9b8bed134 100644 --- a/data/maps/LinkContestRoom6/map.json +++ b/data/maps/LinkContestRoom6/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM6", "name": "LinkContestRoom6", "layout": "LAYOUT_LINK_CONTEST_ROOM6", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 2ce0ea4a1..25a27a528 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN", "name": "LittlerootTown", "layout": "LAYOUT_LITTLEROOT_TOWN", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 7b45aa651..dcdf452dd 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -98,7 +98,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 - playse SE_DANSA + playse SE_LEDGE applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6C0 waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 @@ -865,7 +865,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_Text_16AA32 waitfanfare waitmessage diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 5c8d5c2e0..f375cc602 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", "name": "LittlerootTown_BrendansHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 2d0a0f901..c3e94b4e5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", "name": "LittlerootTown_BrendansHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index ac2048fbf..8cc646d22 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", "name": "LittlerootTown_MaysHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 877166683..1e76f4d25 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", "name": "LittlerootTown_MaysHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 660f68e5e..c97ac979e 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -35,7 +35,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A - playse SE_KAIDAN + playse SE_EXIT removeobject VAR_LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_STATE, 1 @@ -46,7 +46,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, MSGBOX_DEFAULT - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark @@ -80,7 +80,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, MSGBOX_DEFAULT - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 214bc4654..0632dae2c 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", "name": "LittlerootTown_ProfessorBirchsLab", "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", - "music": "MUS_ODAMAKI", + "music": "MUS_BIRCH_LAB", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 15267ec8a..f72178096 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO compare VAR_RESULT, YES @@ -153,7 +153,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index dba9b43bc..fb816c036 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_1F", "name": "MagmaHideout_1F", "layout": "LAYOUT_MAGMA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_B1F/map.json b/data/maps/MagmaHideout_B1F/map.json index 6219a75db..1d70b7868 100644 --- a/data/maps/MagmaHideout_B1F/map.json +++ b/data/maps/MagmaHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_B1F", "name": "MagmaHideout_B1F", "layout": "LAYOUT_MAGMA_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_B2F/map.json b/data/maps/MagmaHideout_B2F/map.json index 8562e15d6..4aefc7977 100644 --- a/data/maps/MagmaHideout_B2F/map.json +++ b/data/maps/MagmaHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_B2F", "name": "MagmaHideout_B2F", "layout": "LAYOUT_MAGMA_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index fa745647e..77b21d296 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY", "name": "MauvilleCity", "layout": "LAYOUT_MAUVILLE_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 50ad62df9..fe61fb6e1 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_BIKE_SHOP", "name": "MauvilleCity_BikeShop", "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index f8e2ed505..6ef698b65 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GAME_CORNER", "name": "MauvilleCity_GameCorner", "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", - "music": "MUS_CASINO", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 3e439332f..d852ef406 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -62,7 +62,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -163,7 +163,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 removecoins 1000 adddecoration DECOR_TREECKO_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -179,7 +179,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 removecoins 1000 adddecoration DECOR_TORCHIC_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -195,7 +195,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA removecoins 1000 adddecoration DECOR_MUDKIP_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -297,7 +297,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C removecoins 1500 additem ITEM_TM32_DOUBLE_TEAM updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 removecoins 3500 additem ITEM_TM29_PSYCHIC updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 removecoins 4000 additem ITEM_TM35_FLAMETHROWER updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA removecoins 4000 additem ITEM_TM24_THUNDERBOLT updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 removecoins 4000 additem ITEM_TM13_ICE_BEAM updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -466,7 +466,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C setflag FLAG_RECEIVED_20_COINS addcoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, MSGBOX_DEFAULT - playse SE_REGI + playse SE_SHOP goto MauvilleCity_GameCorner_EventScript_1570CA end diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 0ad9f27d4..cf4d2e0e3 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GYM", "name": "MauvilleCity_Gym", "layout": "LAYOUT_MAUVILLE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index f7af8e1d0..7afaafceb 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call Common_EventScript_SetGymTrainers special MauvilleGymSpecial3 special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK goto MauvilleCity_Gym_EventScript_15661D end @@ -140,7 +140,7 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1 goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC releaseall diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 30ef32dcd..f9fd5c248 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE1", "name": "MauvilleCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 83d979d2c..0e603641b 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE2", "name": "MauvilleCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 48b2dc552..dfa55a4fe 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_MART", "name": "MauvilleCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 3964d626a..861ea6697 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", "name": "MauvilleCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 163d79fb4..6dcfb8737 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", "name": "MauvilleCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 221538cf2..12a963d13 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_1R", "name": "MeteorFalls_1F_1R", "layout": "LAYOUT_METEOR_FALLS_1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 91a12d462..3a1c797b9 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_2R", "name": "MeteorFalls_1F_2R", "layout": "LAYOUT_METEOR_FALLS_1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index 293d0da4f..c51b96dc5 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_1R", "name": "MeteorFalls_B1F_1R", "layout": "LAYOUT_METEOR_FALLS_B1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index cfc99f8a7..c1f05e0f5 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_2R", "name": "MeteorFalls_B1F_2R", "layout": "LAYOUT_METEOR_FALLS_B1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 4c6f537c6..0f26395c9 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY", "name": "MossdeepCity", "layout": "LAYOUT_MOSSDEEP_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index c2cc37d06..fc0efe1db 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", "name": "MossdeepCity_GameCorner_1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 6c2c8f4da..15720578d 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", "name": "MossdeepCity_GameCorner_B1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index a054a3a8b..6e154966d 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GYM", "name": "MossdeepCity_Gym", "layout": "LAYOUT_MOSSDEEP_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index bc86b3ead..3bf33b344 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA MossdeepCity_Gym_EventScript_15A619:: @ 815A619 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK releaseall end diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index f8fb6e396..775528b73 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE1", "name": "MossdeepCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 597fac8ff..e77f14b2c 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE2", "name": "MossdeepCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 335ce50e7..8a28a7138 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE3", "name": "MossdeepCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index f23896831..f400dca3e 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE4", "name": "MossdeepCity_House4", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 8c985ab2b..8ec308187 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_MART", "name": "MossdeepCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 16d1152da..bb07b222b 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", "name": "MossdeepCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index ed4ab3c74..e60666508 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", "name": "MossdeepCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index b250b5382..1591bb73f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", "name": "MossdeepCity_SpaceCenter_1F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 8537f7291..466db08fa 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", "name": "MossdeepCity_SpaceCenter_2F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index df63c5ca8..25a1f38a5 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", "name": "MossdeepCity_StevensHouse", "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 07fe1b296..bc3c6b2f9 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -78,7 +78,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar VAR_0x8004, VAR_RESULT removeobject 2 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index fada71876..0befcf8a2 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY", "name": "MtChimney", "layout": "LAYOUT_MT_CHIMNEY", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_ASH", diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 761d074de..c44257d94 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", "name": "MtChimney_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 1c02bd68f..b78524b9a 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_1F", "name": "MtPyre_1F", "layout": "LAYOUT_MT_PYRE_1F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index d49dcb1e9..9e740aaad 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_2F", "name": "MtPyre_2F", "layout": "LAYOUT_MT_PYRE_2F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index a2f36446f..40dfbf151 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_3F", "name": "MtPyre_3F", "layout": "LAYOUT_MT_PYRE_3F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 6469f0b8c..81b432e10 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_4F", "name": "MtPyre_4F", "layout": "LAYOUT_MT_PYRE_4F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 11ffc89db..611e41954 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_5F", "name": "MtPyre_5F", "layout": "LAYOUT_MT_PYRE_5F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index 5dad923b4..3ec42a9b1 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_6F", "name": "MtPyre_6F", "layout": "LAYOUT_MT_PYRE_6F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 3cb7c7815..dd9ce29ff 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_EXTERIOR", "name": "MtPyre_Exterior", "layout": "LAYOUT_MT_PYRE_EXTERIOR", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index cb7c8db49..ae6c856a1 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_SUMMIT", "name": "MtPyre_Summit", "layout": "LAYOUT_MT_PYRE_SUMMIT", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 4162f2bfb..44adf56b9 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_ENTRANCE", "name": "NewMauville_Entrance", "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index ecc52cfa0..5595b1720 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0 setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 0aef219af..0ee17aaa5 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_INSIDE", "name": "NewMauville_Inside", "layout": "LAYOUT_NEW_MAUVILLE_INSIDE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 45b3ce38a..37df7aa62 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN", "name": "OldaleTown", "layout": "LAYOUT_OLDALE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index ba3a1868e..fdad86c1c 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -38,7 +38,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79 goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE msgbox OldaleTown_Text_16AEF2, MSGBOX_DEFAULT closemessage switch VAR_FACING diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 568b9187b..484e9d919 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE1", "name": "OldaleTown_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index b863c6f72..e14f7d6de 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE2", "name": "OldaleTown_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 960be303b..3491333f3 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_MART", "name": "OldaleTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 007924f75..22526e475 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", "name": "OldaleTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 2bd8eff9c..0b857a04c 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", "name": "OldaleTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 50e30456b..a929d586b 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN", "name": "PacifidlogTown", "layout": "LAYOUT_PACIFIDLOG_TOWN", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 4e8810514..0b20e0a18 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE1", "name": "PacifidlogTown_House1", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 702277046..599b6c094 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE2", "name": "PacifidlogTown_House2", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index c4cdcb362..65491d51d 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE3", "name": "PacifidlogTown_House3", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 4f5fd22b1..f2a66cb9d 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE4", "name": "PacifidlogTown_House4", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index cda98d9db..5b80ab704 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE5", "name": "PacifidlogTown_House5", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 744594889..d74698bee 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", "name": "PacifidlogTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index ac2849775..a81efcaf0 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", "name": "PacifidlogTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index aaddb65cb..53627f989 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY", "name": "PetalburgCity", "layout": "LAYOUT_PETALBURG_CITY", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 7c02a67f7..6eac0b301 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - savebgm MUS_TSURETEK + savebgm MUS_FOLLOW_ME return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -182,7 +182,7 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, Common_Movement_FacePlayer waitmovement 0 - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 0e96f6731..724914a04 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_GYM", "name": "PetalburgCity_Gym", "layout": "LAYOUT_PETALBURG_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 07e1394a7..90add0107 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -76,7 +76,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject 10 setflag FLAG_HIDE_WALLY_PETALBURG delay 30 @@ -187,7 +187,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, MSGBOX_DEFAULT closemessage setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_154835 compare VAR_0x8008, 1 diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index ca5dfb729..77b80eb1a 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE1", "name": "PetalburgCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 943c9b1f9..f840d202c 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE2", "name": "PetalburgCity_House2", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index db1e4a94d..0ff957f5f 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_MART", "name": "PetalburgCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index bf15fd1cc..ed161a3ca 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", "name": "PetalburgCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index df425c8f5..eb3e89650 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", "name": "PetalburgCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index c5e040de6..c97e8c328 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE", "name": "PetalburgCity_WallysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 36c312bbe..036ec469f 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_WOODS", "name": "PetalburgWoods", "layout": "LAYOUT_PETALBURG_WOODS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_PETALBURG_WOODS", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 804987129..2f8b276ce 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_RECORD_CORNER", "name": "RecordCorner", "layout": "LAYOUT_RECORD_CORNER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 24d4c2360..b567044d2 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE101", "name": "Route101", "layout": "LAYOUT_ROUTE101", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_101", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 60e67565d..b042ab903 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playbgm MUS_EVENT0, TRUE + playbgm MUS_HELP, TRUE msgbox Route101_Text_16D10E, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 54262a239..cba038763 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE102", "name": "Route102", "layout": "LAYOUT_ROUTE102", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_102", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 691cc719a..cb2a70a6b 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE103", "name": "Route103", "layout": "LAYOUT_ROUTE103", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_103", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 637a2a85a..ea9dc841d 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, MSGBOX_DEFAULT - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE applymovement 2, Common_Movement_FacePlayer waitmovement 0 applymovement 2, Common_Movement_ExclamationMark @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, MSGBOX_DEFAULT - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE applymovement 2, Common_Movement_FacePlayer waitmovement 0 applymovement 2, Common_Movement_ExclamationMark @@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9 Route103_EventScript_14ED0C:: @ 814ED0C applymovement 2, Route103_Movement_14ED67 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement 2, Route103_Movement_14ED6B waitmovement 0 goto Route103_EventScript_14ED46 @@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C Route103_EventScript_14ED29:: @ 814ED29 applymovement 2, Route103_Movement_14ED71 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement 2, Route103_Movement_14ED74 waitmovement 0 goto Route103_EventScript_14ED46 diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index fd90b70e5..3a5fef615 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104", "name": "Route104", "layout": "LAYOUT_ROUTE104", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 6dcc22109..7322b2066 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE", "name": "Route104_MrBrineysHouse", "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index b949583ed..fd3e7cb0a 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index 286dbaaa2..b769374f9 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE", "name": "Route104_Prototype", "layout": "LAYOUT_ROUTE104_PROTOTYPE", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index 8e532a031..479a2384d 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrototypePrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 378acb257..497fd19f3 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE105", "name": "Route105", "layout": "LAYOUT_ROUTE105", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_105", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 6fba97556..f1df4be1a 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE106", "name": "Route106", "layout": "LAYOUT_ROUTE106", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_106", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 369697c74..51ef3a9c0 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE107", "name": "Route107", "layout": "LAYOUT_ROUTE107", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_107", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 0763b7dfc..2092e0f4a 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE108", "name": "Route108", "layout": "LAYOUT_ROUTE108", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_108", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 8345481c4..bcdaaf259 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109", "name": "Route109", "layout": "LAYOUT_ROUTE109", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 49e8a7751..ccb50b680 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109_SEASHORE_HOUSE", "name": "Route109_SeashoreHouse", "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 93fb927dc..7aef1715f 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110", "name": "Route110", "layout": "LAYOUT_ROUTE110", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 80605c132..75341ea2c 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return Route110_EventScript_14FDAC:: @ 814FDAC - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return Route110_EventScript_14FDB1:: @ 814FDB1 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index dc7060d9b..f073d60c7 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadNorthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRACE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 2d17f1f79..91e54f251 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadSouthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRACE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index 116e0994d..ece6984cb 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", "name": "Route110_TrickHouseCorridor", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index bf413874d..a992e138d 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_END", "name": "Route110_TrickHouseEnd", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 683637648..167f9bf58 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -182,7 +182,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 @@ -230,7 +230,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_161CEA waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index ca869dcdc..79cef3649 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", "name": "Route110_TrickHouseEntrance", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 794237957..59797f90f 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -213,7 +213,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -462,7 +462,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -707,7 +707,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waitmessage diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index e9d7922ae..1d059f3df 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", "name": "Route110_TrickHousePuzzle1", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index c006dcebc..6755424a5 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2", "name": "Route110_TrickHousePuzzle2", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 6ff77999b..11249d223 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3", "name": "Route110_TrickHousePuzzle3", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 020c1442f..8b2b3025d 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4", "name": "Route110_TrickHousePuzzle4", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index f3fc7de40..6cb94cae7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5", "name": "Route110_TrickHousePuzzle5", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 6836211bd..903ccc999 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -389,7 +389,7 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 waitse - playse SE_HAZURE + playse SE_FAILURE msgbox Route110_TrickHousePuzzle5_Text_19D5CF, MSGBOX_DEFAULT applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F @@ -408,7 +408,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF waitse - playse SE_SEIKAI + playse SE_SUCCESS goto Route110_TrickHousePuzzle5_EventScript_162DE9 end diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index d6c9966f4..b0a39b700 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6", "name": "Route110_TrickHousePuzzle6", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 508cc6d1f..df9c47be5 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", "name": "Route110_TrickHousePuzzle7", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 589e77983..8491b5220 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -119,7 +119,7 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9 end @@ -130,7 +130,7 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3 end @@ -141,7 +141,7 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD end @@ -152,7 +152,7 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7 end @@ -163,7 +163,7 @@ Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1 end diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 19d7a006f..0b6b06cf5 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8", "name": "Route110_TrickHousePuzzle8", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 5f3dba03f..d5cd385d8 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111", "name": "Route111", "layout": "LAYOUT_ROUTE111", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 163fe11da..295cab713 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -219,14 +219,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather WEATHER_SUNNY - fadenewbgm MUS_DOORO_X1 + fadenewbgm MUS_ROUTE110 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather WEATHER_SANDSTORM - fadenewbgm MUS_ASHROAD + fadenewbgm MUS_ROUTE111 doweather end diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index a617e7307..d89409184 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP", "name": "Route111_OldLadysRestStop", "layout": "LAYOUT_HOUSE3", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 2ee5c83de..5fe9e1a9c 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", "name": "Route111_WinstrateFamilysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 88cf1c2b3..b5651711c 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112", "name": "Route112", "layout": "LAYOUT_ROUTE112", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index b3b8c0ea1..27940bc66 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112_CABLE_CAR_STATION", "name": "Route112_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 88311edd7..f8fb82631 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113", "name": "Route113", "layout": "LAYOUT_ROUTE113", - "music": "MUS_KAZANBAI", + "music": "MUS_ROUTE113", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 14982c2d4..3d6687d35 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113_GLASS_WORKSHOP", "name": "Route113_GlassWorkshop", "layout": "LAYOUT_HOUSE4", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index d237ccf16..72afb8330 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114", "name": "Route114", "layout": "LAYOUT_ROUTE114", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 0cc1cebc5..2ac163837 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", "name": "Route114_FossilManiacsHouse", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index dd42dd934..62563a426 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", "name": "Route114_FossilManiacsTunnel", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index af62dac96..e1182536c 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_LANETTES_HOUSE", "name": "Route114_LanettesHouse", "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 2e6fb8545..764945bde 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE115", "name": "Route115", "layout": "LAYOUT_ROUTE115", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_115", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 2ec98302e..741309055 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116", "name": "Route116", "layout": "LAYOUT_ROUTE116", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 9b07d84e3..653074880 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", "name": "Route116_TunnelersRestHouse", "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 368fa9d6e..eff08e1ee 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117", "name": "Route117", "layout": "LAYOUT_ROUTE117", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index ebb732d35..7ba6120b2 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117_POKEMON_DAY_CARE", "name": "Route117_PokemonDayCare", "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index be767e166..9dfc95194 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -76,7 +76,7 @@ Route118_EventScript_150FE4:: @ 8150FE4 end Route118_EventScript_151004:: @ 8151004 - playse SE_DANSA + playse SE_LEDGE applymovement 19, Route118_Movement_15106D waitmovement 0 delay 30 diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 0cdba1552..e275d0b10 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119", "name": "Route119", "layout": "LAYOUT_ROUTE119", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 3b4e9c51f..b1307f0e4 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -79,11 +79,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return Route119_EventScript_151259:: @ 8151259 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return Route119_EventScript_15125E:: @ 815125E diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index cb41137b0..9c9468d59 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_HOUSE", "name": "Route119_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 3ca2fd306..7dc0223fd 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", "name": "Route119_WeatherInstitute_1F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 13f9009c8..4d951a18e 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", "name": "Route119_WeatherInstitute_2F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 18aba2003..6a14b2c60 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A getpartysize compare VAR_RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index bc3473476..19c9f8846 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE120", "name": "Route120", "layout": "LAYOUT_ROUTE120", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_120", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 92fc5b59f..7b610e9dd 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121", "name": "Route121", "layout": "LAYOUT_ROUTE121", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 3c1220c49..993cdd403 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", "name": "Route121_SafariZoneEntrance", "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 6fa9c8d81..481f243fc 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waitmessage diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 1037df207..e1aabb090 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE122", "name": "Route122", "layout": "LAYOUT_ROUTE122", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_122", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index 4cb877538..7dc367d1a 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123", "name": "Route123", "layout": "LAYOUT_ROUTE123", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 9cdf9620e..ff3252a88 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", "name": "Route123_BerryMastersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 717381caf..1eda0bd74 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124", "name": "Route124", "layout": "LAYOUT_ROUTE124", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 775508c2d..ef800009b 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", "name": "Route124_DivingTreasureHuntersHouse", "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 51e39ac41..418afc5f9 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE125", "name": "Route125", "layout": "LAYOUT_ROUTE125", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_125", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index a6ab407ff..e9cf0075c 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE126", "name": "Route126", "layout": "LAYOUT_ROUTE126", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_126", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 6b471e370..6c3a53f12 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE127", "name": "Route127", "layout": "LAYOUT_ROUTE127", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_127", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index da4ed9c21..a5c329c86 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE128", "name": "Route128", "layout": "LAYOUT_ROUTE128", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_128", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 7e7ae0d8b..3236a422c 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE129", "name": "Route129", "layout": "LAYOUT_ROUTE129", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_129", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 073549cd4..f6628e888 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE130", "name": "Route130", "layout": "LAYOUT_ROUTE130", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_130", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 5e166047a..4b367e9be 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE131", "name": "Route131", "layout": "LAYOUT_ROUTE131", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_131", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index e778a1341..5ded1cd04 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE132", "name": "Route132", "layout": "LAYOUT_ROUTE132", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_132", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index cf61d83d2..41808fd13 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE133", "name": "Route133", "layout": "LAYOUT_ROUTE133", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_133", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 566507ec6..ac41a0486 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE134", "name": "Route134", "layout": "LAYOUT_ROUTE134", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_134", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index c186a4149..10032c0f9 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY", "name": "RustboroCity", "layout": "LAYOUT_RUSTBORO_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index e03fbb322..e8df00e87 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", "name": "RustboroCity_CuttersHouse", "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 4ecd68663..dfbea534c 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", "name": "RustboroCity_DevonCorp_1F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 09798add6..148acbfff 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", "name": "RustboroCity_DevonCorp_2F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index ae04f9779..5974adb69 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -138,7 +138,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage @@ -158,7 +158,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 3f6033db7..0854a32e6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", "name": "RustboroCity_DevonCorp_3F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 0a2cd2117..ce25c82ac 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, MSGBOX_DEFAULT closemessage - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_18320B, MSGBOX_DEFAULT giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index 71ca8ec5b..fdb6596b9 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_1F", "name": "RustboroCity_Flat1_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 63d3aa2b2..fccd06dc3 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_2F", "name": "RustboroCity_Flat1_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 01f55b7cd..8a2161620 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_1F", "name": "RustboroCity_Flat2_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 8bd868bcd..68edab82b 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_2F", "name": "RustboroCity_Flat2_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 462f90bbe..975d37739 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_3F", "name": "RustboroCity_Flat2_3F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 95a9cca8b..82866f8a3 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_GYM", "name": "RustboroCity_Gym", "layout": "LAYOUT_RUSTBORO_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 5100c2d83..5ded523a8 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE1", "name": "RustboroCity_House1", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 282740365..7c02d3ad5 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE2", "name": "RustboroCity_House2", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index f3ee9bfcf..b2e22ae1e 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE3", "name": "RustboroCity_House3", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 389da78f2..abf13aea7 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_MART", "name": "RustboroCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 86fcd070c..71093bbe1 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", "name": "RustboroCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 5d4209a8f..ed06cae95 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", "name": "RustboroCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index cc34e9c93..6de9ec101 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", "name": "RustboroCity_PokemonSchool", "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", - "music": "MUS_P_SCHOOL", + "music": "MUS_SCHOOL", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 919abbd25..9e84d1689 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTURF_TUNNEL", "name": "RusturfTunnel", "layout": "LAYOUT_RUSTURF_TUNNEL", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_RUSTURF_TUNNEL", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 74813ed10..af7f6e177 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_CORRIDOR", "name": "SSTidalCorridor", "layout": "LAYOUT_SS_TIDAL_CORRIDOR", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 18d42f009..77ec961cb 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 2 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199007, MSGBOX_DEFAULT releaseall end @@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar VAR_PORTHOLE_STATE, 6 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT releaseall end @@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_199007, MSGBOX_DEFAULT return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_1990F8, MSGBOX_DEFAULT return @@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 3 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT releaseall end @@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_1990B4, MSGBOX_DEFAULT releaseall end @@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_1990B4, MSGBOX_DEFAULT return diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index dabe9dbbb..a80ec4a89 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_LOWER_DECK", "name": "SSTidalLowerDeck", "layout": "LAYOUT_SS_TIDAL_LOWER_DECK", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 6cdac8246..858848c1b 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_ROOMS", "name": "SSTidalRooms", "layout": "LAYOUT_SS_TIDAL_ROOMS", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 0207c6917..41964581a 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHEAST", "name": "SafariZone_Northeast", "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index fa22ddef0..8c85b5414 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHWEST", "name": "SafariZone_Northwest", "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index dc62a87e4..06c169254 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_REST_HOUSE", "name": "SafariZone_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index c99a370e5..d90635ce3 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHEAST", "name": "SafariZone_Southeast", "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index fd2d06f24..cd6b5853b 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHWEST", "name": "SafariZone_Southwest", "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 1bb82eea2..4d61d53f2 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -2,7 +2,7 @@ "id": "MAP_SCORCHED_SLAB", "name": "ScorchedSlab", "layout": "LAYOUT_SCORCHED_SLAB", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_SCORCHED_SLAB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 36b4b7c67..7051d58f3 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE", "name": "SeafloorCavern_Entrance", "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index d37a2ce20..e0ebb348c 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM1", "name": "SeafloorCavern_Room1", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index ce9722c5a..9a9c7d681 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM2", "name": "SeafloorCavern_Room2", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 06c6e6d7e..328250525 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM3", "name": "SeafloorCavern_Room3", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 2150f0cda..1f01baced 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM4", "name": "SeafloorCavern_Room4", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 73c9b2979..84c74c344 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM5", "name": "SeafloorCavern_Room5", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index a554c7531..2b22d66b5 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM6", "name": "SeafloorCavern_Room6", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 700c3107f..db9cabf64 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM7", "name": "SeafloorCavern_Room7", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index caa853d21..82f4fe3ca 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM8", "name": "SeafloorCavern_Room8", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index c9cbc6d22..406b5804d 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM9", "name": "SeafloorCavern_Room9", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 82011cbf7..3f865d5fc 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -78,7 +78,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar VAR_RESULT, 0 .endif - playse SE_W197 + playse SE_M_DETECT setfieldeffectargument 0, 16 setfieldeffectargument 1, 42 setfieldeffectargument 2, 0 @@ -89,8 +89,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar VAR_RESULT, 1 .endif - playfanfare MUS_ME_TAMA - playse SE_TAMA + playfanfare MUS_AWAKEN_LEGEND + playse SE_ORB special sub_80818A4 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp @@ -126,7 +126,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4A89, MSGBOX_DEFAULT .endif - playse SE_PC_LOGON + playse SE_PC_LOGIN applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index 585bb90d0..e49ab2067 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_INNER_ROOM", "name": "SealedChamber_InnerRoom", "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index d0f098566..a5355b77a 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -11,7 +11,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 compare VAR_RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 - playse SE_TRACK_MOVE + playse SE_TRUCK_MOVE special DoSealedChamberShakingEffect1 waitstate delay 40 diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index c2c74b930..91f541a57 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_OUTER_ROOM", "name": "SealedChamber_OuterRoom", "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 48c4ec49c..f9c796e6d 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 075ccbbfa..0d80cd4e3 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 482b3d4a3..22c577034 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index b3d6a37d4..0591aa9e2 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 1ffa76d99..edad638c9 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index f0c455fc1..189967535 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index f7ec74fed..3fdbaeedc 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index d1ae09924..4e6239506 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index c9dd337ae..cea0365cf 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index ecc21b523..a3c36c9fd 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index f038f3449..eb728dac3 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 537622c45..ea16b6dcc 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index f4980476d..862606f22 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 61a53af44..ac377ddbc 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index 5d92fe6ee..83844bcd6 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 296e63958..13b678f46 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 0e9366a6a..feccc5a26 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 92a4c9240..35c10dd5b 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index a27353ec0..7a022a1a0 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index e2de6d6c1..3a37090d9 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 0dbf8134b..3ff452fb6 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 25bcd3ea4..8181fd4dd 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index e9a9bb038..10e9e53a0 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 0c7699125..acd1151f7 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 3ae268fa1..c6ad65f54 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_HighTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index ef1f1487c..0946b1155 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", "name": "ShoalCave_HighTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 5db783bc3..e4feb3c84 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_LowTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index 3e00c17bd..5e658aab9 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", "name": "ShoalCave_LowTideIceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 53ebe6eb6..543b38a2b 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", "name": "ShoalCave_LowTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 3604ee850..159f96417 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", "name": "ShoalCave_LowTideLowerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index b5c200b45..4650d533e 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", "name": "ShoalCave_LowTideStairsRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index 47703ae02..89ae1c28e 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -2,7 +2,7 @@ "id": "MAP_SINGLE_BATTLE_COLOSSEUM", "name": "SingleBattleColosseum", "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index dc120c3b6..fae9ac22f 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_1F", "name": "SkyPillar_1F", "layout": "LAYOUT_SKY_PILLAR_1F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 9dc7b05de..c69f7018a 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_2F", "name": "SkyPillar_2F", "layout": "LAYOUT_SKY_PILLAR_2F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 712c1c490..c363754e4 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_3F", "name": "SkyPillar_3F", "layout": "LAYOUT_SKY_PILLAR_3F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index 7d25f8c81..9371a5d0e 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_4F", "name": "SkyPillar_4F", "layout": "LAYOUT_SKY_PILLAR_4F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 007456bfc..78cf86a7f 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_5F", "name": "SkyPillar_5F", "layout": "LAYOUT_SKY_PILLAR_5F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index d0d984329..538fb07c2 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_ENTRANCE", "name": "SkyPillar_Entrance", "layout": "LAYOUT_SKY_PILLAR_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 1d5b0d633..2867510c2 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_OUTSIDE", "name": "SkyPillar_Outside", "layout": "LAYOUT_SKY_PILLAR_OUTSIDE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 44854fc28..edbf2369f 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_TOP", "name": "SkyPillar_Top", "layout": "LAYOUT_SKY_PILLAR_TOP", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 9df1b3229..f1bdbac44 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY", "name": "SlateportCity", "layout": "LAYOUT_SLATEPORT_CITY", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 854462533..a3908f6f9 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -73,7 +73,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 compare VAR_RESULT, 0 call_if_eq SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message SlateportCity_Text_1646DD waitfanfare waitmessage diff --git a/data/maps/SlateportCity_ContestHall/map.json b/data/maps/SlateportCity_ContestHall/map.json index 803b35db0..40a592f97 100644 --- a/data/maps/SlateportCity_ContestHall/map.json +++ b/data/maps/SlateportCity_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_CONTEST_HALL", "name": "SlateportCity_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_ContestLobby/map.json b/data/maps/SlateportCity_ContestLobby/map.json index 44a98ea06..2814471d0 100644 --- a/data/maps/SlateportCity_ContestLobby/map.json +++ b/data/maps/SlateportCity_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_CONTEST_LOBBY", "name": "SlateportCity_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index f484e8a57..adc0c13cf 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 6a7bf3969..b189da606 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HARBOR", "name": "SlateportCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index a9b24dab5..8102fca9b 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HOUSE1", "name": "SlateportCity_House1", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index b27168eca..2766431e4 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HOUSE2", "name": "SlateportCity_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index 69e227101..bdc412416 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_MART", "name": "SlateportCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index db9aaec0f..40ce94acc 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", "name": "SlateportCity_OceanicMuseum_1F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 575a42e33..ae9a0086d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -179,7 +179,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse SE_KAIDAN + playse SE_EXIT removeobject 13 release end @@ -188,7 +188,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse SE_KAIDAN + playse SE_EXIT removeobject 13 release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index e00f2ade1..aa9183e21 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", "name": "SlateportCity_OceanicMuseum_2F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 0450d51f1..5e14d0cd2 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -84,7 +84,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closemessage applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject 1 setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index de1a16a27..8da2981e2 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", "name": "SlateportCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index b7d8799fe..f135fe7e5 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", "name": "SlateportCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index d5a39eb54..4292187fd 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", "name": "SlateportCity_PokemonFanClub", "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index b916af9ea..4c5bd47ed 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", "name": "SlateportCity_SternsShipyard_1F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index d2a35e317..bf5d31907 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", "name": "SlateportCity_SternsShipyard_2F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index e4c2d7710..4dd94cadf 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY", "name": "SootopolisCity", "layout": "LAYOUT_SOOTOPOLIS_CITY", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index e28450cd1..0416e99a4 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_1F", "name": "SootopolisCity_Gym_1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 7013df88d..38f97a3b0 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -49,7 +49,7 @@ SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -57,7 +57,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -65,7 +65,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -75,7 +75,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 delay 20 applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_15AFFD waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 9a0619421..50cc08af3 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F", "name": "SootopolisCity_Gym_B1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 8c024eca8..f4ce05680 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE1", "name": "SootopolisCity_House1", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 09ec1c06f..81aa1184c 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE2", "name": "SootopolisCity_House2", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 282e50bc4..454ab19f8 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE3", "name": "SootopolisCity_House3", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 61bbfa10b..754fe6a15 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE4", "name": "SootopolisCity_House4", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 89becb6c6..1691b2165 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE5", "name": "SootopolisCity_House5", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 19df640ce..4b3913f3d 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE6", "name": "SootopolisCity_House6", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 9ccef3f2b..b83876db7 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE7", "name": "SootopolisCity_House7", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House8/map.json b/data/maps/SootopolisCity_House8/map.json index 07ea5c5a0..c47219f7e 100644 --- a/data/maps/SootopolisCity_House8/map.json +++ b/data/maps/SootopolisCity_House8/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE8", "name": "SootopolisCity_House8", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE8", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 43ae2ca93..debe89e79 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MART", "name": "SootopolisCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 795e69cd6..91f14a7e2 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", "name": "SootopolisCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index ff92662bb..afa78b9ca 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", "name": "SootopolisCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 2a8bfd397..7749a4a27 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_EXTERIOR", "name": "SouthernIsland_Exterior", "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index c93edfe2f..7743f9ad6 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_INTERIOR", "name": "SouthernIsland_Interior", "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f31bfc8c6..7ffa58cb4 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRADE_CENTER", "name": "TradeCenter", "layout": "LAYOUT_TRADE_CENTER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index b5da6e8f3..38b125dec 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER1", "name": "Underwater1", "layout": "LAYOUT_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_124", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 19bb67c63..e743f8989 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER2", "name": "Underwater2", "layout": "LAYOUT_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_125", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 5166a403c..e5f75aa4f 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER3", "name": "Underwater3", "layout": "LAYOUT_UNDERWATER3", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_126", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index a963da647..ee97a911d 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER4", "name": "Underwater4", "layout": "LAYOUT_UNDERWATER4", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_127", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index d435556ee..5a3b00bbc 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_ROUTE134", "name": "Underwater_Route134", "layout": "LAYOUT_UNDERWATER_ROUTE134", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 6ec900a6f..59bafbac5 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN", "name": "Underwater_SeafloorCavern", "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_128", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 4a31edb43..4cc83422f 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEALED_CHAMBER", "name": "Underwater_SealedChamber", "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index 8250b2a32..fe5211040 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY", "name": "Underwater_SootopolisCity", "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json index eba4d0b48..82a084b1b 100644 --- a/data/maps/UnknownMap_25_29/map.json +++ b/data/maps/UnknownMap_25_29/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_29", "name": "UnknownMap_25_29", "layout": "LAYOUT_UNKNOWN_MAP_25_29", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json index 4a8343163..5a22fae5e 100644 --- a/data/maps/UnknownMap_25_30/map.json +++ b/data/maps/UnknownMap_25_30/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_30", "name": "UnknownMap_25_30", "layout": "LAYOUT_UNKNOWN_MAP_25_30", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json index 932a48899..b73602e9f 100644 --- a/data/maps/UnknownMap_25_31/map.json +++ b/data/maps/UnknownMap_25_31/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_31", "name": "UnknownMap_25_31", "layout": "LAYOUT_UNKNOWN_MAP_25_31", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json index 32d15dbdc..3266a2c9d 100644 --- a/data/maps/UnknownMap_25_32/map.json +++ b/data/maps/UnknownMap_25_32/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_32", "name": "UnknownMap_25_32", "layout": "LAYOUT_UNKNOWN_MAP_25_32", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json index 14d6589b6..3a6d79404 100644 --- a/data/maps/UnknownMap_25_33/map.json +++ b/data/maps/UnknownMap_25_33/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_33", "name": "UnknownMap_25_33", "layout": "LAYOUT_UNKNOWN_MAP_25_33", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json index b4d5c7bab..aec7f40a1 100644 --- a/data/maps/UnknownMap_25_34/map.json +++ b/data/maps/UnknownMap_25_34/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_34", "name": "UnknownMap_25_34", "layout": "LAYOUT_UNKNOWN_MAP_25_34", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 71f176e2b..20e6b88bf 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN", "name": "VerdanturfTown", "layout": "LAYOUT_VERDANTURF_TOWN", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VerdanturfTown_ContestHall/map.json b/data/maps/VerdanturfTown_ContestHall/map.json index 90215698b..5ef4101f6 100644 --- a/data/maps/VerdanturfTown_ContestHall/map.json +++ b/data/maps/VerdanturfTown_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_CONTEST_HALL", "name": "VerdanturfTown_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_ContestLobby/map.json b/data/maps/VerdanturfTown_ContestLobby/map.json index acd5caa8c..8907f866c 100644 --- a/data/maps/VerdanturfTown_ContestLobby/map.json +++ b/data/maps/VerdanturfTown_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_CONTEST_LOBBY", "name": "VerdanturfTown_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 8eb1c0bcd..df4139dbe 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 0d9e9113a..785a4df91 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", "name": "VerdanturfTown_FriendshipRatersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index b09e47a12..d302bb710 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_HOUSE", "name": "VerdanturfTown_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 445ea2e1e..eadc8033b 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_MART", "name": "VerdanturfTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 220aceaec..0a343727b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", "name": "VerdanturfTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index b5b8c9fef..f2657afe6 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", "name": "VerdanturfTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 3986443e2..7c4f130e0 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", "name": "VerdanturfTown_WandasHouse", "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 8c4dfb9ae..9931edd3d 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_1F", "name": "VictoryRoad_1F", "layout": "LAYOUT_VICTORY_ROAD_1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 2473a819f..ee15b4ffa 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B1F", "name": "VictoryRoad_B1F", "layout": "LAYOUT_VICTORY_ROAD_B1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 0a0ee1a57..87a8359bc 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B2F", "name": "VictoryRoad_B2F", "layout": "LAYOUT_VICTORY_ROAD_B2F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f7952540c..cf17f759d 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -112,7 +112,7 @@ BerryTree_EventScript_1A161D:: @ 81A161D goto_if_eq BerryTree_EventScript_1A1642 special ObjectEventInteractionRemoveBerryTree message Route102_Text_1A17FD - playfanfare MUS_ME_KINOMI + playfanfare MUS_OBTAIN_BERRY waitmessage waitfanfare waitbuttonpress diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 0bc876575..59b53d40d 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -11,7 +11,7 @@ EventScript_FallDownHole:: @ 81C6BC5 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_UNDEFINED waitstate @@ -22,7 +22,7 @@ EventScript_FallDownHoleMtPyre:: @ 81C6BDE delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 special DoFallWarp waitstate diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index a99c33492..465b0bfe8 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -343,13 +343,13 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 waitmovement 0 releaseall addobject 13 - playse SE_DANSA + playse SE_LEDGE lockall applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addvar VAR_0x8006, -1 - playse SE_BOWA2 + playse SE_BALL_OPEN special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E return @@ -369,7 +369,7 @@ LinkContestRoom1_EventScript_1A5370:: @ 81A5370 LinkContestRoom1_EventScript_1A5377:: @ 81A5377 call LinkContestRoom1_EventScript_1A53B3 call LinkContestRoom1_EventScript_1A53CE - playse SE_W227B + playse SE_M_ENCORE2 waitmessage call LinkContestRoom1_EventScript_1A5A90 applymovement 1, LinkContestRoom1_Movement_1A5D9F @@ -406,7 +406,7 @@ LinkContestRoom1_EventScript_1A53DF:: @ 81A53DF LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 applymovement 1, LinkContestRoom1_Movement_1A5DAF waitmovement 0 - playse SE_W227B + playse SE_M_ENCORE2 call LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB @@ -803,7 +803,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A setvar VAR_TEMP_9, 1 showcontestresults setvar VAR_TEMP_9, 0 - playbgm MUS_CON_FAN, FALSE + playbgm MUS_CONTEST_WINNER, FALSE return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 @@ -888,7 +888,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 call LinkContestRoom1_EventScript_1A5A75 applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 - playse SE_W227B + playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 return @@ -999,7 +999,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB waitmessage call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 - playse SE_W227B + playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 call LinkContestRoom1_EventScript_1A5A90 delay 30 @@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_1A6D6A, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LinkContestRoom1_Text_1A6D96, MSGBOX_DEFAULT waitfanfare special ScrSpecial_GetContestWinnerNick diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 2eb32cc71..9acd544d9 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298 Route117_EventScript_1B22B2:: @ 81B22B2 message Route117_Text_1B27A2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitmessage waitbuttonpress @@ -208,7 +208,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special PayMoneyFor - playse SE_REGI + playse SE_SHOP msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index 39d52825e..af2a747e9 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -20,7 +20,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 81A0693 PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 81A0710 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 - playse SE_TRACK_DOOR + playse SE_TRUCK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 2be28646e..37e8a3788 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -66,11 +66,11 @@ EventScript_NoRoomForItem: @ 819FECC return EventScript_PlayFanfareObtainedItem: - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM return EventScript_PlayFanfareObtainedTMHM: - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM return Std_ObtainDecoration: @ 819FEDA @@ -88,7 +88,7 @@ EventScript_ObtainDecorationMessage: @ 819FEE8 return EventScript_ObtainedDecor: @ 819FF03 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Text_ObtainedTheDecor waitfanfare waitmessage diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 91b47004d..a8c1cff90 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -25,7 +25,7 @@ EventScript_AccessPC: end EventScript_AccessPlayersPC: - playse SE_PC_LOGON + playse SE_PC_LOGIN msgbox Text_AccessedPlayersPC, MSGBOX_DEFAULT special PlayerPC waitstate @@ -33,7 +33,7 @@ EventScript_AccessPlayersPC: end EventScript_AccessPokemonStorage: - playse SE_PC_LOGON + playse SE_PC_LOGIN call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC msgbox Text_StorageSystemOpened, MSGBOX_DEFAULT @@ -59,7 +59,7 @@ EventScript_TurnOffPC: EventScript_AccessHallOfFame: goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC - playse SE_PC_LOGON + playse SE_PC_LOGIN special AccessHallOfFamePC waitstate goto EventScript_AccessPC diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 2b746dbe0..68aef1b37 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -72,7 +72,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 - playse SE_KAIDAN + playse SE_EXIT removeobject VAR_0x8008 releaseall end @@ -159,7 +159,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC waitmovement 0 - playbgm MUS_INTER_V, FALSE + playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB @@ -184,7 +184,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 waitmovement 0 - playbgm MUS_INTER_V, FALSE + playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 68efec328..07ae88aa6 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -24,7 +24,7 @@ EventScript_1C3443: gUnknown_081C3448:: @ 81C3448 lockall - playse SE_PINPON + playse SE_DING_DONG message UnknownString_81C34E4 waitmessage waitbuttonpress @@ -33,7 +33,7 @@ gUnknown_081C3448:: @ 81C3448 gUnknown_081C3459:: @ 81C3459 lockall - playse SE_PINPON + playse SE_DING_DONG message UnknownString_81C3514 waitmessage waitbuttonpress diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 8a82583b2..ae361ac7e 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -115,7 +115,7 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage - playse SE_KAIDAN + playse SE_EXIT setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC @@ -135,7 +135,7 @@ SecretBase_EventScript_FirstEntrance:: @ 81A2DDE compare VAR_RESULT, YES goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage - playse SE_KAIDAN + playse SE_EXIT special sub_80BC440 end @@ -154,7 +154,7 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall setvar VAR_INIT_SECRET_BASE, 1 - playse SE_KAIDAN + playse SE_EXIT special sub_80BC114 compare VAR_RESULT, 0 goto_if_eq EventScript_1A2E38 diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index e3b87f1ea..b466a8409 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -24,7 +24,7 @@ SecretBase_OnFrame:: @ 815F362 SecretBase_EventScript_PC:: @ 815F36C lockall - playse SE_PC_LOGON + playse SE_PC_LOGIN message SecretBase_Text_BootUpPC dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON waitstate @@ -85,7 +85,7 @@ SecretBase_EventScript_PCRegistryMenu: SecretBase_EventScript_RecordMixingPC:: @ 815F43A lockall message SecretBase_Text_BootUpPC - playse SE_PC_LOGON + playse SE_PC_LOGIN dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON waitstate waitmessage diff --git a/include/constants/songs.h b/include/constants/songs.h index 45e3d335a..9a268f966 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -1,373 +1,379 @@ #ifndef GUARD_CONSTANTS_SONGS_H #define GUARD_CONSTANTS_SONGS_H -#define SE_STOP 0 -#define SE_KAIFUKU 1 // Healing Item -#define SE_PC_LOGON 2 // PC Logon -#define SE_PC_OFF 3 // PC Shutdown -#define SE_PC_ON 4 // PC Startup -#define SE_SELECT 5 // Cursor Selection -#define SE_WIN_OPEN 6 // Start Menu -#define SE_WALL_HIT 7 // Wall Bump -#define SE_DOOR 8 // Opening Door -#define SE_KAIDAN 9 // Stairs -#define SE_DANSA 10 // Ledge -#define SE_JITENSYA 11 // Bicycle Bell -#define SE_KOUKA_L 12 // Not Very Effective -#define SE_KOUKA_M 13 // Normal Effectiveness -#define SE_KOUKA_H 14 // Super Effective -#define SE_BOWA2 15 // Pokémon Withdrawl -#define SE_POKE_DEAD 16 // Pokémon Fainted -#define SE_NIGERU 17 // Flee from Wild Battle -#define SE_JIDO_DOA 18 // Pokémon Center Door -#define SE_NAMINORI 19 // Briney's Ship -#define SE_BAN 20 // Bang -#define SE_PIN 21 // Exclamation Bubble -#define SE_BOO 22 // Contest Jam -#define SE_BOWA 23 // Giving Poké Ball to Nurse, Poké Ball Wiggle -#define SE_JYUNI 24 // Places in Contest Appearing -#define SE_A 25 // Bard A -#define SE_I 26 // Bard I -#define SE_U 27 // Bard U -#define SE_E 28 // Bard E -#define SE_O 29 // Bard O -#define SE_N 30 // Bard N -#define SE_SEIKAI 31 // Success -#define SE_HAZURE 32 // Failure -#define SE_EXP 33 // Exp. Bar -#define SE_JITE_PYOKO 34 // Bunny Hop -#define SE_MU_PACHI 35 -#define SE_TK_KASYA 36 // Mossdeep Gym/Trick House Switch -#define SE_FU_ZAKU 37 -#define SE_FU_ZAKU2 38 -#define SE_FU_ZUZUZU 39 // Lavaridge Gym Warp -#define SE_RU_GASHIN 40 // Sootopolis Gym - Stairs Appear -#define SE_RU_GASYAN 41 // Sootopolis Gym - Ice Breaking -#define SE_RU_BARI 42 // Sootopolis Gym - Stepping on Ice -#define SE_RU_HYUU 43 // Falling Down -#define SE_KI_GASYAN 44 -#define SE_TK_WARPIN 45 // Warp In -#define SE_TK_WARPOUT 46 // Warp Out -#define SE_TU_SAA 47 // Repel -#define SE_HI_TURUN 48 // Moving Obstacle in Fortree Gym -#define SE_TRACK_MOVE 49 // Moving Truck -#define SE_TRACK_STOP 50 // Moving Truck Stop -#define SE_TRACK_HAIK 51 // Moving Truck Unload -#define SE_TRACK_DOOR 52 // Moving Truck Door -#define SE_MOTER 53 -#define SE_CARD 54 -#define SE_SAVE 55 // Save -#define SE_KON 56 // Poké Ball Bounce 1 -#define SE_KON2 57 // Poké Ball Bounce 2 -#define SE_KON3 58 // Poké Ball Bounce 3 -#define SE_KON4 59 // Poké Ball Bounce 4 -#define SE_SUIKOMU 60 // Poké Ball Trade -#define SE_NAGERU 61 // Poké Ball Throw -#define SE_TOY_C 62 // Note C -#define SE_TOY_D 63 // Note D -#define SE_TOY_E 64 // Note E -#define SE_TOY_F 65 // Note F -#define SE_TOY_G 66 // Note G -#define SE_TOY_A 67 // Note A -#define SE_TOY_B 68 // Note B -#define SE_TOY_C1 69 // Note High C -#define SE_MIZU 70 // Puddle -#define SE_HASHI 71 // Boardwalk -#define SE_DAUGI 72 // Slots Credits -#define SE_PINPON 73 // Ding-dong! -#define SE_FUUSEN1 74 // Red Balloon -#define SE_FUUSEN2 75 // Blue Balloon -#define SE_FUUSEN3 76 // Yellow Balloon -#define SE_TOY_KABE 77 // Breakable Door -#define SE_TOY_DANGO 78 // Mud Ball -#define SE_DOKU 79 // Overworld Poison Damage -#define SE_ESUKA 80 // Escalator -#define SE_T_AME 81 // Rain -#define SE_T_AME_E 82 // Rain stop -#define SE_T_OOAME 83 // Heavy Rain -#define SE_T_OOAME_E 84 // Heavy Rain Stop -#define SE_T_KOAME 85 // Light Rain -#define SE_T_KOAME_E 86 // Light Rain Stop -#define SE_T_KAMI 87 // Thunder -#define SE_T_KAMI2 88 // Thunder 2 -#define SE_ELEBETA 89 // Elevator -#define SE_HINSI 90 // Low Health -#define SE_EXPMAX 91 // Exp. Max -#define SE_TAMAKORO 92 // Roulette Ball -#define SE_TAMAKORO_E 93 // Roulette Ball 2 -#define SE_BASABASA 94 -#define SE_REGI 95 // Cash Register -#define SE_C_GAJI 96 // Contest Hearts -#define SE_C_MAKU_U 97 // Contest Curtain rise -#define SE_C_MAKU_D 98 // Contest Curtain fall -#define SE_C_PASI 99 -#define SE_C_SYU 100 -#define SE_C_PIKON 101 // Pokémon Appears in Contest -#define SE_REAPOKE 102 // Shiny Pokémon -#define SE_OP_BASYU 103 // Opening Movie -> Title Screen whoosh -#define SE_BT_START 104 // Battle Mugshot whoosh -#define SE_DENDOU 105 // Audience Cheering -#define SE_JIHANKI 106 // Vending Machine -#define SE_TAMA 107 // Orb Used -#define SE_Z_SCROLL 108 // Pokédex Scrolling -#define SE_Z_PAGE 109 // Pokédex Page -#define SE_PN_ON 110 // PokéNav On -#define SE_PN_OFF 111 // PokéNav Off -#define SE_Z_SEARCH 112 // Pokédex Search -#define SE_TAMAGO 113 // Egg hatch -#define SE_TB_START 114 // Battle - Poké Ball Tray slide in -#define SE_TB_KON 115 // Battle - Poké Ball Tray ball sound -#define SE_TB_KARA 116 // Battle - Poké Ball Tray slide out -#define SE_BIDORO 117 -#define SE_W085 118 // Thunderbolt -#define SE_W085B 119 // Thunderbolt 2 -#define SE_W231 120 // Harden -#define SE_W171 121 // Nightmare -#define SE_W233 122 // Vital Throw -#define SE_W233B 123 // Vital Throw 2 -#define SE_W145 124 // Bubble -#define SE_W145B 125 // Bubble 2 -#define SE_W145C 126 // Bubble 3 -#define SE_W240 127 // Rain Dance -#define SE_W015 128 // Cut -#define SE_W081 129 // String Shot -#define SE_W081B 130 // String Shot 2 -#define SE_W088 131 // Rock Throw -#define SE_W016 132 // Gust -#define SE_W016B 133 // Gust 2 -#define SE_W003 134 // DoubleSlap -#define SE_W104 135 // Double Team -#define SE_W013 136 // Razor Wind -#define SE_W196 137 // Icy Wind -#define SE_W086 138 // Thunder Wave -#define SE_W004 139 // Comet Punch -#define SE_W025 140 // Mega Kick -#define SE_W025B 141 // Mega Kick 2 -#define SE_W152 142 // Crabhammer -#define SE_W026 143 // Jump Kick -#define SE_W172 144 // Flame Wheel -#define SE_W172B 145 // Flame Wheel 2 -#define SE_W053 146 // Flamethrower -#define SE_W007 147 // Fire Punch -#define SE_W092 148 // Toxic -#define SE_W221 149 // Sacred Fire -#define SE_W221B 150 // Sacred Fire 2 -#define SE_W052 151 // Ember -#define SE_W036 152 // Take Down -#define SE_W059 153 // Blizzard -#define SE_W059B 154 // Blizzard 2 -#define SE_W010 155 // Scratch -#define SE_W011 156 // Vicegrip -#define SE_W017 157 // Wing Attack -#define SE_W019 158 // Fly -#define SE_W028 159 // Sand-Attack -#define SE_W013B 160 // Razor Wind 2 -#define SE_W044 161 // Bite -#define SE_W029 162 // Headbutt -#define SE_W057 163 // Surf -#define SE_W056 164 // Hydro Pump -#define SE_W250 165 // Whirlpool -#define SE_W030 166 // Horn Attack -#define SE_W039 167 // Tail Whip -#define SE_W054 168 // Mist -#define SE_W077 169 // PoisonPowder -#define SE_W020 170 // Bind -#define SE_W082 171 // Dragon Rage -#define SE_W047 172 // Sing -#define SE_W195 173 // Perish Song -#define SE_W006 174 // Pay Day -#define SE_W091 175 // Dig -#define SE_W146 176 // Dizzy Punch -#define SE_W120 177 // Self-Destruct -#define SE_W153 178 // Explosion -#define SE_W071B 179 // Absorb 2 -#define SE_W071 180 // Absorb -#define SE_W103 181 // Screech -#define SE_W062 182 // BubbleBeam -#define SE_W062B 183 // BubbleBeam 2 -#define SE_W048 184 // Supersonic -#define SE_W187 185 // Belly Drum -#define SE_W118 186 // Metronome -#define SE_W155 187 // Bonemerang -#define SE_W122 188 // Lick -#define SE_W060 189 // Psybeam -#define SE_W185 190 // Faint Attack -#define SE_W014 191 // Swords Dance -#define SE_W043 192 // Leer -#define SE_W207 193 // Swagger -#define SE_W207B 194 // Swagger 2 -#define SE_W215 195 // Heal Bell -#define SE_W109 196 // Confuse Ray -#define SE_W173 197 // Snore -#define SE_W280 198 // Brick Break -#define SE_W202 199 // Giga Drain -#define SE_W060B 200 // Psybeam 2 -#define SE_W076 201 // SolarBeam -#define SE_W080 202 // Petal Dance -#define SE_W100 203 // Teleport -#define SE_W107 204 // Minimize -#define SE_W166 205 // Sketch -#define SE_W129 206 // Swift -#define SE_W115 207 // Reflect -#define SE_W112 208 // Barrier -#define SE_W197 209 // Detect -#define SE_W199 210 // Lock-On -#define SE_W236 211 // Moonlight -#define SE_W204 212 // Charm -#define SE_W268 213 // Charge -#define SE_W070 214 // Strength -#define SE_W063 215 // Hyper Beam -#define SE_W127 216 // Waterfall -#define SE_W179 217 // Reversal -#define SE_W151 218 // Acid Armor -#define SE_W201 219 // Sandstorm -#define SE_W161 220 // Tri-Attack -#define SE_W161B 221 // Tri-Attack 2 -#define SE_W227 222 // Encore -#define SE_W227B 223 // Encore 2 -#define SE_W226 224 // Baton Pass -#define SE_W208 225 // Milk Drink -#define SE_W213 226 // Attract -#define SE_W213B 227 // Attract 2 -#define SE_W234 228 // Morning Sun -#define SE_W260 229 // Flatter -#define SE_W328 230 // Sand Tomb -#define SE_W320 231 // GrassWhistle -#define SE_W255 232 // Spit Up -#define SE_W291 233 // Dive -#define SE_W089 234 // Earthquake -#define SE_W239 235 // Twister -#define SE_W230 236 // Sweet Scent -#define SE_W281 237 // Yawn -#define SE_W327 238 // Sky Uppercut -#define SE_W287 239 // Stat Increased -#define SE_W257 240 // Heat Wave -#define SE_W253 241 // Uproar -#define SE_W258 242 // Hail -#define SE_W322 243 // Cosmic Power -#define SE_W298 244 // Teeter Dance -#define SE_W287B 245 // Stat Decreased -#define SE_W114 246 // Haze -#define SE_W063B 247 // Hyper Beam 2 -#define MUS_STOP 349 -#define MUS_TETSUJI 350 // Littleroot Town Test 'TETSUJI' -#define MUS_FIELD13 351 // GSC - Route 38 -#define MUS_KACHI22 352 // Wild Pokémon Defeated -#define MUS_KACHI2 353 // Wild Pokémon Defeated with Intro -#define MUS_KACHI3 354 // Gym Leader Defeated -#define MUS_KACHI5 355 // Victory! Elite Four -#define MUS_PCC 356 // Crystal - Pokémon Communication Center -#define MUS_NIBI 357 // GSC - Viridian/Saffron/Pewter/etc -#define MUS_SUIKUN 358 // Crystal - Battle! Legendary Beasts -#define MUS_DOORO1 359 // Route 101 -#define MUS_DOORO_X1 360 // Route 110 -#define MUS_DOORO_X3 361 // Route 120 -#define MUS_MACHI_S2 362 // Petalburg City -#define MUS_MACHI_S4 363 // Oldale Town -#define MUS_GIM 364 // Gym -#define MUS_NAMINORI 365 // Surfing -#define MUS_DAN01 366 // Caves and Darkness -#define MUS_FANFA1 367 // Level Up! -#define MUS_ME_ASA 368 // Pokémon Healed -#define MUS_ME_BACHI 369 // Obtained a Badge! -#define MUS_FANFA4 370 // Obtained an Item! -#define MUS_FANFA5 371 // Your Pokémon Just Evolved! -#define MUS_ME_WAZA 372 // Obtained a TM/HM! -#define MUS_BIJYUTU 373 // Lilycove Musseum -#define MUS_DOORO_X4 374 // Route 122/Intro -#define MUS_FUNE_KAN 375 // Slateport Museum -#define MUS_ME_SHINKA 376 // Evolution Intro -#define MUS_SHINKA 377 // Evolution -#define MUS_ME_WASURE 378 // Move Deleted -#define MUS_SYOUJOEYE 379 // Encounter! Tuber -#define MUS_BOYEYE 380 // Encounter! Boy -#define MUS_DAN02 381 // Abandoned Ship -#define MUS_MACHI_S3 382 // Fortree City -#define MUS_ODAMAKI 383 // Professor Birch's Lab -#define MUS_B_TOWER 384 // Battle Tower (RS) -#define MUS_SWIMEYE 385 // Encounter! Swimmer -#define MUS_DAN03 386 // Meteor Falls -#define MUS_ME_KINOMI 387 // Obtained a Berry! -#define MUS_ME_TAMA 388 // Awakening the Super-Ancient Pokémon -#define MUS_ME_B_BIG 389 // Slots Jackpot! -#define MUS_ME_B_SMALL 390 // Slots Victory! -#define MUS_ME_ZANNEN 391 // Too bad! -#define MUS_BD_TIME 392 // Roulette! -#define MUS_TEST1 393 // Contest Test 1 -#define MUS_TEST2 394 // Contest Test 2 -#define MUS_TEST3 395 // Contest Test 3 -#define MUS_TEST4 396 // Contest Test 4 -#define MUS_TEST 397 // Encounter! Gentleman (Test?) -#define MUS_GOMACHI0 398 // Verdanturf Town -#define MUS_GOTOWN 399 // Rustboro City -#define MUS_POKECEN 400 // Pokémon Center -#define MUS_NEXTROAD 401 // Route 104 -#define MUS_GRANROAD 402 // Route 119 -#define MUS_CYCLING 403 // Cycling -#define MUS_FRIENDLY 404 // Pokémart -#define MUS_MISHIRO 405 // Littleroot Town -#define MUS_TOZAN 406 // Sky Pillar -#define MUS_GIRLEYE 407 // Encounter! Girl -#define MUS_MINAMO 408 // Lilycove City -#define MUS_ASHROAD 409 // Route 111 -#define MUS_EVENT0 410 // Help me! -#define MUS_DEEPDEEP 411 // Underwater -#define MUS_KACHI1 412 // Victory! Trainer -#define MUS_TITLE3 413 // Title Screen -#define MUS_DEMO1 414 // Opening Movie -#define MUS_GIRL_SUP 415 // Encounter! May -#define MUS_HAGESHII 416 // Encounter! Biker -#define MUS_KAKKOII 417 // Encounter! Electric Trainer -#define MUS_KAZANBAI 418 // Route 113 -#define MUS_AQA_0 419 // Encounter! Team Aqua -#define MUS_TSURETEK 420 // Follow Me! -#define MUS_BOY_SUP 421 // Encounter! Brendan -#define MUS_RAINBOW 422 // Ever Grande City -#define MUS_AYASII 423 // Encounter! Psychic -#define MUS_KACHI4 424 // Victory! Aqua/Magma Grunt -#define MUS_ROPEWAY 425 // Cable Car -#define MUS_CASINO 426 // Game Corner -#define MUS_HIGHTOWN 427 // Dewford Town -#define MUS_SAFARI 428 // Safari Zone -#define MUS_C_ROAD 429 // Victory Toad -#define MUS_AJITO 430 // Aqua/Magma Hideout -#define MUS_M_BOAT 431 // Sailing -#define MUS_M_DUNGON 432 // Mt. Pyre (Inside) -#define MUS_FINECITY 433 // Slateport City -#define MUS_MACHUPI 434 // Mt. Pyre (Outside) -#define MUS_P_SCHOOL 435 // Pokémon Trainer's School -#define MUS_DENDOU 436 // Hall of Fame -#define MUS_TONEKUSA 437 // Lavaridge Town -#define MUS_MABOROSI 438 // Sealed Chamber -#define MUS_CON_FAN 439 // You are the Champion! -#define MUS_CONTEST0 440 // Pokémon Contest -#define MUS_MGM0 441 // Encounter! Team Magma -#define MUS_T_BATTLE 442 // Opening Battle -#define MUS_OOAME 443 // The Flood -#define MUS_HIDERI 444 // The Drought -#define MUS_RUNECITY 445 // Sootopolis City -#define MUS_CON_K 446 // Berry Blending Results -#define MUS_EIKOU_R 447 // Hall of Fame -#define MUS_KARAKURI 448 // Trick House -#define MUS_HUTAGO 449 // Encounter! Kid -#define MUS_SITENNOU 450 // Encounter! Elite Four -#define MUS_YAMA_EYE 451 // Encounter! Hiker -#define MUS_CONLOBBY 452 // Contest Lobby -#define MUS_INTER_V 453 // Encounter! Gabby and Ty -#define MUS_DAIGO 454 // Encounter! Wallace -#define MUS_THANKFOR 455 // Credits -#define MUS_END 456 // The End -#define MUS_BATTLE27 457 // Battle! Wild Pokémon -#define MUS_BATTLE31 458 // Battle! Team Aqua/Magma -#define MUS_BATTLE20 459 // Battle! Trainer -#define MUS_BATTLE32 460 // Battle! Gym Leader -#define MUS_BATTLE33 461 // Battle! Champion -#define MUS_BATTLE36 462 // Battle! Regi Trio -#define MUS_BATTLE34 463 // Battle! Legendary Pokémon -#define MUS_BATTLE35 464 // Battle! Rival -#define MUS_BATTLE38 465 // Battle! Elite Four -#define MUS_BATTLE30 466 // Battle! Archie/Maxie +// Original JP names listed on right, along with any additional notes -#define MUS_ROUTE_118 0x7FFF // What is this for? +#define MUS_DUMMY 0 // MUS_DUMMY +#define SE_USE_ITEM 1 // SE_KAIFUKU +#define SE_PC_LOGIN 2 // SE_PC_LOGIN +#define SE_PC_OFF 3 // SE_PC_OFF +#define SE_PC_ON 4 // SE_PC_ON +#define SE_SELECT 5 // SE_SELECT +#define SE_WIN_OPEN 6 // SE_WIN_OPEN +#define SE_WALL_HIT 7 // SE_WALL_HIT +#define SE_DOOR 8 // SE_DOOR +#define SE_EXIT 9 // SE_KAIDAN +#define SE_LEDGE 10 // SE_DANSA +#define SE_BIKE_BELL 11 // SE_JITENSYA +#define SE_NOT_EFFECTIVE 12 // SE_KOUKA_L +#define SE_EFFECTIVE 13 // SE_KOUKA_M +#define SE_SUPER_EFFECTIVE 14 // SE_KOUKA_H +#define SE_BALL_OPEN 15 // SE_BOWA2 +#define SE_FAINT 16 // SE_POKE_DEAD +#define SE_FLEE 17 // SE_NIGERU +#define SE_SLIDING_DOOR 18 // SE_JIDO_DOA +#define SE_SHIP 19 // SE_NAMINORI +#define SE_BANG 20 // SE_BAN +#define SE_PIN 21 // SE_PIN (General "good", commonly for "!") +#define SE_BOO 22 // SE_BOO (General "bad") +#define SE_BALL 23 // SE_BOWA (Giving Poké Ball to nurse, Poké Ball shake, etc) +#define SE_CONTEST_PLACE 24 // SE_JYUNI +#define SE_A 25 // SE_A (Bard sounds) +#define SE_I 26 // SE_I +#define SE_U 27 // SE_U +#define SE_E 28 // SE_E +#define SE_O 29 // SE_O +#define SE_N 30 // SE_N +#define SE_SUCCESS 31 // SE_SEIKAI +#define SE_FAILURE 32 // SE_HAZURE +#define SE_EXP 33 // SE_EXP +#define SE_BIKE_HOP 34 // SE_JITE_PYOKO +#define SE_SWITCH 35 // SE_MU_PACHI +#define SE_CLICK 36 // SE_TK_KASYA +#define SE_FU_ZAKU 37 // SE_FU_ZAKU (Unknown purpose, unused) +#define SE_CONTEST_CONDITION_LOSE 38 // SE_FU_ZAKU2 +#define SE_LAVARIDGE_FALL_WARP 39 // SE_FU_ZUZUZU +#define SE_ICE_STAIRS 40 // SE_RU_GASHIN +#define SE_ICE_BREAK 41 // SE_RU_GASYAN +#define SE_ICE_CRACK 42 // SE_RU_BARI +#define SE_FALL 43 // SE_RU_HYUU +#define SE_UNLOCK 44 // SE_KI_GASYAN +#define SE_WARP_IN 45 // SE_TK_WARPIN +#define SE_WARP_OUT 46 // SE_TK_WARPOUT +#define SE_REPEL 47 // SE_TU_SAA +#define SE_ROTATING_GATE 48 // SE_HI_TURUN +#define SE_TRUCK_MOVE 49 // SE_TRACK_MOVE +#define SE_TRUCK_STOP 50 // SE_TRACK_STOP +#define SE_TRUCK_UNLOAD 51 // SE_TRACK_HAIKI +#define SE_TRUCK_DOOR 52 // SE_TRACK_DOOR +#define SE_BERRY_BLENDER 53 // SE_MOTER +#define SE_CARD 54 // SE_CARD +#define SE_SAVE 55 // SE_SAVE +#define SE_BALL_BOUNCE_1 56 // SE_KON +#define SE_BALL_BOUNCE_2 57 // SE_KON2 +#define SE_BALL_BOUNCE_3 58 // SE_KON3 +#define SE_BALL_BOUNCE_4 59 // SE_KON4 +#define SE_BALL_TRADE 60 // SE_SUIKOMU +#define SE_BALL_THROW 61 // SE_NAGERU +#define SE_NOTE_C 62 // SE_TOY_C +#define SE_NOTE_D 63 // SE_TOY_D +#define SE_NOTE_E 64 // SE_TOY_E +#define SE_NOTE_F 65 // SE_TOY_F +#define SE_NOTE_G 66 // SE_TOY_G +#define SE_NOTE_A 67 // SE_TOY_A +#define SE_NOTE_B 68 // SE_TOY_B +#define SE_NOTE_C_HIGH 69 // SE_TOY_C1 +#define SE_PUDDLE 70 // SE_MIZU +#define SE_BRIDGE_WALK 71 // SE_HASHI +#define SE_ITEMFINDER 72 // SE_DAUGI +#define SE_DING_DONG 73 // SE_PINPON +#define SE_BALLOON_RED 74 // SE_FUUSEN1 +#define SE_BALLOON_BLUE 75 // SE_FUUSEN2 +#define SE_BALLOON_YELLOW 76 // SE_FUUSEN3 +#define SE_BREAKABLE_DOOR 77 // SE_TOY_KABE +#define SE_MUD_BALL 78 // SE_TOY_DANGO +#define SE_FIELD_POISON 79 // SE_DOKU +#define SE_ESCALATOR 80 // SE_ESUKA +#define SE_THUNDERSTORM 81 // SE_T_AME +#define SE_THUNDERSTORM_STOP 82 // SE_T_AME_E +#define SE_DOWNPOUR 83 // SE_T_OOAME +#define SE_DOWNPOUR_STOP 84 // SE_T_OOAME_E +#define SE_RAIN 85 // SE_T_KOAME +#define SE_RAIN_STOP 86 // SE_T_KOAME_E +#define SE_THUNDER 87 // SE_T_KAMI +#define SE_THUNDER2 88 // SE_T_KAMI2 +#define SE_ELEVATOR 89 // SE_ELEBETA +#define SE_LOW_HEALTH 90 // SE_HINSI +#define SE_EXP_MAX 91 // SE_EXPMAX +#define SE_ROULETTE_BALL 92 // SE_TAMAKORO +#define SE_ROULETTE_BALL2 93 // SE_TAMAKORO_E +#define SE_TAILLOW_WING_FLAP 94 // SE_BASABASA +#define SE_SHOP 95 // SE_REGI +#define SE_CONTEST_HEART 96 // SE_C_GAJI +#define SE_CONTEST_CURTAIN_RISE 97 // SE_C_MAKU_U +#define SE_CONTEST_CURTAIN_FALL 98 // SE_C_MAKU_D +#define SE_CONTEST_ICON_CHANGE 99 // SE_C_PASI +#define SE_CONTEST_ICON_CLEAR 100 // SE_C_SYU +#define SE_CONTEST_MONS_TURN 101 // SE_C_PIKON +#define SE_SHINY 102 // SE_REAPOKE +#define SE_INTRO_BLAST 103 // SE_OP_BASYU +#define SE_MUGSHOT 104 // SE_BT_START +#define SE_APPLAUSE 105 // SE_DENDOU +#define SE_VEND 106 // SE_JIHANKI +#define SE_ORB 107 // SE_TAMA +#define SE_DEX_SCROLL 108 // SE_Z_SCROLL +#define SE_DEX_PAGE 109 // SE_Z_PAGE +#define SE_POKENAV_ON 110 // SE_PN_ON +#define SE_POKENAV_OFF 111 // SE_PN_OFF +#define SE_DEX_SEARCH 112 // SE_Z_SEARCH +#define SE_EGG_HATCH 113 // SE_TAMAGO +#define SE_BALL_TRAY_ENTER 114 // SE_TB_START +#define SE_BALL_TRAY_BALL 115 // SE_TB_KON +#define SE_BALL_TRAY_EXIT 116 // SE_TB_KARA +#define SE_GLASS_FLUTE 117 // SE_BIDORO +// Move SFX +#define SE_M_THUNDERBOLT 118 // SE_W085 +#define SE_M_THUNDERBOLT2 119 // SE_W085B +#define SE_M_HARDEN 120 // SE_W231 +#define SE_M_NIGHTMARE 121 // SE_W171 +#define SE_M_VITAL_THROW 122 // SE_W233 +#define SE_M_VITAL_THROW2 123 // SE_W233B +#define SE_M_BUBBLE 124 // SE_W145 +#define SE_M_BUBBLE2 125 // SE_W145B +#define SE_M_BUBBLE3 126 // SE_W145C +#define SE_M_RAIN_DANCE 127 // SE_W240 +#define SE_M_CUT 128 // SE_W015 +#define SE_M_STRING_SHOT 129 // SE_W081 +#define SE_M_STRING_SHOT2 130 // SE_W081B +#define SE_M_ROCK_THROW 131 // SE_W088 +#define SE_M_GUST 132 // SE_W016 +#define SE_M_GUST2 133 // SE_W016B +#define SE_M_DOUBLE_SLAP 134 // SE_W003 +#define SE_M_DOUBLE_TEAM 135 // SE_W104 +#define SE_M_RAZOR_WIND 136 // SE_W013 +#define SE_M_ICY_WIND 137 // SE_W196 +#define SE_M_THUNDER_WAVE 138 // SE_W086 +#define SE_M_COMET_PUNCH 139 // SE_W004 +#define SE_M_MEGA_KICK 140 // SE_W025 +#define SE_M_MEGA_KICK2 141 // SE_W025B +#define SE_M_CRABHAMMER 142 // SE_W152 +#define SE_M_JUMP_KICK 143 // SE_W026 +#define SE_M_FLAME_WHEEL 144 // SE_W172 +#define SE_M_FLAME_WHEEL2 145 // SE_W172B +#define SE_M_FLAMETHROWER 146 // SE_W053 +#define SE_M_FIRE_PUNCH 147 // SE_W007 +#define SE_M_TOXIC 148 // SE_W092 +#define SE_M_SACRED_FIRE 149 // SE_W221 +#define SE_M_SACRED_FIRE2 150 // SE_W221B +#define SE_M_EMBER 151 // SE_W052 +#define SE_M_TAKE_DOWN 152 // SE_W036 +#define SE_M_BLIZZARD 153 // SE_W059 +#define SE_M_BLIZZARD2 154 // SE_W059B +#define SE_M_SCRATCH 155 // SE_W010 +#define SE_M_VICEGRIP 156 // SE_W011 +#define SE_M_WING_ATTACK 157 // SE_W017 +#define SE_M_FLY 158 // SE_W019 +#define SE_M_SAND_ATTACK 159 // SE_W028 +#define SE_M_RAZOR_WIND2 160 // SE_W013B +#define SE_M_BITE 161 // SE_W044 +#define SE_M_HEADBUTT 162 // SE_W029 +#define SE_M_SURF 163 // SE_W057 +#define SE_M_HYDRO_PUMP 164 // SE_W056 +#define SE_M_WHIRLPOOL 165 // SE_W250 +#define SE_M_HORN_ATTACK 166 // SE_W030 +#define SE_M_TAIL_WHIP 167 // SE_W039 +#define SE_M_MIST 168 // SE_W054 +#define SE_M_POISON_POWDER 169 // SE_W077 +#define SE_M_BIND 170 // SE_W020 +#define SE_M_DRAGON_RAGE 171 // SE_W082 +#define SE_M_SING 172 // SE_W047 +#define SE_M_PERISH_SONG 173 // SE_W195 +#define SE_M_PAY_DAY 174 // SE_W006 +#define SE_M_DIG 175 // SE_W091 +#define SE_M_DIZZY_PUNCH 176 // SE_W146 +#define SE_M_SELF_DESTRUCT 177 // SE_W120 +#define SE_M_EXPLOSION 178 // SE_W153 +#define SE_M_ABSORB_2 179 // SE_W071B +#define SE_M_ABSORB 180 // SE_W071 +#define SE_M_SCREECH 181 // SE_W103 +#define SE_M_BUBBLE_BEAM 182 // SE_W062 +#define SE_M_BUBBLE_BEAM2 183 // SE_W062B +#define SE_M_SUPERSONIC 184 // SE_W048 +#define SE_M_BELLY_DRUM 185 // SE_W187 +#define SE_M_METRONOME 186 // SE_W118 +#define SE_M_BONEMERANG 187 // SE_W155 +#define SE_M_LICK 188 // SE_W122 +#define SE_M_PSYBEAM 189 // SE_W060 +#define SE_M_FAINT_ATTACK 190 // SE_W185 +#define SE_M_SWORDS_DANCE 191 // SE_W014 +#define SE_M_LEER 192 // SE_W043 +#define SE_M_SWAGGER 193 // SE_W207 +#define SE_M_SWAGGER2 194 // SE_W207B +#define SE_M_HEAL_BELL 195 // SE_W215 +#define SE_M_CONFUSE_RAY 196 // SE_W109 +#define SE_M_SNORE 197 // SE_W173 +#define SE_M_BRICK_BREAK 198 // SE_W280 +#define SE_M_GIGA_DRAIN 199 // SE_W202 +#define SE_M_PSYBEAM2 200 // SE_W060B +#define SE_M_SOLAR_BEAM 201 // SE_W076 +#define SE_M_PETAL_DANCE 202 // SE_W080 +#define SE_M_TELEPORT 203 // SE_W100 +#define SE_M_MINIMIZE 204 // SE_W107 +#define SE_M_SKETCH 205 // SE_W166 +#define SE_M_SWIFT 206 // SE_W129 +#define SE_M_REFLECT 207 // SE_W115 +#define SE_M_BARRIER 208 // SE_W112 +#define SE_M_DETECT 209 // SE_W197 +#define SE_M_LOCK_ON 210 // SE_W199 +#define SE_M_MOONLIGHT 211 // SE_W236 +#define SE_M_CHARM 212 // SE_W204 +#define SE_M_CHARGE 213 // SE_W268 +#define SE_M_STRENGTH 214 // SE_W070 +#define SE_M_HYPER_BEAM 215 // SE_W063 +#define SE_M_WATERFALL 216 // SE_W127 +#define SE_M_REVERSAL 217 // SE_W179 +#define SE_M_ACID_ARMOR 218 // SE_W151 +#define SE_M_SANDSTORM 219 // SE_W201 +#define SE_M_TRI_ATTACK 220 // SE_W161 +#define SE_M_TRI_ATTACK2 221 // SE_W161B +#define SE_M_ENCORE 222 // SE_W227 +#define SE_M_ENCORE2 223 // SE_W227B +#define SE_M_BATON_PASS 224 // SE_W226 +#define SE_M_MILK_DRINK 225 // SE_W208 +#define SE_M_ATTRACT 226 // SE_W213 +#define SE_M_ATTRACT2 227 // SE_W213B +#define SE_M_MORNING_SUN 228 // SE_W234 +#define SE_M_FLATTER 229 // SE_W260 +#define SE_M_SAND_TOMB 230 // SE_W328 +#define SE_M_GRASSWHISTLE 231 // SE_W320 +#define SE_M_SPIT_UP 232 // SE_W255 +#define SE_M_DIVE 233 // SE_W291 +#define SE_M_EARTHQUAKE 234 // SE_W089 +#define SE_M_TWISTER 235 // SE_W239 +#define SE_M_SWEET_SCENT 236 // SE_W230 +#define SE_M_YAWN 237 // SE_W281 +#define SE_M_SKY_UPPERCUT 238 // SE_W327 +#define SE_M_STAT_INCREASE 239 // SE_W287 +#define SE_M_HEAT_WAVE 240 // SE_W257 +#define SE_M_UPROAR 241 // SE_W253 +#define SE_M_HAIL 242 // SE_W258 +#define SE_M_COSMIC_POWER 243 // SE_W322 +#define SE_M_TEETER_DANCE 244 // SE_W298 +#define SE_M_STAT_DECREASE 245 // SE_W287B +#define SE_M_HAZE 246 // SE_W114 +#define SE_M_HYPER_BEAM2 247 // SE_W063B + +// Music +#define MUS_STOP 349 // MUS_STOP +#define MUS_LITTLEROOT_TEST 350 // MUS_TETSUJI +#define MUS_GSC_ROUTE38 351 // MUS_FIELD13 +#define MUS_CAUGHT 352 // MUS_KACHI22 +#define MUS_VICTORY_WILD 353 // MUS_KACHI2 +#define MUS_VICTORY_GYM_LEADER 354 // MUS_KACHI3 +#define MUS_VICTORY_LEAGUE 355 // MUS_KACHI5 +#define MUS_C_COMM_CENTER 356 // MUS_PCC +#define MUS_GSC_PEWTER 357 // MUS_NIBI +#define MUS_C_VS_LEGEND_BEAST 358 // MUS_SUIKUN +#define MUS_ROUTE101 359 // MUS_DOORO1 +#define MUS_ROUTE110 360 // MUS_DOORO_X1 +#define MUS_ROUTE120 361 // MUS_DOORO_X3 +#define MUS_PETALBURG 362 // MUS_MACHI_S2 +#define MUS_OLDALE 363 // MUS_MACHI_S4 +#define MUS_GYM 364 // MUS_GIM +#define MUS_SURF 365 // MUS_NAMINORI +#define MUS_PETALBURG_WOODS 366 // MUS_DAN01 +#define MUS_LEVEL_UP 367 // MUS_FANFA1 +#define MUS_HEAL 368 // MUS_ME_ASA +#define MUS_OBTAIN_BADGE 369 // MUS_ME_BACHI +#define MUS_OBTAIN_ITEM 370 // MUS_FANFA4 +#define MUS_EVOLVED 371 // MUS_FANFA5 +#define MUS_OBTAIN_TMHM 372 // MUS_ME_WAZA +#define MUS_LILYCOVE_MUSEUM 373 // MUS_BIJYUTU +#define MUS_ROUTE122 374 // MUS_DOORO_X4 +#define MUS_OCEANIC_MUSEUM 375 // MUS_FUNE_KAN +#define MUS_EVOLUTION_INTRO 376 // MUS_ME_SHINKA +#define MUS_EVOLUTION 377 // MUS_SHINKA +#define MUS_MOVE_DELETED 378 // MUS_ME_WASURE +#define MUS_ENCOUNTER_GIRL 379 // MUS_SYOUJOEYE +#define MUS_ENCOUNTER_MALE 380 // MUS_BOYEYE +#define MUS_ABANDONED_SHIP 381 // MUS_DAN02 +#define MUS_FORTREE 382 // MUS_MACHI_S3 +#define MUS_BIRCH_LAB 383 // MUS_ODAMAKI +#define MUS_B_TOWER 384 // MUS_B_TOWER +#define MUS_ENCOUNTER_SWIMMER 385 // MUS_SWIMEYE +#define MUS_CAVE_OF_ORIGIN 386 // MUS_DAN03 +#define MUS_OBTAIN_BERRY 387 // MUS_ME_KINOMI +#define MUS_AWAKEN_LEGEND 388 // MUS_ME_TAMA +#define MUS_SLOTS_JACKPOT 389 // MUS_ME_B_BIG +#define MUS_SLOTS_WIN 390 // MUS_ME_B_SMALL +#define MUS_TOO_BAD 391 // MUS_ME_ZANNEN +#define MUS_ROULETTE 392 // MUS_BD_TIME +#define MUS_LINK_CONTEST_P1 393 // MUS_TEST1 +#define MUS_LINK_CONTEST_P2 394 // MUS_TEST2 +#define MUS_LINK_CONTEST_P3 395 // MUS_TEST3 +#define MUS_LINK_CONTEST_P4 396 // MUS_TEST4 +#define MUS_ENCOUNTER_RICH 397 // MUS_TEST +#define MUS_VERDANTURF 398 // MUS_GOMACHI0 +#define MUS_RUSTBORO 399 // MUS_GOTOWN +#define MUS_POKE_CENTER 400 // MUS_POKECEN +#define MUS_ROUTE104 401 // MUS_NEXTROAD +#define MUS_ROUTE119 402 // MUS_GRANROAD +#define MUS_CYCLING 403 // MUS_CYCLING +#define MUS_POKE_MART 404 // MUS_FRIENDLY +#define MUS_LITTLEROOT 405 // MUS_MISHIRO +#define MUS_MT_CHIMNEY 406 // MUS_TOZAN +#define MUS_ENCOUNTER_FEMALE 407 // MUS_GIRLEYE +#define MUS_LILYCOVE 408 // MUS_MINAMO +#define MUS_ROUTE111 409 // MUS_ASHROAD +#define MUS_HELP 410 // MUS_EVENT0 +#define MUS_UNDERWATER 411 // MUS_DEEPDEEP +#define MUS_VICTORY_TRAINER 412 // MUS_KACHI1 +#define MUS_TITLE 413 // MUS_TITLE3 +#define MUS_INTRO 414 // MUS_DEMO1 +#define MUS_ENCOUNTER_MAY 415 // MUS_GIRL_SUP +#define MUS_ENCOUNTER_INTENSE 416 // MUS_HAGESHII +#define MUS_ENCOUNTER_COOL 417 // MUS_KAKKOII +#define MUS_ROUTE113 418 // MUS_KAZANBAI +#define MUS_ENCOUNTER_AQUA 419 // MUS_AQA_0 +#define MUS_FOLLOW_ME 420 // MUS_TSURETEK +#define MUS_ENCOUNTER_BRENDAN 421 // MUS_BOY_SUP +#define MUS_EVER_GRANDE 422 // MUS_RAINBOW +#define MUS_ENCOUNTER_SUSPICIOUS 423 // MUS_AYASII +#define MUS_VICTORY_AQUA_MAGMA 424 // MUS_KACHI4 +#define MUS_CABLE_CAR 425 // MUS_ROPEWAY +#define MUS_GAME_CORNER 426 // MUS_CASINO +#define MUS_DEWFORD 427 // MUS_HIGHTOWN +#define MUS_SAFARI_ZONE 428 // MUS_SAFARI +#define MUS_VICTORY_ROAD 429 // MUS_C_ROAD +#define MUS_AQUA_MAGMA_HIDEOUT 430 // MUS_AJITO +#define MUS_SAILING 431 // MUS_M_BOAT +#define MUS_MT_PYRE 432 // MUS_M_DUNGON +#define MUS_SLATEPORT 433 // MUS_FINECITY +#define MUS_MT_PYRE_EXTERIOR 434 // MUS_MACHUPI +#define MUS_SCHOOL 435 // MUS_P_SCHOOL +#define MUS_HALL_OF_FAME 436 // MUS_DENDOU +#define MUS_FALLARBOR 437 // MUS_TONEKUSA +#define MUS_SEALED_CHAMBER 438 // MUS_MABOROSI +#define MUS_CONTEST_WINNER 439 // MUS_CON_FAN +#define MUS_CONTEST 440 // MUS_CONTEST0 +#define MUS_ENCOUNTER_MAGMA 441 // MUS_MGM0 +#define MUS_INTRO_BATTLE 442 // MUS_T_BATTLE +#define MUS_WEATHER_KYOGRE 443 // MUS_OOAME +#define MUS_WEATHER_GROUDON 444 // MUS_HIDERI +#define MUS_SOOTOPOLIS 445 // MUS_RUNECITY +#define MUS_CONTEST_RESULTS 446 // MUS_CON_K +#define MUS_HALL_OF_FAME_ROOM 447 // MUS_EIKOU_R +#define MUS_TRICK_HOUSE 448 // MUS_KARAKURI +#define MUS_ENCOUNTER_TWINS 449 // MUS_HUTAGO +#define MUS_ENCOUNTER_ELITE_FOUR 450 // MUS_SITENNOU +#define MUS_ENCOUNTER_HIKER 451 // MUS_YAMA_EYE +#define MUS_CONTEST_LOBBY 452 // MUS_CONLOBBY +#define MUS_ENCOUNTER_INTERVIEWER 453 // MUS_INTER_V +#define MUS_ENCOUNTER_CHAMPION 454 // MUS_DAIGO +#define MUS_CREDITS 455 // MUS_THANKFOR +#define MUS_END 456 // MUS_END +#define MUS_VS_WILD 457 // MUS_BATTLE27 +#define MUS_VS_AQUA_MAGMA 458 // MUS_BATTLE31 +#define MUS_VS_TRAINER 459 // MUS_BATTLE20 +#define MUS_VS_GYM_LEADER 460 // MUS_BATTLE32 +#define MUS_VS_CHAMPION 461 // MUS_BATTLE33 +#define MUS_VS_REGI 462 // MUS_BATTLE36 +#define MUS_VS_KYOGRE_GROUDON 463 // MUS_BATTLE34 +#define MUS_VS_RIVAL 464 // MUS_BATTLE35 +#define MUS_VS_ELITE_FOUR 465 // MUS_BATTLE38 +#define MUS_VS_AQUA_MAGMA_LEADER 466 // MUS_BATTLE30 +#define MUS_GSC_RADIO_TOWER_TAKEOVER 467 + +#define MUS_ROUTE_118 0x7FFF // Map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic(). #endif // GUARD_CONSTANTS_SONGS_H diff --git a/ld_script.txt b/ld_script.txt index 2606c7d1a..9dee04d9b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -793,254 +793,254 @@ SECTIONS { song_data : ALIGN(4) { - sound/songs/se_stop.o(.rodata); - sound/songs/se_kaifuku.o(.rodata); - sound/songs/se_pc_logon.o(.rodata); + sound/songs/mus_dummy.o(.rodata); + sound/songs/se_use_item.o(.rodata); + sound/songs/se_pc_login.o(.rodata); sound/songs/se_pc_off.o(.rodata); sound/songs/se_pc_on.o(.rodata); sound/songs/se_select.o(.rodata); sound/songs/se_win_open.o(.rodata); sound/songs/se_wall_hit.o(.rodata); sound/songs/se_door.o(.rodata); - sound/songs/se_kaidan.o(.rodata); - sound/songs/se_dansa.o(.rodata); - sound/songs/se_jitensya.o(.rodata); - sound/songs/se_kouka_l.o(.rodata); - sound/songs/se_kouka_m.o(.rodata); - sound/songs/se_kouka_h.o(.rodata); - sound/songs/se_bowa2.o(.rodata); - sound/songs/se_poke_dead.o(.rodata); - sound/songs/se_nigeru.o(.rodata); - sound/songs/se_jido_doa.o(.rodata); - sound/songs/se_naminori.o(.rodata); - sound/songs/se_ban.o(.rodata); + sound/songs/se_exit.o(.rodata); + sound/songs/se_ledge.o(.rodata); + sound/songs/se_bike_bell.o(.rodata); + sound/songs/se_not_effective.o(.rodata); + sound/songs/se_effective.o(.rodata); + sound/songs/se_super_effective.o(.rodata); + sound/songs/se_ball_open.o(.rodata); + sound/songs/se_faint.o(.rodata); + sound/songs/se_flee.o(.rodata); + sound/songs/se_sliding_door.o(.rodata); + sound/songs/se_ship.o(.rodata); + sound/songs/se_bang.o(.rodata); sound/songs/se_pin.o(.rodata); sound/songs/se_boo.o(.rodata); - sound/songs/se_bowa.o(.rodata); - sound/songs/se_jyuni.o(.rodata); + sound/songs/se_ball.o(.rodata); + sound/songs/se_contest_place.o(.rodata); sound/songs/se_a.o(.rodata); sound/songs/se_i.o(.rodata); sound/songs/se_u.o(.rodata); sound/songs/se_e.o(.rodata); sound/songs/se_o.o(.rodata); sound/songs/se_n.o(.rodata); - sound/songs/se_seikai.o(.rodata); - sound/songs/se_hazure.o(.rodata); + sound/songs/se_success.o(.rodata); + sound/songs/se_failure.o(.rodata); sound/songs/se_exp.o(.rodata); - sound/songs/se_jite_pyoko.o(.rodata); - sound/songs/se_mu_pachi.o(.rodata); - sound/songs/se_tk_kasya.o(.rodata); + sound/songs/se_bike_hop.o(.rodata); + sound/songs/se_switch.o(.rodata); + sound/songs/se_click.o(.rodata); sound/songs/se_fu_zaku.o(.rodata); - sound/songs/se_fu_zaku2.o(.rodata); - sound/songs/se_fu_zuzuzu.o(.rodata); - sound/songs/se_ru_gashin.o(.rodata); - sound/songs/se_ru_gasyan.o(.rodata); - sound/songs/se_ru_bari.o(.rodata); - sound/songs/se_ru_hyuu.o(.rodata); - sound/songs/se_ki_gasyan.o(.rodata); - sound/songs/se_tk_warpin.o(.rodata); - sound/songs/se_tk_warpout.o(.rodata); - sound/songs/se_tu_saa.o(.rodata); - sound/songs/se_hi_turun.o(.rodata); - sound/songs/se_track_move.o(.rodata); - sound/songs/se_track_stop.o(.rodata); - sound/songs/se_track_haik.o(.rodata); - sound/songs/se_track_door.o(.rodata); - sound/songs/se_moter.o(.rodata); + sound/songs/se_contest_condition_lose.o(.rodata); + sound/songs/se_lavaridge_fall_warp.o(.rodata); + sound/songs/se_ice_stairs.o(.rodata); + sound/songs/se_ice_break.o(.rodata); + sound/songs/se_ice_crack.o(.rodata); + sound/songs/se_fall.o(.rodata); + sound/songs/se_unlock.o(.rodata); + sound/songs/se_warp_in.o(.rodata); + sound/songs/se_warp_out.o(.rodata); + sound/songs/se_repel.o(.rodata); + sound/songs/se_rotating_gate.o(.rodata); + sound/songs/se_truck_move.o(.rodata); + sound/songs/se_truck_stop.o(.rodata); + sound/songs/se_truck_unload.o(.rodata); + sound/songs/se_truck_door.o(.rodata); + sound/songs/se_berry_blender.o(.rodata); sound/songs/se_card.o(.rodata); sound/songs/se_save.o(.rodata); - sound/songs/se_kon.o(.rodata); - sound/songs/se_kon2.o(.rodata); - sound/songs/se_kon3.o(.rodata); - sound/songs/se_kon4.o(.rodata); - sound/songs/se_suikomu.o(.rodata); - sound/songs/se_nageru.o(.rodata); - sound/songs/se_toy_c.o(.rodata); - sound/songs/se_toy_d.o(.rodata); - sound/songs/se_toy_e.o(.rodata); - sound/songs/se_toy_f.o(.rodata); - sound/songs/se_toy_g.o(.rodata); - sound/songs/se_toy_a.o(.rodata); - sound/songs/se_toy_b.o(.rodata); - sound/songs/se_toy_c1.o(.rodata); - sound/songs/se_mizu.o(.rodata); - sound/songs/se_hashi.o(.rodata); - sound/songs/se_daugi.o(.rodata); - sound/songs/se_pinpon.o(.rodata); - sound/songs/se_fuusen1.o(.rodata); - sound/songs/se_fuusen2.o(.rodata); - sound/songs/se_fuusen3.o(.rodata); - sound/songs/se_toy_kabe.o(.rodata); - sound/songs/se_toy_dango.o(.rodata); - sound/songs/se_doku.o(.rodata); - sound/songs/se_esuka.o(.rodata); - sound/songs/se_t_ame.o(.rodata); - sound/songs/se_t_ame_e.o(.rodata); - sound/songs/se_t_ooame.o(.rodata); - sound/songs/se_t_ooame_e.o(.rodata); - sound/songs/se_t_koame.o(.rodata); - sound/songs/se_t_koame_e.o(.rodata); - sound/songs/se_t_kami.o(.rodata); - sound/songs/se_t_kami2.o(.rodata); - sound/songs/se_elebeta.o(.rodata); - sound/songs/se_hinsi.o(.rodata); - sound/songs/se_expmax.o(.rodata); - sound/songs/se_tamakoro.o(.rodata); - sound/songs/se_tamakoro_e.o(.rodata); - sound/songs/se_basabasa.o(.rodata); - sound/songs/se_regi.o(.rodata); - sound/songs/se_c_gaji.o(.rodata); - sound/songs/se_c_maku_u.o(.rodata); - sound/songs/se_c_maku_d.o(.rodata); - sound/songs/se_c_pasi.o(.rodata); - sound/songs/se_c_syu.o(.rodata); - sound/songs/se_c_pikon.o(.rodata); - sound/songs/se_reapoke.o(.rodata); - sound/songs/se_op_basyu.o(.rodata); - sound/songs/se_bt_start.o(.rodata); - sound/songs/se_dendou.o(.rodata); - sound/songs/se_jihanki.o(.rodata); - sound/songs/se_tama.o(.rodata); - sound/songs/se_z_scroll.o(.rodata); - sound/songs/se_z_page.o(.rodata); - sound/songs/se_pn_on.o(.rodata); - sound/songs/se_pn_off.o(.rodata); - sound/songs/se_z_search.o(.rodata); - sound/songs/se_tamago.o(.rodata); - sound/songs/se_tb_start.o(.rodata); - sound/songs/se_tb_kon.o(.rodata); - sound/songs/se_tb_kara.o(.rodata); - sound/songs/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/se_w015.o(.rodata); - sound/songs/se_w081.o(.rodata); - sound/songs/se_w081b.o(.rodata); - sound/songs/se_w088.o(.rodata); - sound/songs/se_w016.o(.rodata); - sound/songs/se_w016b.o(.rodata); - sound/songs/se_w003.o(.rodata); - sound/songs/se_w104.o(.rodata); - sound/songs/se_w013.o(.rodata); - sound/songs/se_w196.o(.rodata); - sound/songs/se_w086.o(.rodata); - sound/songs/se_w004.o(.rodata); - sound/songs/se_w025.o(.rodata); - sound/songs/se_w025b.o(.rodata); - sound/songs/se_w152.o(.rodata); - sound/songs/se_w026.o(.rodata); - sound/songs/se_w172.o(.rodata); - sound/songs/se_w172b.o(.rodata); - sound/songs/se_w053.o(.rodata); - sound/songs/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/se_w036.o(.rodata); - sound/songs/se_w059.o(.rodata); - sound/songs/se_w059b.o(.rodata); - sound/songs/se_w010.o(.rodata); - sound/songs/se_w011.o(.rodata); - sound/songs/se_w017.o(.rodata); - sound/songs/se_w019.o(.rodata); - sound/songs/se_w028.o(.rodata); - sound/songs/se_w013b.o(.rodata); - sound/songs/se_w044.o(.rodata); - sound/songs/se_w029.o(.rodata); - sound/songs/se_w057.o(.rodata); - sound/songs/se_w056.o(.rodata); - sound/songs/se_w250.o(.rodata); - sound/songs/se_w030.o(.rodata); - sound/songs/se_w039.o(.rodata); - sound/songs/se_w054.o(.rodata); - sound/songs/se_w077.o(.rodata); - sound/songs/se_w020.o(.rodata); - sound/songs/se_w082.o(.rodata); - sound/songs/se_w047.o(.rodata); - sound/songs/se_w195.o(.rodata); - sound/songs/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/se_w014.o(.rodata); - sound/songs/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/se_ball_bounce_1.o(.rodata); + sound/songs/se_ball_bounce_2.o(.rodata); + sound/songs/se_ball_bounce_3.o(.rodata); + sound/songs/se_ball_bounce_4.o(.rodata); + sound/songs/se_ball_trade.o(.rodata); + sound/songs/se_ball_throw.o(.rodata); + sound/songs/se_note_c.o(.rodata); + sound/songs/se_note_d.o(.rodata); + sound/songs/se_note_e.o(.rodata); + sound/songs/se_note_f.o(.rodata); + sound/songs/se_note_g.o(.rodata); + sound/songs/se_note_a.o(.rodata); + sound/songs/se_note_b.o(.rodata); + sound/songs/se_note_c_high.o(.rodata); + sound/songs/se_puddle.o(.rodata); + sound/songs/se_bridge_walk.o(.rodata); + sound/songs/se_itemfinder.o(.rodata); + sound/songs/se_ding_dong.o(.rodata); + sound/songs/se_balloon_red.o(.rodata); + sound/songs/se_balloon_blue.o(.rodata); + sound/songs/se_balloon_yellow.o(.rodata); + sound/songs/se_breakable_door.o(.rodata); + sound/songs/se_mud_ball.o(.rodata); + sound/songs/se_field_poison.o(.rodata); + sound/songs/se_escalator.o(.rodata); + sound/songs/se_thunderstorm.o(.rodata); + sound/songs/se_thunderstorm_stop.o(.rodata); + sound/songs/se_downpour.o(.rodata); + sound/songs/se_downpour_stop.o(.rodata); + sound/songs/se_rain.o(.rodata); + sound/songs/se_rain_stop.o(.rodata); + sound/songs/se_thunder.o(.rodata); + sound/songs/se_thunder2.o(.rodata); + sound/songs/se_elevator.o(.rodata); + sound/songs/se_low_health.o(.rodata); + sound/songs/se_exp_max.o(.rodata); + sound/songs/se_roulette_ball.o(.rodata); + sound/songs/se_roulette_ball2.o(.rodata); + sound/songs/se_taillow_wing_flap.o(.rodata); + sound/songs/se_shop.o(.rodata); + sound/songs/se_contest_heart.o(.rodata); + sound/songs/se_contest_curtain_rise.o(.rodata); + sound/songs/se_contest_curtain_fall.o(.rodata); + sound/songs/se_contest_icon_change.o(.rodata); + sound/songs/se_contest_icon_clear.o(.rodata); + sound/songs/se_contest_mons_turn.o(.rodata); + sound/songs/se_shiny.o(.rodata); + sound/songs/se_intro_blast.o(.rodata); + sound/songs/se_mugshot.o(.rodata); + sound/songs/se_applause.o(.rodata); + sound/songs/se_vend.o(.rodata); + sound/songs/se_orb.o(.rodata); + sound/songs/se_dex_scroll.o(.rodata); + sound/songs/se_dex_page.o(.rodata); + sound/songs/se_pokenav_on.o(.rodata); + sound/songs/se_pokenav_off.o(.rodata); + sound/songs/se_dex_search.o(.rodata); + sound/songs/se_egg_hatch.o(.rodata); + sound/songs/se_ball_tray_enter.o(.rodata); + sound/songs/se_ball_tray_ball.o(.rodata); + sound/songs/se_ball_tray_exit.o(.rodata); + sound/songs/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/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/se_m_gust.o(.rodata); + sound/songs/se_m_gust2.o(.rodata); + sound/songs/se_m_double_slap.o(.rodata); + sound/songs/se_m_double_team.o(.rodata); + sound/songs/se_m_razor_wind.o(.rodata); + sound/songs/se_m_icy_wind.o(.rodata); + sound/songs/se_m_thunder_wave.o(.rodata); + sound/songs/se_m_comet_punch.o(.rodata); + sound/songs/se_m_mega_kick.o(.rodata); + sound/songs/se_m_mega_kick2.o(.rodata); + sound/songs/se_m_crabhammer.o(.rodata); + sound/songs/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/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/se_m_take_down.o(.rodata); + sound/songs/se_m_blizzard.o(.rodata); + sound/songs/se_m_blizzard2.o(.rodata); + sound/songs/se_m_scratch.o(.rodata); + sound/songs/se_m_vicegrip.o(.rodata); + sound/songs/se_m_wing_attack.o(.rodata); + sound/songs/se_m_fly.o(.rodata); + sound/songs/se_m_sand_attack.o(.rodata); + sound/songs/se_m_razor_wind2.o(.rodata); + sound/songs/se_m_bite.o(.rodata); + sound/songs/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/se_m_horn_attack.o(.rodata); + sound/songs/se_m_tail_whip.o(.rodata); + sound/songs/se_m_mist.o(.rodata); + sound/songs/se_m_poison_powder.o(.rodata); + sound/songs/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/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/se_m_swords_dance.o(.rodata); + sound/songs/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/song_248.o(.rodata); sound/songs/song_249.o(.rodata); sound/songs/song_250.o(.rodata); @@ -1092,124 +1092,124 @@ SECTIONS { sound/songs/song_296.o(.rodata); sound/songs/song_297.o(.rodata); sound/songs/song_298.o(.rodata); - sound/songs/bgm_tetsuji.o(.rodata); - sound/songs/bgm_field13.o(.rodata); - sound/songs/bgm_kachi22.o(.rodata); - sound/songs/bgm_kachi2.o(.rodata); - sound/songs/bgm_kachi3.o(.rodata); - sound/songs/bgm_kachi5.o(.rodata); - sound/songs/bgm_pcc.o(.rodata); - sound/songs/bgm_nibi.o(.rodata); - sound/songs/bgm_suikun.o(.rodata); - sound/songs/bgm_dooro1.o(.rodata); - sound/songs/bgm_dooro_x1.o(.rodata); - sound/songs/bgm_dooro_x3.o(.rodata); - sound/songs/bgm_machi_s2.o(.rodata); - sound/songs/bgm_machi_s4.o(.rodata); - sound/songs/bgm_gim.o(.rodata); - sound/songs/bgm_naminori.o(.rodata); - sound/songs/bgm_dan01.o(.rodata); - sound/songs/bgm_fanfa1.o(.rodata); - sound/songs/bgm_me_asa.o(.rodata); - sound/songs/bgm_me_bachi.o(.rodata); - sound/songs/bgm_fanfa4.o(.rodata); - sound/songs/bgm_fanfa5.o(.rodata); - sound/songs/bgm_me_waza.o(.rodata); - sound/songs/bgm_bijyutu.o(.rodata); - sound/songs/bgm_dooro_x4.o(.rodata); - sound/songs/bgm_fune_kan.o(.rodata); - sound/songs/bgm_me_shinka.o(.rodata); - sound/songs/bgm_shinka.o(.rodata); - sound/songs/bgm_me_wasure.o(.rodata); - sound/songs/bgm_syoujoeye.o(.rodata); - sound/songs/bgm_boyeye.o(.rodata); - sound/songs/bgm_dan02.o(.rodata); - sound/songs/bgm_machi_s3.o(.rodata); - sound/songs/bgm_odamaki.o(.rodata); - sound/songs/bgm_b_tower.o(.rodata); - sound/songs/bgm_swimeye.o(.rodata); - sound/songs/bgm_dan03.o(.rodata); - sound/songs/bgm_me_kinomi.o(.rodata); - sound/songs/bgm_me_tama.o(.rodata); - sound/songs/bgm_me_b_big.o(.rodata); - sound/songs/bgm_me_b_small.o(.rodata); - sound/songs/bgm_me_zannen.o(.rodata); - sound/songs/bgm_bd_time.o(.rodata); - sound/songs/bgm_test1.o(.rodata); - sound/songs/bgm_test2.o(.rodata); - sound/songs/bgm_test3.o(.rodata); - sound/songs/bgm_test4.o(.rodata); - sound/songs/bgm_test.o(.rodata); - sound/songs/bgm_gomachi0.o(.rodata); - sound/songs/bgm_gotown.o(.rodata); - sound/songs/bgm_pokecen.o(.rodata); - sound/songs/bgm_nextroad.o(.rodata); - sound/songs/bgm_granroad.o(.rodata); - sound/songs/bgm_cycling.o(.rodata); - sound/songs/bgm_friendly.o(.rodata); - sound/songs/bgm_mishiro.o(.rodata); - sound/songs/bgm_tozan.o(.rodata); - sound/songs/bgm_girleye.o(.rodata); - sound/songs/bgm_minamo.o(.rodata); - sound/songs/bgm_ashroad.o(.rodata); - sound/songs/bgm_event0.o(.rodata); - sound/songs/bgm_deepdeep.o(.rodata); - sound/songs/bgm_kachi1.o(.rodata); - sound/songs/bgm_title3.o(.rodata); - sound/songs/bgm_demo1.o(.rodata); - sound/songs/bgm_girl_sup.o(.rodata); - sound/songs/bgm_hageshii.o(.rodata); - sound/songs/bgm_kakkoii.o(.rodata); - sound/songs/bgm_kazanbai.o(.rodata); - sound/songs/bgm_aqa_0.o(.rodata); - sound/songs/bgm_tsuretek.o(.rodata); - sound/songs/bgm_boy_sup.o(.rodata); - sound/songs/bgm_rainbow.o(.rodata); - sound/songs/bgm_ayasii.o(.rodata); - sound/songs/bgm_kachi4.o(.rodata); - sound/songs/bgm_ropeway.o(.rodata); - sound/songs/bgm_casino.o(.rodata); - sound/songs/bgm_hightown.o(.rodata); - sound/songs/bgm_safari.o(.rodata); - sound/songs/bgm_c_road.o(.rodata); - sound/songs/bgm_ajito.o(.rodata); - sound/songs/bgm_m_boat.o(.rodata); - sound/songs/bgm_m_dungon.o(.rodata); - sound/songs/bgm_finecity.o(.rodata); - sound/songs/bgm_machupi.o(.rodata); - sound/songs/bgm_p_school.o(.rodata); - sound/songs/bgm_dendou.o(.rodata); - sound/songs/bgm_tonekusa.o(.rodata); - sound/songs/bgm_maborosi.o(.rodata); - sound/songs/bgm_con_fan.o(.rodata); - sound/songs/bgm_contest0.o(.rodata); - sound/songs/bgm_mgm0.o(.rodata); - sound/songs/bgm_t_battle.o(.rodata); - sound/songs/bgm_ooame.o(.rodata); - sound/songs/bgm_hideri.o(.rodata); - sound/songs/bgm_runecity.o(.rodata); - sound/songs/bgm_con_k.o(.rodata); - sound/songs/bgm_eikou_r.o(.rodata); - sound/songs/bgm_karakuri.o(.rodata); - sound/songs/bgm_hutago.o(.rodata); - sound/songs/bgm_sitennou.o(.rodata); - sound/songs/bgm_yama_eye.o(.rodata); - sound/songs/bgm_conlobby.o(.rodata); - sound/songs/bgm_inter_v.o(.rodata); - sound/songs/bgm_daigo.o(.rodata); - sound/songs/bgm_thankfor.o(.rodata); - sound/songs/bgm_end.o(.rodata); - sound/songs/bgm_battle27.o(.rodata); - sound/songs/bgm_battle31.o(.rodata); - sound/songs/bgm_battle20.o(.rodata); - sound/songs/bgm_battle32.o(.rodata); - sound/songs/bgm_battle33.o(.rodata); - sound/songs/bgm_battle36.o(.rodata); - sound/songs/bgm_battle34.o(.rodata); - sound/songs/bgm_battle35.o(.rodata); - sound/songs/bgm_battle38.o(.rodata); - sound/songs/bgm_battle30.o(.rodata); - sound/songs/bgm_radio_tower_occupied.o(.rodata); + sound/songs/mus_littleroot_test.o(.rodata); + sound/songs/mus_gsc_route38.o(.rodata); + sound/songs/mus_caught.o(.rodata); + sound/songs/mus_victory_wild.o(.rodata); + sound/songs/mus_victory_gym_leader.o(.rodata); + sound/songs/mus_victory_league.o(.rodata); + sound/songs/mus_c_comm_center.o(.rodata); + sound/songs/mus_gsc_pewter.o(.rodata); + sound/songs/mus_c_vs_legend_beast.o(.rodata); + sound/songs/mus_route101.o(.rodata); + sound/songs/mus_route110.o(.rodata); + sound/songs/mus_route120.o(.rodata); + sound/songs/mus_petalburg.o(.rodata); + sound/songs/mus_oldale.o(.rodata); + sound/songs/mus_gym.o(.rodata); + sound/songs/mus_surf.o(.rodata); + sound/songs/mus_petalburg_woods.o(.rodata); + sound/songs/mus_level_up.o(.rodata); + sound/songs/mus_heal.o(.rodata); + sound/songs/mus_obtain_badge.o(.rodata); + sound/songs/mus_obtain_item.o(.rodata); + sound/songs/mus_evolved.o(.rodata); + sound/songs/mus_obtain_tmhm.o(.rodata); + sound/songs/mus_lilycove_museum.o(.rodata); + sound/songs/mus_route122.o(.rodata); + sound/songs/mus_oceanic_museum.o(.rodata); + sound/songs/mus_evolution_intro.o(.rodata); + sound/songs/mus_evolution.o(.rodata); + sound/songs/mus_move_deleted.o(.rodata); + sound/songs/mus_encounter_girl.o(.rodata); + sound/songs/mus_encounter_male.o(.rodata); + sound/songs/mus_abandoned_ship.o(.rodata); + sound/songs/mus_fortree.o(.rodata); + sound/songs/mus_birch_lab.o(.rodata); + sound/songs/mus_b_tower.o(.rodata); + sound/songs/mus_encounter_swimmer.o(.rodata); + sound/songs/mus_cave_of_origin.o(.rodata); + sound/songs/mus_obtain_berry.o(.rodata); + sound/songs/mus_awaken_legend.o(.rodata); + sound/songs/mus_slots_jackpot.o(.rodata); + sound/songs/mus_slots_win.o(.rodata); + sound/songs/mus_too_bad.o(.rodata); + sound/songs/mus_roulette.o(.rodata); + sound/songs/mus_link_contest_p1.o(.rodata); + sound/songs/mus_link_contest_p2.o(.rodata); + sound/songs/mus_link_contest_p3.o(.rodata); + sound/songs/mus_link_contest_p4.o(.rodata); + sound/songs/mus_encounter_rich.o(.rodata); + sound/songs/mus_verdanturf.o(.rodata); + sound/songs/mus_rustboro.o(.rodata); + sound/songs/mus_poke_center.o(.rodata); + sound/songs/mus_route104.o(.rodata); + sound/songs/mus_route119.o(.rodata); + sound/songs/mus_cycling.o(.rodata); + sound/songs/mus_poke_mart.o(.rodata); + sound/songs/mus_littleroot.o(.rodata); + sound/songs/mus_mt_chimney.o(.rodata); + sound/songs/mus_encounter_female.o(.rodata); + sound/songs/mus_lilycove.o(.rodata); + sound/songs/mus_route111.o(.rodata); + sound/songs/mus_help.o(.rodata); + sound/songs/mus_underwater.o(.rodata); + sound/songs/mus_victory_trainer.o(.rodata); + sound/songs/mus_title.o(.rodata); + sound/songs/mus_intro.o(.rodata); + sound/songs/mus_encounter_may.o(.rodata); + sound/songs/mus_encounter_intense.o(.rodata); + sound/songs/mus_encounter_cool.o(.rodata); + sound/songs/mus_route113.o(.rodata); + sound/songs/mus_encounter_aqua.o(.rodata); + sound/songs/mus_follow_me.o(.rodata); + sound/songs/mus_encounter_brendan.o(.rodata); + sound/songs/mus_ever_grande.o(.rodata); + sound/songs/mus_encounter_suspicious.o(.rodata); + sound/songs/mus_victory_aqua_magma.o(.rodata); + sound/songs/mus_cable_car.o(.rodata); + sound/songs/mus_game_corner.o(.rodata); + sound/songs/mus_dewford.o(.rodata); + sound/songs/mus_safari_zone.o(.rodata); + sound/songs/mus_victory_road.o(.rodata); + sound/songs/mus_aqua_magma_hideout.o(.rodata); + sound/songs/mus_sailing.o(.rodata); + sound/songs/mus_mt_pyre.o(.rodata); + sound/songs/mus_slateport.o(.rodata); + sound/songs/mus_mt_pyre_exterior.o(.rodata); + sound/songs/mus_school.o(.rodata); + sound/songs/mus_hall_of_fame.o(.rodata); + sound/songs/mus_fallarbor.o(.rodata); + sound/songs/mus_sealed_chamber.o(.rodata); + sound/songs/mus_contest_winner.o(.rodata); + sound/songs/mus_contest.o(.rodata); + sound/songs/mus_encounter_magma.o(.rodata); + sound/songs/mus_intro_battle.o(.rodata); + sound/songs/mus_weather_kyogre.o(.rodata); + sound/songs/mus_weather_groudon.o(.rodata); + sound/songs/mus_sootopolis.o(.rodata); + sound/songs/mus_contest_results.o(.rodata); + sound/songs/mus_hall_of_fame_room.o(.rodata); + sound/songs/mus_trick_house.o(.rodata); + sound/songs/mus_encounter_twins.o(.rodata); + sound/songs/mus_encounter_elite_four.o(.rodata); + sound/songs/mus_encounter_hiker.o(.rodata); + sound/songs/mus_contest_lobby.o(.rodata); + sound/songs/mus_encounter_interviewer.o(.rodata); + sound/songs/mus_encounter_champion.o(.rodata); + sound/songs/mus_credits.o(.rodata); + sound/songs/mus_end.o(.rodata); + sound/songs/mus_vs_wild.o(.rodata); + sound/songs/mus_vs_aqua_magma.o(.rodata); + sound/songs/mus_vs_trainer.o(.rodata); + sound/songs/mus_vs_gym_leader.o(.rodata); + sound/songs/mus_vs_champion.o(.rodata); + sound/songs/mus_vs_regi.o(.rodata); + sound/songs/mus_vs_kyogre_groudon.o(.rodata); + sound/songs/mus_vs_rival.o(.rodata); + sound/songs/mus_vs_elite_four.o(.rodata); + sound/songs/mus_vs_aqua_magma_leader.o(.rodata); + sound/songs/mus_radio_tower_takeover.o(.rodata); } =0 lib_rodata : diff --git a/sound/song_table.inc b/sound/song_table.inc index 605a6ec8a..5b26a44b2 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -1,253 +1,253 @@ .align 2 gSongTable:: @ 845548C - song se_stop, 0, 0 - song se_kaifuku, 1, 1 @ Healing Item - song se_pc_logon, 1, 1 @ PC Logon - song se_pc_off, 1, 1 @ PC Shutdown - song se_pc_on, 1, 1 @ PC Startup - song se_select, 2, 2 @ Cursor Selection - song se_win_open, 1, 1 @ Start Menu - song se_wall_hit, 2, 2 @ Wall Bump - song se_door, 1, 1 @ Opening Door - song se_kaidan, 1, 1 @ Stairs - song se_dansa, 1, 1 @ Ledge - song se_jitensya, 1, 1 @ Bicycle Bell - song se_kouka_l, 1, 1 @ Not Very Effective - song se_kouka_m, 1, 1 @ Normal Effectiveness - song se_kouka_h, 1, 1 @ Super Effective - song se_bowa2, 1, 1 @ Pokémon Withdrawl - song se_poke_dead, 1, 1 @ Pokémon Fainted - song se_nigeru, 1, 1 @ Flee from Wild Battle - song se_jido_doa, 1, 1 @ Pokémon Center Door - song se_naminori, 1, 1 @ Briney's Ship - song se_ban, 1, 1 @ Bang - song se_pin, 1, 1 @ Exclamation Bubble - song se_boo, 1, 1 @ Contest Jam - song se_bowa, 1, 1 @ Giving Poké Ball to Nurse, Poké Ball wiggle - song se_jyuni, 2, 2 @ Places in Contest Appearing - song se_a, 1, 1 @ Bard A - song se_i, 1, 1 @ Bard I - song se_u, 1, 1 @ Bard U - song se_e, 1, 1 @ Bard E - song se_o, 1, 1 @ Bard O - song se_n, 1, 1 @ Bard N - song se_seikai, 1, 1 @ Success - song se_hazure, 1, 1 @ Failure - song se_exp, 1, 1 @ Exp. Bar - song se_jite_pyoko, 1, 1 @ Bunny Hop - song se_mu_pachi, 1, 1 - song se_tk_kasya, 1, 1 @ Mossdeep Gym/Trick House Switch + song mus_dummy, 0, 0 + song se_use_item, 1, 1 + song se_pc_login, 1, 1 + song se_pc_off, 1, 1 + song se_pc_on, 1, 1 + song se_select, 2, 2 + song se_win_open, 1, 1 + song se_wall_hit, 2, 2 + song se_door, 1, 1 + song se_exit, 1, 1 + song se_ledge, 1, 1 + song se_bike_bell, 1, 1 + song se_not_effective, 1, 1 + song se_effective, 1, 1 + song se_super_effective, 1, 1 + song se_ball_open, 1, 1 + song se_faint, 1, 1 + song se_flee, 1, 1 + song se_sliding_door, 1, 1 + song se_ship, 1, 1 + song se_bang, 1, 1 + song se_pin, 1, 1 + song se_boo, 1, 1 + song se_ball, 1, 1 + song se_contest_place, 2, 2 + song se_a, 1, 1 + song se_i, 1, 1 + song se_u, 1, 1 + song se_e, 1, 1 + song se_o, 1, 1 + song se_n, 1, 1 + song se_success, 1, 1 + song se_failure, 1, 1 + song se_exp, 1, 1 + song se_bike_hop, 1, 1 + song se_switch, 1, 1 + song se_click, 1, 1 song se_fu_zaku, 1, 1 - song se_fu_zaku2, 1, 1 - song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym Warp - song se_ru_gashin, 1, 1 @ Sootopolis Gym - Stairs Appear - song se_ru_gasyan, 1, 1 @ Sootopolis Gym - Ice Breaking - song se_ru_bari, 1, 1 @ Sootopolis Gym - Walking on Ice - song se_ru_hyuu, 1, 1 @ Falling Down - song se_ki_gasyan, 2, 2 - song se_tk_warpin, 1, 1 @ Warp In - song se_tk_warpout, 1, 1 @ Warp Out - song se_tu_saa, 1, 1 @ Repel - song se_hi_turun, 1, 1 @ Moving Obstacle in Fortree Gym - song se_track_move, 1, 1 @ Moving Truck - song se_track_stop, 1, 1 @ Moving Truck Stop - song se_track_haik, 2, 2 @ Moving Truck Unload - song se_track_door, 1, 1 @ Moving Truck Door - song se_moter, 2, 2 + song se_contest_condition_lose, 1, 1 + song se_lavaridge_fall_warp, 1, 1 + song se_ice_stairs, 1, 1 + song se_ice_break, 1, 1 + song se_ice_crack, 1, 1 + song se_fall, 1, 1 + song se_unlock, 2, 2 + song se_warp_in, 1, 1 + song se_warp_out, 1, 1 + song se_repel, 1, 1 + song se_rotating_gate, 1, 1 + song se_truck_move, 1, 1 + song se_truck_stop, 1, 1 + song se_truck_unload, 2, 2 + song se_truck_door, 1, 1 + song se_berry_blender, 2, 2 song se_card, 1, 1 - song se_save, 1, 1 @ Save - song se_kon, 1, 1 @ Poke Ball Bounce 1 - song se_kon2, 1, 1 @ Poké Ball Bounce 2 - song se_kon3, 1, 1 @ Poké Ball Bounce 3 - song se_kon4, 1, 1 @ Poké Ball Bounce 4 - song se_suikomu, 2, 2 @ Poké Ball Trade - song se_nageru, 1, 1 @ Poké Ball Throw - song se_toy_c, 2, 2 @ Note C - song se_toy_d, 2, 2 @ Note D - song se_toy_e, 2, 2 @ Note E - song se_toy_f, 2, 2 @ Note F - song se_toy_g, 2, 2 @ Note G - song se_toy_a, 2, 2 @ Note A - song se_toy_b, 2, 2 @ Note B - song se_toy_c1, 2, 2 @ Note High C - song se_mizu, 2, 2 @ Puddle - song se_hashi, 2, 2 @ Boardwalk - song se_daugi, 1, 1 @ Slots Credits - song se_pinpon, 1, 1 @ Ding-dong! - song se_fuusen1, 2, 2 @ Red Balloon - song se_fuusen2, 2, 2 @ Blue Balloon - song se_fuusen3, 2, 2 @ Yellow Balloon - song se_toy_kabe, 2, 2 @ Breakable Door - song se_toy_dango, 2, 2 @ Mud Ball - song se_doku, 1, 1 @ Overworld Poison damage - song se_esuka, 1, 1 @ Escalator - song se_t_ame, 3, 3 @ Rain - song se_t_ame_e, 3, 3 @ Rain stop - song se_t_ooame, 3, 3 @ Heavy Rain - song se_t_ooame_e, 3, 3 @ Heavy Rain stop - song se_t_koame, 3, 3 @ Light Rain - song se_t_koame_e, 3, 3 @ Light Rain stop - song se_t_kami, 1, 1 @ Thunder - song se_t_kami2, 1, 1 @ Thunder 2 - song se_elebeta, 1, 1 @ Elevator - song se_hinsi, 3, 3 @ Low Health - song se_expmax, 1, 1 @ Exp. Max - song se_tamakoro, 2, 2 @ Roulette Ball - song se_tamakoro_e, 2, 2 @ Roulette Ball 2 - song se_basabasa, 1, 1 - song se_regi, 1, 1 @ Cash Register - song se_c_gaji, 1, 1 @ Contest Hearts - song se_c_maku_u, 1, 1 @ Contest Curtain rise - song se_c_maku_d, 1, 1 @ Contest Curtain fall - song se_c_pasi, 1, 1 - song se_c_syu, 1, 1 - song se_c_pikon, 1, 1 @ Pokémon Appears in Contest - song se_reapoke, 1, 1 @ Shiny Pokémon - song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen whoosh - song se_bt_start, 1, 1 @ Battle Mugshot whoosh - song se_dendou, 1, 1 @ Audience Cheering - song se_jihanki, 1, 1 @ Vending Machine - song se_tama, 1, 1 @ Orb Used - song se_z_scroll, 1, 1 @ Pokédex Scrolling - song se_z_page, 1, 1 @ Pokédex Page - song se_pn_on, 1, 1 @ PokéNav On - song se_pn_off, 1, 1 @ PokéNav Off - song se_z_search, 1, 1 @ Pokédex Search - song se_tamago, 1, 1 @ Egg hatch - song se_tb_start, 1, 1 @ Battle - Poké Ball Tray slide in - song se_tb_kon, 1, 1 @ Battle - Poké Ball Tray ball sound - song se_tb_kara, 2, 2 @ Battle - Poké Ball Tray slide out - song se_bidoro, 1, 1 - song se_w085, 2, 2 @ Thunderbolt - song se_w085b, 1, 1 @ Thunderbolt 2 - song se_w231, 1, 1 @ Harden - song se_w171, 1, 1 @ Nightmare - song se_w233, 1, 1 @ Vital Throw - song se_w233b, 1, 1 @ Vital Throw 2 - song se_w145, 1, 1 @ Bubble - song se_w145b, 1, 1 @ Bubble 2 - song se_w145c, 1, 1 @ Bubble 3 - song se_w240, 1, 1 @ Rain Dance - song se_w015, 1, 1 @ Cut - song se_w081, 1, 1 @ String Shot - song se_w081b, 1, 1 @ String Shot 2 - song se_w088, 1, 1 @ Rock Throw - song se_w016, 2, 2 @ Gust - song se_w016b, 2, 2 @ Gust 2 - song se_w003, 1, 1 @ DoubleSlap - song se_w104, 1, 1 @ Double Team - song se_w013, 1, 1 @ Razor Wind - song se_w196, 1, 1 @ Icy Wind - song se_w086, 1, 1 @ Thunder Wave - song se_w004, 1, 1 @ Comet Punch - song se_w025, 1, 1 @ Mega Kick - song se_w025b, 1, 1 @ Mega Kick 2 - song se_w152, 1, 1 @ Crabhammer - song se_w026, 1, 1 @ Jump Kick - song se_w172, 1, 1 @ Flame Wheel - song se_w172b, 1, 1 @ Flame Wheel 2 - song se_w053, 1, 1 @ Flamethrower - song se_w007, 1, 1 @ Fire Punch - song se_w092, 1, 1 @ Toxic - song se_w221, 1, 1 @ Sacred Fire - song se_w221b, 2, 2 @ Sacred Fire 2 - song se_w052, 1, 1 @ Ember - song se_w036, 2, 2 @ Take Down - song se_w059, 1, 1 @ Blizzard - song se_w059b, 1, 1 @ Blizzard 2 - song se_w010, 1, 1 @ Scratch - song se_w011, 1, 1 @ Vicegrip - song se_w017, 1, 1 @ Wing Attack - song se_w019, 1, 1 @ Fly - song se_w028, 1, 1 @ Sand-Attack - song se_w013b, 1, 1 @ Razor Wind 2 - song se_w044, 1, 1 @ Bite - song se_w029, 1, 1 @ Headbutt - song se_w057, 1, 1 @ Surf - song se_w056, 1, 1 @ Hydro Pump - song se_w250, 1, 1 @ Whirlpool - song se_w030, 1, 1 @ Horn Attack - song se_w039, 2, 2 @ Tail Whip - song se_w054, 1, 1 @ Mist - song se_w077, 1, 1 @ PoisonPowder - song se_w020, 2, 2 @ Bind - song se_w082, 1, 1 @ Dragon Rage - song se_w047, 1, 1 @ Sing - song se_w195, 1, 1 @ Perish Song - song se_w006, 1, 1 @ Pay Day - song se_w091, 1, 1 @ Dig - song se_w146, 1, 1 @ Dizzy Punch - song se_w120, 1, 1 @ Self-Destruct - song se_w153, 1, 1 @ Explosion - song se_w071b, 1, 1 @ Absorb 2 - song se_w071, 1, 1 @ Absorb - song se_w103, 1, 1 @ Screech - song se_w062, 1, 1 @ BubbleBeam - song se_w062b, 1, 1 @ BubbleBeam 2 - song se_w048, 1, 1 @ Supersonic - song se_w187, 1, 1 @ Belly Drum - song se_w118, 1, 1 @ Metronome - song se_w155, 1, 1 @ Bonemerang - song se_w122, 1, 1 @ Lick - song se_w060, 1, 1 @ Psybeam - song se_w185, 1, 1 @ Faint Attack - song se_w014, 1, 1 @ Swords Dance - song se_w043, 1, 1 @ Leer - song se_w207, 1, 1 @ Swagger - song se_w207b, 1, 1 @ Swagger 2 - song se_w215, 1, 1 @ Heal Bell - song se_w109, 1, 1 @ Confuse Ray - song se_w173, 1, 1 @ Snore - song se_w280, 1, 1 @ Brick Break - song se_w202, 1, 1 @ Giga Drain - song se_w060b, 1, 1 @ Psybeam 2 - song se_w076, 2, 2 @ SolarBeam - song se_w080, 1, 1 @ Petal Dance - song se_w100, 1, 1 @ Teleport - song se_w107, 1, 1 @ Minimize - song se_w166, 1, 1 @ Sketch - song se_w129, 1, 1 @ Swift - song se_w115, 1, 1 @ Reflect - song se_w112, 1, 1 @ Barrier - song se_w197, 2, 2 @ Detect - song se_w199, 1, 1 @ Lock-On - song se_w236, 1, 1 @ Moonlight - song se_w204, 1, 1 @ Charm - song se_w268, 1, 1 @ Charge - song se_w070, 1, 1 @ Strength - song se_w063, 1, 1 @ Hyper Beam - song se_w127, 1, 1 @ Waterfall - song se_w179, 1, 1 @ Reversal - song se_w151, 1, 1 @ Acid Armor - song se_w201, 1, 1 @ Sandstorm - song se_w161, 1, 1 @ Tri-Attack - song se_w161b, 1, 1 @ Tri-Attack 2 - song se_w227, 1, 1 @ Encore - song se_w227b, 2, 2 @ Encore 2 - song se_w226, 1, 1 @ Baton Pass - song se_w208, 1, 1 @ Milk Drink - song se_w213, 1, 1 @ Attract - song se_w213b, 1, 1 @ Attract 2 - song se_w234, 1, 1 @ Morning Sun - song se_w260, 1, 1 @ Flatter - song se_w328, 1, 1 @ Sand Tomb - song se_w320, 1, 1 @ GrassWhistle - song se_w255, 1, 1 @ Spit Up - song se_w291, 1, 1 @ Dive - song se_w089, 2, 2 @ Earthquake - song se_w239, 2, 2 @ Twister - song se_w230, 1, 1 @ Sweet Scent - song se_w281, 1, 1 @ Yawn - song se_w327, 2, 2 @ Sky Uppercut - song se_w287, 1, 1 @ Stat Increased - song se_w257, 1, 1 @ Heat Wave - song se_w253, 1, 1 @ Uproar - song se_w258, 1, 1 @ Hail - song se_w322, 2, 2 @ Cosmic Power - song se_w298, 1, 1 @ Teeter Dance - song se_w287b, 1, 1 @ Stat Decreased - song se_w114, 1, 1 @ Haze - song se_w063b, 1, 1 @ Hyper Beam 2 + song se_save, 1, 1 + song se_ball_bounce_1, 1, 1 + song se_ball_bounce_2, 1, 1 + song se_ball_bounce_3, 1, 1 + song se_ball_bounce_4, 1, 1 + song se_ball_trade, 2, 2 + song se_ball_throw, 1, 1 + song se_note_c, 2, 2 + song se_note_d, 2, 2 + song se_note_e, 2, 2 + song se_note_f, 2, 2 + song se_note_g, 2, 2 + song se_note_a, 2, 2 + song se_note_b, 2, 2 + song se_note_c_high, 2, 2 + song se_puddle, 2, 2 + song se_bridge_walk, 2, 2 + song se_itemfinder, 1, 1 + song se_ding_dong, 1, 1 + song se_balloon_red, 2, 2 + song se_balloon_blue, 2, 2 + song se_balloon_yellow, 2, 2 + song se_breakable_door, 2, 2 + song se_mud_ball, 2, 2 + song se_field_poison, 1, 1 + song se_escalator, 1, 1 + song se_thunderstorm, 3, 3 + song se_thunderstorm_stop, 3, 3 + song se_downpour, 3, 3 + song se_downpour_stop, 3, 3 + song se_rain, 3, 3 + song se_rain_stop, 3, 3 + song se_thunder, 1, 1 + song se_thunder2, 1, 1 + song se_elevator, 1, 1 + song se_low_health, 3, 3 + song se_exp_max, 1, 1 + song se_roulette_ball, 2, 2 + song se_roulette_ball2, 2, 2 + song se_taillow_wing_flap, 1, 1 + song se_shop, 1, 1 + song se_contest_heart, 1, 1 + song se_contest_curtain_rise, 1, 1 + song se_contest_curtain_fall, 1, 1 + song se_contest_icon_change, 1, 1 + song se_contest_icon_clear, 1, 1 + song se_contest_mons_turn, 1, 1 + song se_shiny, 1, 1 + song se_intro_blast, 1, 1 + song se_mugshot, 1, 1 + song se_applause, 1, 1 + song se_vend, 1, 1 + song se_orb, 1, 1 + song se_dex_scroll, 1, 1 + song se_dex_page, 1, 1 + song se_pokenav_on, 1, 1 + song se_pokenav_off, 1, 1 + song se_dex_search, 1, 1 + song se_egg_hatch, 1, 1 + song se_ball_tray_enter, 1, 1 + song se_ball_tray_ball, 1, 1 + song se_ball_tray_exit, 2, 2 + song se_glass_flute, 1, 1 + song se_m_thunderbolt, 2, 2 + song se_m_thunderbolt2, 1, 1 + song se_m_harden, 1, 1 + song se_m_nightmare, 1, 1 + song se_m_vital_throw, 1, 1 + song se_m_vital_throw2, 1, 1 + song se_m_bubble, 1, 1 + song se_m_bubble2, 1, 1 + song se_m_bubble3, 1, 1 + song se_m_rain_dance, 1, 1 + song se_m_cut, 1, 1 + song se_m_string_shot, 1, 1 + song se_m_string_shot2, 1, 1 + song se_m_rock_throw, 1, 1 + song se_m_gust, 2, 2 + song se_m_gust2, 2, 2 + song se_m_double_slap, 1, 1 + song se_m_double_team, 1, 1 + song se_m_razor_wind, 1, 1 + song se_m_icy_wind, 1, 1 + song se_m_thunder_wave, 1, 1 + song se_m_comet_punch, 1, 1 + song se_m_mega_kick, 1, 1 + song se_m_mega_kick2, 1, 1 + song se_m_crabhammer, 1, 1 + song se_m_jump_kick, 1, 1 + song se_m_flame_wheel, 1, 1 + song se_m_flame_wheel2, 1, 1 + song se_m_flamethrower, 1, 1 + song se_m_fire_punch, 1, 1 + song se_m_toxic, 1, 1 + song se_m_sacred_fire, 1, 1 + song se_m_sacred_fire2, 2, 2 + song se_m_ember, 1, 1 + song se_m_take_down, 2, 2 + song se_m_blizzard, 1, 1 + song se_m_blizzard2, 1, 1 + song se_m_scratch, 1, 1 + song se_m_vicegrip, 1, 1 + song se_m_wing_attack, 1, 1 + song se_m_fly, 1, 1 + song se_m_sand_attack, 1, 1 + song se_m_razor_wind2, 1, 1 + song se_m_bite, 1, 1 + song se_m_headbutt, 1, 1 + song se_m_surf, 1, 1 + song se_m_hydro_pump, 1, 1 + song se_m_whirlpool, 1, 1 + song se_m_horn_attack, 1, 1 + song se_m_tail_whip, 2, 2 + song se_m_mist, 1, 1 + song se_m_poison_powder, 1, 1 + song se_m_bind, 2, 2 + song se_m_dragon_rage, 1, 1 + song se_m_sing, 1, 1 + song se_m_perish_song, 1, 1 + song se_m_pay_day, 1, 1 + song se_m_dig, 1, 1 + song se_m_dizzy_punch, 1, 1 + song se_m_self_destruct, 1, 1 + song se_m_explosion, 1, 1 + song se_m_absorb_2, 1, 1 + song se_m_absorb, 1, 1 + song se_m_screech, 1, 1 + song se_m_bubble_beam, 1, 1 + song se_m_bubble_beam2, 1, 1 + song se_m_supersonic, 1, 1 + song se_m_belly_drum, 1, 1 + song se_m_metronome, 1, 1 + song se_m_bonemerang, 1, 1 + song se_m_lick, 1, 1 + song se_m_psybeam, 1, 1 + song se_m_faint_attack, 1, 1 + song se_m_swords_dance, 1, 1 + song se_m_leer, 1, 1 + song se_m_swagger, 1, 1 + song se_m_swagger2, 1, 1 + song se_m_heal_bell, 1, 1 + song se_m_confuse_ray, 1, 1 + song se_m_snore, 1, 1 + song se_m_brick_break, 1, 1 + song se_m_giga_drain, 1, 1 + song se_m_psybeam2, 1, 1 + song se_m_solar_beam, 2, 2 + song se_m_petal_dance, 1, 1 + song se_m_teleport, 1, 1 + song se_m_minimize, 1, 1 + song se_m_sketch, 1, 1 + song se_m_swift, 1, 1 + song se_m_reflect, 1, 1 + song se_m_barrier, 1, 1 + song se_m_detect, 2, 2 + song se_m_lock_on, 1, 1 + song se_m_moonlight, 1, 1 + song se_m_charm, 1, 1 + song se_m_charge, 1, 1 + song se_m_strength, 1, 1 + song se_m_hyper_beam, 1, 1 + song se_m_waterfall, 1, 1 + song se_m_reversal, 1, 1 + song se_m_acid_armor, 1, 1 + song se_m_sandstorm, 1, 1 + song se_m_tri_attack, 1, 1 + song se_m_tri_attack2, 1, 1 + song se_m_encore, 1, 1 + song se_m_encore2, 2, 2 + song se_m_baton_pass, 1, 1 + song se_m_milk_drink, 1, 1 + song se_m_attract, 1, 1 + song se_m_attract2, 1, 1 + song se_m_morning_sun, 1, 1 + song se_m_flatter, 1, 1 + song se_m_sand_tomb, 1, 1 + song se_m_grasswhistle, 1, 1 + song se_m_spit_up, 1, 1 + song se_m_dive, 1, 1 + song se_m_earthquake, 2, 2 + song se_m_twister, 2, 2 + song se_m_sweet_scent, 1, 1 + song se_m_yawn, 1, 1 + song se_m_sky_uppercut, 2, 2 + song se_m_stat_increase, 1, 1 + song se_m_heat_wave, 1, 1 + song se_m_uproar, 1, 1 + song se_m_hail, 1, 1 + song se_m_cosmic_power, 2, 2 + song se_m_teeter_dance, 1, 1 + song se_m_stat_decrease, 1, 1 + song se_m_haze, 1, 1 + song se_m_hyper_beam2, 1, 1 song song_248, 2, 2 song song_249, 2, 2 song song_250, 2, 2 @@ -350,124 +350,124 @@ gSongTable:: @ 845548C song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 - song bgm_tetsuji, 0, 0 @ Littleroot Town Test 'TETSUJI' - song bgm_field13, 0, 0 @ GSC - Route 38 - song bgm_kachi22, 0, 0 @ Wild Pokémon Defeated - song bgm_kachi2, 0, 0 @ Wild Pokémon Defeated with Intro - song bgm_kachi3, 0, 0 @ Gym Leader Defeated - song bgm_kachi5, 0, 0 @ Victory! Elite Four - song bgm_pcc, 0, 0 @ Crystal - Pokémon Communication Center - song bgm_nibi, 0, 0 @ GSC - Viridian/Saffron/Pewter/etc - song bgm_suikun, 0, 0 @ Crystal - Battle! Legendary Beasts - song bgm_dooro1, 0, 0 @ Route 101 - song bgm_dooro_x1, 0, 0 @ Route 110 - song bgm_dooro_x3, 0, 0 @ Route 120 - song bgm_machi_s2, 0, 0 @ Petalburg City - song bgm_machi_s4, 0, 0 @ Oldale Town - song bgm_gim, 0, 0 @ Gym - song bgm_naminori, 0, 0 @ Surfing - song bgm_dan01, 0, 0 @ Caves and Darkness - song bgm_fanfa1, 2, 2 @ Level Up! - song bgm_me_asa, 2, 2 @ Pokémon Healed - song bgm_me_bachi, 2, 2 @ Obtained a Badge! - song bgm_fanfa4, 2, 2 @ Obtained an Item! - song bgm_fanfa5, 2, 2 @ Your Pokémon Just Evolved! - song bgm_me_waza, 2, 2 @ Obtained a TM/HM! - song bgm_bijyutu, 0, 0 @ Lilycove Museum - song bgm_dooro_x4, 0, 0 @ Route 122/Intro - song bgm_fune_kan, 0, 0 @ Slateport Museum - song bgm_me_shinka, 2, 2 @ Evolution Intro - song bgm_shinka, 0, 0 @ Evolution - song bgm_me_wasure, 2, 2 @ Move Deleted - song bgm_syoujoeye, 0, 0 @ Encounter! Tuber - song bgm_boyeye, 0, 0 @ Encounter! Boy - song bgm_dan02, 0, 0 @ Abandoned Ship - song bgm_machi_s3, 0, 0 @ Fortree City - song bgm_odamaki, 0, 0 @ Professor Birch's Lab - song bgm_b_tower, 0, 0 @ Battle Tower (RS) - song bgm_swimeye, 0, 0 @ Encounter! Swimmer - song bgm_dan03, 0, 0 @ Meteor Falls - song bgm_me_kinomi, 2, 2 @ Obtained a Berry! - song bgm_me_tama, 2, 2 @ Awakening the Super-Ancient Pokémon - song bgm_me_b_big, 2, 2 @ Slots Jackpot! - song bgm_me_b_small, 2, 2 @ Slots Victory! - song bgm_me_zannen, 2, 2 @ Too bad! - song bgm_bd_time, 0, 0 @ Roulette! - song bgm_test1, 0, 0 @ Contest Test 1 - song bgm_test2, 0, 0 @ Contest Test 2 - song bgm_test3, 0, 0 @ Contest Test 3 - song bgm_test4, 0, 0 @ Contest Test 4 - song bgm_test, 0, 0 @ Encounter! Gentleman (Test?) - song bgm_gomachi0, 0, 0 @ Verdanturf Town - song bgm_gotown, 0, 0 @ Rustboro City - song bgm_pokecen, 0, 0 @ Pokémon Center - song bgm_nextroad, 0, 0 @ Route 104 - song bgm_granroad, 0, 0 @ Route 119 - song bgm_cycling, 0, 0 @ Cycling - song bgm_friendly, 0, 0 @ Pokémart - song bgm_mishiro, 0, 0 @ Littleroot Town - song bgm_tozan, 0, 0 @ Sky Pillar - song bgm_girleye, 0, 0 @ Encounter! Girl - song bgm_minamo, 0, 0 @ Lilycove City - song bgm_ashroad, 0, 0 @ Route 111 - song bgm_event0, 0, 0 @ Help me! - song bgm_deepdeep, 0, 0 @ Underwater - song bgm_kachi1, 0, 0 @ Victory! Trainer - song bgm_title3, 0, 0 @ Title Screen - song bgm_demo1, 0, 0 @ Opening Movie - song bgm_girl_sup, 0, 0 @ Encounter! May - song bgm_hageshii, 0, 0 @ Encounter! Biker - song bgm_kakkoii, 0, 0 @ Encounter! Electric Trainer - song bgm_kazanbai, 0, 0 @ Route 113 - song bgm_aqa_0, 0, 0 @ Encounter! Team Aqua - song bgm_tsuretek, 0, 0 @ Follow Me! - song bgm_boy_sup, 0, 0 @ Encounter! Brendan - song bgm_rainbow, 0, 0 @ Ever Grande City - song bgm_ayasii, 0, 0 @ Encounter! Psychic - song bgm_kachi4, 0, 0 @ Victory! Aqua/Magma Grunt - song bgm_ropeway, 0, 0 @ Cable Car - song bgm_casino, 0, 0 @ Game Corner - song bgm_hightown, 0, 0 @ Dewford Town - song bgm_safari, 0, 0 @ Safari Zone - song bgm_c_road, 0, 0 @ Victory Road - song bgm_ajito, 0, 0 @ Aqua/Magma Hideout - song bgm_m_boat, 0, 0 @ Sailing - song bgm_m_dungon, 0, 0 @ Mt. Pyre (Inside) - song bgm_finecity, 0, 0 @ Slateport City - song bgm_machupi, 0, 0 @ Mt. Pyte (Outside) - song bgm_p_school, 0, 0 @ Pokémon Trainer's School - song bgm_dendou, 0, 0 @ Hall of Fame - song bgm_tonekusa, 0, 0 @ Fallarbor Town - song bgm_maborosi, 0, 0 @ Sealed Chamber - song bgm_con_fan, 0, 0 @ You are the Champion! - song bgm_contest0, 0, 0 @ Pokémon Contest - song bgm_mgm0, 0, 0 @ Encounter! Team Magma - song bgm_t_battle, 0, 0 @ Opening Battle - song bgm_ooame, 0, 0 @ The Flood - song bgm_hideri, 0, 0 @ The Drought - song bgm_runecity, 0, 0 @ Sootopolis City - song bgm_con_k, 0, 0 @ Berry Blending Results - song bgm_eikou_r, 0, 0 @ Hall of Fame - song bgm_karakuri, 0, 0 @ Trick House - song bgm_hutago, 0, 0 @ Encounter! Kid - song bgm_sitennou, 0, 0 @ Encounter! Elite Four - song bgm_yama_eye, 0, 0 @ Encounter! Hiker - song bgm_conlobby, 0, 0 @ Contest Lobby - song bgm_inter_v, 0, 0 @ Encounter! Gabby and Ty - song bgm_daigo, 0, 0 @ Encounter! Wallace - song bgm_thankfor, 0, 0 @ Credits - song bgm_end, 0, 0 @ The End - song bgm_battle27, 0, 0 @ Battle! Wild Pokémon - song bgm_battle31, 0, 0 @ Battle! Team Aqua/Magma - song bgm_battle20, 0, 0 @ Battle! Trainer - song bgm_battle32, 0, 0 @ Battle! Gym Leader - song bgm_battle33, 0, 0 @ Battle! Champion - song bgm_battle36, 0, 0 @ Battle! Regi Trio - song bgm_battle34, 0, 0 @ Battle! Legendary Pokémon (dupe) - song bgm_battle35, 0, 0 @ Battle! Rival - song bgm_battle38, 0, 0 @ Battle! Elite Four - song bgm_battle30, 0, 0 @ Battle! Archie/Maxie - song bgm_radio_tower_occupied, 0, 0 @ GSC - Radio Tower Takeover! + song mus_littleroot_test, 0, 0 + song mus_gsc_route38, 0, 0 + song mus_caught, 0, 0 + song mus_victory_wild, 0, 0 + song mus_victory_gym_leader, 0, 0 + song mus_victory_league, 0, 0 + song mus_c_comm_center, 0, 0 + song mus_gsc_pewter, 0, 0 + song mus_c_vs_legend_beast, 0, 0 + song mus_route101, 0, 0 + song mus_route110, 0, 0 + song mus_route120, 0, 0 + song mus_petalburg, 0, 0 + song mus_oldale, 0, 0 + song mus_gym, 0, 0 + song mus_surf, 0, 0 + song mus_petalburg_woods, 0, 0 + song mus_level_up, 2, 2 + song mus_heal, 2, 2 + song mus_obtain_badge, 2, 2 + song mus_obtain_item, 2, 2 + song mus_evolved, 2, 2 + song mus_obtain_tmhm, 2, 2 + song mus_lilycove_museum, 0, 0 + song mus_route122, 0, 0 + song mus_oceanic_museum, 0, 0 + song mus_evolution_intro, 2, 2 + song mus_evolution, 0, 0 + song mus_move_deleted, 2, 2 + song mus_encounter_girl, 0, 0 + song mus_encounter_male, 0, 0 + song mus_abandoned_ship, 0, 0 + song mus_fortree, 0, 0 + song mus_birch_lab, 0, 0 + song mus_b_tower, 0, 0 + song mus_encounter_swimmer, 0, 0 + song mus_cave_of_origin, 0, 0 + song mus_obtain_berry, 2, 2 + song mus_awaken_legend, 2, 2 + song mus_slots_jackpot, 2, 2 + song mus_slots_win, 2, 2 + song mus_too_bad, 2, 2 + song mus_roulette, 0, 0 + song mus_link_contest_p1, 0, 0 + song mus_link_contest_p2, 0, 0 + song mus_link_contest_p3, 0, 0 + song mus_link_contest_p4, 0, 0 + song mus_encounter_rich, 0, 0 + song mus_verdanturf, 0, 0 + song mus_rustboro, 0, 0 + song mus_poke_center, 0, 0 + song mus_route104, 0, 0 + song mus_route119, 0, 0 + song mus_cycling, 0, 0 + song mus_poke_mart, 0, 0 + song mus_littleroot, 0, 0 + song mus_mt_chimney, 0, 0 + song mus_encounter_female, 0, 0 + song mus_lilycove, 0, 0 + song mus_route111, 0, 0 + song mus_help, 0, 0 + song mus_underwater, 0, 0 + song mus_victory_trainer, 0, 0 + song mus_title, 0, 0 + song mus_intro, 0, 0 + song mus_encounter_may, 0, 0 + song mus_encounter_intense, 0, 0 + song mus_encounter_cool, 0, 0 + song mus_route113, 0, 0 + song mus_encounter_aqua, 0, 0 + song mus_follow_me, 0, 0 + song mus_encounter_brendan, 0, 0 + song mus_ever_grande, 0, 0 + song mus_encounter_suspicious, 0, 0 + song mus_victory_aqua_magma, 0, 0 + song mus_cable_car, 0, 0 + song mus_game_corner, 0, 0 + song mus_dewford, 0, 0 + song mus_safari_zone, 0, 0 + song mus_victory_road, 0, 0 + song mus_aqua_magma_hideout, 0, 0 + song mus_sailing, 0, 0 + song mus_mt_pyre, 0, 0 + song mus_slateport, 0, 0 + song mus_mt_pyre_exterior, 0, 0 + song mus_school, 0, 0 + song mus_hall_of_fame, 0, 0 + song mus_fallarbor, 0, 0 + song mus_sealed_chamber, 0, 0 + song mus_contest_winner, 0, 0 + song mus_contest, 0, 0 + song mus_encounter_magma, 0, 0 + song mus_intro_battle, 0, 0 + song mus_weather_kyogre, 0, 0 + song mus_weather_groudon, 0, 0 + song mus_sootopolis, 0, 0 + song mus_contest_results, 0, 0 + song mus_hall_of_fame_room, 0, 0 + song mus_trick_house, 0, 0 + song mus_encounter_twins, 0, 0 + song mus_encounter_elite_four, 0, 0 + song mus_encounter_hiker, 0, 0 + song mus_contest_lobby, 0, 0 + song mus_encounter_interviewer, 0, 0 + song mus_encounter_champion, 0, 0 + song mus_credits, 0, 0 + song mus_end, 0, 0 + song mus_vs_wild, 0, 0 + song mus_vs_aqua_magma, 0, 0 + song mus_vs_trainer, 0, 0 + song mus_vs_gym_leader, 0, 0 + song mus_vs_champion, 0, 0 + song mus_vs_regi, 0, 0 + song mus_vs_kyogre_groudon, 0, 0 + song mus_vs_rival, 0, 0 + song mus_vs_elite_four, 0, 0 + song mus_vs_aqua_magma_leader, 0, 0 + song mus_radio_tower_takeover, 0, 0 .align 2 dummy_song_header: @ 845632C diff --git a/sound/songs/bgm_dan02.s b/sound/songs/mus_abandoned_ship.s index cf8531108..53b0c6a0b 100644 --- a/sound/songs/bgm_dan02.s +++ b/sound/songs/mus_abandoned_ship.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_dan02_grp, voicegroup027 - .equ bgm_dan02_pri, 0 - .equ bgm_dan02_rev, reverb_set+50 - .equ bgm_dan02_mvl, 127 - .equ bgm_dan02_key, 0 - .equ bgm_dan02_tbs, 1 - .equ bgm_dan02_exg, 0 - .equ bgm_dan02_cmp, 1 + .equ mus_abandoned_ship_grp, voicegroup027 + .equ mus_abandoned_ship_pri, 0 + .equ mus_abandoned_ship_rev, reverb_set+50 + .equ mus_abandoned_ship_mvl, 127 + .equ mus_abandoned_ship_key, 0 + .equ mus_abandoned_ship_tbs, 1 + .equ mus_abandoned_ship_exg, 0 + .equ mus_abandoned_ship_cmp, 1 .section .rodata - .global bgm_dan02 + .global mus_abandoned_ship .align 2 @********************** Track 1 **********************@ -bgm_dan02_1: - .byte KEYSH , bgm_dan02_key+0 - .byte TEMPO , 100*bgm_dan02_tbs/2 - .byte VOL , 80*bgm_dan02_mvl/mxv +mus_abandoned_ship_1: + .byte KEYSH , mus_abandoned_ship_key+0 + .byte TEMPO , 100*mus_abandoned_ship_tbs/2 + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte PAN , c_v+0 .byte LFOS , 40 .byte W36 -bgm_dan02_1_B1: +mus_abandoned_ship_1_B1: .byte VOICE , 17 .byte N56 , As4 , v108 .byte W24 @@ -60,18 +60,18 @@ bgm_dan02_1_B1: .byte W24 .byte MOD , 9 .byte W12 - .byte VOL , 72*bgm_dan02_mvl/mxv + .byte VOL , 72*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 65*bgm_dan02_mvl/mxv + .byte 65*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 51*bgm_dan02_mvl/mxv + .byte 51*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 24*bgm_dan02_mvl/mxv + .byte 24*mus_abandoned_ship_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 .byte VOICE , 14 - .byte VOL , 80*bgm_dan02_mvl/mxv + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte W12 .byte N24 , Cn4 , v092 .byte W24 @@ -114,38 +114,38 @@ bgm_dan02_1_B1: .byte W24 .byte MOD , 9 .byte W12 - .byte VOL , 72*bgm_dan02_mvl/mxv + .byte VOL , 72*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 65*bgm_dan02_mvl/mxv + .byte 65*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 51*bgm_dan02_mvl/mxv + .byte 51*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 24*bgm_dan02_mvl/mxv + .byte 24*mus_abandoned_ship_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 .byte VOICE , 14 - .byte VOL , 80*bgm_dan02_mvl/mxv + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte W12 .byte N24 , Cs4 , v092 .byte W24 .byte As3 .byte W28 - .byte VOL , 72*bgm_dan02_mvl/mxv + .byte VOL , 72*mus_abandoned_ship_mvl/mxv .byte W04 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W04 - .byte 54*bgm_dan02_mvl/mxv + .byte 54*mus_abandoned_ship_mvl/mxv .byte W04 - .byte 60*bgm_dan02_mvl/mxv + .byte 60*mus_abandoned_ship_mvl/mxv .byte W04 - .byte 67*bgm_dan02_mvl/mxv + .byte 67*mus_abandoned_ship_mvl/mxv .byte W04 - .byte 72*bgm_dan02_mvl/mxv + .byte 72*mus_abandoned_ship_mvl/mxv .byte W04 - .byte 77*bgm_dan02_mvl/mxv + .byte 77*mus_abandoned_ship_mvl/mxv .byte W04 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W04 .byte VOICE , 1 .byte N12 , Cs4 , v100 @@ -309,17 +309,17 @@ bgm_dan02_1_B1: .byte Cs4 .byte W12 .byte GOTO - .word bgm_dan02_1_B1 + .word mus_abandoned_ship_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_dan02_2: - .byte KEYSH , bgm_dan02_key+0 - .byte VOL , 80*bgm_dan02_mvl/mxv +mus_abandoned_ship_2: + .byte KEYSH , mus_abandoned_ship_key+0 + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte PAN , c_v+0 .byte W36 -bgm_dan02_2_B1: +mus_abandoned_ship_2_B1: .byte VOICE , 90 .byte PAN , c_v+10 .byte N06 , Fs2 , v100 @@ -328,15 +328,15 @@ bgm_dan02_2_B1: .byte W24 .byte N21 , Fn4 , v072 .byte W12 - .byte VOL , 73*bgm_dan02_mvl/mxv + .byte VOL , 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 61*bgm_dan02_mvl/mxv + .byte 61*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 25*bgm_dan02_mvl/mxv + .byte 25*mus_abandoned_ship_mvl/mxv .byte W15 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W12 .byte N06 , Fs2 , v100 .byte W12 @@ -346,24 +346,24 @@ bgm_dan02_2_B1: .byte W24 .byte N21 , Fn4 , v072 .byte W09 - .byte VOL , 73*bgm_dan02_mvl/mxv + .byte VOL , 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 61*bgm_dan02_mvl/mxv + .byte 61*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 25*bgm_dan02_mvl/mxv + .byte 25*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N36 , Fs2 , v100 .byte W06 - .byte VOL , 64*bgm_dan02_mvl/mxv + .byte VOL , 64*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 68*bgm_dan02_mvl/mxv + .byte 68*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 73*bgm_dan02_mvl/mxv + .byte 73*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 78*bgm_dan02_mvl/mxv + .byte 78*mus_abandoned_ship_mvl/mxv .byte W12 .byte N06 .byte W12 @@ -371,15 +371,15 @@ bgm_dan02_2_B1: .byte W24 .byte N21 , Ds4 , v072 .byte W12 - .byte VOL , 73*bgm_dan02_mvl/mxv + .byte VOL , 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 61*bgm_dan02_mvl/mxv + .byte 61*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 25*bgm_dan02_mvl/mxv + .byte 25*mus_abandoned_ship_mvl/mxv .byte W15 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W12 .byte N06 , Fs2 , v100 .byte W12 @@ -389,24 +389,24 @@ bgm_dan02_2_B1: .byte W24 .byte N21 , Ds4 , v072 .byte W09 - .byte VOL , 73*bgm_dan02_mvl/mxv + .byte VOL , 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 61*bgm_dan02_mvl/mxv + .byte 61*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 25*bgm_dan02_mvl/mxv + .byte 25*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N36 , Fs2 , v100 .byte W06 - .byte VOL , 64*bgm_dan02_mvl/mxv + .byte VOL , 64*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 68*bgm_dan02_mvl/mxv + .byte 68*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 73*bgm_dan02_mvl/mxv + .byte 73*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 78*bgm_dan02_mvl/mxv + .byte 78*mus_abandoned_ship_mvl/mxv .byte W12 .byte N06 , Fn2 .byte W12 @@ -414,15 +414,15 @@ bgm_dan02_2_B1: .byte W24 .byte N21 , Cn4 , v072 .byte W12 - .byte VOL , 73*bgm_dan02_mvl/mxv + .byte VOL , 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 61*bgm_dan02_mvl/mxv + .byte 61*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 25*bgm_dan02_mvl/mxv + .byte 25*mus_abandoned_ship_mvl/mxv .byte W15 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W12 .byte N06 , Fn2 , v100 .byte W12 @@ -432,24 +432,24 @@ bgm_dan02_2_B1: .byte W24 .byte N21 , Cn4 , v072 .byte W09 - .byte VOL , 73*bgm_dan02_mvl/mxv + .byte VOL , 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 61*bgm_dan02_mvl/mxv + .byte 61*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 25*bgm_dan02_mvl/mxv + .byte 25*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N36 , Fn2 , v100 .byte W06 - .byte VOL , 64*bgm_dan02_mvl/mxv + .byte VOL , 64*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 68*bgm_dan02_mvl/mxv + .byte 68*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 73*bgm_dan02_mvl/mxv + .byte 73*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 78*bgm_dan02_mvl/mxv + .byte 78*mus_abandoned_ship_mvl/mxv .byte W12 .byte N06 , Cs3 .byte W12 @@ -457,16 +457,16 @@ bgm_dan02_2_B1: .byte W24 .byte N18 , As3 , v072 .byte W06 - .byte VOL , 73*bgm_dan02_mvl/mxv + .byte VOL , 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 61*bgm_dan02_mvl/mxv + .byte 61*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 25*bgm_dan02_mvl/mxv + .byte 25*mus_abandoned_ship_mvl/mxv .byte W32 .byte W01 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N06 , Cs3 , v100 .byte W12 .byte N06 @@ -475,149 +475,149 @@ bgm_dan02_2_B1: .byte W24 .byte N18 , As3 , v072 .byte W06 - .byte VOL , 73*bgm_dan02_mvl/mxv + .byte VOL , 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 61*bgm_dan02_mvl/mxv + .byte 61*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 25*bgm_dan02_mvl/mxv + .byte 25*mus_abandoned_ship_mvl/mxv .byte W09 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N36 , Cs3 , v100 .byte W36 .byte W48 - .byte VOL , 42*bgm_dan02_mvl/mxv + .byte VOL , 42*mus_abandoned_ship_mvl/mxv .byte N48 .byte W06 - .byte VOL , 47*bgm_dan02_mvl/mxv + .byte VOL , 47*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 56*bgm_dan02_mvl/mxv + .byte 56*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 65*bgm_dan02_mvl/mxv + .byte 65*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 70*bgm_dan02_mvl/mxv + .byte 70*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 75*bgm_dan02_mvl/mxv + .byte 75*mus_abandoned_ship_mvl/mxv .byte W09 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W09 .byte N96 , Cn3 .byte W24 - .byte VOL , 74*bgm_dan02_mvl/mxv + .byte VOL , 74*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 56*bgm_dan02_mvl/mxv + .byte 56*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 49*bgm_dan02_mvl/mxv + .byte 49*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 49*bgm_dan02_mvl/mxv + .byte 49*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 53*bgm_dan02_mvl/mxv + .byte 53*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 58*bgm_dan02_mvl/mxv + .byte 58*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N96 , As2 .byte W24 - .byte VOL , 74*bgm_dan02_mvl/mxv + .byte VOL , 74*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 56*bgm_dan02_mvl/mxv + .byte 56*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 49*bgm_dan02_mvl/mxv + .byte 49*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 49*bgm_dan02_mvl/mxv + .byte 49*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 53*bgm_dan02_mvl/mxv + .byte 53*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 58*bgm_dan02_mvl/mxv + .byte 58*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N96 , Gs2 .byte W24 - .byte VOL , 74*bgm_dan02_mvl/mxv + .byte VOL , 74*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 56*bgm_dan02_mvl/mxv + .byte 56*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 49*bgm_dan02_mvl/mxv + .byte 49*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 49*bgm_dan02_mvl/mxv + .byte 49*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 53*bgm_dan02_mvl/mxv + .byte 53*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 58*bgm_dan02_mvl/mxv + .byte 58*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 45*bgm_dan02_mvl/mxv + .byte 45*mus_abandoned_ship_mvl/mxv .byte N80 , Bn2 .byte W06 - .byte VOL , 49*bgm_dan02_mvl/mxv + .byte VOL , 49*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 53*bgm_dan02_mvl/mxv + .byte 53*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 58*bgm_dan02_mvl/mxv + .byte 58*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W09 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W36 .byte W03 .byte N09 .byte W12 - .byte VOL , 45*bgm_dan02_mvl/mxv + .byte VOL , 45*mus_abandoned_ship_mvl/mxv .byte N80 , Dn3 .byte W06 - .byte VOL , 49*bgm_dan02_mvl/mxv + .byte VOL , 49*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 53*bgm_dan02_mvl/mxv + .byte 53*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 58*bgm_dan02_mvl/mxv + .byte 58*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W09 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W36 .byte W03 .byte N09 @@ -643,16 +643,16 @@ bgm_dan02_2_B1: .byte Fn2 .byte W12 .byte GOTO - .word bgm_dan02_2_B1 + .word mus_abandoned_ship_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_dan02_3: - .byte KEYSH , bgm_dan02_key+0 - .byte VOL , 80*bgm_dan02_mvl/mxv +mus_abandoned_ship_3: + .byte KEYSH , mus_abandoned_ship_key+0 + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte W36 -bgm_dan02_3_B1: +mus_abandoned_ship_3_B1: .byte VOICE , 47 .byte PAN , c_v-10 .byte BEND , c_v+0 @@ -770,19 +770,19 @@ bgm_dan02_3_B1: .byte N12 .byte W60 .byte GOTO - .word bgm_dan02_3_B1 + .word mus_abandoned_ship_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_dan02_4: - .byte KEYSH , bgm_dan02_key+0 - .byte VOL , 80*bgm_dan02_mvl/mxv +mus_abandoned_ship_4: + .byte KEYSH , mus_abandoned_ship_key+0 + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte PAN , c_v-1 .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte W36 -bgm_dan02_4_B1: +mus_abandoned_ship_4_B1: .byte VOICE , 7 .byte PAN , c_v-47 .byte N06 , As3 , v048 @@ -1104,19 +1104,19 @@ bgm_dan02_4_B1: .byte Gs3 .byte W12 .byte GOTO - .word bgm_dan02_4_B1 + .word mus_abandoned_ship_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_dan02_5: - .byte KEYSH , bgm_dan02_key+0 - .byte VOL , 80*bgm_dan02_mvl/mxv +mus_abandoned_ship_5: + .byte KEYSH , mus_abandoned_ship_key+0 + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte PAN , c_v+0 .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte W36 -bgm_dan02_5_B1: +mus_abandoned_ship_5_B1: .byte VOICE , 8 .byte PAN , c_v+49 .byte N06 , Fs3 , v048 @@ -1308,24 +1308,24 @@ bgm_dan02_5_B1: .byte Fn3 .byte W12 .byte GOTO - .word bgm_dan02_5_B1 + .word mus_abandoned_ship_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_dan02_6: - .byte KEYSH , bgm_dan02_key+0 +mus_abandoned_ship_6: + .byte KEYSH , mus_abandoned_ship_key+0 .byte W36 -bgm_dan02_6_B1: +mus_abandoned_ship_6_B1: .byte VOICE , 81 - .byte VOL , 80*bgm_dan02_mvl/mxv + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte N06 , Fs1 , v064 .byte W12 .byte N06 .byte W72 .byte N06 .byte W12 -bgm_dan02_6_000: +mus_abandoned_ship_6_000: .byte N06 , Fs1 , v064 .byte W12 .byte N06 @@ -1340,7 +1340,7 @@ bgm_dan02_6_000: .byte N06 .byte W12 .byte PATT - .word bgm_dan02_6_000 + .word mus_abandoned_ship_6_000 .byte N06 , Fn1 , v064 .byte W12 .byte N06 @@ -1366,54 +1366,54 @@ bgm_dan02_6_000: .byte N36 .byte W36 .byte W48 - .byte VOL , 40*bgm_dan02_mvl/mxv + .byte VOL , 40*mus_abandoned_ship_mvl/mxv .byte N48 .byte W18 - .byte VOL , 62*bgm_dan02_mvl/mxv + .byte VOL , 62*mus_abandoned_ship_mvl/mxv .byte W18 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W12 .byte N96 , Cn2 .byte W24 - .byte VOL , 62*bgm_dan02_mvl/mxv + .byte VOL , 62*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 40*bgm_dan02_mvl/mxv + .byte 40*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N96 , As1 .byte W24 - .byte VOL , 62*bgm_dan02_mvl/mxv + .byte VOL , 62*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 40*bgm_dan02_mvl/mxv + .byte 40*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N96 , Gs1 .byte W24 - .byte VOL , 62*bgm_dan02_mvl/mxv + .byte VOL , 62*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 40*bgm_dan02_mvl/mxv + .byte 40*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W24 - .byte 40*bgm_dan02_mvl/mxv + .byte 40*mus_abandoned_ship_mvl/mxv .byte N80 , Bn1 .byte W15 - .byte VOL , 59*bgm_dan02_mvl/mxv + .byte VOL , 59*mus_abandoned_ship_mvl/mxv .byte W21 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W48 .byte N09 .byte W12 - .byte VOL , 40*bgm_dan02_mvl/mxv + .byte VOL , 40*mus_abandoned_ship_mvl/mxv .byte N80 , Dn2 .byte W15 - .byte VOL , 59*bgm_dan02_mvl/mxv + .byte VOL , 59*mus_abandoned_ship_mvl/mxv .byte W21 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W48 .byte N09 .byte W12 @@ -1438,16 +1438,16 @@ bgm_dan02_6_000: .byte Fn1 .byte W12 .byte GOTO - .word bgm_dan02_6_B1 + .word mus_abandoned_ship_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_dan02_7: - .byte KEYSH , bgm_dan02_key+0 - .byte VOL , 80*bgm_dan02_mvl/mxv +mus_abandoned_ship_7: + .byte KEYSH , mus_abandoned_ship_key+0 + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte W36 -bgm_dan02_7_B1: +mus_abandoned_ship_7_B1: .byte W96 .byte W96 .byte W96 @@ -1457,44 +1457,44 @@ bgm_dan02_7_B1: .byte W96 .byte W60 .byte VOICE , 0 - .byte VOL , 40*bgm_dan02_mvl/mxv + .byte VOL , 40*mus_abandoned_ship_mvl/mxv .byte N36 , An2 , v064 .byte W06 - .byte VOL , 47*bgm_dan02_mvl/mxv + .byte VOL , 47*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 52*bgm_dan02_mvl/mxv + .byte 52*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 59*bgm_dan02_mvl/mxv + .byte 59*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 66*bgm_dan02_mvl/mxv + .byte 66*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 73*bgm_dan02_mvl/mxv + .byte 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W06 .byte W96 .byte W48 .byte VOICE , 60 - .byte VOL , 49*bgm_dan02_mvl/mxv + .byte VOL , 49*mus_abandoned_ship_mvl/mxv .byte N48 , Gs2 , v096 .byte W06 - .byte VOL , 54*bgm_dan02_mvl/mxv + .byte VOL , 54*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 58*bgm_dan02_mvl/mxv + .byte 58*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 65*bgm_dan02_mvl/mxv + .byte 65*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 68*bgm_dan02_mvl/mxv + .byte 68*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 70*bgm_dan02_mvl/mxv + .byte 70*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 74*bgm_dan02_mvl/mxv + .byte 74*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W06 .byte N36 , As2 .byte W36 @@ -1507,15 +1507,15 @@ bgm_dan02_7_B1: .byte N84 , Ds3 .byte W56 .byte W01 - .byte VOL , 78*bgm_dan02_mvl/mxv + .byte VOL , 78*mus_abandoned_ship_mvl/mxv .byte W09 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W09 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 54*bgm_dan02_mvl/mxv + .byte 54*mus_abandoned_ship_mvl/mxv .byte W15 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte N09 , Gs2 , v100 .byte W12 .byte N12 @@ -1526,31 +1526,31 @@ bgm_dan02_7_B1: .byte W06 .byte N32 , Gs2 .byte W18 - .byte VOL , 68*bgm_dan02_mvl/mxv + .byte VOL , 68*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 62*bgm_dan02_mvl/mxv + .byte 62*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 30*bgm_dan02_mvl/mxv + .byte 30*mus_abandoned_ship_mvl/mxv .byte W06 .byte VOICE , 14 - .byte VOL , 80*bgm_dan02_mvl/mxv + .byte VOL , 80*mus_abandoned_ship_mvl/mxv .byte N12 , Ds4 , v112 .byte W12 .byte N36 , Dn4 .byte W60 .byte VOICE , 60 - .byte VOL , 55*bgm_dan02_mvl/mxv + .byte VOL , 55*mus_abandoned_ship_mvl/mxv .byte N36 , Bn2 , v100 .byte W06 - .byte VOL , 60*bgm_dan02_mvl/mxv + .byte VOL , 60*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 66*bgm_dan02_mvl/mxv + .byte 66*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 71*bgm_dan02_mvl/mxv + .byte 71*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W06 .byte N12 .byte W18 @@ -1579,35 +1579,35 @@ bgm_dan02_7_B1: .byte Gs2 .byte W12 .byte GOTO - .word bgm_dan02_7_B1 + .word mus_abandoned_ship_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_dan02_8: - .byte KEYSH , bgm_dan02_key+0 +mus_abandoned_ship_8: + .byte KEYSH , mus_abandoned_ship_key+0 .byte VOICE , 0 - .byte VOL , 40*bgm_dan02_mvl/mxv + .byte VOL , 40*mus_abandoned_ship_mvl/mxv .byte N36 , An2 , v064 .byte W06 - .byte VOL , 47*bgm_dan02_mvl/mxv + .byte VOL , 47*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 52*bgm_dan02_mvl/mxv + .byte 52*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 59*bgm_dan02_mvl/mxv + .byte 59*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 66*bgm_dan02_mvl/mxv + .byte 66*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 73*bgm_dan02_mvl/mxv + .byte 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W06 -bgm_dan02_8_B1: -bgm_dan02_8_000: +mus_abandoned_ship_8_B1: +mus_abandoned_ship_8_000: .byte N06 , En1 , v092 .byte N72 , Bn2 , v064 .byte W12 @@ -1632,7 +1632,7 @@ bgm_dan02_8_000: .byte En1 , v092 .byte W12 .byte PEND -bgm_dan02_8_001: +mus_abandoned_ship_8_001: .byte N06 , En1 , v092 .byte W12 .byte N06 @@ -1669,7 +1669,7 @@ bgm_dan02_8_001: .byte N03 .byte W03 .byte PEND -bgm_dan02_8_002: +mus_abandoned_ship_8_002: .byte N06 , En1 , v092 .byte W12 .byte N06 @@ -1694,13 +1694,13 @@ bgm_dan02_8_002: .byte W12 .byte PEND .byte PATT - .word bgm_dan02_8_001 + .word mus_abandoned_ship_8_001 .byte PATT - .word bgm_dan02_8_000 + .word mus_abandoned_ship_8_000 .byte PATT - .word bgm_dan02_8_001 + .word mus_abandoned_ship_8_001 .byte PATT - .word bgm_dan02_8_002 + .word mus_abandoned_ship_8_002 .byte N06 , En1 , v092 .byte W12 .byte N06 @@ -1743,47 +1743,47 @@ bgm_dan02_8_002: .byte W96 .byte W96 .byte W60 - .byte VOL , 40*bgm_dan02_mvl/mxv + .byte VOL , 40*mus_abandoned_ship_mvl/mxv .byte N36 , An2 , v064 .byte W06 - .byte VOL , 47*bgm_dan02_mvl/mxv + .byte VOL , 47*mus_abandoned_ship_mvl/mxv .byte W06 - .byte 52*bgm_dan02_mvl/mxv + .byte 52*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 59*bgm_dan02_mvl/mxv + .byte 59*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 66*bgm_dan02_mvl/mxv + .byte 66*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 69*bgm_dan02_mvl/mxv + .byte 69*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 73*bgm_dan02_mvl/mxv + .byte 73*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 76*bgm_dan02_mvl/mxv + .byte 76*mus_abandoned_ship_mvl/mxv .byte W03 - .byte 80*bgm_dan02_mvl/mxv + .byte 80*mus_abandoned_ship_mvl/mxv .byte W06 .byte GOTO - .word bgm_dan02_8_B1 + .word mus_abandoned_ship_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_dan02: +mus_abandoned_ship: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_dan02_pri @ Priority - .byte bgm_dan02_rev @ Reverb. + .byte mus_abandoned_ship_pri @ Priority + .byte mus_abandoned_ship_rev @ Reverb. - .word bgm_dan02_grp + .word mus_abandoned_ship_grp - .word bgm_dan02_1 - .word bgm_dan02_2 - .word bgm_dan02_3 - .word bgm_dan02_4 - .word bgm_dan02_5 - .word bgm_dan02_6 - .word bgm_dan02_7 - .word bgm_dan02_8 + .word mus_abandoned_ship_1 + .word mus_abandoned_ship_2 + .word mus_abandoned_ship_3 + .word mus_abandoned_ship_4 + .word mus_abandoned_ship_5 + .word mus_abandoned_ship_6 + .word mus_abandoned_ship_7 + .word mus_abandoned_ship_8 .end diff --git a/sound/songs/bgm_ajito.s b/sound/songs/mus_aqua_magma_hideout.s index fcb8323ae..b111d3fc3 100644 --- a/sound/songs/bgm_ajito.s +++ b/sound/songs/mus_aqua_magma_hideout.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_ajito_grp, voicegroup073 - .equ bgm_ajito_pri, 0 - .equ bgm_ajito_rev, reverb_set+50 - .equ bgm_ajito_mvl, 127 - .equ bgm_ajito_key, 0 - .equ bgm_ajito_tbs, 1 - .equ bgm_ajito_exg, 0 - .equ bgm_ajito_cmp, 1 + .equ mus_aqua_magma_hideout_grp, voicegroup073 + .equ mus_aqua_magma_hideout_pri, 0 + .equ mus_aqua_magma_hideout_rev, reverb_set+50 + .equ mus_aqua_magma_hideout_mvl, 127 + .equ mus_aqua_magma_hideout_key, 0 + .equ mus_aqua_magma_hideout_tbs, 1 + .equ mus_aqua_magma_hideout_exg, 0 + .equ mus_aqua_magma_hideout_cmp, 1 .section .rodata - .global bgm_ajito + .global mus_aqua_magma_hideout .align 2 @********************** Track 1 **********************@ -bgm_ajito_1: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_1_B1: - .byte TEMPO , 118*bgm_ajito_tbs/2 +mus_aqua_magma_hideout_1: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_1_B1: + .byte TEMPO , 118*mus_aqua_magma_hideout_tbs/2 .byte VOICE , 127 .byte PAN , c_v+0 - .byte VOL , 39*bgm_ajito_mvl/mxv + .byte VOL , 39*mus_aqua_magma_hideout_mvl/mxv .byte N03 , En5 , v112 .byte W12 .byte N03 @@ -41,7 +41,7 @@ bgm_ajito_1_B1: .byte VOICE , 126 .byte N09 , Gn5 .byte W12 -bgm_ajito_1_000: +mus_aqua_magma_hideout_1_000: .byte VOICE , 127 .byte N03 , En5 , v112 .byte W12 @@ -64,57 +64,57 @@ bgm_ajito_1_000: .byte W12 .byte PEND .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte PATT - .word bgm_ajito_1_000 + .word mus_aqua_magma_hideout_1_000 .byte GOTO - .word bgm_ajito_1_B1 + .word mus_aqua_magma_hideout_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_ajito_2: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_2_B1: +mus_aqua_magma_hideout_2: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_2_B1: .byte VOICE , 17 .byte PAN , c_v+0 - .byte VOL , 36*bgm_ajito_mvl/mxv + .byte VOL , 36*mus_aqua_magma_hideout_mvl/mxv .byte LFOS , 44 .byte BENDR , 2 .byte W96 -bgm_ajito_2_000: +mus_aqua_magma_hideout_2_000: .byte W72 .byte N03 , Ds4 , v112 .byte W03 @@ -265,7 +265,7 @@ bgm_ajito_2_000: .byte W06 .byte W96 .byte PATT - .word bgm_ajito_2_000 + .word mus_aqua_magma_hideout_2_000 .byte N36 , Ds5 , v112 .byte W36 .byte W03 @@ -299,19 +299,19 @@ bgm_ajito_2_000: .byte Ds5 .byte W06 .byte GOTO - .word bgm_ajito_2_B1 + .word mus_aqua_magma_hideout_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_ajito_3: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_3_B1: +mus_aqua_magma_hideout_3: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_3_B1: .byte VOICE , 36 .byte LFOS , 44 .byte BENDR , 2 .byte PAN , c_v+0 - .byte VOL , 84*bgm_ajito_mvl/mxv + .byte VOL , 84*mus_aqua_magma_hideout_mvl/mxv .byte BEND , c_v+0 .byte N12 , Cn1 , v112 .byte W18 @@ -323,7 +323,7 @@ bgm_ajito_3_B1: .byte W06 .byte c_v+0 .byte W48 -bgm_ajito_3_000: +mus_aqua_magma_hideout_3_000: .byte N06 , Cn1 , v112 .byte W12 .byte N12 , Cn1 , v088 @@ -343,7 +343,7 @@ bgm_ajito_3_000: .byte Gn1 .byte W06 .byte PEND -bgm_ajito_3_001: +mus_aqua_magma_hideout_3_001: .byte VOICE , 36 .byte BEND , c_v+0 .byte N12 , Cn1 , v112 @@ -358,17 +358,17 @@ bgm_ajito_3_001: .byte W48 .byte PEND .byte PATT - .word bgm_ajito_3_000 + .word mus_aqua_magma_hideout_3_000 .byte PATT - .word bgm_ajito_3_001 + .word mus_aqua_magma_hideout_3_001 .byte PATT - .word bgm_ajito_3_000 + .word mus_aqua_magma_hideout_3_000 .byte PATT - .word bgm_ajito_3_001 + .word mus_aqua_magma_hideout_3_001 .byte PATT - .word bgm_ajito_3_000 + .word mus_aqua_magma_hideout_3_000 .byte PATT - .word bgm_ajito_3_001 + .word mus_aqua_magma_hideout_3_001 .byte N06 , Cn1 , v112 .byte W12 .byte N12 , Cn1 , v088 @@ -385,7 +385,7 @@ bgm_ajito_3_001: .byte W12 .byte Ds2 .byte W06 -bgm_ajito_3_002: +mus_aqua_magma_hideout_3_002: .byte VOICE , 36 .byte BEND , c_v+0 .byte N12 , Fn1 , v112 @@ -418,7 +418,7 @@ bgm_ajito_3_002: .byte Cn2 .byte W06 .byte PATT - .word bgm_ajito_3_002 + .word mus_aqua_magma_hideout_3_002 .byte N06 , Fn1 , v112 .byte W12 .byte N12 , Fn1 , v088 @@ -440,33 +440,33 @@ bgm_ajito_3_002: .byte c_v+0 .byte W12 .byte PATT - .word bgm_ajito_3_001 + .word mus_aqua_magma_hideout_3_001 .byte PATT - .word bgm_ajito_3_000 + .word mus_aqua_magma_hideout_3_000 .byte PATT - .word bgm_ajito_3_001 + .word mus_aqua_magma_hideout_3_001 .byte PATT - .word bgm_ajito_3_000 + .word mus_aqua_magma_hideout_3_000 .byte PATT - .word bgm_ajito_3_001 + .word mus_aqua_magma_hideout_3_001 .byte PATT - .word bgm_ajito_3_000 + .word mus_aqua_magma_hideout_3_000 .byte GOTO - .word bgm_ajito_3_B1 + .word mus_aqua_magma_hideout_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_ajito_4: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_4_B1: +mus_aqua_magma_hideout_4: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_4_B1: .byte VOICE , 17 .byte PAN , c_v+0 - .byte VOL , 39*bgm_ajito_mvl/mxv + .byte VOL , 39*mus_aqua_magma_hideout_mvl/mxv .byte LFOS , 44 .byte BENDR , 2 .byte W96 -bgm_ajito_4_000: +mus_aqua_magma_hideout_4_000: .byte W72 .byte N03 , Cn4 , v112 .byte W03 @@ -638,7 +638,7 @@ bgm_ajito_4_000: .byte W06 .byte W96 .byte PATT - .word bgm_ajito_4_000 + .word mus_aqua_magma_hideout_4_000 .byte N96 , Cn5 , v112 .byte W96 .byte N03 , Gn4 @@ -670,18 +670,18 @@ bgm_ajito_4_000: .byte Cn5 .byte W06 .byte GOTO - .word bgm_ajito_4_B1 + .word mus_aqua_magma_hideout_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_ajito_5: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_5_B1: +mus_aqua_magma_hideout_5: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_5_B1: .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 2 - .byte VOL , 42*bgm_ajito_mvl/mxv + .byte VOL , 42*mus_aqua_magma_hideout_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -775,31 +775,31 @@ bgm_ajito_5_B1: .byte W96 .byte W96 .byte W03 - .byte VOL , 31*bgm_ajito_mvl/mxv + .byte VOL , 31*mus_aqua_magma_hideout_mvl/mxv .byte W92 .byte W01 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_ajito_5_B1 + .word mus_aqua_magma_hideout_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_ajito_6: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_6_B1: +mus_aqua_magma_hideout_6: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_6_B1: .byte VOICE , 80 .byte PAN , c_v-61 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 2 - .byte VOL , 37*bgm_ajito_mvl/mxv + .byte VOL , 37*mus_aqua_magma_hideout_mvl/mxv .byte BEND , c_v+0 .byte W96 -bgm_ajito_6_000: +mus_aqua_magma_hideout_6_000: .byte W72 .byte N03 , An1 , v112 .byte W03 @@ -960,7 +960,7 @@ bgm_ajito_6_000: .byte W06 .byte W96 .byte PATT - .word bgm_ajito_6_000 + .word mus_aqua_magma_hideout_6_000 .byte TIE , As2 , v112 .byte W96 .byte W48 @@ -978,23 +978,23 @@ bgm_ajito_6_000: .byte Gn2 .byte W06 .byte GOTO - .word bgm_ajito_6_B1 + .word mus_aqua_magma_hideout_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_ajito_7: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_7_B1: +mus_aqua_magma_hideout_7: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_7_B1: .byte VOICE , 81 .byte PAN , c_v+63 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 2 - .byte VOL , 37*bgm_ajito_mvl/mxv + .byte VOL , 37*mus_aqua_magma_hideout_mvl/mxv .byte W96 -bgm_ajito_7_000: +mus_aqua_magma_hideout_7_000: .byte W72 .byte N03 , Ds2 , v112 .byte W03 @@ -1119,7 +1119,7 @@ bgm_ajito_7_000: .byte W06 .byte W96 .byte PATT - .word bgm_ajito_7_000 + .word mus_aqua_magma_hideout_7_000 .byte TIE , Ds3 , v112 .byte W96 .byte W48 @@ -1137,17 +1137,17 @@ bgm_ajito_7_000: .byte Ds3 .byte W06 .byte GOTO - .word bgm_ajito_7_B1 + .word mus_aqua_magma_hideout_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_ajito_8: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_8_B1: +mus_aqua_magma_hideout_8: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_8_B1: .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 79*bgm_ajito_mvl/mxv + .byte VOL , 79*mus_aqua_magma_hideout_mvl/mxv .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v064 @@ -1168,7 +1168,7 @@ bgm_ajito_8_B1: .byte W06 .byte N06 .byte W06 -bgm_ajito_8_000: +mus_aqua_magma_hideout_8_000: .byte N06 , Cn1 , v112 .byte W12 .byte Cn1 , v120 @@ -1190,7 +1190,7 @@ bgm_ajito_8_000: .byte N06 .byte W06 .byte PEND -bgm_ajito_8_001: +mus_aqua_magma_hideout_8_001: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v064 @@ -1213,7 +1213,7 @@ bgm_ajito_8_001: .byte W06 .byte PEND .byte PATT - .word bgm_ajito_8_000 + .word mus_aqua_magma_hideout_8_000 .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v064 @@ -1234,7 +1234,7 @@ bgm_ajito_8_001: .byte W06 .byte N06 .byte W06 -bgm_ajito_8_002: +mus_aqua_magma_hideout_8_002: .byte N06 , Cn1 , v112 .byte W12 .byte Cn1 , v120 @@ -1259,19 +1259,19 @@ bgm_ajito_8_002: .byte W06 .byte PEND .byte PATT - .word bgm_ajito_8_001 + .word mus_aqua_magma_hideout_8_001 .byte PATT - .word bgm_ajito_8_000 + .word mus_aqua_magma_hideout_8_000 .byte PATT - .word bgm_ajito_8_001 + .word mus_aqua_magma_hideout_8_001 .byte PATT - .word bgm_ajito_8_000 + .word mus_aqua_magma_hideout_8_000 .byte PATT - .word bgm_ajito_8_001 + .word mus_aqua_magma_hideout_8_001 .byte PATT - .word bgm_ajito_8_000 + .word mus_aqua_magma_hideout_8_000 .byte PATT - .word bgm_ajito_8_001 + .word mus_aqua_magma_hideout_8_001 .byte N06 , Cn1 , v112 .byte W12 .byte Cn1 , v120 @@ -1295,33 +1295,33 @@ bgm_ajito_8_002: .byte Cn1 , v064 .byte W06 .byte PATT - .word bgm_ajito_8_001 + .word mus_aqua_magma_hideout_8_001 .byte PATT - .word bgm_ajito_8_000 + .word mus_aqua_magma_hideout_8_000 .byte PATT - .word bgm_ajito_8_001 + .word mus_aqua_magma_hideout_8_001 .byte PATT - .word bgm_ajito_8_002 + .word mus_aqua_magma_hideout_8_002 .byte PATT - .word bgm_ajito_8_001 + .word mus_aqua_magma_hideout_8_001 .byte PATT - .word bgm_ajito_8_000 + .word mus_aqua_magma_hideout_8_000 .byte GOTO - .word bgm_ajito_8_B1 + .word mus_aqua_magma_hideout_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_ajito_9: - .byte KEYSH , bgm_ajito_key+0 -bgm_ajito_9_B1: +mus_aqua_magma_hideout_9: + .byte KEYSH , mus_aqua_magma_hideout_key+0 +mus_aqua_magma_hideout_9_B1: .byte VOICE , 82 .byte PAN , c_v+0 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 2 - .byte VOL , 42*bgm_ajito_mvl/mxv + .byte VOL , 42*mus_aqua_magma_hideout_mvl/mxv .byte BEND , c_v+1 .byte N12 , Cn1 , v112 .byte W18 @@ -1347,7 +1347,7 @@ bgm_ajito_9_B1: .byte W12 .byte Gn1 .byte W06 -bgm_ajito_9_000: +mus_aqua_magma_hideout_9_000: .byte N12 , Cn1 , v112 .byte W18 .byte N03 , Cn1 , v088 @@ -1355,7 +1355,7 @@ bgm_ajito_9_000: .byte N12 , Bn1 , v124 .byte W60 .byte PEND -bgm_ajito_9_001: +mus_aqua_magma_hideout_9_001: .byte N06 , Cn1 , v112 .byte W12 .byte N12 , Cn1 , v088 @@ -1374,7 +1374,7 @@ bgm_ajito_9_001: .byte W06 .byte PEND .byte VOICE , 83 - .byte VOL , 32*bgm_ajito_mvl/mxv + .byte VOL , 32*mus_aqua_magma_hideout_mvl/mxv .byte BEND , c_v+0 .byte N03 , Bn2 .byte W06 @@ -1451,7 +1451,7 @@ bgm_ajito_9_001: .byte c_v-62 .byte W04 .byte VOICE , 82 - .byte VOL , 43*bgm_ajito_mvl/mxv + .byte VOL , 43*mus_aqua_magma_hideout_mvl/mxv .byte BEND , c_v+3 .byte N12 , Cn1 .byte W18 @@ -1460,9 +1460,9 @@ bgm_ajito_9_001: .byte N12 , Bn1 , v124 .byte W60 .byte PATT - .word bgm_ajito_9_001 + .word mus_aqua_magma_hideout_9_001 .byte PATT - .word bgm_ajito_9_000 + .word mus_aqua_magma_hideout_9_000 .byte N06 , Cn1 , v112 .byte W12 .byte N12 , Cn1 , v088 @@ -1479,7 +1479,7 @@ bgm_ajito_9_001: .byte W12 .byte Ds2 .byte W06 -bgm_ajito_9_002: +mus_aqua_magma_hideout_9_002: .byte N12 , Fn1 , v112 .byte W18 .byte N03 , Fn1 , v088 @@ -1504,7 +1504,7 @@ bgm_ajito_9_002: .byte Cn2 .byte W06 .byte PATT - .word bgm_ajito_9_002 + .word mus_aqua_magma_hideout_9_002 .byte N06 , Fn1 , v112 .byte W12 .byte N12 , Fn1 , v088 @@ -1522,40 +1522,40 @@ bgm_ajito_9_002: .byte N12 , En2 , v124 .byte W24 .byte PATT - .word bgm_ajito_9_000 + .word mus_aqua_magma_hideout_9_000 .byte PATT - .word bgm_ajito_9_001 + .word mus_aqua_magma_hideout_9_001 .byte PATT - .word bgm_ajito_9_000 + .word mus_aqua_magma_hideout_9_000 .byte PATT - .word bgm_ajito_9_001 + .word mus_aqua_magma_hideout_9_001 .byte PATT - .word bgm_ajito_9_000 + .word mus_aqua_magma_hideout_9_000 .byte PATT - .word bgm_ajito_9_001 + .word mus_aqua_magma_hideout_9_001 .byte GOTO - .word bgm_ajito_9_B1 + .word mus_aqua_magma_hideout_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_ajito: +mus_aqua_magma_hideout: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_ajito_pri @ Priority - .byte bgm_ajito_rev @ Reverb. + .byte mus_aqua_magma_hideout_pri @ Priority + .byte mus_aqua_magma_hideout_rev @ Reverb. - .word bgm_ajito_grp + .word mus_aqua_magma_hideout_grp - .word bgm_ajito_1 - .word bgm_ajito_2 - .word bgm_ajito_3 - .word bgm_ajito_4 - .word bgm_ajito_5 - .word bgm_ajito_6 - .word bgm_ajito_7 - .word bgm_ajito_8 - .word bgm_ajito_9 + .word mus_aqua_magma_hideout_1 + .word mus_aqua_magma_hideout_2 + .word mus_aqua_magma_hideout_3 + .word mus_aqua_magma_hideout_4 + .word mus_aqua_magma_hideout_5 + .word mus_aqua_magma_hideout_6 + .word mus_aqua_magma_hideout_7 + .word mus_aqua_magma_hideout_8 + .word mus_aqua_magma_hideout_9 .end diff --git a/sound/songs/bgm_me_tama.s b/sound/songs/mus_awaken_legend.s index 45ddf72bf..f4cfa2d91 100644 --- a/sound/songs/bgm_me_tama.s +++ b/sound/songs/mus_awaken_legend.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_me_tama_grp, voicegroup009 - .equ bgm_me_tama_pri, 5 - .equ bgm_me_tama_rev, reverb_set+50 - .equ bgm_me_tama_mvl, 127 - .equ bgm_me_tama_key, 0 - .equ bgm_me_tama_tbs, 1 - .equ bgm_me_tama_exg, 0 - .equ bgm_me_tama_cmp, 1 + .equ mus_awaken_legend_grp, voicegroup009 + .equ mus_awaken_legend_pri, 5 + .equ mus_awaken_legend_rev, reverb_set+50 + .equ mus_awaken_legend_mvl, 127 + .equ mus_awaken_legend_key, 0 + .equ mus_awaken_legend_tbs, 1 + .equ mus_awaken_legend_exg, 0 + .equ mus_awaken_legend_cmp, 1 .section .rodata - .global bgm_me_tama + .global mus_awaken_legend .align 2 @********************** Track 1 **********************@ -bgm_me_tama_1: - .byte KEYSH , bgm_me_tama_key+0 +mus_awaken_legend_1: + .byte KEYSH , mus_awaken_legend_key+0 .byte W12 - .byte TEMPO , 140*bgm_me_tama_tbs/2 + .byte TEMPO , 140*mus_awaken_legend_tbs/2 .byte VOICE , 48 .byte PAN , c_v-10 - .byte VOL , 90*bgm_me_tama_mvl/mxv + .byte VOL , 90*mus_awaken_legend_mvl/mxv .byte N04 , Cn3 , v076 .byte W08 .byte En3 @@ -37,17 +37,17 @@ bgm_me_tama_1: .byte TIE , Gs4 , v080 .byte W96 .byte W24 - .byte VOL , 77*bgm_me_tama_mvl/mxv + .byte VOL , 77*mus_awaken_legend_mvl/mxv .byte W08 - .byte 70*bgm_me_tama_mvl/mxv + .byte 70*mus_awaken_legend_mvl/mxv .byte W04 - .byte 60*bgm_me_tama_mvl/mxv + .byte 60*mus_awaken_legend_mvl/mxv .byte W04 - .byte 46*bgm_me_tama_mvl/mxv + .byte 46*mus_awaken_legend_mvl/mxv .byte W04 .byte EOT .byte W04 - .byte VOL , 90*bgm_me_tama_mvl/mxv + .byte VOL , 90*mus_awaken_legend_mvl/mxv .byte N04 , An3 .byte W04 .byte Bn3 @@ -92,27 +92,27 @@ bgm_me_tama_1: .byte W96 .byte N84 , Cn4 .byte W44 - .byte VOL , 86*bgm_me_tama_mvl/mxv + .byte VOL , 86*mus_awaken_legend_mvl/mxv .byte W08 - .byte 80*bgm_me_tama_mvl/mxv + .byte 80*mus_awaken_legend_mvl/mxv .byte W08 - .byte 74*bgm_me_tama_mvl/mxv + .byte 74*mus_awaken_legend_mvl/mxv .byte W08 - .byte 65*bgm_me_tama_mvl/mxv + .byte 65*mus_awaken_legend_mvl/mxv .byte W08 - .byte 50*bgm_me_tama_mvl/mxv + .byte 50*mus_awaken_legend_mvl/mxv .byte W04 - .byte 32*bgm_me_tama_mvl/mxv + .byte 32*mus_awaken_legend_mvl/mxv .byte W16 .byte FINE @********************** Track 2 **********************@ -bgm_me_tama_2: - .byte KEYSH , bgm_me_tama_key+0 +mus_awaken_legend_2: + .byte KEYSH , mus_awaken_legend_key+0 .byte W12 .byte VOICE , 48 - .byte VOL , 90*bgm_me_tama_mvl/mxv + .byte VOL , 90*mus_awaken_legend_mvl/mxv .byte PAN , c_v-10 .byte W04 .byte N04 , Dn3 , v076 @@ -181,28 +181,28 @@ bgm_me_tama_2: .byte W16 .byte N84 , As4 , v100 .byte W44 - .byte VOL , 86*bgm_me_tama_mvl/mxv + .byte VOL , 86*mus_awaken_legend_mvl/mxv .byte W08 - .byte 80*bgm_me_tama_mvl/mxv + .byte 80*mus_awaken_legend_mvl/mxv .byte W08 - .byte 74*bgm_me_tama_mvl/mxv + .byte 74*mus_awaken_legend_mvl/mxv .byte W08 - .byte 65*bgm_me_tama_mvl/mxv + .byte 65*mus_awaken_legend_mvl/mxv .byte W08 - .byte 50*bgm_me_tama_mvl/mxv + .byte 50*mus_awaken_legend_mvl/mxv .byte W04 - .byte 32*bgm_me_tama_mvl/mxv + .byte 32*mus_awaken_legend_mvl/mxv .byte W16 .byte FINE @********************** Track 3 **********************@ -bgm_me_tama_3: - .byte KEYSH , bgm_me_tama_key+0 +mus_awaken_legend_3: + .byte KEYSH , mus_awaken_legend_key+0 .byte W12 .byte W48 .byte VOICE , 85 - .byte VOL , 90*bgm_me_tama_mvl/mxv + .byte VOL , 90*mus_awaken_legend_mvl/mxv .byte PAN , c_v+0 .byte N04 , An5 , v040 .byte W08 @@ -275,7 +275,7 @@ bgm_me_tama_3: .byte PAN , c_v+48 .byte N04 .byte W08 -bgm_me_tama_3_000: +mus_awaken_legend_3_000: .byte PAN , c_v+0 .byte N04 , As5 , v040 .byte W08 @@ -314,7 +314,7 @@ bgm_me_tama_3_000: .byte W08 .byte PEND .byte PATT - .word bgm_me_tama_3_000 + .word mus_awaken_legend_3_000 .byte VOICE , 83 .byte PAN , c_v-48 .byte N16 , Gn3 , v060 @@ -331,31 +331,31 @@ bgm_me_tama_3_000: .byte W16 .byte N84 , Cn5 .byte W44 - .byte VOL , 86*bgm_me_tama_mvl/mxv + .byte VOL , 86*mus_awaken_legend_mvl/mxv .byte W08 - .byte 80*bgm_me_tama_mvl/mxv + .byte 80*mus_awaken_legend_mvl/mxv .byte W08 - .byte 74*bgm_me_tama_mvl/mxv + .byte 74*mus_awaken_legend_mvl/mxv .byte W08 - .byte 65*bgm_me_tama_mvl/mxv + .byte 65*mus_awaken_legend_mvl/mxv .byte W08 - .byte 50*bgm_me_tama_mvl/mxv + .byte 50*mus_awaken_legend_mvl/mxv .byte W04 - .byte 32*bgm_me_tama_mvl/mxv + .byte 32*mus_awaken_legend_mvl/mxv .byte W16 .byte FINE @********************** Track 4 **********************@ -bgm_me_tama_4: - .byte KEYSH , bgm_me_tama_key+0 +mus_awaken_legend_4: + .byte KEYSH , mus_awaken_legend_key+0 .byte XCMD , xIECV , 10 .byte xIECL , 13 .byte W12 .byte W48 .byte VOICE , 82 .byte PAN , c_v+0 - .byte VOL , 90*bgm_me_tama_mvl/mxv + .byte VOL , 90*mus_awaken_legend_mvl/mxv .byte N96 , En3 , v052 .byte W96 .byte N08 , Cn4 @@ -409,31 +409,31 @@ bgm_me_tama_4: .byte W16 .byte N84 , Gn4 .byte W44 - .byte VOL , 86*bgm_me_tama_mvl/mxv + .byte VOL , 86*mus_awaken_legend_mvl/mxv .byte W08 - .byte 80*bgm_me_tama_mvl/mxv + .byte 80*mus_awaken_legend_mvl/mxv .byte W08 - .byte 74*bgm_me_tama_mvl/mxv + .byte 74*mus_awaken_legend_mvl/mxv .byte W08 - .byte 65*bgm_me_tama_mvl/mxv + .byte 65*mus_awaken_legend_mvl/mxv .byte W08 - .byte 50*bgm_me_tama_mvl/mxv + .byte 50*mus_awaken_legend_mvl/mxv .byte W04 - .byte 32*bgm_me_tama_mvl/mxv + .byte 32*mus_awaken_legend_mvl/mxv .byte W16 .byte FINE @********************** Track 5 **********************@ -bgm_me_tama_5: - .byte KEYSH , bgm_me_tama_key+0 +mus_awaken_legend_5: + .byte KEYSH , mus_awaken_legend_key+0 .byte XCMD , xIECV , 10 .byte xIECL , 13 .byte W12 .byte W48 .byte VOICE , 47 .byte PAN , c_v+0 - .byte VOL , 90*bgm_me_tama_mvl/mxv + .byte VOL , 90*mus_awaken_legend_mvl/mxv .byte N04 , An1 , v112 .byte W04 .byte N04 @@ -576,12 +576,12 @@ bgm_me_tama_5: @********************** Track 6 **********************@ -bgm_me_tama_6: - .byte KEYSH , bgm_me_tama_key+0 +mus_awaken_legend_6: + .byte KEYSH , mus_awaken_legend_key+0 .byte W12 .byte W48 .byte VOICE , 88 - .byte VOL , 90*bgm_me_tama_mvl/mxv + .byte VOL , 90*mus_awaken_legend_mvl/mxv .byte N68 , An1 , v072 .byte W72 .byte N04 @@ -610,12 +610,12 @@ bgm_me_tama_6: @********************** Track 7 **********************@ -bgm_me_tama_7: - .byte KEYSH , bgm_me_tama_key+0 +mus_awaken_legend_7: + .byte KEYSH , mus_awaken_legend_key+0 .byte W12 .byte W48 .byte VOICE , 0 - .byte VOL , 90*bgm_me_tama_mvl/mxv + .byte VOL , 90*mus_awaken_legend_mvl/mxv .byte N88 , An2 , v092 .byte W88 .byte N08 @@ -636,26 +636,26 @@ bgm_me_tama_7: .byte W16 .byte N56 .byte W56 - .byte VOL , 28*bgm_me_tama_mvl/mxv + .byte VOL , 28*mus_awaken_legend_mvl/mxv .byte N40 , Cn3 , v064 .byte W04 - .byte VOL , 36*bgm_me_tama_mvl/mxv + .byte VOL , 36*mus_awaken_legend_mvl/mxv .byte W04 - .byte 43*bgm_me_tama_mvl/mxv + .byte 43*mus_awaken_legend_mvl/mxv .byte W04 - .byte 47*bgm_me_tama_mvl/mxv + .byte 47*mus_awaken_legend_mvl/mxv .byte W04 - .byte 53*bgm_me_tama_mvl/mxv + .byte 53*mus_awaken_legend_mvl/mxv .byte W04 - .byte 57*bgm_me_tama_mvl/mxv + .byte 57*mus_awaken_legend_mvl/mxv .byte W04 - .byte 63*bgm_me_tama_mvl/mxv + .byte 63*mus_awaken_legend_mvl/mxv .byte W04 - .byte 75*bgm_me_tama_mvl/mxv + .byte 75*mus_awaken_legend_mvl/mxv .byte W04 - .byte 84*bgm_me_tama_mvl/mxv + .byte 84*mus_awaken_legend_mvl/mxv .byte W04 - .byte 90*bgm_me_tama_mvl/mxv + .byte 90*mus_awaken_legend_mvl/mxv .byte W04 .byte N72 , An2 , v092 .byte W96 @@ -664,20 +664,20 @@ bgm_me_tama_7: @******************************************************@ .align 2 -bgm_me_tama: +mus_awaken_legend: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_tama_pri @ Priority - .byte bgm_me_tama_rev @ Reverb. + .byte mus_awaken_legend_pri @ Priority + .byte mus_awaken_legend_rev @ Reverb. - .word bgm_me_tama_grp + .word mus_awaken_legend_grp - .word bgm_me_tama_1 - .word bgm_me_tama_2 - .word bgm_me_tama_3 - .word bgm_me_tama_4 - .word bgm_me_tama_5 - .word bgm_me_tama_6 - .word bgm_me_tama_7 + .word mus_awaken_legend_1 + .word mus_awaken_legend_2 + .word mus_awaken_legend_3 + .word mus_awaken_legend_4 + .word mus_awaken_legend_5 + .word mus_awaken_legend_6 + .word mus_awaken_legend_7 .end diff --git a/sound/songs/bgm_b_tower.s b/sound/songs/mus_b_tower.s index e93233872..982f8758b 100644 --- a/sound/songs/bgm_b_tower.s +++ b/sound/songs/mus_b_tower.s @@ -1,50 +1,50 @@ .include "MPlayDef.s" - .equ bgm_b_tower_grp, voicegroup032 - .equ bgm_b_tower_pri, 0 - .equ bgm_b_tower_rev, reverb_set+50 - .equ bgm_b_tower_mvl, 127 - .equ bgm_b_tower_key, 0 - .equ bgm_b_tower_tbs, 1 - .equ bgm_b_tower_exg, 0 - .equ bgm_b_tower_cmp, 1 + .equ mus_b_tower_grp, voicegroup032 + .equ mus_b_tower_pri, 0 + .equ mus_b_tower_rev, reverb_set+50 + .equ mus_b_tower_mvl, 127 + .equ mus_b_tower_key, 0 + .equ mus_b_tower_tbs, 1 + .equ mus_b_tower_exg, 0 + .equ mus_b_tower_cmp, 1 .section .rodata - .global bgm_b_tower + .global mus_b_tower .align 2 @********************** Track 1 **********************@ -bgm_b_tower_1: - .byte KEYSH , bgm_b_tower_key+0 - .byte TEMPO , 128*bgm_b_tower_tbs/2 +mus_b_tower_1: + .byte KEYSH , mus_b_tower_key+0 + .byte TEMPO , 128*mus_b_tower_tbs/2 .byte VOICE , 56 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N06 , Cn3 , v112 .byte W06 .byte Fn3 .byte W06 .byte N12 , Cn4 .byte W12 -bgm_b_tower_1_B1: +mus_b_tower_1_B1: .byte N68 , Fn4 , v112 .byte W32 .byte W01 .byte MOD , 7 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W09 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N03 , Dn4 .byte W06 .byte Ds4 @@ -56,19 +56,19 @@ bgm_b_tower_1_B1: .byte W01 .byte MOD , 7 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W09 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N06 , Cn3 .byte W06 .byte Fn3 @@ -80,19 +80,19 @@ bgm_b_tower_1_B1: .byte W01 .byte MOD , 7 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W09 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N03 , Dn4 .byte W06 .byte Ds4 @@ -105,21 +105,21 @@ bgm_b_tower_1_B1: .byte MOD , 7 .byte W24 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W72 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N06 , Cn3 .byte W06 .byte Fn3 @@ -151,19 +151,19 @@ bgm_b_tower_1_B1: .byte W24 .byte MOD , 7 .byte W12 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 52*bgm_b_tower_mvl/mxv + .byte 52*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N06 , As3 .byte W12 .byte N24 @@ -189,19 +189,19 @@ bgm_b_tower_1_B1: .byte W24 .byte MOD , 7 .byte W12 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 52*bgm_b_tower_mvl/mxv + .byte 52*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N06 , Ds4 .byte W12 .byte N24 @@ -230,18 +230,18 @@ bgm_b_tower_1_B1: .byte W06 .byte N42 , As3 .byte W18 - .byte VOL , 76*bgm_b_tower_mvl/mxv + .byte VOL , 76*mus_b_tower_mvl/mxv .byte MOD , 7 .byte W06 - .byte VOL , 69*bgm_b_tower_mvl/mxv + .byte VOL , 69*mus_b_tower_mvl/mxv .byte W06 - .byte 58*bgm_b_tower_mvl/mxv + .byte 58*mus_b_tower_mvl/mxv .byte W06 - .byte 39*bgm_b_tower_mvl/mxv + .byte 39*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N06 , Cn4 .byte W12 .byte N24 @@ -270,18 +270,18 @@ bgm_b_tower_1_B1: .byte W06 .byte N42 , An3 .byte W18 - .byte VOL , 76*bgm_b_tower_mvl/mxv + .byte VOL , 76*mus_b_tower_mvl/mxv .byte MOD , 7 .byte W06 - .byte VOL , 69*bgm_b_tower_mvl/mxv + .byte VOL , 69*mus_b_tower_mvl/mxv .byte W06 - .byte 58*bgm_b_tower_mvl/mxv + .byte 58*mus_b_tower_mvl/mxv .byte W06 - .byte 39*bgm_b_tower_mvl/mxv + .byte 39*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N32 , As3 .byte W18 .byte MOD , 7 @@ -301,20 +301,20 @@ bgm_b_tower_1_B1: .byte W36 .byte MOD , 7 .byte W24 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N32 .byte W18 .byte MOD , 7 @@ -343,18 +343,18 @@ bgm_b_tower_1_B1: .byte W06 .byte N42 , Cn4 .byte W18 - .byte VOL , 76*bgm_b_tower_mvl/mxv + .byte VOL , 76*mus_b_tower_mvl/mxv .byte MOD , 7 .byte W06 - .byte VOL , 69*bgm_b_tower_mvl/mxv + .byte VOL , 69*mus_b_tower_mvl/mxv .byte W06 - .byte 58*bgm_b_tower_mvl/mxv + .byte 58*mus_b_tower_mvl/mxv .byte W06 - .byte 39*bgm_b_tower_mvl/mxv + .byte 39*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N32 , Dn4 .byte W18 .byte MOD , 7 @@ -382,18 +382,18 @@ bgm_b_tower_1_B1: .byte W12 .byte N42 , Ds4 .byte W18 - .byte VOL , 76*bgm_b_tower_mvl/mxv + .byte VOL , 76*mus_b_tower_mvl/mxv .byte MOD , 7 .byte W06 - .byte VOL , 69*bgm_b_tower_mvl/mxv + .byte VOL , 69*mus_b_tower_mvl/mxv .byte W06 - .byte 58*bgm_b_tower_mvl/mxv + .byte 58*mus_b_tower_mvl/mxv .byte W06 - .byte 39*bgm_b_tower_mvl/mxv + .byte 39*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte MOD , 0 .byte N36 , Fs4 .byte W15 @@ -429,16 +429,16 @@ bgm_b_tower_1_B1: .byte N12 , Cn4 .byte W12 .byte GOTO - .word bgm_b_tower_1_B1 + .word mus_b_tower_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_b_tower_2: - .byte KEYSH , bgm_b_tower_key+0 - .byte VOL , 80*bgm_b_tower_mvl/mxv +mus_b_tower_2: + .byte KEYSH , mus_b_tower_key+0 + .byte VOL , 80*mus_b_tower_mvl/mxv .byte W24 -bgm_b_tower_2_B1: +mus_b_tower_2_B1: .byte VOICE , 48 .byte PAN , c_v+18 .byte N30 , As4 , v080 @@ -495,21 +495,21 @@ bgm_b_tower_2_B1: .byte W12 .byte N96 , Fn3 .byte W60 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte W06 .byte W96 .byte W36 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte N06 , Cn4 , v076 .byte W06 .byte Dn4 @@ -522,19 +522,19 @@ bgm_b_tower_2_B1: .byte W12 .byte N48 , Dn4 .byte W24 - .byte VOL , 74*bgm_b_tower_mvl/mxv + .byte VOL , 74*mus_b_tower_mvl/mxv .byte W06 - .byte 62*bgm_b_tower_mvl/mxv + .byte 62*mus_b_tower_mvl/mxv .byte W06 - .byte 48*bgm_b_tower_mvl/mxv + .byte 48*mus_b_tower_mvl/mxv .byte W06 - .byte 23*bgm_b_tower_mvl/mxv + .byte 23*mus_b_tower_mvl/mxv .byte W03 - .byte 13*bgm_b_tower_mvl/mxv + .byte 13*mus_b_tower_mvl/mxv .byte W48 .byte W03 .byte W36 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte N06 , Ds4 .byte W06 .byte Cn4 @@ -549,15 +549,15 @@ bgm_b_tower_2_B1: .byte W12 .byte N30 .byte W12 - .byte VOL , 74*bgm_b_tower_mvl/mxv + .byte VOL , 74*mus_b_tower_mvl/mxv .byte W06 - .byte 62*bgm_b_tower_mvl/mxv + .byte 62*mus_b_tower_mvl/mxv .byte W06 - .byte 48*bgm_b_tower_mvl/mxv + .byte 48*mus_b_tower_mvl/mxv .byte W06 - .byte 23*bgm_b_tower_mvl/mxv + .byte 23*mus_b_tower_mvl/mxv .byte W06 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte N24 , Gn2 , v068 .byte W24 .byte An2 @@ -596,19 +596,19 @@ bgm_b_tower_2_B1: .byte W06 .byte N44 , Cn4 .byte W18 - .byte VOL , 75*bgm_b_tower_mvl/mxv + .byte VOL , 75*mus_b_tower_mvl/mxv .byte W06 - .byte 69*bgm_b_tower_mvl/mxv + .byte 69*mus_b_tower_mvl/mxv .byte W06 - .byte 61*bgm_b_tower_mvl/mxv + .byte 61*mus_b_tower_mvl/mxv .byte W06 - .byte 49*bgm_b_tower_mvl/mxv + .byte 49*mus_b_tower_mvl/mxv .byte W06 - .byte 28*bgm_b_tower_mvl/mxv + .byte 28*mus_b_tower_mvl/mxv .byte W06 .byte W96 .byte VOICE , 1 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N32 , Gn4 , v064 .byte W36 .byte N06 @@ -700,16 +700,16 @@ bgm_b_tower_2_B1: .byte N12 .byte W48 .byte GOTO - .word bgm_b_tower_2_B1 + .word mus_b_tower_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_b_tower_3: - .byte KEYSH , bgm_b_tower_key+0 - .byte VOL , 80*bgm_b_tower_mvl/mxv +mus_b_tower_3: + .byte KEYSH , mus_b_tower_key+0 + .byte VOL , 80*mus_b_tower_mvl/mxv .byte W24 -bgm_b_tower_3_B1: +mus_b_tower_3_B1: .byte W96 .byte W96 .byte W96 @@ -731,19 +731,19 @@ bgm_b_tower_3_B1: .byte W12 .byte N48 , As2 .byte W24 - .byte VOL , 74*bgm_b_tower_mvl/mxv + .byte VOL , 74*mus_b_tower_mvl/mxv .byte W06 - .byte 62*bgm_b_tower_mvl/mxv + .byte 62*mus_b_tower_mvl/mxv .byte W06 - .byte 48*bgm_b_tower_mvl/mxv + .byte 48*mus_b_tower_mvl/mxv .byte W06 - .byte 23*bgm_b_tower_mvl/mxv + .byte 23*mus_b_tower_mvl/mxv .byte W03 - .byte 13*bgm_b_tower_mvl/mxv + .byte 13*mus_b_tower_mvl/mxv .byte W48 .byte W03 .byte W36 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte N03 , Gs2 .byte W06 .byte N03 @@ -756,15 +756,15 @@ bgm_b_tower_3_B1: .byte W12 .byte N42 , Ds3 .byte W24 - .byte VOL , 74*bgm_b_tower_mvl/mxv + .byte VOL , 74*mus_b_tower_mvl/mxv .byte W06 - .byte 62*bgm_b_tower_mvl/mxv + .byte 62*mus_b_tower_mvl/mxv .byte W06 - .byte 48*bgm_b_tower_mvl/mxv + .byte 48*mus_b_tower_mvl/mxv .byte W06 - .byte 23*bgm_b_tower_mvl/mxv + .byte 23*mus_b_tower_mvl/mxv .byte W06 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte W48 .byte W48 .byte N24 , As2 , v064 @@ -797,17 +797,17 @@ bgm_b_tower_3_B1: .byte W06 .byte N44 , Cn3 .byte W18 - .byte VOL , 75*bgm_b_tower_mvl/mxv + .byte VOL , 75*mus_b_tower_mvl/mxv .byte W06 - .byte 69*bgm_b_tower_mvl/mxv + .byte 69*mus_b_tower_mvl/mxv .byte W06 - .byte 61*bgm_b_tower_mvl/mxv + .byte 61*mus_b_tower_mvl/mxv .byte W06 - .byte 49*bgm_b_tower_mvl/mxv + .byte 49*mus_b_tower_mvl/mxv .byte W06 - .byte 28*bgm_b_tower_mvl/mxv + .byte 28*mus_b_tower_mvl/mxv .byte W06 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte N06 , As2 , v076 .byte W12 .byte N06 @@ -818,17 +818,17 @@ bgm_b_tower_3_B1: .byte W06 .byte N44 .byte W18 - .byte VOL , 75*bgm_b_tower_mvl/mxv + .byte VOL , 75*mus_b_tower_mvl/mxv .byte W06 - .byte 69*bgm_b_tower_mvl/mxv + .byte 69*mus_b_tower_mvl/mxv .byte W06 - .byte 61*bgm_b_tower_mvl/mxv + .byte 61*mus_b_tower_mvl/mxv .byte W06 - .byte 49*bgm_b_tower_mvl/mxv + .byte 49*mus_b_tower_mvl/mxv .byte W06 - .byte 28*bgm_b_tower_mvl/mxv + .byte 28*mus_b_tower_mvl/mxv .byte W06 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte N06 , Ds2 .byte W12 .byte N06 @@ -839,17 +839,17 @@ bgm_b_tower_3_B1: .byte W06 .byte N44 .byte W18 - .byte VOL , 75*bgm_b_tower_mvl/mxv + .byte VOL , 75*mus_b_tower_mvl/mxv .byte W06 - .byte 69*bgm_b_tower_mvl/mxv + .byte 69*mus_b_tower_mvl/mxv .byte W06 - .byte 61*bgm_b_tower_mvl/mxv + .byte 61*mus_b_tower_mvl/mxv .byte W06 - .byte 49*bgm_b_tower_mvl/mxv + .byte 49*mus_b_tower_mvl/mxv .byte W06 - .byte 28*bgm_b_tower_mvl/mxv + .byte 28*mus_b_tower_mvl/mxv .byte W06 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte N24 .byte W24 .byte Fn2 @@ -862,13 +862,13 @@ bgm_b_tower_3_B1: .byte W12 .byte N21 .byte W09 - .byte VOL , 71*bgm_b_tower_mvl/mxv + .byte VOL , 71*mus_b_tower_mvl/mxv .byte W03 - .byte 54*bgm_b_tower_mvl/mxv + .byte 54*mus_b_tower_mvl/mxv .byte W03 - .byte 44*bgm_b_tower_mvl/mxv + .byte 44*mus_b_tower_mvl/mxv .byte W09 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte N03 .byte W06 .byte N03 @@ -930,18 +930,18 @@ bgm_b_tower_3_B1: .byte N12 .byte W48 .byte GOTO - .word bgm_b_tower_3_B1 + .word mus_b_tower_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_b_tower_4: - .byte KEYSH , bgm_b_tower_key+0 - .byte VOL , 80*bgm_b_tower_mvl/mxv +mus_b_tower_4: + .byte KEYSH , mus_b_tower_key+0 + .byte VOL , 80*mus_b_tower_mvl/mxv .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte W24 -bgm_b_tower_4_B1: +mus_b_tower_4_B1: .byte VOICE , 80 .byte PAN , c_v-48 .byte N66 , Dn4 , v052 @@ -949,20 +949,20 @@ bgm_b_tower_4_B1: .byte W01 .byte MOD , 6 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N03 , As3 .byte W06 .byte Cn4 @@ -974,39 +974,39 @@ bgm_b_tower_4_B1: .byte W01 .byte MOD , 6 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte MOD , 0 .byte W30 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N66 , Dn4 .byte W32 .byte W01 .byte MOD , 6 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N03 , As3 .byte W06 .byte Cn4 @@ -1019,21 +1019,21 @@ bgm_b_tower_4_B1: .byte MOD , 6 .byte W24 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte W06 - .byte 56*bgm_b_tower_mvl/mxv + .byte 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W96 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N06 , Fn3 .byte W12 .byte N06 @@ -1329,18 +1329,18 @@ bgm_b_tower_4_B1: .byte N12 .byte W48 .byte GOTO - .word bgm_b_tower_4_B1 + .word mus_b_tower_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_b_tower_5: - .byte KEYSH , bgm_b_tower_key+0 +mus_b_tower_5: + .byte KEYSH , mus_b_tower_key+0 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte W24 -bgm_b_tower_5_B1: +mus_b_tower_5_B1: .byte VOICE , 82 .byte PAN , c_v+48 .byte N12 , As3 , v052 @@ -1352,23 +1352,23 @@ bgm_b_tower_5_B1: .byte W09 .byte MOD , 6 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte N12 .byte W06 - .byte VOL , 73*bgm_b_tower_mvl/mxv + .byte VOL , 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte N18 .byte W06 - .byte VOL , 56*bgm_b_tower_mvl/mxv + .byte VOL , 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte MOD , 0 .byte W06 .byte VOICE , 82 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N03 , Fn3 .byte W06 .byte Gn3 @@ -1384,23 +1384,23 @@ bgm_b_tower_5_B1: .byte W09 .byte MOD , 6 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte N12 .byte W06 - .byte VOL , 73*bgm_b_tower_mvl/mxv + .byte VOL , 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte N18 .byte W06 - .byte VOL , 56*bgm_b_tower_mvl/mxv + .byte VOL , 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte MOD , 0 .byte W30 .byte VOICE , 82 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N12 , As3 .byte W12 .byte VOICE , 84 @@ -1410,23 +1410,23 @@ bgm_b_tower_5_B1: .byte W09 .byte MOD , 6 .byte W03 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte N12 .byte W06 - .byte VOL , 73*bgm_b_tower_mvl/mxv + .byte VOL , 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte N18 .byte W06 - .byte VOL , 56*bgm_b_tower_mvl/mxv + .byte VOL , 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte W06 - .byte 21*bgm_b_tower_mvl/mxv + .byte 21*mus_b_tower_mvl/mxv .byte MOD , 0 .byte W06 .byte VOICE , 82 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N03 , Fn3 .byte W06 .byte Gn3 @@ -1446,25 +1446,25 @@ bgm_b_tower_5_B1: .byte W12 .byte N12 .byte W12 - .byte VOL , 77*bgm_b_tower_mvl/mxv + .byte VOL , 77*mus_b_tower_mvl/mxv .byte N12 .byte W06 - .byte VOL , 73*bgm_b_tower_mvl/mxv + .byte VOL , 73*mus_b_tower_mvl/mxv .byte W06 - .byte 66*bgm_b_tower_mvl/mxv + .byte 66*mus_b_tower_mvl/mxv .byte N12 .byte W06 - .byte VOL , 56*bgm_b_tower_mvl/mxv + .byte VOL , 56*mus_b_tower_mvl/mxv .byte W06 - .byte 34*bgm_b_tower_mvl/mxv + .byte 34*mus_b_tower_mvl/mxv .byte N12 .byte W06 - .byte VOL , 21*bgm_b_tower_mvl/mxv + .byte VOL , 21*mus_b_tower_mvl/mxv .byte W06 .byte MOD , 0 .byte W96 .byte VOICE , 82 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N06 , Dn3 .byte W12 .byte N06 @@ -1757,16 +1757,16 @@ bgm_b_tower_5_B1: .byte N12 .byte W48 .byte GOTO - .word bgm_b_tower_5_B1 + .word mus_b_tower_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_b_tower_6: - .byte KEYSH , bgm_b_tower_key+0 - .byte VOL , 80*bgm_b_tower_mvl/mxv +mus_b_tower_6: + .byte KEYSH , mus_b_tower_key+0 + .byte VOL , 80*mus_b_tower_mvl/mxv .byte W24 -bgm_b_tower_6_B1: +mus_b_tower_6_B1: .byte VOICE , 81 .byte N06 , As1 , v080 .byte W12 @@ -1800,7 +1800,7 @@ bgm_b_tower_6_B1: .byte W24 .byte N09 .byte W12 -bgm_b_tower_6_000: +mus_b_tower_6_000: .byte N06 , As1 , v080 .byte W12 .byte N06 @@ -1845,7 +1845,7 @@ bgm_b_tower_6_000: .byte Cn2 .byte W24 .byte PATT - .word bgm_b_tower_6_000 + .word mus_b_tower_6_000 .byte N06 , Fn1 , v080 .byte W12 .byte N06 @@ -1863,7 +1863,7 @@ bgm_b_tower_6_000: .byte Fn1 .byte W12 .byte PATT - .word bgm_b_tower_6_000 + .word mus_b_tower_6_000 .byte N06 , Gs1 , v080 .byte W12 .byte N06 @@ -1926,7 +1926,7 @@ bgm_b_tower_6_000: .byte W24 .byte N09 , As1 .byte W12 -bgm_b_tower_6_001: +mus_b_tower_6_001: .byte N09 , Ds1 , v080 .byte W12 .byte As1 @@ -1945,7 +1945,7 @@ bgm_b_tower_6_001: .byte W12 .byte PEND .byte PATT - .word bgm_b_tower_6_001 + .word mus_b_tower_6_001 .byte N09 , As1 , v080 .byte W12 .byte Fn2 @@ -2028,23 +2028,23 @@ bgm_b_tower_6_001: .byte N12 .byte W48 .byte GOTO - .word bgm_b_tower_6_B1 + .word mus_b_tower_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_b_tower_7: - .byte KEYSH , bgm_b_tower_key+0 +mus_b_tower_7: + .byte KEYSH , mus_b_tower_key+0 .byte PAN , c_v-8 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte W24 -bgm_b_tower_7_B1: +mus_b_tower_7_B1: .byte VOICE , 47 .byte N24 , As1 , v127 .byte W72 .byte N24 .byte W24 -bgm_b_tower_7_000: +mus_b_tower_7_000: .byte N24 , Fn2 , v127 .byte W84 .byte N12 @@ -2055,7 +2055,7 @@ bgm_b_tower_7_000: .byte N24 .byte W24 .byte PATT - .word bgm_b_tower_7_000 + .word mus_b_tower_7_000 .byte N24 , Fn2 , v127 .byte W24 .byte Ds2 @@ -2129,17 +2129,17 @@ bgm_b_tower_7_000: .byte W96 .byte W96 .byte GOTO - .word bgm_b_tower_7_B1 + .word mus_b_tower_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_b_tower_8: - .byte KEYSH , bgm_b_tower_key+0 +mus_b_tower_8: + .byte KEYSH , mus_b_tower_key+0 .byte VOICE , 0 .byte W24 -bgm_b_tower_8_B1: - .byte VOL , 80*bgm_b_tower_mvl/mxv +mus_b_tower_8_B1: + .byte VOL , 80*mus_b_tower_mvl/mxv .byte N72 , Bn2 , v092 .byte W96 .byte W96 @@ -2162,20 +2162,20 @@ bgm_b_tower_8_B1: .byte W96 .byte W96 .byte W48 - .byte VOL , 40*bgm_b_tower_mvl/mxv + .byte VOL , 40*mus_b_tower_mvl/mxv .byte N48 , An2 , v064 .byte W09 - .byte VOL , 49*bgm_b_tower_mvl/mxv + .byte VOL , 49*mus_b_tower_mvl/mxv .byte W06 - .byte 57*bgm_b_tower_mvl/mxv + .byte 57*mus_b_tower_mvl/mxv .byte W06 - .byte 64*bgm_b_tower_mvl/mxv + .byte 64*mus_b_tower_mvl/mxv .byte W06 - .byte 73*bgm_b_tower_mvl/mxv + .byte 73*mus_b_tower_mvl/mxv .byte W06 - .byte 77*bgm_b_tower_mvl/mxv + .byte 77*mus_b_tower_mvl/mxv .byte W06 - .byte 80*bgm_b_tower_mvl/mxv + .byte 80*mus_b_tower_mvl/mxv .byte W09 .byte N96 , Bn2 , v092 .byte W96 @@ -2187,18 +2187,18 @@ bgm_b_tower_8_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_b_tower_8_B1 + .word mus_b_tower_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_b_tower_9: - .byte KEYSH , bgm_b_tower_key+0 +mus_b_tower_9: + .byte KEYSH , mus_b_tower_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_b_tower_mvl/mxv + .byte VOL , 80*mus_b_tower_mvl/mxv .byte W24 -bgm_b_tower_9_B1: -bgm_b_tower_9_000: +mus_b_tower_9_B1: +mus_b_tower_9_000: .byte W60 .byte N06 , En1 , v092 .byte W06 @@ -2208,11 +2208,11 @@ bgm_b_tower_9_000: .byte W24 .byte PEND .byte PATT - .word bgm_b_tower_9_000 + .word mus_b_tower_9_000 .byte PATT - .word bgm_b_tower_9_000 + .word mus_b_tower_9_000 .byte PATT - .word bgm_b_tower_9_000 + .word mus_b_tower_9_000 .byte N06 , En1 , v112 .byte W24 .byte N06 @@ -2248,7 +2248,7 @@ bgm_b_tower_9_000: .byte W96 .byte W96 .byte W96 -bgm_b_tower_9_001: +mus_b_tower_9_001: .byte N06 , En1 , v092 .byte W06 .byte En1 , v060 @@ -2272,7 +2272,7 @@ bgm_b_tower_9_001: .byte N06 .byte W06 .byte PEND -bgm_b_tower_9_002: +mus_b_tower_9_002: .byte N06 , En1 , v092 .byte W06 .byte En1 , v076 @@ -2301,7 +2301,7 @@ bgm_b_tower_9_002: .byte W06 .byte PEND .byte PATT - .word bgm_b_tower_9_001 + .word mus_b_tower_9_001 .byte N06 , En1 , v092 .byte W06 .byte En1 , v076 @@ -2333,11 +2333,11 @@ bgm_b_tower_9_002: .byte N06 .byte W06 .byte PATT - .word bgm_b_tower_9_001 + .word mus_b_tower_9_001 .byte PATT - .word bgm_b_tower_9_002 + .word mus_b_tower_9_002 .byte PATT - .word bgm_b_tower_9_001 + .word mus_b_tower_9_001 .byte N06 , En1 , v092 .byte W06 .byte En1 , v076 @@ -2353,28 +2353,28 @@ bgm_b_tower_9_002: .byte En1 , v112 .byte W48 .byte GOTO - .word bgm_b_tower_9_B1 + .word mus_b_tower_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_b_tower: +mus_b_tower: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_b_tower_pri @ Priority - .byte bgm_b_tower_rev @ Reverb. + .byte mus_b_tower_pri @ Priority + .byte mus_b_tower_rev @ Reverb. - .word bgm_b_tower_grp + .word mus_b_tower_grp - .word bgm_b_tower_1 - .word bgm_b_tower_2 - .word bgm_b_tower_3 - .word bgm_b_tower_4 - .word bgm_b_tower_5 - .word bgm_b_tower_6 - .word bgm_b_tower_7 - .word bgm_b_tower_8 - .word bgm_b_tower_9 + .word mus_b_tower_1 + .word mus_b_tower_2 + .word mus_b_tower_3 + .word mus_b_tower_4 + .word mus_b_tower_5 + .word mus_b_tower_6 + .word mus_b_tower_7 + .word mus_b_tower_8 + .word mus_b_tower_9 .end diff --git a/sound/songs/bgm_odamaki.s b/sound/songs/mus_birch_lab.s index 7fe0af66c..ff0719cf1 100644 --- a/sound/songs/bgm_odamaki.s +++ b/sound/songs/mus_birch_lab.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_odamaki_grp, voicegroup030 - .equ bgm_odamaki_pri, 0 - .equ bgm_odamaki_rev, reverb_set+50 - .equ bgm_odamaki_mvl, 127 - .equ bgm_odamaki_key, 0 - .equ bgm_odamaki_tbs, 1 - .equ bgm_odamaki_exg, 0 - .equ bgm_odamaki_cmp, 1 + .equ mus_birch_lab_grp, voicegroup030 + .equ mus_birch_lab_pri, 0 + .equ mus_birch_lab_rev, reverb_set+50 + .equ mus_birch_lab_mvl, 127 + .equ mus_birch_lab_key, 0 + .equ mus_birch_lab_tbs, 1 + .equ mus_birch_lab_exg, 0 + .equ mus_birch_lab_cmp, 1 .section .rodata - .global bgm_odamaki + .global mus_birch_lab .align 2 @********************** Track 1 **********************@ -bgm_odamaki_1: - .byte KEYSH , bgm_odamaki_key+0 -bgm_odamaki_1_B1: - .byte TEMPO , 100*bgm_odamaki_tbs/2 +mus_birch_lab_1: + .byte KEYSH , mus_birch_lab_key+0 +mus_birch_lab_1_B1: + .byte TEMPO , 100*mus_birch_lab_tbs/2 .byte VOICE , 48 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte LFOS , 48 .byte PAN , c_v-3 .byte W09 @@ -48,15 +48,15 @@ bgm_odamaki_1_B1: .byte W15 .byte MOD , 5 .byte W03 - .byte VOL , 73*bgm_odamaki_mvl/mxv + .byte VOL , 73*mus_birch_lab_mvl/mxv .byte W06 - .byte 64*bgm_odamaki_mvl/mxv + .byte 64*mus_birch_lab_mvl/mxv .byte W06 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W06 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte W09 .byte N03 , Gs4 .byte W03 @@ -86,16 +86,16 @@ bgm_odamaki_1_B1: .byte W15 .byte MOD , 5 .byte W03 - .byte VOL , 73*bgm_odamaki_mvl/mxv + .byte VOL , 73*mus_birch_lab_mvl/mxv .byte W06 - .byte 64*bgm_odamaki_mvl/mxv + .byte 64*mus_birch_lab_mvl/mxv .byte W06 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W06 .byte MOD , 0 .byte W12 .byte VOICE , 73 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte N12 , Dn5 , v100 .byte W18 .byte N18 @@ -108,18 +108,18 @@ bgm_odamaki_1_B1: .byte W12 .byte N21 , Dn5 .byte W09 - .byte VOL , 71*bgm_odamaki_mvl/mxv + .byte VOL , 71*mus_birch_lab_mvl/mxv .byte MOD , 7 .byte W03 - .byte VOL , 62*bgm_odamaki_mvl/mxv + .byte VOL , 62*mus_birch_lab_mvl/mxv .byte W03 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W03 - .byte 28*bgm_odamaki_mvl/mxv + .byte 28*mus_birch_lab_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte W96 .byte N09 .byte W12 @@ -139,16 +139,16 @@ bgm_odamaki_1_B1: .byte W06 .byte MOD , 7 .byte W09 - .byte VOL , 71*bgm_odamaki_mvl/mxv + .byte VOL , 71*mus_birch_lab_mvl/mxv .byte W03 - .byte 62*bgm_odamaki_mvl/mxv + .byte 62*mus_birch_lab_mvl/mxv .byte W03 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W03 - .byte 28*bgm_odamaki_mvl/mxv + .byte 28*mus_birch_lab_mvl/mxv .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte W72 .byte VOICE , 48 .byte W09 @@ -180,20 +180,20 @@ bgm_odamaki_1_B1: .byte W15 .byte MOD , 5 .byte W09 - .byte VOL , 71*bgm_odamaki_mvl/mxv + .byte VOL , 71*mus_birch_lab_mvl/mxv .byte W03 - .byte 62*bgm_odamaki_mvl/mxv + .byte 62*mus_birch_lab_mvl/mxv .byte W03 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W03 - .byte 28*bgm_odamaki_mvl/mxv + .byte 28*mus_birch_lab_mvl/mxv .byte W03 - .byte 20*bgm_odamaki_mvl/mxv + .byte 20*mus_birch_lab_mvl/mxv .byte MOD , 0 .byte W03 - .byte VOL , 11*bgm_odamaki_mvl/mxv + .byte VOL , 11*mus_birch_lab_mvl/mxv .byte W09 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte W12 .byte N12 , Dn4 .byte W12 @@ -215,27 +215,27 @@ bgm_odamaki_1_B1: .byte W24 .byte N24 , Dn4 .byte W09 - .byte VOL , 71*bgm_odamaki_mvl/mxv + .byte VOL , 71*mus_birch_lab_mvl/mxv .byte W03 - .byte 62*bgm_odamaki_mvl/mxv + .byte 62*mus_birch_lab_mvl/mxv .byte MOD , 5 .byte W03 - .byte VOL , 45*bgm_odamaki_mvl/mxv + .byte VOL , 45*mus_birch_lab_mvl/mxv .byte W03 - .byte 28*bgm_odamaki_mvl/mxv + .byte 28*mus_birch_lab_mvl/mxv .byte W06 .byte MOD , 0 .byte W24 .byte GOTO - .word bgm_odamaki_1_B1 + .word mus_birch_lab_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_odamaki_2: - .byte VOL , 80*bgm_odamaki_mvl/mxv - .byte KEYSH , bgm_odamaki_key+0 -bgm_odamaki_2_B1: +mus_birch_lab_2: + .byte VOL , 80*mus_birch_lab_mvl/mxv + .byte KEYSH , mus_birch_lab_key+0 +mus_birch_lab_2_B1: .byte VOICE , 35 .byte PAN , c_v+0 .byte N12 , Dn2 , v116 @@ -391,17 +391,17 @@ bgm_odamaki_2_B1: .byte Cs2 .byte W06 .byte GOTO - .word bgm_odamaki_2_B1 + .word mus_birch_lab_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_odamaki_3: - .byte KEYSH , bgm_odamaki_key+0 -bgm_odamaki_3_B1: +mus_birch_lab_3: + .byte KEYSH , mus_birch_lab_key+0 +mus_birch_lab_3_B1: .byte VOICE , 73 .byte LFOS , 48 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte PAN , c_v+18 .byte W24 .byte N03 , An5 , v068 @@ -432,15 +432,15 @@ bgm_odamaki_3_B1: .byte W15 .byte MOD , 7 .byte W03 - .byte VOL , 73*bgm_odamaki_mvl/mxv + .byte VOL , 73*mus_birch_lab_mvl/mxv .byte W06 - .byte 64*bgm_odamaki_mvl/mxv + .byte 64*mus_birch_lab_mvl/mxv .byte W06 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W06 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte W24 .byte N03 , Fs5 .byte W03 @@ -474,16 +474,16 @@ bgm_odamaki_3_B1: .byte W12 .byte MOD , 7 .byte W06 - .byte VOL , 73*bgm_odamaki_mvl/mxv + .byte VOL , 73*mus_birch_lab_mvl/mxv .byte W06 - .byte 64*bgm_odamaki_mvl/mxv + .byte 64*mus_birch_lab_mvl/mxv .byte W06 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W06 .byte MOD , 0 .byte W12 .byte VOICE , 73 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte N12 , Fs4 , v076 .byte W18 .byte N18 @@ -496,19 +496,19 @@ bgm_odamaki_3_B1: .byte W12 .byte N21 , Fs4 .byte W09 - .byte VOL , 71*bgm_odamaki_mvl/mxv + .byte VOL , 71*mus_birch_lab_mvl/mxv .byte MOD , 7 .byte W03 - .byte VOL , 62*bgm_odamaki_mvl/mxv + .byte VOL , 62*mus_birch_lab_mvl/mxv .byte W03 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W03 - .byte 28*bgm_odamaki_mvl/mxv + .byte 28*mus_birch_lab_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 .byte VOICE , 48 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte N12 , Cs4 , v080 .byte W18 .byte N18 @@ -599,21 +599,21 @@ bgm_odamaki_3_B1: .byte W15 .byte MOD , 7 .byte W09 - .byte VOL , 71*bgm_odamaki_mvl/mxv + .byte VOL , 71*mus_birch_lab_mvl/mxv .byte W03 - .byte 62*bgm_odamaki_mvl/mxv + .byte 62*mus_birch_lab_mvl/mxv .byte W03 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W03 - .byte 28*bgm_odamaki_mvl/mxv + .byte 28*mus_birch_lab_mvl/mxv .byte W03 - .byte 20*bgm_odamaki_mvl/mxv + .byte 20*mus_birch_lab_mvl/mxv .byte W03 - .byte 11*bgm_odamaki_mvl/mxv + .byte 11*mus_birch_lab_mvl/mxv .byte W03 .byte MOD , 0 .byte W06 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte W12 .byte N03 , An5 .byte W03 @@ -645,28 +645,28 @@ bgm_odamaki_3_B1: .byte W24 .byte N24 , Fs4 .byte W09 - .byte VOL , 71*bgm_odamaki_mvl/mxv + .byte VOL , 71*mus_birch_lab_mvl/mxv .byte W03 - .byte 62*bgm_odamaki_mvl/mxv + .byte 62*mus_birch_lab_mvl/mxv .byte MOD , 5 .byte W03 - .byte VOL , 45*bgm_odamaki_mvl/mxv + .byte VOL , 45*mus_birch_lab_mvl/mxv .byte W03 - .byte 28*bgm_odamaki_mvl/mxv + .byte 28*mus_birch_lab_mvl/mxv .byte W06 .byte MOD , 0 .byte W24 .byte GOTO - .word bgm_odamaki_3_B1 + .word mus_birch_lab_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_odamaki_4: - .byte KEYSH , bgm_odamaki_key+0 -bgm_odamaki_4_B1: +mus_birch_lab_4: + .byte KEYSH , mus_birch_lab_key+0 +mus_birch_lab_4_B1: .byte VOICE , 60 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte PAN , c_v+5 .byte N12 , An3 , v080 .byte W36 @@ -684,21 +684,21 @@ bgm_odamaki_4_B1: .byte W24 .byte Bn3 .byte W24 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte N21 , En3 .byte W12 - .byte VOL , 74*bgm_odamaki_mvl/mxv + .byte VOL , 74*mus_birch_lab_mvl/mxv .byte W03 - .byte 52*bgm_odamaki_mvl/mxv + .byte 52*mus_birch_lab_mvl/mxv .byte W03 - .byte 23*bgm_odamaki_mvl/mxv + .byte 23*mus_birch_lab_mvl/mxv .byte W06 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte N12 , Cs4 .byte W12 .byte Bn3 .byte W12 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte N12 , An3 .byte W36 .byte N03 , Fs3 @@ -717,13 +717,13 @@ bgm_odamaki_4_B1: .byte W24 .byte N21 , An2 .byte W12 - .byte VOL , 74*bgm_odamaki_mvl/mxv + .byte VOL , 74*mus_birch_lab_mvl/mxv .byte W03 - .byte 52*bgm_odamaki_mvl/mxv + .byte 52*mus_birch_lab_mvl/mxv .byte W03 - .byte 23*bgm_odamaki_mvl/mxv + .byte 23*mus_birch_lab_mvl/mxv .byte W06 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte N12 , Dn3 .byte W12 .byte Cs3 @@ -740,16 +740,16 @@ bgm_odamaki_4_B1: .byte W12 .byte N21 , Bn3 .byte W09 - .byte VOL , 71*bgm_odamaki_mvl/mxv + .byte VOL , 71*mus_birch_lab_mvl/mxv .byte W03 - .byte 62*bgm_odamaki_mvl/mxv + .byte 62*mus_birch_lab_mvl/mxv .byte W03 - .byte 45*bgm_odamaki_mvl/mxv + .byte 45*mus_birch_lab_mvl/mxv .byte W03 - .byte 28*bgm_odamaki_mvl/mxv + .byte 28*mus_birch_lab_mvl/mxv .byte W06 .byte VOICE , 46 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte PAN , c_v-12 .byte N06 , An3 , v076 .byte W06 @@ -884,16 +884,16 @@ bgm_odamaki_4_B1: .byte N12 , Dn3 , v080 .byte W48 .byte GOTO - .word bgm_odamaki_4_B1 + .word mus_birch_lab_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_odamaki_5: - .byte KEYSH , bgm_odamaki_key+0 -bgm_odamaki_5_B1: +mus_birch_lab_5: + .byte KEYSH , mus_birch_lab_key+0 +mus_birch_lab_5_B1: .byte VOICE , 80 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v-48 @@ -915,27 +915,27 @@ bgm_odamaki_5_B1: .byte W06 .byte N36 .byte W18 - .byte VOL , 67*bgm_odamaki_mvl/mxv + .byte VOL , 67*mus_birch_lab_mvl/mxv .byte W06 - .byte 54*bgm_odamaki_mvl/mxv + .byte 54*mus_birch_lab_mvl/mxv .byte W06 - .byte 27*bgm_odamaki_mvl/mxv + .byte 27*mus_birch_lab_mvl/mxv .byte W18 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte N21 , Cs3 .byte W12 - .byte VOL , 74*bgm_odamaki_mvl/mxv + .byte VOL , 74*mus_birch_lab_mvl/mxv .byte W03 - .byte 52*bgm_odamaki_mvl/mxv + .byte 52*mus_birch_lab_mvl/mxv .byte W03 - .byte 23*bgm_odamaki_mvl/mxv + .byte 23*mus_birch_lab_mvl/mxv .byte W06 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte N12 , En3 .byte W12 .byte Gn3 .byte W12 -bgm_odamaki_5_000: +mus_birch_lab_5_000: .byte N06 , An3 , v052 .byte W12 .byte Fs3 @@ -961,13 +961,13 @@ bgm_odamaki_5_000: .byte W06 .byte N21 , En4 .byte W12 - .byte VOL , 74*bgm_odamaki_mvl/mxv + .byte VOL , 74*mus_birch_lab_mvl/mxv .byte W03 - .byte 52*bgm_odamaki_mvl/mxv + .byte 52*mus_birch_lab_mvl/mxv .byte W03 - .byte 23*bgm_odamaki_mvl/mxv + .byte 23*mus_birch_lab_mvl/mxv .byte W06 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte N12 , An3 .byte W12 .byte Gn3 @@ -1009,7 +1009,7 @@ bgm_odamaki_5_000: .byte N06 , En3 .byte W06 .byte PATT - .word bgm_odamaki_5_000 + .word mus_birch_lab_5_000 .byte N06 , Bn3 , v052 .byte W12 .byte Gn3 @@ -1047,18 +1047,18 @@ bgm_odamaki_5_000: .byte N12 .byte W48 .byte GOTO - .word bgm_odamaki_5_B1 + .word mus_birch_lab_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_odamaki_6: - .byte KEYSH , bgm_odamaki_key+0 -bgm_odamaki_6_B1: +mus_birch_lab_6: + .byte KEYSH , mus_birch_lab_key+0 +mus_birch_lab_6_B1: .byte VOICE , 82 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 80*bgm_odamaki_mvl/mxv + .byte VOL , 80*mus_birch_lab_mvl/mxv .byte PAN , c_v+48 .byte N06 , Fs3 , v052 .byte W12 @@ -1078,22 +1078,22 @@ bgm_odamaki_6_B1: .byte W06 .byte N36 , Bn2 .byte W18 - .byte VOL , 67*bgm_odamaki_mvl/mxv + .byte VOL , 67*mus_birch_lab_mvl/mxv .byte W06 - .byte 54*bgm_odamaki_mvl/mxv + .byte 54*mus_birch_lab_mvl/mxv .byte W06 - .byte 27*bgm_odamaki_mvl/mxv + .byte 27*mus_birch_lab_mvl/mxv .byte W18 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte N21 , An2 .byte W12 - .byte VOL , 74*bgm_odamaki_mvl/mxv + .byte VOL , 74*mus_birch_lab_mvl/mxv .byte W03 - .byte 52*bgm_odamaki_mvl/mxv + .byte 52*mus_birch_lab_mvl/mxv .byte W03 - .byte 23*bgm_odamaki_mvl/mxv + .byte 23*mus_birch_lab_mvl/mxv .byte W06 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte N12 , Cs3 .byte W12 .byte En3 @@ -1122,13 +1122,13 @@ bgm_odamaki_6_B1: .byte W06 .byte N21 , Cs4 .byte W12 - .byte VOL , 74*bgm_odamaki_mvl/mxv + .byte VOL , 74*mus_birch_lab_mvl/mxv .byte W03 - .byte 52*bgm_odamaki_mvl/mxv + .byte 52*mus_birch_lab_mvl/mxv .byte W03 - .byte 23*bgm_odamaki_mvl/mxv + .byte 23*mus_birch_lab_mvl/mxv .byte W06 - .byte 80*bgm_odamaki_mvl/mxv + .byte 80*mus_birch_lab_mvl/mxv .byte N12 , Fs3 .byte W12 .byte En3 @@ -1222,22 +1222,22 @@ bgm_odamaki_6_B1: .byte N12 .byte W48 .byte GOTO - .word bgm_odamaki_6_B1 + .word mus_birch_lab_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_odamaki_7: - .byte VOL , 80*bgm_odamaki_mvl/mxv - .byte KEYSH , bgm_odamaki_key+0 -bgm_odamaki_7_B1: +mus_birch_lab_7: + .byte VOL , 80*mus_birch_lab_mvl/mxv + .byte KEYSH , mus_birch_lab_key+0 +mus_birch_lab_7_B1: .byte VOICE , 0 .byte W24 .byte N06 , Fs2 , v064 .byte W48 .byte N06 .byte W24 -bgm_odamaki_7_000: +mus_birch_lab_7_000: .byte W24 .byte N06 , Fs2 , v064 .byte W48 @@ -1245,11 +1245,11 @@ bgm_odamaki_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_odamaki_7_000 + .word mus_birch_lab_7_000 .byte PATT - .word bgm_odamaki_7_000 + .word mus_birch_lab_7_000 .byte W96 -bgm_odamaki_7_001: +mus_birch_lab_7_001: .byte W24 .byte N06 , Fs2 , v064 .byte W36 @@ -1272,13 +1272,13 @@ bgm_odamaki_7_001: .byte PEND .byte W96 .byte PATT - .word bgm_odamaki_7_001 + .word mus_birch_lab_7_001 .byte PATT - .word bgm_odamaki_7_000 + .word mus_birch_lab_7_000 .byte PATT - .word bgm_odamaki_7_000 + .word mus_birch_lab_7_000 .byte PATT - .word bgm_odamaki_7_000 + .word mus_birch_lab_7_000 .byte W12 .byte N06 , Fs2 , v044 .byte W06 @@ -1289,26 +1289,26 @@ bgm_odamaki_7_001: .byte N06 .byte W24 .byte GOTO - .word bgm_odamaki_7_B1 + .word mus_birch_lab_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_odamaki: +mus_birch_lab: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_odamaki_pri @ Priority - .byte bgm_odamaki_rev @ Reverb. + .byte mus_birch_lab_pri @ Priority + .byte mus_birch_lab_rev @ Reverb. - .word bgm_odamaki_grp + .word mus_birch_lab_grp - .word bgm_odamaki_1 - .word bgm_odamaki_2 - .word bgm_odamaki_3 - .word bgm_odamaki_4 - .word bgm_odamaki_5 - .word bgm_odamaki_6 - .word bgm_odamaki_7 + .word mus_birch_lab_1 + .word mus_birch_lab_2 + .word mus_birch_lab_3 + .word mus_birch_lab_4 + .word mus_birch_lab_5 + .word mus_birch_lab_6 + .word mus_birch_lab_7 .end diff --git a/sound/songs/bgm_pcc.s b/sound/songs/mus_c_comm_center.s index 4bf0d3c07..3c98b41e1 100644 --- a/sound/songs/bgm_pcc.s +++ b/sound/songs/mus_c_comm_center.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_pcc_grp, voicegroup000 - .equ bgm_pcc_pri, 0 - .equ bgm_pcc_rev, reverb_set+50 - .equ bgm_pcc_mvl, 127 - .equ bgm_pcc_key, 0 - .equ bgm_pcc_tbs, 1 - .equ bgm_pcc_exg, 0 - .equ bgm_pcc_cmp, 1 + .equ mus_c_comm_center_grp, voicegroup000 + .equ mus_c_comm_center_pri, 0 + .equ mus_c_comm_center_rev, reverb_set+50 + .equ mus_c_comm_center_mvl, 127 + .equ mus_c_comm_center_key, 0 + .equ mus_c_comm_center_tbs, 1 + .equ mus_c_comm_center_exg, 0 + .equ mus_c_comm_center_cmp, 1 .section .rodata - .global bgm_pcc + .global mus_c_comm_center .align 2 @********************** Track 1 **********************@ -bgm_pcc_1: - .byte KEYSH , bgm_pcc_key+0 - .byte TEMPO , 120*bgm_pcc_tbs/2 +mus_c_comm_center_1: + .byte KEYSH , mus_c_comm_center_key+0 + .byte TEMPO , 120*mus_c_comm_center_tbs/2 .byte VOICE , 1 - .byte VOL , 80*bgm_pcc_mvl/mxv + .byte VOL , 80*mus_c_comm_center_mvl/mxv .byte N12 , En3 , v076 .byte W12 .byte Fn3 @@ -32,8 +32,8 @@ bgm_pcc_1: .byte W12 .byte N24 , Bn3 .byte W24 -bgm_pcc_1_B1: -bgm_pcc_1_000: +mus_c_comm_center_1_B1: +mus_c_comm_center_1_000: .byte N11 , En3 , v076 .byte W12 .byte Cn3 @@ -51,7 +51,7 @@ bgm_pcc_1_000: .byte Gn3 .byte W12 .byte PEND -bgm_pcc_1_001: +mus_c_comm_center_1_001: .byte N11 , An3 , v076 .byte W12 .byte Gn3 @@ -102,9 +102,9 @@ bgm_pcc_1_001: .byte Gn3 .byte W12 .byte PATT - .word bgm_pcc_1_000 + .word mus_c_comm_center_1_000 .byte PATT - .word bgm_pcc_1_001 + .word mus_c_comm_center_1_001 .byte N11 , Gn3 , v076 .byte W12 .byte Dn3 @@ -248,15 +248,15 @@ bgm_pcc_1_001: .byte Fn3 .byte W12 .byte GOTO - .word bgm_pcc_1_B1 + .word mus_c_comm_center_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_pcc_2: - .byte KEYSH , bgm_pcc_key+0 +mus_c_comm_center_2: + .byte KEYSH , mus_c_comm_center_key+0 .byte VOICE , 32 - .byte VOL , 80*bgm_pcc_mvl/mxv + .byte VOL , 80*mus_c_comm_center_mvl/mxv .byte W60 .byte N12 , Gn1 , v112 .byte W12 @@ -264,8 +264,8 @@ bgm_pcc_2: .byte W12 .byte Bn1 .byte W12 -bgm_pcc_2_B1: -bgm_pcc_2_000: +mus_c_comm_center_2_B1: +mus_c_comm_center_2_000: .byte N11 , Cn2 , v112 .byte W12 .byte En2 @@ -283,7 +283,7 @@ bgm_pcc_2_000: .byte En2 .byte W12 .byte PEND -bgm_pcc_2_001: +mus_c_comm_center_2_001: .byte N11 , Dn2 , v112 .byte W12 .byte Gn2 @@ -301,7 +301,7 @@ bgm_pcc_2_001: .byte Gn2 .byte W12 .byte PEND -bgm_pcc_2_002: +mus_c_comm_center_2_002: .byte N11 , Dn2 , v112 .byte W12 .byte Gn2 @@ -336,11 +336,11 @@ bgm_pcc_2_002: .byte Gn2 .byte W12 .byte PATT - .word bgm_pcc_2_000 + .word mus_c_comm_center_2_000 .byte PATT - .word bgm_pcc_2_001 + .word mus_c_comm_center_2_001 .byte PATT - .word bgm_pcc_2_002 + .word mus_c_comm_center_2_002 .byte N11 , Cn2 , v112 .byte W12 .byte En2 @@ -357,7 +357,7 @@ bgm_pcc_2_002: .byte W12 .byte Fn2 .byte W12 -bgm_pcc_2_003: +mus_c_comm_center_2_003: .byte N11 , En2 , v112 .byte W12 .byte Gn2 @@ -375,7 +375,7 @@ bgm_pcc_2_003: .byte Gn2 .byte W12 .byte PEND -bgm_pcc_2_004: +mus_c_comm_center_2_004: .byte N11 , Fn2 , v112 .byte W12 .byte An2 @@ -393,7 +393,7 @@ bgm_pcc_2_004: .byte An2 .byte W12 .byte PEND -bgm_pcc_2_005: +mus_c_comm_center_2_005: .byte N11 , Dn2 , v112 .byte W12 .byte Fn2 @@ -412,13 +412,13 @@ bgm_pcc_2_005: .byte W12 .byte PEND .byte PATT - .word bgm_pcc_2_003 + .word mus_c_comm_center_2_003 .byte PATT - .word bgm_pcc_2_003 + .word mus_c_comm_center_2_003 .byte PATT - .word bgm_pcc_2_004 + .word mus_c_comm_center_2_004 .byte PATT - .word bgm_pcc_2_005 + .word mus_c_comm_center_2_005 .byte N11 , En2 , v112 .byte W12 .byte Gn2 @@ -436,15 +436,15 @@ bgm_pcc_2_005: .byte Dn2 .byte W12 .byte GOTO - .word bgm_pcc_2_B1 + .word mus_c_comm_center_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_pcc_3: - .byte KEYSH , bgm_pcc_key+0 +mus_c_comm_center_3: + .byte KEYSH , mus_c_comm_center_key+0 .byte VOICE , 48 - .byte VOL , 80*bgm_pcc_mvl/mxv + .byte VOL , 80*mus_c_comm_center_mvl/mxv .byte N12 , Gn3 , v092 .byte W12 .byte An3 @@ -457,8 +457,8 @@ bgm_pcc_3: .byte W12 .byte N24 , Dn4 .byte W24 -bgm_pcc_3_B1: -bgm_pcc_3_000: +mus_c_comm_center_3_B1: +mus_c_comm_center_3_000: .byte N11 , Cn4 , v092 .byte W12 .byte Gn3 @@ -472,7 +472,7 @@ bgm_pcc_3_000: .byte N11 , En4 .byte W12 .byte PEND -bgm_pcc_3_001: +mus_c_comm_center_3_001: .byte N11 , Dn4 , v092 .byte W12 .byte N32 , Bn3 @@ -485,7 +485,7 @@ bgm_pcc_3_001: .byte N23 , Dn6 .byte W24 .byte PEND -bgm_pcc_3_002: +mus_c_comm_center_3_002: .byte VOICE , 48 .byte N11 , Bn3 , v092 .byte W12 @@ -513,11 +513,11 @@ bgm_pcc_3_002: .byte N12 , En3 .byte W12 .byte PATT - .word bgm_pcc_3_000 + .word mus_c_comm_center_3_000 .byte PATT - .word bgm_pcc_3_001 + .word mus_c_comm_center_3_001 .byte PATT - .word bgm_pcc_3_002 + .word mus_c_comm_center_3_002 .byte N44 , Cn4 , v092 .byte W48 .byte N11 , Gn3 @@ -528,7 +528,7 @@ bgm_pcc_3_002: .byte W12 .byte N12 , Dn4 .byte W12 -bgm_pcc_3_003: +mus_c_comm_center_3_003: .byte N44 , En4 , v092 .byte W48 .byte Gn4 @@ -548,7 +548,7 @@ bgm_pcc_3_003: .byte W48 .byte Dn4 .byte W48 -bgm_pcc_3_004: +mus_c_comm_center_3_004: .byte N11 , En4 , v092 .byte W12 .byte Fn4 @@ -561,7 +561,7 @@ bgm_pcc_3_004: .byte W48 .byte PEND .byte PATT - .word bgm_pcc_3_003 + .word mus_c_comm_center_3_003 .byte N11 , Fn4 , v092 .byte W12 .byte En4 @@ -581,24 +581,24 @@ bgm_pcc_3_004: .byte N44 , Fn4 .byte W48 .byte PATT - .word bgm_pcc_3_004 + .word mus_c_comm_center_3_004 .byte GOTO - .word bgm_pcc_3_B1 + .word mus_c_comm_center_3_B1 .byte FINE @******************************************************@ .align 2 -bgm_pcc: +mus_c_comm_center: .byte 3 @ NumTrks .byte 0 @ NumBlks - .byte bgm_pcc_pri @ Priority - .byte bgm_pcc_rev @ Reverb. + .byte mus_c_comm_center_pri @ Priority + .byte mus_c_comm_center_rev @ Reverb. - .word bgm_pcc_grp + .word mus_c_comm_center_grp - .word bgm_pcc_1 - .word bgm_pcc_2 - .word bgm_pcc_3 + .word mus_c_comm_center_1 + .word mus_c_comm_center_2 + .word mus_c_comm_center_3 .end diff --git a/sound/songs/bgm_suikun.s b/sound/songs/mus_c_vs_legend_beast.s index 7d6caa1b6..4ac19b958 100644 --- a/sound/songs/bgm_suikun.s +++ b/sound/songs/mus_c_vs_legend_beast.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_suikun_grp, voicegroup000 - .equ bgm_suikun_pri, 0 - .equ bgm_suikun_rev, reverb_set+50 - .equ bgm_suikun_mvl, 127 - .equ bgm_suikun_key, 0 - .equ bgm_suikun_tbs, 1 - .equ bgm_suikun_exg, 0 - .equ bgm_suikun_cmp, 1 + .equ mus_c_vs_legend_beast_grp, voicegroup000 + .equ mus_c_vs_legend_beast_pri, 0 + .equ mus_c_vs_legend_beast_rev, reverb_set+50 + .equ mus_c_vs_legend_beast_mvl, 127 + .equ mus_c_vs_legend_beast_key, 0 + .equ mus_c_vs_legend_beast_tbs, 1 + .equ mus_c_vs_legend_beast_exg, 0 + .equ mus_c_vs_legend_beast_cmp, 1 .section .rodata - .global bgm_suikun + .global mus_c_vs_legend_beast .align 2 @********************** Track 1 **********************@ -bgm_suikun_1: - .byte KEYSH , bgm_suikun_key+0 - .byte TEMPO , 186*bgm_suikun_tbs/2 +mus_c_vs_legend_beast_1: + .byte KEYSH , mus_c_vs_legend_beast_key+0 + .byte TEMPO , 186*mus_c_vs_legend_beast_tbs/2 .byte VOICE , 48 - .byte VOL , 80*bgm_suikun_mvl/mxv + .byte VOL , 80*mus_c_vs_legend_beast_mvl/mxv .byte N06 , An4 , v112 .byte W06 .byte Gs4 @@ -65,7 +65,7 @@ bgm_suikun_1: .byte W24 .byte N06 .byte W12 -bgm_suikun_1_000: +mus_c_vs_legend_beast_1_000: .byte N06 , An2 , v112 .byte W12 .byte N06 @@ -79,7 +79,7 @@ bgm_suikun_1_000: .byte N12 , Fn4 .byte W24 .byte PEND -bgm_suikun_1_001: +mus_c_vs_legend_beast_1_001: .byte N12 , En4 , v112 .byte W12 .byte N06 , An2 @@ -94,13 +94,13 @@ bgm_suikun_1_001: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_1_000 + .word mus_c_vs_legend_beast_1_000 .byte PATT - .word bgm_suikun_1_001 + .word mus_c_vs_legend_beast_1_001 .byte PATT - .word bgm_suikun_1_000 + .word mus_c_vs_legend_beast_1_000 .byte PATT - .word bgm_suikun_1_001 + .word mus_c_vs_legend_beast_1_001 .byte N06 , An2 , v112 .byte W12 .byte N06 @@ -120,7 +120,7 @@ bgm_suikun_1_001: .byte W06 .byte Gs3 .byte W06 -bgm_suikun_1_B1: +mus_c_vs_legend_beast_1_B1: .byte VOICE , 1 .byte N12 , An2 , v112 .byte W12 @@ -136,7 +136,7 @@ bgm_suikun_1_B1: .byte W12 .byte En2 .byte W12 -bgm_suikun_1_002: +mus_c_vs_legend_beast_1_002: .byte N12 , Dn2 , v112 .byte W12 .byte En2 @@ -152,7 +152,7 @@ bgm_suikun_1_002: .byte En2 .byte W12 .byte PEND -bgm_suikun_1_003: +mus_c_vs_legend_beast_1_003: .byte N12 , Dn3 , v112 .byte W12 .byte An2 @@ -170,7 +170,7 @@ bgm_suikun_1_003: .byte An2 .byte W12 .byte PEND -bgm_suikun_1_004: +mus_c_vs_legend_beast_1_004: .byte N12 , Dn3 , v112 .byte W12 .byte En3 @@ -188,7 +188,7 @@ bgm_suikun_1_004: .byte En3 .byte W12 .byte PEND -bgm_suikun_1_005: +mus_c_vs_legend_beast_1_005: .byte N12 , Cn3 , v112 .byte W12 .byte Dn3 @@ -204,7 +204,7 @@ bgm_suikun_1_005: .byte Gn2 .byte W12 .byte PEND -bgm_suikun_1_006: +mus_c_vs_legend_beast_1_006: .byte N12 , Cn3 , v112 .byte W12 .byte Dn3 @@ -255,15 +255,15 @@ bgm_suikun_1_006: .byte En2 .byte W12 .byte PATT - .word bgm_suikun_1_002 + .word mus_c_vs_legend_beast_1_002 .byte PATT - .word bgm_suikun_1_003 + .word mus_c_vs_legend_beast_1_003 .byte PATT - .word bgm_suikun_1_004 + .word mus_c_vs_legend_beast_1_004 .byte PATT - .word bgm_suikun_1_005 + .word mus_c_vs_legend_beast_1_005 .byte PATT - .word bgm_suikun_1_006 + .word mus_c_vs_legend_beast_1_006 .byte N12 , Cn4 , v112 .byte W12 .byte Gn3 @@ -292,7 +292,7 @@ bgm_suikun_1_006: .byte W12 .byte Cn3 .byte W12 -bgm_suikun_1_007: +mus_c_vs_legend_beast_1_007: .byte N12 , Bn2 , v112 .byte W12 .byte Cn3 @@ -306,7 +306,7 @@ bgm_suikun_1_007: .byte Bn2 .byte W12 .byte PEND -bgm_suikun_1_008: +mus_c_vs_legend_beast_1_008: .byte N12 , Bn2 , v112 .byte W12 .byte Cn3 @@ -324,7 +324,7 @@ bgm_suikun_1_008: .byte Bn2 .byte W12 .byte PEND -bgm_suikun_1_009: +mus_c_vs_legend_beast_1_009: .byte N12 , Cn3 , v112 .byte W12 .byte Gn2 @@ -333,11 +333,11 @@ bgm_suikun_1_009: .byte W60 .byte PEND .byte PATT - .word bgm_suikun_1_009 + .word mus_c_vs_legend_beast_1_009 .byte PATT - .word bgm_suikun_1_007 + .word mus_c_vs_legend_beast_1_007 .byte PATT - .word bgm_suikun_1_008 + .word mus_c_vs_legend_beast_1_008 .byte N12 , Gn3 , v112 .byte W12 .byte Cn3 @@ -417,7 +417,7 @@ bgm_suikun_1_009: .byte W06 .byte Cn4 .byte W06 -bgm_suikun_1_010: +mus_c_vs_legend_beast_1_010: .byte N12 , Bn3 , v112 .byte W12 .byte N12 @@ -431,7 +431,7 @@ bgm_suikun_1_010: .byte N24 , Fs1 .byte W24 .byte PEND -bgm_suikun_1_011: +mus_c_vs_legend_beast_1_011: .byte N12 , Bn3 , v112 .byte W12 .byte N12 @@ -444,10 +444,10 @@ bgm_suikun_1_011: .byte W36 .byte PEND .byte PATT - .word bgm_suikun_1_010 + .word mus_c_vs_legend_beast_1_010 .byte PATT - .word bgm_suikun_1_011 -bgm_suikun_1_012: + .word mus_c_vs_legend_beast_1_011 +mus_c_vs_legend_beast_1_012: .byte N48 , Bn2 , v112 .byte W48 .byte En2 @@ -458,7 +458,7 @@ bgm_suikun_1_012: .byte An2 .byte W48 .byte PATT - .word bgm_suikun_1_012 + .word mus_c_vs_legend_beast_1_012 .byte N60 , Fn2 , v112 .byte W60 .byte VOICE , 48 @@ -494,7 +494,7 @@ bgm_suikun_1_012: .byte W96 .byte W96 .byte W96 -bgm_suikun_1_013: +mus_c_vs_legend_beast_1_013: .byte W24 .byte N12 , Dn3 , v112 .byte W48 @@ -502,12 +502,12 @@ bgm_suikun_1_013: .byte W24 .byte PEND .byte PATT - .word bgm_suikun_1_013 + .word mus_c_vs_legend_beast_1_013 .byte PATT - .word bgm_suikun_1_013 + .word mus_c_vs_legend_beast_1_013 .byte PATT - .word bgm_suikun_1_013 -bgm_suikun_1_014: + .word mus_c_vs_legend_beast_1_013 +mus_c_vs_legend_beast_1_014: .byte W24 .byte N12 , Fn3 , v112 .byte W48 @@ -515,11 +515,11 @@ bgm_suikun_1_014: .byte W24 .byte PEND .byte PATT - .word bgm_suikun_1_014 + .word mus_c_vs_legend_beast_1_014 .byte PATT - .word bgm_suikun_1_014 + .word mus_c_vs_legend_beast_1_014 .byte PATT - .word bgm_suikun_1_014 + .word mus_c_vs_legend_beast_1_014 .byte N24 , En3 , v112 .byte W96 .byte W96 @@ -544,16 +544,16 @@ bgm_suikun_1_014: .byte W48 .byte W48 .byte GOTO - .word bgm_suikun_1_B1 + .word mus_c_vs_legend_beast_1_B1 .byte W48 .byte FINE @********************** Track 2 **********************@ -bgm_suikun_2: - .byte KEYSH , bgm_suikun_key+0 +mus_c_vs_legend_beast_2: + .byte KEYSH , mus_c_vs_legend_beast_key+0 .byte VOICE , 17 - .byte VOL , 80*bgm_suikun_mvl/mxv + .byte VOL , 80*mus_c_vs_legend_beast_mvl/mxv .byte N06 , En6 , v088 .byte W06 .byte En5 @@ -608,7 +608,7 @@ bgm_suikun_2: .byte W48 .byte N12 .byte W24 -bgm_suikun_2_000: +mus_c_vs_legend_beast_2_000: .byte W24 .byte N12 , En2 , v112 .byte W48 @@ -622,8 +622,8 @@ bgm_suikun_2_000: .byte N12 .byte W24 .byte PATT - .word bgm_suikun_2_000 -bgm_suikun_2_001: + .word mus_c_vs_legend_beast_2_000 +mus_c_vs_legend_beast_2_001: .byte N12 , An5 , v112 .byte W24 .byte En4 @@ -637,27 +637,27 @@ bgm_suikun_2_001: .byte As5 .byte W24 .byte PATT - .word bgm_suikun_2_001 + .word mus_c_vs_legend_beast_2_001 .byte W24 .byte N12 , En4 , v112 .byte W48 .byte N12 .byte W24 -bgm_suikun_2_B1: -bgm_suikun_2_002: +mus_c_vs_legend_beast_2_B1: +mus_c_vs_legend_beast_2_002: .byte VOICE , 48 .byte N48 , An3 , v112 .byte W48 .byte Bn3 .byte W48 .byte PEND -bgm_suikun_2_003: +mus_c_vs_legend_beast_2_003: .byte N48 , Dn3 , v112 .byte W48 .byte N96 , Dn4 .byte W48 .byte PEND -bgm_suikun_2_004: +mus_c_vs_legend_beast_2_004: .byte W48 .byte VOICE , 1 .byte N12 , An5 , v112 @@ -665,21 +665,21 @@ bgm_suikun_2_004: .byte Bn5 .byte W12 .byte PEND -bgm_suikun_2_005: +mus_c_vs_legend_beast_2_005: .byte W24 .byte N12 , Dn5 , v112 .byte W24 .byte Dn6 .byte W48 .byte PEND -bgm_suikun_2_006: +mus_c_vs_legend_beast_2_006: .byte VOICE , 48 .byte N48 , Cn4 , v112 .byte W48 .byte Dn4 .byte W48 .byte PEND -bgm_suikun_2_007: +mus_c_vs_legend_beast_2_007: .byte N48 , Gn3 , v112 .byte W48 .byte Fn4 @@ -697,17 +697,17 @@ bgm_suikun_2_007: .byte Bn2 .byte W24 .byte PATT - .word bgm_suikun_2_002 + .word mus_c_vs_legend_beast_2_002 .byte PATT - .word bgm_suikun_2_003 + .word mus_c_vs_legend_beast_2_003 .byte PATT - .word bgm_suikun_2_004 + .word mus_c_vs_legend_beast_2_004 .byte PATT - .word bgm_suikun_2_005 + .word mus_c_vs_legend_beast_2_005 .byte PATT - .word bgm_suikun_2_006 + .word mus_c_vs_legend_beast_2_006 .byte PATT - .word bgm_suikun_2_007 + .word mus_c_vs_legend_beast_2_007 .byte N96 , En4 , v112 .byte W96 .byte VOICE , 1 @@ -833,7 +833,7 @@ bgm_suikun_2_007: .byte W12 .byte N36 , Gn3 .byte W36 -bgm_suikun_2_008: +mus_c_vs_legend_beast_2_008: .byte N12 , Fs4 , v112 .byte W12 .byte N12 @@ -847,7 +847,7 @@ bgm_suikun_2_008: .byte N24 , Bn1 .byte W24 .byte PEND -bgm_suikun_2_009: +mus_c_vs_legend_beast_2_009: .byte N12 , Fs4 , v112 .byte W12 .byte N12 @@ -860,10 +860,10 @@ bgm_suikun_2_009: .byte W36 .byte PEND .byte PATT - .word bgm_suikun_2_008 + .word mus_c_vs_legend_beast_2_008 .byte PATT - .word bgm_suikun_2_009 -bgm_suikun_2_010: + .word mus_c_vs_legend_beast_2_009 +mus_c_vs_legend_beast_2_010: .byte N48 , Fs3 , v112 .byte W48 .byte Bn2 @@ -874,7 +874,7 @@ bgm_suikun_2_010: .byte En3 .byte W48 .byte PATT - .word bgm_suikun_2_010 + .word mus_c_vs_legend_beast_2_010 .byte N96 , Cn3 , v112 .byte W96 .byte VOICE , 48 @@ -907,7 +907,7 @@ bgm_suikun_2_010: .byte W12 .byte Fn1 .byte W12 -bgm_suikun_2_011: +mus_c_vs_legend_beast_2_011: .byte N12 , Bn1 , v112 .byte W12 .byte En2 @@ -940,7 +940,7 @@ bgm_suikun_2_011: .byte Fn1 .byte W12 .byte PATT - .word bgm_suikun_2_011 + .word mus_c_vs_legend_beast_2_011 .byte N12 , Bn2 , v112 .byte W03 .byte VOICE , 48 @@ -957,7 +957,7 @@ bgm_suikun_2_011: .byte W12 .byte Fn2 .byte W12 -bgm_suikun_2_012: +mus_c_vs_legend_beast_2_012: .byte N12 , Bn2 , v112 .byte W12 .byte En3 @@ -990,8 +990,8 @@ bgm_suikun_2_012: .byte Fn2 .byte W12 .byte PATT - .word bgm_suikun_2_012 -bgm_suikun_2_013: + .word mus_c_vs_legend_beast_2_012 +mus_c_vs_legend_beast_2_013: .byte N12 , Dn3 , v112 .byte W12 .byte Gn3 @@ -1007,7 +1007,7 @@ bgm_suikun_2_013: .byte Gs2 .byte W12 .byte PEND -bgm_suikun_2_014: +mus_c_vs_legend_beast_2_014: .byte N12 , Dn3 , v112 .byte W12 .byte Gn3 @@ -1026,10 +1026,10 @@ bgm_suikun_2_014: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_2_013 + .word mus_c_vs_legend_beast_2_013 .byte PATT - .word bgm_suikun_2_014 -bgm_suikun_2_015: + .word mus_c_vs_legend_beast_2_014 +mus_c_vs_legend_beast_2_015: .byte N12 , Bn3 , v112 .byte W12 .byte En4 @@ -1045,7 +1045,7 @@ bgm_suikun_2_015: .byte Fn3 .byte W12 .byte PEND -bgm_suikun_2_016: +mus_c_vs_legend_beast_2_016: .byte N12 , Bn3 , v112 .byte W12 .byte En4 @@ -1064,10 +1064,10 @@ bgm_suikun_2_016: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_2_015 + .word mus_c_vs_legend_beast_2_015 .byte PATT - .word bgm_suikun_2_016 -bgm_suikun_2_017: + .word mus_c_vs_legend_beast_2_016 +mus_c_vs_legend_beast_2_017: .byte N12 , Dn4 , v112 .byte W12 .byte Gn4 @@ -1083,7 +1083,7 @@ bgm_suikun_2_017: .byte Gs3 .byte W12 .byte PEND -bgm_suikun_2_018: +mus_c_vs_legend_beast_2_018: .byte N12 , Dn4 , v112 .byte W12 .byte Gn4 @@ -1102,9 +1102,9 @@ bgm_suikun_2_018: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_2_017 + .word mus_c_vs_legend_beast_2_017 .byte PATT - .word bgm_suikun_2_018 + .word mus_c_vs_legend_beast_2_018 .byte N24 , An4 , v112 .byte W48 .byte VOICE , 1 @@ -1116,7 +1116,7 @@ bgm_suikun_2_018: .byte W12 .byte N24 , En3 .byte W12 -bgm_suikun_2_019: +mus_c_vs_legend_beast_2_019: .byte W12 .byte N12 , Bn2 , v112 .byte W12 @@ -1133,7 +1133,7 @@ bgm_suikun_2_019: .byte Bn2 .byte W12 .byte PEND -bgm_suikun_2_020: +mus_c_vs_legend_beast_2_020: .byte N12 , An2 , v112 .byte W12 .byte En2 @@ -1152,7 +1152,7 @@ bgm_suikun_2_020: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_2_019 + .word mus_c_vs_legend_beast_2_019 .byte N12 , An2 , v112 .byte W12 .byte En2 @@ -1169,7 +1169,7 @@ bgm_suikun_2_020: .byte W12 .byte N24 , Gn3 .byte W12 -bgm_suikun_2_021: +mus_c_vs_legend_beast_2_021: .byte W12 .byte N12 , Dn3 , v112 .byte W12 @@ -1203,7 +1203,7 @@ bgm_suikun_2_021: .byte N24 , Gn3 .byte W12 .byte PATT - .word bgm_suikun_2_021 + .word mus_c_vs_legend_beast_2_021 .byte N12 , Cn3 , v112 .byte W12 .byte Gn2 @@ -1221,11 +1221,11 @@ bgm_suikun_2_021: .byte N24 , En3 .byte W12 .byte PATT - .word bgm_suikun_2_019 + .word mus_c_vs_legend_beast_2_019 .byte PATT - .word bgm_suikun_2_020 + .word mus_c_vs_legend_beast_2_020 .byte PATT - .word bgm_suikun_2_019 + .word mus_c_vs_legend_beast_2_019 .byte N12 , An2 , v112 .byte W12 .byte En2 @@ -1235,16 +1235,16 @@ bgm_suikun_2_021: .byte Bn2 .byte W12 .byte GOTO - .word bgm_suikun_2_B1 + .word mus_c_vs_legend_beast_2_B1 .byte W48 .byte FINE @********************** Track 3 **********************@ -bgm_suikun_3: - .byte KEYSH , bgm_suikun_key+0 +mus_c_vs_legend_beast_3: + .byte KEYSH , mus_c_vs_legend_beast_key+0 .byte VOICE , 36 - .byte VOL , 80*bgm_suikun_mvl/mxv + .byte VOL , 80*mus_c_vs_legend_beast_mvl/mxv .byte W96 .byte W24 .byte N24 , An1 , v112 @@ -1257,7 +1257,7 @@ bgm_suikun_3: .byte W12 .byte Gn1 .byte W12 -bgm_suikun_3_000: +mus_c_vs_legend_beast_3_000: .byte N12 , Dn1 , v112 .byte W12 .byte En1 @@ -1273,7 +1273,7 @@ bgm_suikun_3_000: .byte An0 .byte W12 .byte PEND -bgm_suikun_3_001: +mus_c_vs_legend_beast_3_001: .byte N12 , Dn1 , v112 .byte W12 .byte En1 @@ -1292,8 +1292,8 @@ bgm_suikun_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_000 -bgm_suikun_3_002: + .word mus_c_vs_legend_beast_3_000 +mus_c_vs_legend_beast_3_002: .byte N12 , Dn1 , v112 .byte W12 .byte En1 @@ -1310,15 +1310,15 @@ bgm_suikun_3_002: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_000 + .word mus_c_vs_legend_beast_3_000 .byte PATT - .word bgm_suikun_3_001 + .word mus_c_vs_legend_beast_3_001 .byte PATT - .word bgm_suikun_3_000 + .word mus_c_vs_legend_beast_3_000 .byte PATT - .word bgm_suikun_3_002 -bgm_suikun_3_B1: -bgm_suikun_3_003: + .word mus_c_vs_legend_beast_3_002 +mus_c_vs_legend_beast_3_B1: +mus_c_vs_legend_beast_3_003: .byte N12 , An0 , v112 .byte W12 .byte Dn1 @@ -1337,8 +1337,8 @@ bgm_suikun_3_003: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_003 -bgm_suikun_3_004: + .word mus_c_vs_legend_beast_3_003 +mus_c_vs_legend_beast_3_004: .byte N12 , An0 , v112 .byte W12 .byte Dn1 @@ -1356,7 +1356,7 @@ bgm_suikun_3_004: .byte Dn1 .byte W12 .byte PEND -bgm_suikun_3_005: +mus_c_vs_legend_beast_3_005: .byte N12 , An0 , v112 .byte W12 .byte Dn1 @@ -1374,7 +1374,7 @@ bgm_suikun_3_005: .byte An1 .byte W12 .byte PEND -bgm_suikun_3_006: +mus_c_vs_legend_beast_3_006: .byte N12 , Cn1 , v112 .byte W12 .byte Gn1 @@ -1393,7 +1393,7 @@ bgm_suikun_3_006: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_006 + .word mus_c_vs_legend_beast_3_006 .byte N12 , Cn1 , v112 .byte W12 .byte Gn1 @@ -1425,15 +1425,15 @@ bgm_suikun_3_006: .byte Dn1 .byte W12 .byte PATT - .word bgm_suikun_3_003 + .word mus_c_vs_legend_beast_3_003 .byte PATT - .word bgm_suikun_3_003 + .word mus_c_vs_legend_beast_3_003 .byte PATT - .word bgm_suikun_3_004 + .word mus_c_vs_legend_beast_3_004 .byte PATT - .word bgm_suikun_3_005 + .word mus_c_vs_legend_beast_3_005 .byte PATT - .word bgm_suikun_3_006 + .word mus_c_vs_legend_beast_3_006 .byte N12 , Cn1 , v112 .byte W12 .byte Gn1 @@ -1480,7 +1480,7 @@ bgm_suikun_3_006: .byte W12 .byte Gn1 .byte W12 -bgm_suikun_3_007: +mus_c_vs_legend_beast_3_007: .byte N12 , Bn0 , v112 .byte W12 .byte Fs1 @@ -1499,7 +1499,7 @@ bgm_suikun_3_007: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_007 + .word mus_c_vs_legend_beast_3_007 .byte N12 , Cn1 , v112 .byte W12 .byte Gn1 @@ -1530,7 +1530,7 @@ bgm_suikun_3_007: .byte W12 .byte Gn1 .byte W12 -bgm_suikun_3_008: +mus_c_vs_legend_beast_3_008: .byte N12 , Dn1 , v112 .byte W12 .byte An1 @@ -1549,7 +1549,7 @@ bgm_suikun_3_008: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_008 + .word mus_c_vs_legend_beast_3_008 .byte N12 , Cn1 , v112 .byte W12 .byte Gn1 @@ -1582,7 +1582,7 @@ bgm_suikun_3_008: .byte W12 .byte Gn1 .byte W12 -bgm_suikun_3_009: +mus_c_vs_legend_beast_3_009: .byte N12 , Fs1 , v112 .byte W12 .byte N12 @@ -1592,7 +1592,7 @@ bgm_suikun_3_009: .byte N12 .byte W36 .byte PEND -bgm_suikun_3_010: +mus_c_vs_legend_beast_3_010: .byte N12 , Fs1 , v112 .byte W12 .byte N12 @@ -1603,9 +1603,9 @@ bgm_suikun_3_010: .byte W36 .byte PEND .byte PATT - .word bgm_suikun_3_009 + .word mus_c_vs_legend_beast_3_009 .byte PATT - .word bgm_suikun_3_010 + .word mus_c_vs_legend_beast_3_010 .byte N12 , Bn1 , v112 .byte W12 .byte N12 @@ -1650,7 +1650,7 @@ bgm_suikun_3_010: .byte W12 .byte N36 , Gn2 .byte W36 -bgm_suikun_3_011: +mus_c_vs_legend_beast_3_011: .byte N48 , Fs1 , v112 .byte W48 .byte Bn0 @@ -1661,7 +1661,7 @@ bgm_suikun_3_011: .byte En1 .byte W48 .byte PATT - .word bgm_suikun_3_011 + .word mus_c_vs_legend_beast_3_011 .byte N60 , Cn1 , v112 .byte W60 .byte N12 @@ -1684,7 +1684,7 @@ bgm_suikun_3_011: .byte W48 .byte N96 , Cn1 .byte W96 -bgm_suikun_3_012: +mus_c_vs_legend_beast_3_012: .byte W24 .byte N12 , Bn0 , v112 .byte W48 @@ -1692,12 +1692,12 @@ bgm_suikun_3_012: .byte W24 .byte PEND .byte PATT - .word bgm_suikun_3_012 + .word mus_c_vs_legend_beast_3_012 .byte PATT - .word bgm_suikun_3_012 + .word mus_c_vs_legend_beast_3_012 .byte PATT - .word bgm_suikun_3_012 -bgm_suikun_3_013: + .word mus_c_vs_legend_beast_3_012 +mus_c_vs_legend_beast_3_013: .byte N12 , Bn0 , v112 .byte W12 .byte Fn1 @@ -1716,9 +1716,9 @@ bgm_suikun_3_013: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_013 + .word mus_c_vs_legend_beast_3_013 .byte PATT - .word bgm_suikun_3_013 + .word mus_c_vs_legend_beast_3_013 .byte N12 , Bn0 , v112 .byte W12 .byte Fn1 @@ -1735,7 +1735,7 @@ bgm_suikun_3_013: .byte W12 .byte Fn1 .byte W12 -bgm_suikun_3_014: +mus_c_vs_legend_beast_3_014: .byte N12 , Dn1 , v112 .byte W12 .byte Gs1 @@ -1754,10 +1754,10 @@ bgm_suikun_3_014: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_014 + .word mus_c_vs_legend_beast_3_014 .byte PATT - .word bgm_suikun_3_014 -bgm_suikun_3_015: + .word mus_c_vs_legend_beast_3_014 +mus_c_vs_legend_beast_3_015: .byte N12 , Dn1 , v112 .byte W12 .byte Gs1 @@ -1775,7 +1775,7 @@ bgm_suikun_3_015: .byte Gs1 .byte W12 .byte PEND -bgm_suikun_3_016: +mus_c_vs_legend_beast_3_016: .byte N12 , Bn1 , v112 .byte W12 .byte Fn1 @@ -1794,12 +1794,12 @@ bgm_suikun_3_016: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_016 + .word mus_c_vs_legend_beast_3_016 .byte PATT - .word bgm_suikun_3_013 + .word mus_c_vs_legend_beast_3_013 .byte PATT - .word bgm_suikun_3_013 -bgm_suikun_3_017: + .word mus_c_vs_legend_beast_3_013 +mus_c_vs_legend_beast_3_017: .byte N12 , Dn2 , v112 .byte W12 .byte Gs1 @@ -1818,11 +1818,11 @@ bgm_suikun_3_017: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_017 + .word mus_c_vs_legend_beast_3_017 .byte PATT - .word bgm_suikun_3_014 + .word mus_c_vs_legend_beast_3_014 .byte PATT - .word bgm_suikun_3_015 + .word mus_c_vs_legend_beast_3_015 .byte N24 , An1 , v112 .byte W48 .byte N12 , An0 @@ -1833,7 +1833,7 @@ bgm_suikun_3_017: .byte W12 .byte Dn1 .byte W12 -bgm_suikun_3_018: +mus_c_vs_legend_beast_3_018: .byte N12 , An0 , v112 .byte W12 .byte An1 @@ -1852,7 +1852,7 @@ bgm_suikun_3_018: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_018 + .word mus_c_vs_legend_beast_3_018 .byte N12 , An0 , v112 .byte W12 .byte Dn1 @@ -1885,7 +1885,7 @@ bgm_suikun_3_018: .byte W12 .byte Cn1 .byte W12 -bgm_suikun_3_019: +mus_c_vs_legend_beast_3_019: .byte N12 , Gn1 , v112 .byte W12 .byte Cn2 @@ -1904,9 +1904,9 @@ bgm_suikun_3_019: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_019 + .word mus_c_vs_legend_beast_3_019 .byte PATT - .word bgm_suikun_3_019 + .word mus_c_vs_legend_beast_3_019 .byte N12 , Gn1 , v112 .byte W12 .byte Cn2 @@ -1923,7 +1923,7 @@ bgm_suikun_3_019: .byte W12 .byte An0 .byte W12 -bgm_suikun_3_020: +mus_c_vs_legend_beast_3_020: .byte N12 , En1 , v112 .byte W12 .byte An1 @@ -1942,7 +1942,7 @@ bgm_suikun_3_020: .byte W12 .byte PEND .byte PATT - .word bgm_suikun_3_020 + .word mus_c_vs_legend_beast_3_020 .byte N12 , En1 , v112 .byte W12 .byte An1 @@ -1967,23 +1967,23 @@ bgm_suikun_3_020: .byte En1 .byte W12 .byte GOTO - .word bgm_suikun_3_B1 + .word mus_c_vs_legend_beast_3_B1 .byte W48 .byte FINE @******************************************************@ .align 2 -bgm_suikun: +mus_c_vs_legend_beast: .byte 3 @ NumTrks .byte 0 @ NumBlks - .byte bgm_suikun_pri @ Priority - .byte bgm_suikun_rev @ Reverb. + .byte mus_c_vs_legend_beast_pri @ Priority + .byte mus_c_vs_legend_beast_rev @ Reverb. - .word bgm_suikun_grp + .word mus_c_vs_legend_beast_grp - .word bgm_suikun_1 - .word bgm_suikun_2 - .word bgm_suikun_3 + .word mus_c_vs_legend_beast_1 + .word mus_c_vs_legend_beast_2 + .word mus_c_vs_legend_beast_3 .end diff --git a/sound/songs/bgm_ropeway.s b/sound/songs/mus_cable_car.s index 97af82cd5..ace45d50e 100644 --- a/sound/songs/bgm_ropeway.s +++ b/sound/songs/mus_cable_car.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_ropeway_grp, voicegroup068 - .equ bgm_ropeway_pri, 0 - .equ bgm_ropeway_rev, reverb_set+50 - .equ bgm_ropeway_mvl, 127 - .equ bgm_ropeway_key, 0 - .equ bgm_ropeway_tbs, 1 - .equ bgm_ropeway_exg, 0 - .equ bgm_ropeway_cmp, 1 + .equ mus_cable_car_grp, voicegroup068 + .equ mus_cable_car_pri, 0 + .equ mus_cable_car_rev, reverb_set+50 + .equ mus_cable_car_mvl, 127 + .equ mus_cable_car_key, 0 + .equ mus_cable_car_tbs, 1 + .equ mus_cable_car_exg, 0 + .equ mus_cable_car_cmp, 1 .section .rodata - .global bgm_ropeway + .global mus_cable_car .align 2 @********************** Track 1 **********************@ -bgm_ropeway_1: - .byte KEYSH , bgm_ropeway_key+0 - .byte TEMPO , 120*bgm_ropeway_tbs/2 +mus_cable_car_1: + .byte KEYSH , mus_cable_car_key+0 + .byte TEMPO , 120*mus_cable_car_tbs/2 .byte VOICE , 56 - .byte VOL , 55*bgm_ropeway_mvl/mxv + .byte VOL , 55*mus_cable_car_mvl/mxv .byte PAN , c_v+24 .byte N06 , An3 , v112 .byte W06 @@ -39,29 +39,29 @@ bgm_ropeway_1: .byte W02 .byte N04 , Cn4 , v036 .byte W10 - .byte VOL , 25*bgm_ropeway_mvl/mxv + .byte VOL , 25*mus_cable_car_mvl/mxv .byte N24 , As3 , v112 .byte W02 - .byte VOL , 28*bgm_ropeway_mvl/mxv + .byte VOL , 28*mus_cable_car_mvl/mxv .byte W03 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W03 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W02 - .byte 46*bgm_ropeway_mvl/mxv + .byte 46*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W03 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W03 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte N06 , Cn4 .byte W06 .byte N04 , Cn4 , v036 .byte W06 - .byte VOL , 55*bgm_ropeway_mvl/mxv + .byte VOL , 55*mus_cable_car_mvl/mxv .byte N06 , An3 , v112 .byte W06 .byte N04 , An3 , v036 @@ -82,29 +82,29 @@ bgm_ropeway_1: .byte W02 .byte N04 , Cn4 , v036 .byte W10 - .byte VOL , 25*bgm_ropeway_mvl/mxv + .byte VOL , 25*mus_cable_car_mvl/mxv .byte N24 , As3 , v112 .byte W02 - .byte VOL , 28*bgm_ropeway_mvl/mxv + .byte VOL , 28*mus_cable_car_mvl/mxv .byte W03 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W03 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W02 - .byte 46*bgm_ropeway_mvl/mxv + .byte 46*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W03 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W03 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte N06 , Cn4 .byte W06 .byte N04 , Cn4 , v036 .byte W06 - .byte VOL , 55*bgm_ropeway_mvl/mxv + .byte VOL , 55*mus_cable_car_mvl/mxv .byte N06 , Cs4 , v112 .byte W06 .byte N04 , Cs4 , v036 @@ -123,29 +123,29 @@ bgm_ropeway_1: .byte W02 .byte N04 , En4 , v036 .byte W10 - .byte VOL , 25*bgm_ropeway_mvl/mxv + .byte VOL , 25*mus_cable_car_mvl/mxv .byte N24 , Dn4 , v112 .byte W02 - .byte VOL , 28*bgm_ropeway_mvl/mxv + .byte VOL , 28*mus_cable_car_mvl/mxv .byte W03 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W03 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W02 - .byte 46*bgm_ropeway_mvl/mxv + .byte 46*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W03 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W03 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte N06 , En4 .byte W06 .byte N04 , En4 , v036 .byte W06 - .byte VOL , 55*bgm_ropeway_mvl/mxv + .byte VOL , 55*mus_cable_car_mvl/mxv .byte N06 , Cs4 , v112 .byte W06 .byte N04 , Cs4 , v036 @@ -166,90 +166,90 @@ bgm_ropeway_1: .byte W03 .byte N04 , En4 , v036 .byte W09 - .byte VOL , 25*bgm_ropeway_mvl/mxv + .byte VOL , 25*mus_cable_car_mvl/mxv .byte N24 , Dn4 , v112 .byte W02 - .byte VOL , 28*bgm_ropeway_mvl/mxv + .byte VOL , 28*mus_cable_car_mvl/mxv .byte W03 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W03 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W02 - .byte 46*bgm_ropeway_mvl/mxv + .byte 46*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W03 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W03 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte N06 , En4 .byte W06 .byte N04 , En4 , v036 .byte W06 - .byte VOL , 55*bgm_ropeway_mvl/mxv + .byte VOL , 55*mus_cable_car_mvl/mxv .byte TIE , Fs4 , v112 .byte W48 - .byte VOL , 50*bgm_ropeway_mvl/mxv + .byte VOL , 50*mus_cable_car_mvl/mxv .byte W04 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte W04 - .byte 47*bgm_ropeway_mvl/mxv + .byte 47*mus_cable_car_mvl/mxv .byte W04 - .byte 44*bgm_ropeway_mvl/mxv + .byte 44*mus_cable_car_mvl/mxv .byte W04 - .byte 44*bgm_ropeway_mvl/mxv + .byte 44*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W04 - .byte 41*bgm_ropeway_mvl/mxv + .byte 41*mus_cable_car_mvl/mxv .byte W04 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 38*bgm_ropeway_mvl/mxv + .byte 38*mus_cable_car_mvl/mxv .byte W04 - .byte 36*bgm_ropeway_mvl/mxv + .byte 36*mus_cable_car_mvl/mxv .byte W04 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W08 - .byte 31*bgm_ropeway_mvl/mxv + .byte 31*mus_cable_car_mvl/mxv .byte W04 - .byte 30*bgm_ropeway_mvl/mxv + .byte 30*mus_cable_car_mvl/mxv .byte W04 - .byte 29*bgm_ropeway_mvl/mxv + .byte 29*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W08 - .byte 27*bgm_ropeway_mvl/mxv + .byte 27*mus_cable_car_mvl/mxv .byte W04 - .byte 25*bgm_ropeway_mvl/mxv + .byte 25*mus_cable_car_mvl/mxv .byte W08 - .byte 22*bgm_ropeway_mvl/mxv + .byte 22*mus_cable_car_mvl/mxv .byte W08 - .byte 22*bgm_ropeway_mvl/mxv + .byte 22*mus_cable_car_mvl/mxv .byte W04 - .byte 21*bgm_ropeway_mvl/mxv + .byte 21*mus_cable_car_mvl/mxv .byte W08 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W08 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W04 - .byte 17*bgm_ropeway_mvl/mxv + .byte 17*mus_cable_car_mvl/mxv .byte W04 - .byte 16*bgm_ropeway_mvl/mxv + .byte 16*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 12*bgm_ropeway_mvl/mxv + .byte 12*mus_cable_car_mvl/mxv .byte W04 - .byte 11*bgm_ropeway_mvl/mxv + .byte 11*mus_cable_car_mvl/mxv .byte W04 - .byte 9*bgm_ropeway_mvl/mxv + .byte 9*mus_cable_car_mvl/mxv .byte W04 - .byte 8*bgm_ropeway_mvl/mxv + .byte 8*mus_cable_car_mvl/mxv .byte W04 .byte EOT .byte W96 @@ -283,11 +283,11 @@ bgm_ropeway_1: @********************** Track 2 **********************@ -bgm_ropeway_2: - .byte KEYSH , bgm_ropeway_key+0 +mus_cable_car_2: + .byte KEYSH , mus_cable_car_key+0 .byte VOICE , 58 .byte PAN , c_v+0 - .byte VOL , 76*bgm_ropeway_mvl/mxv + .byte VOL , 76*mus_cable_car_mvl/mxv .byte N06 , Dn2 , v112 .byte W24 .byte An1 @@ -328,63 +328,63 @@ bgm_ropeway_2: .byte W03 .byte TIE , Fs1 , v124 .byte W72 - .byte VOL , 61*bgm_ropeway_mvl/mxv + .byte VOL , 61*mus_cable_car_mvl/mxv .byte W04 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W04 - .byte 56*bgm_ropeway_mvl/mxv + .byte 56*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W08 - .byte 53*bgm_ropeway_mvl/mxv + .byte 53*mus_cable_car_mvl/mxv .byte W04 - .byte 50*bgm_ropeway_mvl/mxv + .byte 50*mus_cable_car_mvl/mxv .byte W04 - .byte 47*bgm_ropeway_mvl/mxv + .byte 47*mus_cable_car_mvl/mxv .byte W08 - .byte 44*bgm_ropeway_mvl/mxv + .byte 44*mus_cable_car_mvl/mxv .byte W04 - .byte 44*bgm_ropeway_mvl/mxv + .byte 44*mus_cable_car_mvl/mxv .byte W04 - .byte 41*bgm_ropeway_mvl/mxv + .byte 41*mus_cable_car_mvl/mxv .byte W04 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 36*bgm_ropeway_mvl/mxv + .byte 36*mus_cable_car_mvl/mxv .byte W04 - .byte 31*bgm_ropeway_mvl/mxv + .byte 31*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W04 - .byte 24*bgm_ropeway_mvl/mxv + .byte 24*mus_cable_car_mvl/mxv .byte W04 - .byte 22*bgm_ropeway_mvl/mxv + .byte 22*mus_cable_car_mvl/mxv .byte W04 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W08 - .byte 17*bgm_ropeway_mvl/mxv + .byte 17*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 12*bgm_ropeway_mvl/mxv + .byte 12*mus_cable_car_mvl/mxv .byte W04 - .byte 11*bgm_ropeway_mvl/mxv + .byte 11*mus_cable_car_mvl/mxv .byte W04 - .byte 9*bgm_ropeway_mvl/mxv + .byte 9*mus_cable_car_mvl/mxv .byte W04 - .byte 8*bgm_ropeway_mvl/mxv + .byte 8*mus_cable_car_mvl/mxv .byte W04 - .byte 5*bgm_ropeway_mvl/mxv + .byte 5*mus_cable_car_mvl/mxv .byte W04 - .byte 3*bgm_ropeway_mvl/mxv + .byte 3*mus_cable_car_mvl/mxv .byte W04 - .byte 1*bgm_ropeway_mvl/mxv + .byte 1*mus_cable_car_mvl/mxv .byte W04 .byte EOT .byte W96 - .byte VOL , 1*bgm_ropeway_mvl/mxv + .byte VOL , 1*mus_cable_car_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -415,11 +415,11 @@ bgm_ropeway_2: @********************** Track 3 **********************@ -bgm_ropeway_3: - .byte KEYSH , bgm_ropeway_key+0 +mus_cable_car_3: + .byte KEYSH , mus_cable_car_key+0 .byte VOICE , 60 .byte PAN , c_v-24 - .byte VOL , 49*bgm_ropeway_mvl/mxv + .byte VOL , 49*mus_cable_car_mvl/mxv .byte N06 , Fs2 , v112 .byte W24 .byte N03 @@ -434,27 +434,27 @@ bgm_ropeway_3: .byte W06 .byte An2 , v112 .byte W12 - .byte VOL , 25*bgm_ropeway_mvl/mxv + .byte VOL , 25*mus_cable_car_mvl/mxv .byte N24 , Gn2 .byte W02 - .byte VOL , 28*bgm_ropeway_mvl/mxv + .byte VOL , 28*mus_cable_car_mvl/mxv .byte W03 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W03 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W02 - .byte 46*bgm_ropeway_mvl/mxv + .byte 46*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W03 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W03 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte N06 , An2 .byte W12 - .byte VOL , 49*bgm_ropeway_mvl/mxv + .byte VOL , 49*mus_cable_car_mvl/mxv .byte N06 , Fs2 .byte W12 .byte N03 @@ -471,24 +471,24 @@ bgm_ropeway_3: .byte W06 .byte An2 , v112 .byte W12 - .byte VOL , 25*bgm_ropeway_mvl/mxv + .byte VOL , 25*mus_cable_car_mvl/mxv .byte N24 , Gn2 .byte W02 - .byte VOL , 28*bgm_ropeway_mvl/mxv + .byte VOL , 28*mus_cable_car_mvl/mxv .byte W03 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W03 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W02 - .byte 46*bgm_ropeway_mvl/mxv + .byte 46*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W03 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W03 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte N06 , An2 .byte W12 .byte As2 @@ -505,24 +505,24 @@ bgm_ropeway_3: .byte W06 .byte Cs3 , v112 .byte W12 - .byte VOL , 25*bgm_ropeway_mvl/mxv + .byte VOL , 25*mus_cable_car_mvl/mxv .byte N24 , Bn2 .byte W02 - .byte VOL , 28*bgm_ropeway_mvl/mxv + .byte VOL , 28*mus_cable_car_mvl/mxv .byte W03 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W03 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W02 - .byte 46*bgm_ropeway_mvl/mxv + .byte 46*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W03 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W03 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte N06 , Cs3 .byte W12 .byte As2 @@ -541,24 +541,24 @@ bgm_ropeway_3: .byte W06 .byte Cs3 , v112 .byte W12 - .byte VOL , 25*bgm_ropeway_mvl/mxv + .byte VOL , 25*mus_cable_car_mvl/mxv .byte N24 , Bn2 .byte W02 - .byte VOL , 28*bgm_ropeway_mvl/mxv + .byte VOL , 28*mus_cable_car_mvl/mxv .byte W03 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W03 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W02 - .byte 46*bgm_ropeway_mvl/mxv + .byte 46*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W03 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W03 - .byte 49*bgm_ropeway_mvl/mxv + .byte 49*mus_cable_car_mvl/mxv .byte N06 , Cs3 .byte W06 .byte N03 , En3 @@ -567,65 +567,65 @@ bgm_ropeway_3: .byte W03 .byte TIE , Fs3 .byte W48 - .byte VOL , 48*bgm_ropeway_mvl/mxv + .byte VOL , 48*mus_cable_car_mvl/mxv .byte W04 - .byte 47*bgm_ropeway_mvl/mxv + .byte 47*mus_cable_car_mvl/mxv .byte W04 - .byte 47*bgm_ropeway_mvl/mxv + .byte 47*mus_cable_car_mvl/mxv .byte W04 - .byte 45*bgm_ropeway_mvl/mxv + .byte 45*mus_cable_car_mvl/mxv .byte W04 - .byte 44*bgm_ropeway_mvl/mxv + .byte 44*mus_cable_car_mvl/mxv .byte W04 - .byte 42*bgm_ropeway_mvl/mxv + .byte 42*mus_cable_car_mvl/mxv .byte W04 - .byte 41*bgm_ropeway_mvl/mxv + .byte 41*mus_cable_car_mvl/mxv .byte W04 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 38*bgm_ropeway_mvl/mxv + .byte 38*mus_cable_car_mvl/mxv .byte W04 - .byte 36*bgm_ropeway_mvl/mxv + .byte 36*mus_cable_car_mvl/mxv .byte W04 - .byte 33*bgm_ropeway_mvl/mxv + .byte 33*mus_cable_car_mvl/mxv .byte W08 - .byte 31*bgm_ropeway_mvl/mxv + .byte 31*mus_cable_car_mvl/mxv .byte W04 - .byte 30*bgm_ropeway_mvl/mxv + .byte 30*mus_cable_car_mvl/mxv .byte W04 - .byte 29*bgm_ropeway_mvl/mxv + .byte 29*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W08 - .byte 27*bgm_ropeway_mvl/mxv + .byte 27*mus_cable_car_mvl/mxv .byte W04 - .byte 25*bgm_ropeway_mvl/mxv + .byte 25*mus_cable_car_mvl/mxv .byte W08 - .byte 22*bgm_ropeway_mvl/mxv + .byte 22*mus_cable_car_mvl/mxv .byte W08 - .byte 22*bgm_ropeway_mvl/mxv + .byte 22*mus_cable_car_mvl/mxv .byte W04 - .byte 21*bgm_ropeway_mvl/mxv + .byte 21*mus_cable_car_mvl/mxv .byte W08 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W08 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W04 - .byte 17*bgm_ropeway_mvl/mxv + .byte 17*mus_cable_car_mvl/mxv .byte W04 - .byte 16*bgm_ropeway_mvl/mxv + .byte 16*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 12*bgm_ropeway_mvl/mxv + .byte 12*mus_cable_car_mvl/mxv .byte W04 - .byte 11*bgm_ropeway_mvl/mxv + .byte 11*mus_cable_car_mvl/mxv .byte W04 - .byte 9*bgm_ropeway_mvl/mxv + .byte 9*mus_cable_car_mvl/mxv .byte W04 - .byte 8*bgm_ropeway_mvl/mxv + .byte 8*mus_cable_car_mvl/mxv .byte W04 .byte EOT .byte W96 @@ -659,11 +659,11 @@ bgm_ropeway_3: @********************** Track 4 **********************@ -bgm_ropeway_4: - .byte KEYSH , bgm_ropeway_key+0 +mus_cable_car_4: + .byte KEYSH , mus_cable_car_key+0 .byte VOICE , 127 .byte PAN , c_v+0 - .byte VOL , 34*bgm_ropeway_mvl/mxv + .byte VOL , 34*mus_cable_car_mvl/mxv .byte N02 , En4 , v112 .byte W24 .byte N02 @@ -686,7 +686,7 @@ bgm_ropeway_4: .byte W03 .byte N03 .byte W03 -bgm_ropeway_4_000: +mus_cable_car_4_000: .byte N02 , En4 , v112 .byte W12 .byte En4 , v096 @@ -735,7 +735,7 @@ bgm_ropeway_4_000: .byte N03 .byte W03 .byte PATT - .word bgm_ropeway_4_000 + .word mus_cable_car_4_000 .byte W96 .byte W96 .byte W96 @@ -769,10 +769,10 @@ bgm_ropeway_4_000: @********************** Track 5 **********************@ -bgm_ropeway_5: - .byte KEYSH , bgm_ropeway_key+0 +mus_cable_car_5: + .byte KEYSH , mus_cable_car_key+0 .byte VOICE , 60 - .byte VOL , 77*bgm_ropeway_mvl/mxv + .byte VOL , 77*mus_cable_car_mvl/mxv .byte MOD , 2 .byte N08 , Dn3 , v112 .byte W08 @@ -853,63 +853,63 @@ bgm_ropeway_5: .byte W48 .byte MOD , 5 .byte W24 - .byte VOL , 61*bgm_ropeway_mvl/mxv + .byte VOL , 61*mus_cable_car_mvl/mxv .byte W04 - .byte 58*bgm_ropeway_mvl/mxv + .byte 58*mus_cable_car_mvl/mxv .byte W04 - .byte 56*bgm_ropeway_mvl/mxv + .byte 56*mus_cable_car_mvl/mxv .byte W04 - .byte 55*bgm_ropeway_mvl/mxv + .byte 55*mus_cable_car_mvl/mxv .byte W08 - .byte 53*bgm_ropeway_mvl/mxv + .byte 53*mus_cable_car_mvl/mxv .byte W04 - .byte 50*bgm_ropeway_mvl/mxv + .byte 50*mus_cable_car_mvl/mxv .byte W04 - .byte 47*bgm_ropeway_mvl/mxv + .byte 47*mus_cable_car_mvl/mxv .byte W08 - .byte 44*bgm_ropeway_mvl/mxv + .byte 44*mus_cable_car_mvl/mxv .byte W04 - .byte 44*bgm_ropeway_mvl/mxv + .byte 44*mus_cable_car_mvl/mxv .byte W04 - .byte 41*bgm_ropeway_mvl/mxv + .byte 41*mus_cable_car_mvl/mxv .byte W04 - .byte 39*bgm_ropeway_mvl/mxv + .byte 39*mus_cable_car_mvl/mxv .byte W04 - .byte 36*bgm_ropeway_mvl/mxv + .byte 36*mus_cable_car_mvl/mxv .byte W04 - .byte 31*bgm_ropeway_mvl/mxv + .byte 31*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W04 - .byte 24*bgm_ropeway_mvl/mxv + .byte 24*mus_cable_car_mvl/mxv .byte W04 - .byte 22*bgm_ropeway_mvl/mxv + .byte 22*mus_cable_car_mvl/mxv .byte W04 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W08 - .byte 17*bgm_ropeway_mvl/mxv + .byte 17*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 12*bgm_ropeway_mvl/mxv + .byte 12*mus_cable_car_mvl/mxv .byte W04 - .byte 11*bgm_ropeway_mvl/mxv + .byte 11*mus_cable_car_mvl/mxv .byte W04 - .byte 9*bgm_ropeway_mvl/mxv + .byte 9*mus_cable_car_mvl/mxv .byte W04 - .byte 8*bgm_ropeway_mvl/mxv + .byte 8*mus_cable_car_mvl/mxv .byte W04 - .byte 5*bgm_ropeway_mvl/mxv + .byte 5*mus_cable_car_mvl/mxv .byte W04 - .byte 3*bgm_ropeway_mvl/mxv + .byte 3*mus_cable_car_mvl/mxv .byte W04 - .byte 1*bgm_ropeway_mvl/mxv + .byte 1*mus_cable_car_mvl/mxv .byte W04 .byte EOT .byte W96 - .byte VOL , 1*bgm_ropeway_mvl/mxv + .byte VOL , 1*mus_cable_car_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -940,10 +940,10 @@ bgm_ropeway_5: @********************** Track 6 **********************@ -bgm_ropeway_6: - .byte KEYSH , bgm_ropeway_key+0 +mus_cable_car_6: + .byte KEYSH , mus_cable_car_key+0 .byte VOICE , 80 - .byte VOL , 36*bgm_ropeway_mvl/mxv + .byte VOL , 36*mus_cable_car_mvl/mxv .byte PAN , c_v-62 .byte N06 , Fs3 , v112 .byte W24 @@ -1023,59 +1023,59 @@ bgm_ropeway_6: .byte W12 .byte TIE , As3 .byte W48 - .byte VOL , 33*bgm_ropeway_mvl/mxv + .byte VOL , 33*mus_cable_car_mvl/mxv .byte W04 - .byte 31*bgm_ropeway_mvl/mxv + .byte 31*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W04 - .byte 25*bgm_ropeway_mvl/mxv + .byte 25*mus_cable_car_mvl/mxv .byte W04 - .byte 25*bgm_ropeway_mvl/mxv + .byte 25*mus_cable_car_mvl/mxv .byte W04 - .byte 24*bgm_ropeway_mvl/mxv + .byte 24*mus_cable_car_mvl/mxv .byte W04 - .byte 22*bgm_ropeway_mvl/mxv + .byte 22*mus_cable_car_mvl/mxv .byte W04 - .byte 21*bgm_ropeway_mvl/mxv + .byte 21*mus_cable_car_mvl/mxv .byte W04 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W04 - .byte 17*bgm_ropeway_mvl/mxv + .byte 17*mus_cable_car_mvl/mxv .byte W08 - .byte 16*bgm_ropeway_mvl/mxv + .byte 16*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 12*bgm_ropeway_mvl/mxv + .byte 12*mus_cable_car_mvl/mxv .byte W04 - .byte 11*bgm_ropeway_mvl/mxv + .byte 11*mus_cable_car_mvl/mxv .byte W04 - .byte 9*bgm_ropeway_mvl/mxv + .byte 9*mus_cable_car_mvl/mxv .byte W04 - .byte 8*bgm_ropeway_mvl/mxv + .byte 8*mus_cable_car_mvl/mxv .byte W08 - .byte 7*bgm_ropeway_mvl/mxv + .byte 7*mus_cable_car_mvl/mxv .byte W04 - .byte 6*bgm_ropeway_mvl/mxv + .byte 6*mus_cable_car_mvl/mxv .byte W04 - .byte 4*bgm_ropeway_mvl/mxv + .byte 4*mus_cable_car_mvl/mxv .byte W04 - .byte 3*bgm_ropeway_mvl/mxv + .byte 3*mus_cable_car_mvl/mxv .byte W08 - .byte 2*bgm_ropeway_mvl/mxv + .byte 2*mus_cable_car_mvl/mxv .byte W04 - .byte 1*bgm_ropeway_mvl/mxv + .byte 1*mus_cable_car_mvl/mxv .byte W12 - .byte 1*bgm_ropeway_mvl/mxv + .byte 1*mus_cable_car_mvl/mxv .byte W28 - .byte 2*bgm_ropeway_mvl/mxv + .byte 2*mus_cable_car_mvl/mxv .byte W04 .byte EOT .byte W96 - .byte VOL , 1*bgm_ropeway_mvl/mxv + .byte VOL , 1*mus_cable_car_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1106,11 +1106,11 @@ bgm_ropeway_6: @********************** Track 7 **********************@ -bgm_ropeway_7: - .byte KEYSH , bgm_ropeway_key+0 +mus_cable_car_7: + .byte KEYSH , mus_cable_car_key+0 .byte VOICE , 81 .byte PAN , c_v+63 - .byte VOL , 34*bgm_ropeway_mvl/mxv + .byte VOL , 34*mus_cable_car_mvl/mxv .byte N06 , An3 , v112 .byte W24 .byte N03 @@ -1189,62 +1189,62 @@ bgm_ropeway_7: .byte W12 .byte TIE , Fs4 .byte W48 - .byte VOL , 33*bgm_ropeway_mvl/mxv + .byte VOL , 33*mus_cable_car_mvl/mxv .byte W04 - .byte 31*bgm_ropeway_mvl/mxv + .byte 31*mus_cable_car_mvl/mxv .byte W04 - .byte 30*bgm_ropeway_mvl/mxv + .byte 30*mus_cable_car_mvl/mxv .byte W04 - .byte 29*bgm_ropeway_mvl/mxv + .byte 29*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W04 - .byte 28*bgm_ropeway_mvl/mxv + .byte 28*mus_cable_car_mvl/mxv .byte W04 - .byte 27*bgm_ropeway_mvl/mxv + .byte 27*mus_cable_car_mvl/mxv .byte W04 - .byte 25*bgm_ropeway_mvl/mxv + .byte 25*mus_cable_car_mvl/mxv .byte W04 - .byte 24*bgm_ropeway_mvl/mxv + .byte 24*mus_cable_car_mvl/mxv .byte W04 - .byte 22*bgm_ropeway_mvl/mxv + .byte 22*mus_cable_car_mvl/mxv .byte W08 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W04 .byte W04 - .byte 19*bgm_ropeway_mvl/mxv + .byte 19*mus_cable_car_mvl/mxv .byte W04 - .byte 17*bgm_ropeway_mvl/mxv + .byte 17*mus_cable_car_mvl/mxv .byte W04 - .byte 16*bgm_ropeway_mvl/mxv + .byte 16*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W04 - .byte 14*bgm_ropeway_mvl/mxv + .byte 14*mus_cable_car_mvl/mxv .byte W08 - .byte 11*bgm_ropeway_mvl/mxv + .byte 11*mus_cable_car_mvl/mxv .byte W08 - .byte 9*bgm_ropeway_mvl/mxv + .byte 9*mus_cable_car_mvl/mxv .byte W04 - .byte 9*bgm_ropeway_mvl/mxv + .byte 9*mus_cable_car_mvl/mxv .byte W08 - .byte 8*bgm_ropeway_mvl/mxv + .byte 8*mus_cable_car_mvl/mxv .byte W08 - .byte 7*bgm_ropeway_mvl/mxv + .byte 7*mus_cable_car_mvl/mxv .byte W12 - .byte 6*bgm_ropeway_mvl/mxv + .byte 6*mus_cable_car_mvl/mxv .byte W12 - .byte 5*bgm_ropeway_mvl/mxv + .byte 5*mus_cable_car_mvl/mxv .byte W04 - .byte 4*bgm_ropeway_mvl/mxv + .byte 4*mus_cable_car_mvl/mxv .byte W04 - .byte 3*bgm_ropeway_mvl/mxv + .byte 3*mus_cable_car_mvl/mxv .byte W04 - .byte 2*bgm_ropeway_mvl/mxv + .byte 2*mus_cable_car_mvl/mxv .byte W04 .byte EOT .byte W96 - .byte VOL , 1*bgm_ropeway_mvl/mxv + .byte VOL , 1*mus_cable_car_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1275,9 +1275,9 @@ bgm_ropeway_7: @********************** Track 8 **********************@ -bgm_ropeway_8: - .byte VOL , 78*bgm_ropeway_mvl/mxv - .byte KEYSH , bgm_ropeway_key+0 +mus_cable_car_8: + .byte VOL , 78*mus_cable_car_mvl/mxv + .byte KEYSH , mus_cable_car_key+0 .byte VOICE , 0 .byte W96 .byte W96 @@ -1317,11 +1317,11 @@ bgm_ropeway_8: @********************** Track 9 **********************@ -bgm_ropeway_9: - .byte KEYSH , bgm_ropeway_key+0 +mus_cable_car_9: + .byte KEYSH , mus_cable_car_key+0 .byte VOICE , 83 .byte PAN , c_v+0 - .byte VOL , 47*bgm_ropeway_mvl/mxv + .byte VOL , 47*mus_cable_car_mvl/mxv .byte N06 , Dn2 , v112 .byte W24 .byte An1 @@ -1394,22 +1394,22 @@ bgm_ropeway_9: @******************************************************@ .align 2 -bgm_ropeway: +mus_cable_car: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_ropeway_pri @ Priority - .byte bgm_ropeway_rev @ Reverb. + .byte mus_cable_car_pri @ Priority + .byte mus_cable_car_rev @ Reverb. - .word bgm_ropeway_grp + .word mus_cable_car_grp - .word bgm_ropeway_1 - .word bgm_ropeway_2 - .word bgm_ropeway_3 - .word bgm_ropeway_4 - .word bgm_ropeway_5 - .word bgm_ropeway_6 - .word bgm_ropeway_7 - .word bgm_ropeway_8 - .word bgm_ropeway_9 + .word mus_cable_car_1 + .word mus_cable_car_2 + .word mus_cable_car_3 + .word mus_cable_car_4 + .word mus_cable_car_5 + .word mus_cable_car_6 + .word mus_cable_car_7 + .word mus_cable_car_8 + .word mus_cable_car_9 .end diff --git a/sound/songs/bgm_kachi22.s b/sound/songs/mus_caught.s index 081350f36..d3c532139 100644 --- a/sound/songs/bgm_kachi22.s +++ b/sound/songs/mus_caught.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_kachi22_grp, voicegroup022 - .equ bgm_kachi22_pri, 0 - .equ bgm_kachi22_rev, reverb_set+50 - .equ bgm_kachi22_mvl, 127 - .equ bgm_kachi22_key, 0 - .equ bgm_kachi22_tbs, 1 - .equ bgm_kachi22_exg, 0 - .equ bgm_kachi22_cmp, 1 + .equ mus_caught_grp, voicegroup022 + .equ mus_caught_pri, 0 + .equ mus_caught_rev, reverb_set+50 + .equ mus_caught_mvl, 127 + .equ mus_caught_key, 0 + .equ mus_caught_tbs, 1 + .equ mus_caught_exg, 0 + .equ mus_caught_cmp, 1 .section .rodata - .global bgm_kachi22 + .global mus_caught .align 2 @********************** Track 1 **********************@ -bgm_kachi22_1: - .byte KEYSH , bgm_kachi22_key+0 - .byte TEMPO , 140*bgm_kachi22_tbs/2 +mus_caught_1: + .byte KEYSH , mus_caught_key+0 + .byte TEMPO , 140*mus_caught_tbs/2 .byte W12 -bgm_kachi22_1_B1: +mus_caught_1_B1: .byte VOICE , 73 .byte PAN , c_v+0 .byte MOD , 0 - .byte VOL , 80*bgm_kachi22_mvl/mxv + .byte VOL , 80*mus_caught_mvl/mxv .byte N06 , Bn4 , v112 .byte W12 .byte An4 @@ -86,7 +86,7 @@ bgm_kachi22_1_B1: .byte W06 .byte As4 .byte W06 -bgm_kachi22_1_000: +mus_caught_1_000: .byte N06 , Cn5 , v112 .byte W12 .byte As4 @@ -118,7 +118,7 @@ bgm_kachi22_1_000: .byte N06 .byte W24 .byte PATT - .word bgm_kachi22_1_000 + .word mus_caught_1_000 .byte N06 , Dn5 , v112 .byte W12 .byte N06 @@ -139,19 +139,19 @@ bgm_kachi22_1_000: .byte An4 .byte W06 .byte GOTO - .word bgm_kachi22_1_B1 + .word mus_caught_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_kachi22_2: - .byte KEYSH , bgm_kachi22_key+0 +mus_caught_2: + .byte KEYSH , mus_caught_key+0 .byte W12 -bgm_kachi22_2_B1: +mus_caught_2_B1: .byte VOICE , 56 .byte PAN , c_v+0 .byte MOD , 0 - .byte VOL , 80*bgm_kachi22_mvl/mxv + .byte VOL , 80*mus_caught_mvl/mxv .byte W12 .byte N06 , En3 , v092 .byte W24 @@ -188,7 +188,7 @@ bgm_kachi22_2_B1: .byte W24 .byte Bn1 .byte W48 -bgm_kachi22_2_000: +mus_caught_2_000: .byte VOICE , 56 .byte PAN , c_v+0 .byte W12 @@ -210,7 +210,7 @@ bgm_kachi22_2_000: .byte Cn2 .byte W48 .byte PATT - .word bgm_kachi22_2_000 + .word mus_caught_2_000 .byte N06 , Fn3 , v092 .byte W24 .byte VOICE , 47 @@ -220,333 +220,333 @@ bgm_kachi22_2_000: .byte Cn2 .byte W48 .byte GOTO - .word bgm_kachi22_2_B1 + .word mus_caught_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_kachi22_3: - .byte KEYSH , bgm_kachi22_key+0 +mus_caught_3: + .byte KEYSH , mus_caught_key+0 .byte W12 -bgm_kachi22_3_B1: +mus_caught_3_B1: .byte VOICE , 58 - .byte VOL , 80*bgm_kachi22_mvl/mxv + .byte VOL , 80*mus_caught_mvl/mxv .byte N21 , En1 , v127 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , En1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N48 , An1 .byte W06 - .byte VOL , 67*bgm_kachi22_mvl/mxv + .byte VOL , 67*mus_caught_mvl/mxv .byte W03 - .byte 58*bgm_kachi22_mvl/mxv + .byte 58*mus_caught_mvl/mxv .byte W06 - .byte 54*bgm_kachi22_mvl/mxv + .byte 54*mus_caught_mvl/mxv .byte W06 - .byte 57*bgm_kachi22_mvl/mxv + .byte 57*mus_caught_mvl/mxv .byte W06 - .byte 64*bgm_kachi22_mvl/mxv + .byte 64*mus_caught_mvl/mxv .byte W03 - .byte 69*bgm_kachi22_mvl/mxv + .byte 69*mus_caught_mvl/mxv .byte W03 - .byte 76*bgm_kachi22_mvl/mxv + .byte 76*mus_caught_mvl/mxv .byte W06 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte W09 - .byte 62*bgm_kachi22_mvl/mxv + .byte 62*mus_caught_mvl/mxv .byte N48 , Bn1 .byte W06 - .byte VOL , 65*bgm_kachi22_mvl/mxv + .byte VOL , 65*mus_caught_mvl/mxv .byte W06 - .byte 67*bgm_kachi22_mvl/mxv + .byte 67*mus_caught_mvl/mxv .byte W06 - .byte 69*bgm_kachi22_mvl/mxv + .byte 69*mus_caught_mvl/mxv .byte W06 - .byte 73*bgm_kachi22_mvl/mxv + .byte 73*mus_caught_mvl/mxv .byte W09 - .byte 76*bgm_kachi22_mvl/mxv + .byte 76*mus_caught_mvl/mxv .byte W06 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte W09 .byte N21 , En1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , En1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N24 , An1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W30 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , En1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N48 , As1 .byte W06 - .byte VOL , 67*bgm_kachi22_mvl/mxv + .byte VOL , 67*mus_caught_mvl/mxv .byte W03 - .byte 58*bgm_kachi22_mvl/mxv + .byte 58*mus_caught_mvl/mxv .byte W06 - .byte 54*bgm_kachi22_mvl/mxv + .byte 54*mus_caught_mvl/mxv .byte W06 - .byte 57*bgm_kachi22_mvl/mxv + .byte 57*mus_caught_mvl/mxv .byte W06 - .byte 64*bgm_kachi22_mvl/mxv + .byte 64*mus_caught_mvl/mxv .byte W03 - .byte 69*bgm_kachi22_mvl/mxv + .byte 69*mus_caught_mvl/mxv .byte W03 - .byte 76*bgm_kachi22_mvl/mxv + .byte 76*mus_caught_mvl/mxv .byte W06 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte W09 - .byte 62*bgm_kachi22_mvl/mxv + .byte 62*mus_caught_mvl/mxv .byte N48 , Cn2 .byte W06 - .byte VOL , 65*bgm_kachi22_mvl/mxv + .byte VOL , 65*mus_caught_mvl/mxv .byte W06 - .byte 67*bgm_kachi22_mvl/mxv + .byte 67*mus_caught_mvl/mxv .byte W06 - .byte 69*bgm_kachi22_mvl/mxv + .byte 69*mus_caught_mvl/mxv .byte W06 - .byte 73*bgm_kachi22_mvl/mxv + .byte 73*mus_caught_mvl/mxv .byte W09 - .byte 76*bgm_kachi22_mvl/mxv + .byte 76*mus_caught_mvl/mxv .byte W06 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte W09 .byte N21 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N24 , As1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W30 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N24 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 - .byte 80*bgm_kachi22_mvl/mxv + .byte 80*mus_caught_mvl/mxv .byte N24 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi22_mvl/mxv + .byte VOL , 73*mus_caught_mvl/mxv .byte W03 - .byte 61*bgm_kachi22_mvl/mxv + .byte 61*mus_caught_mvl/mxv .byte W03 - .byte 37*bgm_kachi22_mvl/mxv + .byte 37*mus_caught_mvl/mxv .byte W03 - .byte 25*bgm_kachi22_mvl/mxv + .byte 25*mus_caught_mvl/mxv .byte W03 .byte GOTO - .word bgm_kachi22_3_B1 + .word mus_caught_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_kachi22_4: - .byte KEYSH , bgm_kachi22_key+0 +mus_caught_4: + .byte KEYSH , mus_caught_key+0 .byte W12 -bgm_kachi22_4_B1: +mus_caught_4_B1: .byte VOICE , 82 .byte PAN , c_v+0 - .byte VOL , 80*bgm_kachi22_mvl/mxv + .byte VOL , 80*mus_caught_mvl/mxv .byte W12 .byte N06 , Bn2 , v060 .byte W24 @@ -569,7 +569,7 @@ bgm_kachi22_4_B1: .byte W12 .byte Cs3 .byte W96 -bgm_kachi22_4_000: +mus_caught_4_000: .byte W12 .byte N06 , Cn3 , v060 .byte W24 @@ -583,22 +583,22 @@ bgm_kachi22_4_000: .byte Dn3 .byte W96 .byte PATT - .word bgm_kachi22_4_000 + .word mus_caught_4_000 .byte N06 , Dn3 , v060 .byte W96 .byte GOTO - .word bgm_kachi22_4_B1 + .word mus_caught_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_kachi22_5: - .byte KEYSH , bgm_kachi22_key+0 +mus_caught_5: + .byte KEYSH , mus_caught_key+0 .byte W12 -bgm_kachi22_5_B1: +mus_caught_5_B1: .byte VOICE , 83 .byte PAN , c_v+48 - .byte VOL , 80*bgm_kachi22_mvl/mxv + .byte VOL , 80*mus_caught_mvl/mxv .byte N03 , Bn5 , v032 .byte W12 .byte An5 @@ -647,7 +647,7 @@ bgm_kachi22_5_B1: .byte W24 .byte Bn5 .byte W48 -bgm_kachi22_5_000: +mus_caught_5_000: .byte N03 , Cn6 , v032 .byte W12 .byte As5 @@ -676,7 +676,7 @@ bgm_kachi22_5_000: .byte N03 .byte W24 .byte PATT - .word bgm_kachi22_5_000 + .word mus_caught_5_000 .byte N03 , Dn6 , v032 .byte W12 .byte N03 @@ -686,18 +686,18 @@ bgm_kachi22_5_000: .byte Cn6 .byte W48 .byte GOTO - .word bgm_kachi22_5_B1 + .word mus_caught_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_kachi22_6: - .byte KEYSH , bgm_kachi22_key+0 +mus_caught_6: + .byte KEYSH , mus_caught_key+0 .byte W12 -bgm_kachi22_6_B1: +mus_caught_6_B1: .byte VOICE , 81 .byte MOD , 0 - .byte VOL , 80*bgm_kachi22_mvl/mxv + .byte VOL , 80*mus_caught_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte N06 , An4 , v048 @@ -756,17 +756,17 @@ bgm_kachi22_6_B1: .byte N06 , An4 .byte W48 .byte GOTO - .word bgm_kachi22_6_B1 + .word mus_caught_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_kachi22_7: - .byte KEYSH , bgm_kachi22_key+0 +mus_caught_7: + .byte KEYSH , mus_caught_key+0 .byte W12 -bgm_kachi22_7_B1: +mus_caught_7_B1: .byte VOICE , 0 - .byte VOL , 80*bgm_kachi22_mvl/mxv + .byte VOL , 80*mus_caught_mvl/mxv .byte N06 , En1 , v076 .byte W12 .byte N06 @@ -795,7 +795,7 @@ bgm_kachi22_7_B1: .byte W06 .byte En1 , v064 .byte W06 -bgm_kachi22_7_000: +mus_caught_7_000: .byte N06 , En1 , v112 .byte W24 .byte Fs2 , v064 @@ -816,7 +816,7 @@ bgm_kachi22_7_000: .byte N06 , Fs2 , v060 .byte W06 .byte PEND -bgm_kachi22_7_001: +mus_caught_7_001: .byte N06 , En1 , v076 .byte W12 .byte N06 @@ -847,36 +847,36 @@ bgm_kachi22_7_001: .byte W06 .byte PEND .byte PATT - .word bgm_kachi22_7_000 + .word mus_caught_7_000 .byte PATT - .word bgm_kachi22_7_001 + .word mus_caught_7_001 .byte PATT - .word bgm_kachi22_7_000 + .word mus_caught_7_000 .byte PATT - .word bgm_kachi22_7_001 + .word mus_caught_7_001 .byte PATT - .word bgm_kachi22_7_000 + .word mus_caught_7_000 .byte GOTO - .word bgm_kachi22_7_B1 + .word mus_caught_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_kachi22: +mus_caught: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_kachi22_pri @ Priority - .byte bgm_kachi22_rev @ Reverb. + .byte mus_caught_pri @ Priority + .byte mus_caught_rev @ Reverb. - .word bgm_kachi22_grp + .word mus_caught_grp - .word bgm_kachi22_1 - .word bgm_kachi22_2 - .word bgm_kachi22_3 - .word bgm_kachi22_4 - .word bgm_kachi22_5 - .word bgm_kachi22_6 - .word bgm_kachi22_7 + .word mus_caught_1 + .word mus_caught_2 + .word mus_caught_3 + .word mus_caught_4 + .word mus_caught_5 + .word mus_caught_6 + .word mus_caught_7 .end diff --git a/sound/songs/bgm_dan03.s b/sound/songs/mus_cave_of_origin.s index 2db05620c..bd7ffc3b7 100644 --- a/sound/songs/bgm_dan03.s +++ b/sound/songs/mus_cave_of_origin.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_dan03_grp, voicegroup034 - .equ bgm_dan03_pri, 0 - .equ bgm_dan03_rev, reverb_set+50 - .equ bgm_dan03_mvl, 127 - .equ bgm_dan03_key, 0 - .equ bgm_dan03_tbs, 1 - .equ bgm_dan03_exg, 0 - .equ bgm_dan03_cmp, 1 + .equ mus_cave_of_origin_grp, voicegroup034 + .equ mus_cave_of_origin_pri, 0 + .equ mus_cave_of_origin_rev, reverb_set+50 + .equ mus_cave_of_origin_mvl, 127 + .equ mus_cave_of_origin_key, 0 + .equ mus_cave_of_origin_tbs, 1 + .equ mus_cave_of_origin_exg, 0 + .equ mus_cave_of_origin_cmp, 1 .section .rodata - .global bgm_dan03 + .global mus_cave_of_origin .align 2 @********************** Track 1 **********************@ -bgm_dan03_1: - .byte KEYSH , bgm_dan03_key+0 - .byte TEMPO , 100*bgm_dan03_tbs/2 +mus_cave_of_origin_1: + .byte KEYSH , mus_cave_of_origin_key+0 + .byte TEMPO , 100*mus_cave_of_origin_tbs/2 .byte W24 -bgm_dan03_1_B1: +mus_cave_of_origin_1_B1: .byte VOICE , 46 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v-12 .byte N08 , Ds4 , v096 .byte W08 @@ -365,17 +365,17 @@ bgm_dan03_1_B1: .byte N48 .byte W48 .byte GOTO - .word bgm_dan03_1_B1 + .word mus_cave_of_origin_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_dan03_2: - .byte KEYSH , bgm_dan03_key+0 +mus_cave_of_origin_2: + .byte KEYSH , mus_cave_of_origin_key+0 .byte W24 -bgm_dan03_2_B1: +mus_cave_of_origin_2_B1: .byte VOICE , 58 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v+6 .byte N84 , Ds1 , v127 .byte W84 @@ -455,15 +455,15 @@ bgm_dan03_2_B1: .byte Fn1 .byte W16 .byte GOTO - .word bgm_dan03_2_B1 + .word mus_cave_of_origin_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_dan03_3: - .byte KEYSH , bgm_dan03_key+0 +mus_cave_of_origin_3: + .byte KEYSH , mus_cave_of_origin_key+0 .byte VOICE , 48 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v+18 .byte N04 , As3 , v068 .byte W04 @@ -477,57 +477,57 @@ bgm_dan03_3: .byte W04 .byte Cn5 .byte W04 -bgm_dan03_3_B1: +mus_cave_of_origin_3_B1: .byte VOICE , 48 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v+18 .byte TIE , Dn5 , v068 .byte W24 .byte BEND , c_v+0 .byte W08 - .byte VOL , 75*bgm_dan03_mvl/mxv + .byte VOL , 75*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 71*bgm_dan03_mvl/mxv + .byte 71*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 66*bgm_dan03_mvl/mxv + .byte 66*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 61*bgm_dan03_mvl/mxv + .byte 61*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 57*bgm_dan03_mvl/mxv + .byte 57*mus_cave_of_origin_mvl/mxv .byte W16 -bgm_dan03_3_000: - .byte VOL , 52*bgm_dan03_mvl/mxv +mus_cave_of_origin_3_000: + .byte VOL , 52*mus_cave_of_origin_mvl/mxv .byte W16 - .byte 57*bgm_dan03_mvl/mxv + .byte 57*mus_cave_of_origin_mvl/mxv .byte W16 - .byte 62*bgm_dan03_mvl/mxv + .byte 62*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 67*bgm_dan03_mvl/mxv + .byte 67*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 69*bgm_dan03_mvl/mxv + .byte 69*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 73*bgm_dan03_mvl/mxv + .byte 73*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 74*bgm_dan03_mvl/mxv + .byte 74*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 80*bgm_dan03_mvl/mxv + .byte 80*mus_cave_of_origin_mvl/mxv .byte W16 .byte PEND .byte EOT , Dn5 .byte TIE , Cs5 , v068 .byte W32 - .byte VOL , 75*bgm_dan03_mvl/mxv + .byte VOL , 75*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 71*bgm_dan03_mvl/mxv + .byte 71*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 66*bgm_dan03_mvl/mxv + .byte 66*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 61*bgm_dan03_mvl/mxv + .byte 61*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 57*bgm_dan03_mvl/mxv + .byte 57*mus_cave_of_origin_mvl/mxv .byte W16 .byte PATT - .word bgm_dan03_3_000 + .word mus_cave_of_origin_3_000 .byte EOT , Cs5 .byte N12 , Gs4 , v088 .byte W24 @@ -545,29 +545,29 @@ bgm_dan03_3_000: .byte W24 .byte N12 .byte W48 -bgm_dan03_3_001: +mus_cave_of_origin_3_001: .byte TIE , As4 , v068 .byte W32 - .byte VOL , 75*bgm_dan03_mvl/mxv + .byte VOL , 75*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 71*bgm_dan03_mvl/mxv + .byte 71*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 66*bgm_dan03_mvl/mxv + .byte 66*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 61*bgm_dan03_mvl/mxv + .byte 61*mus_cave_of_origin_mvl/mxv .byte W12 - .byte 57*bgm_dan03_mvl/mxv + .byte 57*mus_cave_of_origin_mvl/mxv .byte W16 .byte PEND .byte PATT - .word bgm_dan03_3_000 + .word mus_cave_of_origin_3_000 .byte EOT , As4 .byte PATT - .word bgm_dan03_3_001 + .word mus_cave_of_origin_3_001 .byte PATT - .word bgm_dan03_3_000 + .word mus_cave_of_origin_3_000 .byte EOT , As4 -bgm_dan03_3_002: +mus_cave_of_origin_3_002: .byte N12 , Ds4 , v088 .byte W32 .byte N04 @@ -584,7 +584,7 @@ bgm_dan03_3_002: .byte N12 .byte W96 .byte PATT - .word bgm_dan03_3_002 + .word mus_cave_of_origin_3_002 .byte N12 , Ds4 , v088 .byte W96 .byte Dn4 @@ -640,41 +640,41 @@ bgm_dan03_3_002: .byte Cn5 .byte W04 .byte GOTO - .word bgm_dan03_3_B1 + .word mus_cave_of_origin_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_dan03_4: - .byte KEYSH , bgm_dan03_key+0 +mus_cave_of_origin_4: + .byte KEYSH , mus_cave_of_origin_key+0 .byte BENDR , 38 .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte W24 -bgm_dan03_4_B1: +mus_cave_of_origin_4_B1: .byte VOICE , 80 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v-48 .byte N92 , As3 , v060 .byte W24 .byte MOD , 7 .byte W24 - .byte VOL , 76*bgm_dan03_mvl/mxv + .byte VOL , 76*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 70*bgm_dan03_mvl/mxv + .byte 70*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 64*bgm_dan03_mvl/mxv + .byte 64*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 55*bgm_dan03_mvl/mxv + .byte 55*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 44*bgm_dan03_mvl/mxv + .byte 44*mus_cave_of_origin_mvl/mxv .byte W06 - .byte 27*bgm_dan03_mvl/mxv + .byte 27*mus_cave_of_origin_mvl/mxv .byte W02 .byte MOD , 0 .byte W04 .byte VOICE , 4 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v-1 .byte N06 , Ds6 , v052 .byte W08 @@ -706,22 +706,22 @@ bgm_dan03_4_B1: .byte W24 .byte MOD , 7 .byte W24 - .byte VOL , 76*bgm_dan03_mvl/mxv + .byte VOL , 76*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 70*bgm_dan03_mvl/mxv + .byte 70*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 64*bgm_dan03_mvl/mxv + .byte 64*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 55*bgm_dan03_mvl/mxv + .byte 55*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 44*bgm_dan03_mvl/mxv + .byte 44*mus_cave_of_origin_mvl/mxv .byte W06 - .byte 27*bgm_dan03_mvl/mxv + .byte 27*mus_cave_of_origin_mvl/mxv .byte W02 .byte MOD , 0 .byte W04 .byte VOICE , 4 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v-1 .byte N06 , Ds6 , v052 .byte W08 @@ -828,38 +828,38 @@ bgm_dan03_4_B1: .byte W16 .byte W48 .byte VOICE , 80 - .byte VOL , 44*bgm_dan03_mvl/mxv + .byte VOL , 44*mus_cave_of_origin_mvl/mxv .byte N48 , Gs3 , v072 .byte W08 - .byte VOL , 50*bgm_dan03_mvl/mxv + .byte VOL , 50*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 59*bgm_dan03_mvl/mxv + .byte 59*mus_cave_of_origin_mvl/mxv .byte MOD , 7 .byte W08 - .byte VOL , 68*bgm_dan03_mvl/mxv + .byte VOL , 68*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 73*bgm_dan03_mvl/mxv + .byte 73*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 80*bgm_dan03_mvl/mxv + .byte 80*mus_cave_of_origin_mvl/mxv .byte W08 .byte MOD , 0 .byte N96 , Gn3 , v060 .byte W36 .byte MOD , 7 .byte W12 - .byte VOL , 76*bgm_dan03_mvl/mxv + .byte VOL , 76*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 70*bgm_dan03_mvl/mxv + .byte 70*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 64*bgm_dan03_mvl/mxv + .byte 64*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 55*bgm_dan03_mvl/mxv + .byte 55*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 44*bgm_dan03_mvl/mxv + .byte 44*mus_cave_of_origin_mvl/mxv .byte W06 - .byte 27*bgm_dan03_mvl/mxv + .byte 27*mus_cave_of_origin_mvl/mxv .byte W06 - .byte 80*bgm_dan03_mvl/mxv + .byte 80*mus_cave_of_origin_mvl/mxv .byte MOD , 0 .byte N06 , Gn3 , v040 .byte W08 @@ -974,20 +974,20 @@ bgm_dan03_4_B1: .byte Dn3 .byte W08 .byte GOTO - .word bgm_dan03_4_B1 + .word mus_cave_of_origin_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_dan03_5: - .byte KEYSH , bgm_dan03_key+0 +mus_cave_of_origin_5: + .byte KEYSH , mus_cave_of_origin_key+0 .byte BENDR , 38 .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte W24 -bgm_dan03_5_B1: +mus_cave_of_origin_5_B1: .byte VOICE , 82 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v+48 .byte N12 , Gn3 , v060 .byte W12 @@ -999,28 +999,28 @@ bgm_dan03_5_B1: .byte W12 .byte N12 .byte W12 - .byte VOL , 76*bgm_dan03_mvl/mxv + .byte VOL , 76*mus_cave_of_origin_mvl/mxv .byte N12 .byte W09 - .byte VOL , 70*bgm_dan03_mvl/mxv + .byte VOL , 70*mus_cave_of_origin_mvl/mxv .byte W03 .byte N12 .byte W06 - .byte VOL , 64*bgm_dan03_mvl/mxv + .byte VOL , 64*mus_cave_of_origin_mvl/mxv .byte W06 .byte N12 .byte W03 - .byte VOL , 55*bgm_dan03_mvl/mxv + .byte VOL , 55*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 44*bgm_dan03_mvl/mxv + .byte 44*mus_cave_of_origin_mvl/mxv .byte N09 .byte W06 - .byte VOL , 27*bgm_dan03_mvl/mxv + .byte VOL , 27*mus_cave_of_origin_mvl/mxv .byte W02 .byte MOD , 0 .byte W04 .byte VOICE , 5 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v+0 .byte W04 .byte N06 , Dn6 , v052 @@ -1059,28 +1059,28 @@ bgm_dan03_5_B1: .byte W12 .byte N12 .byte W12 - .byte VOL , 76*bgm_dan03_mvl/mxv + .byte VOL , 76*mus_cave_of_origin_mvl/mxv .byte N12 .byte W09 - .byte VOL , 70*bgm_dan03_mvl/mxv + .byte VOL , 70*mus_cave_of_origin_mvl/mxv .byte W03 .byte N12 .byte W06 - .byte VOL , 64*bgm_dan03_mvl/mxv + .byte VOL , 64*mus_cave_of_origin_mvl/mxv .byte W06 .byte N12 .byte W03 - .byte VOL , 55*bgm_dan03_mvl/mxv + .byte VOL , 55*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 44*bgm_dan03_mvl/mxv + .byte 44*mus_cave_of_origin_mvl/mxv .byte N09 .byte W06 - .byte VOL , 27*bgm_dan03_mvl/mxv + .byte VOL , 27*mus_cave_of_origin_mvl/mxv .byte W02 .byte MOD , 0 .byte W04 .byte VOICE , 5 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v+0 .byte W04 .byte N06 , Cs6 , v052 @@ -1194,25 +1194,25 @@ bgm_dan03_5_B1: .byte W12 .byte W48 .byte VOICE , 82 - .byte VOL , 44*bgm_dan03_mvl/mxv + .byte VOL , 44*mus_cave_of_origin_mvl/mxv .byte N12 , En3 , v072 .byte W08 - .byte VOL , 50*bgm_dan03_mvl/mxv + .byte VOL , 50*mus_cave_of_origin_mvl/mxv .byte W04 .byte VOICE , 83 .byte N12 .byte W04 - .byte VOL , 59*bgm_dan03_mvl/mxv + .byte VOL , 59*mus_cave_of_origin_mvl/mxv .byte MOD , 7 .byte W08 - .byte VOL , 68*bgm_dan03_mvl/mxv + .byte VOL , 68*mus_cave_of_origin_mvl/mxv .byte N12 .byte W08 - .byte VOL , 73*bgm_dan03_mvl/mxv + .byte VOL , 73*mus_cave_of_origin_mvl/mxv .byte W04 .byte N12 .byte W04 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte W08 .byte VOICE , 82 .byte MOD , 0 @@ -1226,26 +1226,26 @@ bgm_dan03_5_B1: .byte MOD , 7 .byte N12 .byte W12 - .byte VOL , 76*bgm_dan03_mvl/mxv + .byte VOL , 76*mus_cave_of_origin_mvl/mxv .byte N12 .byte W09 - .byte VOL , 70*bgm_dan03_mvl/mxv + .byte VOL , 70*mus_cave_of_origin_mvl/mxv .byte W03 .byte N12 .byte W06 - .byte VOL , 64*bgm_dan03_mvl/mxv + .byte VOL , 64*mus_cave_of_origin_mvl/mxv .byte W06 .byte N12 .byte W03 - .byte VOL , 55*bgm_dan03_mvl/mxv + .byte VOL , 55*mus_cave_of_origin_mvl/mxv .byte W09 - .byte 44*bgm_dan03_mvl/mxv + .byte 44*mus_cave_of_origin_mvl/mxv .byte N12 .byte W06 - .byte VOL , 27*bgm_dan03_mvl/mxv + .byte VOL , 27*mus_cave_of_origin_mvl/mxv .byte W06 .byte VOICE , 82 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte MOD , 0 .byte N06 , En3 , v040 .byte W08 @@ -1360,17 +1360,17 @@ bgm_dan03_5_B1: .byte An2 .byte W08 .byte GOTO - .word bgm_dan03_5_B1 + .word mus_cave_of_origin_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_dan03_6: - .byte KEYSH , bgm_dan03_key+0 +mus_cave_of_origin_6: + .byte KEYSH , mus_cave_of_origin_key+0 .byte W24 -bgm_dan03_6_B1: +mus_cave_of_origin_6_B1: .byte VOICE , 46 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte PAN , c_v+12 .byte BEND , c_v+0 .byte N08 , As3 , v088 @@ -1455,19 +1455,19 @@ bgm_dan03_6_B1: .byte W96 .byte W48 .byte VOICE , 60 - .byte VOL , 45*bgm_dan03_mvl/mxv + .byte VOL , 45*mus_cave_of_origin_mvl/mxv .byte PAN , c_v+0 .byte N48 , As2 , v108 .byte W08 - .byte VOL , 52*bgm_dan03_mvl/mxv + .byte VOL , 52*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 61*bgm_dan03_mvl/mxv + .byte 61*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 69*bgm_dan03_mvl/mxv + .byte 69*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 74*bgm_dan03_mvl/mxv + .byte 74*mus_cave_of_origin_mvl/mxv .byte W08 - .byte 80*bgm_dan03_mvl/mxv + .byte 80*mus_cave_of_origin_mvl/mxv .byte W08 .byte N12 , As2 , v072 .byte W24 @@ -1583,18 +1583,18 @@ bgm_dan03_6_B1: .byte W08 .byte W96 .byte GOTO - .word bgm_dan03_6_B1 + .word mus_cave_of_origin_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_dan03_7: - .byte KEYSH , bgm_dan03_key+0 +mus_cave_of_origin_7: + .byte KEYSH , mus_cave_of_origin_key+0 .byte PAN , c_v-8 .byte W24 -bgm_dan03_7_B1: +mus_cave_of_origin_7_B1: .byte VOICE , 47 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1703,17 +1703,17 @@ bgm_dan03_7_B1: .byte N24 .byte W48 .byte GOTO - .word bgm_dan03_7_B1 + .word mus_cave_of_origin_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_dan03_8: - .byte KEYSH , bgm_dan03_key+0 +mus_cave_of_origin_8: + .byte KEYSH , mus_cave_of_origin_key+0 .byte W24 -bgm_dan03_8_B1: +mus_cave_of_origin_8_B1: .byte VOICE , 81 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte N84 , Ds1 , v052 .byte W84 .byte N12 , As1 @@ -1851,39 +1851,39 @@ bgm_dan03_8_B1: .byte Fn1 .byte W16 .byte GOTO - .word bgm_dan03_8_B1 + .word mus_cave_of_origin_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_dan03_9: - .byte KEYSH , bgm_dan03_key+0 +mus_cave_of_origin_9: + .byte KEYSH , mus_cave_of_origin_key+0 .byte W24 -bgm_dan03_9_B1: +mus_cave_of_origin_9_B1: .byte VOICE , 0 - .byte VOL , 80*bgm_dan03_mvl/mxv + .byte VOL , 80*mus_cave_of_origin_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 .byte W96 .byte W64 - .byte 39*bgm_dan03_mvl/mxv + .byte 39*mus_cave_of_origin_mvl/mxv .byte N32 , An2 , v064 .byte W04 - .byte VOL , 44*bgm_dan03_mvl/mxv + .byte VOL , 44*mus_cave_of_origin_mvl/mxv .byte W04 - .byte 49*bgm_dan03_mvl/mxv + .byte 49*mus_cave_of_origin_mvl/mxv .byte W04 - .byte 54*bgm_dan03_mvl/mxv + .byte 54*mus_cave_of_origin_mvl/mxv .byte W04 - .byte 59*bgm_dan03_mvl/mxv + .byte 59*mus_cave_of_origin_mvl/mxv .byte W04 - .byte 65*bgm_dan03_mvl/mxv + .byte 65*mus_cave_of_origin_mvl/mxv .byte W04 - .byte 72*bgm_dan03_mvl/mxv + .byte 72*mus_cave_of_origin_mvl/mxv .byte W04 - .byte 80*bgm_dan03_mvl/mxv + .byte 80*mus_cave_of_origin_mvl/mxv .byte W04 .byte N96 , Bn2 , v100 .byte W96 @@ -1899,28 +1899,28 @@ bgm_dan03_9_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_dan03_9_B1 + .word mus_cave_of_origin_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_dan03: +mus_cave_of_origin: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_dan03_pri @ Priority - .byte bgm_dan03_rev @ Reverb. + .byte mus_cave_of_origin_pri @ Priority + .byte mus_cave_of_origin_rev @ Reverb. - .word bgm_dan03_grp + .word mus_cave_of_origin_grp - .word bgm_dan03_1 - .word bgm_dan03_2 - .word bgm_dan03_3 - .word bgm_dan03_4 - .word bgm_dan03_5 - .word bgm_dan03_6 - .word bgm_dan03_7 - .word bgm_dan03_8 - .word bgm_dan03_9 + .word mus_cave_of_origin_1 + .word mus_cave_of_origin_2 + .word mus_cave_of_origin_3 + .word mus_cave_of_origin_4 + .word mus_cave_of_origin_5 + .word mus_cave_of_origin_6 + .word mus_cave_of_origin_7 + .word mus_cave_of_origin_8 + .word mus_cave_of_origin_9 .end diff --git a/sound/songs/bgm_contest0.s b/sound/songs/mus_contest.s index 34fbf0af1..3e81fc461 100644 --- a/sound/songs/bgm_contest0.s +++ b/sound/songs/mus_contest.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_contest0_grp, voicegroup083 - .equ bgm_contest0_pri, 0 - .equ bgm_contest0_rev, reverb_set+50 - .equ bgm_contest0_mvl, 127 - .equ bgm_contest0_key, 0 - .equ bgm_contest0_tbs, 1 - .equ bgm_contest0_exg, 0 - .equ bgm_contest0_cmp, 1 + .equ mus_contest_grp, voicegroup083 + .equ mus_contest_pri, 0 + .equ mus_contest_rev, reverb_set+50 + .equ mus_contest_mvl, 127 + .equ mus_contest_key, 0 + .equ mus_contest_tbs, 1 + .equ mus_contest_exg, 0 + .equ mus_contest_cmp, 1 .section .rodata - .global bgm_contest0 + .global mus_contest .align 2 @********************** Track 1 **********************@ -bgm_contest0_1: - .byte KEYSH , bgm_contest0_key+0 -bgm_contest0_1_B1: - .byte TEMPO , 128*bgm_contest0_tbs/2 +mus_contest_1: + .byte KEYSH , mus_contest_key+0 +mus_contest_1_B1: + .byte TEMPO , 128*mus_contest_tbs/2 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 66*bgm_contest0_mvl/mxv + .byte VOL , 66*mus_contest_mvl/mxv .byte N06 , Fn4 , v112 .byte W12 .byte N03 @@ -132,24 +132,24 @@ bgm_contest0_1_B1: .byte W12 .byte MOD , 5 .byte W24 - .byte VOL , 57*bgm_contest0_mvl/mxv + .byte VOL , 57*mus_contest_mvl/mxv .byte W05 - .byte 51*bgm_contest0_mvl/mxv + .byte 51*mus_contest_mvl/mxv .byte W07 - .byte 47*bgm_contest0_mvl/mxv + .byte 47*mus_contest_mvl/mxv .byte W05 - .byte 41*bgm_contest0_mvl/mxv + .byte 41*mus_contest_mvl/mxv .byte W07 - .byte 36*bgm_contest0_mvl/mxv + .byte 36*mus_contest_mvl/mxv .byte W05 - .byte 29*bgm_contest0_mvl/mxv + .byte 29*mus_contest_mvl/mxv .byte W07 - .byte 22*bgm_contest0_mvl/mxv + .byte 22*mus_contest_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 19*bgm_contest0_mvl/mxv + .byte VOL , 19*mus_contest_mvl/mxv .byte W06 - .byte 66*bgm_contest0_mvl/mxv + .byte 66*mus_contest_mvl/mxv .byte N04 , Fs3 .byte W08 .byte As3 @@ -214,22 +214,22 @@ bgm_contest0_1_B1: .byte W24 .byte MOD , 5 .byte W12 - .byte VOL , 58*bgm_contest0_mvl/mxv + .byte VOL , 58*mus_contest_mvl/mxv .byte W05 - .byte 51*bgm_contest0_mvl/mxv + .byte 51*mus_contest_mvl/mxv .byte W07 - .byte 46*bgm_contest0_mvl/mxv + .byte 46*mus_contest_mvl/mxv .byte W05 - .byte 40*bgm_contest0_mvl/mxv + .byte 40*mus_contest_mvl/mxv .byte W07 - .byte 36*bgm_contest0_mvl/mxv + .byte 36*mus_contest_mvl/mxv .byte W05 - .byte 30*bgm_contest0_mvl/mxv + .byte 30*mus_contest_mvl/mxv .byte W07 - .byte 27*bgm_contest0_mvl/mxv + .byte 27*mus_contest_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 66*bgm_contest0_mvl/mxv + .byte VOL , 66*mus_contest_mvl/mxv .byte N03 , Ds4 .byte W03 .byte En4 @@ -257,7 +257,7 @@ bgm_contest0_1_B1: .byte W48 .byte 24 .byte W48 - .byte VOL , 51*bgm_contest0_mvl/mxv + .byte VOL , 51*mus_contest_mvl/mxv .byte W12 .byte N03 , Dn4 .byte W06 @@ -326,21 +326,21 @@ bgm_contest0_1_B1: .byte Fs4 .byte W03 .byte GOTO - .word bgm_contest0_1_B1 + .word mus_contest_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_contest0_2: - .byte KEYSH , bgm_contest0_key+0 -bgm_contest0_2_B1: +mus_contest_2: + .byte KEYSH , mus_contest_key+0 +mus_contest_2_B1: .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 88*bgm_contest0_mvl/mxv + .byte VOL , 88*mus_contest_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -580,19 +580,19 @@ bgm_contest0_2_B1: .byte Fs1 .byte W06 .byte GOTO - .word bgm_contest0_2_B1 + .word mus_contest_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_contest0_3: - .byte KEYSH , bgm_contest0_key+0 -bgm_contest0_3_B1: +mus_contest_3: + .byte KEYSH , mus_contest_key+0 +mus_contest_3_B1: .byte VOICE , 60 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 40*bgm_contest0_mvl/mxv + .byte VOL , 40*mus_contest_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -601,7 +601,7 @@ bgm_contest0_3_B1: .byte W96 .byte W96 .byte W96 - .byte 62*bgm_contest0_mvl/mxv + .byte 62*mus_contest_mvl/mxv .byte W48 .byte N06 , As3 , v112 .byte W06 @@ -628,7 +628,7 @@ bgm_contest0_3_B1: .byte Ds4 .byte W24 .byte VOICE , 17 - .byte VOL , 39*bgm_contest0_mvl/mxv + .byte VOL , 39*mus_contest_mvl/mxv .byte N04 , Dn5 .byte W08 .byte Ds5 @@ -776,21 +776,21 @@ bgm_contest0_3_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_contest0_3_B1 + .word mus_contest_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_contest0_4: - .byte KEYSH , bgm_contest0_key+0 -bgm_contest0_4_B1: +mus_contest_4: + .byte KEYSH , mus_contest_key+0 +mus_contest_4_B1: .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-61 - .byte VOL , 36*bgm_contest0_mvl/mxv + .byte VOL , 36*mus_contest_mvl/mxv .byte N06 , Fn2 , v112 .byte W12 .byte N03 @@ -985,7 +985,7 @@ bgm_contest0_4_B1: .byte W22 .byte Ds3 .byte W24 -bgm_contest0_4_000: +mus_contest_4_000: .byte N06 , Gn3 , v112 .byte W06 .byte N03 , Gn3 , v096 @@ -1019,7 +1019,7 @@ bgm_contest0_4_000: .byte N03 .byte W06 .byte PEND -bgm_contest0_4_001: +mus_contest_4_001: .byte N06 , Gn3 , v112 .byte W06 .byte N03 , Gn3 , v096 @@ -1051,7 +1051,7 @@ bgm_contest0_4_001: .byte As3 , v112 .byte W06 .byte PEND -bgm_contest0_4_002: +mus_contest_4_002: .byte N06 , An3 , v112 .byte W06 .byte N03 , An3 , v096 @@ -1112,11 +1112,11 @@ bgm_contest0_4_002: .byte N06 , An3 .byte W06 .byte PATT - .word bgm_contest0_4_000 + .word mus_contest_4_000 .byte PATT - .word bgm_contest0_4_001 + .word mus_contest_4_001 .byte PATT - .word bgm_contest0_4_002 + .word mus_contest_4_002 .byte N06 , As3 , v112 .byte W06 .byte N03 , As3 , v096 @@ -1338,21 +1338,21 @@ bgm_contest0_4_002: .byte Ds4 .byte W03 .byte GOTO - .word bgm_contest0_4_B1 + .word mus_contest_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_contest0_5: - .byte KEYSH , bgm_contest0_key+0 -bgm_contest0_5_B1: +mus_contest_5: + .byte KEYSH , mus_contest_key+0 +mus_contest_5_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 36*bgm_contest0_mvl/mxv + .byte VOL , 36*mus_contest_mvl/mxv .byte N06 , Cn4 , v112 .byte W12 .byte N03 @@ -1559,7 +1559,7 @@ bgm_contest0_5_B1: .byte W24 .byte N24 .byte W24 -bgm_contest0_5_000: +mus_contest_5_000: .byte N06 , Fn4 , v112 .byte W06 .byte N03 , Fn4 , v096 @@ -1593,7 +1593,7 @@ bgm_contest0_5_000: .byte N03 .byte W06 .byte PEND -bgm_contest0_5_001: +mus_contest_5_001: .byte N06 , Fn4 , v112 .byte W06 .byte N03 , Fn4 , v096 @@ -1623,7 +1623,7 @@ bgm_contest0_5_001: .byte Gn4 , v112 .byte W06 .byte PEND -bgm_contest0_5_002: +mus_contest_5_002: .byte N06 , Fn4 , v112 .byte W06 .byte N03 , Fn4 , v096 @@ -1684,11 +1684,11 @@ bgm_contest0_5_002: .byte N06 , Dn4 .byte W06 .byte PATT - .word bgm_contest0_5_000 + .word mus_contest_5_000 .byte PATT - .word bgm_contest0_5_001 + .word mus_contest_5_001 .byte PATT - .word bgm_contest0_5_002 + .word mus_contest_5_002 .byte N06 , Fn4 , v112 .byte W06 .byte N03 , Fn4 , v096 @@ -1910,16 +1910,16 @@ bgm_contest0_5_002: .byte As4 .byte W03 .byte GOTO - .word bgm_contest0_5_B1 + .word mus_contest_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_contest0_6: - .byte KEYSH , bgm_contest0_key+0 -bgm_contest0_6_B1: +mus_contest_6: + .byte KEYSH , mus_contest_key+0 +mus_contest_6_B1: .byte VOICE , 0 - .byte VOL , 77*bgm_contest0_mvl/mxv + .byte VOL , 77*mus_contest_mvl/mxv .byte PAN , c_v+0 .byte N06 , En1 , v112 .byte N48 , An2 , v092 @@ -2003,7 +2003,7 @@ bgm_contest0_6_B1: .byte N06 .byte N24 , An2 .byte W48 -bgm_contest0_6_000: +mus_contest_6_000: .byte N06 , En1 , v112 .byte W12 .byte N06 @@ -2121,7 +2121,7 @@ bgm_contest0_6_000: .byte N03 .byte W03 .byte PATT - .word bgm_contest0_6_000 + .word mus_contest_6_000 .byte N06 , En1 , v112 .byte W36 .byte N03 @@ -2208,7 +2208,7 @@ bgm_contest0_6_000: .byte W06 .byte Cn1 .byte W12 -bgm_contest0_6_001: +mus_contest_6_001: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -2257,8 +2257,8 @@ bgm_contest0_6_001: .byte En1 , v088 .byte W06 .byte PATT - .word bgm_contest0_6_001 -bgm_contest0_6_002: + .word mus_contest_6_001 +mus_contest_6_002: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -2281,7 +2281,7 @@ bgm_contest0_6_002: .byte W06 .byte PEND .byte PATT - .word bgm_contest0_6_001 + .word mus_contest_6_001 .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -2309,10 +2309,10 @@ bgm_contest0_6_002: .byte En1 , v092 .byte W06 .byte PATT - .word bgm_contest0_6_001 + .word mus_contest_6_001 .byte PATT - .word bgm_contest0_6_002 -bgm_contest0_6_003: + .word mus_contest_6_002 +mus_contest_6_003: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v088 @@ -2335,9 +2335,9 @@ bgm_contest0_6_003: .byte W06 .byte PEND .byte PATT - .word bgm_contest0_6_003 + .word mus_contest_6_003 .byte PATT - .word bgm_contest0_6_003 + .word mus_contest_6_003 .byte N06 , Dn1 , v112 .byte W06 .byte Dn1 , v080 @@ -2363,21 +2363,21 @@ bgm_contest0_6_003: .byte Cn1 , v096 .byte W06 .byte GOTO - .word bgm_contest0_6_B1 + .word mus_contest_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_contest0_7: - .byte KEYSH , bgm_contest0_key+0 -bgm_contest0_7_B1: +mus_contest_7: + .byte KEYSH , mus_contest_key+0 +mus_contest_7_B1: .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 66*bgm_contest0_mvl/mxv + .byte VOL , 66*mus_contest_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fn1 , v112 .byte W12 @@ -2556,7 +2556,7 @@ bgm_contest0_7_B1: .byte Dn1 .byte W12 .byte VOICE , 83 - .byte VOL , 38*bgm_contest0_mvl/mxv + .byte VOL , 38*mus_contest_mvl/mxv .byte BEND , c_v+1 .byte N04 , Dn4 .byte W08 @@ -2700,7 +2700,7 @@ bgm_contest0_7_B1: .byte W12 .byte N06 .byte W06 - .byte VOL , 44*bgm_contest0_mvl/mxv + .byte VOL , 44*mus_contest_mvl/mxv .byte W12 .byte N03 , Dn4 .byte W06 @@ -2765,19 +2765,19 @@ bgm_contest0_7_B1: .byte N18 , Gs4 .byte W24 .byte GOTO - .word bgm_contest0_7_B1 + .word mus_contest_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_contest0_8: - .byte KEYSH , bgm_contest0_key+0 -bgm_contest0_8_B1: +mus_contest_8: + .byte KEYSH , mus_contest_key+0 +mus_contest_8_B1: .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 44*bgm_contest0_mvl/mxv + .byte VOL , 44*mus_contest_mvl/mxv .byte N06 , An3 , v112 .byte W12 .byte N03 @@ -3036,27 +3036,27 @@ bgm_contest0_8_B1: .byte Cn4 .byte W03 .byte GOTO - .word bgm_contest0_8_B1 + .word mus_contest_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_contest0: +mus_contest: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_contest0_pri @ Priority - .byte bgm_contest0_rev @ Reverb. + .byte mus_contest_pri @ Priority + .byte mus_contest_rev @ Reverb. - .word bgm_contest0_grp + .word mus_contest_grp - .word bgm_contest0_1 - .word bgm_contest0_2 - .word bgm_contest0_3 - .word bgm_contest0_4 - .word bgm_contest0_5 - .word bgm_contest0_6 - .word bgm_contest0_7 - .word bgm_contest0_8 + .word mus_contest_1 + .word mus_contest_2 + .word mus_contest_3 + .word mus_contest_4 + .word mus_contest_5 + .word mus_contest_6 + .word mus_contest_7 + .word mus_contest_8 .end diff --git a/sound/songs/bgm_conlobby.s b/sound/songs/mus_contest_lobby.s index 9b2f66f3f..9960393ce 100644 --- a/sound/songs/bgm_conlobby.s +++ b/sound/songs/mus_contest_lobby.s @@ -1,33 +1,33 @@ .include "MPlayDef.s" - .equ bgm_conlobby_grp, voicegroup095 - .equ bgm_conlobby_pri, 0 - .equ bgm_conlobby_rev, reverb_set+50 - .equ bgm_conlobby_mvl, 127 - .equ bgm_conlobby_key, 0 - .equ bgm_conlobby_tbs, 1 - .equ bgm_conlobby_exg, 0 - .equ bgm_conlobby_cmp, 1 + .equ mus_contest_lobby_grp, voicegroup095 + .equ mus_contest_lobby_pri, 0 + .equ mus_contest_lobby_rev, reverb_set+50 + .equ mus_contest_lobby_mvl, 127 + .equ mus_contest_lobby_key, 0 + .equ mus_contest_lobby_tbs, 1 + .equ mus_contest_lobby_exg, 0 + .equ mus_contest_lobby_cmp, 1 .section .rodata - .global bgm_conlobby + .global mus_contest_lobby .align 2 @********************** Track 1 **********************@ -bgm_conlobby_1: - .byte KEYSH , bgm_conlobby_key+0 - .byte TEMPO , 128*bgm_conlobby_tbs/2 +mus_contest_lobby_1: + .byte KEYSH , mus_contest_lobby_key+0 + .byte TEMPO , 128*mus_contest_lobby_tbs/2 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 36*bgm_conlobby_mvl/mxv + .byte VOL , 36*mus_contest_lobby_mvl/mxv .byte W96 .byte W84 .byte N12 , Ds3 , v112 .byte W12 -bgm_conlobby_1_B1: +mus_contest_lobby_1_B1: .byte N06 , En3 , v112 .byte W12 .byte N18 @@ -141,26 +141,26 @@ bgm_conlobby_1_B1: .byte N12 , Ds3 .byte W12 .byte GOTO - .word bgm_conlobby_1_B1 + .word mus_contest_lobby_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_conlobby_2: - .byte KEYSH , bgm_conlobby_key+0 +mus_contest_lobby_2: + .byte KEYSH , mus_contest_lobby_key+0 .byte VOICE , 58 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 60*bgm_conlobby_mvl/mxv + .byte VOL , 60*mus_contest_lobby_mvl/mxv .byte W96 .byte W84 .byte N12 , Bn1 , v112 .byte W12 -bgm_conlobby_2_B1: -bgm_conlobby_2_000: +mus_contest_lobby_2_B1: +mus_contest_lobby_2_000: .byte N06 , Cn2 , v112 .byte W24 .byte Gn1 @@ -170,7 +170,7 @@ bgm_conlobby_2_000: .byte Gn1 .byte W24 .byte PEND -bgm_conlobby_2_001: +mus_contest_lobby_2_001: .byte N06 , As1 , v112 .byte W24 .byte Fn1 @@ -180,7 +180,7 @@ bgm_conlobby_2_001: .byte Fn1 .byte W24 .byte PEND -bgm_conlobby_2_002: +mus_contest_lobby_2_002: .byte N06 , An1 , v112 .byte W24 .byte En1 @@ -190,7 +190,7 @@ bgm_conlobby_2_002: .byte En1 .byte W24 .byte PEND -bgm_conlobby_2_003: +mus_contest_lobby_2_003: .byte N06 , Gs1 , v112 .byte W24 .byte Ds1 @@ -203,45 +203,45 @@ bgm_conlobby_2_003: .byte W12 .byte PEND .byte PATT - .word bgm_conlobby_2_000 + .word mus_contest_lobby_2_000 .byte PATT - .word bgm_conlobby_2_001 + .word mus_contest_lobby_2_001 .byte PATT - .word bgm_conlobby_2_002 + .word mus_contest_lobby_2_002 .byte PATT - .word bgm_conlobby_2_003 + .word mus_contest_lobby_2_003 .byte PATT - .word bgm_conlobby_2_000 + .word mus_contest_lobby_2_000 .byte PATT - .word bgm_conlobby_2_001 + .word mus_contest_lobby_2_001 .byte PATT - .word bgm_conlobby_2_002 + .word mus_contest_lobby_2_002 .byte PATT - .word bgm_conlobby_2_003 + .word mus_contest_lobby_2_003 .byte PATT - .word bgm_conlobby_2_000 + .word mus_contest_lobby_2_000 .byte PATT - .word bgm_conlobby_2_001 + .word mus_contest_lobby_2_001 .byte PATT - .word bgm_conlobby_2_002 + .word mus_contest_lobby_2_002 .byte PATT - .word bgm_conlobby_2_003 + .word mus_contest_lobby_2_003 .byte GOTO - .word bgm_conlobby_2_B1 + .word mus_contest_lobby_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_conlobby_3: - .byte KEYSH , bgm_conlobby_key+0 +mus_contest_lobby_3: + .byte KEYSH , mus_contest_lobby_key+0 .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 33*bgm_conlobby_mvl/mxv + .byte VOL , 33*mus_contest_lobby_mvl/mxv .byte W96 .byte W96 -bgm_conlobby_3_B1: +mus_contest_lobby_3_B1: .byte W96 .byte W96 .byte W96 @@ -324,7 +324,7 @@ bgm_conlobby_3_B1: .byte W06 .byte Fn3 .byte W06 -bgm_conlobby_3_000: +mus_contest_lobby_3_000: .byte N06 , Gn3 , v112 .byte W06 .byte N03 , Fs3 @@ -355,7 +355,7 @@ bgm_conlobby_3_000: .byte W06 .byte PEND .byte PATT - .word bgm_conlobby_3_000 + .word mus_contest_lobby_3_000 .byte N06 , En4 , v112 .byte W06 .byte N03 , Fn4 @@ -433,24 +433,24 @@ bgm_conlobby_3_000: .byte N03 , As3 .byte W06 .byte GOTO - .word bgm_conlobby_3_B1 + .word mus_contest_lobby_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_conlobby_4: - .byte KEYSH , bgm_conlobby_key+0 +mus_contest_lobby_4: + .byte KEYSH , mus_contest_lobby_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-61 - .byte VOL , 35*bgm_conlobby_mvl/mxv + .byte VOL , 35*mus_contest_lobby_mvl/mxv .byte W96 .byte W96 -bgm_conlobby_4_B1: -bgm_conlobby_4_000: +mus_contest_lobby_4_B1: +mus_contest_lobby_4_000: .byte N06 , Cn3 , v112 .byte W12 .byte N03 , Gn3 @@ -472,7 +472,7 @@ bgm_conlobby_4_000: .byte N03 .byte W12 .byte PEND -bgm_conlobby_4_001: +mus_contest_lobby_4_001: .byte N06 , As2 , v112 .byte W12 .byte N03 , Fn3 @@ -494,7 +494,7 @@ bgm_conlobby_4_001: .byte N03 .byte W12 .byte PEND -bgm_conlobby_4_002: +mus_contest_lobby_4_002: .byte N06 , An2 , v112 .byte W12 .byte N03 , En3 @@ -514,7 +514,7 @@ bgm_conlobby_4_002: .byte N03 .byte W12 .byte PEND -bgm_conlobby_4_003: +mus_contest_lobby_4_003: .byte N06 , Gs2 , v112 .byte W12 .byte N03 , Ds3 @@ -537,25 +537,25 @@ bgm_conlobby_4_003: .byte W12 .byte PEND .byte PATT - .word bgm_conlobby_4_000 + .word mus_contest_lobby_4_000 .byte PATT - .word bgm_conlobby_4_001 + .word mus_contest_lobby_4_001 .byte PATT - .word bgm_conlobby_4_002 + .word mus_contest_lobby_4_002 .byte PATT - .word bgm_conlobby_4_003 + .word mus_contest_lobby_4_003 .byte PATT - .word bgm_conlobby_4_000 + .word mus_contest_lobby_4_000 .byte PATT - .word bgm_conlobby_4_001 + .word mus_contest_lobby_4_001 .byte PATT - .word bgm_conlobby_4_002 + .word mus_contest_lobby_4_002 .byte PATT - .word bgm_conlobby_4_003 + .word mus_contest_lobby_4_003 .byte PATT - .word bgm_conlobby_4_000 + .word mus_contest_lobby_4_000 .byte PATT - .word bgm_conlobby_4_001 + .word mus_contest_lobby_4_001 .byte N06 , An2 , v112 .byte W12 .byte N03 , En3 @@ -585,26 +585,26 @@ bgm_conlobby_4_003: .byte En3 .byte W06 .byte PATT - .word bgm_conlobby_4_003 + .word mus_contest_lobby_4_003 .byte GOTO - .word bgm_conlobby_4_B1 + .word mus_contest_lobby_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_conlobby_5: - .byte KEYSH , bgm_conlobby_key+0 +mus_contest_lobby_5: + .byte KEYSH , mus_contest_lobby_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 33*bgm_conlobby_mvl/mxv + .byte VOL , 33*mus_contest_lobby_mvl/mxv .byte W96 .byte W96 -bgm_conlobby_5_B1: -bgm_conlobby_5_000: +mus_contest_lobby_5_B1: +mus_contest_lobby_5_000: .byte N06 , Gn2 , v112 .byte W12 .byte N03 , Cn4 @@ -626,7 +626,7 @@ bgm_conlobby_5_000: .byte N03 .byte W12 .byte PEND -bgm_conlobby_5_001: +mus_contest_lobby_5_001: .byte N06 , Fn2 , v112 .byte W12 .byte N03 , As3 @@ -648,7 +648,7 @@ bgm_conlobby_5_001: .byte N03 .byte W12 .byte PEND -bgm_conlobby_5_002: +mus_contest_lobby_5_002: .byte N06 , En2 , v112 .byte W12 .byte N03 , An3 @@ -668,7 +668,7 @@ bgm_conlobby_5_002: .byte N03 .byte W12 .byte PEND -bgm_conlobby_5_003: +mus_contest_lobby_5_003: .byte N06 , Ds2 , v112 .byte W12 .byte N03 , Gs3 @@ -691,25 +691,25 @@ bgm_conlobby_5_003: .byte W12 .byte PEND .byte PATT - .word bgm_conlobby_5_000 + .word mus_contest_lobby_5_000 .byte PATT - .word bgm_conlobby_5_001 + .word mus_contest_lobby_5_001 .byte PATT - .word bgm_conlobby_5_002 + .word mus_contest_lobby_5_002 .byte PATT - .word bgm_conlobby_5_003 + .word mus_contest_lobby_5_003 .byte PATT - .word bgm_conlobby_5_000 + .word mus_contest_lobby_5_000 .byte PATT - .word bgm_conlobby_5_001 + .word mus_contest_lobby_5_001 .byte PATT - .word bgm_conlobby_5_002 + .word mus_contest_lobby_5_002 .byte PATT - .word bgm_conlobby_5_003 + .word mus_contest_lobby_5_003 .byte PATT - .word bgm_conlobby_5_000 + .word mus_contest_lobby_5_000 .byte PATT - .word bgm_conlobby_5_001 + .word mus_contest_lobby_5_001 .byte N06 , En2 , v112 .byte W12 .byte N03 , An3 @@ -739,18 +739,18 @@ bgm_conlobby_5_003: .byte An3 .byte W06 .byte PATT - .word bgm_conlobby_5_003 + .word mus_contest_lobby_5_003 .byte GOTO - .word bgm_conlobby_5_B1 + .word mus_contest_lobby_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_conlobby_6: - .byte KEYSH , bgm_conlobby_key+0 +mus_contest_lobby_6: + .byte KEYSH , mus_contest_lobby_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 52*bgm_conlobby_mvl/mxv + .byte VOL , 52*mus_contest_lobby_mvl/mxv .byte N03 , En1 , v112 .byte W12 .byte En1 , v060 @@ -821,8 +821,8 @@ bgm_conlobby_6: .byte W03 .byte N03 .byte W03 -bgm_conlobby_6_B1: -bgm_conlobby_6_000: +mus_contest_lobby_6_B1: +mus_contest_lobby_6_000: .byte N03 , En1 , v112 .byte W12 .byte En1 , v060 @@ -856,7 +856,7 @@ bgm_conlobby_6_000: .byte N03 .byte W03 .byte PEND -bgm_conlobby_6_001: +mus_contest_lobby_6_001: .byte N03 , En1 , v112 .byte W12 .byte En1 , v060 @@ -895,12 +895,12 @@ bgm_conlobby_6_001: .byte W03 .byte PEND .byte PATT - .word bgm_conlobby_6_000 + .word mus_contest_lobby_6_000 .byte PATT - .word bgm_conlobby_6_001 + .word mus_contest_lobby_6_001 .byte PATT - .word bgm_conlobby_6_000 -bgm_conlobby_6_002: + .word mus_contest_lobby_6_000 +mus_contest_lobby_6_002: .byte N03 , En1 , v112 .byte W12 .byte En1 , v060 @@ -939,47 +939,47 @@ bgm_conlobby_6_002: .byte W03 .byte PEND .byte PATT - .word bgm_conlobby_6_000 + .word mus_contest_lobby_6_000 .byte PATT - .word bgm_conlobby_6_002 + .word mus_contest_lobby_6_002 .byte PATT - .word bgm_conlobby_6_000 + .word mus_contest_lobby_6_000 .byte PATT - .word bgm_conlobby_6_001 + .word mus_contest_lobby_6_001 .byte PATT - .word bgm_conlobby_6_000 + .word mus_contest_lobby_6_000 .byte PATT - .word bgm_conlobby_6_002 + .word mus_contest_lobby_6_002 .byte PATT - .word bgm_conlobby_6_000 + .word mus_contest_lobby_6_000 .byte PATT - .word bgm_conlobby_6_002 + .word mus_contest_lobby_6_002 .byte PATT - .word bgm_conlobby_6_000 + .word mus_contest_lobby_6_000 .byte PATT - .word bgm_conlobby_6_002 + .word mus_contest_lobby_6_002 .byte GOTO - .word bgm_conlobby_6_B1 + .word mus_contest_lobby_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_conlobby_7: - .byte KEYSH , bgm_conlobby_key+0 +mus_contest_lobby_7: + .byte KEYSH , mus_contest_lobby_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_conlobby_mvl/mxv + .byte VOL , 45*mus_contest_lobby_mvl/mxv .byte PAN , c_v-11 .byte BEND , c_v+1 .byte W96 .byte W84 .byte N12 , Bn1 , v112 .byte W12 -bgm_conlobby_7_B1: -bgm_conlobby_7_000: +mus_contest_lobby_7_B1: +mus_contest_lobby_7_000: .byte N06 , Cn2 , v112 .byte W24 .byte Gn1 @@ -989,7 +989,7 @@ bgm_conlobby_7_000: .byte Gn1 .byte W24 .byte PEND -bgm_conlobby_7_001: +mus_contest_lobby_7_001: .byte N06 , As1 , v112 .byte W24 .byte Fn1 @@ -999,7 +999,7 @@ bgm_conlobby_7_001: .byte Fn1 .byte W24 .byte PEND -bgm_conlobby_7_002: +mus_contest_lobby_7_002: .byte N06 , An1 , v112 .byte W24 .byte En1 @@ -1009,7 +1009,7 @@ bgm_conlobby_7_002: .byte En1 .byte W24 .byte PEND -bgm_conlobby_7_003: +mus_contest_lobby_7_003: .byte N06 , Gs1 , v112 .byte W24 .byte Ds1 @@ -1022,47 +1022,47 @@ bgm_conlobby_7_003: .byte W12 .byte PEND .byte PATT - .word bgm_conlobby_7_000 + .word mus_contest_lobby_7_000 .byte PATT - .word bgm_conlobby_7_001 + .word mus_contest_lobby_7_001 .byte PATT - .word bgm_conlobby_7_002 + .word mus_contest_lobby_7_002 .byte PATT - .word bgm_conlobby_7_003 + .word mus_contest_lobby_7_003 .byte PATT - .word bgm_conlobby_7_000 + .word mus_contest_lobby_7_000 .byte PATT - .word bgm_conlobby_7_001 + .word mus_contest_lobby_7_001 .byte PATT - .word bgm_conlobby_7_002 + .word mus_contest_lobby_7_002 .byte PATT - .word bgm_conlobby_7_003 + .word mus_contest_lobby_7_003 .byte PATT - .word bgm_conlobby_7_000 + .word mus_contest_lobby_7_000 .byte PATT - .word bgm_conlobby_7_001 + .word mus_contest_lobby_7_001 .byte PATT - .word bgm_conlobby_7_002 + .word mus_contest_lobby_7_002 .byte PATT - .word bgm_conlobby_7_003 + .word mus_contest_lobby_7_003 .byte GOTO - .word bgm_conlobby_7_B1 + .word mus_contest_lobby_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_conlobby_8: - .byte KEYSH , bgm_conlobby_key+0 +mus_contest_lobby_8: + .byte KEYSH , mus_contest_lobby_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-14 - .byte VOL , 28*bgm_conlobby_mvl/mxv + .byte VOL , 28*mus_contest_lobby_mvl/mxv .byte W96 .byte W84 .byte N12 , Fs2 , v112 .byte W12 -bgm_conlobby_8_B1: +mus_contest_lobby_8_B1: .byte N06 , Gn2 , v112 .byte W12 .byte N18 @@ -1174,27 +1174,27 @@ bgm_conlobby_8_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_conlobby_8_B1 + .word mus_contest_lobby_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_conlobby: +mus_contest_lobby: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_conlobby_pri @ Priority - .byte bgm_conlobby_rev @ Reverb. + .byte mus_contest_lobby_pri @ Priority + .byte mus_contest_lobby_rev @ Reverb. - .word bgm_conlobby_grp + .word mus_contest_lobby_grp - .word bgm_conlobby_1 - .word bgm_conlobby_2 - .word bgm_conlobby_3 - .word bgm_conlobby_4 - .word bgm_conlobby_5 - .word bgm_conlobby_6 - .word bgm_conlobby_7 - .word bgm_conlobby_8 + .word mus_contest_lobby_1 + .word mus_contest_lobby_2 + .word mus_contest_lobby_3 + .word mus_contest_lobby_4 + .word mus_contest_lobby_5 + .word mus_contest_lobby_6 + .word mus_contest_lobby_7 + .word mus_contest_lobby_8 .end diff --git a/sound/songs/bgm_con_k.s b/sound/songs/mus_contest_results.s index aa73f0c7d..ca5706c34 100644 --- a/sound/songs/bgm_con_k.s +++ b/sound/songs/mus_contest_results.s @@ -1,32 +1,32 @@ .include "MPlayDef.s" - .equ bgm_con_k_grp, voicegroup089 - .equ bgm_con_k_pri, 0 - .equ bgm_con_k_rev, reverb_set+50 - .equ bgm_con_k_mvl, 127 - .equ bgm_con_k_key, 0 - .equ bgm_con_k_tbs, 1 - .equ bgm_con_k_exg, 0 - .equ bgm_con_k_cmp, 1 + .equ mus_contest_results_grp, voicegroup089 + .equ mus_contest_results_pri, 0 + .equ mus_contest_results_rev, reverb_set+50 + .equ mus_contest_results_mvl, 127 + .equ mus_contest_results_key, 0 + .equ mus_contest_results_tbs, 1 + .equ mus_contest_results_exg, 0 + .equ mus_contest_results_cmp, 1 .section .rodata - .global bgm_con_k + .global mus_contest_results .align 2 @********************** Track 1 **********************@ -bgm_con_k_1: - .byte KEYSH , bgm_con_k_key+0 - .byte TEMPO , 128*bgm_con_k_tbs/2 +mus_contest_results_1: + .byte KEYSH , mus_contest_results_key+0 + .byte TEMPO , 128*mus_contest_results_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte PAN , c_v+4 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 46*bgm_con_k_mvl/mxv + .byte VOL , 46*mus_contest_results_mvl/mxv .byte W24 -bgm_con_k_1_B1: -bgm_con_k_1_000: +mus_contest_results_1_B1: +mus_contest_results_1_000: .byte N02 , Gn5 , v112 .byte W08 .byte Gn5 , v064 @@ -52,7 +52,7 @@ bgm_con_k_1_000: .byte N02 .byte W08 .byte PEND -bgm_con_k_1_001: +mus_contest_results_1_001: .byte N02 , Gn5 , v112 .byte W08 .byte Gn5 , v064 @@ -81,32 +81,32 @@ bgm_con_k_1_001: .byte W08 .byte PEND .byte PATT - .word bgm_con_k_1_000 + .word mus_contest_results_1_000 .byte PATT - .word bgm_con_k_1_001 + .word mus_contest_results_1_001 .byte PATT - .word bgm_con_k_1_000 + .word mus_contest_results_1_000 .byte PATT - .word bgm_con_k_1_001 + .word mus_contest_results_1_001 .byte PATT - .word bgm_con_k_1_000 + .word mus_contest_results_1_000 .byte PATT - .word bgm_con_k_1_001 + .word mus_contest_results_1_001 .byte GOTO - .word bgm_con_k_1_B1 + .word mus_contest_results_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_con_k_2: - .byte KEYSH , bgm_con_k_key+0 +mus_contest_results_2: + .byte KEYSH , mus_contest_results_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 57*bgm_con_k_mvl/mxv + .byte VOL , 57*mus_contest_results_mvl/mxv .byte W24 -bgm_con_k_2_B1: +mus_contest_results_2_B1: .byte N20 , Bn3 , v112 .byte W24 .byte N04 , As3 @@ -200,20 +200,20 @@ bgm_con_k_2_B1: .byte N08 .byte W24 .byte GOTO - .word bgm_con_k_2_B1 + .word mus_contest_results_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_con_k_3: - .byte KEYSH , bgm_con_k_key+0 +mus_contest_results_3: + .byte KEYSH , mus_contest_results_key+0 .byte VOICE , 38 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 80*bgm_con_k_mvl/mxv + .byte VOL , 80*mus_contest_results_mvl/mxv .byte BEND , c_v-48 .byte N24 , Bn0 , v112 .byte W04 @@ -223,7 +223,7 @@ bgm_con_k_3: .byte W04 .byte c_v+0 .byte W12 -bgm_con_k_3_B1: +mus_contest_results_3_B1: .byte BEND , c_v+0 .byte N32 , En1 , v112 .byte W32 @@ -235,7 +235,7 @@ bgm_con_k_3_B1: .byte W40 .byte N04 .byte W08 -bgm_con_k_3_000: +mus_contest_results_3_000: .byte N32 , Ds1 , v112 .byte W32 .byte N08 , Dn1 @@ -251,7 +251,7 @@ bgm_con_k_3_000: .byte N04 , Bn0 .byte W08 .byte PEND -bgm_con_k_3_001: +mus_contest_results_3_001: .byte N32 , Cs1 , v112 .byte W32 .byte N04 , Cn1 @@ -267,7 +267,7 @@ bgm_con_k_3_001: .byte Ds1 .byte W08 .byte PEND -bgm_con_k_3_002: +mus_contest_results_3_002: .byte N24 , Bn0 , v112 .byte W24 .byte N08 , As0 @@ -296,27 +296,27 @@ bgm_con_k_3_002: .byte N04 .byte W08 .byte PATT - .word bgm_con_k_3_000 + .word mus_contest_results_3_000 .byte PATT - .word bgm_con_k_3_001 + .word mus_contest_results_3_001 .byte PATT - .word bgm_con_k_3_002 + .word mus_contest_results_3_002 .byte GOTO - .word bgm_con_k_3_B1 + .word mus_contest_results_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_con_k_4: - .byte KEYSH , bgm_con_k_key+0 +mus_contest_results_4: + .byte KEYSH , mus_contest_results_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+2 - .byte VOL , 50*bgm_con_k_mvl/mxv + .byte VOL , 50*mus_contest_results_mvl/mxv .byte N24 , Fs3 , v112 .byte W24 -bgm_con_k_4_B1: +mus_contest_results_4_B1: .byte W16 .byte N08 , Gs4 , v112 .byte W08 @@ -334,32 +334,32 @@ bgm_con_k_4_B1: .byte W24 .byte N48 , Fs4 .byte W24 - .byte VOL , 48*bgm_con_k_mvl/mxv + .byte VOL , 48*mus_contest_results_mvl/mxv .byte MOD , 6 .byte W01 - .byte VOL , 45*bgm_con_k_mvl/mxv + .byte VOL , 45*mus_contest_results_mvl/mxv .byte W03 - .byte 43*bgm_con_k_mvl/mxv + .byte 43*mus_contest_results_mvl/mxv .byte W01 - .byte 37*bgm_con_k_mvl/mxv + .byte 37*mus_contest_results_mvl/mxv .byte W03 - .byte 36*bgm_con_k_mvl/mxv + .byte 36*mus_contest_results_mvl/mxv .byte W01 - .byte 35*bgm_con_k_mvl/mxv + .byte 35*mus_contest_results_mvl/mxv .byte W03 - .byte 28*bgm_con_k_mvl/mxv + .byte 28*mus_contest_results_mvl/mxv .byte W01 - .byte 25*bgm_con_k_mvl/mxv + .byte 25*mus_contest_results_mvl/mxv .byte W03 - .byte 20*bgm_con_k_mvl/mxv + .byte 20*mus_contest_results_mvl/mxv .byte W01 - .byte 18*bgm_con_k_mvl/mxv + .byte 18*mus_contest_results_mvl/mxv .byte W03 - .byte 16*bgm_con_k_mvl/mxv + .byte 16*mus_contest_results_mvl/mxv .byte W01 - .byte 15*bgm_con_k_mvl/mxv + .byte 15*mus_contest_results_mvl/mxv .byte W03 - .byte 49*bgm_con_k_mvl/mxv + .byte 49*mus_contest_results_mvl/mxv .byte MOD , 0 .byte N08 , Bn4 .byte W08 @@ -381,32 +381,32 @@ bgm_con_k_4_B1: .byte N48 , Ds4 .byte W24 .byte MOD , 7 - .byte VOL , 48*bgm_con_k_mvl/mxv + .byte VOL , 48*mus_contest_results_mvl/mxv .byte W01 - .byte 45*bgm_con_k_mvl/mxv + .byte 45*mus_contest_results_mvl/mxv .byte W03 - .byte 43*bgm_con_k_mvl/mxv + .byte 43*mus_contest_results_mvl/mxv .byte W01 - .byte 37*bgm_con_k_mvl/mxv + .byte 37*mus_contest_results_mvl/mxv .byte W03 - .byte 36*bgm_con_k_mvl/mxv + .byte 36*mus_contest_results_mvl/mxv .byte W01 - .byte 35*bgm_con_k_mvl/mxv + .byte 35*mus_contest_results_mvl/mxv .byte W03 - .byte 28*bgm_con_k_mvl/mxv + .byte 28*mus_contest_results_mvl/mxv .byte W01 - .byte 25*bgm_con_k_mvl/mxv + .byte 25*mus_contest_results_mvl/mxv .byte W03 - .byte 20*bgm_con_k_mvl/mxv + .byte 20*mus_contest_results_mvl/mxv .byte W01 - .byte 18*bgm_con_k_mvl/mxv + .byte 18*mus_contest_results_mvl/mxv .byte W03 - .byte 16*bgm_con_k_mvl/mxv + .byte 16*mus_contest_results_mvl/mxv .byte W01 - .byte 15*bgm_con_k_mvl/mxv + .byte 15*mus_contest_results_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 49*bgm_con_k_mvl/mxv + .byte VOL , 49*mus_contest_results_mvl/mxv .byte N08 , Fs4 .byte W08 .byte Fs4 , v032 @@ -467,22 +467,22 @@ bgm_con_k_4_B1: .byte Bn4 , v032 .byte W88 .byte GOTO - .word bgm_con_k_4_B1 + .word mus_contest_results_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_con_k_5: - .byte KEYSH , bgm_con_k_key+0 +mus_contest_results_5: + .byte KEYSH , mus_contest_results_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-62 - .byte VOL , 46*bgm_con_k_mvl/mxv + .byte VOL , 46*mus_contest_results_mvl/mxv .byte W24 -bgm_con_k_5_B1: +mus_contest_results_5_B1: .byte N20 , En3 , v112 .byte W24 .byte N04 @@ -493,7 +493,7 @@ bgm_con_k_5_B1: .byte W24 .byte N08 .byte W24 -bgm_con_k_5_000: +mus_contest_results_5_000: .byte N08 , As2 , v112 .byte W24 .byte N08 @@ -503,7 +503,7 @@ bgm_con_k_5_000: .byte N08 .byte W24 .byte PEND -bgm_con_k_5_001: +mus_contest_results_5_001: .byte N08 , Gs2 , v112 .byte W24 .byte N08 @@ -513,7 +513,7 @@ bgm_con_k_5_001: .byte N08 .byte W24 .byte PEND -bgm_con_k_5_002: +mus_contest_results_5_002: .byte N24 , An2 , v112 .byte W24 .byte N08 , Gs2 @@ -538,28 +538,28 @@ bgm_con_k_5_002: .byte N08 .byte W24 .byte PATT - .word bgm_con_k_5_000 + .word mus_contest_results_5_000 .byte PATT - .word bgm_con_k_5_001 + .word mus_contest_results_5_001 .byte PATT - .word bgm_con_k_5_002 + .word mus_contest_results_5_002 .byte GOTO - .word bgm_con_k_5_B1 + .word mus_contest_results_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_con_k_6: - .byte KEYSH , bgm_con_k_key+0 +mus_contest_results_6: + .byte KEYSH , mus_contest_results_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 45*bgm_con_k_mvl/mxv + .byte VOL , 45*mus_contest_results_mvl/mxv .byte W24 -bgm_con_k_6_B1: +mus_contest_results_6_B1: .byte N20 , Gs3 , v112 .byte W24 .byte N04 @@ -570,7 +570,7 @@ bgm_con_k_6_B1: .byte W24 .byte Gs3 .byte W24 -bgm_con_k_6_000: +mus_contest_results_6_000: .byte N08 , Cs3 , v112 .byte W24 .byte N08 @@ -580,7 +580,7 @@ bgm_con_k_6_000: .byte N08 .byte W24 .byte PEND -bgm_con_k_6_001: +mus_contest_results_6_001: .byte N08 , Bn2 , v112 .byte W24 .byte N08 @@ -590,7 +590,7 @@ bgm_con_k_6_001: .byte N08 .byte W24 .byte PEND -bgm_con_k_6_002: +mus_contest_results_6_002: .byte N24 , Cs3 , v112 .byte W24 .byte N08 @@ -614,21 +614,21 @@ bgm_con_k_6_002: .byte Gs3 .byte W24 .byte PATT - .word bgm_con_k_6_000 + .word mus_contest_results_6_000 .byte PATT - .word bgm_con_k_6_001 + .word mus_contest_results_6_001 .byte PATT - .word bgm_con_k_6_002 + .word mus_contest_results_6_002 .byte GOTO - .word bgm_con_k_6_B1 + .word mus_contest_results_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_con_k_7: - .byte KEYSH , bgm_con_k_key+0 +mus_contest_results_7: + .byte KEYSH , mus_contest_results_key+0 .byte VOICE , 0 - .byte VOL , 70*bgm_con_k_mvl/mxv + .byte VOL , 70*mus_contest_results_mvl/mxv .byte PAN , c_v+0 .byte N04 , Dn1 , v112 .byte W08 @@ -636,8 +636,8 @@ bgm_con_k_7: .byte W08 .byte Cn1 .byte W08 -bgm_con_k_7_B1: -bgm_con_k_7_000: +mus_contest_results_7_B1: +mus_contest_results_7_000: .byte N04 , Cn1 , v112 .byte W24 .byte Dn1 @@ -651,7 +651,7 @@ bgm_con_k_7_000: .byte Dn1 .byte W24 .byte PEND -bgm_con_k_7_001: +mus_contest_results_7_001: .byte N04 , Cn1 , v112 .byte W24 .byte Dn1 @@ -670,7 +670,7 @@ bgm_con_k_7_001: .byte W08 .byte PEND .byte PATT - .word bgm_con_k_7_000 + .word mus_contest_results_7_000 .byte N04 , Cn1 , v112 .byte W24 .byte Dn1 @@ -688,11 +688,11 @@ bgm_con_k_7_001: .byte Dn1 .byte W08 .byte PATT - .word bgm_con_k_7_000 + .word mus_contest_results_7_000 .byte PATT - .word bgm_con_k_7_001 + .word mus_contest_results_7_001 .byte PATT - .word bgm_con_k_7_000 + .word mus_contest_results_7_000 .byte N04 , Cn1 , v112 .byte W24 .byte Dn1 @@ -710,22 +710,22 @@ bgm_con_k_7_001: .byte N04 .byte W08 .byte GOTO - .word bgm_con_k_7_B1 + .word mus_contest_results_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_con_k_8: - .byte KEYSH , bgm_con_k_key+0 +mus_contest_results_8: + .byte KEYSH , mus_contest_results_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 34*bgm_con_k_mvl/mxv + .byte VOL , 34*mus_contest_results_mvl/mxv .byte W24 -bgm_con_k_8_B1: +mus_contest_results_8_B1: .byte W16 .byte N08 , Gs4 , v112 .byte W08 @@ -798,27 +798,27 @@ bgm_con_k_8_B1: .byte N08 , Bn4 .byte W96 .byte GOTO - .word bgm_con_k_8_B1 + .word mus_contest_results_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_con_k: +mus_contest_results: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_con_k_pri @ Priority - .byte bgm_con_k_rev @ Reverb. + .byte mus_contest_results_pri @ Priority + .byte mus_contest_results_rev @ Reverb. - .word bgm_con_k_grp + .word mus_contest_results_grp - .word bgm_con_k_1 - .word bgm_con_k_2 - .word bgm_con_k_3 - .word bgm_con_k_4 - .word bgm_con_k_5 - .word bgm_con_k_6 - .word bgm_con_k_7 - .word bgm_con_k_8 + .word mus_contest_results_1 + .word mus_contest_results_2 + .word mus_contest_results_3 + .word mus_contest_results_4 + .word mus_contest_results_5 + .word mus_contest_results_6 + .word mus_contest_results_7 + .word mus_contest_results_8 .end diff --git a/sound/songs/bgm_con_fan.s b/sound/songs/mus_contest_winner.s index 279d778f0..7303e9bea 100644 --- a/sound/songs/bgm_con_fan.s +++ b/sound/songs/mus_contest_winner.s @@ -1,35 +1,35 @@ .include "MPlayDef.s" - .equ bgm_con_fan_grp, voicegroup082 - .equ bgm_con_fan_pri, 0 - .equ bgm_con_fan_rev, reverb_set+50 - .equ bgm_con_fan_mvl, 127 - .equ bgm_con_fan_key, 0 - .equ bgm_con_fan_tbs, 1 - .equ bgm_con_fan_exg, 0 - .equ bgm_con_fan_cmp, 1 + .equ mus_contest_winner_grp, voicegroup082 + .equ mus_contest_winner_pri, 0 + .equ mus_contest_winner_rev, reverb_set+50 + .equ mus_contest_winner_mvl, 127 + .equ mus_contest_winner_key, 0 + .equ mus_contest_winner_tbs, 1 + .equ mus_contest_winner_exg, 0 + .equ mus_contest_winner_cmp, 1 .section .rodata - .global bgm_con_fan + .global mus_contest_winner .align 2 @********************** Track 1 **********************@ -bgm_con_fan_1: - .byte KEYSH , bgm_con_fan_key+0 - .byte TEMPO , 148*bgm_con_fan_tbs/2 +mus_contest_winner_1: + .byte KEYSH , mus_contest_winner_key+0 + .byte TEMPO , 148*mus_contest_winner_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 79*bgm_con_fan_mvl/mxv + .byte VOL , 79*mus_contest_winner_mvl/mxv .byte W12 .byte W96 .byte W96 .byte W96 .byte W96 -bgm_con_fan_1_B1: -bgm_con_fan_1_000: +mus_contest_winner_1_B1: +mus_contest_winner_1_000: .byte N02 , Gn5 , v076 .byte W08 .byte Gn5 , v036 @@ -56,9 +56,9 @@ bgm_con_fan_1_000: .byte W08 .byte PEND .byte PATT - .word bgm_con_fan_1_000 + .word mus_contest_winner_1_000 .byte PATT - .word bgm_con_fan_1_000 + .word mus_contest_winner_1_000 .byte N02 , Gn5 , v076 .byte W08 .byte Gn5 , v036 @@ -84,18 +84,18 @@ bgm_con_fan_1_000: .byte Gn5 , v056 .byte W08 .byte GOTO - .word bgm_con_fan_1_B1 + .word mus_contest_winner_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_con_fan_2: - .byte KEYSH , bgm_con_fan_key+0 +mus_contest_winner_2: + .byte KEYSH , mus_contest_winner_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-1 - .byte VOL , 100*bgm_con_fan_mvl/mxv + .byte VOL , 100*mus_contest_winner_mvl/mxv .byte W12 .byte N06 , Fn3 , v088 .byte W12 @@ -185,10 +185,10 @@ bgm_con_fan_2: .byte W08 .byte En4 .byte W08 -bgm_con_fan_2_B1: +mus_contest_winner_2_B1: .byte VOICE , 24 .byte PAN , c_v+16 - .byte VOL , 94*bgm_con_fan_mvl/mxv + .byte VOL , 94*mus_contest_winner_mvl/mxv .byte N04 , Fs4 , v052 .byte W08 .byte Gn4 @@ -213,17 +213,17 @@ bgm_con_fan_2_B1: .byte N36 , An5 , v032 .byte W12 .byte MOD , 5 - .byte VOL , 94*bgm_con_fan_mvl/mxv + .byte VOL , 94*mus_contest_winner_mvl/mxv .byte W04 - .byte 88*bgm_con_fan_mvl/mxv + .byte 88*mus_contest_winner_mvl/mxv .byte W04 - .byte 81*bgm_con_fan_mvl/mxv + .byte 81*mus_contest_winner_mvl/mxv .byte W04 - .byte 77*bgm_con_fan_mvl/mxv + .byte 77*mus_contest_winner_mvl/mxv .byte W04 - .byte 74*bgm_con_fan_mvl/mxv + .byte 74*mus_contest_winner_mvl/mxv .byte W04 - .byte 94*bgm_con_fan_mvl/mxv + .byte 94*mus_contest_winner_mvl/mxv .byte W04 .byte MOD , 0 .byte N04 , Bn5 @@ -233,21 +233,21 @@ bgm_con_fan_2_B1: .byte N48 , Gn5 .byte W24 .byte MOD , 5 - .byte VOL , 90*bgm_con_fan_mvl/mxv + .byte VOL , 90*mus_contest_winner_mvl/mxv .byte W04 - .byte 88*bgm_con_fan_mvl/mxv + .byte 88*mus_contest_winner_mvl/mxv .byte W04 - .byte 83*bgm_con_fan_mvl/mxv + .byte 83*mus_contest_winner_mvl/mxv .byte W04 - .byte 77*bgm_con_fan_mvl/mxv + .byte 77*mus_contest_winner_mvl/mxv .byte W04 - .byte 74*bgm_con_fan_mvl/mxv + .byte 74*mus_contest_winner_mvl/mxv .byte W04 - .byte 71*bgm_con_fan_mvl/mxv + .byte 71*mus_contest_winner_mvl/mxv .byte W04 .byte VOICE , 24 .byte MOD , 0 - .byte VOL , 94*bgm_con_fan_mvl/mxv + .byte VOL , 94*mus_contest_winner_mvl/mxv .byte N04 , En4 , v052 .byte W08 .byte Fn4 @@ -272,20 +272,20 @@ bgm_con_fan_2_B1: .byte N36 , Dn5 .byte W12 .byte MOD , 5 - .byte VOL , 89*bgm_con_fan_mvl/mxv + .byte VOL , 89*mus_contest_winner_mvl/mxv .byte W04 - .byte 86*bgm_con_fan_mvl/mxv + .byte 86*mus_contest_winner_mvl/mxv .byte W04 - .byte 83*bgm_con_fan_mvl/mxv + .byte 83*mus_contest_winner_mvl/mxv .byte W04 - .byte 78*bgm_con_fan_mvl/mxv + .byte 78*mus_contest_winner_mvl/mxv .byte W04 - .byte 75*bgm_con_fan_mvl/mxv + .byte 75*mus_contest_winner_mvl/mxv .byte W04 - .byte 74*bgm_con_fan_mvl/mxv + .byte 74*mus_contest_winner_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 94*bgm_con_fan_mvl/mxv + .byte VOL , 94*mus_contest_winner_mvl/mxv .byte N04 , Cs5 .byte W04 .byte N08 , Dn5 @@ -297,18 +297,18 @@ bgm_con_fan_2_B1: .byte N04 , As5 .byte W08 .byte GOTO - .word bgm_con_fan_2_B1 + .word mus_contest_winner_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_con_fan_3: - .byte KEYSH , bgm_con_fan_key+0 +mus_contest_winner_3: + .byte KEYSH , mus_contest_winner_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 100*bgm_con_fan_mvl/mxv + .byte VOL , 100*mus_contest_winner_mvl/mxv .byte N04 , Cn2 , v064 .byte W04 .byte N04 @@ -379,25 +379,25 @@ bgm_con_fan_3: .byte W08 .byte An1 .byte W08 -bgm_con_fan_3_B1: +mus_contest_winner_3_B1: .byte W96 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_con_fan_3_B1 + .word mus_contest_winner_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_con_fan_4: - .byte KEYSH , bgm_con_fan_key+0 +mus_contest_winner_4: + .byte KEYSH , mus_contest_winner_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 100*bgm_con_fan_mvl/mxv + .byte VOL , 100*mus_contest_winner_mvl/mxv .byte PAN , c_v+63 .byte N02 , Fn4 , v040 .byte W04 @@ -488,9 +488,9 @@ bgm_con_fan_4: .byte W08 .byte An3 .byte W08 -bgm_con_fan_4_B1: +mus_contest_winner_4_B1: .byte PAN , c_v-64 - .byte VOL , 69*bgm_con_fan_mvl/mxv + .byte VOL , 69*mus_contest_winner_mvl/mxv .byte N04 , Fs4 , v040 .byte W08 .byte Gn4 @@ -595,20 +595,20 @@ bgm_con_fan_4_B1: .byte En5 .byte W08 .byte GOTO - .word bgm_con_fan_4_B1 + .word mus_contest_winner_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_con_fan_5: - .byte KEYSH , bgm_con_fan_key+0 +mus_contest_winner_5: + .byte KEYSH , mus_contest_winner_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 96*bgm_con_fan_mvl/mxv + .byte VOL , 96*mus_contest_winner_mvl/mxv .byte N02 , Cn2 , v064 .byte W04 .byte N02 @@ -673,8 +673,8 @@ bgm_con_fan_5: .byte W08 .byte Cs2 .byte W08 -bgm_con_fan_5_B1: - .byte VOL , 88*bgm_con_fan_mvl/mxv +mus_contest_winner_5_B1: + .byte VOL , 88*mus_contest_winner_mvl/mxv .byte N08 , Dn2 , v072 .byte W16 .byte N04 , Dn2 , v056 @@ -748,16 +748,16 @@ bgm_con_fan_5_B1: .byte N04 , Cn2 .byte W08 .byte GOTO - .word bgm_con_fan_5_B1 + .word mus_contest_winner_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_con_fan_6: - .byte KEYSH , bgm_con_fan_key+0 +mus_contest_winner_6: + .byte KEYSH , mus_contest_winner_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 100*bgm_con_fan_mvl/mxv + .byte VOL , 100*mus_contest_winner_mvl/mxv .byte W12 .byte N48 , An2 , v048 .byte W96 @@ -773,8 +773,8 @@ bgm_con_fan_6: .byte W24 .byte N48 , An2 , v064 .byte W96 -bgm_con_fan_6_B1: - .byte VOL , 77*bgm_con_fan_mvl/mxv +mus_contest_winner_6_B1: + .byte VOL , 77*mus_contest_winner_mvl/mxv .byte N04 , Cn1 , v096 .byte N48 , An2 .byte W16 @@ -794,7 +794,7 @@ bgm_con_fan_6_B1: .byte W16 .byte En1 , v080 .byte W08 -bgm_con_fan_6_000: +mus_contest_winner_6_000: .byte N04 , Cn1 , v096 .byte W16 .byte Cn1 , v080 @@ -815,7 +815,7 @@ bgm_con_fan_6_000: .byte W08 .byte PEND .byte PATT - .word bgm_con_fan_6_000 + .word mus_contest_winner_6_000 .byte N04 , Cn1 , v096 .byte W08 .byte En1 , v080 @@ -839,19 +839,19 @@ bgm_con_fan_6_000: .byte En1 , v096 .byte W08 .byte GOTO - .word bgm_con_fan_6_B1 + .word mus_contest_winner_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_con_fan_7: - .byte KEYSH , bgm_con_fan_key+0 +mus_contest_winner_7: + .byte KEYSH , mus_contest_winner_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 100*bgm_con_fan_mvl/mxv + .byte VOL , 100*mus_contest_winner_mvl/mxv .byte PAN , c_v-62 .byte N02 , An3 , v064 .byte W04 @@ -942,9 +942,9 @@ bgm_con_fan_7: .byte W08 .byte Cs3 .byte W08 -bgm_con_fan_7_B1: +mus_contest_winner_7_B1: .byte PAN , c_v+0 - .byte VOL , 75*bgm_con_fan_mvl/mxv + .byte VOL , 75*mus_contest_winner_mvl/mxv .byte N04 , Fs3 , v052 .byte W08 .byte N12 , An3 @@ -1021,18 +1021,18 @@ bgm_con_fan_7_B1: .byte N04 , Cn5 .byte W08 .byte GOTO - .word bgm_con_fan_7_B1 + .word mus_contest_winner_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_con_fan_8: - .byte KEYSH , bgm_con_fan_key+0 +mus_contest_winner_8: + .byte KEYSH , mus_contest_winner_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-16 - .byte VOL , 100*bgm_con_fan_mvl/mxv + .byte VOL , 100*mus_contest_winner_mvl/mxv .byte W12 .byte N06 , An2 , v064 .byte W12 @@ -1122,9 +1122,9 @@ bgm_con_fan_8: .byte W08 .byte An3 .byte W08 -bgm_con_fan_8_B1: +mus_contest_winner_8_B1: .byte VOICE , 24 - .byte VOL , 93*bgm_con_fan_mvl/mxv + .byte VOL , 93*mus_contest_winner_mvl/mxv .byte N04 , Dn4 , v052 .byte W08 .byte En4 @@ -1189,27 +1189,27 @@ bgm_con_fan_8_B1: .byte N04 , En5 .byte W08 .byte GOTO - .word bgm_con_fan_8_B1 + .word mus_contest_winner_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_con_fan: +mus_contest_winner: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_con_fan_pri @ Priority - .byte bgm_con_fan_rev @ Reverb. + .byte mus_contest_winner_pri @ Priority + .byte mus_contest_winner_rev @ Reverb. - .word bgm_con_fan_grp + .word mus_contest_winner_grp - .word bgm_con_fan_1 - .word bgm_con_fan_2 - .word bgm_con_fan_3 - .word bgm_con_fan_4 - .word bgm_con_fan_5 - .word bgm_con_fan_6 - .word bgm_con_fan_7 - .word bgm_con_fan_8 + .word mus_contest_winner_1 + .word mus_contest_winner_2 + .word mus_contest_winner_3 + .word mus_contest_winner_4 + .word mus_contest_winner_5 + .word mus_contest_winner_6 + .word mus_contest_winner_7 + .word mus_contest_winner_8 .end diff --git a/sound/songs/bgm_thankfor.s b/sound/songs/mus_credits.s index f79b556bf..a0e770afe 100644 --- a/sound/songs/bgm_thankfor.s +++ b/sound/songs/mus_credits.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_thankfor_grp, voicegroup098 - .equ bgm_thankfor_pri, 0 - .equ bgm_thankfor_rev, reverb_set+50 - .equ bgm_thankfor_mvl, 127 - .equ bgm_thankfor_key, 0 - .equ bgm_thankfor_tbs, 1 - .equ bgm_thankfor_exg, 0 - .equ bgm_thankfor_cmp, 1 + .equ mus_credits_grp, voicegroup098 + .equ mus_credits_pri, 0 + .equ mus_credits_rev, reverb_set+50 + .equ mus_credits_mvl, 127 + .equ mus_credits_key, 0 + .equ mus_credits_tbs, 1 + .equ mus_credits_exg, 0 + .equ mus_credits_cmp, 1 .section .rodata - .global bgm_thankfor + .global mus_credits .align 2 @********************** Track 1 **********************@ -bgm_thankfor_1: - .byte KEYSH , bgm_thankfor_key+0 - .byte TEMPO , 94*bgm_thankfor_tbs/2 +mus_credits_1: + .byte KEYSH , mus_credits_key+0 + .byte TEMPO , 94*mus_credits_tbs/2 .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 88*bgm_thankfor_mvl/mxv + .byte VOL , 88*mus_credits_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+0 .byte W24 @@ -31,19 +31,19 @@ bgm_thankfor_1: .byte W24 .byte Bn2 .byte W18 - .byte VOL , 77*bgm_thankfor_mvl/mxv + .byte VOL , 77*mus_credits_mvl/mxv .byte W06 .byte N24 , Cn3 , v076 .byte W24 .byte Bn2 , v084 .byte W24 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte An2 , v092 .byte W24 - .byte TEMPO , 84*bgm_thankfor_tbs/2 + .byte TEMPO , 84*mus_credits_tbs/2 .byte Bn2 , v104 .byte W24 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte W24 .byte Bn2 , v088 .byte W24 @@ -51,22 +51,22 @@ bgm_thankfor_1: .byte W24 .byte Bn2 .byte W24 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte N30 , Gn3 , v064 .byte W36 .byte N12 , Gn3 , v088 .byte W12 - .byte TEMPO , 84*bgm_thankfor_tbs/2 + .byte TEMPO , 84*mus_credits_tbs/2 .byte Dn4 , v064 .byte W12 .byte Cn4 , v072 .byte W12 - .byte TEMPO , 76*bgm_thankfor_tbs/2 + .byte TEMPO , 76*mus_credits_tbs/2 .byte Bn3 .byte W12 .byte An3 , v064 .byte W12 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte N96 , Bn3 , v096 .byte W96 .byte N24 , An3 , v076 @@ -103,10 +103,10 @@ bgm_thankfor_1: .byte W03 .byte N96 , Cn4 , v112 .byte W96 - .byte TEMPO , 90*bgm_thankfor_tbs/2 - .byte VOL , 31*bgm_thankfor_mvl/mxv + .byte TEMPO , 90*mus_credits_tbs/2 + .byte VOL , 31*mus_credits_mvl/mxv .byte W48 - .byte TEMPO , 82*bgm_thankfor_tbs/2 + .byte TEMPO , 82*mus_credits_tbs/2 .byte N12 , Dn5 .byte W12 .byte N18 , Cn5 , v096 @@ -117,7 +117,7 @@ bgm_thankfor_1: .byte W06 .byte Gn4 .byte W06 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte N36 , Bn4 , v112 .byte W36 .byte N06 , As4 , v080 @@ -261,17 +261,17 @@ bgm_thankfor_1: .byte W06 .byte Fs5 .byte W06 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte N24 , Dn5 , v096 .byte W24 - .byte TEMPO , 80*bgm_thankfor_tbs/2 + .byte TEMPO , 80*mus_credits_tbs/2 .byte N12 , Bn4 , v088 .byte W12 .byte N06 , Cn5 , v080 .byte W06 .byte Dn5 , v088 .byte W06 - .byte TEMPO , 92*bgm_thankfor_tbs/2 + .byte TEMPO , 92*mus_credits_tbs/2 .byte PAN , c_v+32 .byte N06 , Gn5 , v044 .byte W06 @@ -282,7 +282,7 @@ bgm_thankfor_1: .byte W06 .byte Gn5 .byte W06 - .byte TEMPO , 86*bgm_thankfor_tbs/2 + .byte TEMPO , 86*mus_credits_tbs/2 .byte PAN , c_v+8 .byte N06 , En5 .byte W06 @@ -292,7 +292,7 @@ bgm_thankfor_1: .byte W06 .byte En5 , v032 .byte W06 - .byte TEMPO , 80*bgm_thankfor_tbs/2 + .byte TEMPO , 80*mus_credits_tbs/2 .byte PAN , c_v-8 .byte N06 , Cn5 .byte W06 @@ -303,7 +303,7 @@ bgm_thankfor_1: .byte W06 .byte Cn5 .byte W06 - .byte TEMPO , 68*bgm_thankfor_tbs/2 + .byte TEMPO , 68*mus_credits_tbs/2 .byte PAN , c_v-25 .byte N06 , An4 .byte W06 @@ -313,7 +313,7 @@ bgm_thankfor_1: .byte W06 .byte An4 .byte W06 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte PAN , c_v+5 .byte N30 , Bn3 , v112 .byte W30 @@ -323,13 +323,13 @@ bgm_thankfor_1: .byte W06 .byte N36 , Bn3 , v104 .byte W24 - .byte TEMPO , 92*bgm_thankfor_tbs/2 + .byte TEMPO , 92*mus_credits_tbs/2 .byte W12 .byte N06 , Cn4 , v088 .byte W06 .byte Dn4 , v100 .byte W06 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte N12 , Fn4 , v104 .byte W12 .byte En4 , v092 @@ -338,16 +338,16 @@ bgm_thankfor_1: .byte W12 .byte En4 , v092 .byte W12 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte N30 , Bn3 , v096 .byte W24 - .byte TEMPO , 84*bgm_thankfor_tbs/2 + .byte TEMPO , 84*mus_credits_tbs/2 .byte W06 .byte N12 , Cn4 , v092 .byte W12 .byte N06 , Dn4 , v100 .byte W06 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte N30 , Cn4 , v112 .byte W30 .byte N12 , Dn4 , v104 @@ -368,12 +368,12 @@ bgm_thankfor_1: .byte W12 .byte Fs4 , v092 .byte W12 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte Dn4 , v096 .byte W12 .byte Cn4 , v112 .byte W12 - .byte TEMPO , 78*bgm_thankfor_tbs/2 + .byte TEMPO , 78*mus_credits_tbs/2 .byte W06 .byte N06 , Bn3 , v100 .byte W06 @@ -381,7 +381,7 @@ bgm_thankfor_1: .byte W06 .byte Gn3 .byte W06 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte N30 , Bn4 .byte W30 .byte N12 , Cn5 , v104 @@ -402,16 +402,16 @@ bgm_thankfor_1: .byte W12 .byte En5 , v092 .byte W12 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte N30 , Bn4 , v096 .byte W24 - .byte TEMPO , 82*bgm_thankfor_tbs/2 + .byte TEMPO , 82*mus_credits_tbs/2 .byte W06 .byte N12 , Cn5 , v092 .byte W12 .byte N06 , Dn5 , v100 .byte W06 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte N12 , Cn5 , v112 .byte W12 .byte En4 , v084 @@ -435,13 +435,13 @@ bgm_thankfor_1: .byte BEND , c_v+0 .byte N72 , Gn4 , v096 .byte W36 - .byte TEMPO , 92*bgm_thankfor_tbs/2 + .byte TEMPO , 92*mus_credits_tbs/2 .byte W12 - .byte TEMPO , 86*bgm_thankfor_tbs/2 + .byte TEMPO , 86*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 76*bgm_thankfor_tbs/2 + .byte TEMPO , 76*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte W96 .byte W96 .byte W96 @@ -449,11 +449,11 @@ bgm_thankfor_1: .byte W96 .byte W96 .byte W96 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte W48 - .byte TEMPO , 82*bgm_thankfor_tbs/2 + .byte TEMPO , 82*mus_credits_tbs/2 .byte W48 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte W96 .byte W96 .byte W96 @@ -461,53 +461,53 @@ bgm_thankfor_1: .byte W96 .byte W96 .byte W48 - .byte TEMPO , 88*bgm_thankfor_tbs/2 + .byte TEMPO , 88*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 64*bgm_thankfor_tbs/2 + .byte TEMPO , 64*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 88*bgm_thankfor_tbs/2 + .byte TEMPO , 88*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 82*bgm_thankfor_tbs/2 + .byte TEMPO , 82*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 70*bgm_thankfor_tbs/2 + .byte TEMPO , 70*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 64*bgm_thankfor_tbs/2 + .byte TEMPO , 64*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte W72 - .byte TEMPO , 86*bgm_thankfor_tbs/2 + .byte TEMPO , 86*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte W48 - .byte TEMPO , 86*bgm_thankfor_tbs/2 + .byte TEMPO , 86*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 82*bgm_thankfor_tbs/2 + .byte TEMPO , 82*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte W96 .byte W48 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 78*bgm_thankfor_tbs/2 + .byte TEMPO , 78*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte W96 .byte W48 - .byte TEMPO , 90*bgm_thankfor_tbs/2 + .byte TEMPO , 90*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 82*bgm_thankfor_tbs/2 + .byte TEMPO , 82*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 92*bgm_thankfor_tbs/2 + .byte TEMPO , 92*mus_credits_tbs/2 .byte W48 - .byte TEMPO , 88*bgm_thankfor_tbs/2 + .byte TEMPO , 88*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 74*bgm_thankfor_tbs/2 + .byte TEMPO , 74*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 92*bgm_thankfor_tbs/2 + .byte TEMPO , 92*mus_credits_tbs/2 .byte W72 - .byte TEMPO , 82*bgm_thankfor_tbs/2 + .byte TEMPO , 82*mus_credits_tbs/2 .byte W24 - .byte TEMPO , 94*bgm_thankfor_tbs/2 + .byte TEMPO , 94*mus_credits_tbs/2 .byte W96 .byte W96 .byte W96 @@ -519,9 +519,9 @@ bgm_thankfor_1: .byte W96 .byte W96 .byte W96 - .byte TEMPO , 82*bgm_thankfor_tbs/2 + .byte TEMPO , 82*mus_credits_tbs/2 .byte W96 - .byte TEMPO , 182*bgm_thankfor_tbs/2 + .byte TEMPO , 182*mus_credits_tbs/2 .byte W96 .byte W96 .byte W96 @@ -529,12 +529,12 @@ bgm_thankfor_1: @********************** Track 2 **********************@ -bgm_thankfor_2: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_2: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 100*bgm_thankfor_mvl/mxv + .byte VOL , 100*mus_credits_mvl/mxv .byte PAN , c_v+0 .byte W24 .byte N24 , Bn2 , v088 @@ -606,7 +606,7 @@ bgm_thankfor_2: .byte W03 .byte N96 , Cn4 , v092 .byte W96 - .byte VOL , 78*bgm_thankfor_mvl/mxv + .byte VOL , 78*mus_credits_mvl/mxv .byte W48 .byte N12 , Dn5 , v112 .byte W12 @@ -807,7 +807,7 @@ bgm_thankfor_2: .byte W06 .byte An4 .byte W06 - .byte VOL , 98*bgm_thankfor_mvl/mxv + .byte VOL , 98*mus_credits_mvl/mxv .byte PAN , c_v+0 .byte N30 , Bn3 , v088 .byte W30 @@ -865,7 +865,7 @@ bgm_thankfor_2: .byte W06 .byte Gn3 .byte W06 - .byte VOL , 78*bgm_thankfor_mvl/mxv + .byte VOL , 78*mus_credits_mvl/mxv .byte N30 , Bn4 .byte W30 .byte N12 , Cn5 , v104 @@ -924,7 +924,7 @@ bgm_thankfor_2: .byte VOICE , 73 .byte W96 .byte PAN , c_v-29 - .byte VOL , 29*bgm_thankfor_mvl/mxv + .byte VOL , 29*mus_credits_mvl/mxv .byte N06 , Gn5 , v112 .byte W06 .byte Dn5 @@ -1199,7 +1199,7 @@ bgm_thankfor_2: .byte W04 .byte VOICE , 56 .byte PAN , c_v-38 - .byte VOL , 48*bgm_thankfor_mvl/mxv + .byte VOL , 48*mus_credits_mvl/mxv .byte N32 , Dn4 , v112 .byte W12 .byte MOD , 8 @@ -1255,7 +1255,7 @@ bgm_thankfor_2: .byte Dn4 .byte W06 .byte VOICE , 60 - .byte VOL , 59*bgm_thankfor_mvl/mxv + .byte VOL , 59*mus_credits_mvl/mxv .byte PAN , c_v-41 .byte N30 , An3 .byte W30 @@ -1294,7 +1294,7 @@ bgm_thankfor_2: .byte W12 .byte Fs3 .byte W12 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte N12 , Gn3 .byte W12 .byte An3 @@ -1323,7 +1323,7 @@ bgm_thankfor_2: .byte N30 , En4 .byte W48 .byte PAN , c_v+42 - .byte VOL , 44*bgm_thankfor_mvl/mxv + .byte VOL , 44*mus_credits_mvl/mxv .byte N12 , An4 .byte W12 .byte Cn4 @@ -1347,7 +1347,7 @@ bgm_thankfor_2: .byte Cn4 .byte W06 .byte PAN , c_v-41 - .byte VOL , 59*bgm_thankfor_mvl/mxv + .byte VOL , 59*mus_credits_mvl/mxv .byte N24 , Gn4 .byte W24 .byte An4 @@ -1370,27 +1370,27 @@ bgm_thankfor_2: .byte W06 .byte N60 , En5 .byte W24 - .byte VOL , 58*bgm_thankfor_mvl/mxv + .byte VOL , 58*mus_credits_mvl/mxv .byte W02 - .byte 55*bgm_thankfor_mvl/mxv + .byte 55*mus_credits_mvl/mxv .byte W03 - .byte 53*bgm_thankfor_mvl/mxv + .byte 53*mus_credits_mvl/mxv .byte W03 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W04 - .byte 49*bgm_thankfor_mvl/mxv + .byte 49*mus_credits_mvl/mxv .byte W02 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W03 - .byte 43*bgm_thankfor_mvl/mxv + .byte 43*mus_credits_mvl/mxv .byte W03 - .byte 39*bgm_thankfor_mvl/mxv + .byte 39*mus_credits_mvl/mxv .byte W04 - .byte 38*bgm_thankfor_mvl/mxv + .byte 38*mus_credits_mvl/mxv .byte W02 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W10 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte N12 , Gn4 .byte W12 .byte N06 , Dn5 @@ -1403,29 +1403,29 @@ bgm_thankfor_2: .byte W06 .byte N60 , En5 .byte W24 - .byte VOL , 59*bgm_thankfor_mvl/mxv + .byte VOL , 59*mus_credits_mvl/mxv .byte W02 - .byte 57*bgm_thankfor_mvl/mxv + .byte 57*mus_credits_mvl/mxv .byte W03 - .byte 55*bgm_thankfor_mvl/mxv + .byte 55*mus_credits_mvl/mxv .byte W03 - .byte 51*bgm_thankfor_mvl/mxv + .byte 51*mus_credits_mvl/mxv .byte W04 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W02 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W03 - .byte 46*bgm_thankfor_mvl/mxv + .byte 46*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W04 - .byte 42*bgm_thankfor_mvl/mxv + .byte 42*mus_credits_mvl/mxv .byte W02 - .byte 39*bgm_thankfor_mvl/mxv + .byte 39*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W07 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte N06 , Dn5 .byte W06 .byte En5 @@ -1446,23 +1446,23 @@ bgm_thankfor_2: .byte W06 .byte N48 , Dn5 , v112 .byte W24 - .byte VOL , 59*bgm_thankfor_mvl/mxv + .byte VOL , 59*mus_credits_mvl/mxv .byte W02 - .byte 55*bgm_thankfor_mvl/mxv + .byte 55*mus_credits_mvl/mxv .byte W03 - .byte 53*bgm_thankfor_mvl/mxv + .byte 53*mus_credits_mvl/mxv .byte W03 - .byte 51*bgm_thankfor_mvl/mxv + .byte 51*mus_credits_mvl/mxv .byte W04 - .byte 49*bgm_thankfor_mvl/mxv + .byte 49*mus_credits_mvl/mxv .byte W02 - .byte 46*bgm_thankfor_mvl/mxv + .byte 46*mus_credits_mvl/mxv .byte W03 - .byte 43*bgm_thankfor_mvl/mxv + .byte 43*mus_credits_mvl/mxv .byte W03 - .byte 42*bgm_thankfor_mvl/mxv + .byte 42*mus_credits_mvl/mxv .byte W04 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte N24 , Cs5 .byte W24 .byte As4 @@ -1479,29 +1479,29 @@ bgm_thankfor_2: .byte W06 .byte N60 , Fn5 .byte W24 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte W02 - .byte 55*bgm_thankfor_mvl/mxv + .byte 55*mus_credits_mvl/mxv .byte W03 - .byte 51*bgm_thankfor_mvl/mxv + .byte 51*mus_credits_mvl/mxv .byte W03 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W04 - .byte 49*bgm_thankfor_mvl/mxv + .byte 49*mus_credits_mvl/mxv .byte W02 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W03 - .byte 45*bgm_thankfor_mvl/mxv + .byte 45*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W04 - .byte 42*bgm_thankfor_mvl/mxv + .byte 42*mus_credits_mvl/mxv .byte W02 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W07 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte N12 , An4 .byte W12 .byte N06 , En5 @@ -1516,27 +1516,27 @@ bgm_thankfor_2: .byte W12 .byte N48 , Fn5 .byte W12 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte W02 - .byte 55*bgm_thankfor_mvl/mxv + .byte 55*mus_credits_mvl/mxv .byte W03 - .byte 53*bgm_thankfor_mvl/mxv + .byte 53*mus_credits_mvl/mxv .byte W03 - .byte 51*bgm_thankfor_mvl/mxv + .byte 51*mus_credits_mvl/mxv .byte W04 - .byte 49*bgm_thankfor_mvl/mxv + .byte 49*mus_credits_mvl/mxv .byte W02 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W03 - .byte 42*bgm_thankfor_mvl/mxv + .byte 42*mus_credits_mvl/mxv .byte W04 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W02 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W10 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte N06 , En5 .byte W06 .byte Fn5 @@ -1553,147 +1553,147 @@ bgm_thankfor_2: .byte W06 .byte Dn5 .byte W06 - .byte VOL , 59*bgm_thankfor_mvl/mxv + .byte VOL , 59*mus_credits_mvl/mxv .byte N92 , Cs5 .byte W24 - .byte VOL , 55*bgm_thankfor_mvl/mxv + .byte VOL , 55*mus_credits_mvl/mxv .byte W02 - .byte 55*bgm_thankfor_mvl/mxv + .byte 55*mus_credits_mvl/mxv .byte W03 - .byte 51*bgm_thankfor_mvl/mxv + .byte 51*mus_credits_mvl/mxv .byte W03 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W04 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W02 - .byte 46*bgm_thankfor_mvl/mxv + .byte 46*mus_credits_mvl/mxv .byte W03 - .byte 43*bgm_thankfor_mvl/mxv + .byte 43*mus_credits_mvl/mxv .byte W03 - .byte 42*bgm_thankfor_mvl/mxv + .byte 42*mus_credits_mvl/mxv .byte W04 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W02 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W06 - .byte 34*bgm_thankfor_mvl/mxv + .byte 34*mus_credits_mvl/mxv .byte W04 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W02 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W03 - .byte 27*bgm_thankfor_mvl/mxv + .byte 27*mus_credits_mvl/mxv .byte W04 - .byte 25*bgm_thankfor_mvl/mxv + .byte 25*mus_credits_mvl/mxv .byte W02 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W03 - .byte 21*bgm_thankfor_mvl/mxv + .byte 21*mus_credits_mvl/mxv .byte W03 - .byte 20*bgm_thankfor_mvl/mxv + .byte 20*mus_credits_mvl/mxv .byte W04 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W02 - .byte 17*bgm_thankfor_mvl/mxv + .byte 17*mus_credits_mvl/mxv .byte W03 - .byte 16*bgm_thankfor_mvl/mxv + .byte 16*mus_credits_mvl/mxv .byte W03 - .byte 14*bgm_thankfor_mvl/mxv + .byte 14*mus_credits_mvl/mxv .byte W04 - .byte 58*bgm_thankfor_mvl/mxv + .byte 58*mus_credits_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 - .byte 8*bgm_thankfor_mvl/mxv + .byte 8*mus_credits_mvl/mxv .byte TIE , En5 .byte W12 - .byte VOL , 7*bgm_thankfor_mvl/mxv + .byte VOL , 7*mus_credits_mvl/mxv .byte W24 .byte W02 - .byte 8*bgm_thankfor_mvl/mxv + .byte 8*mus_credits_mvl/mxv .byte W10 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte W02 - .byte 12*bgm_thankfor_mvl/mxv + .byte 12*mus_credits_mvl/mxv .byte W10 - .byte 14*bgm_thankfor_mvl/mxv + .byte 14*mus_credits_mvl/mxv .byte W02 - .byte 17*bgm_thankfor_mvl/mxv + .byte 17*mus_credits_mvl/mxv .byte W03 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W09 - .byte 20*bgm_thankfor_mvl/mxv + .byte 20*mus_credits_mvl/mxv .byte W03 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W07 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W02 - .byte 25*bgm_thankfor_mvl/mxv + .byte 25*mus_credits_mvl/mxv .byte W03 - .byte 27*bgm_thankfor_mvl/mxv + .byte 27*mus_credits_mvl/mxv .byte W07 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W02 - .byte 30*bgm_thankfor_mvl/mxv + .byte 30*mus_credits_mvl/mxv .byte W06 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W04 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W02 - .byte 35*bgm_thankfor_mvl/mxv + .byte 35*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W07 - .byte 39*bgm_thankfor_mvl/mxv + .byte 39*mus_credits_mvl/mxv .byte W02 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 43*bgm_thankfor_mvl/mxv + .byte 43*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W04 - .byte 45*bgm_thankfor_mvl/mxv + .byte 45*mus_credits_mvl/mxv .byte W02 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W03 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W03 - .byte 51*bgm_thankfor_mvl/mxv + .byte 51*mus_credits_mvl/mxv .byte W04 - .byte 54*bgm_thankfor_mvl/mxv + .byte 54*mus_credits_mvl/mxv .byte W02 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W03 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte W03 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W04 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W02 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W03 - .byte 67*bgm_thankfor_mvl/mxv + .byte 67*mus_credits_mvl/mxv .byte W03 - .byte 70*bgm_thankfor_mvl/mxv + .byte 70*mus_credits_mvl/mxv .byte W04 - .byte 72*bgm_thankfor_mvl/mxv + .byte 72*mus_credits_mvl/mxv .byte W02 - .byte 75*bgm_thankfor_mvl/mxv + .byte 75*mus_credits_mvl/mxv .byte W03 - .byte 77*bgm_thankfor_mvl/mxv + .byte 77*mus_credits_mvl/mxv .byte W03 - .byte 78*bgm_thankfor_mvl/mxv + .byte 78*mus_credits_mvl/mxv .byte W04 - .byte 81*bgm_thankfor_mvl/mxv + .byte 81*mus_credits_mvl/mxv .byte W02 - .byte 82*bgm_thankfor_mvl/mxv + .byte 82*mus_credits_mvl/mxv .byte W03 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte W03 - .byte 86*bgm_thankfor_mvl/mxv + .byte 86*mus_credits_mvl/mxv .byte W04 .byte EOT .byte VOICE , 47 @@ -1704,15 +1704,15 @@ bgm_thankfor_2: @********************** Track 3 **********************@ -bgm_thankfor_3: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_3: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 1 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v-24 - .byte VOL , 93*bgm_thankfor_mvl/mxv + .byte VOL , 93*mus_credits_mvl/mxv .byte TIE , Gn1 , v120 .byte W96 .byte W96 @@ -1775,7 +1775,7 @@ bgm_thankfor_3: .byte W84 .byte N12 , Dn1 , v112 .byte W12 -bgm_thankfor_3_000: +mus_credits_3_000: .byte N48 , Gn1 , v112 .byte W48 .byte Fs1 @@ -1800,7 +1800,7 @@ bgm_thankfor_3_000: .byte Dn1 .byte W12 .byte PATT - .word bgm_thankfor_3_000 + .word mus_credits_3_000 .byte N48 , Fn1 , v112 .byte W48 .byte N36 , En1 @@ -1815,7 +1815,7 @@ bgm_thankfor_3_000: .byte W72 .byte VOICE , 58 .byte PAN , c_v+0 - .byte VOL , 75*bgm_thankfor_mvl/mxv + .byte VOL , 75*mus_credits_mvl/mxv .byte N12 , Dn0 .byte W12 .byte Fs0 @@ -1845,10 +1845,10 @@ bgm_thankfor_3_000: .byte Fs0 .byte W12 .byte VOICE , 58 - .byte VOL , 78*bgm_thankfor_mvl/mxv + .byte VOL , 78*mus_credits_mvl/mxv .byte N36 , Gn0 .byte W36 - .byte VOL , 78*bgm_thankfor_mvl/mxv + .byte VOL , 78*mus_credits_mvl/mxv .byte N06 , Fs0 .byte W06 .byte Gn0 @@ -1939,217 +1939,217 @@ bgm_thankfor_3_000: .byte N02 .byte W04 .byte PAN , c_v+0 - .byte VOL , 85*bgm_thankfor_mvl/mxv + .byte VOL , 85*mus_credits_mvl/mxv .byte N12 , Gn0 , v112 .byte W12 .byte Bn0 .byte W12 .byte N36 , Cn1 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N48 .byte W12 - .byte VOL , 82*bgm_thankfor_mvl/mxv + .byte VOL , 82*mus_credits_mvl/mxv .byte W05 - .byte 77*bgm_thankfor_mvl/mxv + .byte 77*mus_credits_mvl/mxv .byte W07 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W05 - .byte 68*bgm_thankfor_mvl/mxv + .byte 68*mus_credits_mvl/mxv .byte W07 - .byte 64*bgm_thankfor_mvl/mxv + .byte 64*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N36 , Bn0 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N48 .byte W12 - .byte VOL , 82*bgm_thankfor_mvl/mxv + .byte VOL , 82*mus_credits_mvl/mxv .byte W05 - .byte 77*bgm_thankfor_mvl/mxv + .byte 77*mus_credits_mvl/mxv .byte W07 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W05 - .byte 68*bgm_thankfor_mvl/mxv + .byte 68*mus_credits_mvl/mxv .byte W07 - .byte 64*bgm_thankfor_mvl/mxv + .byte 64*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N36 , As0 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N48 .byte W12 - .byte VOL , 82*bgm_thankfor_mvl/mxv + .byte VOL , 82*mus_credits_mvl/mxv .byte W05 - .byte 77*bgm_thankfor_mvl/mxv + .byte 77*mus_credits_mvl/mxv .byte W07 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W05 - .byte 68*bgm_thankfor_mvl/mxv + .byte 68*mus_credits_mvl/mxv .byte W07 - .byte 64*bgm_thankfor_mvl/mxv + .byte 64*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N36 , An0 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N48 .byte W12 - .byte VOL , 82*bgm_thankfor_mvl/mxv + .byte VOL , 82*mus_credits_mvl/mxv .byte W05 - .byte 77*bgm_thankfor_mvl/mxv + .byte 77*mus_credits_mvl/mxv .byte W07 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W05 - .byte 68*bgm_thankfor_mvl/mxv + .byte 68*mus_credits_mvl/mxv .byte W07 - .byte 64*bgm_thankfor_mvl/mxv + .byte 64*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N36 , Dn1 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N48 .byte W12 - .byte VOL , 82*bgm_thankfor_mvl/mxv + .byte VOL , 82*mus_credits_mvl/mxv .byte W05 - .byte 77*bgm_thankfor_mvl/mxv + .byte 77*mus_credits_mvl/mxv .byte W07 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W05 - .byte 68*bgm_thankfor_mvl/mxv + .byte 68*mus_credits_mvl/mxv .byte W07 - .byte 64*bgm_thankfor_mvl/mxv + .byte 64*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N36 , Cs1 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N48 .byte W12 - .byte VOL , 82*bgm_thankfor_mvl/mxv + .byte VOL , 82*mus_credits_mvl/mxv .byte W05 - .byte 77*bgm_thankfor_mvl/mxv + .byte 77*mus_credits_mvl/mxv .byte W07 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W05 - .byte 68*bgm_thankfor_mvl/mxv + .byte 68*mus_credits_mvl/mxv .byte W07 - .byte 64*bgm_thankfor_mvl/mxv + .byte 64*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N36 , Bn0 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N36 , Gn1 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 -bgm_thankfor_3_001: +mus_credits_3_001: .byte N36 , An1 , v112 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N12 @@ -2163,15 +2163,15 @@ bgm_thankfor_3_001: .byte PEND .byte N36 , Gn1 .byte W12 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte W05 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W05 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte N06 .byte W12 .byte N12 @@ -2183,86 +2183,86 @@ bgm_thankfor_3_001: .byte Gn1 .byte W12 .byte PATT - .word bgm_thankfor_3_001 + .word mus_credits_3_001 .byte PATT - .word bgm_thankfor_3_001 + .word mus_credits_3_001 .byte PATT - .word bgm_thankfor_3_001 - .byte VOL , 10*bgm_thankfor_mvl/mxv + .word mus_credits_3_001 + .byte VOL , 10*mus_credits_mvl/mxv .byte TIE , An1 , v112 .byte W05 - .byte VOL , 11*bgm_thankfor_mvl/mxv + .byte VOL , 11*mus_credits_mvl/mxv .byte W03 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W16 - .byte 12*bgm_thankfor_mvl/mxv + .byte 12*mus_credits_mvl/mxv .byte W08 - .byte 14*bgm_thankfor_mvl/mxv + .byte 14*mus_credits_mvl/mxv .byte W04 - .byte 15*bgm_thankfor_mvl/mxv + .byte 15*mus_credits_mvl/mxv .byte W02 - .byte 16*bgm_thankfor_mvl/mxv + .byte 16*mus_credits_mvl/mxv .byte W12 - .byte 19*bgm_thankfor_mvl/mxv + .byte 19*mus_credits_mvl/mxv .byte W10 - .byte 20*bgm_thankfor_mvl/mxv + .byte 20*mus_credits_mvl/mxv .byte W08 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W04 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W05 - .byte 25*bgm_thankfor_mvl/mxv + .byte 25*mus_credits_mvl/mxv .byte W03 - .byte 28*bgm_thankfor_mvl/mxv + .byte 28*mus_credits_mvl/mxv .byte W06 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W03 - .byte 32*bgm_thankfor_mvl/mxv + .byte 32*mus_credits_mvl/mxv .byte W07 .byte W02 - .byte 36*bgm_thankfor_mvl/mxv + .byte 36*mus_credits_mvl/mxv .byte W06 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W06 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W06 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W03 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W03 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W04 - .byte 52*bgm_thankfor_mvl/mxv + .byte 52*mus_credits_mvl/mxv .byte W02 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W06 - .byte 58*bgm_thankfor_mvl/mxv + .byte 58*mus_credits_mvl/mxv .byte W04 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W05 - .byte 68*bgm_thankfor_mvl/mxv + .byte 68*mus_credits_mvl/mxv .byte W07 - .byte 70*bgm_thankfor_mvl/mxv + .byte 70*mus_credits_mvl/mxv .byte W02 - .byte 72*bgm_thankfor_mvl/mxv + .byte 72*mus_credits_mvl/mxv .byte W03 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W03 - .byte 77*bgm_thankfor_mvl/mxv + .byte 77*mus_credits_mvl/mxv .byte W06 - .byte 80*bgm_thankfor_mvl/mxv + .byte 80*mus_credits_mvl/mxv .byte W03 - .byte 84*bgm_thankfor_mvl/mxv + .byte 84*mus_credits_mvl/mxv .byte W03 - .byte 88*bgm_thankfor_mvl/mxv + .byte 88*mus_credits_mvl/mxv .byte W04 - .byte 91*bgm_thankfor_mvl/mxv + .byte 91*mus_credits_mvl/mxv .byte W02 - .byte 93*bgm_thankfor_mvl/mxv + .byte 93*mus_credits_mvl/mxv .byte W10 .byte EOT .byte N06 , An0 @@ -2271,13 +2271,13 @@ bgm_thankfor_3_001: @********************** Track 4 **********************@ -bgm_thankfor_4: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_4: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+21 - .byte VOL , 69*bgm_thankfor_mvl/mxv + .byte VOL , 69*mus_credits_mvl/mxv .byte W12 .byte N24 , Dn2 , v080 .byte W24 @@ -2324,7 +2324,7 @@ bgm_thankfor_4: .byte W24 .byte Dn2 , v068 .byte W12 -bgm_thankfor_4_000: +mus_credits_4_000: .byte W12 .byte N24 , Dn2 , v064 .byte W24 @@ -2335,7 +2335,7 @@ bgm_thankfor_4_000: .byte Dn2 , v088 .byte W12 .byte PEND -bgm_thankfor_4_001: +mus_credits_4_001: .byte W12 .byte N24 , Bn1 , v068 .byte W24 @@ -2346,7 +2346,7 @@ bgm_thankfor_4_001: .byte Bn1 , v068 .byte W12 .byte PEND -bgm_thankfor_4_002: +mus_credits_4_002: .byte W12 .byte N24 , Bn1 , v064 .byte W24 @@ -2355,7 +2355,7 @@ bgm_thankfor_4_002: .byte N12 .byte W36 .byte PEND -bgm_thankfor_4_003: +mus_credits_4_003: .byte W12 .byte N24 , En2 , v068 .byte W24 @@ -2366,7 +2366,7 @@ bgm_thankfor_4_003: .byte En2 , v068 .byte W12 .byte PEND -bgm_thankfor_4_004: +mus_credits_4_004: .byte W12 .byte N24 , En2 , v064 .byte W24 @@ -2394,7 +2394,7 @@ bgm_thankfor_4_004: .byte W03 .byte N48 , Cn3 , v112 .byte W48 - .byte VOL , 73*bgm_thankfor_mvl/mxv + .byte VOL , 73*mus_credits_mvl/mxv .byte W12 .byte N24 , Dn2 , v068 .byte W24 @@ -2405,15 +2405,15 @@ bgm_thankfor_4_004: .byte Dn2 , v068 .byte W12 .byte PATT - .word bgm_thankfor_4_000 + .word mus_credits_4_000 .byte PATT - .word bgm_thankfor_4_001 + .word mus_credits_4_001 .byte PATT - .word bgm_thankfor_4_002 + .word mus_credits_4_002 .byte PATT - .word bgm_thankfor_4_003 + .word mus_credits_4_003 .byte PATT - .word bgm_thankfor_4_004 + .word mus_credits_4_004 .byte W12 .byte N24 , An2 , v068 .byte W24 @@ -2501,7 +2501,7 @@ bgm_thankfor_4_004: .byte W12 .byte VOICE , 73 .byte PAN , c_v+0 - .byte VOL , 43*bgm_thankfor_mvl/mxv + .byte VOL , 43*mus_credits_mvl/mxv .byte N12 , Gn4 .byte W12 .byte An4 @@ -2512,40 +2512,40 @@ bgm_thankfor_4_004: .byte N68 , Bn4 , v112 .byte W21 .byte MOD , 7 - .byte VOL , 40*bgm_thankfor_mvl/mxv + .byte VOL , 40*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W02 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W03 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W04 - .byte 28*bgm_thankfor_mvl/mxv + .byte 28*mus_credits_mvl/mxv .byte W02 - .byte 27*bgm_thankfor_mvl/mxv + .byte 27*mus_credits_mvl/mxv .byte W03 - .byte 25*bgm_thankfor_mvl/mxv + .byte 25*mus_credits_mvl/mxv .byte W03 - .byte 23*bgm_thankfor_mvl/mxv + .byte 23*mus_credits_mvl/mxv .byte W04 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W02 - .byte 21*bgm_thankfor_mvl/mxv + .byte 21*mus_credits_mvl/mxv .byte W03 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W03 - .byte 17*bgm_thankfor_mvl/mxv + .byte 17*mus_credits_mvl/mxv .byte W04 - .byte 15*bgm_thankfor_mvl/mxv + .byte 15*mus_credits_mvl/mxv .byte W02 - .byte 12*bgm_thankfor_mvl/mxv + .byte 12*mus_credits_mvl/mxv .byte W03 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 43*bgm_thankfor_mvl/mxv + .byte VOL , 43*mus_credits_mvl/mxv .byte W12 .byte N06 , Dn4 .byte W06 @@ -2569,44 +2569,44 @@ bgm_thankfor_4_004: .byte W06 .byte N72 , Bn4 .byte W24 - .byte VOL , 37*bgm_thankfor_mvl/mxv + .byte VOL , 37*mus_credits_mvl/mxv .byte W03 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W02 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W03 - .byte 35*bgm_thankfor_mvl/mxv + .byte 35*mus_credits_mvl/mxv .byte W03 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W04 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W02 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W03 - .byte 28*bgm_thankfor_mvl/mxv + .byte 28*mus_credits_mvl/mxv .byte W04 - .byte 25*bgm_thankfor_mvl/mxv + .byte 25*mus_credits_mvl/mxv .byte W02 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W03 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W03 - .byte 21*bgm_thankfor_mvl/mxv + .byte 21*mus_credits_mvl/mxv .byte W04 - .byte 20*bgm_thankfor_mvl/mxv + .byte 20*mus_credits_mvl/mxv .byte W02 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W03 - .byte 17*bgm_thankfor_mvl/mxv + .byte 17*mus_credits_mvl/mxv .byte W03 - .byte 15*bgm_thankfor_mvl/mxv + .byte 15*mus_credits_mvl/mxv .byte W01 .byte MOD , 0 - .byte VOL , 12*bgm_thankfor_mvl/mxv + .byte VOL , 12*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W06 .byte N03 , Gn4 .byte W03 @@ -2624,16 +2624,16 @@ bgm_thankfor_4_004: .byte W03 .byte N36 , Cn5 .byte W24 - .byte VOL , 40*bgm_thankfor_mvl/mxv + .byte VOL , 40*mus_credits_mvl/mxv .byte W03 - .byte 36*bgm_thankfor_mvl/mxv + .byte 36*mus_credits_mvl/mxv .byte W02 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 44*bgm_thankfor_mvl/mxv + .byte VOL , 44*mus_credits_mvl/mxv .byte N06 , Bn4 .byte W06 .byte Cn5 @@ -2643,24 +2643,24 @@ bgm_thankfor_4_004: .byte N44 , Cn5 , v112 .byte W21 .byte MOD , 7 - .byte VOL , 40*bgm_thankfor_mvl/mxv + .byte VOL , 40*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W02 - .byte 35*bgm_thankfor_mvl/mxv + .byte 35*mus_credits_mvl/mxv .byte W03 - .byte 32*bgm_thankfor_mvl/mxv + .byte 32*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W04 - .byte 28*bgm_thankfor_mvl/mxv + .byte 28*mus_credits_mvl/mxv .byte W02 - .byte 23*bgm_thankfor_mvl/mxv + .byte 23*mus_credits_mvl/mxv .byte W03 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 44*bgm_thankfor_mvl/mxv + .byte VOL , 44*mus_credits_mvl/mxv .byte N24 , Bn4 .byte W24 .byte Cn5 @@ -2690,41 +2690,41 @@ bgm_thankfor_4_004: .byte N68 , Cn5 .byte W21 .byte MOD , 7 - .byte VOL , 37*bgm_thankfor_mvl/mxv + .byte VOL , 37*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W02 - .byte 34*bgm_thankfor_mvl/mxv + .byte 34*mus_credits_mvl/mxv .byte W03 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W04 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W02 - .byte 25*bgm_thankfor_mvl/mxv + .byte 25*mus_credits_mvl/mxv .byte W03 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W03 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W04 - .byte 20*bgm_thankfor_mvl/mxv + .byte 20*mus_credits_mvl/mxv .byte W02 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W03 - .byte 16*bgm_thankfor_mvl/mxv + .byte 16*mus_credits_mvl/mxv .byte W03 - .byte 14*bgm_thankfor_mvl/mxv + .byte 14*mus_credits_mvl/mxv .byte W04 - .byte 12*bgm_thankfor_mvl/mxv + .byte 12*mus_credits_mvl/mxv .byte W02 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W03 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W04 .byte VOICE , 48 .byte PAN , c_v+0 - .byte VOL , 61*bgm_thankfor_mvl/mxv + .byte VOL , 61*mus_credits_mvl/mxv .byte MOD , 0 .byte W24 .byte W03 @@ -2879,7 +2879,7 @@ bgm_thankfor_4_004: .byte Bn4 , v068 .byte W04 .byte VOICE , 60 - .byte VOL , 90*bgm_thankfor_mvl/mxv + .byte VOL , 90*mus_credits_mvl/mxv .byte PAN , c_v+0 .byte N30 , Bn3 , v112 .byte W12 @@ -2918,7 +2918,7 @@ bgm_thankfor_4_004: .byte MOD , 8 .byte W12 .byte VOICE , 48 - .byte VOL , 74*bgm_thankfor_mvl/mxv + .byte VOL , 74*mus_credits_mvl/mxv .byte W06 .byte MOD , 0 .byte N12 , Cn4 , v092 @@ -2965,14 +2965,14 @@ bgm_thankfor_4_004: .byte W12 .byte Cn4 , v112 .byte W12 - .byte VOL , 67*bgm_thankfor_mvl/mxv + .byte VOL , 67*mus_credits_mvl/mxv .byte N12 , Bn3 .byte W12 - .byte VOL , 80*bgm_thankfor_mvl/mxv + .byte VOL , 80*mus_credits_mvl/mxv .byte N12 , Cn4 .byte W12 .byte VOICE , 56 - .byte VOL , 75*bgm_thankfor_mvl/mxv + .byte VOL , 75*mus_credits_mvl/mxv .byte N30 , Bn4 .byte W12 .byte MOD , 8 @@ -3004,13 +3004,13 @@ bgm_thankfor_4_004: .byte MOD , 8 .byte W18 .byte VOICE , 48 - .byte VOL , 74*bgm_thankfor_mvl/mxv + .byte VOL , 74*mus_credits_mvl/mxv .byte MOD , 0 .byte N12 , Cn5 , v092 .byte W12 .byte N06 , Dn5 , v100 .byte W06 - .byte VOL , 81*bgm_thankfor_mvl/mxv + .byte VOL , 81*mus_credits_mvl/mxv .byte N12 , Cn5 , v112 .byte W12 .byte En4 , v084 @@ -3040,7 +3040,7 @@ bgm_thankfor_4_004: .byte Cs5 .byte W24 .byte PAN , c_v+0 - .byte VOL , 64*bgm_thankfor_mvl/mxv + .byte VOL , 64*mus_credits_mvl/mxv .byte N12 , Dn5 .byte W12 .byte Gn4 @@ -3053,31 +3053,31 @@ bgm_thankfor_4_004: .byte W96 .byte W96 .byte VOICE , 60 - .byte VOL , 69*bgm_thankfor_mvl/mxv + .byte VOL , 69*mus_credits_mvl/mxv .byte N36 , An3 .byte W36 .byte N06 , Cs4 .byte W12 .byte N48 , En4 .byte W24 - .byte VOL , 69*bgm_thankfor_mvl/mxv + .byte VOL , 69*mus_credits_mvl/mxv .byte MOD , 5 .byte W02 - .byte VOL , 66*bgm_thankfor_mvl/mxv + .byte VOL , 66*mus_credits_mvl/mxv .byte W03 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W03 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W04 - .byte 54*bgm_thankfor_mvl/mxv + .byte 54*mus_credits_mvl/mxv .byte W02 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W03 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W04 - .byte 69*bgm_thankfor_mvl/mxv + .byte 69*mus_credits_mvl/mxv .byte MOD , 0 .byte N36 , Bn3 .byte W36 @@ -3094,183 +3094,183 @@ bgm_thankfor_4_004: .byte W06 .byte N72 , En4 .byte W24 - .byte VOL , 69*bgm_thankfor_mvl/mxv + .byte VOL , 69*mus_credits_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 66*bgm_thankfor_mvl/mxv + .byte VOL , 66*mus_credits_mvl/mxv .byte W03 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W03 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W06 - .byte 54*bgm_thankfor_mvl/mxv + .byte 54*mus_credits_mvl/mxv .byte W03 - .byte 53*bgm_thankfor_mvl/mxv + .byte 53*mus_credits_mvl/mxv .byte W03 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W04 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W05 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W07 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W05 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W04 - .byte 69*bgm_thankfor_mvl/mxv + .byte 69*mus_credits_mvl/mxv .byte MOD , 0 .byte N24 , Dn4 .byte W24 .byte N72 , En4 .byte W24 - .byte VOL , 69*bgm_thankfor_mvl/mxv + .byte VOL , 69*mus_credits_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 66*bgm_thankfor_mvl/mxv + .byte VOL , 66*mus_credits_mvl/mxv .byte W03 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W03 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W04 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte W02 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W03 - .byte 54*bgm_thankfor_mvl/mxv + .byte 54*mus_credits_mvl/mxv .byte W03 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W04 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W02 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W03 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W07 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W02 - .byte 35*bgm_thankfor_mvl/mxv + .byte 35*mus_credits_mvl/mxv .byte W03 - .byte 34*bgm_thankfor_mvl/mxv + .byte 34*mus_credits_mvl/mxv .byte W07 - .byte 69*bgm_thankfor_mvl/mxv + .byte 69*mus_credits_mvl/mxv .byte MOD , 0 .byte N21 , Dn4 .byte W24 .byte N72 , En4 .byte W24 - .byte VOL , 66*bgm_thankfor_mvl/mxv + .byte VOL , 66*mus_credits_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 66*bgm_thankfor_mvl/mxv + .byte VOL , 66*mus_credits_mvl/mxv .byte W03 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W07 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte W02 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W03 - .byte 54*bgm_thankfor_mvl/mxv + .byte 54*mus_credits_mvl/mxv .byte W07 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W02 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W03 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W04 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W05 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W07 - .byte 69*bgm_thankfor_mvl/mxv + .byte 69*mus_credits_mvl/mxv .byte MOD , 0 .byte N21 , Dn4 .byte W24 - .byte VOL , 6*bgm_thankfor_mvl/mxv + .byte VOL , 6*mus_credits_mvl/mxv .byte PAN , c_v+32 .byte TIE , Cs4 .byte W02 - .byte VOL , 7*bgm_thankfor_mvl/mxv + .byte VOL , 7*mus_credits_mvl/mxv .byte W03 - .byte 9*bgm_thankfor_mvl/mxv + .byte 9*mus_credits_mvl/mxv .byte W09 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte W03 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W07 - .byte 12*bgm_thankfor_mvl/mxv + .byte 12*mus_credits_mvl/mxv .byte W02 - .byte 14*bgm_thankfor_mvl/mxv + .byte 14*mus_credits_mvl/mxv .byte W03 - .byte 15*bgm_thankfor_mvl/mxv + .byte 15*mus_credits_mvl/mxv .byte W03 - .byte 17*bgm_thankfor_mvl/mxv + .byte 17*mus_credits_mvl/mxv .byte W04 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W02 - .byte 19*bgm_thankfor_mvl/mxv + .byte 19*mus_credits_mvl/mxv .byte W06 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W06 - .byte 25*bgm_thankfor_mvl/mxv + .byte 25*mus_credits_mvl/mxv .byte W06 - .byte 28*bgm_thankfor_mvl/mxv + .byte 28*mus_credits_mvl/mxv .byte W04 - .byte 32*bgm_thankfor_mvl/mxv + .byte 32*mus_credits_mvl/mxv .byte W08 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W04 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W05 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W09 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W07 .byte W02 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W03 - .byte 49*bgm_thankfor_mvl/mxv + .byte 49*mus_credits_mvl/mxv .byte W07 - .byte 51*bgm_thankfor_mvl/mxv + .byte 51*mus_credits_mvl/mxv .byte W02 - .byte 53*bgm_thankfor_mvl/mxv + .byte 53*mus_credits_mvl/mxv .byte W03 - .byte 55*bgm_thankfor_mvl/mxv + .byte 55*mus_credits_mvl/mxv .byte W03 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W04 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte W02 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W03 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W07 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W02 - .byte 69*bgm_thankfor_mvl/mxv + .byte 69*mus_credits_mvl/mxv .byte W03 - .byte 70*bgm_thankfor_mvl/mxv + .byte 70*mus_credits_mvl/mxv .byte W03 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W04 - .byte 75*bgm_thankfor_mvl/mxv + .byte 75*mus_credits_mvl/mxv .byte W02 - .byte 78*bgm_thankfor_mvl/mxv + .byte 78*mus_credits_mvl/mxv .byte W03 - .byte 79*bgm_thankfor_mvl/mxv + .byte 79*mus_credits_mvl/mxv .byte W03 - .byte 81*bgm_thankfor_mvl/mxv + .byte 81*mus_credits_mvl/mxv .byte W06 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte W03 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte W03 - .byte 87*bgm_thankfor_mvl/mxv + .byte 87*mus_credits_mvl/mxv .byte W28 .byte EOT .byte N03 , An1 @@ -3279,12 +3279,12 @@ bgm_thankfor_4_004: @********************** Track 5 **********************@ -bgm_thankfor_5: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_5: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 46 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 90*bgm_thankfor_mvl/mxv + .byte VOL , 90*mus_credits_mvl/mxv .byte PAN , c_v+28 .byte W96 .byte W96 @@ -3316,7 +3316,7 @@ bgm_thankfor_5: .byte W48 .byte c_v+30 .byte W48 - .byte VOL , 56*bgm_thankfor_mvl/mxv + .byte VOL , 56*mus_credits_mvl/mxv .byte PAN , c_v-29 .byte W12 .byte N06 , Bn4 , v112 @@ -3333,7 +3333,7 @@ bgm_thankfor_5: .byte W12 .byte Dn5 .byte W12 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte PAN , c_v-32 .byte N03 , Bn3 , v100 .byte W03 @@ -3388,7 +3388,7 @@ bgm_thankfor_5: .byte W03 .byte An4 .byte W03 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte PAN , c_v+9 .byte N06 , Bn4 , v088 .byte W06 @@ -3421,7 +3421,7 @@ bgm_thankfor_5: .byte W06 .byte N12 , Gn5 .byte W12 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte N03 , Dn4 , v096 .byte W03 .byte Gn4 , v088 @@ -3475,7 +3475,7 @@ bgm_thankfor_5: .byte Bn4 .byte W03 .byte PAN , c_v-32 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte N12 , An4 , v112 .byte W12 .byte N06 , Cn5 @@ -3498,7 +3498,7 @@ bgm_thankfor_5: .byte W06 .byte N12 , Cn5 .byte W36 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte PAN , c_v+26 .byte N03 , Cn6 , v092 .byte W03 @@ -3535,7 +3535,7 @@ bgm_thankfor_5: .byte W03 .byte Fs4 .byte W03 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte N06 , An4 , v112 .byte W12 .byte Gn4 @@ -3553,7 +3553,7 @@ bgm_thankfor_5: .byte Gn5 .byte W12 .byte VOICE , 46 - .byte VOL , 57*bgm_thankfor_mvl/mxv + .byte VOL , 57*mus_credits_mvl/mxv .byte N03 , Dn4 .byte W03 .byte Fs4 @@ -3604,7 +3604,7 @@ bgm_thankfor_5: .byte W96 .byte W96 .byte W96 - .byte VOL , 62*bgm_thankfor_mvl/mxv + .byte VOL , 62*mus_credits_mvl/mxv .byte PAN , c_v-32 .byte N06 , Gn4 , v096 .byte W06 @@ -3656,10 +3656,10 @@ bgm_thankfor_5: .byte VOICE , 48 .byte W96 .byte 47 - .byte VOL , 62*bgm_thankfor_mvl/mxv + .byte VOL , 62*mus_credits_mvl/mxv .byte PAN , c_v+0 .byte W48 - .byte VOL , 88*bgm_thankfor_mvl/mxv + .byte VOL , 88*mus_credits_mvl/mxv .byte N04 , Dn2 , v056 .byte W04 .byte N04 @@ -3684,7 +3684,7 @@ bgm_thankfor_5: .byte W04 .byte Dn2 , v116 .byte W04 - .byte VOL , 88*bgm_thankfor_mvl/mxv + .byte VOL , 88*mus_credits_mvl/mxv .byte N15 , Gn1 , v112 .byte W36 .byte N02 , Gn1 , v056 @@ -3711,7 +3711,7 @@ bgm_thankfor_5: .byte W12 .byte Ds1 .byte W12 - .byte VOL , 88*bgm_thankfor_mvl/mxv + .byte VOL , 88*mus_credits_mvl/mxv .byte N04 , En1 .byte W12 .byte N06 , En2 , v112 @@ -3757,7 +3757,7 @@ bgm_thankfor_5: .byte W04 .byte Dn2 , v116 .byte W04 - .byte VOL , 100*bgm_thankfor_mvl/mxv + .byte VOL , 100*mus_credits_mvl/mxv .byte PAN , c_v+0 .byte N24 , Gn1 , v112 .byte W36 @@ -3798,7 +3798,7 @@ bgm_thankfor_5: .byte N12 , An1 , v092 .byte W12 .byte VOICE , 47 - .byte VOL , 100*bgm_thankfor_mvl/mxv + .byte VOL , 100*mus_credits_mvl/mxv .byte PAN , c_v-24 .byte N06 , Gn2 , v112 .byte W12 @@ -3840,7 +3840,7 @@ bgm_thankfor_5: .byte Gn1 , v124 .byte W04 .byte VOICE , 1 - .byte VOL , 49*bgm_thankfor_mvl/mxv + .byte VOL , 49*mus_credits_mvl/mxv .byte PAN , c_v-32 .byte N06 , Cn3 , v112 .byte W06 @@ -4093,127 +4093,127 @@ bgm_thankfor_5: .byte W48 .byte Dn3 .byte W48 -bgm_thankfor_5_000: +mus_credits_5_000: .byte N72 , En3 , v112 .byte W72 .byte N24 , Dn3 .byte W24 .byte PEND .byte PATT - .word bgm_thankfor_5_000 + .word mus_credits_5_000 .byte N72 , En3 , v112 .byte W96 .byte VOICE , 48 - .byte VOL , 6*bgm_thankfor_mvl/mxv + .byte VOL , 6*mus_credits_mvl/mxv .byte TIE , An3 .byte W08 - .byte VOL , 7*bgm_thankfor_mvl/mxv + .byte VOL , 7*mus_credits_mvl/mxv .byte W06 - .byte 9*bgm_thankfor_mvl/mxv + .byte 9*mus_credits_mvl/mxv .byte W06 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte W06 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W03 - .byte 12*bgm_thankfor_mvl/mxv + .byte 12*mus_credits_mvl/mxv .byte W07 - .byte 14*bgm_thankfor_mvl/mxv + .byte 14*mus_credits_mvl/mxv .byte W02 - .byte 15*bgm_thankfor_mvl/mxv + .byte 15*mus_credits_mvl/mxv .byte W03 - .byte 17*bgm_thankfor_mvl/mxv + .byte 17*mus_credits_mvl/mxv .byte W07 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W02 - .byte 19*bgm_thankfor_mvl/mxv + .byte 19*mus_credits_mvl/mxv .byte W06 - .byte 21*bgm_thankfor_mvl/mxv + .byte 21*mus_credits_mvl/mxv .byte W06 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W03 - .byte 26*bgm_thankfor_mvl/mxv + .byte 26*mus_credits_mvl/mxv .byte W07 - .byte 28*bgm_thankfor_mvl/mxv + .byte 28*mus_credits_mvl/mxv .byte W02 - .byte 32*bgm_thankfor_mvl/mxv + .byte 32*mus_credits_mvl/mxv .byte W03 - .byte 35*bgm_thankfor_mvl/mxv + .byte 35*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W06 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W03 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W04 .byte W02 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W03 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W03 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W04 - .byte 51*bgm_thankfor_mvl/mxv + .byte 51*mus_credits_mvl/mxv .byte W02 - .byte 53*bgm_thankfor_mvl/mxv + .byte 53*mus_credits_mvl/mxv .byte W03 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W03 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte W06 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W03 - .byte 64*bgm_thankfor_mvl/mxv + .byte 64*mus_credits_mvl/mxv .byte W03 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W04 - .byte 69*bgm_thankfor_mvl/mxv + .byte 69*mus_credits_mvl/mxv .byte W02 - .byte 70*bgm_thankfor_mvl/mxv + .byte 70*mus_credits_mvl/mxv .byte W06 - .byte 73*bgm_thankfor_mvl/mxv + .byte 73*mus_credits_mvl/mxv .byte W04 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W02 - .byte 75*bgm_thankfor_mvl/mxv + .byte 75*mus_credits_mvl/mxv .byte W03 - .byte 78*bgm_thankfor_mvl/mxv + .byte 78*mus_credits_mvl/mxv .byte W03 - .byte 79*bgm_thankfor_mvl/mxv + .byte 79*mus_credits_mvl/mxv .byte W06 - .byte 81*bgm_thankfor_mvl/mxv + .byte 81*mus_credits_mvl/mxv .byte W03 - .byte 83*bgm_thankfor_mvl/mxv + .byte 83*mus_credits_mvl/mxv .byte W03 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte W04 - .byte 85*bgm_thankfor_mvl/mxv + .byte 85*mus_credits_mvl/mxv .byte W24 .byte EOT .byte VOICE , 47 - .byte VOL , 100*bgm_thankfor_mvl/mxv + .byte VOL , 100*mus_credits_mvl/mxv .byte N24 , An1 .byte W96 .byte FINE @********************** Track 6 **********************@ -bgm_thankfor_6: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_6: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 4 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-61 - .byte VOL , 44*bgm_thankfor_mvl/mxv + .byte VOL , 44*mus_credits_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 -bgm_thankfor_6_000: - .byte VOL , 30*bgm_thankfor_mvl/mxv +mus_credits_6_000: + .byte VOL , 30*mus_credits_mvl/mxv .byte W12 .byte N24 , Dn3 , v112 .byte W24 @@ -4224,7 +4224,7 @@ bgm_thankfor_6_000: .byte N24 .byte W12 .byte PEND -bgm_thankfor_6_001: +mus_credits_6_001: .byte W12 .byte N24 , Dn3 , v112 .byte W24 @@ -4236,7 +4236,7 @@ bgm_thankfor_6_001: .byte W12 .byte PEND .byte PATT - .word bgm_thankfor_6_001 + .word mus_credits_6_001 .byte W12 .byte N24 , Bn2 , v112 .byte W24 @@ -4246,7 +4246,7 @@ bgm_thankfor_6_001: .byte W24 .byte N24 .byte W12 -bgm_thankfor_6_002: +mus_credits_6_002: .byte W12 .byte N24 , En3 , v112 .byte W24 @@ -4258,7 +4258,7 @@ bgm_thankfor_6_002: .byte W12 .byte PEND .byte PATT - .word bgm_thankfor_6_002 + .word mus_credits_6_002 .byte W12 .byte N24 , Fs3 , v112 .byte W24 @@ -4268,68 +4268,68 @@ bgm_thankfor_6_002: .byte W24 .byte N12 .byte W12 - .byte VOL , 10*bgm_thankfor_mvl/mxv + .byte VOL , 10*mus_credits_mvl/mxv .byte N48 , Dn3 .byte W06 - .byte VOL , 10*bgm_thankfor_mvl/mxv + .byte VOL , 10*mus_credits_mvl/mxv .byte W02 - .byte 12*bgm_thankfor_mvl/mxv + .byte 12*mus_credits_mvl/mxv .byte W04 - .byte 15*bgm_thankfor_mvl/mxv + .byte 15*mus_credits_mvl/mxv .byte W02 - .byte 20*bgm_thankfor_mvl/mxv + .byte 20*mus_credits_mvl/mxv .byte W03 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W04 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W02 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W03 - .byte 52*bgm_thankfor_mvl/mxv + .byte 52*mus_credits_mvl/mxv .byte W04 - .byte 53*bgm_thankfor_mvl/mxv + .byte 53*mus_credits_mvl/mxv .byte W02 - .byte 57*bgm_thankfor_mvl/mxv + .byte 57*mus_credits_mvl/mxv .byte W03 - .byte 61*bgm_thankfor_mvl/mxv + .byte 61*mus_credits_mvl/mxv .byte W03 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W04 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte N48 , An3 .byte W03 - .byte VOL , 11*bgm_thankfor_mvl/mxv + .byte VOL , 11*mus_credits_mvl/mxv .byte W02 - .byte 16*bgm_thankfor_mvl/mxv + .byte 16*mus_credits_mvl/mxv .byte W03 - .byte 23*bgm_thankfor_mvl/mxv + .byte 23*mus_credits_mvl/mxv .byte W04 - .byte 27*bgm_thankfor_mvl/mxv + .byte 27*mus_credits_mvl/mxv .byte W02 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W03 - .byte 36*bgm_thankfor_mvl/mxv + .byte 36*mus_credits_mvl/mxv .byte W03 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W04 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W02 - .byte 49*bgm_thankfor_mvl/mxv + .byte 49*mus_credits_mvl/mxv .byte W03 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W03 - .byte 61*bgm_thankfor_mvl/mxv + .byte 61*mus_credits_mvl/mxv .byte W04 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W12 .byte PATT - .word bgm_thankfor_6_000 + .word mus_credits_6_000 .byte PATT - .word bgm_thankfor_6_001 + .word mus_credits_6_001 .byte W12 .byte N24 , Dn3 , v112 .byte W24 @@ -4349,7 +4349,7 @@ bgm_thankfor_6_002: .byte W24 .byte N24 .byte W12 -bgm_thankfor_6_003: +mus_credits_6_003: .byte W12 .byte N24 , En4 , v112 .byte W24 @@ -4361,7 +4361,7 @@ bgm_thankfor_6_003: .byte W12 .byte PEND .byte PATT - .word bgm_thankfor_6_003 + .word mus_credits_6_003 .byte W12 .byte N24 , Fs4 , v112 .byte W24 @@ -4468,10 +4468,10 @@ bgm_thankfor_6_003: .byte W24 .byte N12 , An4 .byte W03 - .byte VOL , 37*bgm_thankfor_mvl/mxv + .byte VOL , 37*mus_credits_mvl/mxv .byte W09 .byte VOICE , 4 - .byte VOL , 37*bgm_thankfor_mvl/mxv + .byte VOL , 37*mus_credits_mvl/mxv .byte N03 , Gs4 .byte W03 .byte N44 , Gn4 @@ -4581,29 +4581,29 @@ bgm_thankfor_6_003: .byte 0 .byte N48 , Dn3 .byte W15 - .byte VOL , 45*bgm_thankfor_mvl/mxv + .byte VOL , 45*mus_credits_mvl/mxv .byte W02 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W03 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W03 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W03 - .byte 35*bgm_thankfor_mvl/mxv + .byte 35*mus_credits_mvl/mxv .byte W03 - .byte 32*bgm_thankfor_mvl/mxv + .byte 32*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W03 - .byte 27*bgm_thankfor_mvl/mxv + .byte 27*mus_credits_mvl/mxv .byte W03 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W03 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W04 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte N12 , Cn3 .byte W12 .byte Bn2 @@ -4613,7 +4613,7 @@ bgm_thankfor_6_003: .byte Dn2 .byte W12 .byte VOICE , 68 - .byte VOL , 40*bgm_thankfor_mvl/mxv + .byte VOL , 40*mus_credits_mvl/mxv .byte N06 , Gn1 .byte W06 .byte Dn2 @@ -5092,7 +5092,7 @@ bgm_thankfor_6_003: .byte N12 , Dn3 .byte W12 .byte VOICE , 4 - .byte VOL , 37*bgm_thankfor_mvl/mxv + .byte VOL , 37*mus_credits_mvl/mxv .byte W12 .byte N12 , Cs2 .byte W12 @@ -5128,7 +5128,7 @@ bgm_thankfor_6_003: .byte W06 .byte MOD , 6 .byte W06 -bgm_thankfor_6_004: +mus_credits_6_004: .byte MOD , 0 .byte W12 .byte N12 , Cs2 , v112 @@ -5149,70 +5149,70 @@ bgm_thankfor_6_004: .byte W06 .byte PEND .byte PATT - .word bgm_thankfor_6_004 + .word mus_credits_6_004 .byte PATT - .word bgm_thankfor_6_004 + .word mus_credits_6_004 .byte VOICE , 81 - .byte VOL , 5*bgm_thankfor_mvl/mxv + .byte VOL , 5*mus_credits_mvl/mxv .byte MOD , 0 .byte TIE , En2 , v112 .byte W02 - .byte VOL , 6*bgm_thankfor_mvl/mxv + .byte VOL , 6*mus_credits_mvl/mxv .byte W56 .byte W02 - .byte 7*bgm_thankfor_mvl/mxv + .byte 7*mus_credits_mvl/mxv .byte W20 - .byte 7*bgm_thankfor_mvl/mxv + .byte 7*mus_credits_mvl/mxv .byte W09 - .byte 8*bgm_thankfor_mvl/mxv + .byte 8*mus_credits_mvl/mxv .byte W07 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte W02 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W03 - .byte 14*bgm_thankfor_mvl/mxv + .byte 14*mus_credits_mvl/mxv .byte W03 - .byte 16*bgm_thankfor_mvl/mxv + .byte 16*mus_credits_mvl/mxv .byte W04 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W02 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W03 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W03 - .byte 28*bgm_thankfor_mvl/mxv + .byte 28*mus_credits_mvl/mxv .byte W04 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W02 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W03 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W03 - .byte 34*bgm_thankfor_mvl/mxv + .byte 34*mus_credits_mvl/mxv .byte W04 - .byte 36*bgm_thankfor_mvl/mxv + .byte 36*mus_credits_mvl/mxv .byte W02 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W03 - .byte 46*bgm_thankfor_mvl/mxv + .byte 46*mus_credits_mvl/mxv .byte W03 - .byte 47*bgm_thankfor_mvl/mxv + .byte 47*mus_credits_mvl/mxv .byte W04 - .byte 50*bgm_thankfor_mvl/mxv + .byte 50*mus_credits_mvl/mxv .byte W02 - .byte 54*bgm_thankfor_mvl/mxv + .byte 54*mus_credits_mvl/mxv .byte W03 - .byte 59*bgm_thankfor_mvl/mxv + .byte 59*mus_credits_mvl/mxv .byte W03 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W04 - .byte 75*bgm_thankfor_mvl/mxv + .byte 75*mus_credits_mvl/mxv .byte W02 - .byte 81*bgm_thankfor_mvl/mxv + .byte 81*mus_credits_mvl/mxv .byte W03 - .byte 84*bgm_thankfor_mvl/mxv + .byte 84*mus_credits_mvl/mxv .byte W03 - .byte 88*bgm_thankfor_mvl/mxv + .byte 88*mus_credits_mvl/mxv .byte W28 .byte EOT .byte W96 @@ -5220,21 +5220,21 @@ bgm_thankfor_6_004: @********************** Track 7 **********************@ -bgm_thankfor_7: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_7: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 5 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 43*bgm_thankfor_mvl/mxv + .byte VOL , 43*mus_credits_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 -bgm_thankfor_7_000: - .byte VOL , 30*bgm_thankfor_mvl/mxv +mus_credits_7_000: + .byte VOL , 30*mus_credits_mvl/mxv .byte N24 , Gn3 , v112 .byte W24 .byte N24 @@ -5244,7 +5244,7 @@ bgm_thankfor_7_000: .byte Gn3 .byte W24 .byte PEND -bgm_thankfor_7_001: +mus_credits_7_001: .byte N24 , Gn3 , v112 .byte W24 .byte N24 @@ -5254,7 +5254,7 @@ bgm_thankfor_7_001: .byte Fs3 .byte W24 .byte PEND -bgm_thankfor_7_002: +mus_credits_7_002: .byte N24 , Gn3 , v112 .byte W24 .byte N24 @@ -5272,7 +5272,7 @@ bgm_thankfor_7_002: .byte W24 .byte En3 .byte W24 -bgm_thankfor_7_003: +mus_credits_7_003: .byte N24 , An3 , v112 .byte W24 .byte N24 @@ -5283,7 +5283,7 @@ bgm_thankfor_7_003: .byte W24 .byte PEND .byte PATT - .word bgm_thankfor_7_003 + .word mus_credits_7_003 .byte N24 , An3 , v112 .byte W24 .byte N24 @@ -5292,70 +5292,70 @@ bgm_thankfor_7_003: .byte W24 .byte N24 .byte W24 - .byte VOL , 10*bgm_thankfor_mvl/mxv + .byte VOL , 10*mus_credits_mvl/mxv .byte N48 , Fs3 .byte W06 - .byte VOL , 10*bgm_thankfor_mvl/mxv + .byte VOL , 10*mus_credits_mvl/mxv .byte W02 - .byte 12*bgm_thankfor_mvl/mxv + .byte 12*mus_credits_mvl/mxv .byte W04 - .byte 15*bgm_thankfor_mvl/mxv + .byte 15*mus_credits_mvl/mxv .byte W02 - .byte 20*bgm_thankfor_mvl/mxv + .byte 20*mus_credits_mvl/mxv .byte W03 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W04 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W02 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W03 - .byte 52*bgm_thankfor_mvl/mxv + .byte 52*mus_credits_mvl/mxv .byte W04 - .byte 53*bgm_thankfor_mvl/mxv + .byte 53*mus_credits_mvl/mxv .byte W02 - .byte 57*bgm_thankfor_mvl/mxv + .byte 57*mus_credits_mvl/mxv .byte W03 - .byte 61*bgm_thankfor_mvl/mxv + .byte 61*mus_credits_mvl/mxv .byte W03 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W04 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte N48 , Cn4 .byte W03 - .byte VOL , 11*bgm_thankfor_mvl/mxv + .byte VOL , 11*mus_credits_mvl/mxv .byte W02 - .byte 16*bgm_thankfor_mvl/mxv + .byte 16*mus_credits_mvl/mxv .byte W03 - .byte 23*bgm_thankfor_mvl/mxv + .byte 23*mus_credits_mvl/mxv .byte W04 - .byte 27*bgm_thankfor_mvl/mxv + .byte 27*mus_credits_mvl/mxv .byte W02 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W03 - .byte 36*bgm_thankfor_mvl/mxv + .byte 36*mus_credits_mvl/mxv .byte W03 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W04 - .byte 48*bgm_thankfor_mvl/mxv + .byte 48*mus_credits_mvl/mxv .byte W02 - .byte 49*bgm_thankfor_mvl/mxv + .byte 49*mus_credits_mvl/mxv .byte W03 - .byte 56*bgm_thankfor_mvl/mxv + .byte 56*mus_credits_mvl/mxv .byte W03 - .byte 61*bgm_thankfor_mvl/mxv + .byte 61*mus_credits_mvl/mxv .byte W04 - .byte 62*bgm_thankfor_mvl/mxv + .byte 62*mus_credits_mvl/mxv .byte W12 .byte PATT - .word bgm_thankfor_7_000 + .word mus_credits_7_000 .byte PATT - .word bgm_thankfor_7_001 + .word mus_credits_7_001 .byte PATT - .word bgm_thankfor_7_002 + .word mus_credits_7_002 .byte N06 , En4 , v112 .byte W24 .byte N24 @@ -5364,7 +5364,7 @@ bgm_thankfor_7_003: .byte W24 .byte En4 .byte W24 -bgm_thankfor_7_004: +mus_credits_7_004: .byte N24 , An4 , v112 .byte W24 .byte N24 @@ -5375,7 +5375,7 @@ bgm_thankfor_7_004: .byte W24 .byte PEND .byte PATT - .word bgm_thankfor_7_004 + .word mus_credits_7_004 .byte N24 , An4 , v112 .byte W24 .byte N24 @@ -5385,7 +5385,7 @@ bgm_thankfor_7_004: .byte N24 .byte W24 .byte W96 - .byte VOL , 31*bgm_thankfor_mvl/mxv + .byte VOL , 31*mus_credits_mvl/mxv .byte N24 , Gn3 .byte W24 .byte N24 @@ -5451,7 +5451,7 @@ bgm_thankfor_7_004: .byte Gn3 .byte W24 .byte VOICE , 80 - .byte VOL , 41*bgm_thankfor_mvl/mxv + .byte VOL , 41*mus_credits_mvl/mxv .byte N12 , Gn2 .byte W12 .byte Dn2 @@ -5553,22 +5553,22 @@ bgm_thankfor_7_004: .byte W12 .byte MOD , 7 .byte W03 - .byte VOL , 45*bgm_thankfor_mvl/mxv + .byte VOL , 45*mus_credits_mvl/mxv .byte W02 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W03 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W03 - .byte 36*bgm_thankfor_mvl/mxv + .byte 36*mus_credits_mvl/mxv .byte W03 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W03 - .byte 25*bgm_thankfor_mvl/mxv + .byte 25*mus_credits_mvl/mxv .byte W03 - .byte 23*bgm_thankfor_mvl/mxv + .byte 23*mus_credits_mvl/mxv .byte W04 .byte VOICE , 105 - .byte VOL , 37*bgm_thankfor_mvl/mxv + .byte VOL , 37*mus_credits_mvl/mxv .byte MOD , 0 .byte N03 , Cn4 .byte W03 @@ -5590,7 +5590,7 @@ bgm_thankfor_7_004: .byte W12 .byte An3 .byte W12 - .byte VOL , 37*bgm_thankfor_mvl/mxv + .byte VOL , 37*mus_credits_mvl/mxv .byte N36 , Gn3 .byte W12 .byte MOD , 8 @@ -5721,7 +5721,7 @@ bgm_thankfor_7_004: .byte W96 .byte VOICE , 86 .byte PAN , c_v+0 - .byte VOL , 50*bgm_thankfor_mvl/mxv + .byte VOL , 50*mus_credits_mvl/mxv .byte N32 , Gn1 .byte W36 .byte N02 @@ -5825,7 +5825,7 @@ bgm_thankfor_7_004: .byte Bn1 .byte W12 .byte PAN , c_v+0 - .byte VOL , 34*bgm_thankfor_mvl/mxv + .byte VOL , 34*mus_credits_mvl/mxv .byte N36 , Cn2 .byte W36 .byte N06 @@ -5870,7 +5870,7 @@ bgm_thankfor_7_004: .byte W36 .byte N06 .byte W12 -bgm_thankfor_7_005: +mus_credits_7_005: .byte N36 , An2 , v112 .byte W36 .byte N06 @@ -5897,80 +5897,80 @@ bgm_thankfor_7_005: .byte Gn2 .byte W12 .byte PATT - .word bgm_thankfor_7_005 + .word mus_credits_7_005 .byte PATT - .word bgm_thankfor_7_005 + .word mus_credits_7_005 .byte PATT - .word bgm_thankfor_7_005 + .word mus_credits_7_005 .byte VOICE , 109 - .byte VOL , 7*bgm_thankfor_mvl/mxv + .byte VOL , 7*mus_credits_mvl/mxv .byte TIE , An4 , v112 .byte W02 - .byte VOL , 7*bgm_thankfor_mvl/mxv + .byte VOL , 7*mus_credits_mvl/mxv .byte W36 - .byte 7*bgm_thankfor_mvl/mxv + .byte 7*mus_credits_mvl/mxv .byte W30 - .byte 7*bgm_thankfor_mvl/mxv + .byte 7*mus_credits_mvl/mxv .byte W06 - .byte 8*bgm_thankfor_mvl/mxv + .byte 8*mus_credits_mvl/mxv .byte W03 - .byte 9*bgm_thankfor_mvl/mxv + .byte 9*mus_credits_mvl/mxv .byte W03 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte W09 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W03 - .byte 11*bgm_thankfor_mvl/mxv + .byte 11*mus_credits_mvl/mxv .byte W01 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte W03 - .byte 10*bgm_thankfor_mvl/mxv + .byte 10*mus_credits_mvl/mxv .byte W02 - .byte 14*bgm_thankfor_mvl/mxv + .byte 14*mus_credits_mvl/mxv .byte W06 - .byte 17*bgm_thankfor_mvl/mxv + .byte 17*mus_credits_mvl/mxv .byte W04 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W02 - .byte 21*bgm_thankfor_mvl/mxv + .byte 21*mus_credits_mvl/mxv .byte W03 - .byte 24*bgm_thankfor_mvl/mxv + .byte 24*mus_credits_mvl/mxv .byte W03 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W04 - .byte 29*bgm_thankfor_mvl/mxv + .byte 29*mus_credits_mvl/mxv .byte W02 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W03 - .byte 34*bgm_thankfor_mvl/mxv + .byte 34*mus_credits_mvl/mxv .byte W03 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W04 - .byte 41*bgm_thankfor_mvl/mxv + .byte 41*mus_credits_mvl/mxv .byte W02 - .byte 44*bgm_thankfor_mvl/mxv + .byte 44*mus_credits_mvl/mxv .byte W03 - .byte 49*bgm_thankfor_mvl/mxv + .byte 49*mus_credits_mvl/mxv .byte W03 - .byte 54*bgm_thankfor_mvl/mxv + .byte 54*mus_credits_mvl/mxv .byte W04 - .byte 57*bgm_thankfor_mvl/mxv + .byte 57*mus_credits_mvl/mxv .byte W02 - .byte 60*bgm_thankfor_mvl/mxv + .byte 60*mus_credits_mvl/mxv .byte W03 - .byte 66*bgm_thankfor_mvl/mxv + .byte 66*mus_credits_mvl/mxv .byte W03 - .byte 67*bgm_thankfor_mvl/mxv + .byte 67*mus_credits_mvl/mxv .byte W04 - .byte 72*bgm_thankfor_mvl/mxv + .byte 72*mus_credits_mvl/mxv .byte W02 - .byte 74*bgm_thankfor_mvl/mxv + .byte 74*mus_credits_mvl/mxv .byte W03 - .byte 78*bgm_thankfor_mvl/mxv + .byte 78*mus_credits_mvl/mxv .byte W03 - .byte 82*bgm_thankfor_mvl/mxv + .byte 82*mus_credits_mvl/mxv .byte W04 - .byte 87*bgm_thankfor_mvl/mxv + .byte 87*mus_credits_mvl/mxv .byte W24 .byte EOT .byte W96 @@ -5978,11 +5978,11 @@ bgm_thankfor_7_005: @********************** Track 8 **********************@ -bgm_thankfor_8: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_8: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 70*bgm_thankfor_mvl/mxv + .byte VOL , 70*mus_credits_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -6068,15 +6068,15 @@ bgm_thankfor_8: @********************** Track 9 **********************@ -bgm_thankfor_9: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_9: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 37*bgm_thankfor_mvl/mxv + .byte VOL , 37*mus_credits_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -6107,7 +6107,7 @@ bgm_thankfor_9: .byte VOICE , 6 .byte W48 .byte PAN , c_v+0 - .byte VOL , 21*bgm_thankfor_mvl/mxv + .byte VOL , 21*mus_credits_mvl/mxv .byte BEND , c_v+1 .byte W24 .byte N12 , Gn4 , v112 @@ -6209,7 +6209,7 @@ bgm_thankfor_9: .byte MOD , 5 .byte W48 .byte VOICE , 74 - .byte VOL , 25*bgm_thankfor_mvl/mxv + .byte VOL , 25*mus_credits_mvl/mxv .byte MOD , 0 .byte W24 .byte W03 @@ -6381,7 +6381,7 @@ bgm_thankfor_9: .byte W96 .byte VOICE , 82 .byte PAN , c_v+63 - .byte VOL , 28*bgm_thankfor_mvl/mxv + .byte VOL , 28*mus_credits_mvl/mxv .byte W24 .byte N12 , Cs2 , v112 .byte W12 @@ -6471,10 +6471,10 @@ bgm_thankfor_9: .byte W06 .byte 0 .byte W96 - .byte VOL , 25*bgm_thankfor_mvl/mxv + .byte VOL , 25*mus_credits_mvl/mxv .byte N96 , En3 .byte W48 - .byte VOL , 50*bgm_thankfor_mvl/mxv + .byte VOL , 50*mus_credits_mvl/mxv .byte W48 .byte N03 , An2 .byte W96 @@ -6482,13 +6482,13 @@ bgm_thankfor_9: @********************** Track 10 **********************@ -bgm_thankfor_10: - .byte KEYSH , bgm_thankfor_key+0 +mus_credits_10: + .byte KEYSH , mus_credits_key+0 .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-17 - .byte VOL , 70*bgm_thankfor_mvl/mxv + .byte VOL , 70*mus_credits_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -6501,7 +6501,7 @@ bgm_thankfor_10: .byte N24 , Fs3 , v080 .byte W24 .byte W03 -bgm_thankfor_10_000: +mus_credits_10_000: .byte W24 .byte N24 , Bn2 , v088 .byte W24 @@ -6533,7 +6533,7 @@ bgm_thankfor_10_000: .byte W24 .byte Gn2 , v084 .byte W24 -bgm_thankfor_10_001: +mus_credits_10_001: .byte W24 .byte N24 , Cn3 , v088 .byte W24 @@ -6542,7 +6542,7 @@ bgm_thankfor_10_001: .byte Cn3 .byte W24 .byte PEND -bgm_thankfor_10_002: +mus_credits_10_002: .byte N24 , Dn3 , v076 .byte W24 .byte Cn3 , v084 @@ -6552,7 +6552,7 @@ bgm_thankfor_10_002: .byte Cn3 , v104 .byte W24 .byte PEND -bgm_thankfor_10_003: +mus_credits_10_003: .byte W24 .byte N24 , Fs3 , v088 .byte W24 @@ -6567,7 +6567,7 @@ bgm_thankfor_10_003: .byte N42 , Fs4 , v112 .byte W54 .byte PATT - .word bgm_thankfor_10_000 + .word mus_credits_10_000 .byte N24 , Cn3 , v076 .byte W24 .byte Bn2 , v084 @@ -6592,13 +6592,13 @@ bgm_thankfor_10_003: .byte Gn2 , v104 .byte W24 .byte PATT - .word bgm_thankfor_10_001 + .word mus_credits_10_001 .byte PATT - .word bgm_thankfor_10_002 + .word mus_credits_10_002 .byte PATT - .word bgm_thankfor_10_003 + .word mus_credits_10_003 .byte W96 -bgm_thankfor_10_004: +mus_credits_10_004: .byte W24 .byte N24 , Bn2 , v092 .byte W48 @@ -6621,7 +6621,7 @@ bgm_thankfor_10_004: .byte N24 .byte W24 .byte PATT - .word bgm_thankfor_10_004 + .word mus_credits_10_004 .byte W24 .byte N24 , Gs2 , v092 .byte W48 @@ -6638,7 +6638,7 @@ bgm_thankfor_10_004: .byte Bn2 , v112 .byte W48 .byte VOICE , 48 - .byte VOL , 41*bgm_thankfor_mvl/mxv + .byte VOL , 41*mus_credits_mvl/mxv .byte PAN , c_v+25 .byte N12 , Dn3 .byte W12 @@ -6732,41 +6732,41 @@ bgm_thankfor_10_004: .byte W24 .byte Cn4 .byte W24 - .byte VOL , 14*bgm_thankfor_mvl/mxv + .byte VOL , 14*mus_credits_mvl/mxv .byte N96 , Dn3 .byte W09 - .byte VOL , 15*bgm_thankfor_mvl/mxv + .byte VOL , 15*mus_credits_mvl/mxv .byte W05 - .byte 17*bgm_thankfor_mvl/mxv + .byte 17*mus_credits_mvl/mxv .byte W03 - .byte 18*bgm_thankfor_mvl/mxv + .byte 18*mus_credits_mvl/mxv .byte W04 - .byte 21*bgm_thankfor_mvl/mxv + .byte 21*mus_credits_mvl/mxv .byte W02 - .byte 22*bgm_thankfor_mvl/mxv + .byte 22*mus_credits_mvl/mxv .byte W01 .byte VOICE , 48 .byte PAN , c_v+41 .byte W02 - .byte VOL , 24*bgm_thankfor_mvl/mxv + .byte VOL , 24*mus_credits_mvl/mxv .byte W03 - .byte 26*bgm_thankfor_mvl/mxv + .byte 26*mus_credits_mvl/mxv .byte W06 - .byte 31*bgm_thankfor_mvl/mxv + .byte 31*mus_credits_mvl/mxv .byte W03 - .byte 33*bgm_thankfor_mvl/mxv + .byte 33*mus_credits_mvl/mxv .byte W03 - .byte 36*bgm_thankfor_mvl/mxv + .byte 36*mus_credits_mvl/mxv .byte W04 - .byte 37*bgm_thankfor_mvl/mxv + .byte 37*mus_credits_mvl/mxv .byte W02 - .byte 40*bgm_thankfor_mvl/mxv + .byte 40*mus_credits_mvl/mxv .byte W03 - .byte 42*bgm_thankfor_mvl/mxv + .byte 42*mus_credits_mvl/mxv .byte W44 .byte W02 .byte PAN , c_v+25 - .byte VOL , 34*bgm_thankfor_mvl/mxv + .byte VOL , 34*mus_credits_mvl/mxv .byte N36 .byte W36 .byte N06 , Cs3 @@ -6866,7 +6866,7 @@ bgm_thankfor_10_004: .byte N18 , Dn4 .byte W72 .byte VOICE , 60 - .byte VOL , 64*bgm_thankfor_mvl/mxv + .byte VOL , 64*mus_credits_mvl/mxv .byte PAN , c_v+0 .byte W12 .byte N06 , Gn3 @@ -6875,7 +6875,7 @@ bgm_thankfor_10_004: .byte W06 .byte VOICE , 56 .byte PAN , c_v+45 - .byte VOL , 34*bgm_thankfor_mvl/mxv + .byte VOL , 34*mus_credits_mvl/mxv .byte N32 , Dn5 .byte W12 .byte MOD , 8 @@ -6932,7 +6932,7 @@ bgm_thankfor_10_004: .byte W06 .byte VOICE , 1 .byte PAN , c_v+23 - .byte VOL , 41*bgm_thankfor_mvl/mxv + .byte VOL , 41*mus_credits_mvl/mxv .byte N03 , An4 .byte W06 .byte N03 @@ -7018,7 +7018,7 @@ bgm_thankfor_10_004: .byte Dn5 .byte W03 .byte VOICE , 46 - .byte VOL , 53*bgm_thankfor_mvl/mxv + .byte VOL , 53*mus_credits_mvl/mxv .byte PAN , c_v-40 .byte N03 , Dn3 .byte W03 @@ -7120,7 +7120,7 @@ bgm_thankfor_10_004: .byte W03 .byte VOICE , 60 .byte PAN , c_v-41 - .byte VOL , 44*bgm_thankfor_mvl/mxv + .byte VOL , 44*mus_credits_mvl/mxv .byte N12 , Gn4 .byte W12 .byte An4 @@ -7151,7 +7151,7 @@ bgm_thankfor_10_004: .byte W04 .byte VOICE , 46 .byte PAN , c_v-41 - .byte VOL , 62*bgm_thankfor_mvl/mxv + .byte VOL , 62*mus_credits_mvl/mxv .byte N03 , Gn5 .byte W03 .byte Fn5 @@ -7221,7 +7221,7 @@ bgm_thankfor_10_004: .byte W03 .byte VOICE , 14 .byte PAN , c_v+32 - .byte VOL , 62*bgm_thankfor_mvl/mxv + .byte VOL , 62*mus_credits_mvl/mxv .byte N36 , Gn4 .byte W36 .byte N48 , Cn5 @@ -7270,7 +7270,7 @@ bgm_thankfor_10_004: .byte N12 , Dn4 .byte W12 .byte VOICE , 48 - .byte VOL , 49*bgm_thankfor_mvl/mxv + .byte VOL , 49*mus_credits_mvl/mxv .byte PAN , c_v-29 .byte N03 , An3 .byte W06 @@ -7440,23 +7440,23 @@ bgm_thankfor_10_004: @******************************************************@ .align 2 -bgm_thankfor: +mus_credits: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_thankfor_pri @ Priority - .byte bgm_thankfor_rev @ Reverb. + .byte mus_credits_pri @ Priority + .byte mus_credits_rev @ Reverb. - .word bgm_thankfor_grp + .word mus_credits_grp - .word bgm_thankfor_1 - .word bgm_thankfor_2 - .word bgm_thankfor_3 - .word bgm_thankfor_4 - .word bgm_thankfor_5 - .word bgm_thankfor_6 - .word bgm_thankfor_7 - .word bgm_thankfor_8 - .word bgm_thankfor_9 - .word bgm_thankfor_10 + .word mus_credits_1 + .word mus_credits_2 + .word mus_credits_3 + .word mus_credits_4 + .word mus_credits_5 + .word mus_credits_6 + .word mus_credits_7 + .word mus_credits_8 + .word mus_credits_9 + .word mus_credits_10 .end diff --git a/sound/songs/bgm_cycling.s b/sound/songs/mus_cycling.s index 043f98129..ba92788be 100644 --- a/sound/songs/bgm_cycling.s +++ b/sound/songs/mus_cycling.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_cycling_grp, voicegroup046 - .equ bgm_cycling_pri, 0 - .equ bgm_cycling_rev, reverb_set+50 - .equ bgm_cycling_mvl, 127 - .equ bgm_cycling_key, 0 - .equ bgm_cycling_tbs, 1 - .equ bgm_cycling_exg, 0 - .equ bgm_cycling_cmp, 1 + .equ mus_cycling_grp, voicegroup046 + .equ mus_cycling_pri, 0 + .equ mus_cycling_rev, reverb_set+50 + .equ mus_cycling_mvl, 127 + .equ mus_cycling_key, 0 + .equ mus_cycling_tbs, 1 + .equ mus_cycling_exg, 0 + .equ mus_cycling_cmp, 1 .section .rodata - .global bgm_cycling + .global mus_cycling .align 2 @********************** Track 1 **********************@ -bgm_cycling_1: - .byte KEYSH , bgm_cycling_key+0 - .byte TEMPO , 138*bgm_cycling_tbs/2 +mus_cycling_1: + .byte KEYSH , mus_cycling_key+0 + .byte TEMPO , 138*mus_cycling_tbs/2 .byte VOICE , 47 .byte PAN , c_v-32 - .byte VOL , 68*bgm_cycling_mvl/mxv + .byte VOL , 68*mus_cycling_mvl/mxv .byte LFOS , 44 .byte W96 -bgm_cycling_1_B1: +mus_cycling_1_B1: .byte W96 .byte W96 .byte W96 @@ -38,155 +38,155 @@ bgm_cycling_1_B1: .byte W12 .byte N92 , Dn2 .byte W24 - .byte VOL , 65*bgm_cycling_mvl/mxv + .byte VOL , 65*mus_cycling_mvl/mxv .byte W02 - .byte 60*bgm_cycling_mvl/mxv + .byte 60*mus_cycling_mvl/mxv .byte W03 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W03 - .byte 54*bgm_cycling_mvl/mxv + .byte 54*mus_cycling_mvl/mxv .byte W04 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W02 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W03 - .byte 44*bgm_cycling_mvl/mxv + .byte 44*mus_cycling_mvl/mxv .byte W03 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W04 - .byte 37*bgm_cycling_mvl/mxv + .byte 37*mus_cycling_mvl/mxv .byte W02 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 30*bgm_cycling_mvl/mxv + .byte 30*mus_cycling_mvl/mxv .byte W03 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W04 - .byte 23*bgm_cycling_mvl/mxv + .byte 23*mus_cycling_mvl/mxv .byte W02 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W03 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W04 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W02 - .byte 8*bgm_cycling_mvl/mxv + .byte 8*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W03 - .byte 3*bgm_cycling_mvl/mxv + .byte 3*mus_cycling_mvl/mxv .byte W04 - .byte 2*bgm_cycling_mvl/mxv + .byte 2*mus_cycling_mvl/mxv .byte W12 .byte VOICE , 9 .byte PAN , c_v-63 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte N48 , En5 , v064 .byte W12 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W02 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W04 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W02 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W04 .byte PAN , c_v+63 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte N48 , Ds5 .byte W12 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W02 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W04 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W02 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W07 .byte VOICE , 47 .byte PAN , c_v-32 - .byte VOL , 68*bgm_cycling_mvl/mxv + .byte VOL , 68*mus_cycling_mvl/mxv .byte N36 , Gn2 , v096 .byte W24 - .byte VOL , 65*bgm_cycling_mvl/mxv + .byte VOL , 65*mus_cycling_mvl/mxv .byte W02 - .byte 60*bgm_cycling_mvl/mxv + .byte 60*mus_cycling_mvl/mxv .byte W03 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W01 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W03 - .byte 68*bgm_cycling_mvl/mxv + .byte 68*mus_cycling_mvl/mxv .byte N06 , Bn1 .byte W12 .byte Bn2 .byte W12 .byte N36 , Gn2 .byte W21 - .byte VOL , 67*bgm_cycling_mvl/mxv + .byte VOL , 67*mus_cycling_mvl/mxv .byte W03 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W02 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W03 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W04 - .byte 68*bgm_cycling_mvl/mxv + .byte 68*mus_cycling_mvl/mxv .byte N48 , An2 .byte W24 - .byte VOL , 67*bgm_cycling_mvl/mxv + .byte VOL , 67*mus_cycling_mvl/mxv .byte W02 - .byte 62*bgm_cycling_mvl/mxv + .byte 62*mus_cycling_mvl/mxv .byte W03 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte W03 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W04 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W02 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W03 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W04 - .byte 68*bgm_cycling_mvl/mxv + .byte 68*mus_cycling_mvl/mxv .byte W12 .byte N06 , Dn2 .byte W12 @@ -196,136 +196,136 @@ bgm_cycling_1_B1: .byte W12 .byte N92 , Cs2 .byte W24 - .byte VOL , 67*bgm_cycling_mvl/mxv + .byte VOL , 67*mus_cycling_mvl/mxv .byte W02 - .byte 64*bgm_cycling_mvl/mxv + .byte 64*mus_cycling_mvl/mxv .byte W06 - .byte 60*bgm_cycling_mvl/mxv + .byte 60*mus_cycling_mvl/mxv .byte W06 - .byte 59*bgm_cycling_mvl/mxv + .byte 59*mus_cycling_mvl/mxv .byte W03 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte W03 - .byte 55*bgm_cycling_mvl/mxv + .byte 55*mus_cycling_mvl/mxv .byte W04 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W02 - .byte 50*bgm_cycling_mvl/mxv + .byte 50*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte W06 - .byte 38*bgm_cycling_mvl/mxv + .byte 38*mus_cycling_mvl/mxv .byte W03 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W04 - .byte 30*bgm_cycling_mvl/mxv + .byte 30*mus_cycling_mvl/mxv .byte W02 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W03 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W04 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W02 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W03 - .byte 13*bgm_cycling_mvl/mxv + .byte 13*mus_cycling_mvl/mxv .byte W07 .byte VOICE , 9 .byte PAN , c_v-63 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte N48 , Dn5 , v064 .byte W12 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W02 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W04 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W02 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W04 .byte PAN , c_v+63 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte N48 , Cs5 .byte W12 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W02 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W04 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W02 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W04 .byte PAN , c_v+0 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte N72 , Cn5 .byte W12 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W02 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W04 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W02 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W04 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W24 .byte VOICE , 46 .byte PAN , c_v-32 - .byte VOL , 68*bgm_cycling_mvl/mxv + .byte VOL , 68*mus_cycling_mvl/mxv .byte N03 , An3 , v112 .byte W03 .byte Cn4 @@ -344,7 +344,7 @@ bgm_cycling_1_B1: .byte W03 .byte VOICE , 35 .byte PAN , c_v+0 - .byte VOL , 83*bgm_cycling_mvl/mxv + .byte VOL , 83*mus_cycling_mvl/mxv .byte N09 , Gn1 .byte W09 .byte N06 , Gn1 , v036 @@ -360,7 +360,7 @@ bgm_cycling_1_B1: .byte W24 .byte N06 .byte W12 -bgm_cycling_1_000: +mus_cycling_1_000: .byte N09 , Gn1 , v112 .byte W09 .byte N06 , Gn1 , v036 @@ -425,7 +425,7 @@ bgm_cycling_1_000: .byte Gn1 , v112 .byte W12 .byte PATT - .word bgm_cycling_1_000 + .word mus_cycling_1_000 .byte N09 , Fs1 , v112 .byte W09 .byte N06 , Fs1 , v036 @@ -497,7 +497,7 @@ bgm_cycling_1_000: .byte N06 .byte W12 .byte VOICE , 48 - .byte VOL , 68*bgm_cycling_mvl/mxv + .byte VOL , 68*mus_cycling_mvl/mxv .byte N06 , An1 , v112 .byte W06 .byte An1 , v032 @@ -563,16 +563,16 @@ bgm_cycling_1_000: .byte An3 , v032 .byte W06 .byte GOTO - .word bgm_cycling_1_B1 + .word mus_cycling_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_cycling_2: - .byte KEYSH , bgm_cycling_key+0 +mus_cycling_2: + .byte KEYSH , mus_cycling_key+0 .byte VOICE , 48 .byte LFOS , 44 - .byte VOL , 80*bgm_cycling_mvl/mxv + .byte VOL , 80*mus_cycling_mvl/mxv .byte PAN , c_v+32 .byte BENDR , 12 .byte W48 @@ -592,7 +592,7 @@ bgm_cycling_2: .byte W06 .byte En5 .byte W06 -bgm_cycling_2_B1: +mus_cycling_2_B1: .byte PAN , c_v-16 .byte N06 , Dn2 , v112 .byte W06 @@ -851,7 +851,7 @@ bgm_cycling_2_B1: .byte W96 .byte VOICE , 1 .byte PAN , c_v-32 - .byte VOL , 50*bgm_cycling_mvl/mxv + .byte VOL , 50*mus_cycling_mvl/mxv .byte N09 , Gn3 .byte W12 .byte N03 , Gn3 , v064 @@ -912,7 +912,7 @@ bgm_cycling_2_B1: .byte W12 .byte N03 .byte W12 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte PAN , c_v+0 .byte N06 , Gn4 , v112 .byte W06 @@ -1070,24 +1070,24 @@ bgm_cycling_2_B1: .byte VOICE , 48 .byte W96 .byte GOTO - .word bgm_cycling_2_B1 + .word mus_cycling_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_cycling_3: - .byte KEYSH , bgm_cycling_key+0 +mus_cycling_3: + .byte KEYSH , mus_cycling_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte W84 .byte N12 , An1 , v108 .byte W12 -bgm_cycling_3_B1: +mus_cycling_3_B1: .byte VOICE , 45 .byte PAN , c_v+27 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte W12 .byte N06 , Fs4 , v112 .byte W06 @@ -1222,7 +1222,7 @@ bgm_cycling_3_B1: .byte Fn4 .byte W06 .byte VOICE , 60 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte PAN , c_v+16 .byte N06 , Dn3 .byte W24 @@ -1231,30 +1231,30 @@ bgm_cycling_3_B1: .byte N36 , Fs3 .byte W24 .byte MOD , 4 - .byte VOL , 52*bgm_cycling_mvl/mxv + .byte VOL , 52*mus_cycling_mvl/mxv .byte MOD , 4 .byte W02 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte W03 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W03 - .byte 47*bgm_cycling_mvl/mxv + .byte 47*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 52*bgm_cycling_mvl/mxv + .byte VOL , 52*mus_cycling_mvl/mxv .byte N06 , En3 .byte W06 .byte Dn3 .byte W06 .byte N36 , Fs3 .byte W24 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte W02 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W07 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte N09 , Dn3 .byte W09 .byte N03 , Gs3 @@ -1268,35 +1268,35 @@ bgm_cycling_3_B1: .byte W12 .byte N72 , Gn3 , v108 .byte W24 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte W02 - .byte 52*bgm_cycling_mvl/mxv + .byte 52*mus_cycling_mvl/mxv .byte W03 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W04 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W02 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W09 - .byte 44*bgm_cycling_mvl/mxv + .byte 44*mus_cycling_mvl/mxv .byte W03 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W04 .byte MOD , 4 - .byte VOL , 42*bgm_cycling_mvl/mxv + .byte VOL , 42*mus_cycling_mvl/mxv .byte W02 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W06 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte N12 , Fs3 , v104 .byte W12 .byte En3 @@ -1304,47 +1304,47 @@ bgm_cycling_3_B1: .byte N48 , Bn3 , v112 .byte W24 .byte MOD , 7 - .byte VOL , 48*bgm_cycling_mvl/mxv + .byte VOL , 48*mus_cycling_mvl/mxv .byte W02 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W03 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W03 - .byte 36*bgm_cycling_mvl/mxv + .byte 36*mus_cycling_mvl/mxv .byte W04 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W02 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W04 - .byte 52*bgm_cycling_mvl/mxv + .byte 52*mus_cycling_mvl/mxv .byte MOD , 0 .byte N44 , Bn2 , v108 .byte W24 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte W02 - .byte 50*bgm_cycling_mvl/mxv + .byte 50*mus_cycling_mvl/mxv .byte W03 - .byte 47*bgm_cycling_mvl/mxv + .byte 47*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W04 .byte MOD , 4 - .byte VOL , 45*bgm_cycling_mvl/mxv + .byte VOL , 45*mus_cycling_mvl/mxv .byte W02 - .byte 42*bgm_cycling_mvl/mxv + .byte 42*mus_cycling_mvl/mxv .byte W03 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W03 - .byte 38*bgm_cycling_mvl/mxv + .byte 38*mus_cycling_mvl/mxv .byte W01 .byte N03 , As2 , v112 .byte W03 .byte MOD , 0 - .byte VOL , 52*bgm_cycling_mvl/mxv + .byte VOL , 52*mus_cycling_mvl/mxv .byte N06 , An2 .byte W24 .byte Bn2 @@ -1352,32 +1352,32 @@ bgm_cycling_3_B1: .byte N36 , Dn3 .byte W24 .byte MOD , 4 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte W02 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W03 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 39*bgm_cycling_mvl/mxv + .byte VOL , 39*mus_cycling_mvl/mxv .byte N06 , Cs3 .byte W06 .byte Bn2 .byte W06 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte N36 , Cs3 .byte W24 .byte MOD , 3 - .byte VOL , 49*bgm_cycling_mvl/mxv + .byte VOL , 49*mus_cycling_mvl/mxv .byte W02 - .byte 47*bgm_cycling_mvl/mxv + .byte 47*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte N12 , Bn2 .byte W12 .byte N36 , An2 @@ -1390,93 +1390,93 @@ bgm_cycling_3_B1: .byte W09 .byte TIE , Fs3 .byte W24 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte MOD , 2 .byte W02 - .byte VOL , 48*bgm_cycling_mvl/mxv + .byte VOL , 48*mus_cycling_mvl/mxv .byte W03 - .byte 47*bgm_cycling_mvl/mxv + .byte 47*mus_cycling_mvl/mxv .byte W03 - .byte 44*bgm_cycling_mvl/mxv + .byte 44*mus_cycling_mvl/mxv .byte W04 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W05 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W03 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W06 - .byte 36*bgm_cycling_mvl/mxv + .byte 36*mus_cycling_mvl/mxv .byte W03 - .byte 35*bgm_cycling_mvl/mxv + .byte 35*mus_cycling_mvl/mxv .byte W03 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W04 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W02 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W03 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W06 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W03 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W06 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W06 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W04 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 24*bgm_cycling_mvl/mxv + .byte VOL , 24*mus_cycling_mvl/mxv .byte W03 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W07 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W02 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W03 - .byte 20*bgm_cycling_mvl/mxv + .byte 20*mus_cycling_mvl/mxv .byte W07 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W02 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W07 - .byte 16*bgm_cycling_mvl/mxv + .byte 16*mus_cycling_mvl/mxv .byte W02 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W06 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W04 - .byte 13*bgm_cycling_mvl/mxv + .byte 13*mus_cycling_mvl/mxv .byte W02 - .byte 12*bgm_cycling_mvl/mxv + .byte 12*mus_cycling_mvl/mxv .byte W03 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 10*bgm_cycling_mvl/mxv + .byte 10*mus_cycling_mvl/mxv .byte W04 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W02 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W03 - .byte 8*bgm_cycling_mvl/mxv + .byte 8*mus_cycling_mvl/mxv .byte W04 - .byte 4*bgm_cycling_mvl/mxv + .byte 4*mus_cycling_mvl/mxv .byte W03 .byte EOT - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte MOD , 0 .byte W24 .byte VOICE , 56 .byte PAN , c_v+25 - .byte VOL , 63*bgm_cycling_mvl/mxv + .byte VOL , 63*mus_cycling_mvl/mxv .byte N09 , Dn4 .byte W12 .byte N03 , Dn4 , v064 @@ -1542,7 +1542,7 @@ bgm_cycling_3_B1: .byte N03 , Fs4 .byte W12 .byte VOICE , 56 - .byte VOL , 66*bgm_cycling_mvl/mxv + .byte VOL , 66*mus_cycling_mvl/mxv .byte N06 , Gn3 .byte W12 .byte Dn3 @@ -1586,22 +1586,22 @@ bgm_cycling_3_B1: .byte W12 .byte MOD , 8 .byte W12 - .byte VOL , 65*bgm_cycling_mvl/mxv + .byte VOL , 65*mus_cycling_mvl/mxv .byte W02 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W01 - .byte 62*bgm_cycling_mvl/mxv + .byte 62*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W01 - .byte 60*bgm_cycling_mvl/mxv + .byte 60*mus_cycling_mvl/mxv .byte W02 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte W01 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 66*bgm_cycling_mvl/mxv + .byte VOL , 66*mus_cycling_mvl/mxv .byte N12 , Gn4 .byte W12 .byte N06 , Fs4 @@ -1665,7 +1665,7 @@ bgm_cycling_3_B1: .byte W96 .byte W96 .byte VOICE , 45 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte PAN , c_v+30 .byte W12 .byte N06 , En4 @@ -1694,7 +1694,7 @@ bgm_cycling_3_B1: .byte Cs4 , v032 .byte W06 .byte VOICE , 48 - .byte VOL , 60*bgm_cycling_mvl/mxv + .byte VOL , 60*mus_cycling_mvl/mxv .byte N06 , Gn4 , v040 .byte W06 .byte Fs4 , v044 @@ -1703,7 +1703,7 @@ bgm_cycling_3_B1: .byte W06 .byte An4 , v052 .byte W06 - .byte VOL , 65*bgm_cycling_mvl/mxv + .byte VOL , 65*mus_cycling_mvl/mxv .byte N06 , Bn4 , v056 .byte W06 .byte Cs5 @@ -1713,19 +1713,19 @@ bgm_cycling_3_B1: .byte En5 .byte W06 .byte GOTO - .word bgm_cycling_3_B1 + .word mus_cycling_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_cycling_4: - .byte KEYSH , bgm_cycling_key+0 +mus_cycling_4: + .byte KEYSH , mus_cycling_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte XCMD , xIECV , 9 .byte xIECL , 8 .byte PAN , c_v+0 - .byte VOL , 41*bgm_cycling_mvl/mxv + .byte VOL , 41*mus_cycling_mvl/mxv .byte BENDR , 12 .byte N06 , Cs2 , v096 .byte W06 @@ -1744,7 +1744,7 @@ bgm_cycling_4: .byte An2 , v096 .byte W06 .byte PAN , c_v-42 - .byte VOL , 29*bgm_cycling_mvl/mxv + .byte VOL , 29*mus_cycling_mvl/mxv .byte N06 , Bn2 .byte W06 .byte An2 , v100 @@ -1761,12 +1761,12 @@ bgm_cycling_4: .byte W06 .byte An3 .byte W06 -bgm_cycling_4_B1: - .byte VOL , 68*bgm_cycling_mvl/mxv +mus_cycling_4_B1: + .byte VOL , 68*mus_cycling_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 -bgm_cycling_4_000: +mus_cycling_4_000: .byte W36 .byte MOD , 7 .byte W24 @@ -1781,13 +1781,13 @@ bgm_cycling_4_000: .byte W96 .byte W96 .byte PATT - .word bgm_cycling_4_000 + .word mus_cycling_4_000 .byte W12 .byte MOD , 0 .byte W60 .byte VOICE , 73 .byte PAN , c_v-16 - .byte VOL , 79*bgm_cycling_mvl/mxv + .byte VOL , 79*mus_cycling_mvl/mxv .byte W12 .byte N12 , An3 , v112 .byte W12 @@ -1804,24 +1804,24 @@ bgm_cycling_4_000: .byte N48 , An4 , v112 .byte W24 .byte MOD , 7 - .byte VOL , 74*bgm_cycling_mvl/mxv + .byte VOL , 74*mus_cycling_mvl/mxv .byte W02 - .byte 68*bgm_cycling_mvl/mxv + .byte 68*mus_cycling_mvl/mxv .byte W03 - .byte 65*bgm_cycling_mvl/mxv + .byte 65*mus_cycling_mvl/mxv .byte W03 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W04 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W02 - .byte 50*bgm_cycling_mvl/mxv + .byte 50*mus_cycling_mvl/mxv .byte W03 - .byte 47*bgm_cycling_mvl/mxv + .byte 47*mus_cycling_mvl/mxv .byte W03 - .byte 44*bgm_cycling_mvl/mxv + .byte 44*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 79*bgm_cycling_mvl/mxv + .byte VOL , 79*mus_cycling_mvl/mxv .byte N12 , An4 , v032 .byte W12 .byte N06 , Fs4 , v112 @@ -1845,42 +1845,42 @@ bgm_cycling_4_000: .byte N96 , En4 , v112 .byte W48 .byte MOD , 5 - .byte VOL , 77*bgm_cycling_mvl/mxv + .byte VOL , 77*mus_cycling_mvl/mxv .byte W02 - .byte 73*bgm_cycling_mvl/mxv + .byte 73*mus_cycling_mvl/mxv .byte W03 - .byte 70*bgm_cycling_mvl/mxv + .byte 70*mus_cycling_mvl/mxv .byte W03 - .byte 68*bgm_cycling_mvl/mxv + .byte 68*mus_cycling_mvl/mxv .byte W04 - .byte 66*bgm_cycling_mvl/mxv + .byte 66*mus_cycling_mvl/mxv .byte W02 - .byte 63*bgm_cycling_mvl/mxv + .byte 63*mus_cycling_mvl/mxv .byte W03 - .byte 60*bgm_cycling_mvl/mxv + .byte 60*mus_cycling_mvl/mxv .byte W03 - .byte 55*bgm_cycling_mvl/mxv + .byte 55*mus_cycling_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W03 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W04 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte W02 - .byte 38*bgm_cycling_mvl/mxv + .byte 38*mus_cycling_mvl/mxv .byte W03 - .byte 35*bgm_cycling_mvl/mxv + .byte 35*mus_cycling_mvl/mxv .byte W03 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 .byte W96 - .byte VOL , 79*bgm_cycling_mvl/mxv + .byte VOL , 79*mus_cycling_mvl/mxv .byte N06 .byte W12 .byte En4 , v032 @@ -1892,24 +1892,24 @@ bgm_cycling_4_000: .byte N48 , Gn4 , v112 .byte W24 .byte MOD , 5 - .byte VOL , 77*bgm_cycling_mvl/mxv + .byte VOL , 77*mus_cycling_mvl/mxv .byte W02 - .byte 73*bgm_cycling_mvl/mxv + .byte 73*mus_cycling_mvl/mxv .byte W03 - .byte 69*bgm_cycling_mvl/mxv + .byte 69*mus_cycling_mvl/mxv .byte W03 - .byte 61*bgm_cycling_mvl/mxv + .byte 61*mus_cycling_mvl/mxv .byte W04 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W02 - .byte 52*bgm_cycling_mvl/mxv + .byte 52*mus_cycling_mvl/mxv .byte W03 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 79*bgm_cycling_mvl/mxv + .byte VOL , 79*mus_cycling_mvl/mxv .byte N12 , Gn4 , v032 .byte W12 .byte N06 , En4 , v112 @@ -1935,86 +1935,86 @@ bgm_cycling_4_000: .byte TIE , Fs5 , v112 .byte W48 .byte MOD , 3 - .byte VOL , 69*bgm_cycling_mvl/mxv + .byte VOL , 69*mus_cycling_mvl/mxv .byte W02 - .byte 66*bgm_cycling_mvl/mxv + .byte 66*mus_cycling_mvl/mxv .byte W03 - .byte 63*bgm_cycling_mvl/mxv + .byte 63*mus_cycling_mvl/mxv .byte W03 - .byte 62*bgm_cycling_mvl/mxv + .byte 62*mus_cycling_mvl/mxv .byte W04 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W02 - .byte 55*bgm_cycling_mvl/mxv + .byte 55*mus_cycling_mvl/mxv .byte W03 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W04 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W02 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W03 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W04 - .byte 36*bgm_cycling_mvl/mxv + .byte 36*mus_cycling_mvl/mxv .byte W02 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W04 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W02 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W04 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W02 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W03 - .byte 16*bgm_cycling_mvl/mxv + .byte 16*mus_cycling_mvl/mxv .byte W03 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W04 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W02 - .byte 13*bgm_cycling_mvl/mxv + .byte 13*mus_cycling_mvl/mxv .byte W03 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W07 - .byte 10*bgm_cycling_mvl/mxv + .byte 10*mus_cycling_mvl/mxv .byte W02 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W06 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 7*bgm_cycling_mvl/mxv + .byte VOL , 7*mus_cycling_mvl/mxv .byte W02 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W03 - .byte 3*bgm_cycling_mvl/mxv + .byte 3*mus_cycling_mvl/mxv .byte W01 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W06 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W03 .byte EOT .byte W24 - .byte VOL , 72*bgm_cycling_mvl/mxv + .byte VOL , 72*mus_cycling_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -2060,17 +2060,17 @@ bgm_cycling_4_000: .byte An3 .byte W06 .byte GOTO - .word bgm_cycling_4_B1 + .word mus_cycling_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_cycling_5: - .byte KEYSH , bgm_cycling_key+0 +mus_cycling_5: + .byte KEYSH , mus_cycling_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 63*bgm_cycling_mvl/mxv + .byte VOL , 63*mus_cycling_mvl/mxv .byte N06 , An2 , v096 .byte W06 .byte Gn2 , v080 @@ -2103,9 +2103,9 @@ bgm_cycling_5: .byte W06 .byte En4 .byte W06 -bgm_cycling_5_B1: +mus_cycling_5_B1: .byte PAN , c_v+0 - .byte VOL , 68*bgm_cycling_mvl/mxv + .byte VOL , 68*mus_cycling_mvl/mxv .byte N06 , Fs4 , v112 .byte W12 .byte Fs4 , v032 @@ -2116,37 +2116,37 @@ bgm_cycling_5_B1: .byte W12 .byte N48 , An4 , v112 .byte W24 - .byte VOL , 60*bgm_cycling_mvl/mxv + .byte VOL , 60*mus_cycling_mvl/mxv .byte W02 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W03 - .byte 55*bgm_cycling_mvl/mxv + .byte 55*mus_cycling_mvl/mxv .byte W03 - .byte 54*bgm_cycling_mvl/mxv + .byte 54*mus_cycling_mvl/mxv .byte W04 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W02 - .byte 50*bgm_cycling_mvl/mxv + .byte 50*mus_cycling_mvl/mxv .byte W03 - .byte 47*bgm_cycling_mvl/mxv + .byte 47*mus_cycling_mvl/mxv .byte W01 .byte MOD , 3 .byte W02 - .byte VOL , 41*bgm_cycling_mvl/mxv + .byte VOL , 41*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 41*bgm_cycling_mvl/mxv + .byte VOL , 41*mus_cycling_mvl/mxv .byte N12 , An4 , v032 .byte W02 - .byte VOL , 36*bgm_cycling_mvl/mxv + .byte VOL , 36*mus_cycling_mvl/mxv .byte W03 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W03 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W01 .byte VOICE , 48 .byte W03 - .byte VOL , 68*bgm_cycling_mvl/mxv + .byte VOL , 68*mus_cycling_mvl/mxv .byte N06 , Fs4 , v112 .byte W12 .byte Gn4 @@ -2167,45 +2167,45 @@ bgm_cycling_5_B1: .byte W12 .byte N96 , En4 , v112 .byte W48 - .byte VOL , 62*bgm_cycling_mvl/mxv + .byte VOL , 62*mus_cycling_mvl/mxv .byte W03 - .byte 60*bgm_cycling_mvl/mxv + .byte 60*mus_cycling_mvl/mxv .byte W02 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W03 - .byte 55*bgm_cycling_mvl/mxv + .byte 55*mus_cycling_mvl/mxv .byte W04 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W02 - .byte 50*bgm_cycling_mvl/mxv + .byte 50*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 44*bgm_cycling_mvl/mxv + .byte 44*mus_cycling_mvl/mxv .byte W04 - .byte 42*bgm_cycling_mvl/mxv + .byte 42*mus_cycling_mvl/mxv .byte W02 - .byte 37*bgm_cycling_mvl/mxv + .byte 37*mus_cycling_mvl/mxv .byte W03 - .byte 35*bgm_cycling_mvl/mxv + .byte 35*mus_cycling_mvl/mxv .byte W03 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W04 .byte MOD , 3 - .byte VOL , 29*bgm_cycling_mvl/mxv + .byte VOL , 29*mus_cycling_mvl/mxv .byte W02 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W03 - .byte 20*bgm_cycling_mvl/mxv + .byte 20*mus_cycling_mvl/mxv .byte W01 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 17*bgm_cycling_mvl/mxv + .byte VOL , 17*mus_cycling_mvl/mxv .byte W48 - .byte 68*bgm_cycling_mvl/mxv + .byte 68*mus_cycling_mvl/mxv .byte W12 .byte N06 , Fs4 , v104 .byte W06 @@ -2230,30 +2230,30 @@ bgm_cycling_5_B1: .byte N48 , Gn4 , v112 .byte W24 .byte W03 - .byte VOL , 62*bgm_cycling_mvl/mxv + .byte VOL , 62*mus_cycling_mvl/mxv .byte W05 - .byte 61*bgm_cycling_mvl/mxv + .byte 61*mus_cycling_mvl/mxv .byte W04 .byte MOD , 3 - .byte VOL , 60*bgm_cycling_mvl/mxv + .byte VOL , 60*mus_cycling_mvl/mxv .byte W02 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W03 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte W03 - .byte 54*bgm_cycling_mvl/mxv + .byte 54*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte N12 , Gn4 , v032 .byte W02 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte W03 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W03 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W04 - .byte 68*bgm_cycling_mvl/mxv + .byte 68*mus_cycling_mvl/mxv .byte N06 , En4 , v112 .byte W12 .byte Fs4 @@ -2272,46 +2272,46 @@ bgm_cycling_5_B1: .byte W12 .byte N96 , An4 , v112 .byte W48 - .byte VOL , 62*bgm_cycling_mvl/mxv + .byte VOL , 62*mus_cycling_mvl/mxv .byte W03 - .byte 60*bgm_cycling_mvl/mxv + .byte 60*mus_cycling_mvl/mxv .byte W02 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W03 - .byte 55*bgm_cycling_mvl/mxv + .byte 55*mus_cycling_mvl/mxv .byte W04 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W02 - .byte 50*bgm_cycling_mvl/mxv + .byte 50*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 44*bgm_cycling_mvl/mxv + .byte 44*mus_cycling_mvl/mxv .byte W04 - .byte 42*bgm_cycling_mvl/mxv + .byte 42*mus_cycling_mvl/mxv .byte W02 - .byte 37*bgm_cycling_mvl/mxv + .byte 37*mus_cycling_mvl/mxv .byte W03 - .byte 35*bgm_cycling_mvl/mxv + .byte 35*mus_cycling_mvl/mxv .byte W03 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W04 .byte MOD , 3 - .byte VOL , 29*bgm_cycling_mvl/mxv + .byte VOL , 29*mus_cycling_mvl/mxv .byte W02 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W03 - .byte 20*bgm_cycling_mvl/mxv + .byte 20*mus_cycling_mvl/mxv .byte W01 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 .byte MOD , 0 .byte N12 , An4 , v032 .byte W96 .byte PAN , c_v-23 - .byte VOL , 45*bgm_cycling_mvl/mxv + .byte VOL , 45*mus_cycling_mvl/mxv .byte N03 , Dn4 , v112 .byte W06 .byte An3 @@ -2565,7 +2565,7 @@ bgm_cycling_5_B1: .byte W12 .byte An4 .byte W12 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte N24 , Bn4 .byte W24 .byte Cs5 @@ -2575,25 +2575,25 @@ bgm_cycling_5_B1: .byte N72 , An5 .byte W24 .byte W24 - .byte VOL , 48*bgm_cycling_mvl/mxv + .byte VOL , 48*mus_cycling_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 43*bgm_cycling_mvl/mxv + .byte VOL , 43*mus_cycling_mvl/mxv .byte W03 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W03 - .byte 37*bgm_cycling_mvl/mxv + .byte 37*mus_cycling_mvl/mxv .byte W04 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W02 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W03 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 51*bgm_cycling_mvl/mxv + .byte VOL , 51*mus_cycling_mvl/mxv .byte N04 , Gn5 , v108 .byte W04 .byte An5 @@ -2823,49 +2823,49 @@ bgm_cycling_5_B1: .byte En4 .byte W06 .byte GOTO - .word bgm_cycling_5_B1 + .word mus_cycling_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_cycling_6: - .byte KEYSH , bgm_cycling_key+0 +mus_cycling_6: + .byte KEYSH , mus_cycling_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 4 .byte xIECL , 4 .byte BENDR , 12 .byte PAN , c_v-61 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte W96 -bgm_cycling_6_B1: +mus_cycling_6_B1: .byte VOICE , 81 .byte PAN , c_v-61 - .byte VOL , 17*bgm_cycling_mvl/mxv + .byte VOL , 17*mus_cycling_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fs2 , v112 .byte W05 - .byte VOL , 18*bgm_cycling_mvl/mxv + .byte VOL , 18*mus_cycling_mvl/mxv .byte W07 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte N24 , Dn3 , v104 .byte W05 - .byte VOL , 22*bgm_cycling_mvl/mxv + .byte VOL , 22*mus_cycling_mvl/mxv .byte W07 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W05 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W07 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte N12 , An2 , v100 .byte W05 - .byte VOL , 31*bgm_cycling_mvl/mxv + .byte VOL , 31*mus_cycling_mvl/mxv .byte W07 .byte VOICE , 84 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte N03 , Fs3 , v092 .byte W12 - .byte VOL , 38*bgm_cycling_mvl/mxv + .byte VOL , 38*mus_cycling_mvl/mxv .byte N06 , Dn5 , v112 .byte W06 .byte En5 @@ -2881,7 +2881,7 @@ bgm_cycling_6_B1: .byte VOICE , 81 .byte N24 , Dn3 , v100 .byte W12 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte W12 .byte N24 , Cs3 , v096 .byte W24 @@ -2890,7 +2890,7 @@ bgm_cycling_6_B1: .byte N12 , Dn3 .byte W12 .byte VOICE , 84 - .byte VOL , 39*bgm_cycling_mvl/mxv + .byte VOL , 39*mus_cycling_mvl/mxv .byte BEND , c_v+0 .byte N12 , Gn3 .byte W12 @@ -2900,24 +2900,24 @@ bgm_cycling_6_B1: .byte W06 .byte N36 , Gn4 .byte W12 - .byte VOL , 39*bgm_cycling_mvl/mxv + .byte VOL , 39*mus_cycling_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 37*bgm_cycling_mvl/mxv + .byte VOL , 37*mus_cycling_mvl/mxv .byte W03 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W04 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W02 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W03 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W04 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte MOD , 0 .byte N06 , Ds3 .byte W06 @@ -2927,22 +2927,22 @@ bgm_cycling_6_B1: .byte W12 .byte MOD , 7 .byte W03 - .byte VOL , 37*bgm_cycling_mvl/mxv + .byte VOL , 37*mus_cycling_mvl/mxv .byte W02 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W03 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W04 - .byte 23*bgm_cycling_mvl/mxv + .byte 23*mus_cycling_mvl/mxv .byte BEND , c_v+0 .byte W02 - .byte VOL , 17*bgm_cycling_mvl/mxv + .byte VOL , 17*mus_cycling_mvl/mxv .byte W04 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W03 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte N06 , Dn3 .byte W03 .byte MOD , 0 @@ -2955,7 +2955,7 @@ bgm_cycling_6_B1: .byte W06 .byte Gn3 .byte W06 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte N03 , Fs3 , v112 .byte W12 .byte En3 @@ -2971,7 +2971,7 @@ bgm_cycling_6_B1: .byte W24 .byte N12 , Cs3 , v088 .byte W12 - .byte VOL , 38*bgm_cycling_mvl/mxv + .byte VOL , 38*mus_cycling_mvl/mxv .byte BEND , c_v+0 .byte N03 , An2 , v096 .byte W09 @@ -2993,7 +2993,7 @@ bgm_cycling_6_B1: .byte W04 .byte Gn5 .byte W04 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte BEND , c_v+0 .byte N06 , An5 .byte W06 @@ -3009,7 +3009,7 @@ bgm_cycling_6_B1: .byte N12 , En3 .byte W12 .byte VOICE , 84 - .byte VOL , 38*bgm_cycling_mvl/mxv + .byte VOL , 38*mus_cycling_mvl/mxv .byte BEND , c_v+0 .byte N12 , Fs3 , v096 .byte W12 @@ -3019,24 +3019,24 @@ bgm_cycling_6_B1: .byte W06 .byte N36 , Fs4 .byte W12 - .byte VOL , 39*bgm_cycling_mvl/mxv + .byte VOL , 39*mus_cycling_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 37*bgm_cycling_mvl/mxv + .byte VOL , 37*mus_cycling_mvl/mxv .byte W03 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W04 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W02 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W03 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W04 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte MOD , 0 .byte N06 , An3 .byte W06 @@ -3046,21 +3046,21 @@ bgm_cycling_6_B1: .byte W12 .byte MOD , 7 .byte W03 - .byte VOL , 37*bgm_cycling_mvl/mxv + .byte VOL , 37*mus_cycling_mvl/mxv .byte W02 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W03 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W04 - .byte 23*bgm_cycling_mvl/mxv + .byte 23*mus_cycling_mvl/mxv .byte W02 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W04 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W03 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 40*bgm_cycling_mvl/mxv + .byte 40*mus_cycling_mvl/mxv .byte N06 , Fs3 .byte W03 .byte MOD , 0 @@ -3076,7 +3076,7 @@ bgm_cycling_6_B1: .byte Fs3 .byte W06 .byte VOICE , 81 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte BEND , c_v+0 .byte N36 , An2 , v112 .byte W15 @@ -3089,111 +3089,111 @@ bgm_cycling_6_B1: .byte N06 , Cs3 .byte W06 .byte PAN , c_v+0 - .byte VOL , 28*bgm_cycling_mvl/mxv + .byte VOL , 28*mus_cycling_mvl/mxv .byte BEND , c_v+1 .byte W84 .byte N12 , An2 , v064 .byte W12 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte N92 , Dn2 .byte W48 - .byte VOL , 32*bgm_cycling_mvl/mxv + .byte VOL , 32*mus_cycling_mvl/mxv .byte W02 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W04 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W02 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W04 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W02 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W03 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 16*bgm_cycling_mvl/mxv + .byte 16*mus_cycling_mvl/mxv .byte W04 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W02 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W03 - .byte 13*bgm_cycling_mvl/mxv + .byte 13*mus_cycling_mvl/mxv .byte W03 - .byte 12*bgm_cycling_mvl/mxv + .byte 12*mus_cycling_mvl/mxv .byte W04 - .byte 35*bgm_cycling_mvl/mxv + .byte 35*mus_cycling_mvl/mxv .byte W96 .byte N36 , Gn2 .byte W09 - .byte VOL , 33*bgm_cycling_mvl/mxv + .byte VOL , 33*mus_cycling_mvl/mxv .byte W03 - .byte 30*bgm_cycling_mvl/mxv + .byte 30*mus_cycling_mvl/mxv .byte W02 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W03 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W04 - .byte 18*bgm_cycling_mvl/mxv + .byte 18*mus_cycling_mvl/mxv .byte W02 - .byte 16*bgm_cycling_mvl/mxv + .byte 16*mus_cycling_mvl/mxv .byte W03 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W07 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte N12 , Bn1 .byte W12 .byte Bn2 .byte W12 .byte N36 , Gn2 .byte W12 - .byte VOL , 33*bgm_cycling_mvl/mxv + .byte VOL , 33*mus_cycling_mvl/mxv .byte W02 - .byte 30*bgm_cycling_mvl/mxv + .byte 30*mus_cycling_mvl/mxv .byte W03 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W07 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W02 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W03 - .byte 18*bgm_cycling_mvl/mxv + .byte 18*mus_cycling_mvl/mxv .byte W03 - .byte 16*bgm_cycling_mvl/mxv + .byte 16*mus_cycling_mvl/mxv .byte W04 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte N60 , An2 .byte W24 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte W02 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W03 - .byte 30*bgm_cycling_mvl/mxv + .byte 30*mus_cycling_mvl/mxv .byte W03 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W04 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W02 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W03 - .byte 18*bgm_cycling_mvl/mxv + .byte 18*mus_cycling_mvl/mxv .byte W03 - .byte 16*bgm_cycling_mvl/mxv + .byte 16*mus_cycling_mvl/mxv .byte W04 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W02 - .byte 13*bgm_cycling_mvl/mxv + .byte 13*mus_cycling_mvl/mxv .byte W10 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte N12 , Dn2 .byte W12 .byte Gn2 @@ -3202,38 +3202,38 @@ bgm_cycling_6_B1: .byte W12 .byte N92 , Cs2 .byte W48 - .byte VOL , 32*bgm_cycling_mvl/mxv + .byte VOL , 32*mus_cycling_mvl/mxv .byte W02 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W06 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W03 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W03 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W04 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W05 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 16*bgm_cycling_mvl/mxv + .byte 16*mus_cycling_mvl/mxv .byte W04 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W02 - .byte 13*bgm_cycling_mvl/mxv + .byte 13*mus_cycling_mvl/mxv .byte W03 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W03 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W04 - .byte 6*bgm_cycling_mvl/mxv + .byte 6*mus_cycling_mvl/mxv .byte W96 .byte VOICE , 84 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte BEND , c_v+0 .byte W72 .byte N12 , Gn5 , v112 @@ -3259,24 +3259,24 @@ bgm_cycling_6_B1: .byte W24 .byte MOD , 9 .byte W24 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte W02 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W04 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W02 - .byte 20*bgm_cycling_mvl/mxv + .byte 20*mus_cycling_mvl/mxv .byte W03 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte N04 , Gn6 , v108 .byte W04 .byte An6 @@ -3336,37 +3336,37 @@ bgm_cycling_6_B1: .byte W24 .byte 0 .byte W24 - .byte VOL , 19*bgm_cycling_mvl/mxv + .byte VOL , 19*mus_cycling_mvl/mxv .byte PAN , c_v+63 .byte N72 , Gn3 .byte W02 - .byte VOL , 21*bgm_cycling_mvl/mxv + .byte VOL , 21*mus_cycling_mvl/mxv .byte W03 - .byte 23*bgm_cycling_mvl/mxv + .byte 23*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W04 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W02 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W03 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W03 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W04 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W02 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 30*bgm_cycling_mvl/mxv + .byte 30*mus_cycling_mvl/mxv .byte W03 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W04 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W05 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 35*bgm_cycling_mvl/mxv + .byte 35*mus_cycling_mvl/mxv .byte W04 .byte MOD , 9 .byte W24 @@ -3375,32 +3375,32 @@ bgm_cycling_6_B1: .byte W12 .byte Bn3 .byte W12 - .byte VOL , 20*bgm_cycling_mvl/mxv + .byte VOL , 20*mus_cycling_mvl/mxv .byte N72 , Cs4 .byte W02 - .byte VOL , 21*bgm_cycling_mvl/mxv + .byte VOL , 21*mus_cycling_mvl/mxv .byte W03 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W03 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W04 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W02 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W03 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W04 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W02 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W06 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W10 .byte MOD , 9 .byte W24 @@ -3409,30 +3409,30 @@ bgm_cycling_6_B1: .byte W12 .byte As3 .byte W12 - .byte VOL , 20*bgm_cycling_mvl/mxv + .byte VOL , 20*mus_cycling_mvl/mxv .byte N72 , An3 .byte W02 - .byte VOL , 21*bgm_cycling_mvl/mxv + .byte VOL , 21*mus_cycling_mvl/mxv .byte W03 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W07 - .byte 23*bgm_cycling_mvl/mxv + .byte 23*mus_cycling_mvl/mxv .byte W02 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W03 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W03 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W06 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W06 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W01 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W09 .byte MOD , 9 .byte W24 @@ -3449,16 +3449,16 @@ bgm_cycling_6_B1: .byte W06 .byte Cs4 .byte W06 - .byte VOL , 27*bgm_cycling_mvl/mxv + .byte VOL , 27*mus_cycling_mvl/mxv .byte N48 , Ds4 .byte W02 - .byte VOL , 30*bgm_cycling_mvl/mxv + .byte VOL , 30*mus_cycling_mvl/mxv .byte W03 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W04 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W12 .byte MOD , 9 .byte W24 @@ -3507,49 +3507,49 @@ bgm_cycling_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_cycling_6_B1 + .word mus_cycling_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_cycling_7: - .byte KEYSH , bgm_cycling_key+0 +mus_cycling_7: + .byte KEYSH , mus_cycling_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte XCMD , xIECV , 4 .byte xIECL , 4 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte W96 -bgm_cycling_7_B1: +mus_cycling_7_B1: .byte VOICE , 87 .byte PAN , c_v+63 - .byte VOL , 14*bgm_cycling_mvl/mxv + .byte VOL , 14*mus_cycling_mvl/mxv .byte N06 , Fs3 , v092 .byte W05 - .byte VOL , 17*bgm_cycling_mvl/mxv + .byte VOL , 17*mus_cycling_mvl/mxv .byte W07 - .byte 18*bgm_cycling_mvl/mxv + .byte 18*mus_cycling_mvl/mxv .byte N24 , An3 , v096 .byte W05 - .byte VOL , 21*bgm_cycling_mvl/mxv + .byte VOL , 21*mus_cycling_mvl/mxv .byte W07 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W05 - .byte 27*bgm_cycling_mvl/mxv + .byte 27*mus_cycling_mvl/mxv .byte W07 - .byte 30*bgm_cycling_mvl/mxv + .byte 30*mus_cycling_mvl/mxv .byte N12 , Fs3 , v100 .byte W05 - .byte VOL , 31*bgm_cycling_mvl/mxv + .byte VOL , 31*mus_cycling_mvl/mxv .byte W07 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte N03 , Dn4 , v076 .byte W09 .byte VOICE , 80 .byte W03 - .byte VOL , 40*bgm_cycling_mvl/mxv + .byte VOL , 40*mus_cycling_mvl/mxv .byte N06 , Fs5 , v080 .byte W06 .byte Gn5 @@ -3569,7 +3569,7 @@ bgm_cycling_7_B1: .byte VOICE , 87 .byte N24 , An3 , v100 .byte W12 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte W12 .byte N24 , Gn3 , v096 .byte W24 @@ -3578,7 +3578,7 @@ bgm_cycling_7_B1: .byte N12 , An3 .byte W12 .byte VOICE , 80 - .byte VOL , 40*bgm_cycling_mvl/mxv + .byte VOL , 40*mus_cycling_mvl/mxv .byte N12 , Gn3 .byte W12 .byte N06 , En3 @@ -3588,24 +3588,24 @@ bgm_cycling_7_B1: .byte N36 , Gn4 .byte W12 .byte MOD , 7 - .byte VOL , 36*bgm_cycling_mvl/mxv + .byte VOL , 36*mus_cycling_mvl/mxv .byte W02 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W03 - .byte 20*bgm_cycling_mvl/mxv + .byte 20*mus_cycling_mvl/mxv .byte W04 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W02 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W03 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 40*bgm_cycling_mvl/mxv + .byte VOL , 40*mus_cycling_mvl/mxv .byte N06 , Ds3 .byte W06 .byte Bn3 @@ -3614,21 +3614,21 @@ bgm_cycling_7_B1: .byte W12 .byte MOD , 7 .byte W03 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte W02 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W03 - .byte 23*bgm_cycling_mvl/mxv + .byte 23*mus_cycling_mvl/mxv .byte W04 - .byte 20*bgm_cycling_mvl/mxv + .byte 20*mus_cycling_mvl/mxv .byte W02 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W03 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W04 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte N06 , Dn3 .byte W03 .byte MOD , 0 @@ -3644,7 +3644,7 @@ bgm_cycling_7_B1: .byte Gn3 .byte W06 .byte VOICE , 87 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte N03 , An3 , v112 .byte W12 .byte Gn3 @@ -3659,7 +3659,7 @@ bgm_cycling_7_B1: .byte W24 .byte N12 , An3 , v088 .byte W12 - .byte VOL , 40*bgm_cycling_mvl/mxv + .byte VOL , 40*mus_cycling_mvl/mxv .byte N03 , En3 , v096 .byte W12 .byte VOICE , 80 @@ -3679,7 +3679,7 @@ bgm_cycling_7_B1: .byte W04 .byte Gn5 .byte W04 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte N06 , An5 .byte W06 .byte An5 , v032 @@ -3694,7 +3694,7 @@ bgm_cycling_7_B1: .byte N12 , Gn3 .byte W12 .byte VOICE , 80 - .byte VOL , 40*bgm_cycling_mvl/mxv + .byte VOL , 40*mus_cycling_mvl/mxv .byte N12 , Fs3 , v096 .byte W12 .byte N06 , An3 @@ -3704,24 +3704,24 @@ bgm_cycling_7_B1: .byte N36 , Fs4 .byte W12 .byte MOD , 7 - .byte VOL , 36*bgm_cycling_mvl/mxv + .byte VOL , 36*mus_cycling_mvl/mxv .byte W02 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W03 - .byte 20*bgm_cycling_mvl/mxv + .byte 20*mus_cycling_mvl/mxv .byte W04 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W02 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W03 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 40*bgm_cycling_mvl/mxv + .byte VOL , 40*mus_cycling_mvl/mxv .byte N06 , An3 .byte W06 .byte Dn4 @@ -3730,21 +3730,21 @@ bgm_cycling_7_B1: .byte W12 .byte MOD , 7 .byte W03 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte W02 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W03 - .byte 23*bgm_cycling_mvl/mxv + .byte 23*mus_cycling_mvl/mxv .byte W04 - .byte 20*bgm_cycling_mvl/mxv + .byte 20*mus_cycling_mvl/mxv .byte W02 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W03 - .byte 9*bgm_cycling_mvl/mxv + .byte 9*mus_cycling_mvl/mxv .byte W03 - .byte 5*bgm_cycling_mvl/mxv + .byte 5*mus_cycling_mvl/mxv .byte W04 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte N06 , Fs3 .byte W03 .byte MOD , 0 @@ -3760,7 +3760,7 @@ bgm_cycling_7_B1: .byte Fs3 .byte W06 .byte VOICE , 87 - .byte VOL , 34*bgm_cycling_mvl/mxv + .byte VOL , 34*mus_cycling_mvl/mxv .byte N36 , Fs3 , v112 .byte W15 .byte MOD , 6 @@ -3771,46 +3771,46 @@ bgm_cycling_7_B1: .byte W03 .byte N06 , En3 .byte W06 - .byte VOL , 56*bgm_cycling_mvl/mxv + .byte VOL , 56*mus_cycling_mvl/mxv .byte PAN , c_v+0 .byte W84 .byte N12 , An2 , v064 .byte W12 .byte N92 , Dn1 .byte W48 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W03 - .byte 48*bgm_cycling_mvl/mxv + .byte 48*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W04 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W02 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W03 - .byte 38*bgm_cycling_mvl/mxv + .byte 38*mus_cycling_mvl/mxv .byte W03 - .byte 35*bgm_cycling_mvl/mxv + .byte 35*mus_cycling_mvl/mxv .byte W04 - .byte 33*bgm_cycling_mvl/mxv + .byte 33*mus_cycling_mvl/mxv .byte W02 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W04 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W02 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W03 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W03 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W04 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte PAN , c_v-63 .byte N24 , En6 .byte W24 @@ -3824,73 +3824,73 @@ bgm_cycling_7_B1: .byte PAN , c_v+0 .byte N36 , Gn1 , v064 .byte W12 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W04 - .byte 36*bgm_cycling_mvl/mxv + .byte 36*mus_cycling_mvl/mxv .byte W02 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 26*bgm_cycling_mvl/mxv + .byte 26*mus_cycling_mvl/mxv .byte W03 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W04 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte N12 , Bn1 .byte W12 .byte N12 .byte W12 .byte N36 , Gn1 .byte W12 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte W02 - .byte 50*bgm_cycling_mvl/mxv + .byte 50*mus_cycling_mvl/mxv .byte W03 - .byte 44*bgm_cycling_mvl/mxv + .byte 44*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 38*bgm_cycling_mvl/mxv + .byte 38*mus_cycling_mvl/mxv .byte W02 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W03 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W04 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte N60 , An1 .byte W24 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 50*bgm_cycling_mvl/mxv + .byte 50*mus_cycling_mvl/mxv .byte W03 - .byte 47*bgm_cycling_mvl/mxv + .byte 47*mus_cycling_mvl/mxv .byte W03 - .byte 42*bgm_cycling_mvl/mxv + .byte 42*mus_cycling_mvl/mxv .byte W04 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W02 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W03 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W04 - .byte 24*bgm_cycling_mvl/mxv + .byte 24*mus_cycling_mvl/mxv .byte W02 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W03 - .byte 13*bgm_cycling_mvl/mxv + .byte 13*mus_cycling_mvl/mxv .byte W03 - .byte 11*bgm_cycling_mvl/mxv + .byte 11*mus_cycling_mvl/mxv .byte W04 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte N12 , Dn1 .byte W12 .byte Gn1 @@ -3899,125 +3899,125 @@ bgm_cycling_7_B1: .byte W12 .byte N92 , Cs1 .byte W48 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W03 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W04 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W02 - .byte 38*bgm_cycling_mvl/mxv + .byte 38*mus_cycling_mvl/mxv .byte W03 - .byte 36*bgm_cycling_mvl/mxv + .byte 36*mus_cycling_mvl/mxv .byte W03 - .byte 32*bgm_cycling_mvl/mxv + .byte 32*mus_cycling_mvl/mxv .byte W04 - .byte 31*bgm_cycling_mvl/mxv + .byte 31*mus_cycling_mvl/mxv .byte W02 - .byte 28*bgm_cycling_mvl/mxv + .byte 28*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W03 - .byte 21*bgm_cycling_mvl/mxv + .byte 21*mus_cycling_mvl/mxv .byte W04 - .byte 19*bgm_cycling_mvl/mxv + .byte 19*mus_cycling_mvl/mxv .byte W02 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 14*bgm_cycling_mvl/mxv + .byte 14*mus_cycling_mvl/mxv .byte W03 - .byte 12*bgm_cycling_mvl/mxv + .byte 12*mus_cycling_mvl/mxv .byte W04 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte PAN , c_v-63 .byte N48 , Dn6 .byte W12 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte W02 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 36*bgm_cycling_mvl/mxv + .byte 36*mus_cycling_mvl/mxv .byte W02 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W04 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W02 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W03 - .byte 12*bgm_cycling_mvl/mxv + .byte 12*mus_cycling_mvl/mxv .byte W04 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte PAN , c_v+63 .byte N48 , Cs6 .byte W12 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte W02 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 36*bgm_cycling_mvl/mxv + .byte 36*mus_cycling_mvl/mxv .byte W02 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W04 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W02 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W03 - .byte 12*bgm_cycling_mvl/mxv + .byte 12*mus_cycling_mvl/mxv .byte W04 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte PAN , c_v+0 .byte N72 , Cn6 , v048 .byte W12 - .byte VOL , 53*bgm_cycling_mvl/mxv + .byte VOL , 53*mus_cycling_mvl/mxv .byte W02 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 36*bgm_cycling_mvl/mxv + .byte 36*mus_cycling_mvl/mxv .byte W02 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 29*bgm_cycling_mvl/mxv + .byte 29*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W04 - .byte 22*bgm_cycling_mvl/mxv + .byte 22*mus_cycling_mvl/mxv .byte W02 - .byte 17*bgm_cycling_mvl/mxv + .byte 17*mus_cycling_mvl/mxv .byte W03 - .byte 15*bgm_cycling_mvl/mxv + .byte 15*mus_cycling_mvl/mxv .byte W03 - .byte 12*bgm_cycling_mvl/mxv + .byte 12*mus_cycling_mvl/mxv .byte W28 .byte VOICE , 82 .byte PAN , c_v-61 - .byte VOL , 55*bgm_cycling_mvl/mxv + .byte VOL , 55*mus_cycling_mvl/mxv .byte N12 , Dn4 , v112 .byte W12 .byte En4 @@ -4041,24 +4041,24 @@ bgm_cycling_7_B1: .byte W24 .byte W24 .byte MOD , 9 - .byte VOL , 54*bgm_cycling_mvl/mxv + .byte VOL , 54*mus_cycling_mvl/mxv .byte W02 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W03 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W03 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W04 - .byte 39*bgm_cycling_mvl/mxv + .byte 39*mus_cycling_mvl/mxv .byte W02 - .byte 34*bgm_cycling_mvl/mxv + .byte 34*mus_cycling_mvl/mxv .byte W03 - .byte 30*bgm_cycling_mvl/mxv + .byte 30*mus_cycling_mvl/mxv .byte W03 - .byte 25*bgm_cycling_mvl/mxv + .byte 25*mus_cycling_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 58*bgm_cycling_mvl/mxv + .byte VOL , 58*mus_cycling_mvl/mxv .byte N04 , Dn5 , v108 .byte W04 .byte En5 @@ -4118,60 +4118,60 @@ bgm_cycling_7_B1: .byte W24 .byte 0 .byte W24 - .byte VOL , 37*bgm_cycling_mvl/mxv + .byte VOL , 37*mus_cycling_mvl/mxv .byte N72 , Dn4 , v080 .byte W05 - .byte VOL , 39*bgm_cycling_mvl/mxv + .byte VOL , 39*mus_cycling_mvl/mxv .byte W03 - .byte 41*bgm_cycling_mvl/mxv + .byte 41*mus_cycling_mvl/mxv .byte W04 - .byte 42*bgm_cycling_mvl/mxv + .byte 42*mus_cycling_mvl/mxv .byte W02 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W03 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W04 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W02 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W03 - .byte 55*bgm_cycling_mvl/mxv + .byte 55*mus_cycling_mvl/mxv .byte W04 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte W02 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W10 .byte MOD , 9 .byte W24 .byte 0 .byte N24 , Ds4 .byte W24 - .byte VOL , 37*bgm_cycling_mvl/mxv + .byte VOL , 37*mus_cycling_mvl/mxv .byte N72 , En4 .byte W02 - .byte VOL , 40*bgm_cycling_mvl/mxv + .byte VOL , 40*mus_cycling_mvl/mxv .byte W03 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W04 - .byte 47*bgm_cycling_mvl/mxv + .byte 47*mus_cycling_mvl/mxv .byte W02 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W03 - .byte 51*bgm_cycling_mvl/mxv + .byte 51*mus_cycling_mvl/mxv .byte W03 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W04 - .byte 54*bgm_cycling_mvl/mxv + .byte 54*mus_cycling_mvl/mxv .byte W02 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte W03 - .byte 58*bgm_cycling_mvl/mxv + .byte 58*mus_cycling_mvl/mxv .byte W19 .byte MOD , 9 .byte W24 @@ -4180,28 +4180,28 @@ bgm_cycling_7_B1: .byte W12 .byte Dn4 .byte W12 - .byte VOL , 41*bgm_cycling_mvl/mxv + .byte VOL , 41*mus_cycling_mvl/mxv .byte N72 , Cs4 .byte W02 - .byte VOL , 42*bgm_cycling_mvl/mxv + .byte VOL , 42*mus_cycling_mvl/mxv .byte W03 - .byte 43*bgm_cycling_mvl/mxv + .byte 43*mus_cycling_mvl/mxv .byte W03 - .byte 45*bgm_cycling_mvl/mxv + .byte 45*mus_cycling_mvl/mxv .byte W04 - .byte 46*bgm_cycling_mvl/mxv + .byte 46*mus_cycling_mvl/mxv .byte W02 - .byte 49*bgm_cycling_mvl/mxv + .byte 49*mus_cycling_mvl/mxv .byte W06 - .byte 52*bgm_cycling_mvl/mxv + .byte 52*mus_cycling_mvl/mxv .byte W04 - .byte 53*bgm_cycling_mvl/mxv + .byte 53*mus_cycling_mvl/mxv .byte W02 - .byte 54*bgm_cycling_mvl/mxv + .byte 54*mus_cycling_mvl/mxv .byte W03 - .byte 56*bgm_cycling_mvl/mxv + .byte 56*mus_cycling_mvl/mxv .byte W03 - .byte 57*bgm_cycling_mvl/mxv + .byte 57*mus_cycling_mvl/mxv .byte W16 .byte MOD , 9 .byte W24 @@ -4214,16 +4214,16 @@ bgm_cycling_7_B1: .byte W06 .byte Fn4 .byte W06 - .byte VOL , 45*bgm_cycling_mvl/mxv + .byte VOL , 45*mus_cycling_mvl/mxv .byte N48 , Fs4 .byte W02 - .byte VOL , 48*bgm_cycling_mvl/mxv + .byte VOL , 48*mus_cycling_mvl/mxv .byte W03 - .byte 52*bgm_cycling_mvl/mxv + .byte 52*mus_cycling_mvl/mxv .byte W03 - .byte 55*bgm_cycling_mvl/mxv + .byte 55*mus_cycling_mvl/mxv .byte W04 - .byte 57*bgm_cycling_mvl/mxv + .byte 57*mus_cycling_mvl/mxv .byte W12 .byte MOD , 9 .byte W24 @@ -4275,20 +4275,20 @@ bgm_cycling_7_B1: .byte 0 .byte W96 .byte GOTO - .word bgm_cycling_7_B1 + .word mus_cycling_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_cycling_8: - .byte KEYSH , bgm_cycling_key+0 +mus_cycling_8: + .byte KEYSH , mus_cycling_key+0 .byte VOICE , 0 .byte PAN , c_v+0 .byte LFOS , 44 - .byte VOL , 45*bgm_cycling_mvl/mxv + .byte VOL , 45*mus_cycling_mvl/mxv .byte W96 -bgm_cycling_8_B1: -bgm_cycling_8_000: +mus_cycling_8_B1: +mus_cycling_8_000: .byte W12 .byte N06 , Fs2 , v112 .byte W24 @@ -4300,10 +4300,10 @@ bgm_cycling_8_000: .byte W12 .byte PEND .byte PATT - .word bgm_cycling_8_000 + .word mus_cycling_8_000 .byte PATT - .word bgm_cycling_8_000 -bgm_cycling_8_001: + .word mus_cycling_8_000 +mus_cycling_8_001: .byte W12 .byte N06 , Fs2 , v112 .byte W24 @@ -4321,13 +4321,13 @@ bgm_cycling_8_001: .byte W12 .byte PEND .byte PATT - .word bgm_cycling_8_000 + .word mus_cycling_8_000 .byte PATT - .word bgm_cycling_8_000 + .word mus_cycling_8_000 .byte PATT - .word bgm_cycling_8_000 + .word mus_cycling_8_000 .byte PATT - .word bgm_cycling_8_001 + .word mus_cycling_8_001 .byte N84 , An2 , v112 .byte W96 .byte W96 @@ -4346,7 +4346,7 @@ bgm_cycling_8_001: .byte W96 .byte W96 .byte PATT - .word bgm_cycling_8_000 + .word mus_cycling_8_000 .byte W12 .byte N06 , Fs2 , v112 .byte W06 @@ -4361,18 +4361,18 @@ bgm_cycling_8_001: .byte W96 .byte W96 .byte GOTO - .word bgm_cycling_8_B1 + .word mus_cycling_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_cycling_9: - .byte KEYSH , bgm_cycling_key+0 +mus_cycling_9: + .byte KEYSH , mus_cycling_key+0 .byte VOICE , 83 - .byte VOL , 45*bgm_cycling_mvl/mxv + .byte VOL , 45*mus_cycling_mvl/mxv .byte PAN , c_v+0 .byte W96 -bgm_cycling_9_B1: +mus_cycling_9_B1: .byte BEND , c_v+0 .byte N06 , Dn2 , v112 .byte W06 @@ -4521,7 +4521,7 @@ bgm_cycling_9_B1: .byte W24 .byte N06 .byte W12 -bgm_cycling_9_000: +mus_cycling_9_000: .byte N09 , Gn1 , v112 .byte W36 .byte N06 @@ -4543,7 +4543,7 @@ bgm_cycling_9_000: .byte W24 .byte N06 , An1 .byte W12 -bgm_cycling_9_001: +mus_cycling_9_001: .byte N09 , Bn1 , v112 .byte W36 .byte N06 @@ -4566,7 +4566,7 @@ bgm_cycling_9_001: .byte N06 .byte W12 .byte PATT - .word bgm_cycling_9_000 + .word mus_cycling_9_000 .byte N09 , Fs1 , v112 .byte W36 .byte N06 @@ -4578,7 +4578,7 @@ bgm_cycling_9_001: .byte N06 , As1 .byte W12 .byte PATT - .word bgm_cycling_9_001 + .word mus_cycling_9_001 .byte N06 , Gn1 , v112 .byte W12 .byte Gn1 , v096 @@ -4611,7 +4611,7 @@ bgm_cycling_9_001: .byte W12 .byte N06 .byte W12 -bgm_cycling_9_002: +mus_cycling_9_002: .byte N06 , An1 , v112 .byte W24 .byte An1 , v096 @@ -4622,30 +4622,30 @@ bgm_cycling_9_002: .byte W24 .byte PEND .byte PATT - .word bgm_cycling_9_002 + .word mus_cycling_9_002 .byte GOTO - .word bgm_cycling_9_B1 + .word mus_cycling_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_cycling: +mus_cycling: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_cycling_pri @ Priority - .byte bgm_cycling_rev @ Reverb. + .byte mus_cycling_pri @ Priority + .byte mus_cycling_rev @ Reverb. - .word bgm_cycling_grp + .word mus_cycling_grp - .word bgm_cycling_1 - .word bgm_cycling_2 - .word bgm_cycling_3 - .word bgm_cycling_4 - .word bgm_cycling_5 - .word bgm_cycling_6 - .word bgm_cycling_7 - .word bgm_cycling_8 - .word bgm_cycling_9 + .word mus_cycling_1 + .word mus_cycling_2 + .word mus_cycling_3 + .word mus_cycling_4 + .word mus_cycling_5 + .word mus_cycling_6 + .word mus_cycling_7 + .word mus_cycling_8 + .word mus_cycling_9 .end diff --git a/sound/songs/bgm_hightown.s b/sound/songs/mus_dewford.s index c33708266..e898a7e98 100644 --- a/sound/songs/bgm_hightown.s +++ b/sound/songs/mus_dewford.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_hightown_grp, voicegroup070 - .equ bgm_hightown_pri, 0 - .equ bgm_hightown_rev, reverb_set+50 - .equ bgm_hightown_mvl, 127 - .equ bgm_hightown_key, 0 - .equ bgm_hightown_tbs, 1 - .equ bgm_hightown_exg, 0 - .equ bgm_hightown_cmp, 1 + .equ mus_dewford_grp, voicegroup070 + .equ mus_dewford_pri, 0 + .equ mus_dewford_rev, reverb_set+50 + .equ mus_dewford_mvl, 127 + .equ mus_dewford_key, 0 + .equ mus_dewford_tbs, 1 + .equ mus_dewford_exg, 0 + .equ mus_dewford_cmp, 1 .section .rodata - .global bgm_hightown + .global mus_dewford .align 2 @********************** Track 1 **********************@ -bgm_hightown_1: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_1_B1: - .byte TEMPO , 94*bgm_hightown_tbs/2 +mus_dewford_1: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_1_B1: + .byte TEMPO , 94*mus_dewford_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 30*bgm_hightown_mvl/mxv + .byte VOL , 30*mus_dewford_mvl/mxv .byte N02 , En5 , v112 .byte W16 .byte En5 , v072 @@ -40,7 +40,7 @@ bgm_hightown_1_B1: .byte W16 .byte En5 , v072 .byte W08 -bgm_hightown_1_000: +mus_dewford_1_000: .byte N02 , En5 , v112 .byte W16 .byte En5 , v072 @@ -59,13 +59,13 @@ bgm_hightown_1_000: .byte W08 .byte PEND .byte PATT - .word bgm_hightown_1_000 + .word mus_dewford_1_000 .byte PATT - .word bgm_hightown_1_000 + .word mus_dewford_1_000 .byte PATT - .word bgm_hightown_1_000 + .word mus_dewford_1_000 .byte PATT - .word bgm_hightown_1_000 + .word mus_dewford_1_000 .byte N02 , En5 , v112 .byte W16 .byte En5 , v072 @@ -83,13 +83,13 @@ bgm_hightown_1_000: .byte En5 , v072 .byte W08 .byte PATT - .word bgm_hightown_1_000 + .word mus_dewford_1_000 .byte PATT - .word bgm_hightown_1_000 + .word mus_dewford_1_000 .byte PATT - .word bgm_hightown_1_000 + .word mus_dewford_1_000 .byte PAN , c_v+63 - .byte VOL , 28*bgm_hightown_mvl/mxv + .byte VOL , 28*mus_dewford_mvl/mxv .byte N02 , En5 , v116 .byte W08 .byte En5 , v072 @@ -188,7 +188,7 @@ bgm_hightown_1_000: .byte W02 .byte N08 , Gs5 , v096 .byte W08 -bgm_hightown_1_001: +mus_dewford_1_001: .byte VOICE , 127 .byte N02 , En5 , v116 .byte W08 @@ -215,7 +215,7 @@ bgm_hightown_1_001: .byte En5 , v092 .byte W08 .byte PEND -bgm_hightown_1_002: +mus_dewford_1_002: .byte N02 , En5 , v116 .byte W08 .byte En5 , v072 @@ -243,39 +243,39 @@ bgm_hightown_1_002: .byte W08 .byte PEND .byte PATT - .word bgm_hightown_1_001 + .word mus_dewford_1_001 .byte PATT - .word bgm_hightown_1_002 + .word mus_dewford_1_002 .byte PATT - .word bgm_hightown_1_001 + .word mus_dewford_1_001 .byte PATT - .word bgm_hightown_1_002 + .word mus_dewford_1_002 .byte PATT - .word bgm_hightown_1_001 + .word mus_dewford_1_001 .byte PATT - .word bgm_hightown_1_002 + .word mus_dewford_1_002 .byte PATT - .word bgm_hightown_1_001 + .word mus_dewford_1_001 .byte PATT - .word bgm_hightown_1_002 + .word mus_dewford_1_002 .byte PATT - .word bgm_hightown_1_001 + .word mus_dewford_1_001 .byte PATT - .word bgm_hightown_1_002 + .word mus_dewford_1_002 .byte GOTO - .word bgm_hightown_1_B1 + .word mus_dewford_1_B1 .byte VOICE , 127 .byte FINE @********************** Track 2 **********************@ -bgm_hightown_2: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_2_B1: +mus_dewford_2: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_2_B1: .byte VOICE , 46 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 49*bgm_hightown_mvl/mxv + .byte VOL , 49*mus_dewford_mvl/mxv .byte PAN , c_v-16 .byte N04 , An4 , v112 .byte W04 @@ -454,18 +454,18 @@ bgm_hightown_2_B1: .byte W12 .byte MOD , 5 .byte W04 - .byte VOL , 45*bgm_hightown_mvl/mxv + .byte VOL , 45*mus_dewford_mvl/mxv .byte W04 - .byte 42*bgm_hightown_mvl/mxv + .byte 42*mus_dewford_mvl/mxv .byte W04 - .byte 37*bgm_hightown_mvl/mxv + .byte 37*mus_dewford_mvl/mxv .byte W04 - .byte 34*bgm_hightown_mvl/mxv + .byte 34*mus_dewford_mvl/mxv .byte W04 - .byte 32*bgm_hightown_mvl/mxv + .byte 32*mus_dewford_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 49*bgm_hightown_mvl/mxv + .byte VOL , 49*mus_dewford_mvl/mxv .byte W02 .byte N02 , Bn4 , v080 .byte W02 @@ -480,26 +480,26 @@ bgm_hightown_2_B1: .byte N48 , En5 .byte W12 .byte MOD , 5 - .byte VOL , 46*bgm_hightown_mvl/mxv + .byte VOL , 46*mus_dewford_mvl/mxv .byte W04 - .byte 44*bgm_hightown_mvl/mxv + .byte 44*mus_dewford_mvl/mxv .byte W04 - .byte 42*bgm_hightown_mvl/mxv + .byte 42*mus_dewford_mvl/mxv .byte W04 - .byte 39*bgm_hightown_mvl/mxv + .byte 39*mus_dewford_mvl/mxv .byte W04 - .byte 37*bgm_hightown_mvl/mxv + .byte 37*mus_dewford_mvl/mxv .byte W04 - .byte 35*bgm_hightown_mvl/mxv + .byte 35*mus_dewford_mvl/mxv .byte W04 - .byte 33*bgm_hightown_mvl/mxv + .byte 33*mus_dewford_mvl/mxv .byte W04 - .byte 31*bgm_hightown_mvl/mxv + .byte 31*mus_dewford_mvl/mxv .byte W04 - .byte 27*bgm_hightown_mvl/mxv + .byte 27*mus_dewford_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 49*bgm_hightown_mvl/mxv + .byte VOL , 49*mus_dewford_mvl/mxv .byte W24 .byte N04 , An5 .byte W04 @@ -593,49 +593,49 @@ bgm_hightown_2_B1: .byte N72 , Dn5 , v112 .byte W24 .byte MOD , 5 - .byte VOL , 46*bgm_hightown_mvl/mxv + .byte VOL , 46*mus_dewford_mvl/mxv .byte W04 - .byte 44*bgm_hightown_mvl/mxv + .byte 44*mus_dewford_mvl/mxv .byte W04 - .byte 41*bgm_hightown_mvl/mxv + .byte 41*mus_dewford_mvl/mxv .byte W04 - .byte 38*bgm_hightown_mvl/mxv + .byte 38*mus_dewford_mvl/mxv .byte W04 - .byte 37*bgm_hightown_mvl/mxv + .byte 37*mus_dewford_mvl/mxv .byte W04 - .byte 35*bgm_hightown_mvl/mxv + .byte 35*mus_dewford_mvl/mxv .byte W04 - .byte 33*bgm_hightown_mvl/mxv + .byte 33*mus_dewford_mvl/mxv .byte W04 - .byte 31*bgm_hightown_mvl/mxv + .byte 31*mus_dewford_mvl/mxv .byte W04 - .byte 28*bgm_hightown_mvl/mxv + .byte 28*mus_dewford_mvl/mxv .byte W04 - .byte 26*bgm_hightown_mvl/mxv + .byte 26*mus_dewford_mvl/mxv .byte W04 - .byte 23*bgm_hightown_mvl/mxv + .byte 23*mus_dewford_mvl/mxv .byte W04 - .byte 22*bgm_hightown_mvl/mxv + .byte 22*mus_dewford_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 49*bgm_hightown_mvl/mxv + .byte VOL , 49*mus_dewford_mvl/mxv .byte W24 .byte GOTO - .word bgm_hightown_2_B1 + .word mus_dewford_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_hightown_3: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_3_B1: +mus_dewford_3: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_3_B1: .byte VOICE , 17 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v-2 - .byte VOL , 49*bgm_hightown_mvl/mxv + .byte VOL , 49*mus_dewford_mvl/mxv .byte N88 , An1 , v112 .byte W88 .byte N08 , En1 @@ -643,7 +643,7 @@ bgm_hightown_3_B1: .byte N96 , An1 .byte W96 .byte VOICE , 35 - .byte VOL , 78*bgm_hightown_mvl/mxv + .byte VOL , 78*mus_dewford_mvl/mxv .byte N12 , Dn2 .byte W16 .byte N04 @@ -674,7 +674,7 @@ bgm_hightown_3_B1: .byte W16 .byte N04 .byte W08 -bgm_hightown_3_000: +mus_dewford_3_000: .byte N08 , Bn1 , v112 .byte W16 .byte N04 @@ -720,7 +720,7 @@ bgm_hightown_3_000: .byte W24 .byte N08 , Dn1 .byte W08 -bgm_hightown_3_001: +mus_dewford_3_001: .byte N08 , Gn1 , v112 .byte W16 .byte N04 @@ -736,7 +736,7 @@ bgm_hightown_3_001: .byte N08 , Dn1 .byte W08 .byte PEND -bgm_hightown_3_002: +mus_dewford_3_002: .byte N08 , An1 , v112 .byte W16 .byte N04 @@ -785,7 +785,7 @@ bgm_hightown_3_002: .byte N04 .byte W08 .byte PATT - .word bgm_hightown_3_000 + .word mus_dewford_3_000 .byte N08 , Bn1 , v112 .byte W16 .byte N04 @@ -803,14 +803,14 @@ bgm_hightown_3_002: .byte N08 .byte W08 .byte PATT - .word bgm_hightown_3_001 + .word mus_dewford_3_001 .byte PATT - .word bgm_hightown_3_001 + .word mus_dewford_3_001 .byte PATT - .word bgm_hightown_3_002 + .word mus_dewford_3_002 .byte N04 , An1 , v112 .byte W96 -bgm_hightown_3_003: +mus_dewford_3_003: .byte N12 , Dn1 , v112 .byte W16 .byte N04 @@ -825,7 +825,7 @@ bgm_hightown_3_003: .byte W08 .byte PEND .byte PATT - .word bgm_hightown_3_003 + .word mus_dewford_3_003 .byte N12 , Gn1 , v112 .byte W16 .byte N04 @@ -851,9 +851,9 @@ bgm_hightown_3_003: .byte N08 , En1 .byte W08 .byte PATT - .word bgm_hightown_3_003 + .word mus_dewford_3_003 .byte PATT - .word bgm_hightown_3_003 + .word mus_dewford_3_003 .byte N12 , Gn1 , v112 .byte W16 .byte N04 @@ -877,19 +877,19 @@ bgm_hightown_3_003: .byte N04 .byte W32 .byte GOTO - .word bgm_hightown_3_B1 + .word mus_dewford_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_hightown_4: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_4_B1: +mus_dewford_4: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_4_B1: .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 50*bgm_hightown_mvl/mxv + .byte VOL , 50*mus_dewford_mvl/mxv .byte N24 , Cs4 , v112 .byte W24 .byte An3 @@ -905,7 +905,7 @@ bgm_hightown_4_B1: .byte En3 .byte W24 .byte VOICE , 17 - .byte VOL , 65*bgm_hightown_mvl/mxv + .byte VOL , 65*mus_dewford_mvl/mxv .byte N08 , An3 .byte W08 .byte Cs4 @@ -913,14 +913,14 @@ bgm_hightown_4_B1: .byte En4 .byte W08 .byte VOICE , 17 - .byte VOL , 63*bgm_hightown_mvl/mxv + .byte VOL , 63*mus_dewford_mvl/mxv .byte N40 , Gn4 .byte W40 .byte N04 , Fs4 .byte W08 .byte N24 .byte W48 -bgm_hightown_4_000: +mus_dewford_4_000: .byte W32 .byte N04 , En4 , v112 .byte W08 @@ -999,81 +999,81 @@ bgm_hightown_4_000: .byte W08 .byte Dn4 .byte W08 - .byte VOL , 7*bgm_hightown_mvl/mxv + .byte VOL , 7*mus_dewford_mvl/mxv .byte N96 , En4 .byte W10 - .byte VOL , 9*bgm_hightown_mvl/mxv + .byte VOL , 9*mus_dewford_mvl/mxv .byte W02 - .byte 9*bgm_hightown_mvl/mxv + .byte 9*mus_dewford_mvl/mxv .byte W01 - .byte 11*bgm_hightown_mvl/mxv + .byte 11*mus_dewford_mvl/mxv .byte W03 - .byte 15*bgm_hightown_mvl/mxv + .byte 15*mus_dewford_mvl/mxv .byte W01 - .byte 17*bgm_hightown_mvl/mxv + .byte 17*mus_dewford_mvl/mxv .byte W03 - .byte 21*bgm_hightown_mvl/mxv + .byte 21*mus_dewford_mvl/mxv .byte W01 - .byte 22*bgm_hightown_mvl/mxv + .byte 22*mus_dewford_mvl/mxv .byte W03 - .byte 26*bgm_hightown_mvl/mxv + .byte 26*mus_dewford_mvl/mxv .byte W01 - .byte 28*bgm_hightown_mvl/mxv + .byte 28*mus_dewford_mvl/mxv .byte W03 - .byte 32*bgm_hightown_mvl/mxv + .byte 32*mus_dewford_mvl/mxv .byte W01 - .byte 35*bgm_hightown_mvl/mxv + .byte 35*mus_dewford_mvl/mxv .byte W03 - .byte 36*bgm_hightown_mvl/mxv + .byte 36*mus_dewford_mvl/mxv .byte W01 - .byte 39*bgm_hightown_mvl/mxv + .byte 39*mus_dewford_mvl/mxv .byte W03 - .byte 43*bgm_hightown_mvl/mxv + .byte 43*mus_dewford_mvl/mxv .byte W01 - .byte 44*bgm_hightown_mvl/mxv + .byte 44*mus_dewford_mvl/mxv .byte W03 - .byte 46*bgm_hightown_mvl/mxv + .byte 46*mus_dewford_mvl/mxv .byte W01 - .byte 48*bgm_hightown_mvl/mxv + .byte 48*mus_dewford_mvl/mxv .byte W03 - .byte 50*bgm_hightown_mvl/mxv + .byte 50*mus_dewford_mvl/mxv .byte W01 - .byte 52*bgm_hightown_mvl/mxv + .byte 52*mus_dewford_mvl/mxv .byte W03 - .byte 54*bgm_hightown_mvl/mxv + .byte 54*mus_dewford_mvl/mxv .byte W01 - .byte 56*bgm_hightown_mvl/mxv + .byte 56*mus_dewford_mvl/mxv .byte W03 - .byte 58*bgm_hightown_mvl/mxv + .byte 58*mus_dewford_mvl/mxv .byte W04 - .byte 60*bgm_hightown_mvl/mxv + .byte 60*mus_dewford_mvl/mxv .byte W04 - .byte 61*bgm_hightown_mvl/mxv + .byte 61*mus_dewford_mvl/mxv .byte W01 - .byte 63*bgm_hightown_mvl/mxv + .byte 63*mus_dewford_mvl/mxv .byte W03 - .byte 63*bgm_hightown_mvl/mxv + .byte 63*mus_dewford_mvl/mxv .byte W01 - .byte 65*bgm_hightown_mvl/mxv + .byte 65*mus_dewford_mvl/mxv .byte W03 - .byte 65*bgm_hightown_mvl/mxv + .byte 65*mus_dewford_mvl/mxv .byte W01 - .byte 66*bgm_hightown_mvl/mxv + .byte 66*mus_dewford_mvl/mxv .byte W03 - .byte 68*bgm_hightown_mvl/mxv + .byte 68*mus_dewford_mvl/mxv .byte W01 - .byte 68*bgm_hightown_mvl/mxv + .byte 68*mus_dewford_mvl/mxv .byte W03 - .byte 71*bgm_hightown_mvl/mxv + .byte 71*mus_dewford_mvl/mxv .byte W04 - .byte 73*bgm_hightown_mvl/mxv + .byte 73*mus_dewford_mvl/mxv .byte W16 - .byte 68*bgm_hightown_mvl/mxv + .byte 68*mus_dewford_mvl/mxv .byte N04 , An4 .byte W24 .byte VOICE , 46 .byte W48 - .byte VOL , 78*bgm_hightown_mvl/mxv + .byte VOL , 78*mus_dewford_mvl/mxv .byte N04 , Gn4 .byte W08 .byte An4 @@ -1090,7 +1090,7 @@ bgm_hightown_4_000: .byte N24 , Fs4 .byte W48 .byte PATT - .word bgm_hightown_4_000 + .word mus_dewford_4_000 .byte N40 , En4 , v112 .byte W24 .byte MOD , 5 @@ -1161,7 +1161,7 @@ bgm_hightown_4_000: .byte W76 .byte N04 , Fs4 .byte W08 - .byte VOL , 40*bgm_hightown_mvl/mxv + .byte VOL , 40*mus_dewford_mvl/mxv .byte N04 , Gn4 .byte W24 .byte VOICE , 48 @@ -1190,13 +1190,13 @@ bgm_hightown_4_000: .byte W04 .byte Gn3 .byte W04 -bgm_hightown_4_001: +mus_dewford_4_001: .byte N48 , An3 , v112 .byte W48 .byte As3 .byte W48 .byte PEND -bgm_hightown_4_002: +mus_dewford_4_002: .byte N48 , Bn3 , v112 .byte W48 .byte Cn4 @@ -1223,9 +1223,9 @@ bgm_hightown_4_002: .byte N08 , Gs3 .byte W08 .byte PATT - .word bgm_hightown_4_001 + .word mus_dewford_4_001 .byte PATT - .word bgm_hightown_4_002 + .word mus_dewford_4_002 .byte N48 , Gn4 , v112 .byte W48 .byte Gn3 @@ -1251,18 +1251,18 @@ bgm_hightown_4_002: .byte An3 .byte W04 .byte GOTO - .word bgm_hightown_4_B1 + .word mus_dewford_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_hightown_5: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_5_B1: +mus_dewford_5: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_5_B1: .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 58*bgm_hightown_mvl/mxv + .byte VOL , 58*mus_dewford_mvl/mxv .byte PAN , c_v+14 .byte N24 , An4 , v112 .byte W24 @@ -1308,21 +1308,21 @@ bgm_hightown_5_B1: .byte Gn4 .byte W04 .byte GOTO - .word bgm_hightown_5_B1 + .word mus_dewford_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_hightown_6: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_6_B1: +mus_dewford_6: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_6_B1: .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 26*bgm_hightown_mvl/mxv + .byte VOL , 26*mus_dewford_mvl/mxv .byte W96 .byte W96 .byte N32 , Dn3 , v112 @@ -1387,36 +1387,36 @@ bgm_hightown_6_B1: .byte W24 .byte MOD , 4 .byte W24 - .byte VOL , 23*bgm_hightown_mvl/mxv + .byte VOL , 23*mus_dewford_mvl/mxv .byte W02 - .byte 25*bgm_hightown_mvl/mxv + .byte 25*mus_dewford_mvl/mxv .byte W03 - .byte 26*bgm_hightown_mvl/mxv + .byte 26*mus_dewford_mvl/mxv .byte W03 - .byte 28*bgm_hightown_mvl/mxv + .byte 28*mus_dewford_mvl/mxv .byte W04 - .byte 29*bgm_hightown_mvl/mxv + .byte 29*mus_dewford_mvl/mxv .byte W02 - .byte 32*bgm_hightown_mvl/mxv + .byte 32*mus_dewford_mvl/mxv .byte W03 - .byte 33*bgm_hightown_mvl/mxv + .byte 33*mus_dewford_mvl/mxv .byte W03 - .byte 35*bgm_hightown_mvl/mxv + .byte 35*mus_dewford_mvl/mxv .byte W04 - .byte 36*bgm_hightown_mvl/mxv + .byte 36*mus_dewford_mvl/mxv .byte W02 - .byte 38*bgm_hightown_mvl/mxv + .byte 38*mus_dewford_mvl/mxv .byte W22 - .byte 29*bgm_hightown_mvl/mxv + .byte 29*mus_dewford_mvl/mxv .byte MOD , 0 .byte N04 , An3 .byte W24 - .byte VOL , 39*bgm_hightown_mvl/mxv + .byte VOL , 39*mus_dewford_mvl/mxv .byte W48 .byte PAN , c_v-58 .byte W24 .byte VOICE , 84 - .byte VOL , 33*bgm_hightown_mvl/mxv + .byte VOL , 33*mus_dewford_mvl/mxv .byte N08 , Fs3 , v120 .byte W08 .byte N02 , Fs3 , v104 @@ -1447,7 +1447,7 @@ bgm_hightown_6_B1: .byte W04 .byte Fs3 , v080 .byte W08 -bgm_hightown_6_000: +mus_dewford_6_000: .byte N08 , Fs3 , v120 .byte W08 .byte N02 , Fs3 , v104 @@ -1481,7 +1481,7 @@ bgm_hightown_6_000: .byte N02 .byte W04 .byte PEND -bgm_hightown_6_001: +mus_dewford_6_001: .byte N08 , Fs3 , v120 .byte W08 .byte N02 , Fs3 , v104 @@ -1514,9 +1514,9 @@ bgm_hightown_6_001: .byte W08 .byte PEND .byte PATT - .word bgm_hightown_6_000 + .word mus_dewford_6_000 .byte PATT - .word bgm_hightown_6_001 + .word mus_dewford_6_001 .byte N08 , Fs3 , v120 .byte W08 .byte N02 , Fs3 , v104 @@ -1654,27 +1654,27 @@ bgm_hightown_6_001: .byte N72 .byte W96 .byte GOTO - .word bgm_hightown_6_B1 + .word mus_dewford_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_hightown_7: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_7_B1: +mus_dewford_7: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_7_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-62 - .byte VOL , 32*bgm_hightown_mvl/mxv + .byte VOL , 32*mus_dewford_mvl/mxv .byte BEND , c_v+0 .byte TIE , En3 , v112 .byte W96 .byte W96 .byte EOT - .byte VOL , 33*bgm_hightown_mvl/mxv + .byte VOL , 33*mus_dewford_mvl/mxv .byte N32 , An2 .byte W32 .byte N04 , Gs2 @@ -1737,36 +1737,36 @@ bgm_hightown_7_B1: .byte W24 .byte MOD , 4 .byte W24 - .byte VOL , 26*bgm_hightown_mvl/mxv + .byte VOL , 26*mus_dewford_mvl/mxv .byte W02 - .byte 27*bgm_hightown_mvl/mxv + .byte 27*mus_dewford_mvl/mxv .byte W03 - .byte 29*bgm_hightown_mvl/mxv + .byte 29*mus_dewford_mvl/mxv .byte W03 - .byte 31*bgm_hightown_mvl/mxv + .byte 31*mus_dewford_mvl/mxv .byte W04 - .byte 32*bgm_hightown_mvl/mxv + .byte 32*mus_dewford_mvl/mxv .byte W02 - .byte 33*bgm_hightown_mvl/mxv + .byte 33*mus_dewford_mvl/mxv .byte W03 - .byte 36*bgm_hightown_mvl/mxv + .byte 36*mus_dewford_mvl/mxv .byte W03 - .byte 38*bgm_hightown_mvl/mxv + .byte 38*mus_dewford_mvl/mxv .byte W04 - .byte 38*bgm_hightown_mvl/mxv + .byte 38*mus_dewford_mvl/mxv .byte W03 - .byte 39*bgm_hightown_mvl/mxv + .byte 39*mus_dewford_mvl/mxv .byte W21 - .byte 29*bgm_hightown_mvl/mxv + .byte 29*mus_dewford_mvl/mxv .byte MOD , 0 .byte N04 , En3 .byte W24 - .byte VOL , 39*bgm_hightown_mvl/mxv + .byte VOL , 39*mus_dewford_mvl/mxv .byte W48 .byte PAN , c_v+61 .byte W24 .byte VOICE , 83 - .byte VOL , 34*bgm_hightown_mvl/mxv + .byte VOL , 34*mus_dewford_mvl/mxv .byte BEND , c_v+0 .byte N08 , Dn4 , v120 .byte W08 @@ -1798,7 +1798,7 @@ bgm_hightown_7_B1: .byte W04 .byte Dn4 , v080 .byte W08 -bgm_hightown_7_000: +mus_dewford_7_000: .byte N08 , Dn4 , v120 .byte W08 .byte N02 , Dn4 , v104 @@ -1832,7 +1832,7 @@ bgm_hightown_7_000: .byte N02 .byte W04 .byte PEND -bgm_hightown_7_001: +mus_dewford_7_001: .byte N08 , Dn4 , v120 .byte W08 .byte N02 , Dn4 , v104 @@ -1865,9 +1865,9 @@ bgm_hightown_7_001: .byte W08 .byte PEND .byte PATT - .word bgm_hightown_7_000 + .word mus_dewford_7_000 .byte PATT - .word bgm_hightown_7_001 + .word mus_dewford_7_001 .byte N08 , Dn4 , v120 .byte W08 .byte N02 , Dn4 , v104 @@ -1960,13 +1960,13 @@ bgm_hightown_7_001: .byte W04 .byte Gn4 .byte W04 -bgm_hightown_7_002: +mus_dewford_7_002: .byte N48 , An4 , v112 .byte W48 .byte As4 .byte W48 .byte PEND -bgm_hightown_7_003: +mus_dewford_7_003: .byte N48 , Bn4 , v112 .byte W48 .byte Cn5 @@ -1987,9 +1987,9 @@ bgm_hightown_7_003: .byte N24 , Gs4 .byte W24 .byte PATT - .word bgm_hightown_7_002 + .word mus_dewford_7_002 .byte PATT - .word bgm_hightown_7_003 + .word mus_dewford_7_003 .byte N48 , Bn4 , v112 .byte W48 .byte En4 @@ -1997,17 +1997,17 @@ bgm_hightown_7_003: .byte N72 , An4 .byte W96 .byte GOTO - .word bgm_hightown_7_B1 + .word mus_dewford_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_hightown_8: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_8_B1: +mus_dewford_8: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_8_B1: .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 78*bgm_hightown_mvl/mxv + .byte VOL , 78*mus_dewford_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -2036,7 +2036,7 @@ bgm_hightown_8_B1: .byte W08 .byte N04 , Cn1 , v112 .byte W08 -bgm_hightown_8_000: +mus_dewford_8_000: .byte N04 , Cn1 , v112 .byte W24 .byte En1 @@ -2050,7 +2050,7 @@ bgm_hightown_8_000: .byte En1 .byte W24 .byte PEND -bgm_hightown_8_001: +mus_dewford_8_001: .byte N04 , Cn1 , v112 .byte W24 .byte En1 @@ -2067,7 +2067,7 @@ bgm_hightown_8_001: .byte W08 .byte PEND .byte PATT - .word bgm_hightown_8_000 + .word mus_dewford_8_000 .byte N04 , Cn1 , v112 .byte W24 .byte En1 @@ -2085,11 +2085,11 @@ bgm_hightown_8_001: .byte En1 .byte W08 .byte PATT - .word bgm_hightown_8_000 + .word mus_dewford_8_000 .byte PATT - .word bgm_hightown_8_001 + .word mus_dewford_8_001 .byte PATT - .word bgm_hightown_8_000 + .word mus_dewford_8_000 .byte N04 , Cn1 , v112 .byte W08 .byte Dn1 @@ -2115,12 +2115,12 @@ bgm_hightown_8_001: .byte Cn1 .byte W08 .byte PATT - .word bgm_hightown_8_000 + .word mus_dewford_8_000 .byte PATT - .word bgm_hightown_8_001 + .word mus_dewford_8_001 .byte PATT - .word bgm_hightown_8_000 -bgm_hightown_8_002: + .word mus_dewford_8_000 +mus_dewford_8_002: .byte N04 , Cn1 , v112 .byte W24 .byte En1 @@ -2145,28 +2145,28 @@ bgm_hightown_8_002: .byte W08 .byte PEND .byte PATT - .word bgm_hightown_8_000 + .word mus_dewford_8_000 .byte PATT - .word bgm_hightown_8_001 + .word mus_dewford_8_001 .byte PATT - .word bgm_hightown_8_000 + .word mus_dewford_8_000 .byte PATT - .word bgm_hightown_8_002 + .word mus_dewford_8_002 .byte GOTO - .word bgm_hightown_8_B1 + .word mus_dewford_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_hightown_9: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_9_B1: +mus_dewford_9: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_9_B1: .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 31*bgm_hightown_mvl/mxv + .byte VOL , 31*mus_dewford_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+1 .byte N88 , An1 , v112 @@ -2175,7 +2175,7 @@ bgm_hightown_9_B1: .byte W08 .byte N96 , An1 .byte W96 - .byte VOL , 35*bgm_hightown_mvl/mxv + .byte VOL , 35*mus_dewford_mvl/mxv .byte N12 , Dn2 .byte W16 .byte N04 @@ -2206,7 +2206,7 @@ bgm_hightown_9_B1: .byte W16 .byte N04 .byte W08 -bgm_hightown_9_000: +mus_dewford_9_000: .byte N08 , Bn1 , v112 .byte W16 .byte N04 @@ -2252,7 +2252,7 @@ bgm_hightown_9_000: .byte W24 .byte N08 , Dn1 .byte W08 -bgm_hightown_9_001: +mus_dewford_9_001: .byte N08 , Gn1 , v112 .byte W16 .byte N04 @@ -2268,7 +2268,7 @@ bgm_hightown_9_001: .byte N08 , Dn1 .byte W08 .byte PEND -bgm_hightown_9_002: +mus_dewford_9_002: .byte N08 , An1 , v112 .byte W16 .byte N04 @@ -2286,7 +2286,7 @@ bgm_hightown_9_002: .byte PEND .byte N04 , An1 .byte W96 - .byte VOL , 39*bgm_hightown_mvl/mxv + .byte VOL , 39*mus_dewford_mvl/mxv .byte BEND , c_v+1 .byte N12 , Dn2 .byte W16 @@ -2319,7 +2319,7 @@ bgm_hightown_9_002: .byte N04 .byte W08 .byte PATT - .word bgm_hightown_9_000 + .word mus_dewford_9_000 .byte N08 , Bn1 , v112 .byte W16 .byte N04 @@ -2337,14 +2337,14 @@ bgm_hightown_9_002: .byte N08 .byte W08 .byte PATT - .word bgm_hightown_9_001 + .word mus_dewford_9_001 .byte PATT - .word bgm_hightown_9_001 + .word mus_dewford_9_001 .byte PATT - .word bgm_hightown_9_002 + .word mus_dewford_9_002 .byte N04 , An1 , v112 .byte W96 -bgm_hightown_9_003: +mus_dewford_9_003: .byte N12 , Dn1 , v112 .byte W16 .byte N04 @@ -2359,7 +2359,7 @@ bgm_hightown_9_003: .byte W08 .byte PEND .byte PATT - .word bgm_hightown_9_003 + .word mus_dewford_9_003 .byte N12 , Gn1 , v112 .byte W16 .byte N04 @@ -2385,9 +2385,9 @@ bgm_hightown_9_003: .byte N08 , En1 .byte W08 .byte PATT - .word bgm_hightown_9_003 + .word mus_dewford_9_003 .byte PATT - .word bgm_hightown_9_003 + .word mus_dewford_9_003 .byte N12 , Gn1 , v112 .byte W16 .byte N04 @@ -2411,20 +2411,20 @@ bgm_hightown_9_003: .byte N04 .byte W32 .byte GOTO - .word bgm_hightown_9_B1 + .word mus_dewford_9_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 10 **********************@ -bgm_hightown_10: - .byte KEYSH , bgm_hightown_key+0 -bgm_hightown_10_B1: +mus_dewford_10: + .byte KEYSH , mus_dewford_key+0 +mus_dewford_10_B1: .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-23 - .byte VOL , 55*bgm_hightown_mvl/mxv + .byte VOL , 55*mus_dewford_mvl/mxv .byte W96 .byte W96 .byte VOICE , 17 @@ -2434,7 +2434,7 @@ bgm_hightown_10_B1: .byte W08 .byte N24 .byte W48 -bgm_hightown_10_000: +mus_dewford_10_000: .byte W32 .byte N04 , Cs4 , v112 .byte W08 @@ -2513,83 +2513,83 @@ bgm_hightown_10_000: .byte W08 .byte Gn3 .byte W08 - .byte VOL , 6*bgm_hightown_mvl/mxv + .byte VOL , 6*mus_dewford_mvl/mxv .byte N96 .byte W08 - .byte VOL , 1*bgm_hightown_mvl/mxv + .byte VOL , 1*mus_dewford_mvl/mxv .byte W02 - .byte 2*bgm_hightown_mvl/mxv + .byte 2*mus_dewford_mvl/mxv .byte W02 - .byte 4*bgm_hightown_mvl/mxv + .byte 4*mus_dewford_mvl/mxv .byte W04 - .byte 6*bgm_hightown_mvl/mxv + .byte 6*mus_dewford_mvl/mxv .byte W01 - .byte 7*bgm_hightown_mvl/mxv + .byte 7*mus_dewford_mvl/mxv .byte W03 - .byte 9*bgm_hightown_mvl/mxv + .byte 9*mus_dewford_mvl/mxv .byte W01 - .byte 11*bgm_hightown_mvl/mxv + .byte 11*mus_dewford_mvl/mxv .byte W03 - .byte 13*bgm_hightown_mvl/mxv + .byte 13*mus_dewford_mvl/mxv .byte W01 - .byte 15*bgm_hightown_mvl/mxv + .byte 15*mus_dewford_mvl/mxv .byte W03 - .byte 17*bgm_hightown_mvl/mxv + .byte 17*mus_dewford_mvl/mxv .byte W01 - .byte 19*bgm_hightown_mvl/mxv + .byte 19*mus_dewford_mvl/mxv .byte W03 - .byte 21*bgm_hightown_mvl/mxv + .byte 21*mus_dewford_mvl/mxv .byte W01 - .byte 22*bgm_hightown_mvl/mxv + .byte 22*mus_dewford_mvl/mxv .byte W03 - .byte 23*bgm_hightown_mvl/mxv + .byte 23*mus_dewford_mvl/mxv .byte W01 - .byte 24*bgm_hightown_mvl/mxv + .byte 24*mus_dewford_mvl/mxv .byte W03 - .byte 27*bgm_hightown_mvl/mxv + .byte 27*mus_dewford_mvl/mxv .byte W01 - .byte 28*bgm_hightown_mvl/mxv + .byte 28*mus_dewford_mvl/mxv .byte W03 - .byte 30*bgm_hightown_mvl/mxv + .byte 30*mus_dewford_mvl/mxv .byte W04 - .byte 33*bgm_hightown_mvl/mxv + .byte 33*mus_dewford_mvl/mxv .byte W04 - .byte 36*bgm_hightown_mvl/mxv + .byte 36*mus_dewford_mvl/mxv .byte W01 - .byte 38*bgm_hightown_mvl/mxv + .byte 38*mus_dewford_mvl/mxv .byte W03 - .byte 39*bgm_hightown_mvl/mxv + .byte 39*mus_dewford_mvl/mxv .byte W04 - .byte 41*bgm_hightown_mvl/mxv + .byte 41*mus_dewford_mvl/mxv .byte W01 - .byte 43*bgm_hightown_mvl/mxv + .byte 43*mus_dewford_mvl/mxv .byte W03 - .byte 44*bgm_hightown_mvl/mxv + .byte 44*mus_dewford_mvl/mxv .byte W01 - .byte 46*bgm_hightown_mvl/mxv + .byte 46*mus_dewford_mvl/mxv .byte W03 - .byte 46*bgm_hightown_mvl/mxv + .byte 46*mus_dewford_mvl/mxv .byte W01 - .byte 47*bgm_hightown_mvl/mxv + .byte 47*mus_dewford_mvl/mxv .byte W03 - .byte 49*bgm_hightown_mvl/mxv + .byte 49*mus_dewford_mvl/mxv .byte W01 - .byte 50*bgm_hightown_mvl/mxv + .byte 50*mus_dewford_mvl/mxv .byte W03 - .byte 52*bgm_hightown_mvl/mxv + .byte 52*mus_dewford_mvl/mxv .byte W01 - .byte 56*bgm_hightown_mvl/mxv + .byte 56*mus_dewford_mvl/mxv .byte W04 - .byte 58*bgm_hightown_mvl/mxv + .byte 58*mus_dewford_mvl/mxv .byte W03 - .byte 60*bgm_hightown_mvl/mxv + .byte 60*mus_dewford_mvl/mxv .byte W12 - .byte 54*bgm_hightown_mvl/mxv + .byte 54*mus_dewford_mvl/mxv .byte N04 , Cs4 .byte W24 .byte VOICE , 24 .byte W48 - .byte VOL , 48*bgm_hightown_mvl/mxv + .byte VOL , 48*mus_dewford_mvl/mxv .byte N04 , Bn3 .byte W08 .byte Cs4 @@ -2603,7 +2603,7 @@ bgm_hightown_10_000: .byte N24 , An3 .byte W48 .byte PATT - .word bgm_hightown_10_000 + .word mus_dewford_10_000 .byte N40 , Gn3 , v112 .byte W40 .byte N04 , Fs3 @@ -2675,29 +2675,29 @@ bgm_hightown_10_000: .byte W96 .byte W96 .byte GOTO - .word bgm_hightown_10_B1 + .word mus_dewford_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_hightown: +mus_dewford: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_hightown_pri @ Priority - .byte bgm_hightown_rev @ Reverb. + .byte mus_dewford_pri @ Priority + .byte mus_dewford_rev @ Reverb. - .word bgm_hightown_grp + .word mus_dewford_grp - .word bgm_hightown_1 - .word bgm_hightown_2 - .word bgm_hightown_3 - .word bgm_hightown_4 - .word bgm_hightown_5 - .word bgm_hightown_6 - .word bgm_hightown_7 - .word bgm_hightown_8 - .word bgm_hightown_9 - .word bgm_hightown_10 + .word mus_dewford_1 + .word mus_dewford_2 + .word mus_dewford_3 + .word mus_dewford_4 + .word mus_dewford_5 + .word mus_dewford_6 + .word mus_dewford_7 + .word mus_dewford_8 + .word mus_dewford_9 + .word mus_dewford_10 .end diff --git a/sound/songs/mus_dummy.s b/sound/songs/mus_dummy.s new file mode 100644 index 000000000..a3dfa9865 --- /dev/null +++ b/sound/songs/mus_dummy.s @@ -0,0 +1,28 @@ + .include "MPlayDef.s" + + .equ mus_dummy_grp, voicegroup000 + .equ mus_dummy_pri, 0 + .equ mus_dummy_rev, reverb_set+40 + .equ mus_dummy_mvl, 127 + .equ mus_dummy_key, 0 + .equ mus_dummy_tbs, 1 + .equ mus_dummy_exg, 0 + .equ mus_dummy_cmp, 1 + + .section .rodata + .global mus_dummy + .align 2 + +@******************************************************@ + .align 2 + +mus_dummy: + .byte 0 @ NumTrks + .byte 0 @ NumBlks + .byte mus_dummy_pri @ Priority + .byte mus_dummy_rev @ Reverb. + + .word mus_dummy_grp + + + .end diff --git a/sound/songs/bgm_aqa_0.s b/sound/songs/mus_encounter_aqua.s index e111b9427..f019d31b6 100644 --- a/sound/songs/bgm_aqa_0.s +++ b/sound/songs/mus_encounter_aqua.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_aqa_0_grp, voicegroup062 - .equ bgm_aqa_0_pri, 0 - .equ bgm_aqa_0_rev, reverb_set+50 - .equ bgm_aqa_0_mvl, 127 - .equ bgm_aqa_0_key, 0 - .equ bgm_aqa_0_tbs, 1 - .equ bgm_aqa_0_exg, 0 - .equ bgm_aqa_0_cmp, 1 + .equ mus_encounter_aqua_grp, voicegroup062 + .equ mus_encounter_aqua_pri, 0 + .equ mus_encounter_aqua_rev, reverb_set+50 + .equ mus_encounter_aqua_mvl, 127 + .equ mus_encounter_aqua_key, 0 + .equ mus_encounter_aqua_tbs, 1 + .equ mus_encounter_aqua_exg, 0 + .equ mus_encounter_aqua_cmp, 1 .section .rodata - .global bgm_aqa_0 + .global mus_encounter_aqua .align 2 @********************** Track 1 **********************@ -bgm_aqa_0_1: - .byte KEYSH , bgm_aqa_0_key+0 - .byte TEMPO , 140*bgm_aqa_0_tbs/2 +mus_encounter_aqua_1: + .byte KEYSH , mus_encounter_aqua_key+0 + .byte TEMPO , 140*mus_encounter_aqua_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte PAN , c_v+63 - .byte VOL , 46*bgm_aqa_0_mvl/mxv + .byte VOL , 46*mus_encounter_aqua_mvl/mxv .byte W12 -bgm_aqa_0_1_000: +mus_encounter_aqua_1_000: .byte N03 , En4 , v112 .byte W06 .byte En4 , v064 @@ -42,54 +42,54 @@ bgm_aqa_0_1_000: .byte W18 .byte PEND .byte PATT - .word bgm_aqa_0_1_000 -bgm_aqa_0_1_B1: + .word mus_encounter_aqua_1_000 +mus_encounter_aqua_1_B1: .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte PATT - .word bgm_aqa_0_1_000 + .word mus_encounter_aqua_1_000 .byte GOTO - .word bgm_aqa_0_1_B1 + .word mus_encounter_aqua_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_aqa_0_2: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_2: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte PAN , c_v+63 - .byte VOL , 43*bgm_aqa_0_mvl/mxv + .byte VOL , 43*mus_encounter_aqua_mvl/mxv .byte W12 -bgm_aqa_0_2_000: +mus_encounter_aqua_2_000: .byte W12 .byte N12 , Gn4 , v100 .byte W24 @@ -100,67 +100,67 @@ bgm_aqa_0_2_000: .byte N12 .byte W12 .byte PEND - .byte VOL , 10*bgm_aqa_0_mvl/mxv + .byte VOL , 10*mus_encounter_aqua_mvl/mxv .byte W12 .byte N12 .byte W12 - .byte VOL , 21*bgm_aqa_0_mvl/mxv + .byte VOL , 21*mus_encounter_aqua_mvl/mxv .byte W12 .byte N12 .byte W12 - .byte VOL , 32*bgm_aqa_0_mvl/mxv + .byte VOL , 32*mus_encounter_aqua_mvl/mxv .byte W12 .byte N12 .byte W12 - .byte VOL , 43*bgm_aqa_0_mvl/mxv + .byte VOL , 43*mus_encounter_aqua_mvl/mxv .byte W12 .byte N12 .byte W12 -bgm_aqa_0_2_B1: +mus_encounter_aqua_2_B1: .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte PATT - .word bgm_aqa_0_2_000 + .word mus_encounter_aqua_2_000 .byte GOTO - .word bgm_aqa_0_2_B1 + .word mus_encounter_aqua_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_aqa_0_3: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_3: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 - .byte VOL , 86*bgm_aqa_0_mvl/mxv + .byte VOL , 86*mus_encounter_aqua_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+1 .byte W03 @@ -217,7 +217,7 @@ bgm_aqa_0_3: .byte W06 .byte Cn2 .byte W06 -bgm_aqa_0_3_B1: +mus_encounter_aqua_3_B1: .byte PAN , c_v+4 .byte N06 , As0 , v112 .byte W18 @@ -235,7 +235,7 @@ bgm_aqa_0_3_B1: .byte W18 .byte N03 , As0 , v096 .byte W06 -bgm_aqa_0_3_000: +mus_encounter_aqua_3_000: .byte N06 , As0 , v112 .byte W18 .byte N03 , As0 , v096 @@ -471,7 +471,7 @@ bgm_aqa_0_3_000: .byte Gs0 .byte W06 .byte PATT - .word bgm_aqa_0_3_000 + .word mus_encounter_aqua_3_000 .byte N06 , As0 , v112 .byte W18 .byte N03 , As0 , v096 @@ -539,24 +539,24 @@ bgm_aqa_0_3_000: .byte Ds1 .byte W06 .byte GOTO - .word bgm_aqa_0_3_B1 + .word mus_encounter_aqua_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_aqa_0_4: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_4: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 1 .byte LFOS , 44 - .byte VOL , 65*bgm_aqa_0_mvl/mxv + .byte VOL , 65*mus_encounter_aqua_mvl/mxv .byte PAN , c_v+0 .byte W12 .byte W96 .byte W96 -bgm_aqa_0_4_B1: +mus_encounter_aqua_4_B1: .byte VOICE , 1 .byte PAN , c_v-33 - .byte VOL , 35*bgm_aqa_0_mvl/mxv + .byte VOL , 35*mus_encounter_aqua_mvl/mxv .byte N03 , As4 , v112 .byte W06 .byte Cs3 @@ -587,7 +587,7 @@ bgm_aqa_0_4_B1: .byte W06 .byte N12 , Gs4 .byte W12 -bgm_aqa_0_4_000: +mus_encounter_aqua_4_000: .byte N03 , As4 , v112 .byte W06 .byte Cs3 @@ -619,7 +619,7 @@ bgm_aqa_0_4_000: .byte N12 , Gs4 .byte W12 .byte PEND -bgm_aqa_0_4_001: +mus_encounter_aqua_4_001: .byte N03 , As4 , v112 .byte W06 .byte Cs3 @@ -652,13 +652,13 @@ bgm_aqa_0_4_001: .byte W12 .byte PEND .byte PATT - .word bgm_aqa_0_4_001 + .word mus_encounter_aqua_4_001 .byte PATT - .word bgm_aqa_0_4_000 + .word mus_encounter_aqua_4_000 .byte PATT - .word bgm_aqa_0_4_000 + .word mus_encounter_aqua_4_000 .byte VOICE , 56 - .byte VOL , 57*bgm_aqa_0_mvl/mxv + .byte VOL , 57*mus_encounter_aqua_mvl/mxv .byte N03 , Fn4 , v112 .byte W06 .byte N03 @@ -667,7 +667,7 @@ bgm_aqa_0_4_001: .byte W06 .byte N03 , Fn4 .byte W06 - .byte VOL , 62*bgm_aqa_0_mvl/mxv + .byte VOL , 62*mus_encounter_aqua_mvl/mxv .byte N03 , Gn4 .byte W06 .byte N03 @@ -676,7 +676,7 @@ bgm_aqa_0_4_001: .byte W06 .byte N03 , Gn4 .byte W06 - .byte VOL , 63*bgm_aqa_0_mvl/mxv + .byte VOL , 63*mus_encounter_aqua_mvl/mxv .byte N03 , Gs4 .byte W06 .byte N03 @@ -685,7 +685,7 @@ bgm_aqa_0_4_001: .byte W06 .byte N03 , Gs4 .byte W06 - .byte VOL , 75*bgm_aqa_0_mvl/mxv + .byte VOL , 75*mus_encounter_aqua_mvl/mxv .byte N03 , An4 .byte W06 .byte N03 @@ -695,7 +695,7 @@ bgm_aqa_0_4_001: .byte N03 , An4 .byte W06 .byte VOICE , 56 - .byte VOL , 58*bgm_aqa_0_mvl/mxv + .byte VOL , 58*mus_encounter_aqua_mvl/mxv .byte PAN , c_v+0 .byte N06 , Fn5 .byte W06 @@ -727,7 +727,7 @@ bgm_aqa_0_4_001: .byte W06 .byte VOICE , 1 .byte PAN , c_v+12 - .byte VOL , 54*bgm_aqa_0_mvl/mxv + .byte VOL , 54*mus_encounter_aqua_mvl/mxv .byte N06 .byte W06 .byte An4 @@ -907,17 +907,17 @@ bgm_aqa_0_4_001: .byte N48 , Gn4 .byte W96 .byte GOTO - .word bgm_aqa_0_4_B1 + .word mus_encounter_aqua_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_aqa_0_5: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_5: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte PAN , c_v-20 - .byte VOL , 60*bgm_aqa_0_mvl/mxv + .byte VOL , 60*mus_encounter_aqua_mvl/mxv .byte N03 , Cn3 , v112 .byte W03 .byte Ds3 @@ -977,10 +977,10 @@ bgm_aqa_0_5: .byte W06 .byte N03 , Ds4 .byte W06 -bgm_aqa_0_5_B1: +mus_encounter_aqua_5_B1: .byte VOICE , 1 .byte PAN , c_v-38 - .byte VOL , 27*bgm_aqa_0_mvl/mxv + .byte VOL , 27*mus_encounter_aqua_mvl/mxv .byte N03 , As3 , v112 .byte W06 .byte Fn2 @@ -1011,7 +1011,7 @@ bgm_aqa_0_5_B1: .byte W06 .byte N12 , Gs3 .byte W12 -bgm_aqa_0_5_000: +mus_encounter_aqua_5_000: .byte N03 , As3 , v112 .byte W06 .byte As2 @@ -1074,7 +1074,7 @@ bgm_aqa_0_5_000: .byte N12 , Gs3 .byte W12 .byte PATT - .word bgm_aqa_0_5_000 + .word mus_encounter_aqua_5_000 .byte N03 , As3 , v112 .byte W06 .byte Fn2 @@ -1106,9 +1106,9 @@ bgm_aqa_0_5_000: .byte N12 , Gs3 .byte W12 .byte PATT - .word bgm_aqa_0_5_000 + .word mus_encounter_aqua_5_000 .byte VOICE , 56 - .byte VOL , 46*bgm_aqa_0_mvl/mxv + .byte VOL , 46*mus_encounter_aqua_mvl/mxv .byte N03 , Cs3 , v112 .byte W06 .byte N03 @@ -1117,7 +1117,7 @@ bgm_aqa_0_5_000: .byte W06 .byte N03 , Cs3 .byte W06 - .byte VOL , 54*bgm_aqa_0_mvl/mxv + .byte VOL , 54*mus_encounter_aqua_mvl/mxv .byte N03 , Ds3 .byte W06 .byte N03 @@ -1126,7 +1126,7 @@ bgm_aqa_0_5_000: .byte W06 .byte N03 , Ds3 .byte W06 - .byte VOL , 60*bgm_aqa_0_mvl/mxv + .byte VOL , 60*mus_encounter_aqua_mvl/mxv .byte N03 , Fn3 .byte W06 .byte N03 @@ -1135,7 +1135,7 @@ bgm_aqa_0_5_000: .byte W06 .byte N03 , Fn3 .byte W06 - .byte VOL , 67*bgm_aqa_0_mvl/mxv + .byte VOL , 67*mus_encounter_aqua_mvl/mxv .byte N03 .byte W06 .byte N03 @@ -1144,7 +1144,7 @@ bgm_aqa_0_5_000: .byte W06 .byte N03 , Fn3 .byte W06 - .byte VOL , 43*bgm_aqa_0_mvl/mxv + .byte VOL , 43*mus_encounter_aqua_mvl/mxv .byte PAN , c_v-19 .byte N06 .byte W06 @@ -1175,7 +1175,7 @@ bgm_aqa_0_5_000: .byte N03 .byte W06 .byte VOICE , 1 - .byte VOL , 39*bgm_aqa_0_mvl/mxv + .byte VOL , 39*mus_encounter_aqua_mvl/mxv .byte N06 , Fn3 .byte W06 .byte Cs4 @@ -1318,17 +1318,17 @@ bgm_aqa_0_5_000: .byte N48 , Ds4 .byte W96 .byte GOTO - .word bgm_aqa_0_5_B1 + .word mus_encounter_aqua_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_aqa_0_6: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_6: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 71*bgm_aqa_0_mvl/mxv + .byte VOL , 71*mus_encounter_aqua_mvl/mxv .byte N06 , Fn3 , v112 .byte W06 .byte An3 @@ -1369,7 +1369,7 @@ bgm_aqa_0_6: .byte W06 .byte N03 , An4 .byte W06 -bgm_aqa_0_6_B1: +mus_encounter_aqua_6_B1: .byte W96 .byte W96 .byte W96 @@ -1387,19 +1387,19 @@ bgm_aqa_0_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_aqa_0_6_B1 + .word mus_encounter_aqua_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_aqa_0_7: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_7: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+0 - .byte VOL , 33*bgm_aqa_0_mvl/mxv + .byte VOL , 33*mus_encounter_aqua_mvl/mxv .byte BENDR , 12 .byte W12 .byte W06 @@ -1465,10 +1465,10 @@ bgm_aqa_0_7: .byte W06 .byte N03 , An4 .byte W06 -bgm_aqa_0_7_B1: +mus_encounter_aqua_7_B1: .byte VOICE , 85 .byte PAN , c_v+63 - .byte VOL , 39*bgm_aqa_0_mvl/mxv + .byte VOL , 39*mus_encounter_aqua_mvl/mxv .byte N06 , Fn4 , v112 .byte W06 .byte N03 , Fn3 @@ -1518,7 +1518,7 @@ bgm_aqa_0_7_B1: .byte W12 .byte Cn4 .byte W06 -bgm_aqa_0_7_000: +mus_encounter_aqua_7_000: .byte N78 , As3 , v112 .byte W24 .byte MOD , 2 @@ -1530,7 +1530,7 @@ bgm_aqa_0_7_000: .byte PEND .byte VOICE , 80 .byte PAN , c_v+0 - .byte VOL , 44*bgm_aqa_0_mvl/mxv + .byte VOL , 44*mus_encounter_aqua_mvl/mxv .byte N06 , Ds4 .byte W06 .byte N03 , Ds3 @@ -1559,7 +1559,7 @@ bgm_aqa_0_7_000: .byte As3 .byte W06 .byte VOICE , 85 - .byte VOL , 39*bgm_aqa_0_mvl/mxv + .byte VOL , 39*mus_encounter_aqua_mvl/mxv .byte N06 , Fn4 .byte W06 .byte N03 , Fn3 @@ -1610,7 +1610,7 @@ bgm_aqa_0_7_000: .byte Cn4 .byte W06 .byte PATT - .word bgm_aqa_0_7_000 + .word mus_encounter_aqua_7_000 .byte PAN , c_v-62 .byte N06 , Ds4 , v112 .byte W06 @@ -1644,7 +1644,7 @@ bgm_aqa_0_7_000: .byte W06 .byte VOICE , 80 .byte PAN , c_v-62 - .byte VOL , 39*bgm_aqa_0_mvl/mxv + .byte VOL , 39*mus_encounter_aqua_mvl/mxv .byte N03 , As3 .byte W06 .byte Fn2 @@ -1675,7 +1675,7 @@ bgm_aqa_0_7_000: .byte W06 .byte N12 , Gs3 .byte W12 -bgm_aqa_0_7_001: +mus_encounter_aqua_7_001: .byte N03 , As3 , v112 .byte W06 .byte As2 @@ -1707,7 +1707,7 @@ bgm_aqa_0_7_001: .byte N12 , Gs3 .byte W12 .byte PEND -bgm_aqa_0_7_002: +mus_encounter_aqua_7_002: .byte N03 , As3 , v112 .byte W06 .byte Ds2 @@ -1740,7 +1740,7 @@ bgm_aqa_0_7_002: .byte W12 .byte PEND .byte PATT - .word bgm_aqa_0_7_001 + .word mus_encounter_aqua_7_001 .byte N03 , As3 , v112 .byte W06 .byte Fn2 @@ -1772,25 +1772,25 @@ bgm_aqa_0_7_002: .byte N12 , Gs3 .byte W12 .byte PATT - .word bgm_aqa_0_7_001 + .word mus_encounter_aqua_7_001 .byte PATT - .word bgm_aqa_0_7_002 + .word mus_encounter_aqua_7_002 .byte PATT - .word bgm_aqa_0_7_001 + .word mus_encounter_aqua_7_001 .byte GOTO - .word bgm_aqa_0_7_B1 + .word mus_encounter_aqua_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_aqa_0_8: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_8: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 86 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+0 - .byte VOL , 41*bgm_aqa_0_mvl/mxv + .byte VOL , 41*mus_encounter_aqua_mvl/mxv .byte BENDR , 12 .byte W12 .byte W06 @@ -1856,10 +1856,10 @@ bgm_aqa_0_8: .byte W06 .byte N03 , An3 .byte W06 -bgm_aqa_0_8_B1: +mus_encounter_aqua_8_B1: .byte VOICE , 86 .byte PAN , c_v+0 - .byte VOL , 49*bgm_aqa_0_mvl/mxv + .byte VOL , 49*mus_encounter_aqua_mvl/mxv .byte N03 , As4 , v112 .byte W06 .byte As3 @@ -1911,43 +1911,43 @@ bgm_aqa_0_8_B1: .byte W06 .byte N72 , Gn4 .byte W06 - .byte VOL , 43*bgm_aqa_0_mvl/mxv + .byte VOL , 43*mus_encounter_aqua_mvl/mxv .byte W02 - .byte 34*bgm_aqa_0_mvl/mxv + .byte 34*mus_encounter_aqua_mvl/mxv .byte W04 - .byte 29*bgm_aqa_0_mvl/mxv + .byte 29*mus_encounter_aqua_mvl/mxv .byte W02 - .byte 27*bgm_aqa_0_mvl/mxv + .byte 27*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 23*bgm_aqa_0_mvl/mxv + .byte 23*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 18*bgm_aqa_0_mvl/mxv + .byte 18*mus_encounter_aqua_mvl/mxv .byte W04 .byte MOD , 2 .byte W15 - .byte VOL , 29*bgm_aqa_0_mvl/mxv + .byte VOL , 29*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 29*bgm_aqa_0_mvl/mxv + .byte 29*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 32*bgm_aqa_0_mvl/mxv + .byte 32*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 35*bgm_aqa_0_mvl/mxv + .byte 35*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 38*bgm_aqa_0_mvl/mxv + .byte 38*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 43*bgm_aqa_0_mvl/mxv + .byte 43*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 50*bgm_aqa_0_mvl/mxv + .byte 50*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 56*bgm_aqa_0_mvl/mxv + .byte 56*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 59*bgm_aqa_0_mvl/mxv + .byte 59*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 63*bgm_aqa_0_mvl/mxv + .byte 63*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 71*bgm_aqa_0_mvl/mxv + .byte 71*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 50*bgm_aqa_0_mvl/mxv + .byte 50*mus_encounter_aqua_mvl/mxv .byte MOD , 0 .byte N06 , Gs4 .byte W12 @@ -1984,7 +1984,7 @@ bgm_aqa_0_8_B1: .byte W06 .byte VOICE , 82 .byte PAN , c_v+0 - .byte VOL , 49*bgm_aqa_0_mvl/mxv + .byte VOL , 49*mus_encounter_aqua_mvl/mxv .byte N06 , As4 , v112 .byte W06 .byte N03 , As3 @@ -2036,43 +2036,43 @@ bgm_aqa_0_8_B1: .byte W06 .byte N78 , Ds5 .byte W06 - .byte VOL , 43*bgm_aqa_0_mvl/mxv + .byte VOL , 43*mus_encounter_aqua_mvl/mxv .byte W02 - .byte 34*bgm_aqa_0_mvl/mxv + .byte 34*mus_encounter_aqua_mvl/mxv .byte W04 - .byte 29*bgm_aqa_0_mvl/mxv + .byte 29*mus_encounter_aqua_mvl/mxv .byte W02 - .byte 27*bgm_aqa_0_mvl/mxv + .byte 27*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 23*bgm_aqa_0_mvl/mxv + .byte 23*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 18*bgm_aqa_0_mvl/mxv + .byte 18*mus_encounter_aqua_mvl/mxv .byte W04 .byte MOD , 2 .byte W15 - .byte VOL , 29*bgm_aqa_0_mvl/mxv + .byte VOL , 29*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 29*bgm_aqa_0_mvl/mxv + .byte 29*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 32*bgm_aqa_0_mvl/mxv + .byte 32*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 35*bgm_aqa_0_mvl/mxv + .byte 35*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 38*bgm_aqa_0_mvl/mxv + .byte 38*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 43*bgm_aqa_0_mvl/mxv + .byte 43*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 50*bgm_aqa_0_mvl/mxv + .byte 50*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 56*bgm_aqa_0_mvl/mxv + .byte 56*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 59*bgm_aqa_0_mvl/mxv + .byte 59*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 63*bgm_aqa_0_mvl/mxv + .byte 63*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 71*bgm_aqa_0_mvl/mxv + .byte 71*mus_encounter_aqua_mvl/mxv .byte W03 - .byte 48*bgm_aqa_0_mvl/mxv + .byte 48*mus_encounter_aqua_mvl/mxv .byte MOD , 0 .byte W18 .byte N06 , Cs5 @@ -2110,7 +2110,7 @@ bgm_aqa_0_8_B1: .byte W06 .byte VOICE , 81 .byte PAN , c_v+63 - .byte VOL , 40*bgm_aqa_0_mvl/mxv + .byte VOL , 40*mus_encounter_aqua_mvl/mxv .byte N03 , As4 .byte W06 .byte Cs3 @@ -2141,7 +2141,7 @@ bgm_aqa_0_8_B1: .byte W06 .byte N12 , Gs4 .byte W12 -bgm_aqa_0_8_000: +mus_encounter_aqua_8_000: .byte N03 , As4 , v112 .byte W06 .byte Cs3 @@ -2173,7 +2173,7 @@ bgm_aqa_0_8_000: .byte N12 , Gs4 .byte W12 .byte PEND -bgm_aqa_0_8_001: +mus_encounter_aqua_8_001: .byte N03 , As4 , v112 .byte W06 .byte Cs3 @@ -2206,26 +2206,26 @@ bgm_aqa_0_8_001: .byte W12 .byte PEND .byte PATT - .word bgm_aqa_0_8_001 + .word mus_encounter_aqua_8_001 .byte PATT - .word bgm_aqa_0_8_000 + .word mus_encounter_aqua_8_000 .byte PATT - .word bgm_aqa_0_8_000 + .word mus_encounter_aqua_8_000 .byte PATT - .word bgm_aqa_0_8_001 + .word mus_encounter_aqua_8_001 .byte PATT - .word bgm_aqa_0_8_001 + .word mus_encounter_aqua_8_001 .byte GOTO - .word bgm_aqa_0_8_B1 + .word mus_encounter_aqua_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_aqa_0_9: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_9: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 67*bgm_aqa_0_mvl/mxv + .byte VOL , 67*mus_encounter_aqua_mvl/mxv .byte W12 .byte N06 , Cn1 , v112 .byte W18 @@ -2273,8 +2273,8 @@ bgm_aqa_0_9: .byte W06 .byte Dn1 , v112 .byte W06 -bgm_aqa_0_9_B1: -bgm_aqa_0_9_000: +mus_encounter_aqua_9_B1: +mus_encounter_aqua_9_000: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v088 @@ -2289,9 +2289,9 @@ bgm_aqa_0_9_000: .byte W24 .byte PEND .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v088 @@ -2307,11 +2307,11 @@ bgm_aqa_0_9_000: .byte Cn1 , v112 .byte W24 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte N06 , Cn1 , v112 .byte W06 .byte Dn1 @@ -2347,41 +2347,41 @@ bgm_aqa_0_9_000: .byte N06 .byte W06 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte PATT - .word bgm_aqa_0_9_000 + .word mus_encounter_aqua_9_000 .byte GOTO - .word bgm_aqa_0_9_B1 + .word mus_encounter_aqua_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_aqa_0_10: - .byte KEYSH , bgm_aqa_0_key+0 +mus_encounter_aqua_10: + .byte KEYSH , mus_encounter_aqua_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+0 - .byte VOL , 31*bgm_aqa_0_mvl/mxv + .byte VOL , 31*mus_encounter_aqua_mvl/mxv .byte BENDR , 12 .byte BEND , c_v+1 .byte W12 .byte W96 .byte W96 -bgm_aqa_0_10_B1: +mus_encounter_aqua_10_B1: .byte W96 .byte VOICE , 83 .byte W06 @@ -2531,7 +2531,7 @@ bgm_aqa_0_10_B1: .byte An4 .byte W06 .byte VOICE , 87 - .byte VOL , 27*bgm_aqa_0_mvl/mxv + .byte VOL , 27*mus_encounter_aqua_mvl/mxv .byte N06 , Fn3 .byte W06 .byte An3 @@ -2727,29 +2727,29 @@ bgm_aqa_0_10_B1: .byte W48 .byte W03 .byte GOTO - .word bgm_aqa_0_10_B1 + .word mus_encounter_aqua_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_aqa_0: +mus_encounter_aqua: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_aqa_0_pri @ Priority - .byte bgm_aqa_0_rev @ Reverb. + .byte mus_encounter_aqua_pri @ Priority + .byte mus_encounter_aqua_rev @ Reverb. - .word bgm_aqa_0_grp + .word mus_encounter_aqua_grp - .word bgm_aqa_0_1 - .word bgm_aqa_0_2 - .word bgm_aqa_0_3 - .word bgm_aqa_0_4 - .word bgm_aqa_0_5 - .word bgm_aqa_0_6 - .word bgm_aqa_0_7 - .word bgm_aqa_0_8 - .word bgm_aqa_0_9 - .word bgm_aqa_0_10 + .word mus_encounter_aqua_1 + .word mus_encounter_aqua_2 + .word mus_encounter_aqua_3 + .word mus_encounter_aqua_4 + .word mus_encounter_aqua_5 + .word mus_encounter_aqua_6 + .word mus_encounter_aqua_7 + .word mus_encounter_aqua_8 + .word mus_encounter_aqua_9 + .word mus_encounter_aqua_10 .end diff --git a/sound/songs/bgm_boy_sup.s b/sound/songs/mus_encounter_brendan.s index f7df3d52e..147e031a4 100644 --- a/sound/songs/bgm_boy_sup.s +++ b/sound/songs/mus_encounter_brendan.s @@ -1,39 +1,39 @@ .include "MPlayDef.s" - .equ bgm_boy_sup_grp, voicegroup064 - .equ bgm_boy_sup_pri, 0 - .equ bgm_boy_sup_rev, reverb_set+50 - .equ bgm_boy_sup_mvl, 127 - .equ bgm_boy_sup_key, 0 - .equ bgm_boy_sup_tbs, 1 - .equ bgm_boy_sup_exg, 0 - .equ bgm_boy_sup_cmp, 1 + .equ mus_encounter_brendan_grp, voicegroup064 + .equ mus_encounter_brendan_pri, 0 + .equ mus_encounter_brendan_rev, reverb_set+50 + .equ mus_encounter_brendan_mvl, 127 + .equ mus_encounter_brendan_key, 0 + .equ mus_encounter_brendan_tbs, 1 + .equ mus_encounter_brendan_exg, 0 + .equ mus_encounter_brendan_cmp, 1 .section .rodata - .global bgm_boy_sup + .global mus_encounter_brendan .align 2 @********************** Track 1 **********************@ -bgm_boy_sup_1: - .byte KEYSH , bgm_boy_sup_key+0 - .byte TEMPO , 128*bgm_boy_sup_tbs/2 +mus_encounter_brendan_1: + .byte KEYSH , mus_encounter_brendan_key+0 + .byte TEMPO , 128*mus_encounter_brendan_tbs/2 .byte VOICE , 1 .byte PAN , c_v+0 - .byte VOL , 39*bgm_boy_sup_mvl/mxv + .byte VOL , 39*mus_encounter_brendan_mvl/mxv .byte LFOS , 44 .byte W96 .byte W68 .byte W01 - .byte VOL , 52*bgm_boy_sup_mvl/mxv + .byte VOL , 52*mus_encounter_brendan_mvl/mxv .byte W15 .byte N06 , An3 , v112 .byte W06 .byte Bn3 .byte W06 -bgm_boy_sup_1_B1: +mus_encounter_brendan_1_B1: .byte VOICE , 1 - .byte VOL , 52*bgm_boy_sup_mvl/mxv + .byte VOL , 52*mus_encounter_brendan_mvl/mxv .byte N06 , Cs4 , v112 .byte W12 .byte Dn4 @@ -177,30 +177,30 @@ bgm_boy_sup_1_B1: .byte W12 .byte VOICE , 17 .byte W12 - .byte VOL , 18*bgm_boy_sup_mvl/mxv + .byte VOL , 18*mus_encounter_brendan_mvl/mxv .byte N36 , Cs5 .byte W02 - .byte VOL , 19*bgm_boy_sup_mvl/mxv + .byte VOL , 19*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 21*bgm_boy_sup_mvl/mxv + .byte 21*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 22*bgm_boy_sup_mvl/mxv + .byte 22*mus_encounter_brendan_mvl/mxv .byte W04 - .byte 27*bgm_boy_sup_mvl/mxv + .byte 27*mus_encounter_brendan_mvl/mxv .byte W02 - .byte 31*bgm_boy_sup_mvl/mxv + .byte 31*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 38*bgm_boy_sup_mvl/mxv + .byte 38*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 42*bgm_boy_sup_mvl/mxv + .byte 42*mus_encounter_brendan_mvl/mxv .byte W04 - .byte 47*bgm_boy_sup_mvl/mxv + .byte 47*mus_encounter_brendan_mvl/mxv .byte W02 - .byte 51*bgm_boy_sup_mvl/mxv + .byte 51*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 53*bgm_boy_sup_mvl/mxv + .byte 53*mus_encounter_brendan_mvl/mxv .byte W07 - .byte 39*bgm_boy_sup_mvl/mxv + .byte 39*mus_encounter_brendan_mvl/mxv .byte N06 , Fs4 .byte W06 .byte N06 @@ -213,30 +213,30 @@ bgm_boy_sup_1_B1: .byte W06 .byte N18 , Bn4 .byte W18 - .byte VOL , 18*bgm_boy_sup_mvl/mxv + .byte VOL , 18*mus_encounter_brendan_mvl/mxv .byte N36 , Cs5 .byte W02 - .byte VOL , 19*bgm_boy_sup_mvl/mxv + .byte VOL , 19*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 21*bgm_boy_sup_mvl/mxv + .byte 21*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 22*bgm_boy_sup_mvl/mxv + .byte 22*mus_encounter_brendan_mvl/mxv .byte W04 - .byte 27*bgm_boy_sup_mvl/mxv + .byte 27*mus_encounter_brendan_mvl/mxv .byte W02 - .byte 31*bgm_boy_sup_mvl/mxv + .byte 31*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 38*bgm_boy_sup_mvl/mxv + .byte 38*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 42*bgm_boy_sup_mvl/mxv + .byte 42*mus_encounter_brendan_mvl/mxv .byte W04 - .byte 47*bgm_boy_sup_mvl/mxv + .byte 47*mus_encounter_brendan_mvl/mxv .byte W02 - .byte 51*bgm_boy_sup_mvl/mxv + .byte 51*mus_encounter_brendan_mvl/mxv .byte W03 - .byte 53*bgm_boy_sup_mvl/mxv + .byte 53*mus_encounter_brendan_mvl/mxv .byte W13 - .byte 39*bgm_boy_sup_mvl/mxv + .byte 39*mus_encounter_brendan_mvl/mxv .byte N06 , En4 .byte W06 .byte An4 @@ -345,7 +345,7 @@ bgm_boy_sup_1_B1: .byte W03 .byte An4 .byte W03 - .byte VOL , 28*bgm_boy_sup_mvl/mxv + .byte VOL , 28*mus_encounter_brendan_mvl/mxv .byte W03 .byte VOICE , 17 .byte N03 , Ds5 , v076 @@ -385,20 +385,20 @@ bgm_boy_sup_1_B1: .byte Bn4 .byte W06 .byte GOTO - .word bgm_boy_sup_1_B1 + .word mus_encounter_brendan_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_boy_sup_2: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_2: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 126 .byte PAN , c_v-63 - .byte VOL , 35*bgm_boy_sup_mvl/mxv + .byte VOL , 35*mus_encounter_brendan_mvl/mxv .byte W60 .byte N12 , Gn4 , v112 .byte W36 -bgm_boy_sup_2_000: +mus_encounter_brendan_2_000: .byte W12 .byte N12 , Gn4 , v064 .byte W24 @@ -407,8 +407,8 @@ bgm_boy_sup_2_000: .byte Gn4 , v112 .byte W36 .byte PEND -bgm_boy_sup_2_B1: -bgm_boy_sup_2_001: +mus_encounter_brendan_2_B1: +mus_encounter_brendan_2_001: .byte W24 .byte N06 , Gn4 , v112 .byte W60 @@ -416,20 +416,20 @@ bgm_boy_sup_2_001: .byte W12 .byte PEND .byte PATT - .word bgm_boy_sup_2_001 + .word mus_encounter_brendan_2_001 .byte PATT - .word bgm_boy_sup_2_001 + .word mus_encounter_brendan_2_001 .byte PATT - .word bgm_boy_sup_2_001 + .word mus_encounter_brendan_2_001 .byte PATT - .word bgm_boy_sup_2_001 + .word mus_encounter_brendan_2_001 .byte PATT - .word bgm_boy_sup_2_001 + .word mus_encounter_brendan_2_001 .byte PATT - .word bgm_boy_sup_2_001 + .word mus_encounter_brendan_2_001 .byte PATT - .word bgm_boy_sup_2_001 -bgm_boy_sup_2_002: + .word mus_encounter_brendan_2_001 +mus_encounter_brendan_2_002: .byte W12 .byte N06 , Gn4 , v112 .byte W36 @@ -439,31 +439,31 @@ bgm_boy_sup_2_002: .byte W12 .byte PEND .byte PATT - .word bgm_boy_sup_2_002 + .word mus_encounter_brendan_2_002 .byte PATT - .word bgm_boy_sup_2_002 + .word mus_encounter_brendan_2_002 .byte PATT - .word bgm_boy_sup_2_002 + .word mus_encounter_brendan_2_002 .byte PATT - .word bgm_boy_sup_2_002 + .word mus_encounter_brendan_2_002 .byte PATT - .word bgm_boy_sup_2_002 + .word mus_encounter_brendan_2_002 .byte W60 .byte N12 , Gn4 , v112 .byte W36 .byte PATT - .word bgm_boy_sup_2_000 + .word mus_encounter_brendan_2_000 .byte GOTO - .word bgm_boy_sup_2_B1 + .word mus_encounter_brendan_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_boy_sup_3: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_3: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 38 .byte PAN , c_v+0 - .byte VOL , 78*bgm_boy_sup_mvl/mxv + .byte VOL , 78*mus_encounter_brendan_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte BEND , c_v+0 @@ -519,7 +519,7 @@ bgm_boy_sup_3: .byte W06 .byte BEND , c_v+0 .byte W18 -bgm_boy_sup_3_B1: +mus_encounter_brendan_3_B1: .byte N18 , An0 , v112 .byte W18 .byte N03 @@ -839,15 +839,15 @@ bgm_boy_sup_3_B1: .byte BEND , c_v+0 .byte W18 .byte GOTO - .word bgm_boy_sup_3_B1 + .word mus_encounter_brendan_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_boy_sup_4: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_4: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 56 - .byte VOL , 70*bgm_boy_sup_mvl/mxv + .byte VOL , 70*mus_encounter_brendan_mvl/mxv .byte PAN , c_v+0 .byte LFOS , 44 .byte N03 , Cs4 , v112 @@ -893,7 +893,7 @@ bgm_boy_sup_4: .byte W03 .byte Bn3 .byte W12 -bgm_boy_sup_4_B1: +mus_encounter_brendan_4_B1: .byte W96 .byte W96 .byte W96 @@ -903,7 +903,7 @@ bgm_boy_sup_4_B1: .byte W96 .byte W96 .byte PAN , c_v+32 - .byte VOL , 52*bgm_boy_sup_mvl/mxv + .byte VOL , 52*mus_encounter_brendan_mvl/mxv .byte N03 , Cs4 , v112 .byte W06 .byte N03 @@ -930,7 +930,7 @@ bgm_boy_sup_4_B1: .byte W06 .byte N12 , Bn3 .byte W18 - .byte VOL , 52*bgm_boy_sup_mvl/mxv + .byte VOL , 52*mus_encounter_brendan_mvl/mxv .byte N03 , Cs4 .byte W06 .byte N03 @@ -987,7 +987,7 @@ bgm_boy_sup_4_B1: .byte W12 .byte N03 , Bn3 .byte W12 - .byte VOL , 52*bgm_boy_sup_mvl/mxv + .byte VOL , 52*mus_encounter_brendan_mvl/mxv .byte N06 , Gn3 .byte W06 .byte Fs3 @@ -1086,15 +1086,15 @@ bgm_boy_sup_4_B1: .byte Bn3 , v056 .byte W12 .byte GOTO - .word bgm_boy_sup_4_B1 + .word mus_encounter_brendan_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_boy_sup_5: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_5: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 56 - .byte VOL , 66*bgm_boy_sup_mvl/mxv + .byte VOL , 66*mus_encounter_brendan_mvl/mxv .byte PAN , c_v-26 .byte LFOS , 44 .byte N03 , Fs3 , v112 @@ -1140,7 +1140,7 @@ bgm_boy_sup_5: .byte W03 .byte Fs3 .byte W12 -bgm_boy_sup_5_B1: +mus_encounter_brendan_5_B1: .byte W96 .byte W96 .byte W96 @@ -1158,16 +1158,16 @@ bgm_boy_sup_5_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_boy_sup_5_B1 + .word mus_encounter_brendan_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_boy_sup_6: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_6: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 127 .byte PAN , c_v-63 - .byte VOL , 36*bgm_boy_sup_mvl/mxv + .byte VOL , 36*mus_encounter_brendan_mvl/mxv .byte N03 , En4 , v112 .byte W12 .byte En4 , v064 @@ -1184,7 +1184,7 @@ bgm_boy_sup_6: .byte W12 .byte N03 .byte W12 -bgm_boy_sup_6_000: +mus_encounter_brendan_6_000: .byte N03 , En4 , v112 .byte W24 .byte En4 , v064 @@ -1194,8 +1194,8 @@ bgm_boy_sup_6_000: .byte En4 , v080 .byte W42 .byte PEND -bgm_boy_sup_6_B1: -bgm_boy_sup_6_001: +mus_encounter_brendan_6_B1: +mus_encounter_brendan_6_001: .byte N03 , En4 , v112 .byte W06 .byte En4 , v064 @@ -1224,20 +1224,20 @@ bgm_boy_sup_6_001: .byte W18 .byte PEND .byte PATT - .word bgm_boy_sup_6_001 + .word mus_encounter_brendan_6_001 .byte PATT - .word bgm_boy_sup_6_001 + .word mus_encounter_brendan_6_001 .byte PATT - .word bgm_boy_sup_6_001 + .word mus_encounter_brendan_6_001 .byte PATT - .word bgm_boy_sup_6_001 + .word mus_encounter_brendan_6_001 .byte PATT - .word bgm_boy_sup_6_001 + .word mus_encounter_brendan_6_001 .byte PATT - .word bgm_boy_sup_6_001 + .word mus_encounter_brendan_6_001 .byte PATT - .word bgm_boy_sup_6_001 -bgm_boy_sup_6_002: + .word mus_encounter_brendan_6_001 +mus_encounter_brendan_6_002: .byte N03 , En4 , v112 .byte W06 .byte En4 , v064 @@ -1262,15 +1262,15 @@ bgm_boy_sup_6_002: .byte W18 .byte PEND .byte PATT - .word bgm_boy_sup_6_002 + .word mus_encounter_brendan_6_002 .byte PATT - .word bgm_boy_sup_6_002 + .word mus_encounter_brendan_6_002 .byte PATT - .word bgm_boy_sup_6_002 + .word mus_encounter_brendan_6_002 .byte PATT - .word bgm_boy_sup_6_002 + .word mus_encounter_brendan_6_002 .byte PATT - .word bgm_boy_sup_6_002 + .word mus_encounter_brendan_6_002 .byte N03 , En4 , v112 .byte W12 .byte En4 , v064 @@ -1288,18 +1288,18 @@ bgm_boy_sup_6_002: .byte N03 .byte W12 .byte PATT - .word bgm_boy_sup_6_000 + .word mus_encounter_brendan_6_000 .byte GOTO - .word bgm_boy_sup_6_B1 + .word mus_encounter_brendan_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_boy_sup_7: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_7: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 80 .byte PAN , c_v-62 - .byte VOL , 39*bgm_boy_sup_mvl/mxv + .byte VOL , 39*mus_encounter_brendan_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 @@ -1321,7 +1321,7 @@ bgm_boy_sup_7: .byte W12 .byte Gs2 .byte W12 -bgm_boy_sup_7_000: +mus_encounter_brendan_7_000: .byte W12 .byte N06 , An2 , v112 .byte W24 @@ -1332,7 +1332,7 @@ bgm_boy_sup_7_000: .byte En3 .byte W24 .byte PEND -bgm_boy_sup_7_B1: +mus_encounter_brendan_7_B1: .byte N24 , Cs3 , v112 .byte W30 .byte N06 @@ -1341,7 +1341,7 @@ bgm_boy_sup_7_B1: .byte W06 .byte N24 , Cs3 .byte W48 -bgm_boy_sup_7_001: +mus_encounter_brendan_7_001: .byte N30 , Cs3 , v112 .byte W30 .byte N03 , Dn3 , v096 @@ -1361,7 +1361,7 @@ bgm_boy_sup_7_001: .byte N03 , En3 , v096 .byte W03 .byte PEND -bgm_boy_sup_7_002: +mus_encounter_brendan_7_002: .byte N24 , Fs3 , v112 .byte W30 .byte N06 , Dn3 @@ -1432,9 +1432,9 @@ bgm_boy_sup_7_002: .byte Dn3 .byte W06 .byte PATT - .word bgm_boy_sup_7_001 + .word mus_encounter_brendan_7_001 .byte PATT - .word bgm_boy_sup_7_002 + .word mus_encounter_brendan_7_002 .byte N03 , Bn2 , v112 .byte W06 .byte Gs2 @@ -1471,7 +1471,7 @@ bgm_boy_sup_7_002: .byte W04 .byte Bn2 .byte W04 - .byte VOL , 27*bgm_boy_sup_mvl/mxv + .byte VOL , 27*mus_encounter_brendan_mvl/mxv .byte BEND , c_v+4 .byte N03 , Cs4 .byte W06 @@ -1499,7 +1499,7 @@ bgm_boy_sup_7_002: .byte W06 .byte N12 , Bn3 .byte W18 - .byte VOL , 27*bgm_boy_sup_mvl/mxv + .byte VOL , 27*mus_encounter_brendan_mvl/mxv .byte N03 , Cs4 .byte W06 .byte N03 @@ -1610,7 +1610,7 @@ bgm_boy_sup_7_002: .byte W06 .byte Cn4 .byte W06 - .byte VOL , 39*bgm_boy_sup_mvl/mxv + .byte VOL , 39*mus_encounter_brendan_mvl/mxv .byte BEND , c_v+0 .byte N03 , Fs2 .byte W06 @@ -1631,18 +1631,18 @@ bgm_boy_sup_7_002: .byte Gs2 .byte W12 .byte PATT - .word bgm_boy_sup_7_000 + .word mus_encounter_brendan_7_000 .byte GOTO - .word bgm_boy_sup_7_B1 + .word mus_encounter_brendan_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_boy_sup_8: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_8: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 81 .byte PAN , c_v+63 - .byte VOL , 39*bgm_boy_sup_mvl/mxv + .byte VOL , 39*mus_encounter_brendan_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 @@ -1673,8 +1673,8 @@ bgm_boy_sup_8: .byte W12 .byte Gs3 .byte W24 -bgm_boy_sup_8_B1: -bgm_boy_sup_8_000: +mus_encounter_brendan_8_B1: +mus_encounter_brendan_8_000: .byte N24 , An3 , v112 .byte W30 .byte N06 @@ -1688,7 +1688,7 @@ bgm_boy_sup_8_000: .byte Gs3 .byte W06 .byte PEND -bgm_boy_sup_8_001: +mus_encounter_brendan_8_001: .byte N30 , Gn3 , v112 .byte W30 .byte N03 , An3 , v096 @@ -1712,7 +1712,7 @@ bgm_boy_sup_8_001: .byte N03 , Bn3 , v096 .byte W03 .byte PEND -bgm_boy_sup_8_002: +mus_encounter_brendan_8_002: .byte N24 , Dn4 , v112 .byte W30 .byte N06 , An3 @@ -1771,11 +1771,11 @@ bgm_boy_sup_8_002: .byte Gs3 .byte W03 .byte PATT - .word bgm_boy_sup_8_000 + .word mus_encounter_brendan_8_000 .byte PATT - .word bgm_boy_sup_8_001 + .word mus_encounter_brendan_8_001 .byte PATT - .word bgm_boy_sup_8_002 + .word mus_encounter_brendan_8_002 .byte N03 , Gs3 , v112 .byte W06 .byte En3 @@ -1992,16 +1992,16 @@ bgm_boy_sup_8_002: .byte Fs3 , v044 .byte W12 .byte GOTO - .word bgm_boy_sup_8_B1 + .word mus_encounter_brendan_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_boy_sup_9: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_9: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 70*bgm_boy_sup_mvl/mxv + .byte VOL , 70*mus_encounter_brendan_mvl/mxv .byte N06 , En1 , v112 .byte W06 .byte N06 @@ -2024,7 +2024,7 @@ bgm_boy_sup_9: .byte W06 .byte N06 .byte W06 -bgm_boy_sup_9_000: +mus_encounter_brendan_9_000: .byte N06 , Cn1 , v112 .byte W12 .byte En1 @@ -2042,8 +2042,8 @@ bgm_boy_sup_9_000: .byte N24 , An2 .byte W24 .byte PEND -bgm_boy_sup_9_B1: -bgm_boy_sup_9_001: +mus_encounter_brendan_9_B1: +mus_encounter_brendan_9_001: .byte N06 , Cn1 , v112 .byte W24 .byte En1 @@ -2062,9 +2062,9 @@ bgm_boy_sup_9_001: .byte W06 .byte PEND .byte PATT - .word bgm_boy_sup_9_001 + .word mus_encounter_brendan_9_001 .byte PATT - .word bgm_boy_sup_9_001 + .word mus_encounter_brendan_9_001 .byte N06 , Cn1 , v112 .byte W12 .byte En1 @@ -2088,11 +2088,11 @@ bgm_boy_sup_9_001: .byte N06 .byte W06 .byte PATT - .word bgm_boy_sup_9_001 + .word mus_encounter_brendan_9_001 .byte PATT - .word bgm_boy_sup_9_001 + .word mus_encounter_brendan_9_001 .byte PATT - .word bgm_boy_sup_9_001 + .word mus_encounter_brendan_9_001 .byte N06 , Cn1 , v112 .byte W12 .byte En1 @@ -2115,7 +2115,7 @@ bgm_boy_sup_9_001: .byte W04 .byte N04 .byte W04 -bgm_boy_sup_9_002: +mus_encounter_brendan_9_002: .byte N06 , Cn1 , v112 .byte W18 .byte Dn1 @@ -2156,7 +2156,7 @@ bgm_boy_sup_9_002: .byte Cn1 .byte W06 .byte PATT - .word bgm_boy_sup_9_002 + .word mus_encounter_brendan_9_002 .byte N06 , Cn1 , v112 .byte W12 .byte Dn1 @@ -2238,17 +2238,17 @@ bgm_boy_sup_9_002: .byte N06 .byte W06 .byte PATT - .word bgm_boy_sup_9_000 + .word mus_encounter_brendan_9_000 .byte GOTO - .word bgm_boy_sup_9_B1 + .word mus_encounter_brendan_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_boy_sup_10: - .byte KEYSH , bgm_boy_sup_key+0 +mus_encounter_brendan_10: + .byte KEYSH , mus_encounter_brendan_key+0 .byte VOICE , 83 - .byte VOL , 29*bgm_boy_sup_mvl/mxv + .byte VOL , 29*mus_encounter_brendan_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 @@ -2260,7 +2260,7 @@ bgm_boy_sup_10: .byte W06 .byte Bn4 .byte W06 -bgm_boy_sup_10_B1: +mus_encounter_brendan_10_B1: .byte N06 , Cs5 , v112 .byte W12 .byte Dn5 @@ -2563,29 +2563,29 @@ bgm_boy_sup_10_B1: .byte Bn4 .byte W06 .byte GOTO - .word bgm_boy_sup_10_B1 + .word mus_encounter_brendan_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_boy_sup: +mus_encounter_brendan: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_boy_sup_pri @ Priority - .byte bgm_boy_sup_rev @ Reverb. + .byte mus_encounter_brendan_pri @ Priority + .byte mus_encounter_brendan_rev @ Reverb. - .word bgm_boy_sup_grp + .word mus_encounter_brendan_grp - .word bgm_boy_sup_1 - .word bgm_boy_sup_2 - .word bgm_boy_sup_3 - .word bgm_boy_sup_4 - .word bgm_boy_sup_5 - .word bgm_boy_sup_6 - .word bgm_boy_sup_7 - .word bgm_boy_sup_8 - .word bgm_boy_sup_9 - .word bgm_boy_sup_10 + .word mus_encounter_brendan_1 + .word mus_encounter_brendan_2 + .word mus_encounter_brendan_3 + .word mus_encounter_brendan_4 + .word mus_encounter_brendan_5 + .word mus_encounter_brendan_6 + .word mus_encounter_brendan_7 + .word mus_encounter_brendan_8 + .word mus_encounter_brendan_9 + .word mus_encounter_brendan_10 .end diff --git a/sound/songs/bgm_daigo.s b/sound/songs/mus_encounter_champion.s index 93fc33842..8eca758da 100644 --- a/sound/songs/bgm_daigo.s +++ b/sound/songs/mus_encounter_champion.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_daigo_grp, voicegroup097 - .equ bgm_daigo_pri, 0 - .equ bgm_daigo_rev, reverb_set+50 - .equ bgm_daigo_mvl, 127 - .equ bgm_daigo_key, 0 - .equ bgm_daigo_tbs, 1 - .equ bgm_daigo_exg, 0 - .equ bgm_daigo_cmp, 1 + .equ mus_encounter_champion_grp, voicegroup097 + .equ mus_encounter_champion_pri, 0 + .equ mus_encounter_champion_rev, reverb_set+50 + .equ mus_encounter_champion_mvl, 127 + .equ mus_encounter_champion_key, 0 + .equ mus_encounter_champion_tbs, 1 + .equ mus_encounter_champion_exg, 0 + .equ mus_encounter_champion_cmp, 1 .section .rodata - .global bgm_daigo + .global mus_encounter_champion .align 2 @********************** Track 1 **********************@ -bgm_daigo_1: - .byte KEYSH , bgm_daigo_key+0 - .byte TEMPO , 142*bgm_daigo_tbs/2 +mus_encounter_champion_1: + .byte KEYSH , mus_encounter_champion_key+0 + .byte TEMPO , 142*mus_encounter_champion_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte PAN , c_v+4 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 44*bgm_daigo_mvl/mxv + .byte VOL , 44*mus_encounter_champion_mvl/mxv .byte N03 , Fs5 , v112 .byte W06 .byte Fs5 , v064 @@ -78,8 +78,8 @@ bgm_daigo_1: .byte W06 .byte Fs5 , v064 .byte W06 -bgm_daigo_1_B1: -bgm_daigo_1_000: +mus_encounter_champion_1_B1: +mus_encounter_champion_1_000: .byte N03 , Fs5 , v112 .byte W06 .byte Fs5 , v064 @@ -109,7 +109,7 @@ bgm_daigo_1_000: .byte Fs5 , v064 .byte W06 .byte PEND -bgm_daigo_1_001: +mus_encounter_champion_1_001: .byte W06 .byte N03 , Fs5 , v064 .byte W06 @@ -136,7 +136,7 @@ bgm_daigo_1_001: .byte Fs5 , v064 .byte W06 .byte PEND -bgm_daigo_1_002: +mus_encounter_champion_1_002: .byte N03 , Fs5 , v112 .byte W06 .byte Fs5 , v064 @@ -165,16 +165,16 @@ bgm_daigo_1_002: .byte W06 .byte PEND .byte PATT - .word bgm_daigo_1_001 + .word mus_encounter_champion_1_001 .byte PATT - .word bgm_daigo_1_000 + .word mus_encounter_champion_1_000 .byte PATT - .word bgm_daigo_1_001 + .word mus_encounter_champion_1_001 .byte PATT - .word bgm_daigo_1_002 + .word mus_encounter_champion_1_002 .byte PATT - .word bgm_daigo_1_002 -bgm_daigo_1_003: + .word mus_encounter_champion_1_002 +mus_encounter_champion_1_003: .byte W12 .byte N03 , Fs5 , v080 .byte W06 @@ -190,12 +190,12 @@ bgm_daigo_1_003: .byte W06 .byte PEND .byte PATT - .word bgm_daigo_1_003 + .word mus_encounter_champion_1_003 .byte PATT - .word bgm_daigo_1_003 + .word mus_encounter_champion_1_003 .byte PATT - .word bgm_daigo_1_003 -bgm_daigo_1_004: + .word mus_encounter_champion_1_003 +mus_encounter_champion_1_004: .byte N03 , Fs5 , v112 .byte W12 .byte N03 @@ -220,23 +220,23 @@ bgm_daigo_1_004: .byte W06 .byte PEND .byte PATT - .word bgm_daigo_1_004 + .word mus_encounter_champion_1_004 .byte PATT - .word bgm_daigo_1_004 + .word mus_encounter_champion_1_004 .byte PATT - .word bgm_daigo_1_004 + .word mus_encounter_champion_1_004 .byte GOTO - .word bgm_daigo_1_B1 + .word mus_encounter_champion_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_daigo_2: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_2: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 17 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 63*bgm_daigo_mvl/mxv + .byte VOL , 63*mus_encounter_champion_mvl/mxv .byte PAN , c_v+16 .byte N06 , Cn5 , v112 .byte W12 @@ -259,7 +259,7 @@ bgm_daigo_2: .byte PAN , c_v+32 .byte W06 .byte W96 -bgm_daigo_2_B1: +mus_encounter_champion_2_B1: .byte VOICE , 17 .byte PAN , c_v+32 .byte BEND , c_v+0 @@ -326,7 +326,7 @@ bgm_daigo_2_B1: .byte Gs1 .byte W06 .byte VOICE , 17 - .byte VOL , 63*bgm_daigo_mvl/mxv + .byte VOL , 63*mus_encounter_champion_mvl/mxv .byte MOD , 0 .byte PAN , c_v+32 .byte N03 , Cs4 @@ -457,7 +457,7 @@ bgm_daigo_2_B1: .byte Fs1 .byte W06 .byte VOICE , 56 - .byte VOL , 63*bgm_daigo_mvl/mxv + .byte VOL , 63*mus_encounter_champion_mvl/mxv .byte MOD , 0 .byte PAN , c_v+32 .byte N03 , Bn3 @@ -502,7 +502,7 @@ bgm_daigo_2_B1: .byte N03 , Dn5 .byte W06 .byte VOICE , 24 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte N06 , Bn4 .byte W06 .byte Dn5 @@ -511,32 +511,32 @@ bgm_daigo_2_B1: .byte W24 .byte MOD , 7 .byte W12 - .byte VOL , 46*bgm_daigo_mvl/mxv + .byte VOL , 46*mus_encounter_champion_mvl/mxv .byte W02 - .byte 43*bgm_daigo_mvl/mxv + .byte 43*mus_encounter_champion_mvl/mxv .byte W03 - .byte 40*bgm_daigo_mvl/mxv + .byte 40*mus_encounter_champion_mvl/mxv .byte W03 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W04 - .byte 32*bgm_daigo_mvl/mxv + .byte 32*mus_encounter_champion_mvl/mxv .byte W02 - .byte 30*bgm_daigo_mvl/mxv + .byte 30*mus_encounter_champion_mvl/mxv .byte W03 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W03 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W04 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W02 - .byte 17*bgm_daigo_mvl/mxv + .byte 17*mus_encounter_champion_mvl/mxv .byte W03 - .byte 13*bgm_daigo_mvl/mxv + .byte 13*mus_encounter_champion_mvl/mxv .byte W03 - .byte 9*bgm_daigo_mvl/mxv + .byte 9*mus_encounter_champion_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte N06 , En5 , v088 .byte W12 .byte Fn5 @@ -555,23 +555,23 @@ bgm_daigo_2_B1: .byte W12 .byte En5 .byte W06 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte N36 , Dn5 .byte W02 - .byte VOL , 41*bgm_daigo_mvl/mxv + .byte VOL , 41*mus_encounter_champion_mvl/mxv .byte W06 - .byte 38*bgm_daigo_mvl/mxv + .byte 38*mus_encounter_champion_mvl/mxv .byte W04 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 32*bgm_daigo_mvl/mxv + .byte VOL , 32*mus_encounter_champion_mvl/mxv .byte W03 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W03 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W04 - .byte 47*bgm_daigo_mvl/mxv + .byte 47*mus_encounter_champion_mvl/mxv .byte W12 .byte MOD , 0 .byte N06 , Bn4 @@ -594,22 +594,22 @@ bgm_daigo_2_B1: .byte N48 , En5 .byte W24 .byte MOD , 5 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte W02 - .byte 43*bgm_daigo_mvl/mxv + .byte 43*mus_encounter_champion_mvl/mxv .byte W03 - .byte 40*bgm_daigo_mvl/mxv + .byte 40*mus_encounter_champion_mvl/mxv .byte W03 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W04 - .byte 31*bgm_daigo_mvl/mxv + .byte 31*mus_encounter_champion_mvl/mxv .byte W02 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W03 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte N03 , Cs5 .byte W03 .byte Dn5 @@ -629,24 +629,24 @@ bgm_daigo_2_B1: .byte N48 , Dn5 .byte W24 .byte MOD , 5 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte W02 - .byte 46*bgm_daigo_mvl/mxv + .byte 46*mus_encounter_champion_mvl/mxv .byte W03 - .byte 41*bgm_daigo_mvl/mxv + .byte 41*mus_encounter_champion_mvl/mxv .byte W03 - .byte 38*bgm_daigo_mvl/mxv + .byte 38*mus_encounter_champion_mvl/mxv .byte W04 - .byte 32*bgm_daigo_mvl/mxv + .byte 32*mus_encounter_champion_mvl/mxv .byte W02 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W03 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W03 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte N03 , An4 .byte W06 .byte N03 @@ -658,116 +658,116 @@ bgm_daigo_2_B1: .byte N48 , Dn5 .byte W12 .byte MOD , 6 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte W02 - .byte 46*bgm_daigo_mvl/mxv + .byte 46*mus_encounter_champion_mvl/mxv .byte W03 - .byte 41*bgm_daigo_mvl/mxv + .byte 41*mus_encounter_champion_mvl/mxv .byte W03 - .byte 37*bgm_daigo_mvl/mxv + .byte 37*mus_encounter_champion_mvl/mxv .byte W04 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W02 - .byte 33*bgm_daigo_mvl/mxv + .byte 33*mus_encounter_champion_mvl/mxv .byte W03 - .byte 31*bgm_daigo_mvl/mxv + .byte 31*mus_encounter_champion_mvl/mxv .byte W03 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W04 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W02 - .byte 17*bgm_daigo_mvl/mxv + .byte 17*mus_encounter_champion_mvl/mxv .byte W10 .byte MOD , 0 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte N06 , Cn5 .byte W06 .byte TIE , Gn5 .byte W06 .byte W24 .byte MOD , 6 - .byte VOL , 46*bgm_daigo_mvl/mxv + .byte VOL , 46*mus_encounter_champion_mvl/mxv .byte W02 - .byte 43*bgm_daigo_mvl/mxv + .byte 43*mus_encounter_champion_mvl/mxv .byte W03 - .byte 41*bgm_daigo_mvl/mxv + .byte 41*mus_encounter_champion_mvl/mxv .byte W03 - .byte 39*bgm_daigo_mvl/mxv + .byte 39*mus_encounter_champion_mvl/mxv .byte W04 - .byte 37*bgm_daigo_mvl/mxv + .byte 37*mus_encounter_champion_mvl/mxv .byte W05 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W03 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W06 - .byte 32*bgm_daigo_mvl/mxv + .byte 32*mus_encounter_champion_mvl/mxv .byte W06 - .byte 30*bgm_daigo_mvl/mxv + .byte 30*mus_encounter_champion_mvl/mxv .byte W06 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W03 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W03 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W06 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W03 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W03 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W04 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W02 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W03 - .byte 19*bgm_daigo_mvl/mxv + .byte 19*mus_encounter_champion_mvl/mxv .byte W03 - .byte 18*bgm_daigo_mvl/mxv + .byte 18*mus_encounter_champion_mvl/mxv .byte W04 - .byte 17*bgm_daigo_mvl/mxv + .byte 17*mus_encounter_champion_mvl/mxv .byte W05 - .byte 16*bgm_daigo_mvl/mxv + .byte 16*mus_encounter_champion_mvl/mxv .byte W30 .byte W01 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W02 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W03 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W03 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W04 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W02 - .byte 31*bgm_daigo_mvl/mxv + .byte 31*mus_encounter_champion_mvl/mxv .byte W03 - .byte 33*bgm_daigo_mvl/mxv + .byte 33*mus_encounter_champion_mvl/mxv .byte W03 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W04 - .byte 37*bgm_daigo_mvl/mxv + .byte 37*mus_encounter_champion_mvl/mxv .byte W02 - .byte 41*bgm_daigo_mvl/mxv + .byte 41*mus_encounter_champion_mvl/mxv .byte W03 - .byte 43*bgm_daigo_mvl/mxv + .byte 43*mus_encounter_champion_mvl/mxv .byte W03 - .byte 47*bgm_daigo_mvl/mxv + .byte 47*mus_encounter_champion_mvl/mxv .byte W28 .byte EOT .byte GOTO - .word bgm_daigo_2_B1 + .word mus_encounter_champion_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_daigo_3: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_3: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 - .byte VOL , 76*bgm_daigo_mvl/mxv + .byte VOL , 76*mus_encounter_champion_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N06 , An0 , v127 @@ -830,8 +830,8 @@ bgm_daigo_3: .byte W06 .byte BEND , c_v+0 .byte W06 -bgm_daigo_3_B1: -bgm_daigo_3_000: +mus_encounter_champion_3_B1: +mus_encounter_champion_3_000: .byte BEND , c_v+0 .byte N18 , An0 , v127 .byte W18 @@ -892,7 +892,7 @@ bgm_daigo_3_000: .byte BEND , c_v+4 .byte W06 .byte PATT - .word bgm_daigo_3_000 + .word mus_encounter_champion_3_000 .byte BEND , c_v+0 .byte N12 , Gn1 , v127 .byte W06 @@ -931,7 +931,7 @@ bgm_daigo_3_000: .byte W06 .byte BEND , c_v+9 .byte W06 -bgm_daigo_3_001: +mus_encounter_champion_3_001: .byte BEND , c_v+0 .byte N18 , Gn0 , v127 .byte W18 @@ -992,7 +992,7 @@ bgm_daigo_3_001: .byte BEND , c_v+4 .byte W06 .byte PATT - .word bgm_daigo_3_001 + .word mus_encounter_champion_3_001 .byte BEND , c_v+0 .byte N15 , Gn0 , v127 .byte W18 @@ -1237,21 +1237,21 @@ bgm_daigo_3_001: .byte BEND , c_v+9 .byte W06 .byte GOTO - .word bgm_daigo_3_B1 + .word mus_encounter_champion_3_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 4 **********************@ -bgm_daigo_4: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_4: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-1 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte W96 -bgm_daigo_4_000: +mus_encounter_champion_4_000: .byte N06 , En5 , v112 .byte W06 .byte Dn5 @@ -1285,7 +1285,7 @@ bgm_daigo_4_000: .byte Dn5 .byte W06 .byte PEND -bgm_daigo_4_B1: +mus_encounter_champion_4_B1: .byte W96 .byte W96 .byte W96 @@ -1293,114 +1293,114 @@ bgm_daigo_4_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 19*bgm_daigo_mvl/mxv + .byte VOL , 19*mus_encounter_champion_mvl/mxv .byte PAN , c_v-32 .byte N48 , Dn3 , v112 .byte W24 - .byte VOL , 17*bgm_daigo_mvl/mxv + .byte VOL , 17*mus_encounter_champion_mvl/mxv .byte W02 - .byte 19*bgm_daigo_mvl/mxv + .byte 19*mus_encounter_champion_mvl/mxv .byte W03 - .byte 21*bgm_daigo_mvl/mxv + .byte 21*mus_encounter_champion_mvl/mxv .byte W03 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W04 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W02 - .byte 25*bgm_daigo_mvl/mxv + .byte 25*mus_encounter_champion_mvl/mxv .byte W01 .byte PAN , c_v-30 .byte W02 - .byte VOL , 26*bgm_daigo_mvl/mxv + .byte VOL , 26*mus_encounter_champion_mvl/mxv .byte PAN , c_v-23 .byte W07 - .byte VOL , 27*bgm_daigo_mvl/mxv + .byte VOL , 27*mus_encounter_champion_mvl/mxv .byte PAN , c_v-19 .byte N06 , En3 .byte W02 - .byte VOL , 28*bgm_daigo_mvl/mxv + .byte VOL , 28*mus_encounter_champion_mvl/mxv .byte PAN , c_v-14 .byte W03 - .byte VOL , 29*bgm_daigo_mvl/mxv + .byte VOL , 29*mus_encounter_champion_mvl/mxv .byte PAN , c_v-12 .byte W01 .byte N06 , Fn3 .byte W02 - .byte VOL , 32*bgm_daigo_mvl/mxv + .byte VOL , 32*mus_encounter_champion_mvl/mxv .byte PAN , c_v-6 .byte W04 - .byte VOL , 33*bgm_daigo_mvl/mxv + .byte VOL , 33*mus_encounter_champion_mvl/mxv .byte PAN , c_v+0 .byte N06 , Gn3 .byte W02 .byte PAN , c_v+9 .byte W01 - .byte VOL , 34*bgm_daigo_mvl/mxv + .byte VOL , 34*mus_encounter_champion_mvl/mxv .byte W02 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte PAN , c_v+16 .byte W01 .byte N06 , An3 .byte W02 - .byte VOL , 37*bgm_daigo_mvl/mxv + .byte VOL , 37*mus_encounter_champion_mvl/mxv .byte PAN , c_v+22 .byte W04 - .byte VOL , 39*bgm_daigo_mvl/mxv + .byte VOL , 39*mus_encounter_champion_mvl/mxv .byte PAN , c_v+26 .byte N06 , As3 .byte W02 - .byte VOL , 43*bgm_daigo_mvl/mxv + .byte VOL , 43*mus_encounter_champion_mvl/mxv .byte PAN , c_v+32 .byte W03 - .byte VOL , 49*bgm_daigo_mvl/mxv + .byte VOL , 49*mus_encounter_champion_mvl/mxv .byte PAN , c_v+36 .byte W01 .byte N06 , Cn4 .byte W02 - .byte VOL , 58*bgm_daigo_mvl/mxv + .byte VOL , 58*mus_encounter_champion_mvl/mxv .byte PAN , c_v+41 .byte W04 - .byte VOL , 62*bgm_daigo_mvl/mxv + .byte VOL , 62*mus_encounter_champion_mvl/mxv .byte PAN , c_v+43 .byte N06 , Dn4 .byte W02 - .byte VOL , 65*bgm_daigo_mvl/mxv + .byte VOL , 65*mus_encounter_champion_mvl/mxv .byte PAN , c_v+48 .byte W04 .byte N06 , Cs4 .byte W06 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte PAN , c_v-28 .byte N84 , Cn4 .byte W24 .byte MOD , 5 .byte W24 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte W02 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W03 - .byte 34*bgm_daigo_mvl/mxv + .byte 34*mus_encounter_champion_mvl/mxv .byte W03 - .byte 32*bgm_daigo_mvl/mxv + .byte 32*mus_encounter_champion_mvl/mxv .byte W04 - .byte 29*bgm_daigo_mvl/mxv + .byte 29*mus_encounter_champion_mvl/mxv .byte W02 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W03 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W03 - .byte 16*bgm_daigo_mvl/mxv + .byte 16*mus_encounter_champion_mvl/mxv .byte W04 - .byte 13*bgm_daigo_mvl/mxv + .byte 13*mus_encounter_champion_mvl/mxv .byte W02 - .byte 11*bgm_daigo_mvl/mxv + .byte 11*mus_encounter_champion_mvl/mxv .byte W01 - .byte 10*bgm_daigo_mvl/mxv + .byte 10*mus_encounter_champion_mvl/mxv .byte W06 - .byte 8*bgm_daigo_mvl/mxv + .byte 8*mus_encounter_champion_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 41*bgm_daigo_mvl/mxv + .byte VOL , 41*mus_encounter_champion_mvl/mxv .byte N06 , Cs4 .byte W06 .byte Cn4 @@ -1408,78 +1408,78 @@ bgm_daigo_4_B1: .byte N96 , Bn3 .byte W48 .byte MOD , 5 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte W02 - .byte 40*bgm_daigo_mvl/mxv + .byte 40*mus_encounter_champion_mvl/mxv .byte W03 - .byte 37*bgm_daigo_mvl/mxv + .byte 37*mus_encounter_champion_mvl/mxv .byte W03 - .byte 33*bgm_daigo_mvl/mxv + .byte 33*mus_encounter_champion_mvl/mxv .byte W04 - .byte 32*bgm_daigo_mvl/mxv + .byte 32*mus_encounter_champion_mvl/mxv .byte W02 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W03 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W03 - .byte 19*bgm_daigo_mvl/mxv + .byte 19*mus_encounter_champion_mvl/mxv .byte W04 - .byte 17*bgm_daigo_mvl/mxv + .byte 17*mus_encounter_champion_mvl/mxv .byte W02 - .byte 14*bgm_daigo_mvl/mxv + .byte 14*mus_encounter_champion_mvl/mxv .byte W03 - .byte 13*bgm_daigo_mvl/mxv + .byte 13*mus_encounter_champion_mvl/mxv .byte W03 - .byte 13*bgm_daigo_mvl/mxv + .byte 13*mus_encounter_champion_mvl/mxv .byte W04 - .byte 12*bgm_daigo_mvl/mxv + .byte 12*mus_encounter_champion_mvl/mxv .byte W02 - .byte 11*bgm_daigo_mvl/mxv + .byte 11*mus_encounter_champion_mvl/mxv .byte W03 - .byte 9*bgm_daigo_mvl/mxv + .byte 9*mus_encounter_champion_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 41*bgm_daigo_mvl/mxv + .byte VOL , 41*mus_encounter_champion_mvl/mxv .byte N48 .byte W24 .byte MOD , 5 - .byte VOL , 37*bgm_daigo_mvl/mxv + .byte VOL , 37*mus_encounter_champion_mvl/mxv .byte W02 - .byte 33*bgm_daigo_mvl/mxv + .byte 33*mus_encounter_champion_mvl/mxv .byte W03 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W01 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W02 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W04 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W02 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W03 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte N48 , As3 .byte W24 .byte MOD , 5 - .byte VOL , 37*bgm_daigo_mvl/mxv + .byte VOL , 37*mus_encounter_champion_mvl/mxv .byte W02 - .byte 33*bgm_daigo_mvl/mxv + .byte 33*mus_encounter_champion_mvl/mxv .byte W03 - .byte 31*bgm_daigo_mvl/mxv + .byte 31*mus_encounter_champion_mvl/mxv .byte W03 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W04 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W02 - .byte 21*bgm_daigo_mvl/mxv + .byte 21*mus_encounter_champion_mvl/mxv .byte W03 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte N24 , An4 .byte W24 .byte Gn4 @@ -1507,24 +1507,24 @@ bgm_daigo_4_B1: .byte N44 , An4 .byte W21 .byte MOD , 5 - .byte VOL , 37*bgm_daigo_mvl/mxv + .byte VOL , 37*mus_encounter_champion_mvl/mxv .byte W02 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W03 - .byte 32*bgm_daigo_mvl/mxv + .byte 32*mus_encounter_champion_mvl/mxv .byte W03 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W04 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W02 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W03 - .byte 18*bgm_daigo_mvl/mxv + .byte 18*mus_encounter_champion_mvl/mxv .byte W03 - .byte 16*bgm_daigo_mvl/mxv + .byte 16*mus_encounter_champion_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 41*bgm_daigo_mvl/mxv + .byte VOL , 41*mus_encounter_champion_mvl/mxv .byte N03 , Fn4 .byte W06 .byte N03 @@ -1536,48 +1536,48 @@ bgm_daigo_4_B1: .byte N48 , An4 .byte W24 .byte MOD , 5 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte W02 - .byte 37*bgm_daigo_mvl/mxv + .byte 37*mus_encounter_champion_mvl/mxv .byte W03 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W03 - .byte 32*bgm_daigo_mvl/mxv + .byte 32*mus_encounter_champion_mvl/mxv .byte W04 - .byte 31*bgm_daigo_mvl/mxv + .byte 31*mus_encounter_champion_mvl/mxv .byte W02 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W03 - .byte 21*bgm_daigo_mvl/mxv + .byte 21*mus_encounter_champion_mvl/mxv .byte W03 - .byte 17*bgm_daigo_mvl/mxv + .byte 17*mus_encounter_champion_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 41*bgm_daigo_mvl/mxv + .byte VOL , 41*mus_encounter_champion_mvl/mxv .byte N06 , Fs4 .byte W06 .byte N42 , Gn4 .byte W06 .byte W12 .byte MOD , 5 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte W02 - .byte 37*bgm_daigo_mvl/mxv + .byte 37*mus_encounter_champion_mvl/mxv .byte W03 - .byte 35*bgm_daigo_mvl/mxv + .byte 35*mus_encounter_champion_mvl/mxv .byte W03 - .byte 32*bgm_daigo_mvl/mxv + .byte 32*mus_encounter_champion_mvl/mxv .byte W04 - .byte 30*bgm_daigo_mvl/mxv + .byte 30*mus_encounter_champion_mvl/mxv .byte W02 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W03 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W03 - .byte 19*bgm_daigo_mvl/mxv + .byte 19*mus_encounter_champion_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 41*bgm_daigo_mvl/mxv + .byte VOL , 41*mus_encounter_champion_mvl/mxv .byte N06 , Fs4 .byte W06 .byte Gn4 @@ -1586,40 +1586,40 @@ bgm_daigo_4_B1: .byte W12 .byte MOD , 5 .byte W03 - .byte VOL , 36*bgm_daigo_mvl/mxv + .byte VOL , 36*mus_encounter_champion_mvl/mxv .byte W02 - .byte 31*bgm_daigo_mvl/mxv + .byte 31*mus_encounter_champion_mvl/mxv .byte W03 - .byte 28*bgm_daigo_mvl/mxv + .byte 28*mus_encounter_champion_mvl/mxv .byte W04 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W02 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W03 - .byte 22*bgm_daigo_mvl/mxv + .byte 22*mus_encounter_champion_mvl/mxv .byte W03 - .byte 18*bgm_daigo_mvl/mxv + .byte 18*mus_encounter_champion_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 41*bgm_daigo_mvl/mxv + .byte VOL , 41*mus_encounter_champion_mvl/mxv .byte N06 , Gs4 .byte W06 .byte Bn4 .byte W06 .byte PATT - .word bgm_daigo_4_000 + .word mus_encounter_champion_4_000 .byte GOTO - .word bgm_daigo_4_B1 + .word mus_encounter_champion_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_daigo_5: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_5: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte PAN , c_v+0 .byte W12 .byte N06 , En5 , v096 @@ -1631,15 +1631,15 @@ bgm_daigo_5: .byte W60 .byte N06 .byte W24 -bgm_daigo_5_B1: -bgm_daigo_5_000: +mus_encounter_champion_5_B1: +mus_encounter_champion_5_000: .byte W12 .byte N06 , En5 , v096 .byte W72 .byte N06 .byte W12 .byte PEND -bgm_daigo_5_001: +mus_encounter_champion_5_001: .byte N06 , En5 , v096 .byte W18 .byte N06 @@ -1649,7 +1649,7 @@ bgm_daigo_5_001: .byte N06 .byte W12 .byte PEND -bgm_daigo_5_002: +mus_encounter_champion_5_002: .byte W12 .byte N06 , En5 , v096 .byte W48 @@ -1659,16 +1659,16 @@ bgm_daigo_5_002: .byte W12 .byte PEND .byte PATT - .word bgm_daigo_5_001 + .word mus_encounter_champion_5_001 .byte PATT - .word bgm_daigo_5_000 + .word mus_encounter_champion_5_000 .byte PATT - .word bgm_daigo_5_001 + .word mus_encounter_champion_5_001 .byte PATT - .word bgm_daigo_5_002 + .word mus_encounter_champion_5_002 .byte PATT - .word bgm_daigo_5_002 -bgm_daigo_5_003: + .word mus_encounter_champion_5_002 +mus_encounter_champion_5_003: .byte N06 , En5 , v112 .byte W30 .byte En5 , v080 @@ -1683,12 +1683,12 @@ bgm_daigo_5_003: .byte W12 .byte PEND .byte PATT - .word bgm_daigo_5_003 + .word mus_encounter_champion_5_003 .byte PATT - .word bgm_daigo_5_003 + .word mus_encounter_champion_5_003 .byte PATT - .word bgm_daigo_5_003 -bgm_daigo_5_004: + .word mus_encounter_champion_5_003 +mus_encounter_champion_5_004: .byte W36 .byte N06 , En5 , v092 .byte W48 @@ -1696,57 +1696,57 @@ bgm_daigo_5_004: .byte W12 .byte PEND .byte PATT - .word bgm_daigo_5_004 + .word mus_encounter_champion_5_004 .byte PATT - .word bgm_daigo_5_004 + .word mus_encounter_champion_5_004 .byte PATT - .word bgm_daigo_5_004 + .word mus_encounter_champion_5_004 .byte GOTO - .word bgm_daigo_5_B1 + .word mus_encounter_champion_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_daigo_6: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_6: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 38*bgm_daigo_mvl/mxv + .byte VOL , 38*mus_encounter_champion_mvl/mxv .byte PAN , c_v-61 .byte W96 - .byte VOL , 8*bgm_daigo_mvl/mxv + .byte VOL , 8*mus_encounter_champion_mvl/mxv .byte N96 , Bn3 , v112 .byte W08 - .byte VOL , 11*bgm_daigo_mvl/mxv + .byte VOL , 11*mus_encounter_champion_mvl/mxv .byte W12 - .byte 14*bgm_daigo_mvl/mxv + .byte 14*mus_encounter_champion_mvl/mxv .byte W12 - .byte 17*bgm_daigo_mvl/mxv + .byte 17*mus_encounter_champion_mvl/mxv .byte W21 - .byte 19*bgm_daigo_mvl/mxv + .byte 19*mus_encounter_champion_mvl/mxv .byte W03 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W06 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W03 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W03 - .byte 34*bgm_daigo_mvl/mxv + .byte 34*mus_encounter_champion_mvl/mxv .byte W04 - .byte 38*bgm_daigo_mvl/mxv + .byte 38*mus_encounter_champion_mvl/mxv .byte W02 - .byte 51*bgm_daigo_mvl/mxv + .byte 51*mus_encounter_champion_mvl/mxv .byte W03 - .byte 62*bgm_daigo_mvl/mxv + .byte 62*mus_encounter_champion_mvl/mxv .byte W03 - .byte 65*bgm_daigo_mvl/mxv + .byte 65*mus_encounter_champion_mvl/mxv .byte W16 -bgm_daigo_6_B1: +mus_encounter_champion_6_B1: .byte VOICE , 80 - .byte VOL , 44*bgm_daigo_mvl/mxv + .byte VOL , 44*mus_encounter_champion_mvl/mxv .byte N09 , Cn6 , v112 .byte W12 .byte N06 , Cn6 , v092 @@ -1765,7 +1765,7 @@ bgm_daigo_6_B1: .byte W12 .byte Cn6 , v096 .byte W12 -bgm_daigo_6_000: +mus_encounter_champion_6_000: .byte N06 , An6 , v112 .byte W12 .byte N06 @@ -1806,8 +1806,8 @@ bgm_daigo_6_000: .byte Cn6 , v096 .byte W12 .byte PATT - .word bgm_daigo_6_000 -bgm_daigo_6_001: + .word mus_encounter_champion_6_000 +mus_encounter_champion_6_001: .byte N09 , As5 , v112 .byte W12 .byte N06 , As5 , v092 @@ -1848,7 +1848,7 @@ bgm_daigo_6_001: .byte N03 , Gn5 .byte W06 .byte PATT - .word bgm_daigo_6_001 + .word mus_encounter_champion_6_001 .byte MOD , 4 .byte N06 , Gn6 , v112 .byte W12 @@ -1869,7 +1869,7 @@ bgm_daigo_6_001: .byte N06 , Gn6 .byte W06 .byte VOICE , 81 - .byte VOL , 38*bgm_daigo_mvl/mxv + .byte VOL , 38*mus_encounter_champion_mvl/mxv .byte MOD , 0 .byte N06 , Gn3 .byte W06 @@ -2007,52 +2007,52 @@ bgm_daigo_6_001: .byte En4 .byte W03 .byte GOTO - .word bgm_daigo_6_B1 + .word mus_encounter_champion_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_daigo_7: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_7: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 38*bgm_daigo_mvl/mxv + .byte VOL , 38*mus_encounter_champion_mvl/mxv .byte W96 - .byte 8*bgm_daigo_mvl/mxv + .byte 8*mus_encounter_champion_mvl/mxv .byte PAN , c_v+63 .byte N96 , Dn3 , v112 .byte W08 - .byte VOL , 11*bgm_daigo_mvl/mxv + .byte VOL , 11*mus_encounter_champion_mvl/mxv .byte W12 - .byte 14*bgm_daigo_mvl/mxv + .byte 14*mus_encounter_champion_mvl/mxv .byte W12 - .byte 17*bgm_daigo_mvl/mxv + .byte 17*mus_encounter_champion_mvl/mxv .byte W21 - .byte 19*bgm_daigo_mvl/mxv + .byte 19*mus_encounter_champion_mvl/mxv .byte W03 - .byte 20*bgm_daigo_mvl/mxv + .byte 20*mus_encounter_champion_mvl/mxv .byte W06 - .byte 23*bgm_daigo_mvl/mxv + .byte 23*mus_encounter_champion_mvl/mxv .byte W03 - .byte 26*bgm_daigo_mvl/mxv + .byte 26*mus_encounter_champion_mvl/mxv .byte W03 - .byte 34*bgm_daigo_mvl/mxv + .byte 34*mus_encounter_champion_mvl/mxv .byte W04 - .byte 38*bgm_daigo_mvl/mxv + .byte 38*mus_encounter_champion_mvl/mxv .byte W02 - .byte 51*bgm_daigo_mvl/mxv + .byte 51*mus_encounter_champion_mvl/mxv .byte W03 - .byte 62*bgm_daigo_mvl/mxv + .byte 62*mus_encounter_champion_mvl/mxv .byte W03 - .byte 65*bgm_daigo_mvl/mxv + .byte 65*mus_encounter_champion_mvl/mxv .byte W16 -bgm_daigo_7_B1: +mus_encounter_champion_7_B1: .byte VOICE , 83 - .byte VOL , 38*bgm_daigo_mvl/mxv + .byte VOL , 38*mus_encounter_champion_mvl/mxv .byte N06 , Gn2 , v112 .byte W06 .byte N03 , An2 @@ -2245,26 +2245,26 @@ bgm_daigo_7_B1: .byte W24 .byte MOD , 4 .byte W48 - .byte VOL , 40*bgm_daigo_mvl/mxv + .byte VOL , 40*mus_encounter_champion_mvl/mxv .byte W02 - .byte 44*bgm_daigo_mvl/mxv + .byte 44*mus_encounter_champion_mvl/mxv .byte W03 - .byte 47*bgm_daigo_mvl/mxv + .byte 47*mus_encounter_champion_mvl/mxv .byte W03 - .byte 52*bgm_daigo_mvl/mxv + .byte 52*mus_encounter_champion_mvl/mxv .byte W04 - .byte 55*bgm_daigo_mvl/mxv + .byte 55*mus_encounter_champion_mvl/mxv .byte W02 - .byte 62*bgm_daigo_mvl/mxv + .byte 62*mus_encounter_champion_mvl/mxv .byte W03 - .byte 68*bgm_daigo_mvl/mxv + .byte 68*mus_encounter_champion_mvl/mxv .byte W03 - .byte 71*bgm_daigo_mvl/mxv + .byte 71*mus_encounter_champion_mvl/mxv .byte W16 .byte EOT .byte PAN , c_v+63 .byte MOD , 0 - .byte VOL , 38*bgm_daigo_mvl/mxv + .byte VOL , 38*mus_encounter_champion_mvl/mxv .byte N06 , Gn4 .byte W06 .byte Fn4 @@ -2399,16 +2399,16 @@ bgm_daigo_7_B1: .byte Gs4 .byte W03 .byte GOTO - .word bgm_daigo_7_B1 + .word mus_encounter_champion_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_daigo_8: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_8: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 76*bgm_daigo_mvl/mxv + .byte VOL , 76*mus_encounter_champion_mvl/mxv .byte N06 , Dn1 , v112 .byte W12 .byte N06 @@ -2424,7 +2424,7 @@ bgm_daigo_8: .byte N42 , An2 .byte W42 .byte W96 -bgm_daigo_8_B1: +mus_encounter_champion_8_B1: .byte W18 .byte N06 , Cn1 , v112 .byte W06 @@ -2464,7 +2464,7 @@ bgm_daigo_8_B1: .byte W06 .byte Cn1 .byte W06 -bgm_daigo_8_000: +mus_encounter_champion_8_000: .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -2507,7 +2507,7 @@ bgm_daigo_8_000: .byte Cn1 .byte W06 .byte PATT - .word bgm_daigo_8_000 + .word mus_encounter_champion_8_000 .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -2531,10 +2531,10 @@ bgm_daigo_8_000: .byte Cn1 .byte W06 .byte PATT - .word bgm_daigo_8_000 + .word mus_encounter_champion_8_000 .byte PATT - .word bgm_daigo_8_000 -bgm_daigo_8_001: + .word mus_encounter_champion_8_000 +mus_encounter_champion_8_001: .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -2563,7 +2563,7 @@ bgm_daigo_8_001: .byte N06 .byte W12 .byte PATT - .word bgm_daigo_8_001 + .word mus_encounter_champion_8_001 .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -2580,7 +2580,7 @@ bgm_daigo_8_001: .byte W18 .byte N06 .byte W12 -bgm_daigo_8_002: +mus_encounter_champion_8_002: .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -2603,7 +2603,7 @@ bgm_daigo_8_002: .byte W06 .byte PEND .byte PATT - .word bgm_daigo_8_002 + .word mus_encounter_champion_8_002 .byte N06 , Dn1 , v112 .byte W12 .byte N06 @@ -2655,25 +2655,25 @@ bgm_daigo_8_002: .byte Cn1 , v096 .byte W06 .byte GOTO - .word bgm_daigo_8_B1 + .word mus_encounter_champion_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_daigo_9: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_9: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 29 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 47*bgm_daigo_mvl/mxv + .byte VOL , 47*mus_encounter_champion_mvl/mxv .byte W96 .byte W96 -bgm_daigo_9_B1: +mus_encounter_champion_9_B1: .byte VOICE , 29 - .byte VOL , 56*bgm_daigo_mvl/mxv + .byte VOL , 56*mus_encounter_champion_mvl/mxv .byte N06 , Bn1 , v112 .byte W06 .byte N03 , Cn2 @@ -2932,7 +2932,7 @@ bgm_daigo_9_B1: .byte W48 .byte VOICE , 85 .byte W24 - .byte VOL , 21*bgm_daigo_mvl/mxv + .byte VOL , 21*mus_encounter_champion_mvl/mxv .byte BEND , c_v+2 .byte W12 .byte N06 , Bn4 , v104 @@ -3050,18 +3050,18 @@ bgm_daigo_9_B1: .byte Gn4 .byte W03 .byte GOTO - .word bgm_daigo_9_B1 + .word mus_encounter_champion_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_daigo_10: - .byte KEYSH , bgm_daigo_key+0 +mus_encounter_champion_10: + .byte KEYSH , mus_encounter_champion_key+0 .byte VOICE , 17 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-17 - .byte VOL , 50*bgm_daigo_mvl/mxv + .byte VOL , 50*mus_encounter_champion_mvl/mxv .byte N06 , Ds4 , v112 .byte W12 .byte Cn4 @@ -3081,9 +3081,9 @@ bgm_daigo_10: .byte En4 .byte W12 .byte W96 -bgm_daigo_10_B1: +mus_encounter_champion_10_B1: .byte VOICE , 17 - .byte VOL , 52*bgm_daigo_mvl/mxv + .byte VOL , 52*mus_encounter_champion_mvl/mxv .byte N03 , En3 , v112 .byte W03 .byte Fn3 @@ -3112,7 +3112,7 @@ bgm_daigo_10_B1: .byte N06 , An4 .byte W30 .byte VOICE , 47 - .byte VOL , 52*bgm_daigo_mvl/mxv + .byte VOL , 52*mus_encounter_champion_mvl/mxv .byte PAN , c_v-10 .byte N06 , An2 .byte W18 @@ -3132,7 +3132,7 @@ bgm_daigo_10_B1: .byte W12 .byte VOICE , 17 .byte PAN , c_v-32 - .byte VOL , 52*bgm_daigo_mvl/mxv + .byte VOL , 52*mus_encounter_champion_mvl/mxv .byte N03 , Cs2 .byte W03 .byte Fn3 @@ -3161,7 +3161,7 @@ bgm_daigo_10_B1: .byte N06 , An4 .byte W30 .byte VOICE , 47 - .byte VOL , 52*bgm_daigo_mvl/mxv + .byte VOL , 52*mus_encounter_champion_mvl/mxv .byte PAN , c_v-11 .byte N06 , An2 .byte W18 @@ -3209,7 +3209,7 @@ bgm_daigo_10_B1: .byte N06 , Gn4 .byte W30 .byte VOICE , 47 - .byte VOL , 52*bgm_daigo_mvl/mxv + .byte VOL , 52*mus_encounter_champion_mvl/mxv .byte PAN , c_v-11 .byte N06 , Gn2 .byte W18 @@ -3229,7 +3229,7 @@ bgm_daigo_10_B1: .byte W12 .byte VOICE , 17 .byte PAN , c_v-32 - .byte VOL , 52*bgm_daigo_mvl/mxv + .byte VOL , 52*mus_encounter_champion_mvl/mxv .byte N03 , Bn1 .byte W03 .byte Ds3 @@ -3284,29 +3284,29 @@ bgm_daigo_10_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_daigo_10_B1 + .word mus_encounter_champion_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_daigo: +mus_encounter_champion: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_daigo_pri @ Priority - .byte bgm_daigo_rev @ Reverb. + .byte mus_encounter_champion_pri @ Priority + .byte mus_encounter_champion_rev @ Reverb. - .word bgm_daigo_grp + .word mus_encounter_champion_grp - .word bgm_daigo_1 - .word bgm_daigo_2 - .word bgm_daigo_3 - .word bgm_daigo_4 - .word bgm_daigo_5 - .word bgm_daigo_6 - .word bgm_daigo_7 - .word bgm_daigo_8 - .word bgm_daigo_9 - .word bgm_daigo_10 + .word mus_encounter_champion_1 + .word mus_encounter_champion_2 + .word mus_encounter_champion_3 + .word mus_encounter_champion_4 + .word mus_encounter_champion_5 + .word mus_encounter_champion_6 + .word mus_encounter_champion_7 + .word mus_encounter_champion_8 + .word mus_encounter_champion_9 + .word mus_encounter_champion_10 .end diff --git a/sound/songs/bgm_kakkoii.s b/sound/songs/mus_encounter_cool.s index bcef07517..0b36d400a 100644 --- a/sound/songs/bgm_kakkoii.s +++ b/sound/songs/mus_encounter_cool.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_kakkoii_grp, voicegroup060 - .equ bgm_kakkoii_pri, 0 - .equ bgm_kakkoii_rev, reverb_set+50 - .equ bgm_kakkoii_mvl, 127 - .equ bgm_kakkoii_key, 0 - .equ bgm_kakkoii_tbs, 1 - .equ bgm_kakkoii_exg, 0 - .equ bgm_kakkoii_cmp, 1 + .equ mus_encounter_cool_grp, voicegroup060 + .equ mus_encounter_cool_pri, 0 + .equ mus_encounter_cool_rev, reverb_set+50 + .equ mus_encounter_cool_mvl, 127 + .equ mus_encounter_cool_key, 0 + .equ mus_encounter_cool_tbs, 1 + .equ mus_encounter_cool_exg, 0 + .equ mus_encounter_cool_cmp, 1 .section .rodata - .global bgm_kakkoii + .global mus_encounter_cool .align 2 @********************** Track 1 **********************@ -bgm_kakkoii_1: - .byte KEYSH , bgm_kakkoii_key+0 - .byte TEMPO , 140*bgm_kakkoii_tbs/2 +mus_encounter_cool_1: + .byte KEYSH , mus_encounter_cool_key+0 + .byte TEMPO , 140*mus_encounter_cool_tbs/2 .byte VOICE , 127 .byte PAN , c_v+63 - .byte VOL , 43*bgm_kakkoii_mvl/mxv + .byte VOL , 43*mus_encounter_cool_mvl/mxv .byte W12 -bgm_kakkoii_1_000: +mus_encounter_cool_1_000: .byte N03 , En4 , v112 .byte W06 .byte En4 , v064 @@ -41,9 +41,9 @@ bgm_kakkoii_1_000: .byte W18 .byte PEND .byte PATT - .word bgm_kakkoii_1_000 -bgm_kakkoii_1_B1: -bgm_kakkoii_1_001: + .word mus_encounter_cool_1_000 +mus_encounter_cool_1_B1: +mus_encounter_cool_1_001: .byte N03 , En4 , v112 .byte W12 .byte En4 , v084 @@ -69,7 +69,7 @@ bgm_kakkoii_1_001: .byte En4 , v072 .byte W06 .byte PEND -bgm_kakkoii_1_002: +mus_encounter_cool_1_002: .byte N02 , En4 , v112 .byte W04 .byte En4 , v088 @@ -100,8 +100,8 @@ bgm_kakkoii_1_002: .byte W06 .byte PEND .byte PATT - .word bgm_kakkoii_1_001 -bgm_kakkoii_1_003: + .word mus_encounter_cool_1_001 +mus_encounter_cool_1_003: .byte N02 , En4 , v112 .byte W04 .byte En4 , v088 @@ -136,40 +136,40 @@ bgm_kakkoii_1_003: .byte W06 .byte PEND .byte PATT - .word bgm_kakkoii_1_001 + .word mus_encounter_cool_1_001 .byte PATT - .word bgm_kakkoii_1_002 + .word mus_encounter_cool_1_002 .byte PATT - .word bgm_kakkoii_1_001 + .word mus_encounter_cool_1_001 .byte PATT - .word bgm_kakkoii_1_003 + .word mus_encounter_cool_1_003 .byte PATT - .word bgm_kakkoii_1_001 + .word mus_encounter_cool_1_001 .byte PATT - .word bgm_kakkoii_1_002 + .word mus_encounter_cool_1_002 .byte PATT - .word bgm_kakkoii_1_001 + .word mus_encounter_cool_1_001 .byte PATT - .word bgm_kakkoii_1_003 + .word mus_encounter_cool_1_003 .byte PATT - .word bgm_kakkoii_1_001 + .word mus_encounter_cool_1_001 .byte PATT - .word bgm_kakkoii_1_002 + .word mus_encounter_cool_1_002 .byte PATT - .word bgm_kakkoii_1_001 + .word mus_encounter_cool_1_001 .byte PATT - .word bgm_kakkoii_1_003 + .word mus_encounter_cool_1_003 .byte GOTO - .word bgm_kakkoii_1_B1 + .word mus_encounter_cool_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_kakkoii_2: - .byte KEYSH , bgm_kakkoii_key+0 +mus_encounter_cool_2: + .byte KEYSH , mus_encounter_cool_key+0 .byte VOICE , 126 .byte PAN , c_v+63 - .byte VOL , 43*bgm_kakkoii_mvl/mxv + .byte VOL , 43*mus_encounter_cool_mvl/mxv .byte W12 .byte W36 .byte N10 , Fn4 , v096 @@ -187,7 +187,7 @@ bgm_kakkoii_2: .byte W24 .byte N10 .byte W12 -bgm_kakkoii_2_B1: +mus_encounter_cool_2_B1: .byte W12 .byte N10 , Fn4 , v096 .byte W84 @@ -207,18 +207,18 @@ bgm_kakkoii_2_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_kakkoii_2_B1 + .word mus_encounter_cool_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_kakkoii_3: - .byte KEYSH , bgm_kakkoii_key+0 +mus_encounter_cool_3: + .byte KEYSH , mus_encounter_cool_key+0 .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte BEND , c_v+0 .byte W12 .byte c_v+0 @@ -257,8 +257,8 @@ bgm_kakkoii_3: .byte W06 .byte BEND , c_v+4 .byte W06 -bgm_kakkoii_3_B1: -bgm_kakkoii_3_000: +mus_encounter_cool_3_B1: +mus_encounter_cool_3_000: .byte BEND , c_v+0 .byte N06 , Cn1 , v120 .byte W06 @@ -292,7 +292,7 @@ bgm_kakkoii_3_000: .byte BEND , c_v+5 .byte W06 .byte PEND -bgm_kakkoii_3_001: +mus_encounter_cool_3_001: .byte BEND , c_v+0 .byte N06 , An0 , v120 .byte W06 @@ -360,7 +360,7 @@ bgm_kakkoii_3_001: .byte W06 .byte As1 , v032 .byte W06 -bgm_kakkoii_3_002: +mus_encounter_cool_3_002: .byte N06 , Fn0 , v120 .byte W06 .byte Fn0 , v032 @@ -396,9 +396,9 @@ bgm_kakkoii_3_002: .byte W06 .byte PEND .byte PATT - .word bgm_kakkoii_3_000 + .word mus_encounter_cool_3_000 .byte PATT - .word bgm_kakkoii_3_001 + .word mus_encounter_cool_3_001 .byte BEND , c_v+0 .byte N06 , Cn1 , v120 .byte W06 @@ -432,7 +432,7 @@ bgm_kakkoii_3_002: .byte As1 , v032 .byte W06 .byte PATT - .word bgm_kakkoii_3_002 + .word mus_encounter_cool_3_002 .byte BEND , c_v+0 .byte N06 , Dn1 , v120 .byte W06 @@ -467,7 +467,7 @@ bgm_kakkoii_3_002: .byte W06 .byte BEND , c_v+5 .byte W06 -bgm_kakkoii_3_003: +mus_encounter_cool_3_003: .byte BEND , c_v+0 .byte N06 , Bn0 , v120 .byte W06 @@ -501,7 +501,7 @@ bgm_kakkoii_3_003: .byte N06 , Cs1 .byte W06 .byte PEND -bgm_kakkoii_3_004: +mus_encounter_cool_3_004: .byte BEND , c_v+0 .byte N06 , Dn1 , v120 .byte W06 @@ -537,7 +537,7 @@ bgm_kakkoii_3_004: .byte Cn2 , v032 .byte W06 .byte PEND -bgm_kakkoii_3_005: +mus_encounter_cool_3_005: .byte N06 , Gn0 , v120 .byte W06 .byte Gn0 , v032 @@ -605,22 +605,22 @@ bgm_kakkoii_3_005: .byte BEND , c_v+5 .byte W06 .byte PATT - .word bgm_kakkoii_3_003 + .word mus_encounter_cool_3_003 .byte PATT - .word bgm_kakkoii_3_004 + .word mus_encounter_cool_3_004 .byte PATT - .word bgm_kakkoii_3_005 + .word mus_encounter_cool_3_005 .byte GOTO - .word bgm_kakkoii_3_B1 + .word mus_encounter_cool_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_kakkoii_4: - .byte KEYSH , bgm_kakkoii_key+0 +mus_encounter_cool_4: + .byte KEYSH , mus_encounter_cool_key+0 .byte VOICE , 56 .byte PAN , c_v+12 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte N03 , Dn4 , v120 .byte W12 .byte N06 , Ds4 @@ -658,9 +658,9 @@ bgm_kakkoii_4: .byte W21 .byte N24 , Fn4 .byte W24 -bgm_kakkoii_4_B1: +mus_encounter_cool_4_B1: .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Ds4 , v112 .byte W12 @@ -679,7 +679,7 @@ bgm_kakkoii_4_B1: .byte N03 , Dn4 .byte W18 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N03 , Cn5 , v032 .byte W06 .byte Cn5 , v040 @@ -713,7 +713,7 @@ bgm_kakkoii_4_B1: .byte N12 , Bn4 .byte W12 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Ds4 .byte W06 @@ -740,7 +740,7 @@ bgm_kakkoii_4_B1: .byte Gn4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N06 , Fn4 .byte W06 .byte N03 , Gn4 @@ -772,13 +772,13 @@ bgm_kakkoii_4_B1: .byte Fn4 .byte W04 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte N06 , Dn5 .byte W06 .byte N03 , Ds5 .byte W06 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Ds4 .byte W12 @@ -803,7 +803,7 @@ bgm_kakkoii_4_B1: .byte N03 , An4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N06 , As4 .byte W06 .byte N03 , An4 @@ -841,7 +841,7 @@ bgm_kakkoii_4_B1: .byte Cn5 .byte W04 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Ds5 .byte W06 @@ -874,7 +874,7 @@ bgm_kakkoii_4_B1: .byte N03 , Cn4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N03 , Fn3 .byte W03 .byte Gs3 @@ -910,12 +910,12 @@ bgm_kakkoii_4_B1: .byte W03 .byte N06 , Dn4 , v112 .byte W03 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W03 .byte N06 , En4 .byte W06 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Fn4 .byte W12 @@ -934,7 +934,7 @@ bgm_kakkoii_4_B1: .byte N03 , En4 .byte W18 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N03 , Dn5 , v032 .byte W06 .byte Dn5 , v040 @@ -968,7 +968,7 @@ bgm_kakkoii_4_B1: .byte N12 , Cs5 .byte W12 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Fn4 .byte W06 @@ -995,7 +995,7 @@ bgm_kakkoii_4_B1: .byte An4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N06 , Gn4 .byte W06 .byte N03 , An4 @@ -1033,7 +1033,7 @@ bgm_kakkoii_4_B1: .byte Gn3 .byte W04 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Fn4 .byte W12 @@ -1058,7 +1058,7 @@ bgm_kakkoii_4_B1: .byte N03 , Bn4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N06 , Cn5 .byte W06 .byte N03 , Bn4 @@ -1096,7 +1096,7 @@ bgm_kakkoii_4_B1: .byte Dn5 .byte W04 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Fn5 .byte W06 @@ -1129,7 +1129,7 @@ bgm_kakkoii_4_B1: .byte N03 , Dn4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N03 , Gn3 .byte W03 .byte As3 @@ -1167,21 +1167,21 @@ bgm_kakkoii_4_B1: .byte Dn5 , v048 .byte W09 .byte GOTO - .word bgm_kakkoii_4_B1 + .word mus_encounter_cool_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_kakkoii_5: - .byte KEYSH , bgm_kakkoii_key+0 +mus_encounter_cool_5: + .byte KEYSH , mus_encounter_cool_key+0 .byte VOICE , 56 .byte PAN , c_v-30 - .byte VOL , 75*bgm_kakkoii_mvl/mxv + .byte VOL , 75*mus_encounter_cool_mvl/mxv .byte N03 , Gn3 , v112 .byte W12 .byte VOICE , 82 .byte PAN , c_v+0 - .byte VOL , 60*bgm_kakkoii_mvl/mxv + .byte VOL , 60*mus_encounter_cool_mvl/mxv .byte N06 .byte W06 .byte N03 , Fn3 , v064 @@ -1217,9 +1217,9 @@ bgm_kakkoii_5: .byte W21 .byte N24 , As3 .byte W24 -bgm_kakkoii_5_B1: +mus_encounter_cool_5_B1: .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Gn3 , v112 .byte W12 @@ -1238,7 +1238,7 @@ bgm_kakkoii_5_B1: .byte N03 , Fn3 .byte W18 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N03 , Fn4 , v032 .byte W06 .byte Fn4 , v040 @@ -1272,7 +1272,7 @@ bgm_kakkoii_5_B1: .byte N12 , Gn4 .byte W12 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Gn3 .byte W06 @@ -1299,7 +1299,7 @@ bgm_kakkoii_5_B1: .byte Dn4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N06 , Cn4 .byte W06 .byte N03 , Dn4 @@ -1331,13 +1331,13 @@ bgm_kakkoii_5_B1: .byte Dn4 .byte W04 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte N06 , Fn4 .byte W06 .byte N03 , Gn4 .byte W06 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Gn3 .byte W12 @@ -1362,7 +1362,7 @@ bgm_kakkoii_5_B1: .byte N03 , Fn4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N06 .byte W06 .byte N03 , Cn4 @@ -1400,7 +1400,7 @@ bgm_kakkoii_5_B1: .byte An4 .byte W04 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , Gn4 .byte W06 @@ -1429,7 +1429,7 @@ bgm_kakkoii_5_B1: .byte N03 , Gn3 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N03 , Cn3 .byte W03 .byte Ds3 @@ -1457,12 +1457,12 @@ bgm_kakkoii_5_B1: .byte VOICE , 56 .byte N06 , An3 , v112 .byte W03 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W03 .byte N06 , Cs4 .byte W06 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , An3 .byte W12 @@ -1481,7 +1481,7 @@ bgm_kakkoii_5_B1: .byte N03 , Gn3 .byte W18 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N03 , Gn4 , v032 .byte W06 .byte Gn4 , v040 @@ -1515,7 +1515,7 @@ bgm_kakkoii_5_B1: .byte N12 , An4 .byte W12 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , An3 .byte W06 @@ -1542,7 +1542,7 @@ bgm_kakkoii_5_B1: .byte En4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N06 , Dn4 .byte W06 .byte N03 , En4 @@ -1580,7 +1580,7 @@ bgm_kakkoii_5_B1: .byte En3 .byte W04 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , An3 .byte W12 @@ -1605,7 +1605,7 @@ bgm_kakkoii_5_B1: .byte N03 , Gn4 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N06 .byte W06 .byte N03 , Dn4 @@ -1643,7 +1643,7 @@ bgm_kakkoii_5_B1: .byte Bn4 .byte W04 .byte VOICE , 56 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte W12 .byte N06 , An4 .byte W06 @@ -1672,7 +1672,7 @@ bgm_kakkoii_5_B1: .byte N03 , An3 .byte W06 .byte VOICE , 17 - .byte VOL , 55*bgm_kakkoii_mvl/mxv + .byte VOL , 55*mus_encounter_cool_mvl/mxv .byte N03 , Dn3 .byte W03 .byte Fn3 @@ -1702,16 +1702,16 @@ bgm_kakkoii_5_B1: .byte Bn4 , v048 .byte W09 .byte GOTO - .word bgm_kakkoii_5_B1 + .word mus_encounter_cool_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_kakkoii_6: - .byte KEYSH , bgm_kakkoii_key+0 +mus_encounter_cool_6: + .byte KEYSH , mus_encounter_cool_key+0 .byte VOICE , 17 .byte PAN , c_v+0 - .byte VOL , 39*bgm_kakkoii_mvl/mxv + .byte VOL , 39*mus_encounter_cool_mvl/mxv .byte N03 , Cn5 , v076 .byte W03 .byte Dn5 @@ -1747,7 +1747,7 @@ bgm_kakkoii_6: .byte W03 .byte N24 , As5 .byte W24 -bgm_kakkoii_6_B1: +mus_encounter_cool_6_B1: .byte W96 .byte W96 .byte W96 @@ -1765,22 +1765,22 @@ bgm_kakkoii_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_kakkoii_6_B1 + .word mus_encounter_cool_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_kakkoii_7: - .byte KEYSH , bgm_kakkoii_key+0 +mus_encounter_cool_7: + .byte KEYSH , mus_encounter_cool_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte PAN , c_v-64 - .byte VOL , 39*bgm_kakkoii_mvl/mxv + .byte VOL , 39*mus_encounter_cool_mvl/mxv .byte W12 .byte W96 .byte W96 -bgm_kakkoii_7_B1: -bgm_kakkoii_7_000: +mus_encounter_cool_7_B1: +mus_encounter_cool_7_000: .byte N03 , Cn2 , v112 .byte W06 .byte N03 @@ -1804,7 +1804,7 @@ bgm_kakkoii_7_000: .byte Cn3 .byte W18 .byte PEND -bgm_kakkoii_7_001: +mus_encounter_cool_7_001: .byte N03 , An1 , v112 .byte W06 .byte N03 @@ -1829,8 +1829,8 @@ bgm_kakkoii_7_001: .byte W18 .byte PEND .byte PATT - .word bgm_kakkoii_7_000 -bgm_kakkoii_7_002: + .word mus_encounter_cool_7_000 +mus_encounter_cool_7_002: .byte N03 , An1 , v112 .byte W06 .byte N03 @@ -1855,14 +1855,14 @@ bgm_kakkoii_7_002: .byte W12 .byte PEND .byte PATT - .word bgm_kakkoii_7_000 + .word mus_encounter_cool_7_000 .byte PATT - .word bgm_kakkoii_7_001 + .word mus_encounter_cool_7_001 .byte PATT - .word bgm_kakkoii_7_000 + .word mus_encounter_cool_7_000 .byte PATT - .word bgm_kakkoii_7_002 -bgm_kakkoii_7_003: + .word mus_encounter_cool_7_002 +mus_encounter_cool_7_003: .byte N03 , Dn2 , v112 .byte W06 .byte N03 @@ -1886,7 +1886,7 @@ bgm_kakkoii_7_003: .byte Dn3 .byte W18 .byte PEND -bgm_kakkoii_7_004: +mus_encounter_cool_7_004: .byte N03 , Bn1 , v112 .byte W06 .byte N03 @@ -1911,8 +1911,8 @@ bgm_kakkoii_7_004: .byte W18 .byte PEND .byte PATT - .word bgm_kakkoii_7_003 -bgm_kakkoii_7_005: + .word mus_encounter_cool_7_003 +mus_encounter_cool_7_005: .byte N03 , Bn1 , v112 .byte W06 .byte N03 @@ -1937,30 +1937,30 @@ bgm_kakkoii_7_005: .byte W12 .byte PEND .byte PATT - .word bgm_kakkoii_7_003 + .word mus_encounter_cool_7_003 .byte PATT - .word bgm_kakkoii_7_004 + .word mus_encounter_cool_7_004 .byte PATT - .word bgm_kakkoii_7_003 + .word mus_encounter_cool_7_003 .byte PATT - .word bgm_kakkoii_7_005 + .word mus_encounter_cool_7_005 .byte GOTO - .word bgm_kakkoii_7_B1 + .word mus_encounter_cool_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_kakkoii_8: - .byte KEYSH , bgm_kakkoii_key+0 +mus_encounter_cool_8: + .byte KEYSH , mus_encounter_cool_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte PAN , c_v+63 - .byte VOL , 41*bgm_kakkoii_mvl/mxv + .byte VOL , 41*mus_encounter_cool_mvl/mxv .byte W12 .byte W96 .byte W96 -bgm_kakkoii_8_B1: -bgm_kakkoii_8_000: +mus_encounter_cool_8_B1: +mus_encounter_cool_8_000: .byte N03 , Gn2 , v112 .byte W06 .byte N03 @@ -1984,7 +1984,7 @@ bgm_kakkoii_8_000: .byte Ds3 .byte W18 .byte PEND -bgm_kakkoii_8_001: +mus_encounter_cool_8_001: .byte N03 , Fn2 , v112 .byte W06 .byte N03 @@ -2009,8 +2009,8 @@ bgm_kakkoii_8_001: .byte W18 .byte PEND .byte PATT - .word bgm_kakkoii_8_000 -bgm_kakkoii_8_002: + .word mus_encounter_cool_8_000 +mus_encounter_cool_8_002: .byte N03 , Fn2 , v112 .byte W06 .byte N03 @@ -2035,14 +2035,14 @@ bgm_kakkoii_8_002: .byte W12 .byte PEND .byte PATT - .word bgm_kakkoii_8_000 + .word mus_encounter_cool_8_000 .byte PATT - .word bgm_kakkoii_8_001 + .word mus_encounter_cool_8_001 .byte PATT - .word bgm_kakkoii_8_000 + .word mus_encounter_cool_8_000 .byte PATT - .word bgm_kakkoii_8_002 -bgm_kakkoii_8_003: + .word mus_encounter_cool_8_002 +mus_encounter_cool_8_003: .byte N03 , An2 , v112 .byte W06 .byte N03 @@ -2066,7 +2066,7 @@ bgm_kakkoii_8_003: .byte Fn3 .byte W18 .byte PEND -bgm_kakkoii_8_004: +mus_encounter_cool_8_004: .byte N03 , Gn2 , v112 .byte W06 .byte N03 @@ -2091,8 +2091,8 @@ bgm_kakkoii_8_004: .byte W18 .byte PEND .byte PATT - .word bgm_kakkoii_8_003 -bgm_kakkoii_8_005: + .word mus_encounter_cool_8_003 +mus_encounter_cool_8_005: .byte N03 , Gn2 , v112 .byte W06 .byte N03 @@ -2117,24 +2117,24 @@ bgm_kakkoii_8_005: .byte W12 .byte PEND .byte PATT - .word bgm_kakkoii_8_003 + .word mus_encounter_cool_8_003 .byte PATT - .word bgm_kakkoii_8_004 + .word mus_encounter_cool_8_004 .byte PATT - .word bgm_kakkoii_8_003 + .word mus_encounter_cool_8_003 .byte PATT - .word bgm_kakkoii_8_005 + .word mus_encounter_cool_8_005 .byte GOTO - .word bgm_kakkoii_8_B1 + .word mus_encounter_cool_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_kakkoii_9: - .byte KEYSH , bgm_kakkoii_key+0 +mus_encounter_cool_9: + .byte KEYSH , mus_encounter_cool_key+0 .byte VOICE , 0 .byte PAN , c_v-1 - .byte VOL , 86*bgm_kakkoii_mvl/mxv + .byte VOL , 86*mus_encounter_cool_mvl/mxv .byte N03 , Fs2 , v112 .byte W06 .byte Fs2 , v064 @@ -2169,8 +2169,8 @@ bgm_kakkoii_9: .byte W06 .byte En1 .byte W06 -bgm_kakkoii_9_B1: -bgm_kakkoii_9_000: +mus_encounter_cool_9_B1: +mus_encounter_cool_9_000: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v096 @@ -2184,7 +2184,7 @@ bgm_kakkoii_9_000: .byte Dn1 .byte W12 .byte PEND -bgm_kakkoii_9_001: +mus_encounter_cool_9_001: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v096 @@ -2204,7 +2204,7 @@ bgm_kakkoii_9_001: .byte Dn1 .byte W06 .byte PEND -bgm_kakkoii_9_002: +mus_encounter_cool_9_002: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v096 @@ -2245,10 +2245,10 @@ bgm_kakkoii_9_002: .byte Dn1 .byte W06 .byte PATT - .word bgm_kakkoii_9_000 + .word mus_encounter_cool_9_000 .byte PATT - .word bgm_kakkoii_9_001 -bgm_kakkoii_9_003: + .word mus_encounter_cool_9_001 +mus_encounter_cool_9_003: .byte N06 , Cn1 , v112 .byte W12 .byte En1 @@ -2268,7 +2268,7 @@ bgm_kakkoii_9_003: .byte En1 .byte W06 .byte PEND -bgm_kakkoii_9_004: +mus_encounter_cool_9_004: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v096 @@ -2291,44 +2291,44 @@ bgm_kakkoii_9_004: .byte W12 .byte PEND .byte PATT - .word bgm_kakkoii_9_000 + .word mus_encounter_cool_9_000 .byte PATT - .word bgm_kakkoii_9_001 + .word mus_encounter_cool_9_001 .byte PATT - .word bgm_kakkoii_9_002 + .word mus_encounter_cool_9_002 .byte PATT - .word bgm_kakkoii_9_004 + .word mus_encounter_cool_9_004 .byte PATT - .word bgm_kakkoii_9_000 + .word mus_encounter_cool_9_000 .byte PATT - .word bgm_kakkoii_9_001 + .word mus_encounter_cool_9_001 .byte PATT - .word bgm_kakkoii_9_003 + .word mus_encounter_cool_9_003 .byte PATT - .word bgm_kakkoii_9_004 + .word mus_encounter_cool_9_004 .byte GOTO - .word bgm_kakkoii_9_B1 + .word mus_encounter_cool_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_kakkoii: +mus_encounter_cool: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_kakkoii_pri @ Priority - .byte bgm_kakkoii_rev @ Reverb. + .byte mus_encounter_cool_pri @ Priority + .byte mus_encounter_cool_rev @ Reverb. - .word bgm_kakkoii_grp + .word mus_encounter_cool_grp - .word bgm_kakkoii_1 - .word bgm_kakkoii_2 - .word bgm_kakkoii_3 - .word bgm_kakkoii_4 - .word bgm_kakkoii_5 - .word bgm_kakkoii_6 - .word bgm_kakkoii_7 - .word bgm_kakkoii_8 - .word bgm_kakkoii_9 + .word mus_encounter_cool_1 + .word mus_encounter_cool_2 + .word mus_encounter_cool_3 + .word mus_encounter_cool_4 + .word mus_encounter_cool_5 + .word mus_encounter_cool_6 + .word mus_encounter_cool_7 + .word mus_encounter_cool_8 + .word mus_encounter_cool_9 .end diff --git a/sound/songs/bgm_sitennou.s b/sound/songs/mus_encounter_elite_four.s index 4013ae66f..e79744c7e 100644 --- a/sound/songs/bgm_sitennou.s +++ b/sound/songs/mus_encounter_elite_four.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_sitennou_grp, voicegroup093 - .equ bgm_sitennou_pri, 0 - .equ bgm_sitennou_rev, reverb_set+50 - .equ bgm_sitennou_mvl, 127 - .equ bgm_sitennou_key, 0 - .equ bgm_sitennou_tbs, 1 - .equ bgm_sitennou_exg, 0 - .equ bgm_sitennou_cmp, 1 + .equ mus_encounter_elite_four_grp, voicegroup093 + .equ mus_encounter_elite_four_pri, 0 + .equ mus_encounter_elite_four_rev, reverb_set+50 + .equ mus_encounter_elite_four_mvl, 127 + .equ mus_encounter_elite_four_key, 0 + .equ mus_encounter_elite_four_tbs, 1 + .equ mus_encounter_elite_four_exg, 0 + .equ mus_encounter_elite_four_cmp, 1 .section .rodata - .global bgm_sitennou + .global mus_encounter_elite_four .align 2 @********************** Track 1 **********************@ -bgm_sitennou_1: - .byte KEYSH , bgm_sitennou_key+0 - .byte TEMPO , 134*bgm_sitennou_tbs/2 +mus_encounter_elite_four_1: + .byte KEYSH , mus_encounter_elite_four_key+0 + .byte TEMPO , 134*mus_encounter_elite_four_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 51*bgm_sitennou_mvl/mxv + .byte VOL , 51*mus_encounter_elite_four_mvl/mxv .byte PAN , c_v+62 .byte W24 -bgm_sitennou_1_B1: -bgm_sitennou_1_000: +mus_encounter_elite_four_1_B1: +mus_encounter_elite_four_1_000: .byte W12 .byte N03 , Gn5 , v072 .byte W06 @@ -45,40 +45,40 @@ bgm_sitennou_1_000: .byte W06 .byte PEND .byte PATT - .word bgm_sitennou_1_000 + .word mus_encounter_elite_four_1_000 .byte PATT - .word bgm_sitennou_1_000 + .word mus_encounter_elite_four_1_000 .byte PATT - .word bgm_sitennou_1_000 + .word mus_encounter_elite_four_1_000 .byte PATT - .word bgm_sitennou_1_000 + .word mus_encounter_elite_four_1_000 .byte PATT - .word bgm_sitennou_1_000 + .word mus_encounter_elite_four_1_000 .byte PATT - .word bgm_sitennou_1_000 + .word mus_encounter_elite_four_1_000 .byte PATT - .word bgm_sitennou_1_000 + .word mus_encounter_elite_four_1_000 .byte W96 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_sitennou_1_B1 + .word mus_encounter_elite_four_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_sitennou_2: - .byte KEYSH , bgm_sitennou_key+0 +mus_encounter_elite_four_2: + .byte KEYSH , mus_encounter_elite_four_key+0 .byte VOICE , 38 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 78*bgm_sitennou_mvl/mxv + .byte VOL , 78*mus_encounter_elite_four_mvl/mxv .byte W24 -bgm_sitennou_2_B1: +mus_encounter_elite_four_2_B1: .byte VOICE , 38 .byte BEND , c_v-5 .byte N12 , Bn0 , v112 @@ -185,7 +185,7 @@ bgm_sitennou_2_B1: .byte W06 .byte Fs1 .byte W06 -bgm_sitennou_2_000: +mus_encounter_elite_four_2_000: .byte BEND , c_v-5 .byte N12 , Dn1 , v112 .byte W06 @@ -242,7 +242,7 @@ bgm_sitennou_2_000: .byte BEND , c_v+0 .byte W18 .byte PATT - .word bgm_sitennou_2_000 + .word mus_encounter_elite_four_2_000 .byte BEND , c_v-5 .byte N12 , Dn1 , v112 .byte W06 @@ -269,7 +269,7 @@ bgm_sitennou_2_000: .byte W06 .byte As0 .byte W18 -bgm_sitennou_2_001: +mus_encounter_elite_four_2_001: .byte BEND , c_v-5 .byte N06 , Dn1 , v112 .byte W06 @@ -364,7 +364,7 @@ bgm_sitennou_2_001: .byte Cn1 .byte W03 .byte PATT - .word bgm_sitennou_2_001 + .word mus_encounter_elite_four_2_001 .byte N06 , An0 , v112 .byte W12 .byte N03 @@ -398,22 +398,22 @@ bgm_sitennou_2_001: .byte c_v-59 .byte W04 .byte GOTO - .word bgm_sitennou_2_B1 + .word mus_encounter_elite_four_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_sitennou_3: - .byte KEYSH , bgm_sitennou_key+0 +mus_encounter_elite_four_3: + .byte KEYSH , mus_encounter_elite_four_key+0 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 68*bgm_sitennou_mvl/mxv + .byte VOL , 68*mus_encounter_elite_four_mvl/mxv .byte PAN , c_v-1 .byte W24 -bgm_sitennou_3_B1: +mus_encounter_elite_four_3_B1: .byte VOICE , 13 .byte PAN , c_v-32 - .byte VOL , 64*bgm_sitennou_mvl/mxv + .byte VOL , 64*mus_encounter_elite_four_mvl/mxv .byte W12 .byte N03 , Bn5 , v088 .byte W03 @@ -452,7 +452,7 @@ bgm_sitennou_3_B1: .byte W12 .byte VOICE , 24 .byte PAN , c_v-26 - .byte VOL , 73*bgm_sitennou_mvl/mxv + .byte VOL , 73*mus_encounter_elite_four_mvl/mxv .byte MOD , 8 .byte N12 , Bn1 , v112 .byte W12 @@ -484,7 +484,7 @@ bgm_sitennou_3_B1: .byte VOICE , 24 .byte MOD , 0 .byte PAN , c_v+32 - .byte VOL , 58*bgm_sitennou_mvl/mxv + .byte VOL , 58*mus_encounter_elite_four_mvl/mxv .byte W12 .byte N03 , Bn5 .byte W03 @@ -524,7 +524,7 @@ bgm_sitennou_3_B1: .byte W12 .byte VOICE , 56 .byte PAN , c_v-27 - .byte VOL , 73*bgm_sitennou_mvl/mxv + .byte VOL , 73*mus_encounter_elite_four_mvl/mxv .byte MOD , 8 .byte N12 , Bn1 .byte W12 @@ -547,7 +547,7 @@ bgm_sitennou_3_B1: .byte PAN , c_v-27 .byte W03 .byte VOICE , 17 - .byte VOL , 68*bgm_sitennou_mvl/mxv + .byte VOL , 68*mus_encounter_elite_four_mvl/mxv .byte N03 , Cn4 , v064 .byte W03 .byte Cs4 @@ -579,7 +579,7 @@ bgm_sitennou_3_B1: .byte VOICE , 13 .byte MOD , 0 .byte PAN , c_v-32 - .byte VOL , 64*bgm_sitennou_mvl/mxv + .byte VOL , 64*mus_encounter_elite_four_mvl/mxv .byte W12 .byte N03 , Dn6 , v080 .byte W03 @@ -618,7 +618,7 @@ bgm_sitennou_3_B1: .byte W12 .byte VOICE , 24 .byte PAN , c_v-27 - .byte VOL , 74*bgm_sitennou_mvl/mxv + .byte VOL , 74*mus_encounter_elite_four_mvl/mxv .byte MOD , 9 .byte N12 , Dn2 , v112 .byte W12 @@ -643,7 +643,7 @@ bgm_sitennou_3_B1: .byte MOD , 15 .byte W09 .byte VOICE , 24 - .byte VOL , 68*bgm_sitennou_mvl/mxv + .byte VOL , 68*mus_encounter_elite_four_mvl/mxv .byte PAN , c_v+24 .byte MOD , 9 .byte N03 , An5 , v088 @@ -659,7 +659,7 @@ bgm_sitennou_3_B1: .byte VOICE , 24 .byte MOD , 0 .byte PAN , c_v+32 - .byte VOL , 58*bgm_sitennou_mvl/mxv + .byte VOL , 58*mus_encounter_elite_four_mvl/mxv .byte W12 .byte N03 , Dn6 , v092 .byte W03 @@ -698,7 +698,7 @@ bgm_sitennou_3_B1: .byte W12 .byte VOICE , 56 .byte PAN , c_v-27 - .byte VOL , 74*bgm_sitennou_mvl/mxv + .byte VOL , 74*mus_encounter_elite_four_mvl/mxv .byte MOD , 9 .byte N12 , Dn2 .byte W12 @@ -719,7 +719,7 @@ bgm_sitennou_3_B1: .byte N03 .byte W06 .byte VOICE , 17 - .byte VOL , 68*bgm_sitennou_mvl/mxv + .byte VOL , 68*mus_encounter_elite_four_mvl/mxv .byte PAN , c_v+51 .byte N03 , Ds4 , v064 .byte W03 @@ -780,7 +780,7 @@ bgm_sitennou_3_B1: .byte VOICE , 56 .byte PAN , c_v-26 .byte MOD , 8 - .byte VOL , 78*bgm_sitennou_mvl/mxv + .byte VOL , 78*mus_encounter_elite_four_mvl/mxv .byte N03 , An2 .byte W06 .byte N03 @@ -806,7 +806,7 @@ bgm_sitennou_3_B1: .byte VOICE , 38 .byte MOD , 10 .byte PAN , c_v+0 - .byte VOL , 55*bgm_sitennou_mvl/mxv + .byte VOL , 55*mus_encounter_elite_four_mvl/mxv .byte N03 , An4 , v092 .byte W06 .byte N03 @@ -850,7 +850,7 @@ bgm_sitennou_3_B1: .byte W12 .byte VOICE , 17 .byte PAN , c_v+44 - .byte VOL , 60*bgm_sitennou_mvl/mxv + .byte VOL , 60*mus_encounter_elite_four_mvl/mxv .byte N03 , An4 , v072 .byte W03 .byte Gs4 @@ -871,22 +871,22 @@ bgm_sitennou_3_B1: .byte Dn4 .byte W03 .byte GOTO - .word bgm_sitennou_3_B1 + .word mus_encounter_elite_four_3_B1 .byte PAN , c_v+6 .byte FINE @********************** Track 4 **********************@ -bgm_sitennou_4: - .byte KEYSH , bgm_sitennou_key+0 +mus_encounter_elite_four_4: + .byte KEYSH , mus_encounter_elite_four_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-62 - .byte VOL , 27*bgm_sitennou_mvl/mxv + .byte VOL , 27*mus_encounter_elite_four_mvl/mxv .byte W24 -bgm_sitennou_4_B1: -bgm_sitennou_4_000: +mus_encounter_elite_four_4_B1: +mus_encounter_elite_four_4_000: .byte N06 , En5 , v112 .byte W24 .byte N06 @@ -897,40 +897,40 @@ bgm_sitennou_4_000: .byte W24 .byte PEND .byte PATT - .word bgm_sitennou_4_000 + .word mus_encounter_elite_four_4_000 .byte PATT - .word bgm_sitennou_4_000 + .word mus_encounter_elite_four_4_000 .byte PATT - .word bgm_sitennou_4_000 + .word mus_encounter_elite_four_4_000 .byte PATT - .word bgm_sitennou_4_000 + .word mus_encounter_elite_four_4_000 .byte PATT - .word bgm_sitennou_4_000 + .word mus_encounter_elite_four_4_000 .byte PATT - .word bgm_sitennou_4_000 + .word mus_encounter_elite_four_4_000 .byte PATT - .word bgm_sitennou_4_000 + .word mus_encounter_elite_four_4_000 .byte W96 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_sitennou_4_B1 + .word mus_encounter_elite_four_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_sitennou_5: - .byte KEYSH , bgm_sitennou_key+0 +mus_encounter_elite_four_5: + .byte KEYSH , mus_encounter_elite_four_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 39*bgm_sitennou_mvl/mxv + .byte VOL , 39*mus_encounter_elite_four_mvl/mxv .byte PAN , c_v-61 .byte W24 -bgm_sitennou_5_B1: +mus_encounter_elite_four_5_B1: .byte MOD , 2 .byte BEND , c_v+0 .byte N12 , Fs2 , v112 @@ -1048,7 +1048,7 @@ bgm_sitennou_5_B1: .byte W03 .byte Ds2 .byte W03 -bgm_sitennou_5_000: +mus_encounter_elite_four_5_000: .byte MOD , 2 .byte N12 , An2 , v112 .byte W12 @@ -1107,7 +1107,7 @@ bgm_sitennou_5_000: .byte Gs2 .byte W06 .byte PATT - .word bgm_sitennou_5_000 + .word mus_encounter_elite_four_5_000 .byte N12 , An2 , v112 .byte W12 .byte N03 , Gs2 @@ -1235,22 +1235,22 @@ bgm_sitennou_5_000: .byte An3 .byte W03 .byte GOTO - .word bgm_sitennou_5_B1 + .word mus_encounter_elite_four_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_sitennou_6: - .byte KEYSH , bgm_sitennou_key+0 +mus_encounter_elite_four_6: + .byte KEYSH , mus_encounter_elite_four_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 39*bgm_sitennou_mvl/mxv + .byte VOL , 39*mus_encounter_elite_four_mvl/mxv .byte PAN , c_v+63 .byte W24 -bgm_sitennou_6_B1: +mus_encounter_elite_four_6_B1: .byte W12 .byte N03 , Fs5 , v112 .byte W12 @@ -1457,7 +1457,7 @@ bgm_sitennou_6_B1: .byte W03 .byte As4 .byte W03 - .byte VOL , 54*bgm_sitennou_mvl/mxv + .byte VOL , 54*mus_encounter_elite_four_mvl/mxv .byte N06 , An5 .byte W06 .byte An5 , v036 @@ -1488,7 +1488,7 @@ bgm_sitennou_6_B1: .byte W06 .byte An5 , v036 .byte W06 -bgm_sitennou_6_000: +mus_encounter_elite_four_6_000: .byte PAN , c_v+63 .byte N06 , An5 , v112 .byte W06 @@ -1522,7 +1522,7 @@ bgm_sitennou_6_000: .byte W06 .byte PEND .byte PATT - .word bgm_sitennou_6_000 + .word mus_encounter_elite_four_6_000 .byte PAN , c_v+63 .byte N06 , An4 , v112 .byte W12 @@ -1541,7 +1541,7 @@ bgm_sitennou_6_000: .byte W12 .byte N03 .byte W12 - .byte VOL , 39*bgm_sitennou_mvl/mxv + .byte VOL , 39*mus_encounter_elite_four_mvl/mxv .byte N03 , Cs5 .byte W03 .byte Cn5 @@ -1559,17 +1559,17 @@ bgm_sitennou_6_000: .byte Fs4 .byte W03 .byte GOTO - .word bgm_sitennou_6_B1 + .word mus_encounter_elite_four_6_B1 .byte PAN , c_v+63 .byte FINE @********************** Track 7 **********************@ -bgm_sitennou_7: - .byte KEYSH , bgm_sitennou_key+0 +mus_encounter_elite_four_7: + .byte KEYSH , mus_encounter_elite_four_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 66*bgm_sitennou_mvl/mxv + .byte VOL , 66*mus_encounter_elite_four_mvl/mxv .byte N06 , Cn1 , v112 .byte N24 , An2 , v076 .byte W06 @@ -1581,8 +1581,8 @@ bgm_sitennou_7: .byte W03 .byte N06 .byte W06 -bgm_sitennou_7_B1: -bgm_sitennou_7_000: +mus_encounter_elite_four_7_B1: +mus_encounter_elite_four_7_000: .byte N48 , An2 , v112 .byte W18 .byte N06 , Cn1 @@ -1600,7 +1600,7 @@ bgm_sitennou_7_000: .byte Cn1 .byte W12 .byte PEND -bgm_sitennou_7_001: +mus_encounter_elite_four_7_001: .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -1619,10 +1619,10 @@ bgm_sitennou_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_sitennou_7_000 + .word mus_encounter_elite_four_7_000 .byte PATT - .word bgm_sitennou_7_001 -bgm_sitennou_7_002: + .word mus_encounter_elite_four_7_001 +mus_encounter_elite_four_7_002: .byte N48 , An2 , v112 .byte W18 .byte N06 , Cn1 @@ -1652,7 +1652,7 @@ bgm_sitennou_7_002: .byte En1 , v112 .byte W24 .byte PATT - .word bgm_sitennou_7_002 + .word mus_encounter_elite_four_7_002 .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -1667,7 +1667,7 @@ bgm_sitennou_7_002: .byte W06 .byte N06 .byte W24 -bgm_sitennou_7_003: +mus_encounter_elite_four_7_003: .byte N06 , En1 , v112 .byte W06 .byte N06 @@ -1692,9 +1692,9 @@ bgm_sitennou_7_003: .byte W12 .byte PEND .byte PATT - .word bgm_sitennou_7_003 + .word mus_encounter_elite_four_7_003 .byte PATT - .word bgm_sitennou_7_003 + .word mus_encounter_elite_four_7_003 .byte N06 , En1 , v112 .byte W12 .byte N06 @@ -1715,22 +1715,22 @@ bgm_sitennou_7_003: .byte N03 , En1 .byte W21 .byte GOTO - .word bgm_sitennou_7_B1 + .word mus_encounter_elite_four_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_sitennou_8: - .byte KEYSH , bgm_sitennou_key+0 +mus_encounter_elite_four_8: + .byte KEYSH , mus_encounter_elite_four_key+0 .byte VOICE , 84 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 52*bgm_sitennou_mvl/mxv + .byte VOL , 52*mus_encounter_elite_four_mvl/mxv .byte W24 -bgm_sitennou_8_B1: +mus_encounter_elite_four_8_B1: .byte MOD , 8 .byte BEND , c_v-4 .byte N12 , Bn1 , v112 @@ -2054,16 +2054,16 @@ bgm_sitennou_8_B1: .byte N03 .byte W36 .byte GOTO - .word bgm_sitennou_8_B1 + .word mus_encounter_elite_four_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_sitennou_9: - .byte KEYSH , bgm_sitennou_key+0 +mus_encounter_elite_four_9: + .byte KEYSH , mus_encounter_elite_four_key+0 .byte VOICE , 47 .byte PAN , c_v+0 - .byte VOL , 49*bgm_sitennou_mvl/mxv + .byte VOL , 49*mus_encounter_elite_four_mvl/mxv .byte N06 , Bn1 , v112 .byte W06 .byte N06 @@ -2075,7 +2075,7 @@ bgm_sitennou_9: .byte W03 .byte N03 .byte W03 -bgm_sitennou_9_B1: +mus_encounter_elite_four_9_B1: .byte PAN , c_v-30 .byte N12 , Bn1 , v112 .byte W60 @@ -2229,7 +2229,7 @@ bgm_sitennou_9_B1: .byte W12 .byte N06 .byte W12 -bgm_sitennou_9_000: +mus_encounter_elite_four_9_000: .byte PAN , c_v-32 .byte N06 , An2 , v112 .byte W06 @@ -2259,7 +2259,7 @@ bgm_sitennou_9_000: .byte W24 .byte PEND .byte PATT - .word bgm_sitennou_9_000 + .word mus_encounter_elite_four_9_000 .byte N06 , An2 , v112 .byte W06 .byte N06 @@ -2317,28 +2317,28 @@ bgm_sitennou_9_000: .byte N06 , An2 .byte W24 .byte GOTO - .word bgm_sitennou_9_B1 + .word mus_encounter_elite_four_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_sitennou: +mus_encounter_elite_four: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_sitennou_pri @ Priority - .byte bgm_sitennou_rev @ Reverb. + .byte mus_encounter_elite_four_pri @ Priority + .byte mus_encounter_elite_four_rev @ Reverb. - .word bgm_sitennou_grp + .word mus_encounter_elite_four_grp - .word bgm_sitennou_1 - .word bgm_sitennou_2 - .word bgm_sitennou_3 - .word bgm_sitennou_4 - .word bgm_sitennou_5 - .word bgm_sitennou_6 - .word bgm_sitennou_7 - .word bgm_sitennou_8 - .word bgm_sitennou_9 + .word mus_encounter_elite_four_1 + .word mus_encounter_elite_four_2 + .word mus_encounter_elite_four_3 + .word mus_encounter_elite_four_4 + .word mus_encounter_elite_four_5 + .word mus_encounter_elite_four_6 + .word mus_encounter_elite_four_7 + .word mus_encounter_elite_four_8 + .word mus_encounter_elite_four_9 .end diff --git a/sound/songs/bgm_girleye.s b/sound/songs/mus_encounter_female.s index ed5437e42..19f5db06b 100644 --- a/sound/songs/bgm_girleye.s +++ b/sound/songs/mus_encounter_female.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_girleye_grp, voicegroup050 - .equ bgm_girleye_pri, 0 - .equ bgm_girleye_rev, reverb_set+50 - .equ bgm_girleye_mvl, 127 - .equ bgm_girleye_key, 0 - .equ bgm_girleye_tbs, 1 - .equ bgm_girleye_exg, 0 - .equ bgm_girleye_cmp, 1 + .equ mus_encounter_female_grp, voicegroup050 + .equ mus_encounter_female_pri, 0 + .equ mus_encounter_female_rev, reverb_set+50 + .equ mus_encounter_female_mvl, 127 + .equ mus_encounter_female_key, 0 + .equ mus_encounter_female_tbs, 1 + .equ mus_encounter_female_exg, 0 + .equ mus_encounter_female_cmp, 1 .section .rodata - .global bgm_girleye + .global mus_encounter_female .align 2 @********************** Track 1 **********************@ -bgm_girleye_1: - .byte KEYSH , bgm_girleye_key+0 - .byte TEMPO , 90*bgm_girleye_tbs/2 +mus_encounter_female_1: + .byte KEYSH , mus_encounter_female_key+0 + .byte TEMPO , 90*mus_encounter_female_tbs/2 .byte VOICE , 1 - .byte VOL , 63*bgm_girleye_mvl/mxv + .byte VOL , 63*mus_encounter_female_mvl/mxv .byte PAN , c_v+0 .byte N06 , Ds3 , v112 .byte W06 @@ -50,7 +50,7 @@ bgm_girleye_1: .byte W03 .byte Ds4 .byte W03 -bgm_girleye_1_B1: +mus_encounter_female_1_B1: .byte PAN , c_v-39 .byte W06 .byte N03 , Gs3 , v112 @@ -161,21 +161,21 @@ bgm_girleye_1_B1: .byte An3 .byte W06 .byte GOTO - .word bgm_girleye_1_B1 + .word mus_encounter_female_1_B1 .byte W96 .byte FINE @********************** Track 2 **********************@ -bgm_girleye_2: - .byte KEYSH , bgm_girleye_key+0 +mus_encounter_female_2: + .byte KEYSH , mus_encounter_female_key+0 .byte VOICE , 73 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 45*bgm_girleye_mvl/mxv + .byte VOL , 45*mus_encounter_female_mvl/mxv .byte BEND , c_v+0 .byte W96 -bgm_girleye_2_B1: +mus_encounter_female_2_B1: .byte N03 , Fs5 , v072 .byte W03 .byte Gn5 , v080 @@ -186,35 +186,35 @@ bgm_girleye_2_B1: .byte W03 .byte N36 , As5 , v112 .byte W03 - .byte VOL , 31*bgm_girleye_mvl/mxv + .byte VOL , 31*mus_encounter_female_mvl/mxv .byte W02 - .byte 32*bgm_girleye_mvl/mxv + .byte 32*mus_encounter_female_mvl/mxv .byte W03 - .byte 34*bgm_girleye_mvl/mxv + .byte 34*mus_encounter_female_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 36*bgm_girleye_mvl/mxv + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte W02 - .byte 38*bgm_girleye_mvl/mxv + .byte 38*mus_encounter_female_mvl/mxv .byte W03 - .byte 40*bgm_girleye_mvl/mxv + .byte 40*mus_encounter_female_mvl/mxv .byte W03 - .byte 45*bgm_girleye_mvl/mxv + .byte 45*mus_encounter_female_mvl/mxv .byte W04 - .byte 52*bgm_girleye_mvl/mxv + .byte 52*mus_encounter_female_mvl/mxv .byte W02 - .byte 56*bgm_girleye_mvl/mxv + .byte 56*mus_encounter_female_mvl/mxv .byte W03 - .byte 53*bgm_girleye_mvl/mxv + .byte 53*mus_encounter_female_mvl/mxv .byte W01 - .byte 59*bgm_girleye_mvl/mxv + .byte 59*mus_encounter_female_mvl/mxv .byte W02 - .byte 54*bgm_girleye_mvl/mxv + .byte 54*mus_encounter_female_mvl/mxv .byte W01 - .byte 63*bgm_girleye_mvl/mxv + .byte 63*mus_encounter_female_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 45*bgm_girleye_mvl/mxv + .byte VOL , 45*mus_encounter_female_mvl/mxv .byte N06 , As5 , v032 .byte W06 .byte As5 , v112 @@ -237,37 +237,37 @@ bgm_girleye_2_B1: .byte W06 .byte N48 , Gn5 .byte W06 - .byte VOL , 29*bgm_girleye_mvl/mxv + .byte VOL , 29*mus_encounter_female_mvl/mxv .byte W02 - .byte 30*bgm_girleye_mvl/mxv + .byte 30*mus_encounter_female_mvl/mxv .byte W04 - .byte 31*bgm_girleye_mvl/mxv + .byte 31*mus_encounter_female_mvl/mxv .byte W02 - .byte 31*bgm_girleye_mvl/mxv + .byte 31*mus_encounter_female_mvl/mxv .byte W03 - .byte 34*bgm_girleye_mvl/mxv + .byte 34*mus_encounter_female_mvl/mxv .byte W03 - .byte 35*bgm_girleye_mvl/mxv + .byte 35*mus_encounter_female_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 37*bgm_girleye_mvl/mxv + .byte VOL , 37*mus_encounter_female_mvl/mxv .byte W02 - .byte 40*bgm_girleye_mvl/mxv + .byte 40*mus_encounter_female_mvl/mxv .byte W03 - .byte 45*bgm_girleye_mvl/mxv + .byte 45*mus_encounter_female_mvl/mxv .byte W03 - .byte 53*bgm_girleye_mvl/mxv + .byte 53*mus_encounter_female_mvl/mxv .byte W04 - .byte 57*bgm_girleye_mvl/mxv + .byte 57*mus_encounter_female_mvl/mxv .byte W02 - .byte 61*bgm_girleye_mvl/mxv + .byte 61*mus_encounter_female_mvl/mxv .byte W03 - .byte 64*bgm_girleye_mvl/mxv + .byte 64*mus_encounter_female_mvl/mxv .byte W03 - .byte 66*bgm_girleye_mvl/mxv + .byte 66*mus_encounter_female_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_girleye_mvl/mxv + .byte VOL , 45*mus_encounter_female_mvl/mxv .byte N06 , Gn5 , v032 .byte W06 .byte Gn5 , v112 @@ -291,37 +291,37 @@ bgm_girleye_2_B1: .byte W06 .byte N03 , As5 .byte W03 - .byte VOL , 43*bgm_girleye_mvl/mxv + .byte VOL , 43*mus_encounter_female_mvl/mxv .byte N03 , Cn6 .byte W03 - .byte VOL , 39*bgm_girleye_mvl/mxv + .byte VOL , 39*mus_encounter_female_mvl/mxv .byte N36 , Cs6 .byte W02 - .byte VOL , 36*bgm_girleye_mvl/mxv + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte W03 - .byte 34*bgm_girleye_mvl/mxv + .byte 34*mus_encounter_female_mvl/mxv .byte W03 - .byte 29*bgm_girleye_mvl/mxv + .byte 29*mus_encounter_female_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 27*bgm_girleye_mvl/mxv + .byte VOL , 27*mus_encounter_female_mvl/mxv .byte W02 - .byte 26*bgm_girleye_mvl/mxv + .byte 26*mus_encounter_female_mvl/mxv .byte W07 - .byte 34*bgm_girleye_mvl/mxv + .byte 34*mus_encounter_female_mvl/mxv .byte W03 - .byte 36*bgm_girleye_mvl/mxv + .byte 36*mus_encounter_female_mvl/mxv .byte W03 - .byte 40*bgm_girleye_mvl/mxv + .byte 40*mus_encounter_female_mvl/mxv .byte W03 - .byte 54*bgm_girleye_mvl/mxv + .byte 54*mus_encounter_female_mvl/mxv .byte W02 - .byte 53*bgm_girleye_mvl/mxv + .byte 53*mus_encounter_female_mvl/mxv .byte W01 - .byte 63*bgm_girleye_mvl/mxv + .byte 63*mus_encounter_female_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 45*bgm_girleye_mvl/mxv + .byte VOL , 45*mus_encounter_female_mvl/mxv .byte N06 , Cs6 , v032 .byte W06 .byte Cs6 , v112 @@ -340,32 +340,32 @@ bgm_girleye_2_B1: .byte W03 .byte Bn5 .byte W03 - .byte VOL , 36*bgm_girleye_mvl/mxv + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte N36 , Cn6 , v112 .byte W02 - .byte VOL , 37*bgm_girleye_mvl/mxv + .byte VOL , 37*mus_encounter_female_mvl/mxv .byte W03 - .byte 40*bgm_girleye_mvl/mxv + .byte 40*mus_encounter_female_mvl/mxv .byte W03 - .byte 44*bgm_girleye_mvl/mxv + .byte 44*mus_encounter_female_mvl/mxv .byte W04 - .byte 47*bgm_girleye_mvl/mxv + .byte 47*mus_encounter_female_mvl/mxv .byte W02 - .byte 49*bgm_girleye_mvl/mxv + .byte 49*mus_encounter_female_mvl/mxv .byte W03 - .byte 53*bgm_girleye_mvl/mxv + .byte 53*mus_encounter_female_mvl/mxv .byte W03 - .byte 56*bgm_girleye_mvl/mxv + .byte 56*mus_encounter_female_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 59*bgm_girleye_mvl/mxv + .byte VOL , 59*mus_encounter_female_mvl/mxv .byte W02 - .byte 60*bgm_girleye_mvl/mxv + .byte 60*mus_encounter_female_mvl/mxv .byte W03 - .byte 62*bgm_girleye_mvl/mxv + .byte 62*mus_encounter_female_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 45*bgm_girleye_mvl/mxv + .byte VOL , 45*mus_encounter_female_mvl/mxv .byte N06 , Cs6 .byte W06 .byte Cn6 @@ -387,17 +387,17 @@ bgm_girleye_2_B1: .byte Gn5 .byte W06 .byte GOTO - .word bgm_girleye_2_B1 + .word mus_encounter_female_2_B1 .byte W96 .byte FINE @********************** Track 3 **********************@ -bgm_girleye_3: - .byte KEYSH , bgm_girleye_key+0 +mus_encounter_female_3: + .byte KEYSH , mus_encounter_female_key+0 .byte VOICE , 35 .byte PAN , c_v+0 - .byte VOL , 72*bgm_girleye_mvl/mxv + .byte VOL , 72*mus_encounter_female_mvl/mxv .byte BENDR , 12 .byte BEND , c_v+0 .byte W72 @@ -408,7 +408,7 @@ bgm_girleye_3: .byte W09 .byte c_v-64 .byte W12 -bgm_girleye_3_B1: +mus_encounter_female_3_B1: .byte BEND , c_v+0 .byte N06 , Gs1 , v112 .byte W06 @@ -514,17 +514,17 @@ bgm_girleye_3_B1: .byte Cs2 .byte W06 .byte GOTO - .word bgm_girleye_3_B1 + .word mus_encounter_female_3_B1 .byte W96 .byte FINE @********************** Track 4 **********************@ -bgm_girleye_4: - .byte KEYSH , bgm_girleye_key+0 +mus_encounter_female_4: + .byte KEYSH , mus_encounter_female_key+0 .byte VOICE , 1 .byte PAN , c_v+0 - .byte VOL , 51*bgm_girleye_mvl/mxv + .byte VOL , 51*mus_encounter_female_mvl/mxv .byte W24 .byte N06 , Ds3 , v112 .byte W06 @@ -558,7 +558,7 @@ bgm_girleye_4: .byte W03 .byte Gn3 .byte W03 -bgm_girleye_4_B1: +mus_encounter_female_4_B1: .byte W48 .byte VOICE , 1 .byte W48 @@ -566,20 +566,20 @@ bgm_girleye_4_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_girleye_4_B1 + .word mus_encounter_female_4_B1 .byte W96 .byte FINE @********************** Track 5 **********************@ -bgm_girleye_5: - .byte KEYSH , bgm_girleye_key+0 +mus_encounter_female_5: + .byte KEYSH , mus_encounter_female_key+0 .byte VOICE , 83 .byte LFOS , 44 - .byte VOL , 27*bgm_girleye_mvl/mxv + .byte VOL , 27*mus_encounter_female_mvl/mxv .byte PAN , c_v+63 .byte W96 -bgm_girleye_5_B1: +mus_encounter_female_5_B1: .byte N03 , Fs4 , v072 .byte W03 .byte Gn4 , v080 @@ -692,66 +692,66 @@ bgm_girleye_5_B1: .byte Gn4 .byte W06 .byte GOTO - .word bgm_girleye_5_B1 + .word mus_encounter_female_5_B1 .byte W96 .byte FINE @********************** Track 6 **********************@ -bgm_girleye_6: - .byte KEYSH , bgm_girleye_key+0 +mus_encounter_female_6: + .byte KEYSH , mus_encounter_female_key+0 .byte VOICE , 48 .byte PAN , c_v+32 .byte LFOS , 44 - .byte VOL , 36*bgm_girleye_mvl/mxv + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte N06 , Ds3 , v112 .byte W06 - .byte VOL , 33*bgm_girleye_mvl/mxv + .byte VOL , 33*mus_encounter_female_mvl/mxv .byte N66 , Ds5 .byte W02 - .byte VOL , 26*bgm_girleye_mvl/mxv + .byte VOL , 26*mus_encounter_female_mvl/mxv .byte W01 - .byte 29*bgm_girleye_mvl/mxv + .byte 29*mus_encounter_female_mvl/mxv .byte W03 - .byte 24*bgm_girleye_mvl/mxv + .byte 24*mus_encounter_female_mvl/mxv .byte W02 - .byte 21*bgm_girleye_mvl/mxv + .byte 21*mus_encounter_female_mvl/mxv .byte W03 - .byte 19*bgm_girleye_mvl/mxv + .byte 19*mus_encounter_female_mvl/mxv .byte W03 - .byte 13*bgm_girleye_mvl/mxv + .byte 13*mus_encounter_female_mvl/mxv .byte W04 - .byte 13*bgm_girleye_mvl/mxv + .byte 13*mus_encounter_female_mvl/mxv .byte W02 - .byte 15*bgm_girleye_mvl/mxv + .byte 15*mus_encounter_female_mvl/mxv .byte W01 - .byte 15*bgm_girleye_mvl/mxv + .byte 15*mus_encounter_female_mvl/mxv .byte W05 - .byte 17*bgm_girleye_mvl/mxv + .byte 17*mus_encounter_female_mvl/mxv .byte W04 - .byte 18*bgm_girleye_mvl/mxv + .byte 18*mus_encounter_female_mvl/mxv .byte W02 - .byte 19*bgm_girleye_mvl/mxv + .byte 19*mus_encounter_female_mvl/mxv .byte W03 - .byte 21*bgm_girleye_mvl/mxv + .byte 21*mus_encounter_female_mvl/mxv .byte W03 - .byte 24*bgm_girleye_mvl/mxv + .byte 24*mus_encounter_female_mvl/mxv .byte W04 - .byte 26*bgm_girleye_mvl/mxv + .byte 26*mus_encounter_female_mvl/mxv .byte W02 - .byte 27*bgm_girleye_mvl/mxv + .byte 27*mus_encounter_female_mvl/mxv .byte W03 - .byte 30*bgm_girleye_mvl/mxv + .byte 30*mus_encounter_female_mvl/mxv .byte W03 - .byte 31*bgm_girleye_mvl/mxv + .byte 31*mus_encounter_female_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 34*bgm_girleye_mvl/mxv + .byte VOL , 34*mus_encounter_female_mvl/mxv .byte W02 - .byte 36*bgm_girleye_mvl/mxv + .byte 36*mus_encounter_female_mvl/mxv .byte W10 .byte MOD , 0 - .byte VOL , 36*bgm_girleye_mvl/mxv + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte N03 , Cs5 .byte W03 .byte Cn5 , v096 @@ -768,8 +768,8 @@ bgm_girleye_6: .byte W03 .byte Cs4 , v072 .byte W03 -bgm_girleye_6_B1: - .byte VOL , 36*bgm_girleye_mvl/mxv +mus_encounter_female_6_B1: + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte N03 , As3 , v088 .byte W03 .byte Cn4 , v100 @@ -778,27 +778,27 @@ bgm_girleye_6_B1: .byte W03 .byte Dn4 .byte W03 - .byte VOL , 27*bgm_girleye_mvl/mxv + .byte VOL , 27*mus_encounter_female_mvl/mxv .byte N48 , Ds4 .byte W02 - .byte VOL , 24*bgm_girleye_mvl/mxv + .byte VOL , 24*mus_encounter_female_mvl/mxv .byte W04 - .byte 21*bgm_girleye_mvl/mxv + .byte 21*mus_encounter_female_mvl/mxv .byte W08 - .byte 22*bgm_girleye_mvl/mxv + .byte 22*mus_encounter_female_mvl/mxv .byte W04 - .byte 24*bgm_girleye_mvl/mxv + .byte 24*mus_encounter_female_mvl/mxv .byte W02 - .byte 25*bgm_girleye_mvl/mxv + .byte 25*mus_encounter_female_mvl/mxv .byte W04 - .byte 28*bgm_girleye_mvl/mxv + .byte 28*mus_encounter_female_mvl/mxv .byte MOD , 5 .byte W02 - .byte VOL , 31*bgm_girleye_mvl/mxv + .byte VOL , 31*mus_encounter_female_mvl/mxv .byte W04 - .byte 34*bgm_girleye_mvl/mxv + .byte 34*mus_encounter_female_mvl/mxv .byte W02 - .byte 36*bgm_girleye_mvl/mxv + .byte 36*mus_encounter_female_mvl/mxv .byte W16 .byte MOD , 0 .byte N06 , Cs4 @@ -813,26 +813,26 @@ bgm_girleye_6_B1: .byte W06 .byte Bn3 .byte W06 - .byte VOL , 27*bgm_girleye_mvl/mxv + .byte VOL , 27*mus_encounter_female_mvl/mxv .byte N60 , Cn4 .byte W02 - .byte VOL , 24*bgm_girleye_mvl/mxv + .byte VOL , 24*mus_encounter_female_mvl/mxv .byte W04 - .byte 21*bgm_girleye_mvl/mxv + .byte 21*mus_encounter_female_mvl/mxv .byte W08 - .byte 22*bgm_girleye_mvl/mxv + .byte 22*mus_encounter_female_mvl/mxv .byte W04 - .byte 24*bgm_girleye_mvl/mxv + .byte 24*mus_encounter_female_mvl/mxv .byte W02 - .byte 25*bgm_girleye_mvl/mxv + .byte 25*mus_encounter_female_mvl/mxv .byte W04 - .byte 28*bgm_girleye_mvl/mxv + .byte 28*mus_encounter_female_mvl/mxv .byte W02 - .byte 31*bgm_girleye_mvl/mxv + .byte 31*mus_encounter_female_mvl/mxv .byte W04 - .byte 34*bgm_girleye_mvl/mxv + .byte 34*mus_encounter_female_mvl/mxv .byte W02 - .byte 36*bgm_girleye_mvl/mxv + .byte 36*mus_encounter_female_mvl/mxv .byte W07 .byte MOD , 5 .byte W21 @@ -849,26 +849,26 @@ bgm_girleye_6_B1: .byte W06 .byte As3 .byte W06 - .byte VOL , 27*bgm_girleye_mvl/mxv + .byte VOL , 27*mus_encounter_female_mvl/mxv .byte N60 , Cs4 .byte W02 - .byte VOL , 24*bgm_girleye_mvl/mxv + .byte VOL , 24*mus_encounter_female_mvl/mxv .byte W04 - .byte 21*bgm_girleye_mvl/mxv + .byte 21*mus_encounter_female_mvl/mxv .byte W08 - .byte 22*bgm_girleye_mvl/mxv + .byte 22*mus_encounter_female_mvl/mxv .byte W04 - .byte 24*bgm_girleye_mvl/mxv + .byte 24*mus_encounter_female_mvl/mxv .byte W02 - .byte 25*bgm_girleye_mvl/mxv + .byte 25*mus_encounter_female_mvl/mxv .byte W04 - .byte 28*bgm_girleye_mvl/mxv + .byte 28*mus_encounter_female_mvl/mxv .byte W02 - .byte 31*bgm_girleye_mvl/mxv + .byte 31*mus_encounter_female_mvl/mxv .byte W04 - .byte 34*bgm_girleye_mvl/mxv + .byte 34*mus_encounter_female_mvl/mxv .byte W02 - .byte 36*bgm_girleye_mvl/mxv + .byte 36*mus_encounter_female_mvl/mxv .byte W04 .byte MOD , 5 .byte W24 @@ -912,22 +912,22 @@ bgm_girleye_6_B1: .byte An3 .byte W06 .byte GOTO - .word bgm_girleye_6_B1 + .word mus_encounter_female_6_B1 .byte W96 .byte FINE @********************** Track 7 **********************@ -bgm_girleye_7: - .byte KEYSH , bgm_girleye_key+0 +mus_encounter_female_7: + .byte KEYSH , mus_encounter_female_key+0 .byte VOICE , 1 - .byte VOL , 53*bgm_girleye_mvl/mxv + .byte VOL , 53*mus_encounter_female_mvl/mxv .byte PAN , c_v+0 .byte N06 , Ds5 , v120 .byte W06 .byte N66 , Ds6 , v127 .byte W90 -bgm_girleye_7_B1: +mus_encounter_female_7_B1: .byte VOICE , 82 .byte W12 .byte N06 , Cn3 , v112 @@ -991,67 +991,67 @@ bgm_girleye_7_B1: .byte N06 .byte W06 .byte GOTO - .word bgm_girleye_7_B1 + .word mus_encounter_female_7_B1 .byte W96 .byte FINE @********************** Track 8 **********************@ -bgm_girleye_8: - .byte KEYSH , bgm_girleye_key+0 +mus_encounter_female_8: + .byte KEYSH , mus_encounter_female_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 12 .byte xIECL , 12 - .byte VOL , 28*bgm_girleye_mvl/mxv + .byte VOL , 28*mus_encounter_female_mvl/mxv .byte PAN , c_v-63 .byte N06 , Ds5 , v080 .byte W06 - .byte VOL , 28*bgm_girleye_mvl/mxv + .byte VOL , 28*mus_encounter_female_mvl/mxv .byte N66 , Ds6 , v108 .byte W02 - .byte VOL , 26*bgm_girleye_mvl/mxv + .byte VOL , 26*mus_encounter_female_mvl/mxv .byte W04 - .byte 24*bgm_girleye_mvl/mxv + .byte 24*mus_encounter_female_mvl/mxv .byte W02 - .byte 23*bgm_girleye_mvl/mxv + .byte 23*mus_encounter_female_mvl/mxv .byte W03 - .byte 22*bgm_girleye_mvl/mxv + .byte 22*mus_encounter_female_mvl/mxv .byte W03 - .byte 22*bgm_girleye_mvl/mxv + .byte 22*mus_encounter_female_mvl/mxv .byte W07 - .byte 24*bgm_girleye_mvl/mxv + .byte 24*mus_encounter_female_mvl/mxv .byte W06 - .byte 26*bgm_girleye_mvl/mxv + .byte 26*mus_encounter_female_mvl/mxv .byte W03 - .byte 27*bgm_girleye_mvl/mxv + .byte 27*mus_encounter_female_mvl/mxv .byte W03 - .byte 29*bgm_girleye_mvl/mxv + .byte 29*mus_encounter_female_mvl/mxv .byte W03 - .byte 32*bgm_girleye_mvl/mxv + .byte 32*mus_encounter_female_mvl/mxv .byte W03 - .byte 34*bgm_girleye_mvl/mxv + .byte 34*mus_encounter_female_mvl/mxv .byte W03 .byte MOD , 5 - .byte VOL , 36*bgm_girleye_mvl/mxv + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte W05 - .byte 37*bgm_girleye_mvl/mxv + .byte 37*mus_encounter_female_mvl/mxv .byte W03 - .byte 39*bgm_girleye_mvl/mxv + .byte 39*mus_encounter_female_mvl/mxv .byte W04 - .byte 40*bgm_girleye_mvl/mxv + .byte 40*mus_encounter_female_mvl/mxv .byte W02 - .byte 41*bgm_girleye_mvl/mxv + .byte 41*mus_encounter_female_mvl/mxv .byte W03 - .byte 43*bgm_girleye_mvl/mxv + .byte 43*mus_encounter_female_mvl/mxv .byte W03 - .byte 44*bgm_girleye_mvl/mxv + .byte 44*mus_encounter_female_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 36*bgm_girleye_mvl/mxv + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte W24 -bgm_girleye_8_B1: - .byte VOL , 36*bgm_girleye_mvl/mxv +mus_encounter_female_8_B1: + .byte VOL , 36*mus_encounter_female_mvl/mxv .byte W12 .byte N06 , Gn3 , v112 .byte W18 @@ -1113,17 +1113,17 @@ bgm_girleye_8_B1: .byte Fs3 .byte W06 .byte GOTO - .word bgm_girleye_8_B1 + .word mus_encounter_female_8_B1 .byte W96 .byte FINE @********************** Track 9 **********************@ -bgm_girleye_9: - .byte KEYSH , bgm_girleye_key+0 +mus_encounter_female_9: + .byte KEYSH , mus_encounter_female_key+0 .byte VOICE , 127 .byte PAN , c_v+0 - .byte VOL , 33*bgm_girleye_mvl/mxv + .byte VOL , 33*mus_encounter_female_mvl/mxv .byte W48 .byte N01 , An4 , v112 .byte W06 @@ -1149,8 +1149,8 @@ bgm_girleye_9: .byte W03 .byte An4 , v112 .byte W03 -bgm_girleye_9_B1: -bgm_girleye_9_000: +mus_encounter_female_9_B1: +mus_encounter_female_9_000: .byte N01 , An4 , v112 .byte W06 .byte An4 , v048 @@ -1190,7 +1190,7 @@ bgm_girleye_9_000: .byte An4 , v076 .byte W03 .byte PEND -bgm_girleye_9_001: +mus_encounter_female_9_001: .byte N01 , An4 , v112 .byte W06 .byte An4 , v048 @@ -1235,33 +1235,33 @@ bgm_girleye_9_001: .byte W03 .byte PEND .byte PATT - .word bgm_girleye_9_000 + .word mus_encounter_female_9_000 .byte PATT - .word bgm_girleye_9_001 + .word mus_encounter_female_9_001 .byte GOTO - .word bgm_girleye_9_B1 + .word mus_encounter_female_9_B1 .byte W96 .byte FINE @******************************************************@ .align 2 -bgm_girleye: +mus_encounter_female: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_girleye_pri @ Priority - .byte bgm_girleye_rev @ Reverb. + .byte mus_encounter_female_pri @ Priority + .byte mus_encounter_female_rev @ Reverb. - .word bgm_girleye_grp + .word mus_encounter_female_grp - .word bgm_girleye_1 - .word bgm_girleye_2 - .word bgm_girleye_3 - .word bgm_girleye_4 - .word bgm_girleye_5 - .word bgm_girleye_6 - .word bgm_girleye_7 - .word bgm_girleye_8 - .word bgm_girleye_9 + .word mus_encounter_female_1 + .word mus_encounter_female_2 + .word mus_encounter_female_3 + .word mus_encounter_female_4 + .word mus_encounter_female_5 + .word mus_encounter_female_6 + .word mus_encounter_female_7 + .word mus_encounter_female_8 + .word mus_encounter_female_9 .end diff --git a/sound/songs/bgm_syoujoeye.s b/sound/songs/mus_encounter_girl.s index 6ec1d5674..906b0acf1 100644 --- a/sound/songs/bgm_syoujoeye.s +++ b/sound/songs/mus_encounter_girl.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_syoujoeye_grp, voicegroup024 - .equ bgm_syoujoeye_pri, 0 - .equ bgm_syoujoeye_rev, reverb_set+50 - .equ bgm_syoujoeye_mvl, 127 - .equ bgm_syoujoeye_key, 0 - .equ bgm_syoujoeye_tbs, 1 - .equ bgm_syoujoeye_exg, 0 - .equ bgm_syoujoeye_cmp, 1 + .equ mus_encounter_girl_grp, voicegroup024 + .equ mus_encounter_girl_pri, 0 + .equ mus_encounter_girl_rev, reverb_set+50 + .equ mus_encounter_girl_mvl, 127 + .equ mus_encounter_girl_key, 0 + .equ mus_encounter_girl_tbs, 1 + .equ mus_encounter_girl_exg, 0 + .equ mus_encounter_girl_cmp, 1 .section .rodata - .global bgm_syoujoeye + .global mus_encounter_girl .align 2 @********************** Track 1 **********************@ -bgm_syoujoeye_1: - .byte KEYSH , bgm_syoujoeye_key+0 - .byte TEMPO , 144*bgm_syoujoeye_tbs/2 +mus_encounter_girl_1: + .byte KEYSH , mus_encounter_girl_key+0 + .byte TEMPO , 144*mus_encounter_girl_tbs/2 .byte VOICE , 13 - .byte VOL , 80*bgm_syoujoeye_mvl/mxv + .byte VOL , 80*mus_encounter_girl_mvl/mxv .byte PAN , c_v+5 .byte N06 , Gs4 , v100 .byte W06 @@ -85,8 +85,8 @@ bgm_syoujoeye_1: .byte W03 .byte Ds5 , v036 .byte W15 -bgm_syoujoeye_1_B1: -bgm_syoujoeye_1_000: +mus_encounter_girl_1_B1: +mus_encounter_girl_1_000: .byte N12 , Gs4 , v100 .byte W18 .byte N06 , Fs4 @@ -193,7 +193,7 @@ bgm_syoujoeye_1_000: .byte N03 .byte W15 .byte PATT - .word bgm_syoujoeye_1_000 + .word mus_encounter_girl_1_000 .byte N12 , Cs5 , v100 .byte W18 .byte N06 , Cn5 @@ -274,17 +274,17 @@ bgm_syoujoeye_1_000: .byte W36 .byte W03 .byte GOTO - .word bgm_syoujoeye_1_B1 + .word mus_encounter_girl_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_syoujoeye_2: - .byte KEYSH , bgm_syoujoeye_key+0 +mus_encounter_girl_2: + .byte KEYSH , mus_encounter_girl_key+0 .byte PAN , c_v-6 .byte W24 .byte VOICE , 38 - .byte VOL , 80*bgm_syoujoeye_mvl/mxv + .byte VOL , 80*mus_encounter_girl_mvl/mxv .byte N36 , Gs0 , v127 .byte W42 .byte N03 @@ -297,8 +297,8 @@ bgm_syoujoeye_2: .byte W18 .byte Cn1 .byte W06 -bgm_syoujoeye_2_B1: -bgm_syoujoeye_2_000: +mus_encounter_girl_2_B1: +mus_encounter_girl_2_000: .byte N36 , Cs1 , v127 .byte W42 .byte N03 @@ -312,7 +312,7 @@ bgm_syoujoeye_2_000: .byte N06 , Cs1 .byte W06 .byte PEND -bgm_syoujoeye_2_001: +mus_encounter_girl_2_001: .byte N36 , Fs1 , v127 .byte W42 .byte N03 , Cs1 @@ -345,9 +345,9 @@ bgm_syoujoeye_2_001: .byte N06 , Cn1 .byte W06 .byte PATT - .word bgm_syoujoeye_2_000 + .word mus_encounter_girl_2_000 .byte PATT - .word bgm_syoujoeye_2_001 + .word mus_encounter_girl_2_001 .byte N18 , Ds1 , v127 .byte W18 .byte N03 @@ -371,17 +371,17 @@ bgm_syoujoeye_2_001: .byte N12 , Cs1 .byte W48 .byte GOTO - .word bgm_syoujoeye_2_B1 + .word mus_encounter_girl_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_syoujoeye_3: - .byte KEYSH , bgm_syoujoeye_key+0 +mus_encounter_girl_3: + .byte KEYSH , mus_encounter_girl_key+0 .byte PAN , c_v+16 .byte W24 .byte VOICE , 1 - .byte VOL , 80*bgm_syoujoeye_mvl/mxv + .byte VOL , 80*mus_encounter_girl_mvl/mxv .byte BEND , c_v+0 .byte N06 , Gs2 , v088 .byte W18 @@ -397,8 +397,8 @@ bgm_syoujoeye_3: .byte W18 .byte N06 , Cn2 .byte W06 -bgm_syoujoeye_3_B1: -bgm_syoujoeye_3_000: +mus_encounter_girl_3_B1: +mus_encounter_girl_3_000: .byte N12 , Cs2 , v088 .byte W24 .byte Gs2 @@ -410,7 +410,7 @@ bgm_syoujoeye_3_000: .byte N06 , Cs2 .byte W06 .byte PEND -bgm_syoujoeye_3_001: +mus_encounter_girl_3_001: .byte N09 , Fs2 , v088 .byte W18 .byte N06 , Gs2 @@ -449,9 +449,9 @@ bgm_syoujoeye_3_001: .byte Ds2 .byte W24 .byte PATT - .word bgm_syoujoeye_3_000 + .word mus_encounter_girl_3_000 .byte PATT - .word bgm_syoujoeye_3_001 + .word mus_encounter_girl_3_001 .byte N12 , Fs4 , v096 .byte W18 .byte N06 , Fn4 @@ -473,14 +473,14 @@ bgm_syoujoeye_3_001: .byte N12 , Cs3 .byte W48 .byte GOTO - .word bgm_syoujoeye_3_B1 + .word mus_encounter_girl_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_syoujoeye_4: - .byte VOL , 80*bgm_syoujoeye_mvl/mxv - .byte KEYSH , bgm_syoujoeye_key+0 +mus_encounter_girl_4: + .byte VOL , 80*mus_encounter_girl_mvl/mxv + .byte KEYSH , mus_encounter_girl_key+0 .byte VOICE , 24 .byte XCMD , xIECV , 13 .byte xIECL , 10 @@ -493,7 +493,7 @@ bgm_syoujoeye_4: .byte W06 .byte Ds3 .byte W06 - .byte VOL , 80*bgm_syoujoeye_mvl/mxv + .byte VOL , 80*mus_encounter_girl_mvl/mxv .byte N12 , Ds4 .byte W18 .byte N06 , Gs2 @@ -508,7 +508,7 @@ bgm_syoujoeye_4: .byte W18 .byte Cn4 .byte W06 -bgm_syoujoeye_4_B1: +mus_encounter_girl_4_B1: .byte N06 , Cn4 , v052 .byte W18 .byte Cs3 @@ -523,7 +523,7 @@ bgm_syoujoeye_4_B1: .byte W18 .byte Fn3 .byte W06 -bgm_syoujoeye_4_000: +mus_encounter_girl_4_000: .byte N06 , Fn4 , v052 .byte W18 .byte Fs3 @@ -580,7 +580,7 @@ bgm_syoujoeye_4_000: .byte Fn3 .byte W06 .byte PATT - .word bgm_syoujoeye_4_000 + .word mus_encounter_girl_4_000 .byte VOICE , 26 .byte N42 , Cs4 , v052 .byte W42 @@ -604,14 +604,14 @@ bgm_syoujoeye_4_000: .byte N06 .byte W48 .byte GOTO - .word bgm_syoujoeye_4_B1 + .word mus_encounter_girl_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_syoujoeye_5: - .byte VOL , 80*bgm_syoujoeye_mvl/mxv - .byte KEYSH , bgm_syoujoeye_key+0 +mus_encounter_girl_5: + .byte VOL , 80*mus_encounter_girl_mvl/mxv + .byte KEYSH , mus_encounter_girl_key+0 .byte VOICE , 25 .byte XCMD , xIECV , 13 .byte xIECL , 10 @@ -625,7 +625,7 @@ bgm_syoujoeye_5: .byte W06 .byte Ds3 .byte W03 - .byte VOL , 80*bgm_syoujoeye_mvl/mxv + .byte VOL , 80*mus_encounter_girl_mvl/mxv .byte W03 .byte N12 , Ds4 .byte W18 @@ -643,7 +643,7 @@ bgm_syoujoeye_5: .byte W18 .byte Fs3 .byte W06 -bgm_syoujoeye_5_B1: +mus_encounter_girl_5_B1: .byte N06 , Fn3 , v052 .byte W21 .byte N03 , Gs3 @@ -659,7 +659,7 @@ bgm_syoujoeye_5_B1: .byte W18 .byte Cn3 .byte W06 -bgm_syoujoeye_5_000: +mus_encounter_girl_5_000: .byte N06 , Cs4 , v052 .byte W21 .byte N03 , As3 @@ -718,7 +718,7 @@ bgm_syoujoeye_5_000: .byte Cn3 .byte W06 .byte PATT - .word bgm_syoujoeye_5_000 + .word mus_encounter_girl_5_000 .byte VOICE , 27 .byte N42 , As3 , v052 .byte W42 @@ -743,17 +743,17 @@ bgm_syoujoeye_5_000: .byte N06 , Fn3 .byte W48 .byte GOTO - .word bgm_syoujoeye_5_B1 + .word mus_encounter_girl_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_syoujoeye_6: - .byte KEYSH , bgm_syoujoeye_key+0 +mus_encounter_girl_6: + .byte KEYSH , mus_encounter_girl_key+0 .byte W24 - .byte VOL , 80*bgm_syoujoeye_mvl/mxv + .byte VOL , 80*mus_encounter_girl_mvl/mxv .byte W96 -bgm_syoujoeye_6_B1: +mus_encounter_girl_6_B1: .byte W92 .byte W01 .byte VOICE , 73 @@ -830,17 +830,17 @@ bgm_syoujoeye_6_B1: .byte Fn5 .byte W48 .byte GOTO - .word bgm_syoujoeye_6_B1 + .word mus_encounter_girl_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_syoujoeye_7: - .byte KEYSH , bgm_syoujoeye_key+0 +mus_encounter_girl_7: + .byte KEYSH , mus_encounter_girl_key+0 .byte PAN , c_v+47 .byte W24 .byte VOICE , 127 - .byte VOL , 75*bgm_syoujoeye_mvl/mxv + .byte VOL , 75*mus_encounter_girl_mvl/mxv .byte N12 , Gs4 , v052 .byte W24 .byte VOICE , 126 @@ -856,8 +856,8 @@ bgm_syoujoeye_7: .byte VOICE , 126 .byte N12 , Gs4 , v040 .byte W24 -bgm_syoujoeye_7_B1: -bgm_syoujoeye_7_000: +mus_encounter_girl_7_B1: +mus_encounter_girl_7_000: .byte VOICE , 127 .byte N12 , Gs4 , v052 .byte W24 @@ -902,7 +902,7 @@ bgm_syoujoeye_7_000: .byte N12 , Gs4 , v040 .byte W24 .byte PATT - .word bgm_syoujoeye_7_000 + .word mus_encounter_girl_7_000 .byte N12 , Gs4 , v052 .byte W24 .byte N12 @@ -942,15 +942,15 @@ bgm_syoujoeye_7_000: .byte N12 .byte W48 .byte GOTO - .word bgm_syoujoeye_7_B1 + .word mus_encounter_girl_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_syoujoeye_8: - .byte KEYSH , bgm_syoujoeye_key+0 +mus_encounter_girl_8: + .byte KEYSH , mus_encounter_girl_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_syoujoeye_mvl/mxv + .byte VOL , 80*mus_encounter_girl_mvl/mxv .byte W24 .byte W66 .byte N06 , Cn1 , v120 @@ -959,8 +959,8 @@ bgm_syoujoeye_8: .byte W18 .byte Cn1 , v120 .byte W06 -bgm_syoujoeye_8_B1: -bgm_syoujoeye_8_000: +mus_encounter_girl_8_B1: +mus_encounter_girl_8_000: .byte N06 , Cn1 , v120 .byte W24 .byte En1 , v112 @@ -974,7 +974,7 @@ bgm_syoujoeye_8_000: .byte Cn1 , v120 .byte W06 .byte PEND -bgm_syoujoeye_8_001: +mus_encounter_girl_8_001: .byte N06 , Cn1 , v120 .byte W18 .byte N06 @@ -1013,9 +1013,9 @@ bgm_syoujoeye_8_001: .byte N06 .byte W06 .byte PATT - .word bgm_syoujoeye_8_000 + .word mus_encounter_girl_8_000 .byte PATT - .word bgm_syoujoeye_8_001 + .word mus_encounter_girl_8_001 .byte N06 , Cn1 , v120 .byte W42 .byte N06 @@ -1039,27 +1039,27 @@ bgm_syoujoeye_8_001: .byte Cn1 , v120 .byte W06 .byte GOTO - .word bgm_syoujoeye_8_B1 + .word mus_encounter_girl_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_syoujoeye: +mus_encounter_girl: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_syoujoeye_pri @ Priority - .byte bgm_syoujoeye_rev @ Reverb. + .byte mus_encounter_girl_pri @ Priority + .byte mus_encounter_girl_rev @ Reverb. - .word bgm_syoujoeye_grp + .word mus_encounter_girl_grp - .word bgm_syoujoeye_1 - .word bgm_syoujoeye_2 - .word bgm_syoujoeye_3 - .word bgm_syoujoeye_4 - .word bgm_syoujoeye_5 - .word bgm_syoujoeye_6 - .word bgm_syoujoeye_7 - .word bgm_syoujoeye_8 + .word mus_encounter_girl_1 + .word mus_encounter_girl_2 + .word mus_encounter_girl_3 + .word mus_encounter_girl_4 + .word mus_encounter_girl_5 + .word mus_encounter_girl_6 + .word mus_encounter_girl_7 + .word mus_encounter_girl_8 .end diff --git a/sound/songs/bgm_yama_eye.s b/sound/songs/mus_encounter_hiker.s index 31b79b2ed..ed276b584 100644 --- a/sound/songs/bgm_yama_eye.s +++ b/sound/songs/mus_encounter_hiker.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_yama_eye_grp, voicegroup094 - .equ bgm_yama_eye_pri, 0 - .equ bgm_yama_eye_rev, reverb_set+50 - .equ bgm_yama_eye_mvl, 127 - .equ bgm_yama_eye_key, 0 - .equ bgm_yama_eye_tbs, 1 - .equ bgm_yama_eye_exg, 0 - .equ bgm_yama_eye_cmp, 1 + .equ mus_encounter_hiker_grp, voicegroup094 + .equ mus_encounter_hiker_pri, 0 + .equ mus_encounter_hiker_rev, reverb_set+50 + .equ mus_encounter_hiker_mvl, 127 + .equ mus_encounter_hiker_key, 0 + .equ mus_encounter_hiker_tbs, 1 + .equ mus_encounter_hiker_exg, 0 + .equ mus_encounter_hiker_cmp, 1 .section .rodata - .global bgm_yama_eye + .global mus_encounter_hiker .align 2 @********************** Track 1 **********************@ -bgm_yama_eye_1: - .byte KEYSH , bgm_yama_eye_key+0 - .byte TEMPO , 128*bgm_yama_eye_tbs/2 +mus_encounter_hiker_1: + .byte KEYSH , mus_encounter_hiker_key+0 + .byte TEMPO , 128*mus_encounter_hiker_tbs/2 .byte VOICE , 1 .byte LFOS , 44 .byte PAN , c_v+4 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 38*bgm_yama_eye_mvl/mxv + .byte VOL , 38*mus_encounter_hiker_mvl/mxv .byte N04 , Fs5 , v112 .byte W16 .byte Dn5 @@ -36,7 +36,7 @@ bgm_yama_eye_1: .byte W16 .byte N08 , Fs4 .byte W08 -bgm_yama_eye_1_B1: +mus_encounter_hiker_1_B1: .byte W96 .byte W96 .byte W96 @@ -46,18 +46,18 @@ bgm_yama_eye_1_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_yama_eye_1_B1 + .word mus_encounter_hiker_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_yama_eye_2: - .byte KEYSH , bgm_yama_eye_key+0 +mus_encounter_hiker_2: + .byte KEYSH , mus_encounter_hiker_key+0 .byte VOICE , 60 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 62*bgm_yama_eye_mvl/mxv + .byte VOL , 62*mus_encounter_hiker_mvl/mxv .byte N04 , Fs4 , v112 .byte W16 .byte Dn4 @@ -73,7 +73,7 @@ bgm_yama_eye_2: .byte W16 .byte N08 , Fs3 .byte W08 -bgm_yama_eye_2_B1: +mus_encounter_hiker_2_B1: .byte N08 , Dn4 , v096 .byte W08 .byte N04 , Cs4 @@ -87,20 +87,20 @@ bgm_yama_eye_2_B1: .byte N48 , An3 .byte W24 .byte MOD , 7 - .byte VOL , 58*bgm_yama_eye_mvl/mxv + .byte VOL , 58*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 50*bgm_yama_eye_mvl/mxv + .byte 50*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 43*bgm_yama_eye_mvl/mxv + .byte 43*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 33*bgm_yama_eye_mvl/mxv + .byte 33*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 31*bgm_yama_eye_mvl/mxv + .byte 31*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 26*bgm_yama_eye_mvl/mxv + .byte 26*mus_encounter_hiker_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 63*bgm_yama_eye_mvl/mxv + .byte VOL , 63*mus_encounter_hiker_mvl/mxv .byte N08 , Fs3 .byte W08 .byte N04 , Fn3 @@ -133,30 +133,30 @@ bgm_yama_eye_2_B1: .byte W24 .byte N72 , Gn3 .byte W24 - .byte VOL , 62*bgm_yama_eye_mvl/mxv + .byte VOL , 62*mus_encounter_hiker_mvl/mxv .byte MOD , 8 .byte W08 - .byte VOL , 60*bgm_yama_eye_mvl/mxv + .byte VOL , 60*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 58*bgm_yama_eye_mvl/mxv + .byte 58*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 55*bgm_yama_eye_mvl/mxv + .byte 55*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 53*bgm_yama_eye_mvl/mxv + .byte 53*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 52*bgm_yama_eye_mvl/mxv + .byte 52*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 50*bgm_yama_eye_mvl/mxv + .byte 50*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 46*bgm_yama_eye_mvl/mxv + .byte 46*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 41*bgm_yama_eye_mvl/mxv + .byte 41*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 40*bgm_yama_eye_mvl/mxv + .byte 40*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 36*bgm_yama_eye_mvl/mxv + .byte 36*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 63*bgm_yama_eye_mvl/mxv + .byte 63*mus_encounter_hiker_mvl/mxv .byte MOD , 0 .byte W24 .byte N08 , En4 @@ -171,19 +171,19 @@ bgm_yama_eye_2_B1: .byte W08 .byte N48 , Bn3 .byte W24 - .byte VOL , 62*bgm_yama_eye_mvl/mxv + .byte VOL , 62*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 60*bgm_yama_eye_mvl/mxv + .byte 60*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 57*bgm_yama_eye_mvl/mxv + .byte 57*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 47*bgm_yama_eye_mvl/mxv + .byte 47*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 41*bgm_yama_eye_mvl/mxv + .byte 41*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 38*bgm_yama_eye_mvl/mxv + .byte 38*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 63*bgm_yama_eye_mvl/mxv + .byte 63*mus_encounter_hiker_mvl/mxv .byte N08 , Cs4 .byte W08 .byte N04 , Cn4 @@ -218,47 +218,47 @@ bgm_yama_eye_2_B1: .byte W08 .byte N72 , Fs4 .byte W24 - .byte VOL , 62*bgm_yama_eye_mvl/mxv + .byte VOL , 62*mus_encounter_hiker_mvl/mxv .byte MOD , 5 .byte W04 - .byte VOL , 60*bgm_yama_eye_mvl/mxv + .byte VOL , 60*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 55*bgm_yama_eye_mvl/mxv + .byte 55*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 52*bgm_yama_eye_mvl/mxv + .byte 52*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 50*bgm_yama_eye_mvl/mxv + .byte 50*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 46*bgm_yama_eye_mvl/mxv + .byte 46*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 43*bgm_yama_eye_mvl/mxv + .byte 43*mus_encounter_hiker_mvl/mxv .byte W08 - .byte 40*bgm_yama_eye_mvl/mxv + .byte 40*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 38*bgm_yama_eye_mvl/mxv + .byte 38*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 36*bgm_yama_eye_mvl/mxv + .byte 36*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 33*bgm_yama_eye_mvl/mxv + .byte 33*mus_encounter_hiker_mvl/mxv .byte W04 - .byte 63*bgm_yama_eye_mvl/mxv + .byte 63*mus_encounter_hiker_mvl/mxv .byte MOD , 0 .byte W24 .byte GOTO - .word bgm_yama_eye_2_B1 + .word mus_encounter_hiker_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_yama_eye_3: - .byte KEYSH , bgm_yama_eye_key+0 +mus_encounter_hiker_3: + .byte KEYSH , mus_encounter_hiker_key+0 .byte VOICE , 58 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 76*bgm_yama_eye_mvl/mxv + .byte VOL , 76*mus_encounter_hiker_mvl/mxv .byte N04 , An1 , v112 .byte W16 .byte Fs1 @@ -272,12 +272,12 @@ bgm_yama_eye_3: .byte 0 .byte N16 , Cs1 .byte W24 -bgm_yama_eye_3_B1: +mus_encounter_hiker_3_B1: .byte N08 , Dn1 , v112 .byte W48 .byte An0 .byte W48 -bgm_yama_eye_3_000: +mus_encounter_hiker_3_000: .byte N08 , Dn1 , v112 .byte W24 .byte An0 @@ -302,7 +302,7 @@ bgm_yama_eye_3_000: .byte W48 .byte An0 .byte W48 -bgm_yama_eye_3_001: +mus_encounter_hiker_3_001: .byte N08 , En1 , v112 .byte W24 .byte Bn0 @@ -328,26 +328,26 @@ bgm_yama_eye_3_001: .byte Bn0 .byte W48 .byte PATT - .word bgm_yama_eye_3_001 + .word mus_encounter_hiker_3_001 .byte BEND , c_v+0 .byte N08 , An0 , v112 .byte W48 .byte En0 .byte W48 .byte PATT - .word bgm_yama_eye_3_000 + .word mus_encounter_hiker_3_000 .byte GOTO - .word bgm_yama_eye_3_B1 + .word mus_encounter_hiker_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_yama_eye_4: - .byte KEYSH , bgm_yama_eye_key+0 +mus_encounter_hiker_4: + .byte KEYSH , mus_encounter_hiker_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 76*bgm_yama_eye_mvl/mxv + .byte VOL , 76*mus_encounter_hiker_mvl/mxv .byte PAN , c_v+32 .byte N04 , An2 , v124 .byte W16 @@ -369,7 +369,7 @@ bgm_yama_eye_4: .byte W16 .byte N04 , An1 , v112 .byte W08 -bgm_yama_eye_4_B1: +mus_encounter_hiker_4_B1: .byte PAN , c_v+22 .byte BEND , c_v+0 .byte N08 , Dn2 , v127 @@ -467,20 +467,20 @@ bgm_yama_eye_4_B1: .byte BEND , c_v+20 .byte W08 .byte GOTO - .word bgm_yama_eye_4_B1 + .word mus_encounter_hiker_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_yama_eye_5: - .byte KEYSH , bgm_yama_eye_key+0 +mus_encounter_hiker_5: + .byte KEYSH , mus_encounter_hiker_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-64 - .byte VOL , 35*bgm_yama_eye_mvl/mxv + .byte VOL , 35*mus_encounter_hiker_mvl/mxv .byte N04 , An2 , v112 .byte W16 .byte Fs2 @@ -498,8 +498,8 @@ bgm_yama_eye_5: .byte W04 .byte En3 .byte W04 -bgm_yama_eye_5_B1: -bgm_yama_eye_5_000: +mus_encounter_hiker_5_B1: +mus_encounter_hiker_5_000: .byte N12 , Fs3 , v112 .byte W16 .byte N02 @@ -544,8 +544,8 @@ bgm_yama_eye_5_000: .byte N02 , Fs3 .byte W08 .byte PATT - .word bgm_yama_eye_5_000 -bgm_yama_eye_5_001: + .word mus_encounter_hiker_5_000 +mus_encounter_hiker_5_001: .byte N04 , Gn3 , v112 .byte W12 .byte N02 @@ -590,7 +590,7 @@ bgm_yama_eye_5_001: .byte N02 .byte W08 .byte PATT - .word bgm_yama_eye_5_001 + .word mus_encounter_hiker_5_001 .byte N12 , En3 , v112 .byte W16 .byte N02 @@ -634,20 +634,20 @@ bgm_yama_eye_5_001: .byte N02 , Dn3 .byte W08 .byte GOTO - .word bgm_yama_eye_5_B1 + .word mus_encounter_hiker_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_yama_eye_6: - .byte KEYSH , bgm_yama_eye_key+0 +mus_encounter_hiker_6: + .byte KEYSH , mus_encounter_hiker_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 37*bgm_yama_eye_mvl/mxv + .byte VOL , 37*mus_encounter_hiker_mvl/mxv .byte N04 , Dn3 , v112 .byte W16 .byte An2 @@ -665,8 +665,8 @@ bgm_yama_eye_6: .byte W04 .byte Gn3 .byte W04 -bgm_yama_eye_6_B1: -bgm_yama_eye_6_000: +mus_encounter_hiker_6_B1: +mus_encounter_hiker_6_000: .byte N12 , An3 , v112 .byte W16 .byte N02 @@ -711,8 +711,8 @@ bgm_yama_eye_6_000: .byte N02 , An3 .byte W08 .byte PATT - .word bgm_yama_eye_6_000 -bgm_yama_eye_6_001: + .word mus_encounter_hiker_6_000 +mus_encounter_hiker_6_001: .byte N04 , Bn3 , v112 .byte W12 .byte N02 @@ -757,7 +757,7 @@ bgm_yama_eye_6_001: .byte N02 .byte W08 .byte PATT - .word bgm_yama_eye_6_001 + .word mus_encounter_hiker_6_001 .byte N12 , An3 , v112 .byte W16 .byte N02 @@ -801,19 +801,19 @@ bgm_yama_eye_6_001: .byte N02 , An3 .byte W08 .byte GOTO - .word bgm_yama_eye_6_B1 + .word mus_encounter_hiker_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_yama_eye_7: - .byte KEYSH , bgm_yama_eye_key+0 +mus_encounter_hiker_7: + .byte KEYSH , mus_encounter_hiker_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 56*bgm_yama_eye_mvl/mxv + .byte VOL , 56*mus_encounter_hiker_mvl/mxv .byte W96 -bgm_yama_eye_7_B1: -bgm_yama_eye_7_000: +mus_encounter_hiker_7_B1: +mus_encounter_hiker_7_000: .byte N04 , En1 , v112 .byte W16 .byte En1 , v084 @@ -849,7 +849,7 @@ bgm_yama_eye_7_000: .byte N04 .byte W04 .byte PEND -bgm_yama_eye_7_001: +mus_encounter_hiker_7_001: .byte N04 , En1 , v112 .byte W08 .byte En1 , v060 @@ -878,38 +878,38 @@ bgm_yama_eye_7_001: .byte W04 .byte PEND .byte PATT - .word bgm_yama_eye_7_000 + .word mus_encounter_hiker_7_000 .byte PATT - .word bgm_yama_eye_7_001 + .word mus_encounter_hiker_7_001 .byte PATT - .word bgm_yama_eye_7_000 + .word mus_encounter_hiker_7_000 .byte PATT - .word bgm_yama_eye_7_001 + .word mus_encounter_hiker_7_001 .byte PATT - .word bgm_yama_eye_7_000 + .word mus_encounter_hiker_7_000 .byte PATT - .word bgm_yama_eye_7_001 + .word mus_encounter_hiker_7_001 .byte GOTO - .word bgm_yama_eye_7_B1 + .word mus_encounter_hiker_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_yama_eye_8: - .byte KEYSH , bgm_yama_eye_key+0 +mus_encounter_hiker_8: + .byte KEYSH , mus_encounter_hiker_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 22*bgm_yama_eye_mvl/mxv + .byte VOL , 22*mus_encounter_hiker_mvl/mxv .byte W48 .byte MOD , 7 .byte W24 .byte 0 .byte W24 -bgm_yama_eye_8_B1: +mus_encounter_hiker_8_B1: .byte BEND , c_v+1 .byte N08 , Dn4 , v112 .byte W08 @@ -1013,27 +1013,27 @@ bgm_yama_eye_8_B1: .byte 0 .byte W24 .byte GOTO - .word bgm_yama_eye_8_B1 + .word mus_encounter_hiker_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_yama_eye: +mus_encounter_hiker: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_yama_eye_pri @ Priority - .byte bgm_yama_eye_rev @ Reverb. + .byte mus_encounter_hiker_pri @ Priority + .byte mus_encounter_hiker_rev @ Reverb. - .word bgm_yama_eye_grp + .word mus_encounter_hiker_grp - .word bgm_yama_eye_1 - .word bgm_yama_eye_2 - .word bgm_yama_eye_3 - .word bgm_yama_eye_4 - .word bgm_yama_eye_5 - .word bgm_yama_eye_6 - .word bgm_yama_eye_7 - .word bgm_yama_eye_8 + .word mus_encounter_hiker_1 + .word mus_encounter_hiker_2 + .word mus_encounter_hiker_3 + .word mus_encounter_hiker_4 + .word mus_encounter_hiker_5 + .word mus_encounter_hiker_6 + .word mus_encounter_hiker_7 + .word mus_encounter_hiker_8 .end diff --git a/sound/songs/bgm_hageshii.s b/sound/songs/mus_encounter_intense.s index 5c5a9d6fb..84096567e 100644 --- a/sound/songs/bgm_hageshii.s +++ b/sound/songs/mus_encounter_intense.s @@ -1,30 +1,30 @@ .include "MPlayDef.s" - .equ bgm_hageshii_grp, voicegroup059 - .equ bgm_hageshii_pri, 0 - .equ bgm_hageshii_rev, reverb_set+50 - .equ bgm_hageshii_mvl, 127 - .equ bgm_hageshii_key, 0 - .equ bgm_hageshii_tbs, 1 - .equ bgm_hageshii_exg, 0 - .equ bgm_hageshii_cmp, 1 + .equ mus_encounter_intense_grp, voicegroup059 + .equ mus_encounter_intense_pri, 0 + .equ mus_encounter_intense_rev, reverb_set+50 + .equ mus_encounter_intense_mvl, 127 + .equ mus_encounter_intense_key, 0 + .equ mus_encounter_intense_tbs, 1 + .equ mus_encounter_intense_exg, 0 + .equ mus_encounter_intense_cmp, 1 .section .rodata - .global bgm_hageshii + .global mus_encounter_intense .align 2 @********************** Track 1 **********************@ -bgm_hageshii_1: - .byte KEYSH , bgm_hageshii_key+0 - .byte TEMPO , 140*bgm_hageshii_tbs/2 +mus_encounter_intense_1: + .byte KEYSH , mus_encounter_intense_key+0 + .byte TEMPO , 140*mus_encounter_intense_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte PAN , c_v+63 - .byte VOL , 50*bgm_hageshii_mvl/mxv + .byte VOL , 50*mus_encounter_intense_mvl/mxv .byte W24 -bgm_hageshii_1_B1: -bgm_hageshii_1_000: +mus_encounter_intense_1_B1: +mus_encounter_intense_1_000: .byte N12 , En4 , v112 .byte W12 .byte N06 , En4 , v060 @@ -42,7 +42,7 @@ bgm_hageshii_1_000: .byte N06 , En4 , v064 .byte W12 .byte PEND -bgm_hageshii_1_001: +mus_encounter_intense_1_001: .byte N12 , En4 , v112 .byte W12 .byte N06 , En4 , v060 @@ -59,8 +59,8 @@ bgm_hageshii_1_001: .byte W24 .byte PEND .byte PATT - .word bgm_hageshii_1_000 -bgm_hageshii_1_002: + .word mus_encounter_intense_1_000 +mus_encounter_intense_1_002: .byte W72 .byte N06 , En4 , v112 .byte W06 @@ -68,27 +68,27 @@ bgm_hageshii_1_002: .byte W18 .byte PEND .byte PATT - .word bgm_hageshii_1_000 + .word mus_encounter_intense_1_000 .byte PATT - .word bgm_hageshii_1_001 + .word mus_encounter_intense_1_001 .byte PATT - .word bgm_hageshii_1_000 + .word mus_encounter_intense_1_000 .byte PATT - .word bgm_hageshii_1_002 + .word mus_encounter_intense_1_002 .byte GOTO - .word bgm_hageshii_1_B1 + .word mus_encounter_intense_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_hageshii_2: - .byte KEYSH , bgm_hageshii_key+0 +mus_encounter_intense_2: + .byte KEYSH , mus_encounter_intense_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte PAN , c_v+63 - .byte VOL , 67*bgm_hageshii_mvl/mxv + .byte VOL , 67*mus_encounter_intense_mvl/mxv .byte W24 -bgm_hageshii_2_B1: +mus_encounter_intense_2_B1: .byte W96 .byte W84 .byte N12 , Gn4 , v108 @@ -106,20 +106,20 @@ bgm_hageshii_2_B1: .byte Gn4 , v112 .byte W12 .byte GOTO - .word bgm_hageshii_2_B1 + .word mus_encounter_intense_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_hageshii_3: - .byte KEYSH , bgm_hageshii_key+0 +mus_encounter_intense_3: + .byte KEYSH , mus_encounter_intense_key+0 .byte VOICE , 38 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 78*bgm_hageshii_mvl/mxv + .byte VOL , 78*mus_encounter_intense_mvl/mxv .byte W24 -bgm_hageshii_3_B1: +mus_encounter_intense_3_B1: .byte BEND , c_v-2 .byte N08 , Fn1 , v112 .byte W03 @@ -391,23 +391,23 @@ bgm_hageshii_3_B1: .byte c_v-44 .byte W04 .byte GOTO - .word bgm_hageshii_3_B1 + .word mus_encounter_intense_3_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 4 **********************@ -bgm_hageshii_4: - .byte KEYSH , bgm_hageshii_key+0 +mus_encounter_intense_4: + .byte KEYSH , mus_encounter_intense_key+0 .byte VOICE , 56 .byte LFOS , 70 - .byte VOL , 68*bgm_hageshii_mvl/mxv + .byte VOL , 68*mus_encounter_intense_mvl/mxv .byte PAN , c_v-30 .byte W18 .byte BENDR , 12 .byte W06 -bgm_hageshii_4_B1: - .byte VOL , 68*bgm_hageshii_mvl/mxv +mus_encounter_intense_4_B1: + .byte VOL , 68*mus_encounter_intense_mvl/mxv .byte BEND , c_v+0 .byte N36 , Gs2 , v112 .byte W18 @@ -510,27 +510,27 @@ bgm_hageshii_4_B1: .byte W06 .byte Gs2 .byte W12 - .byte VOL , 65*bgm_hageshii_mvl/mxv + .byte VOL , 65*mus_encounter_intense_mvl/mxv .byte N06 , Gn2 .byte W02 - .byte VOL , 58*bgm_hageshii_mvl/mxv + .byte VOL , 58*mus_encounter_intense_mvl/mxv .byte W03 - .byte 51*bgm_hageshii_mvl/mxv + .byte 51*mus_encounter_intense_mvl/mxv .byte W01 .byte N06 , Gs2 .byte W02 - .byte VOL , 47*bgm_hageshii_mvl/mxv + .byte VOL , 47*mus_encounter_intense_mvl/mxv .byte W04 - .byte 40*bgm_hageshii_mvl/mxv + .byte 40*mus_encounter_intense_mvl/mxv .byte N12 , Fn2 .byte W02 - .byte VOL , 25*bgm_hageshii_mvl/mxv + .byte VOL , 25*mus_encounter_intense_mvl/mxv .byte W03 - .byte 1*bgm_hageshii_mvl/mxv + .byte 1*mus_encounter_intense_mvl/mxv .byte W04 .byte BEND , c_v-62 .byte W03 - .byte VOL , 68*bgm_hageshii_mvl/mxv + .byte VOL , 68*mus_encounter_intense_mvl/mxv .byte BEND , c_v+0 .byte N36 , An2 .byte W18 @@ -552,7 +552,7 @@ bgm_hageshii_4_B1: .byte W06 .byte N06 , En2 .byte W12 - .byte VOL , 68*bgm_hageshii_mvl/mxv + .byte VOL , 68*mus_encounter_intense_mvl/mxv .byte N03 , Fn2 .byte W06 .byte Fn2 , v072 @@ -634,45 +634,45 @@ bgm_hageshii_4_B1: .byte W06 .byte An2 .byte W12 - .byte VOL , 65*bgm_hageshii_mvl/mxv + .byte VOL , 65*mus_encounter_intense_mvl/mxv .byte N06 , Gs2 .byte W02 - .byte VOL , 58*bgm_hageshii_mvl/mxv + .byte VOL , 58*mus_encounter_intense_mvl/mxv .byte W03 - .byte 51*bgm_hageshii_mvl/mxv + .byte 51*mus_encounter_intense_mvl/mxv .byte W01 .byte N06 , An2 .byte W02 - .byte VOL , 47*bgm_hageshii_mvl/mxv + .byte VOL , 47*mus_encounter_intense_mvl/mxv .byte W04 - .byte 40*bgm_hageshii_mvl/mxv + .byte 40*mus_encounter_intense_mvl/mxv .byte N12 , Fs2 .byte W02 - .byte VOL , 25*bgm_hageshii_mvl/mxv + .byte VOL , 25*mus_encounter_intense_mvl/mxv .byte W03 - .byte 1*bgm_hageshii_mvl/mxv + .byte 1*mus_encounter_intense_mvl/mxv .byte W04 .byte BEND , c_v-62 .byte W03 .byte GOTO - .word bgm_hageshii_4_B1 + .word mus_encounter_intense_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_hageshii_5: - .byte KEYSH , bgm_hageshii_key+0 +mus_encounter_intense_5: + .byte KEYSH , mus_encounter_intense_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v-62 - .byte VOL , 53*bgm_hageshii_mvl/mxv + .byte VOL , 53*mus_encounter_intense_mvl/mxv .byte BEND , c_v+0 .byte W18 .byte BENDR , 12 .byte W06 -bgm_hageshii_5_B1: +mus_encounter_intense_5_B1: .byte BEND , c_v+0 .byte N03 , Fn3 , v112 .byte W06 @@ -920,24 +920,24 @@ bgm_hageshii_5_B1: .byte c_v-50 .byte W03 .byte GOTO - .word bgm_hageshii_5_B1 + .word mus_encounter_intense_5_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 6 **********************@ -bgm_hageshii_6: - .byte KEYSH , bgm_hageshii_key+0 +mus_encounter_intense_6: + .byte KEYSH , mus_encounter_intense_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+63 - .byte VOL , 37*bgm_hageshii_mvl/mxv + .byte VOL , 37*mus_encounter_intense_mvl/mxv .byte BENDR , 12 .byte BEND , c_v+2 .byte W24 -bgm_hageshii_6_B1: +mus_encounter_intense_6_B1: .byte BEND , c_v+2 .byte N36 , Fn3 , v112 .byte W18 @@ -1153,15 +1153,15 @@ bgm_hageshii_6_B1: .byte BEND , c_v-64 .byte W06 .byte GOTO - .word bgm_hageshii_6_B1 + .word mus_encounter_intense_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_hageshii_7: - .byte KEYSH , bgm_hageshii_key+0 +mus_encounter_intense_7: + .byte KEYSH , mus_encounter_intense_key+0 .byte VOICE , 0 - .byte VOL , 76*bgm_hageshii_mvl/mxv + .byte VOL , 76*mus_encounter_intense_mvl/mxv .byte N04 , En1 , v112 .byte N04 , Fs2 .byte W04 @@ -1177,8 +1177,8 @@ bgm_hageshii_7: .byte En1 , v112 .byte N06 , Fs2 , v044 .byte W06 -bgm_hageshii_7_B1: -bgm_hageshii_7_000: +mus_encounter_intense_7_B1: +mus_encounter_intense_7_000: .byte N06 , Cn1 , v112 .byte N06 , Fs2 .byte W06 @@ -1221,7 +1221,7 @@ bgm_hageshii_7_000: .byte Fs2 , v044 .byte W06 .byte PEND -bgm_hageshii_7_001: +mus_encounter_intense_7_001: .byte N06 , Cn1 , v112 .byte N06 , Fs2 .byte W06 @@ -1263,7 +1263,7 @@ bgm_hageshii_7_001: .byte Fs2 , v044 .byte W06 .byte PEND -bgm_hageshii_7_002: +mus_encounter_intense_7_002: .byte N06 , Cn1 , v112 .byte N06 , Fs2 .byte W06 @@ -1306,7 +1306,7 @@ bgm_hageshii_7_002: .byte Fs2 , v044 .byte W06 .byte PEND -bgm_hageshii_7_003: +mus_encounter_intense_7_003: .byte N06 , Cn1 , v112 .byte W06 .byte Dn1 @@ -1338,30 +1338,30 @@ bgm_hageshii_7_003: .byte W12 .byte PEND .byte PATT - .word bgm_hageshii_7_000 + .word mus_encounter_intense_7_000 .byte PATT - .word bgm_hageshii_7_001 + .word mus_encounter_intense_7_001 .byte PATT - .word bgm_hageshii_7_002 + .word mus_encounter_intense_7_002 .byte PATT - .word bgm_hageshii_7_003 + .word mus_encounter_intense_7_003 .byte GOTO - .word bgm_hageshii_7_B1 + .word mus_encounter_intense_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_hageshii_8: - .byte KEYSH , bgm_hageshii_key+0 +mus_encounter_intense_8: + .byte KEYSH , mus_encounter_intense_key+0 .byte VOICE , 29 .byte BENDR , 12 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+0 - .byte VOL , 70*bgm_hageshii_mvl/mxv + .byte VOL , 70*mus_encounter_intense_mvl/mxv .byte W24 -bgm_hageshii_8_B1: +mus_encounter_intense_8_B1: .byte BEND , c_v+0 .byte N36 , Fn2 , v112 .byte W18 @@ -1581,27 +1581,27 @@ bgm_hageshii_8_B1: .byte BEND , c_v-64 .byte W06 .byte GOTO - .word bgm_hageshii_8_B1 + .word mus_encounter_intense_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_hageshii: +mus_encounter_intense: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_hageshii_pri @ Priority - .byte bgm_hageshii_rev @ Reverb. + .byte mus_encounter_intense_pri @ Priority + .byte mus_encounter_intense_rev @ Reverb. - .word bgm_hageshii_grp + .word mus_encounter_intense_grp - .word bgm_hageshii_1 - .word bgm_hageshii_2 - .word bgm_hageshii_3 - .word bgm_hageshii_4 - .word bgm_hageshii_5 - .word bgm_hageshii_6 - .word bgm_hageshii_7 - .word bgm_hageshii_8 + .word mus_encounter_intense_1 + .word mus_encounter_intense_2 + .word mus_encounter_intense_3 + .word mus_encounter_intense_4 + .word mus_encounter_intense_5 + .word mus_encounter_intense_6 + .word mus_encounter_intense_7 + .word mus_encounter_intense_8 .end diff --git a/sound/songs/bgm_inter_v.s b/sound/songs/mus_encounter_interviewer.s index 39a90a378..34e18374a 100644 --- a/sound/songs/bgm_inter_v.s +++ b/sound/songs/mus_encounter_interviewer.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_inter_v_grp, voicegroup096 - .equ bgm_inter_v_pri, 0 - .equ bgm_inter_v_rev, reverb_set+50 - .equ bgm_inter_v_mvl, 127 - .equ bgm_inter_v_key, 0 - .equ bgm_inter_v_tbs, 1 - .equ bgm_inter_v_exg, 0 - .equ bgm_inter_v_cmp, 1 + .equ mus_encounter_interviewer_grp, voicegroup096 + .equ mus_encounter_interviewer_pri, 0 + .equ mus_encounter_interviewer_rev, reverb_set+50 + .equ mus_encounter_interviewer_mvl, 127 + .equ mus_encounter_interviewer_key, 0 + .equ mus_encounter_interviewer_tbs, 1 + .equ mus_encounter_interviewer_exg, 0 + .equ mus_encounter_interviewer_cmp, 1 .section .rodata - .global bgm_inter_v + .global mus_encounter_interviewer .align 2 @********************** Track 1 **********************@ -bgm_inter_v_1: - .byte KEYSH , bgm_inter_v_key+0 - .byte TEMPO , 142*bgm_inter_v_tbs/2 +mus_encounter_interviewer_1: + .byte KEYSH , mus_encounter_interviewer_key+0 + .byte TEMPO , 142*mus_encounter_interviewer_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 39*bgm_inter_v_mvl/mxv + .byte VOL , 39*mus_encounter_interviewer_mvl/mxv .byte PAN , c_v+0 .byte W06 .byte N03 , Gn5 , v112 @@ -56,7 +56,7 @@ bgm_inter_v_1: .byte W12 .byte Gn5 , v064 .byte W12 -bgm_inter_v_1_B1: +mus_encounter_interviewer_1_B1: .byte N03 , Gn5 , v112 .byte W06 .byte Gn5 , v064 @@ -178,19 +178,19 @@ bgm_inter_v_1_B1: .byte Gn5 , v096 .byte W06 .byte GOTO - .word bgm_inter_v_1_B1 + .word mus_encounter_interviewer_1_B1 .byte W96 .byte FINE @********************** Track 2 **********************@ -bgm_inter_v_2: - .byte KEYSH , bgm_inter_v_key+0 +mus_encounter_interviewer_2: + .byte KEYSH , mus_encounter_interviewer_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+13 - .byte VOL , 62*bgm_inter_v_mvl/mxv + .byte VOL , 62*mus_encounter_interviewer_mvl/mxv .byte N03 , Ds4 , v112 .byte W03 .byte Cs4 @@ -217,9 +217,9 @@ bgm_inter_v_2: .byte W24 .byte N36 , Fs4 .byte W36 -bgm_inter_v_2_B1: +mus_encounter_interviewer_2_B1: .byte VOICE , 13 - .byte VOL , 27*bgm_inter_v_mvl/mxv + .byte VOL , 27*mus_encounter_interviewer_mvl/mxv .byte N03 , Bn5 , v112 .byte W06 .byte N06 , Bn5 , v064 @@ -248,7 +248,7 @@ bgm_inter_v_2_B1: .byte W06 .byte Bn5 , v080 .byte W06 -bgm_inter_v_2_000: +mus_encounter_interviewer_2_000: .byte N03 , Bn5 , v112 .byte W06 .byte N06 , Bn5 , v064 @@ -279,29 +279,29 @@ bgm_inter_v_2_000: .byte W06 .byte PEND .byte PATT - .word bgm_inter_v_2_000 + .word mus_encounter_interviewer_2_000 .byte PATT - .word bgm_inter_v_2_000 + .word mus_encounter_interviewer_2_000 .byte GOTO - .word bgm_inter_v_2_B1 + .word mus_encounter_interviewer_2_B1 .byte W96 .byte FINE @********************** Track 3 **********************@ -bgm_inter_v_3: - .byte KEYSH , bgm_inter_v_key+0 +mus_encounter_interviewer_3: + .byte KEYSH , mus_encounter_interviewer_key+0 .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 61*bgm_inter_v_mvl/mxv + .byte VOL , 61*mus_encounter_interviewer_mvl/mxv .byte W06 .byte W96 .byte W96 -bgm_inter_v_3_B1: +mus_encounter_interviewer_3_B1: .byte BEND , c_v+0 .byte N18 , Bn0 , v112 .byte W18 @@ -322,7 +322,7 @@ bgm_inter_v_3_B1: .byte W06 .byte As0 .byte W06 -bgm_inter_v_3_000: +mus_encounter_interviewer_3_000: .byte N15 , Bn0 , v112 .byte W18 .byte N03 @@ -355,20 +355,20 @@ bgm_inter_v_3_000: .byte As0 .byte W06 .byte PATT - .word bgm_inter_v_3_000 + .word mus_encounter_interviewer_3_000 .byte GOTO - .word bgm_inter_v_3_B1 + .word mus_encounter_interviewer_3_B1 .byte W96 .byte FINE @********************** Track 4 **********************@ -bgm_inter_v_4: - .byte KEYSH , bgm_inter_v_key+0 +mus_encounter_interviewer_4: + .byte KEYSH , mus_encounter_interviewer_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 60*bgm_inter_v_mvl/mxv + .byte VOL , 60*mus_encounter_interviewer_mvl/mxv .byte PAN , c_v-24 .byte N03 , Gs3 , v112 .byte W03 @@ -396,9 +396,9 @@ bgm_inter_v_4: .byte W24 .byte N36 , Dn4 .byte W36 -bgm_inter_v_4_B1: +mus_encounter_interviewer_4_B1: .byte VOICE , 13 - .byte VOL , 27*bgm_inter_v_mvl/mxv + .byte VOL , 27*mus_encounter_interviewer_mvl/mxv .byte N03 , En5 , v112 .byte W06 .byte N06 , En5 , v064 @@ -427,7 +427,7 @@ bgm_inter_v_4_B1: .byte W06 .byte En5 , v080 .byte W06 -bgm_inter_v_4_000: +mus_encounter_interviewer_4_000: .byte N03 , En5 , v112 .byte W06 .byte N06 , En5 , v064 @@ -458,27 +458,27 @@ bgm_inter_v_4_000: .byte W06 .byte PEND .byte PATT - .word bgm_inter_v_4_000 + .word mus_encounter_interviewer_4_000 .byte PATT - .word bgm_inter_v_4_000 + .word mus_encounter_interviewer_4_000 .byte GOTO - .word bgm_inter_v_4_B1 + .word mus_encounter_interviewer_4_B1 .byte W96 .byte FINE @********************** Track 5 **********************@ -bgm_inter_v_5: - .byte KEYSH , bgm_inter_v_key+0 +mus_encounter_interviewer_5: + .byte KEYSH , mus_encounter_interviewer_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 47*bgm_inter_v_mvl/mxv + .byte VOL , 47*mus_encounter_interviewer_mvl/mxv .byte PAN , c_v+0 .byte W06 .byte W96 .byte W96 -bgm_inter_v_5_B1: +mus_encounter_interviewer_5_B1: .byte W84 .byte N12 , En5 , v096 .byte W12 @@ -496,20 +496,20 @@ bgm_inter_v_5_B1: .byte N12 .byte W36 .byte GOTO - .word bgm_inter_v_5_B1 + .word mus_encounter_interviewer_5_B1 .byte W96 .byte FINE @********************** Track 6 **********************@ -bgm_inter_v_6: - .byte KEYSH , bgm_inter_v_key+0 +mus_encounter_interviewer_6: + .byte KEYSH , mus_encounter_interviewer_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte PAN , c_v-61 .byte N03 , Bn4 , v108 .byte W03 @@ -579,30 +579,30 @@ bgm_inter_v_6: .byte W06 .byte Fs6 .byte W06 -bgm_inter_v_6_B1: +mus_encounter_interviewer_6_B1: .byte VOICE , 83 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte N84 , Bn2 , v112 .byte W36 .byte MOD , 5 - .byte VOL , 44*bgm_inter_v_mvl/mxv + .byte VOL , 44*mus_encounter_interviewer_mvl/mxv .byte W06 - .byte 33*bgm_inter_v_mvl/mxv + .byte 33*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 29*bgm_inter_v_mvl/mxv + .byte 29*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 26*bgm_inter_v_mvl/mxv + .byte 26*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 19*bgm_inter_v_mvl/mxv + .byte 19*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 15*bgm_inter_v_mvl/mxv + .byte 15*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 8*bgm_inter_v_mvl/mxv + .byte 8*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 4*bgm_inter_v_mvl/mxv + .byte 4*mus_encounter_interviewer_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte N06 , Fs2 .byte W06 .byte Bn2 @@ -610,49 +610,49 @@ bgm_inter_v_6_B1: .byte N96 , Fs2 .byte W36 .byte MOD , 5 - .byte VOL , 44*bgm_inter_v_mvl/mxv + .byte VOL , 44*mus_encounter_interviewer_mvl/mxv .byte W06 - .byte 33*bgm_inter_v_mvl/mxv + .byte 33*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 29*bgm_inter_v_mvl/mxv + .byte 29*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 23*bgm_inter_v_mvl/mxv + .byte 23*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 16*bgm_inter_v_mvl/mxv + .byte 16*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 12*bgm_inter_v_mvl/mxv + .byte 12*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 9*bgm_inter_v_mvl/mxv + .byte 9*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 4*bgm_inter_v_mvl/mxv + .byte 4*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 2*bgm_inter_v_mvl/mxv + .byte 2*mus_encounter_interviewer_mvl/mxv .byte W13 .byte MOD , 0 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte N84 , Bn2 .byte W36 .byte MOD , 5 - .byte VOL , 44*bgm_inter_v_mvl/mxv + .byte VOL , 44*mus_encounter_interviewer_mvl/mxv .byte W06 - .byte 40*bgm_inter_v_mvl/mxv + .byte 40*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 33*bgm_inter_v_mvl/mxv + .byte 33*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 29*bgm_inter_v_mvl/mxv + .byte 29*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 25*bgm_inter_v_mvl/mxv + .byte 25*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 18*bgm_inter_v_mvl/mxv + .byte 18*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 9*bgm_inter_v_mvl/mxv + .byte 9*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 6*bgm_inter_v_mvl/mxv + .byte 6*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 4*bgm_inter_v_mvl/mxv + .byte 4*mus_encounter_interviewer_mvl/mxv .byte W01 .byte MOD , 0 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte N06 , En3 .byte W06 .byte Fn3 @@ -660,43 +660,43 @@ bgm_inter_v_6_B1: .byte N96 , Fs3 .byte W36 .byte MOD , 5 - .byte VOL , 44*bgm_inter_v_mvl/mxv + .byte VOL , 44*mus_encounter_interviewer_mvl/mxv .byte W06 - .byte 34*bgm_inter_v_mvl/mxv + .byte 34*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 32*bgm_inter_v_mvl/mxv + .byte 32*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 27*bgm_inter_v_mvl/mxv + .byte 27*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 23*bgm_inter_v_mvl/mxv + .byte 23*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 20*bgm_inter_v_mvl/mxv + .byte 20*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 16*bgm_inter_v_mvl/mxv + .byte 16*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 12*bgm_inter_v_mvl/mxv + .byte 12*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 7*bgm_inter_v_mvl/mxv + .byte 7*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 4*bgm_inter_v_mvl/mxv + .byte 4*mus_encounter_interviewer_mvl/mxv .byte W06 .byte GOTO - .word bgm_inter_v_6_B1 + .word mus_encounter_interviewer_6_B1 .byte MOD , 0 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte W96 .byte FINE @********************** Track 7 **********************@ -bgm_inter_v_7: - .byte KEYSH , bgm_inter_v_key+0 +mus_encounter_interviewer_7: + .byte KEYSH , mus_encounter_interviewer_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte PAN , c_v+63 .byte N03 , Gs4 , v108 .byte W03 @@ -766,30 +766,30 @@ bgm_inter_v_7: .byte W06 .byte Cs6 .byte W06 -bgm_inter_v_7_B1: +mus_encounter_interviewer_7_B1: .byte VOICE , 84 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte N84 , Fs3 , v112 .byte W36 .byte MOD , 5 - .byte VOL , 44*bgm_inter_v_mvl/mxv + .byte VOL , 44*mus_encounter_interviewer_mvl/mxv .byte W06 - .byte 33*bgm_inter_v_mvl/mxv + .byte 33*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 29*bgm_inter_v_mvl/mxv + .byte 29*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 26*bgm_inter_v_mvl/mxv + .byte 26*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 19*bgm_inter_v_mvl/mxv + .byte 19*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 15*bgm_inter_v_mvl/mxv + .byte 15*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 8*bgm_inter_v_mvl/mxv + .byte 8*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 4*bgm_inter_v_mvl/mxv + .byte 4*mus_encounter_interviewer_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte N06 , Ds3 .byte W06 .byte Fs3 @@ -797,49 +797,49 @@ bgm_inter_v_7_B1: .byte N96 , Bn2 .byte W36 .byte MOD , 5 - .byte VOL , 44*bgm_inter_v_mvl/mxv + .byte VOL , 44*mus_encounter_interviewer_mvl/mxv .byte W06 - .byte 33*bgm_inter_v_mvl/mxv + .byte 33*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 29*bgm_inter_v_mvl/mxv + .byte 29*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 23*bgm_inter_v_mvl/mxv + .byte 23*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 16*bgm_inter_v_mvl/mxv + .byte 16*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 12*bgm_inter_v_mvl/mxv + .byte 12*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 9*bgm_inter_v_mvl/mxv + .byte 9*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 4*bgm_inter_v_mvl/mxv + .byte 4*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 2*bgm_inter_v_mvl/mxv + .byte 2*mus_encounter_interviewer_mvl/mxv .byte W13 .byte MOD , 0 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte N84 , Fs3 .byte W36 .byte MOD , 5 - .byte VOL , 44*bgm_inter_v_mvl/mxv + .byte VOL , 44*mus_encounter_interviewer_mvl/mxv .byte W06 - .byte 40*bgm_inter_v_mvl/mxv + .byte 40*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 33*bgm_inter_v_mvl/mxv + .byte 33*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 29*bgm_inter_v_mvl/mxv + .byte 29*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 25*bgm_inter_v_mvl/mxv + .byte 25*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 18*bgm_inter_v_mvl/mxv + .byte 18*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 9*bgm_inter_v_mvl/mxv + .byte 9*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 6*bgm_inter_v_mvl/mxv + .byte 6*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 4*bgm_inter_v_mvl/mxv + .byte 4*mus_encounter_interviewer_mvl/mxv .byte W01 .byte MOD , 0 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte N06 , An3 .byte W06 .byte As3 @@ -847,40 +847,40 @@ bgm_inter_v_7_B1: .byte N96 , Bn3 .byte W36 .byte MOD , 5 - .byte VOL , 44*bgm_inter_v_mvl/mxv + .byte VOL , 44*mus_encounter_interviewer_mvl/mxv .byte W06 - .byte 34*bgm_inter_v_mvl/mxv + .byte 34*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 32*bgm_inter_v_mvl/mxv + .byte 32*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 27*bgm_inter_v_mvl/mxv + .byte 27*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 23*bgm_inter_v_mvl/mxv + .byte 23*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 20*bgm_inter_v_mvl/mxv + .byte 20*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 16*bgm_inter_v_mvl/mxv + .byte 16*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 12*bgm_inter_v_mvl/mxv + .byte 12*mus_encounter_interviewer_mvl/mxv .byte W05 - .byte 7*bgm_inter_v_mvl/mxv + .byte 7*mus_encounter_interviewer_mvl/mxv .byte W07 - .byte 4*bgm_inter_v_mvl/mxv + .byte 4*mus_encounter_interviewer_mvl/mxv .byte W06 .byte GOTO - .word bgm_inter_v_7_B1 + .word mus_encounter_interviewer_7_B1 .byte MOD , 0 - .byte VOL , 37*bgm_inter_v_mvl/mxv + .byte VOL , 37*mus_encounter_interviewer_mvl/mxv .byte W96 .byte FINE @********************** Track 8 **********************@ -bgm_inter_v_8: - .byte KEYSH , bgm_inter_v_key+0 +mus_encounter_interviewer_8: + .byte KEYSH , mus_encounter_interviewer_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 58*bgm_inter_v_mvl/mxv + .byte VOL , 58*mus_encounter_interviewer_mvl/mxv .byte W06 .byte N06 , Cn1 , v112 .byte N24 , An2 , v080 @@ -926,28 +926,28 @@ bgm_inter_v_8: .byte W06 .byte Dn1 , v064 .byte W06 -bgm_inter_v_8_B1: +mus_encounter_interviewer_8_B1: .byte N48 , An2 , v092 .byte W96 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_inter_v_8_B1 + .word mus_encounter_interviewer_8_B1 .byte W96 .byte FINE @********************** Track 9 **********************@ -bgm_inter_v_9: - .byte KEYSH , bgm_inter_v_key+0 +mus_encounter_interviewer_9: + .byte KEYSH , mus_encounter_interviewer_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 60*bgm_inter_v_mvl/mxv + .byte VOL , 60*mus_encounter_interviewer_mvl/mxv .byte W06 .byte N06 , En1 , v112 .byte W18 @@ -985,8 +985,8 @@ bgm_inter_v_9: .byte W12 .byte N12 , Dn2 .byte W12 -bgm_inter_v_9_B1: - .byte VOL , 27*bgm_inter_v_mvl/mxv +mus_encounter_interviewer_9_B1: + .byte VOL , 27*mus_encounter_interviewer_mvl/mxv .byte BEND , c_v+1 .byte N18 , Bn1 , v112 .byte W18 @@ -1004,7 +1004,7 @@ bgm_inter_v_9_B1: .byte W06 .byte As1 .byte W06 -bgm_inter_v_9_000: +mus_encounter_interviewer_9_000: .byte N15 , Bn1 , v112 .byte W18 .byte N03 @@ -1037,31 +1037,31 @@ bgm_inter_v_9_000: .byte As1 .byte W06 .byte PATT - .word bgm_inter_v_9_000 + .word mus_encounter_interviewer_9_000 .byte GOTO - .word bgm_inter_v_9_B1 + .word mus_encounter_interviewer_9_B1 .byte W96 .byte FINE @******************************************************@ .align 2 -bgm_inter_v: +mus_encounter_interviewer: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_inter_v_pri @ Priority - .byte bgm_inter_v_rev @ Reverb. + .byte mus_encounter_interviewer_pri @ Priority + .byte mus_encounter_interviewer_rev @ Reverb. - .word bgm_inter_v_grp + .word mus_encounter_interviewer_grp - .word bgm_inter_v_1 - .word bgm_inter_v_2 - .word bgm_inter_v_3 - .word bgm_inter_v_4 - .word bgm_inter_v_5 - .word bgm_inter_v_6 - .word bgm_inter_v_7 - .word bgm_inter_v_8 - .word bgm_inter_v_9 + .word mus_encounter_interviewer_1 + .word mus_encounter_interviewer_2 + .word mus_encounter_interviewer_3 + .word mus_encounter_interviewer_4 + .word mus_encounter_interviewer_5 + .word mus_encounter_interviewer_6 + .word mus_encounter_interviewer_7 + .word mus_encounter_interviewer_8 + .word mus_encounter_interviewer_9 .end diff --git a/sound/songs/bgm_mgm0.s b/sound/songs/mus_encounter_magma.s index 1ffccf466..560c13027 100644 --- a/sound/songs/bgm_mgm0.s +++ b/sound/songs/mus_encounter_magma.s @@ -1,33 +1,33 @@ .include "MPlayDef.s" - .equ bgm_mgm0_grp, voicegroup084 - .equ bgm_mgm0_pri, 0 - .equ bgm_mgm0_rev, reverb_set+50 - .equ bgm_mgm0_mvl, 127 - .equ bgm_mgm0_key, 0 - .equ bgm_mgm0_tbs, 1 - .equ bgm_mgm0_exg, 0 - .equ bgm_mgm0_cmp, 1 + .equ mus_encounter_magma_grp, voicegroup084 + .equ mus_encounter_magma_pri, 0 + .equ mus_encounter_magma_rev, reverb_set+50 + .equ mus_encounter_magma_mvl, 127 + .equ mus_encounter_magma_key, 0 + .equ mus_encounter_magma_tbs, 1 + .equ mus_encounter_magma_exg, 0 + .equ mus_encounter_magma_cmp, 1 .section .rodata - .global bgm_mgm0 + .global mus_encounter_magma .align 2 @********************** Track 1 **********************@ -bgm_mgm0_1: - .byte KEYSH , bgm_mgm0_key+0 - .byte TEMPO , 148*bgm_mgm0_tbs/2 +mus_encounter_magma_1: + .byte KEYSH , mus_encounter_magma_key+0 + .byte TEMPO , 148*mus_encounter_magma_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 52*bgm_mgm0_mvl/mxv + .byte VOL , 52*mus_encounter_magma_mvl/mxv .byte N03 , Fs5 , v112 .byte W06 .byte Fs5 , v060 .byte W06 -bgm_mgm0_1_B1: +mus_encounter_magma_1_B1: .byte VOICE , 127 .byte N03 , Fs5 , v112 .byte W06 @@ -203,7 +203,7 @@ bgm_mgm0_1_B1: .byte W06 .byte Fs5 , v044 .byte W06 -bgm_mgm0_1_000: +mus_encounter_magma_1_000: .byte N03 , Fs5 , v112 .byte W12 .byte Fs5 , v068 @@ -264,7 +264,7 @@ bgm_mgm0_1_000: .byte Fs5 , v044 .byte W06 .byte PATT - .word bgm_mgm0_1_000 + .word mus_encounter_magma_1_000 .byte VOICE , 127 .byte N03 , Fs5 , v112 .byte W06 @@ -368,23 +368,23 @@ bgm_mgm0_1_000: .byte N12 , An5 , v096 .byte W12 .byte GOTO - .word bgm_mgm0_1_B1 + .word mus_encounter_magma_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_mgm0_2: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_2: + .byte KEYSH , mus_encounter_magma_key+0 .byte VOICE , 60 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 54*bgm_mgm0_mvl/mxv + .byte VOL , 54*mus_encounter_magma_mvl/mxv .byte N06 , Dn5 , v112 .byte W06 .byte En5 .byte W06 -bgm_mgm0_2_B1: +mus_encounter_magma_2_B1: .byte N06 , Fn5 , v112 .byte W06 .byte N03 , En5 @@ -454,7 +454,7 @@ bgm_mgm0_2_B1: .byte Gn5 .byte W84 .byte VOICE , 60 - .byte VOL , 48*bgm_mgm0_mvl/mxv + .byte VOL , 48*mus_encounter_magma_mvl/mxv .byte N48 , An3 .byte W48 .byte Bn3 @@ -463,17 +463,17 @@ bgm_mgm0_2_B1: .byte W48 .byte Bn3 .byte W48 - .byte VOL , 52*bgm_mgm0_mvl/mxv + .byte VOL , 52*mus_encounter_magma_mvl/mxv .byte N48 , Dn4 .byte W48 .byte En4 .byte W48 - .byte VOL , 56*bgm_mgm0_mvl/mxv + .byte VOL , 56*mus_encounter_magma_mvl/mxv .byte N48 , Fn4 .byte W48 .byte Gn4 .byte W48 -bgm_mgm0_2_000: +mus_encounter_magma_2_000: .byte N06 , An4 , v112 .byte W06 .byte N03 @@ -487,7 +487,7 @@ bgm_mgm0_2_000: .byte W06 .byte N03 .byte W30 - .byte VOL , 46*bgm_mgm0_mvl/mxv + .byte VOL , 46*mus_encounter_magma_mvl/mxv .byte N24 , Gs4 .byte W24 .byte Gn4 @@ -495,7 +495,7 @@ bgm_mgm0_2_000: .byte N12 , Fs4 .byte W12 .byte PATT - .word bgm_mgm0_2_000 + .word mus_encounter_magma_2_000 .byte N03 , An4 , v112 .byte W06 .byte N03 @@ -518,22 +518,22 @@ bgm_mgm0_2_000: .byte En5 .byte W06 .byte GOTO - .word bgm_mgm0_2_B1 + .word mus_encounter_magma_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_mgm0_3: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_3: + .byte KEYSH , mus_encounter_magma_key+0 .byte VOICE , 38 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 72*bgm_mgm0_mvl/mxv + .byte VOL , 72*mus_encounter_magma_mvl/mxv .byte W12 -bgm_mgm0_3_B1: +mus_encounter_magma_3_B1: .byte BEND , c_v+0 .byte N06 , An1 , v127 .byte W12 @@ -649,7 +649,7 @@ bgm_mgm0_3_B1: .byte W12 .byte Gs1 .byte W12 - .byte VOL , 54*bgm_mgm0_mvl/mxv + .byte VOL , 54*mus_encounter_magma_mvl/mxv .byte BEND , c_v+0 .byte N18 , Dn1 , v127 .byte W18 @@ -678,7 +678,7 @@ bgm_mgm0_3_B1: .byte W06 .byte BEND , c_v+5 .byte W06 - .byte VOL , 58*bgm_mgm0_mvl/mxv + .byte VOL , 58*mus_encounter_magma_mvl/mxv .byte BEND , c_v+0 .byte N18 , Dn1 , v127 .byte W18 @@ -707,7 +707,7 @@ bgm_mgm0_3_B1: .byte W06 .byte BEND , c_v+5 .byte W06 - .byte VOL , 62*bgm_mgm0_mvl/mxv + .byte VOL , 62*mus_encounter_magma_mvl/mxv .byte BEND , c_v+0 .byte N18 , Dn1 , v127 .byte W18 @@ -736,7 +736,7 @@ bgm_mgm0_3_B1: .byte W06 .byte BEND , c_v+5 .byte W06 - .byte VOL , 72*bgm_mgm0_mvl/mxv + .byte VOL , 72*mus_encounter_magma_mvl/mxv .byte BEND , c_v+0 .byte N18 , Dn1 , v127 .byte W18 @@ -774,7 +774,7 @@ bgm_mgm0_3_B1: .byte W06 .byte Fs1 , v112 .byte W54 -bgm_mgm0_3_000: +mus_encounter_magma_3_000: .byte N03 , Fs1 , v127 .byte W06 .byte Fs1 , v112 @@ -789,22 +789,22 @@ bgm_mgm0_3_000: .byte Fs1 , v112 .byte W54 .byte PATT - .word bgm_mgm0_3_000 + .word mus_encounter_magma_3_000 .byte GOTO - .word bgm_mgm0_3_B1 + .word mus_encounter_magma_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_mgm0_4: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_4: + .byte KEYSH , mus_encounter_magma_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 63*bgm_mgm0_mvl/mxv + .byte VOL , 63*mus_encounter_magma_mvl/mxv .byte PAN , c_v-21 .byte W12 -bgm_mgm0_4_B1: +mus_encounter_magma_4_B1: .byte N03 , Fn2 , v112 .byte W03 .byte N03 @@ -891,7 +891,7 @@ bgm_mgm0_4_B1: .byte W06 .byte N03 .byte W06 - .byte VOL , 36*bgm_mgm0_mvl/mxv + .byte VOL , 36*mus_encounter_magma_mvl/mxv .byte N03 , Dn3 .byte W18 .byte N03 @@ -906,7 +906,7 @@ bgm_mgm0_4_B1: .byte W18 .byte N03 .byte W12 - .byte VOL , 42*bgm_mgm0_mvl/mxv + .byte VOL , 42*mus_encounter_magma_mvl/mxv .byte N03 .byte W18 .byte N03 @@ -921,7 +921,7 @@ bgm_mgm0_4_B1: .byte W18 .byte N03 .byte W12 - .byte VOL , 51*bgm_mgm0_mvl/mxv + .byte VOL , 51*mus_encounter_magma_mvl/mxv .byte N03 .byte W18 .byte N03 @@ -936,7 +936,7 @@ bgm_mgm0_4_B1: .byte W18 .byte N03 .byte W12 - .byte VOL , 60*bgm_mgm0_mvl/mxv + .byte VOL , 60*mus_encounter_magma_mvl/mxv .byte N03 .byte W18 .byte N03 @@ -951,7 +951,7 @@ bgm_mgm0_4_B1: .byte W18 .byte N03 .byte W12 - .byte VOL , 64*bgm_mgm0_mvl/mxv + .byte VOL , 64*mus_encounter_magma_mvl/mxv .byte W48 .byte N06 , An3 .byte W06 @@ -981,20 +981,20 @@ bgm_mgm0_4_B1: .byte W12 .byte W96 .byte GOTO - .word bgm_mgm0_4_B1 + .word mus_encounter_magma_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_mgm0_5: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_5: + .byte KEYSH , mus_encounter_magma_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 57*bgm_mgm0_mvl/mxv + .byte VOL , 57*mus_encounter_magma_mvl/mxv .byte PAN , c_v+31 .byte W12 -bgm_mgm0_5_B1: +mus_encounter_magma_5_B1: .byte W96 .byte W96 .byte W48 @@ -1024,7 +1024,7 @@ bgm_mgm0_5_B1: .byte N03 .byte W06 .byte VOICE , 47 - .byte VOL , 36*bgm_mgm0_mvl/mxv + .byte VOL , 36*mus_encounter_magma_mvl/mxv .byte N06 , Dn2 .byte W18 .byte N06 @@ -1039,7 +1039,7 @@ bgm_mgm0_5_B1: .byte W18 .byte N06 .byte W12 - .byte VOL , 44*bgm_mgm0_mvl/mxv + .byte VOL , 44*mus_encounter_magma_mvl/mxv .byte N06 .byte W18 .byte N06 @@ -1054,7 +1054,7 @@ bgm_mgm0_5_B1: .byte W18 .byte N06 .byte W12 - .byte VOL , 51*bgm_mgm0_mvl/mxv + .byte VOL , 51*mus_encounter_magma_mvl/mxv .byte N06 .byte W18 .byte N06 @@ -1069,7 +1069,7 @@ bgm_mgm0_5_B1: .byte W18 .byte N06 .byte W12 - .byte VOL , 58*bgm_mgm0_mvl/mxv + .byte VOL , 58*mus_encounter_magma_mvl/mxv .byte N06 .byte W18 .byte N06 @@ -1084,7 +1084,7 @@ bgm_mgm0_5_B1: .byte W18 .byte N06 .byte W12 -bgm_mgm0_5_000: +mus_encounter_magma_5_000: .byte N06 , Fs2 , v112 .byte W06 .byte N03 @@ -1106,36 +1106,36 @@ bgm_mgm0_5_000: .byte N12 , Dn3 .byte W12 .byte PEND -bgm_mgm0_5_001: +mus_encounter_magma_5_001: .byte N03 , Fs2 , v112 .byte W06 .byte N03 .byte W90 .byte PEND .byte PATT - .word bgm_mgm0_5_000 + .word mus_encounter_magma_5_000 .byte PATT - .word bgm_mgm0_5_001 + .word mus_encounter_magma_5_001 .byte GOTO - .word bgm_mgm0_5_B1 + .word mus_encounter_magma_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_mgm0_6: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_6: + .byte KEYSH , mus_encounter_magma_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-58 - .byte VOL , 36*bgm_mgm0_mvl/mxv + .byte VOL , 36*mus_encounter_magma_mvl/mxv .byte N06 , Dn3 , v112 .byte W06 .byte An2 .byte W06 -bgm_mgm0_6_B1: +mus_encounter_magma_6_B1: .byte BEND , c_v+0 .byte N06 , An2 , v112 .byte W06 @@ -1159,66 +1159,66 @@ bgm_mgm0_6_B1: .byte W12 .byte N12 , En3 .byte W12 -bgm_mgm0_6_000: - .byte VOL , 6*bgm_mgm0_mvl/mxv +mus_encounter_magma_6_000: + .byte VOL , 6*mus_encounter_magma_mvl/mxv .byte N96 , Fn4 , v112 .byte W05 - .byte VOL , 8*bgm_mgm0_mvl/mxv + .byte VOL , 8*mus_encounter_magma_mvl/mxv .byte W07 - .byte 9*bgm_mgm0_mvl/mxv + .byte 9*mus_encounter_magma_mvl/mxv .byte W02 - .byte 10*bgm_mgm0_mvl/mxv + .byte 10*mus_encounter_magma_mvl/mxv .byte W06 - .byte 13*bgm_mgm0_mvl/mxv + .byte 13*mus_encounter_magma_mvl/mxv .byte W04 - .byte 13*bgm_mgm0_mvl/mxv + .byte 13*mus_encounter_magma_mvl/mxv .byte W02 - .byte 15*bgm_mgm0_mvl/mxv + .byte 15*mus_encounter_magma_mvl/mxv .byte W03 - .byte 17*bgm_mgm0_mvl/mxv + .byte 17*mus_encounter_magma_mvl/mxv .byte W03 - .byte 18*bgm_mgm0_mvl/mxv + .byte 18*mus_encounter_magma_mvl/mxv .byte W04 - .byte 19*bgm_mgm0_mvl/mxv + .byte 19*mus_encounter_magma_mvl/mxv .byte W02 - .byte 20*bgm_mgm0_mvl/mxv + .byte 20*mus_encounter_magma_mvl/mxv .byte W03 - .byte 22*bgm_mgm0_mvl/mxv + .byte 22*mus_encounter_magma_mvl/mxv .byte W03 - .byte 24*bgm_mgm0_mvl/mxv + .byte 24*mus_encounter_magma_mvl/mxv .byte W04 - .byte 24*bgm_mgm0_mvl/mxv + .byte 24*mus_encounter_magma_mvl/mxv .byte W02 - .byte 28*bgm_mgm0_mvl/mxv + .byte 28*mus_encounter_magma_mvl/mxv .byte W03 - .byte 32*bgm_mgm0_mvl/mxv + .byte 32*mus_encounter_magma_mvl/mxv .byte W07 - .byte 34*bgm_mgm0_mvl/mxv + .byte 34*mus_encounter_magma_mvl/mxv .byte W02 - .byte 37*bgm_mgm0_mvl/mxv + .byte 37*mus_encounter_magma_mvl/mxv .byte W03 - .byte 38*bgm_mgm0_mvl/mxv + .byte 38*mus_encounter_magma_mvl/mxv .byte W03 - .byte 40*bgm_mgm0_mvl/mxv + .byte 40*mus_encounter_magma_mvl/mxv .byte W04 - .byte 42*bgm_mgm0_mvl/mxv + .byte 42*mus_encounter_magma_mvl/mxv .byte W02 - .byte 44*bgm_mgm0_mvl/mxv + .byte 44*mus_encounter_magma_mvl/mxv .byte W03 - .byte 47*bgm_mgm0_mvl/mxv + .byte 47*mus_encounter_magma_mvl/mxv .byte W03 - .byte 49*bgm_mgm0_mvl/mxv + .byte 49*mus_encounter_magma_mvl/mxv .byte W04 - .byte 51*bgm_mgm0_mvl/mxv + .byte 51*mus_encounter_magma_mvl/mxv .byte W02 - .byte 53*bgm_mgm0_mvl/mxv + .byte 53*mus_encounter_magma_mvl/mxv .byte W03 - .byte 54*bgm_mgm0_mvl/mxv + .byte 54*mus_encounter_magma_mvl/mxv .byte W03 - .byte 56*bgm_mgm0_mvl/mxv + .byte 56*mus_encounter_magma_mvl/mxv .byte W04 .byte PEND - .byte 36*bgm_mgm0_mvl/mxv + .byte 36*mus_encounter_magma_mvl/mxv .byte N03 , Gn4 .byte W12 .byte Dn4 @@ -1248,8 +1248,8 @@ bgm_mgm0_6_000: .byte N06 , An3 .byte W12 .byte PATT - .word bgm_mgm0_6_000 - .byte VOL , 36*bgm_mgm0_mvl/mxv + .word mus_encounter_magma_6_000 + .byte VOL , 36*mus_encounter_magma_mvl/mxv .byte N03 , Gn4 , v112 .byte W12 .byte Dn4 @@ -1295,7 +1295,7 @@ bgm_mgm0_6_000: .byte W06 .byte An4 .byte W12 -bgm_mgm0_6_001: +mus_encounter_magma_6_001: .byte N03 , Dn5 , v092 .byte W12 .byte Fn5 @@ -1334,8 +1334,8 @@ bgm_mgm0_6_001: .byte An4 .byte W12 .byte PATT - .word bgm_mgm0_6_001 -bgm_mgm0_6_002: + .word mus_encounter_magma_6_001 +mus_encounter_magma_6_002: .byte N06 , Fs2 , v112 .byte W06 .byte N03 @@ -1358,7 +1358,7 @@ bgm_mgm0_6_002: .byte Gs2 .byte W42 .byte PATT - .word bgm_mgm0_6_002 + .word mus_encounter_magma_6_002 .byte N03 , Fs2 , v112 .byte W06 .byte N03 @@ -1381,25 +1381,25 @@ bgm_mgm0_6_002: .byte Cs4 .byte W06 .byte GOTO - .word bgm_mgm0_6_B1 + .word mus_encounter_magma_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_mgm0_7: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_7: + .byte KEYSH , mus_encounter_magma_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 36*bgm_mgm0_mvl/mxv + .byte VOL , 36*mus_encounter_magma_mvl/mxv .byte N06 , Dn4 , v112 .byte W06 .byte En4 .byte W06 -bgm_mgm0_7_B1: +mus_encounter_magma_7_B1: .byte N06 , Fn4 , v112 .byte W06 .byte N03 , En4 @@ -1422,64 +1422,64 @@ bgm_mgm0_7_B1: .byte W12 .byte N12 , Cs4 .byte W12 - .byte VOL , 6*bgm_mgm0_mvl/mxv + .byte VOL , 6*mus_encounter_magma_mvl/mxv .byte N96 , An4 .byte W05 - .byte VOL , 8*bgm_mgm0_mvl/mxv + .byte VOL , 8*mus_encounter_magma_mvl/mxv .byte W07 - .byte 9*bgm_mgm0_mvl/mxv + .byte 9*mus_encounter_magma_mvl/mxv .byte W02 - .byte 10*bgm_mgm0_mvl/mxv + .byte 10*mus_encounter_magma_mvl/mxv .byte W06 - .byte 13*bgm_mgm0_mvl/mxv + .byte 13*mus_encounter_magma_mvl/mxv .byte W04 - .byte 13*bgm_mgm0_mvl/mxv + .byte 13*mus_encounter_magma_mvl/mxv .byte W02 - .byte 15*bgm_mgm0_mvl/mxv + .byte 15*mus_encounter_magma_mvl/mxv .byte W03 - .byte 17*bgm_mgm0_mvl/mxv + .byte 17*mus_encounter_magma_mvl/mxv .byte W03 - .byte 18*bgm_mgm0_mvl/mxv + .byte 18*mus_encounter_magma_mvl/mxv .byte W04 - .byte 19*bgm_mgm0_mvl/mxv + .byte 19*mus_encounter_magma_mvl/mxv .byte W02 - .byte 20*bgm_mgm0_mvl/mxv + .byte 20*mus_encounter_magma_mvl/mxv .byte W03 - .byte 22*bgm_mgm0_mvl/mxv + .byte 22*mus_encounter_magma_mvl/mxv .byte W03 - .byte 24*bgm_mgm0_mvl/mxv + .byte 24*mus_encounter_magma_mvl/mxv .byte W04 - .byte 24*bgm_mgm0_mvl/mxv + .byte 24*mus_encounter_magma_mvl/mxv .byte W02 - .byte 28*bgm_mgm0_mvl/mxv + .byte 28*mus_encounter_magma_mvl/mxv .byte W03 - .byte 32*bgm_mgm0_mvl/mxv + .byte 32*mus_encounter_magma_mvl/mxv .byte W07 - .byte 34*bgm_mgm0_mvl/mxv + .byte 34*mus_encounter_magma_mvl/mxv .byte W02 - .byte 37*bgm_mgm0_mvl/mxv + .byte 37*mus_encounter_magma_mvl/mxv .byte W03 - .byte 38*bgm_mgm0_mvl/mxv + .byte 38*mus_encounter_magma_mvl/mxv .byte W03 - .byte 40*bgm_mgm0_mvl/mxv + .byte 40*mus_encounter_magma_mvl/mxv .byte W04 - .byte 42*bgm_mgm0_mvl/mxv + .byte 42*mus_encounter_magma_mvl/mxv .byte W02 - .byte 44*bgm_mgm0_mvl/mxv + .byte 44*mus_encounter_magma_mvl/mxv .byte W03 - .byte 47*bgm_mgm0_mvl/mxv + .byte 47*mus_encounter_magma_mvl/mxv .byte W03 - .byte 49*bgm_mgm0_mvl/mxv + .byte 49*mus_encounter_magma_mvl/mxv .byte W04 - .byte 51*bgm_mgm0_mvl/mxv + .byte 51*mus_encounter_magma_mvl/mxv .byte W02 - .byte 53*bgm_mgm0_mvl/mxv + .byte 53*mus_encounter_magma_mvl/mxv .byte W03 - .byte 54*bgm_mgm0_mvl/mxv + .byte 54*mus_encounter_magma_mvl/mxv .byte W03 - .byte 56*bgm_mgm0_mvl/mxv + .byte 56*mus_encounter_magma_mvl/mxv .byte W04 - .byte 35*bgm_mgm0_mvl/mxv + .byte 35*mus_encounter_magma_mvl/mxv .byte N03 , Bn4 .byte W12 .byte Gn4 @@ -1508,64 +1508,64 @@ bgm_mgm0_7_B1: .byte W03 .byte N06 , Dn4 .byte W12 - .byte VOL , 6*bgm_mgm0_mvl/mxv + .byte VOL , 6*mus_encounter_magma_mvl/mxv .byte N96 , Cn5 .byte W05 - .byte VOL , 8*bgm_mgm0_mvl/mxv + .byte VOL , 8*mus_encounter_magma_mvl/mxv .byte W07 - .byte 9*bgm_mgm0_mvl/mxv + .byte 9*mus_encounter_magma_mvl/mxv .byte W02 - .byte 10*bgm_mgm0_mvl/mxv + .byte 10*mus_encounter_magma_mvl/mxv .byte W06 - .byte 13*bgm_mgm0_mvl/mxv + .byte 13*mus_encounter_magma_mvl/mxv .byte W04 - .byte 13*bgm_mgm0_mvl/mxv + .byte 13*mus_encounter_magma_mvl/mxv .byte W02 - .byte 15*bgm_mgm0_mvl/mxv + .byte 15*mus_encounter_magma_mvl/mxv .byte W03 - .byte 17*bgm_mgm0_mvl/mxv + .byte 17*mus_encounter_magma_mvl/mxv .byte W03 - .byte 18*bgm_mgm0_mvl/mxv + .byte 18*mus_encounter_magma_mvl/mxv .byte W04 - .byte 19*bgm_mgm0_mvl/mxv + .byte 19*mus_encounter_magma_mvl/mxv .byte W02 - .byte 20*bgm_mgm0_mvl/mxv + .byte 20*mus_encounter_magma_mvl/mxv .byte W03 - .byte 22*bgm_mgm0_mvl/mxv + .byte 22*mus_encounter_magma_mvl/mxv .byte W03 - .byte 24*bgm_mgm0_mvl/mxv + .byte 24*mus_encounter_magma_mvl/mxv .byte W04 - .byte 24*bgm_mgm0_mvl/mxv + .byte 24*mus_encounter_magma_mvl/mxv .byte W02 - .byte 28*bgm_mgm0_mvl/mxv + .byte 28*mus_encounter_magma_mvl/mxv .byte W03 - .byte 32*bgm_mgm0_mvl/mxv + .byte 32*mus_encounter_magma_mvl/mxv .byte W07 - .byte 34*bgm_mgm0_mvl/mxv + .byte 34*mus_encounter_magma_mvl/mxv .byte W02 - .byte 37*bgm_mgm0_mvl/mxv + .byte 37*mus_encounter_magma_mvl/mxv .byte W03 - .byte 38*bgm_mgm0_mvl/mxv + .byte 38*mus_encounter_magma_mvl/mxv .byte W03 - .byte 40*bgm_mgm0_mvl/mxv + .byte 40*mus_encounter_magma_mvl/mxv .byte W04 - .byte 42*bgm_mgm0_mvl/mxv + .byte 42*mus_encounter_magma_mvl/mxv .byte W02 - .byte 44*bgm_mgm0_mvl/mxv + .byte 44*mus_encounter_magma_mvl/mxv .byte W03 - .byte 47*bgm_mgm0_mvl/mxv + .byte 47*mus_encounter_magma_mvl/mxv .byte W03 - .byte 49*bgm_mgm0_mvl/mxv + .byte 49*mus_encounter_magma_mvl/mxv .byte W04 - .byte 51*bgm_mgm0_mvl/mxv + .byte 51*mus_encounter_magma_mvl/mxv .byte W02 - .byte 53*bgm_mgm0_mvl/mxv + .byte 53*mus_encounter_magma_mvl/mxv .byte W03 - .byte 54*bgm_mgm0_mvl/mxv + .byte 54*mus_encounter_magma_mvl/mxv .byte W03 - .byte 56*bgm_mgm0_mvl/mxv + .byte 56*mus_encounter_magma_mvl/mxv .byte W04 - .byte 35*bgm_mgm0_mvl/mxv + .byte 35*mus_encounter_magma_mvl/mxv .byte N03 , Dn5 .byte W12 .byte Bn4 @@ -1594,7 +1594,7 @@ bgm_mgm0_7_B1: .byte W03 .byte N06 , Gn4 .byte W12 -bgm_mgm0_7_000: +mus_encounter_magma_7_000: .byte N03 , Dn5 , v092 .byte W12 .byte Fn5 @@ -1612,7 +1612,7 @@ bgm_mgm0_7_000: .byte An4 .byte W12 .byte PEND -bgm_mgm0_7_001: +mus_encounter_magma_7_001: .byte N03 , Dn5 , v092 .byte W12 .byte Fn5 @@ -1635,10 +1635,10 @@ bgm_mgm0_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_mgm0_7_000 + .word mus_encounter_magma_7_000 .byte PATT - .word bgm_mgm0_7_001 -bgm_mgm0_7_002: + .word mus_encounter_magma_7_001 +mus_encounter_magma_7_002: .byte N06 , En4 , v112 .byte W06 .byte N03 @@ -1673,7 +1673,7 @@ bgm_mgm0_7_002: .byte Bn3 .byte W06 .byte PATT - .word bgm_mgm0_7_002 + .word mus_encounter_magma_7_002 .byte N03 , En4 , v112 .byte W06 .byte N03 @@ -1696,18 +1696,18 @@ bgm_mgm0_7_002: .byte En5 .byte W06 .byte GOTO - .word bgm_mgm0_7_B1 + .word mus_encounter_magma_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_mgm0_8: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_8: + .byte KEYSH , mus_encounter_magma_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 56*bgm_mgm0_mvl/mxv + .byte VOL , 56*mus_encounter_magma_mvl/mxv .byte W12 -bgm_mgm0_8_B1: +mus_encounter_magma_8_B1: .byte W96 .byte W96 .byte W24 @@ -1721,7 +1721,7 @@ bgm_mgm0_8_B1: .byte W96 .byte W96 .byte W96 -bgm_mgm0_8_000: +mus_encounter_magma_8_000: .byte W24 .byte N06 , Cn1 , v112 .byte W24 @@ -1738,7 +1738,7 @@ bgm_mgm0_8_000: .byte N06 .byte W24 .byte PATT - .word bgm_mgm0_8_000 + .word mus_encounter_magma_8_000 .byte W24 .byte N06 , Cn1 , v112 .byte W24 @@ -1747,25 +1747,25 @@ bgm_mgm0_8_000: .byte Cn1 , v112 .byte W24 .byte GOTO - .word bgm_mgm0_8_B1 + .word mus_encounter_magma_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_mgm0_9: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_9: + .byte KEYSH , mus_encounter_magma_key+0 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 34*bgm_mgm0_mvl/mxv + .byte VOL , 34*mus_encounter_magma_mvl/mxv .byte W12 -bgm_mgm0_9_B1: +mus_encounter_magma_9_B1: .byte W96 .byte W96 .byte VOICE , 83 - .byte VOL , 41*bgm_mgm0_mvl/mxv + .byte VOL , 41*mus_encounter_magma_mvl/mxv .byte BEND , c_v+0 .byte W24 .byte N03 , Gn2 , v112 @@ -1819,7 +1819,7 @@ bgm_mgm0_9_B1: .byte N06 , Gn3 .byte W12 .byte VOICE , 29 - .byte VOL , 36*bgm_mgm0_mvl/mxv + .byte VOL , 36*mus_encounter_magma_mvl/mxv .byte BEND , c_v+0 .byte N06 , Dn3 .byte W06 @@ -1873,7 +1873,7 @@ bgm_mgm0_9_B1: .byte W18 .byte N06 , Cs3 .byte W12 - .byte VOL , 36*bgm_mgm0_mvl/mxv + .byte VOL , 36*mus_encounter_magma_mvl/mxv .byte BEND , c_v+0 .byte N06 , Dn3 .byte W06 @@ -1934,7 +1934,7 @@ bgm_mgm0_9_B1: .byte W06 .byte N03 .byte W06 - .byte VOL , 36*bgm_mgm0_mvl/mxv + .byte VOL , 36*mus_encounter_magma_mvl/mxv .byte N06 , As2 .byte W06 .byte N03 @@ -2024,24 +2024,24 @@ bgm_mgm0_9_B1: .byte c_v-54 .byte W04 .byte GOTO - .word bgm_mgm0_9_B1 + .word mus_encounter_magma_9_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 10 **********************@ -bgm_mgm0_10: - .byte KEYSH , bgm_mgm0_key+0 +mus_encounter_magma_10: + .byte KEYSH , mus_encounter_magma_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-18 - .byte VOL , 46*bgm_mgm0_mvl/mxv + .byte VOL , 46*mus_encounter_magma_mvl/mxv .byte N06 , An4 , v112 .byte W06 .byte Bn4 .byte W06 -bgm_mgm0_10_B1: +mus_encounter_magma_10_B1: .byte N03 , Cn5 , v112 .byte W06 .byte Bn4 @@ -2114,7 +2114,7 @@ bgm_mgm0_10_B1: .byte W96 .byte W96 .byte W96 -bgm_mgm0_10_000: +mus_encounter_magma_10_000: .byte N06 , As3 , v112 .byte W06 .byte N03 @@ -2124,7 +2124,7 @@ bgm_mgm0_10_000: .byte N03 .byte W54 .byte PEND - .byte VOL , 45*bgm_mgm0_mvl/mxv + .byte VOL , 45*mus_encounter_magma_mvl/mxv .byte N03 .byte W06 .byte N03 @@ -2136,7 +2136,7 @@ bgm_mgm0_10_000: .byte N12 , Bn3 .byte W12 .byte PATT - .word bgm_mgm0_10_000 + .word mus_encounter_magma_10_000 .byte N03 , As3 , v112 .byte W06 .byte N03 @@ -2159,29 +2159,29 @@ bgm_mgm0_10_000: .byte Cs5 .byte W06 .byte GOTO - .word bgm_mgm0_10_B1 + .word mus_encounter_magma_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_mgm0: +mus_encounter_magma: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_mgm0_pri @ Priority - .byte bgm_mgm0_rev @ Reverb. + .byte mus_encounter_magma_pri @ Priority + .byte mus_encounter_magma_rev @ Reverb. - .word bgm_mgm0_grp + .word mus_encounter_magma_grp - .word bgm_mgm0_1 - .word bgm_mgm0_2 - .word bgm_mgm0_3 - .word bgm_mgm0_4 - .word bgm_mgm0_5 - .word bgm_mgm0_6 - .word bgm_mgm0_7 - .word bgm_mgm0_8 - .word bgm_mgm0_9 - .word bgm_mgm0_10 + .word mus_encounter_magma_1 + .word mus_encounter_magma_2 + .word mus_encounter_magma_3 + .word mus_encounter_magma_4 + .word mus_encounter_magma_5 + .word mus_encounter_magma_6 + .word mus_encounter_magma_7 + .word mus_encounter_magma_8 + .word mus_encounter_magma_9 + .word mus_encounter_magma_10 .end diff --git a/sound/songs/bgm_boyeye.s b/sound/songs/mus_encounter_male.s index 800f30dfc..a7b446603 100644 --- a/sound/songs/bgm_boyeye.s +++ b/sound/songs/mus_encounter_male.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_boyeye_grp, voicegroup025 - .equ bgm_boyeye_pri, 0 - .equ bgm_boyeye_rev, reverb_set+50 - .equ bgm_boyeye_mvl, 127 - .equ bgm_boyeye_key, 0 - .equ bgm_boyeye_tbs, 1 - .equ bgm_boyeye_exg, 0 - .equ bgm_boyeye_cmp, 1 + .equ mus_encounter_male_grp, voicegroup025 + .equ mus_encounter_male_pri, 0 + .equ mus_encounter_male_rev, reverb_set+50 + .equ mus_encounter_male_mvl, 127 + .equ mus_encounter_male_key, 0 + .equ mus_encounter_male_tbs, 1 + .equ mus_encounter_male_exg, 0 + .equ mus_encounter_male_cmp, 1 .section .rodata - .global bgm_boyeye + .global mus_encounter_male .align 2 @********************** Track 1 **********************@ -bgm_boyeye_1: - .byte KEYSH , bgm_boyeye_key+0 - .byte TEMPO , 138*bgm_boyeye_tbs/2 +mus_encounter_male_1: + .byte KEYSH , mus_encounter_male_key+0 + .byte TEMPO , 138*mus_encounter_male_tbs/2 .byte VOICE , 17 .byte LFOS , 40 - .byte VOL , 80*bgm_boyeye_mvl/mxv + .byte VOL , 80*mus_encounter_male_mvl/mxv .byte PAN , c_v+0 .byte N06 , Ds5 , v056 .byte W06 @@ -42,7 +42,7 @@ bgm_boyeye_1: .byte W06 .byte As4 .byte W06 -bgm_boyeye_1_B1: +mus_encounter_male_1_B1: .byte N09 , Cn5 , v080 .byte W18 .byte Ds5 @@ -187,15 +187,15 @@ bgm_boyeye_1_B1: .byte As4 .byte W06 .byte GOTO - .word bgm_boyeye_1_B1 + .word mus_encounter_male_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_boyeye_2: - .byte KEYSH , bgm_boyeye_key+0 +mus_encounter_male_2: + .byte KEYSH , mus_encounter_male_key+0 .byte VOICE , 36 - .byte VOL , 80*bgm_boyeye_mvl/mxv + .byte VOL , 80*mus_encounter_male_mvl/mxv .byte W48 .byte PAN , c_v+8 .byte N06 , Ds1 , v116 @@ -208,7 +208,7 @@ bgm_boyeye_2: .byte W06 .byte N03 .byte W06 -bgm_boyeye_2_B1: +mus_encounter_male_2_B1: .byte N06 , Ds1 , v116 .byte W12 .byte N06 @@ -358,15 +358,15 @@ bgm_boyeye_2_B1: .byte N48 , As0 .byte W48 .byte GOTO - .word bgm_boyeye_2_B1 + .word mus_encounter_male_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_boyeye_3: - .byte KEYSH , bgm_boyeye_key+0 +mus_encounter_male_3: + .byte KEYSH , mus_encounter_male_key+0 .byte VOICE , 56 - .byte VOL , 80*bgm_boyeye_mvl/mxv + .byte VOL , 80*mus_encounter_male_mvl/mxv .byte PAN , c_v-49 .byte BEND , c_v+0 .byte N06 , Gn4 , v068 @@ -381,7 +381,7 @@ bgm_boyeye_3: .byte W06 .byte Gn4 .byte W48 -bgm_boyeye_3_B1: +mus_encounter_male_3_B1: .byte W96 .byte W72 .byte PAN , c_v-8 @@ -391,27 +391,27 @@ bgm_boyeye_3_B1: .byte W12 .byte N84 , Cs3 .byte W12 - .byte VOL , 74*bgm_boyeye_mvl/mxv + .byte VOL , 74*mus_encounter_male_mvl/mxv .byte W12 - .byte 68*bgm_boyeye_mvl/mxv + .byte 68*mus_encounter_male_mvl/mxv .byte W12 - .byte 60*bgm_boyeye_mvl/mxv + .byte 60*mus_encounter_male_mvl/mxv .byte W06 - .byte 52*bgm_boyeye_mvl/mxv + .byte 52*mus_encounter_male_mvl/mxv .byte W06 - .byte 46*bgm_boyeye_mvl/mxv + .byte 46*mus_encounter_male_mvl/mxv .byte W09 - .byte 51*bgm_boyeye_mvl/mxv + .byte 51*mus_encounter_male_mvl/mxv .byte W06 - .byte 56*bgm_boyeye_mvl/mxv + .byte 56*mus_encounter_male_mvl/mxv .byte W06 - .byte 61*bgm_boyeye_mvl/mxv + .byte 61*mus_encounter_male_mvl/mxv .byte W06 - .byte 68*bgm_boyeye_mvl/mxv + .byte 68*mus_encounter_male_mvl/mxv .byte W06 - .byte 75*bgm_boyeye_mvl/mxv + .byte 75*mus_encounter_male_mvl/mxv .byte W06 - .byte 80*bgm_boyeye_mvl/mxv + .byte 80*mus_encounter_male_mvl/mxv .byte W03 .byte N03 , Bn2 .byte W03 @@ -423,20 +423,20 @@ bgm_boyeye_3_B1: .byte W18 .byte N56 , Cs3 .byte W21 - .byte VOL , 77*bgm_boyeye_mvl/mxv + .byte VOL , 77*mus_encounter_male_mvl/mxv .byte W09 - .byte 74*bgm_boyeye_mvl/mxv + .byte 74*mus_encounter_male_mvl/mxv .byte W09 - .byte 63*bgm_boyeye_mvl/mxv + .byte 63*mus_encounter_male_mvl/mxv .byte W06 - .byte 48*bgm_boyeye_mvl/mxv + .byte 48*mus_encounter_male_mvl/mxv .byte W06 - .byte 35*bgm_boyeye_mvl/mxv + .byte 35*mus_encounter_male_mvl/mxv .byte W03 - .byte 18*bgm_boyeye_mvl/mxv + .byte 18*mus_encounter_male_mvl/mxv .byte W06 .byte W48 - .byte 80*bgm_boyeye_mvl/mxv + .byte 80*mus_encounter_male_mvl/mxv .byte N12 , Fn3 .byte W18 .byte Dn3 @@ -449,11 +449,11 @@ bgm_boyeye_3_B1: .byte W18 .byte N18 , Fn3 .byte W09 - .byte VOL , 74*bgm_boyeye_mvl/mxv + .byte VOL , 74*mus_encounter_male_mvl/mxv .byte W03 - .byte 51*bgm_boyeye_mvl/mxv + .byte 51*mus_encounter_male_mvl/mxv .byte W06 - .byte 80*bgm_boyeye_mvl/mxv + .byte 80*mus_encounter_male_mvl/mxv .byte N03 , Cn3 .byte W12 .byte N03 @@ -474,15 +474,15 @@ bgm_boyeye_3_B1: .byte Dn3 .byte W48 .byte GOTO - .word bgm_boyeye_3_B1 + .word mus_encounter_male_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_boyeye_4: - .byte KEYSH , bgm_boyeye_key+0 +mus_encounter_male_4: + .byte KEYSH , mus_encounter_male_key+0 .byte VOICE , 80 - .byte VOL , 80*bgm_boyeye_mvl/mxv + .byte VOL , 80*mus_encounter_male_mvl/mxv .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte PAN , c_v+0 @@ -498,7 +498,7 @@ bgm_boyeye_4: .byte W06 .byte As5 .byte W48 -bgm_boyeye_4_B1: +mus_encounter_male_4_B1: .byte VOICE , 82 .byte PAN , c_v+0 .byte N09 , Gn4 , v052 @@ -643,15 +643,15 @@ bgm_boyeye_4_B1: .byte As4 .byte W48 .byte GOTO - .word bgm_boyeye_4_B1 + .word mus_encounter_male_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_boyeye_5: - .byte KEYSH , bgm_boyeye_key+0 +mus_encounter_male_5: + .byte KEYSH , mus_encounter_male_key+0 .byte VOICE , 56 - .byte VOL , 80*bgm_boyeye_mvl/mxv + .byte VOL , 80*mus_encounter_male_mvl/mxv .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte PAN , c_v+48 @@ -667,7 +667,7 @@ bgm_boyeye_5: .byte W06 .byte Ds4 .byte W48 -bgm_boyeye_5_B1: +mus_encounter_male_5_B1: .byte VOICE , 2 .byte PAN , c_v+47 .byte N03 , Ds3 , v060 @@ -877,15 +877,15 @@ bgm_boyeye_5_B1: .byte Fn4 .byte W48 .byte GOTO - .word bgm_boyeye_5_B1 + .word mus_encounter_male_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_boyeye_6: - .byte KEYSH , bgm_boyeye_key+0 +mus_encounter_male_6: + .byte KEYSH , mus_encounter_male_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_boyeye_mvl/mxv + .byte VOL , 80*mus_encounter_male_mvl/mxv .byte PAN , c_v+0 .byte W72 .byte N06 , Ds4 , v048 @@ -896,7 +896,7 @@ bgm_boyeye_6: .byte W06 .byte As4 .byte W06 -bgm_boyeye_6_B1: +mus_encounter_male_6_B1: .byte N09 , Cn5 , v048 .byte W18 .byte Ds5 @@ -1041,15 +1041,15 @@ bgm_boyeye_6_B1: .byte As4 .byte W06 .byte GOTO - .word bgm_boyeye_6_B1 + .word mus_encounter_male_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_boyeye_7: - .byte KEYSH , bgm_boyeye_key+0 +mus_encounter_male_7: + .byte KEYSH , mus_encounter_male_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_boyeye_mvl/mxv + .byte VOL , 80*mus_encounter_male_mvl/mxv .byte N48 , An2 , v080 .byte W72 .byte N06 , En1 , v064 @@ -1060,7 +1060,7 @@ bgm_boyeye_7: .byte W06 .byte En1 , v104 .byte W06 -bgm_boyeye_7_B1: +mus_encounter_male_7_B1: .byte N06 , Cn1 , v120 .byte N96 , An2 , v080 .byte W12 @@ -1086,7 +1086,7 @@ bgm_boyeye_7_B1: .byte W06 .byte N06 .byte W06 -bgm_boyeye_7_000: +mus_encounter_male_7_000: .byte N06 , Cn1 , v120 .byte W12 .byte Fs1 , v060 @@ -1137,7 +1137,7 @@ bgm_boyeye_7_000: .byte N06 .byte W06 .byte PATT - .word bgm_boyeye_7_000 + .word mus_encounter_male_7_000 .byte N06 , Cn1 , v120 .byte N48 , An2 , v080 .byte W12 @@ -1164,7 +1164,7 @@ bgm_boyeye_7_000: .byte N06 .byte W06 .byte PATT - .word bgm_boyeye_7_000 + .word mus_encounter_male_7_000 .byte N06 , En1 , v112 .byte N96 , An2 , v080 .byte W12 @@ -1213,26 +1213,26 @@ bgm_boyeye_7_000: .byte N06 .byte W06 .byte GOTO - .word bgm_boyeye_7_B1 + .word mus_encounter_male_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_boyeye: +mus_encounter_male: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_boyeye_pri @ Priority - .byte bgm_boyeye_rev @ Reverb. + .byte mus_encounter_male_pri @ Priority + .byte mus_encounter_male_rev @ Reverb. - .word bgm_boyeye_grp + .word mus_encounter_male_grp - .word bgm_boyeye_1 - .word bgm_boyeye_2 - .word bgm_boyeye_3 - .word bgm_boyeye_4 - .word bgm_boyeye_5 - .word bgm_boyeye_6 - .word bgm_boyeye_7 + .word mus_encounter_male_1 + .word mus_encounter_male_2 + .word mus_encounter_male_3 + .word mus_encounter_male_4 + .word mus_encounter_male_5 + .word mus_encounter_male_6 + .word mus_encounter_male_7 .end diff --git a/sound/songs/bgm_girl_sup.s b/sound/songs/mus_encounter_may.s index 07b496f6c..1bfbb38a3 100644 --- a/sound/songs/bgm_girl_sup.s +++ b/sound/songs/mus_encounter_may.s @@ -1,37 +1,37 @@ .include "MPlayDef.s" - .equ bgm_girl_sup_grp, voicegroup058 - .equ bgm_girl_sup_pri, 0 - .equ bgm_girl_sup_rev, reverb_set+50 - .equ bgm_girl_sup_mvl, 127 - .equ bgm_girl_sup_key, 0 - .equ bgm_girl_sup_tbs, 1 - .equ bgm_girl_sup_exg, 0 - .equ bgm_girl_sup_cmp, 1 + .equ mus_encounter_may_grp, voicegroup058 + .equ mus_encounter_may_pri, 0 + .equ mus_encounter_may_rev, reverb_set+50 + .equ mus_encounter_may_mvl, 127 + .equ mus_encounter_may_key, 0 + .equ mus_encounter_may_tbs, 1 + .equ mus_encounter_may_exg, 0 + .equ mus_encounter_may_cmp, 1 .section .rodata - .global bgm_girl_sup + .global mus_encounter_may .align 2 @********************** Track 1 **********************@ -bgm_girl_sup_1: - .byte KEYSH , bgm_girl_sup_key+0 - .byte TEMPO , 128*bgm_girl_sup_tbs/2 +mus_encounter_may_1: + .byte KEYSH , mus_encounter_may_key+0 + .byte TEMPO , 128*mus_encounter_may_tbs/2 .byte VOICE , 17 .byte PAN , c_v+0 - .byte VOL , 39*bgm_girl_sup_mvl/mxv + .byte VOL , 39*mus_encounter_may_mvl/mxv .byte LFOS , 44 .byte W96 .byte W72 - .byte VOL , 43*bgm_girl_sup_mvl/mxv + .byte VOL , 43*mus_encounter_may_mvl/mxv .byte W12 .byte N06 , Cs5 , v112 .byte W06 .byte Ds5 .byte W06 -bgm_girl_sup_1_B1: - .byte VOL , 43*bgm_girl_sup_mvl/mxv +mus_encounter_may_1_B1: + .byte VOL , 43*mus_encounter_may_mvl/mxv .byte N06 , Fn5 , v112 .byte W12 .byte Fs5 @@ -175,30 +175,30 @@ bgm_girl_sup_1_B1: .byte W12 .byte VOICE , 73 .byte W12 - .byte VOL , 18*bgm_girl_sup_mvl/mxv + .byte VOL , 18*mus_encounter_may_mvl/mxv .byte N36 , Fn5 .byte W02 - .byte VOL , 19*bgm_girl_sup_mvl/mxv + .byte VOL , 19*mus_encounter_may_mvl/mxv .byte W03 - .byte 21*bgm_girl_sup_mvl/mxv + .byte 21*mus_encounter_may_mvl/mxv .byte W03 - .byte 22*bgm_girl_sup_mvl/mxv + .byte 22*mus_encounter_may_mvl/mxv .byte W04 - .byte 27*bgm_girl_sup_mvl/mxv + .byte 27*mus_encounter_may_mvl/mxv .byte W02 - .byte 31*bgm_girl_sup_mvl/mxv + .byte 31*mus_encounter_may_mvl/mxv .byte W03 - .byte 38*bgm_girl_sup_mvl/mxv + .byte 38*mus_encounter_may_mvl/mxv .byte W03 - .byte 42*bgm_girl_sup_mvl/mxv + .byte 42*mus_encounter_may_mvl/mxv .byte W04 - .byte 47*bgm_girl_sup_mvl/mxv + .byte 47*mus_encounter_may_mvl/mxv .byte W02 - .byte 51*bgm_girl_sup_mvl/mxv + .byte 51*mus_encounter_may_mvl/mxv .byte W03 - .byte 53*bgm_girl_sup_mvl/mxv + .byte 53*mus_encounter_may_mvl/mxv .byte W07 - .byte 39*bgm_girl_sup_mvl/mxv + .byte 39*mus_encounter_may_mvl/mxv .byte N06 , As4 .byte W06 .byte N06 @@ -211,30 +211,30 @@ bgm_girl_sup_1_B1: .byte W06 .byte N18 , Ds5 .byte W18 - .byte VOL , 18*bgm_girl_sup_mvl/mxv + .byte VOL , 18*mus_encounter_may_mvl/mxv .byte N36 , Fn5 .byte W02 - .byte VOL , 19*bgm_girl_sup_mvl/mxv + .byte VOL , 19*mus_encounter_may_mvl/mxv .byte W03 - .byte 21*bgm_girl_sup_mvl/mxv + .byte 21*mus_encounter_may_mvl/mxv .byte W03 - .byte 22*bgm_girl_sup_mvl/mxv + .byte 22*mus_encounter_may_mvl/mxv .byte W04 - .byte 27*bgm_girl_sup_mvl/mxv + .byte 27*mus_encounter_may_mvl/mxv .byte W02 - .byte 31*bgm_girl_sup_mvl/mxv + .byte 31*mus_encounter_may_mvl/mxv .byte W03 - .byte 38*bgm_girl_sup_mvl/mxv + .byte 38*mus_encounter_may_mvl/mxv .byte W03 - .byte 42*bgm_girl_sup_mvl/mxv + .byte 42*mus_encounter_may_mvl/mxv .byte W04 - .byte 47*bgm_girl_sup_mvl/mxv + .byte 47*mus_encounter_may_mvl/mxv .byte W02 - .byte 51*bgm_girl_sup_mvl/mxv + .byte 51*mus_encounter_may_mvl/mxv .byte W03 - .byte 53*bgm_girl_sup_mvl/mxv + .byte 53*mus_encounter_may_mvl/mxv .byte W13 - .byte 39*bgm_girl_sup_mvl/mxv + .byte 39*mus_encounter_may_mvl/mxv .byte N06 , Gs4 .byte W06 .byte Cs5 @@ -343,7 +343,7 @@ bgm_girl_sup_1_B1: .byte W03 .byte Cs5 .byte W03 - .byte VOL , 29*bgm_girl_sup_mvl/mxv + .byte VOL , 29*mus_encounter_may_mvl/mxv .byte W03 .byte VOICE , 17 .byte N03 , Gn5 , v076 @@ -383,20 +383,20 @@ bgm_girl_sup_1_B1: .byte Ds5 .byte W06 .byte GOTO - .word bgm_girl_sup_1_B1 + .word mus_encounter_may_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_girl_sup_2: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_2: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 126 - .byte VOL , 36*bgm_girl_sup_mvl/mxv + .byte VOL , 36*mus_encounter_may_mvl/mxv .byte PAN , c_v+63 .byte W60 .byte N12 , Gn4 , v112 .byte W36 -bgm_girl_sup_2_000: +mus_encounter_may_2_000: .byte W12 .byte N12 , Gn4 , v064 .byte W24 @@ -405,8 +405,8 @@ bgm_girl_sup_2_000: .byte Gn4 , v112 .byte W36 .byte PEND -bgm_girl_sup_2_B1: -bgm_girl_sup_2_001: +mus_encounter_may_2_B1: +mus_encounter_may_2_001: .byte W24 .byte N06 , Gn4 , v112 .byte W60 @@ -414,20 +414,20 @@ bgm_girl_sup_2_001: .byte W12 .byte PEND .byte PATT - .word bgm_girl_sup_2_001 + .word mus_encounter_may_2_001 .byte PATT - .word bgm_girl_sup_2_001 + .word mus_encounter_may_2_001 .byte PATT - .word bgm_girl_sup_2_001 + .word mus_encounter_may_2_001 .byte PATT - .word bgm_girl_sup_2_001 + .word mus_encounter_may_2_001 .byte PATT - .word bgm_girl_sup_2_001 + .word mus_encounter_may_2_001 .byte PATT - .word bgm_girl_sup_2_001 + .word mus_encounter_may_2_001 .byte PATT - .word bgm_girl_sup_2_001 -bgm_girl_sup_2_002: + .word mus_encounter_may_2_001 +mus_encounter_may_2_002: .byte W12 .byte N06 , Gn4 , v112 .byte W36 @@ -437,31 +437,31 @@ bgm_girl_sup_2_002: .byte W12 .byte PEND .byte PATT - .word bgm_girl_sup_2_002 + .word mus_encounter_may_2_002 .byte PATT - .word bgm_girl_sup_2_002 + .word mus_encounter_may_2_002 .byte PATT - .word bgm_girl_sup_2_002 + .word mus_encounter_may_2_002 .byte PATT - .word bgm_girl_sup_2_002 + .word mus_encounter_may_2_002 .byte PATT - .word bgm_girl_sup_2_002 + .word mus_encounter_may_2_002 .byte W60 .byte N12 , Gn4 , v112 .byte W36 .byte PATT - .word bgm_girl_sup_2_000 + .word mus_encounter_may_2_000 .byte GOTO - .word bgm_girl_sup_2_B1 + .word mus_encounter_may_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_girl_sup_3: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_3: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 36 .byte PAN , c_v+0 - .byte VOL , 78*bgm_girl_sup_mvl/mxv + .byte VOL , 78*mus_encounter_may_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte BEND , c_v+0 @@ -517,7 +517,7 @@ bgm_girl_sup_3: .byte W06 .byte BEND , c_v+0 .byte W18 -bgm_girl_sup_3_B1: +mus_encounter_may_3_B1: .byte N18 , Cs1 , v112 .byte W18 .byte N03 @@ -837,15 +837,15 @@ bgm_girl_sup_3_B1: .byte BEND , c_v+0 .byte W18 .byte GOTO - .word bgm_girl_sup_3_B1 + .word mus_encounter_may_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_girl_sup_4: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_4: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 56 - .byte VOL , 70*bgm_girl_sup_mvl/mxv + .byte VOL , 70*mus_encounter_may_mvl/mxv .byte PAN , c_v+0 .byte LFOS , 44 .byte N03 , Fn4 , v112 @@ -891,7 +891,7 @@ bgm_girl_sup_4: .byte W03 .byte Ds4 .byte W12 -bgm_girl_sup_4_B1: +mus_encounter_may_4_B1: .byte W96 .byte W96 .byte W96 @@ -901,7 +901,7 @@ bgm_girl_sup_4_B1: .byte W96 .byte W96 .byte PAN , c_v+32 - .byte VOL , 51*bgm_girl_sup_mvl/mxv + .byte VOL , 51*mus_encounter_may_mvl/mxv .byte N03 , Fn4 , v112 .byte W06 .byte N03 @@ -928,7 +928,7 @@ bgm_girl_sup_4_B1: .byte W06 .byte N12 , Ds4 .byte W18 - .byte VOL , 51*bgm_girl_sup_mvl/mxv + .byte VOL , 51*mus_encounter_may_mvl/mxv .byte N03 , Fn4 .byte W06 .byte N03 @@ -985,7 +985,7 @@ bgm_girl_sup_4_B1: .byte W12 .byte N03 , Ds4 .byte W12 - .byte VOL , 51*bgm_girl_sup_mvl/mxv + .byte VOL , 51*mus_encounter_may_mvl/mxv .byte N06 , Bn3 .byte W06 .byte As3 @@ -1084,15 +1084,15 @@ bgm_girl_sup_4_B1: .byte Ds4 , v056 .byte W12 .byte GOTO - .word bgm_girl_sup_4_B1 + .word mus_encounter_may_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_girl_sup_5: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_5: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 56 - .byte VOL , 66*bgm_girl_sup_mvl/mxv + .byte VOL , 66*mus_encounter_may_mvl/mxv .byte PAN , c_v-26 .byte LFOS , 44 .byte N03 , As3 , v112 @@ -1138,7 +1138,7 @@ bgm_girl_sup_5: .byte W03 .byte As3 .byte W12 -bgm_girl_sup_5_B1: +mus_encounter_may_5_B1: .byte W96 .byte W96 .byte W96 @@ -1156,15 +1156,15 @@ bgm_girl_sup_5_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_girl_sup_5_B1 + .word mus_encounter_may_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_girl_sup_6: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_6: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 127 - .byte VOL , 36*bgm_girl_sup_mvl/mxv + .byte VOL , 36*mus_encounter_may_mvl/mxv .byte PAN , c_v+63 .byte N03 , En4 , v112 .byte W12 @@ -1182,7 +1182,7 @@ bgm_girl_sup_6: .byte W12 .byte N03 .byte W12 -bgm_girl_sup_6_000: +mus_encounter_may_6_000: .byte N03 , En4 , v112 .byte W24 .byte En4 , v064 @@ -1192,8 +1192,8 @@ bgm_girl_sup_6_000: .byte En4 , v080 .byte W42 .byte PEND -bgm_girl_sup_6_B1: -bgm_girl_sup_6_001: +mus_encounter_may_6_B1: +mus_encounter_may_6_001: .byte N03 , En4 , v112 .byte W06 .byte En4 , v064 @@ -1222,20 +1222,20 @@ bgm_girl_sup_6_001: .byte W18 .byte PEND .byte PATT - .word bgm_girl_sup_6_001 + .word mus_encounter_may_6_001 .byte PATT - .word bgm_girl_sup_6_001 + .word mus_encounter_may_6_001 .byte PATT - .word bgm_girl_sup_6_001 + .word mus_encounter_may_6_001 .byte PATT - .word bgm_girl_sup_6_001 + .word mus_encounter_may_6_001 .byte PATT - .word bgm_girl_sup_6_001 + .word mus_encounter_may_6_001 .byte PATT - .word bgm_girl_sup_6_001 + .word mus_encounter_may_6_001 .byte PATT - .word bgm_girl_sup_6_001 -bgm_girl_sup_6_002: + .word mus_encounter_may_6_001 +mus_encounter_may_6_002: .byte N03 , En4 , v112 .byte W06 .byte En4 , v064 @@ -1260,15 +1260,15 @@ bgm_girl_sup_6_002: .byte W18 .byte PEND .byte PATT - .word bgm_girl_sup_6_002 + .word mus_encounter_may_6_002 .byte PATT - .word bgm_girl_sup_6_002 + .word mus_encounter_may_6_002 .byte PATT - .word bgm_girl_sup_6_002 + .word mus_encounter_may_6_002 .byte PATT - .word bgm_girl_sup_6_002 + .word mus_encounter_may_6_002 .byte PATT - .word bgm_girl_sup_6_002 + .word mus_encounter_may_6_002 .byte N03 , En4 , v112 .byte W12 .byte En4 , v064 @@ -1286,18 +1286,18 @@ bgm_girl_sup_6_002: .byte N03 .byte W12 .byte PATT - .word bgm_girl_sup_6_000 + .word mus_encounter_may_6_000 .byte GOTO - .word bgm_girl_sup_6_B1 + .word mus_encounter_may_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_girl_sup_7: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_7: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 80 .byte PAN , c_v-62 - .byte VOL , 39*bgm_girl_sup_mvl/mxv + .byte VOL , 39*mus_encounter_may_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 @@ -1319,7 +1319,7 @@ bgm_girl_sup_7: .byte W12 .byte Cn3 .byte W12 -bgm_girl_sup_7_000: +mus_encounter_may_7_000: .byte W12 .byte N06 , Cs3 , v112 .byte W24 @@ -1330,7 +1330,7 @@ bgm_girl_sup_7_000: .byte Gs3 .byte W24 .byte PEND -bgm_girl_sup_7_B1: +mus_encounter_may_7_B1: .byte N24 , Fn3 , v112 .byte W30 .byte N06 @@ -1339,7 +1339,7 @@ bgm_girl_sup_7_B1: .byte W06 .byte N24 , Fn3 .byte W48 -bgm_girl_sup_7_001: +mus_encounter_may_7_001: .byte N30 , Fn3 , v112 .byte W30 .byte N03 , Fs3 , v096 @@ -1359,7 +1359,7 @@ bgm_girl_sup_7_001: .byte N03 , Gs3 , v096 .byte W03 .byte PEND -bgm_girl_sup_7_002: +mus_encounter_may_7_002: .byte N24 , As3 , v112 .byte W30 .byte N06 , Fs3 @@ -1430,9 +1430,9 @@ bgm_girl_sup_7_002: .byte Fs3 .byte W06 .byte PATT - .word bgm_girl_sup_7_001 + .word mus_encounter_may_7_001 .byte PATT - .word bgm_girl_sup_7_002 + .word mus_encounter_may_7_002 .byte N03 , Ds3 , v112 .byte W06 .byte Cn3 @@ -1469,7 +1469,7 @@ bgm_girl_sup_7_002: .byte W04 .byte Ds3 .byte W04 - .byte VOL , 27*bgm_girl_sup_mvl/mxv + .byte VOL , 27*mus_encounter_may_mvl/mxv .byte BEND , c_v+4 .byte N03 , Fn4 .byte W06 @@ -1497,7 +1497,7 @@ bgm_girl_sup_7_002: .byte W06 .byte N12 , Ds4 .byte W18 - .byte VOL , 27*bgm_girl_sup_mvl/mxv + .byte VOL , 27*mus_encounter_may_mvl/mxv .byte N03 , Fn4 .byte W06 .byte N03 @@ -1608,7 +1608,7 @@ bgm_girl_sup_7_002: .byte W06 .byte En4 .byte W06 - .byte VOL , 39*bgm_girl_sup_mvl/mxv + .byte VOL , 39*mus_encounter_may_mvl/mxv .byte BEND , c_v+0 .byte N03 , As2 .byte W06 @@ -1629,18 +1629,18 @@ bgm_girl_sup_7_002: .byte Cn3 .byte W12 .byte PATT - .word bgm_girl_sup_7_000 + .word mus_encounter_may_7_000 .byte GOTO - .word bgm_girl_sup_7_B1 + .word mus_encounter_may_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_girl_sup_8: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_8: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 81 .byte PAN , c_v+63 - .byte VOL , 39*bgm_girl_sup_mvl/mxv + .byte VOL , 39*mus_encounter_may_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 @@ -1671,8 +1671,8 @@ bgm_girl_sup_8: .byte W12 .byte Cn4 .byte W24 -bgm_girl_sup_8_B1: -bgm_girl_sup_8_000: +mus_encounter_may_8_B1: +mus_encounter_may_8_000: .byte N24 , Cs4 , v112 .byte W30 .byte N06 @@ -1686,7 +1686,7 @@ bgm_girl_sup_8_000: .byte Cn4 .byte W06 .byte PEND -bgm_girl_sup_8_001: +mus_encounter_may_8_001: .byte N30 , Bn3 , v112 .byte W30 .byte N03 , Cs4 , v096 @@ -1710,7 +1710,7 @@ bgm_girl_sup_8_001: .byte N03 , Ds4 , v096 .byte W03 .byte PEND -bgm_girl_sup_8_002: +mus_encounter_may_8_002: .byte N24 , Fs4 , v112 .byte W30 .byte N06 , Cs4 @@ -1769,11 +1769,11 @@ bgm_girl_sup_8_002: .byte Cn4 .byte W03 .byte PATT - .word bgm_girl_sup_8_000 + .word mus_encounter_may_8_000 .byte PATT - .word bgm_girl_sup_8_001 + .word mus_encounter_may_8_001 .byte PATT - .word bgm_girl_sup_8_002 + .word mus_encounter_may_8_002 .byte N03 , Cn4 , v112 .byte W06 .byte Gs3 @@ -1990,16 +1990,16 @@ bgm_girl_sup_8_002: .byte As3 , v044 .byte W12 .byte GOTO - .word bgm_girl_sup_8_B1 + .word mus_encounter_may_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_girl_sup_9: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_9: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 70*bgm_girl_sup_mvl/mxv + .byte VOL , 70*mus_encounter_may_mvl/mxv .byte N06 , En1 , v112 .byte W06 .byte N06 @@ -2022,7 +2022,7 @@ bgm_girl_sup_9: .byte W06 .byte N06 .byte W06 -bgm_girl_sup_9_000: +mus_encounter_may_9_000: .byte N06 , Cn1 , v112 .byte W12 .byte En1 @@ -2040,8 +2040,8 @@ bgm_girl_sup_9_000: .byte N24 , An2 .byte W24 .byte PEND -bgm_girl_sup_9_B1: -bgm_girl_sup_9_001: +mus_encounter_may_9_B1: +mus_encounter_may_9_001: .byte N06 , Cn1 , v112 .byte W24 .byte En1 @@ -2060,9 +2060,9 @@ bgm_girl_sup_9_001: .byte W06 .byte PEND .byte PATT - .word bgm_girl_sup_9_001 + .word mus_encounter_may_9_001 .byte PATT - .word bgm_girl_sup_9_001 + .word mus_encounter_may_9_001 .byte N06 , Cn1 , v112 .byte W12 .byte En1 @@ -2086,11 +2086,11 @@ bgm_girl_sup_9_001: .byte N06 .byte W06 .byte PATT - .word bgm_girl_sup_9_001 + .word mus_encounter_may_9_001 .byte PATT - .word bgm_girl_sup_9_001 + .word mus_encounter_may_9_001 .byte PATT - .word bgm_girl_sup_9_001 + .word mus_encounter_may_9_001 .byte N06 , Cn1 , v112 .byte W12 .byte En1 @@ -2113,7 +2113,7 @@ bgm_girl_sup_9_001: .byte W04 .byte N04 .byte W04 -bgm_girl_sup_9_002: +mus_encounter_may_9_002: .byte N06 , Cn1 , v112 .byte W18 .byte Dn1 @@ -2154,7 +2154,7 @@ bgm_girl_sup_9_002: .byte Cn1 .byte W06 .byte PATT - .word bgm_girl_sup_9_002 + .word mus_encounter_may_9_002 .byte N06 , Cn1 , v112 .byte W12 .byte Dn1 @@ -2236,17 +2236,17 @@ bgm_girl_sup_9_002: .byte N06 .byte W06 .byte PATT - .word bgm_girl_sup_9_000 + .word mus_encounter_may_9_000 .byte GOTO - .word bgm_girl_sup_9_B1 + .word mus_encounter_may_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_girl_sup_10: - .byte KEYSH , bgm_girl_sup_key+0 +mus_encounter_may_10: + .byte KEYSH , mus_encounter_may_key+0 .byte VOICE , 83 - .byte VOL , 29*bgm_girl_sup_mvl/mxv + .byte VOL , 29*mus_encounter_may_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 @@ -2257,7 +2257,7 @@ bgm_girl_sup_10: .byte W06 .byte Ds5 .byte W06 -bgm_girl_sup_10_B1: +mus_encounter_may_10_B1: .byte N06 , Fn5 , v112 .byte W12 .byte Fs5 @@ -2560,29 +2560,29 @@ bgm_girl_sup_10_B1: .byte Ds5 .byte W06 .byte GOTO - .word bgm_girl_sup_10_B1 + .word mus_encounter_may_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_girl_sup: +mus_encounter_may: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_girl_sup_pri @ Priority - .byte bgm_girl_sup_rev @ Reverb. + .byte mus_encounter_may_pri @ Priority + .byte mus_encounter_may_rev @ Reverb. - .word bgm_girl_sup_grp + .word mus_encounter_may_grp - .word bgm_girl_sup_1 - .word bgm_girl_sup_2 - .word bgm_girl_sup_3 - .word bgm_girl_sup_4 - .word bgm_girl_sup_5 - .word bgm_girl_sup_6 - .word bgm_girl_sup_7 - .word bgm_girl_sup_8 - .word bgm_girl_sup_9 - .word bgm_girl_sup_10 + .word mus_encounter_may_1 + .word mus_encounter_may_2 + .word mus_encounter_may_3 + .word mus_encounter_may_4 + .word mus_encounter_may_5 + .word mus_encounter_may_6 + .word mus_encounter_may_7 + .word mus_encounter_may_8 + .word mus_encounter_may_9 + .word mus_encounter_may_10 .end diff --git a/sound/songs/bgm_test.s b/sound/songs/mus_encounter_rich.s index 32b2108d2..4e6201cad 100644 --- a/sound/songs/bgm_test.s +++ b/sound/songs/mus_encounter_rich.s @@ -1,45 +1,45 @@ .include "MPlayDef.s" - .equ bgm_test_grp, voicegroup040 - .equ bgm_test_pri, 0 - .equ bgm_test_rev, reverb_set+50 - .equ bgm_test_mvl, 127 - .equ bgm_test_key, 0 - .equ bgm_test_tbs, 1 - .equ bgm_test_exg, 0 - .equ bgm_test_cmp, 1 + .equ mus_encounter_rich_grp, voicegroup040 + .equ mus_encounter_rich_pri, 0 + .equ mus_encounter_rich_rev, reverb_set+50 + .equ mus_encounter_rich_mvl, 127 + .equ mus_encounter_rich_key, 0 + .equ mus_encounter_rich_tbs, 1 + .equ mus_encounter_rich_exg, 0 + .equ mus_encounter_rich_cmp, 1 .section .rodata - .global bgm_test + .global mus_encounter_rich .align 2 @********************** Track 1 **********************@ -bgm_test_1: - .byte KEYSH , bgm_test_key+0 - .byte TEMPO , 128*bgm_test_tbs/2 +mus_encounter_rich_1: + .byte KEYSH , mus_encounter_rich_key+0 + .byte TEMPO , 128*mus_encounter_rich_tbs/2 .byte VOICE , 48 - .byte VOL , 14*bgm_test_mvl/mxv + .byte VOL , 14*mus_encounter_rich_mvl/mxv .byte PAN , c_v+16 .byte N48 , Ds4 , v112 .byte W04 - .byte VOL , 22*bgm_test_mvl/mxv + .byte VOL , 22*mus_encounter_rich_mvl/mxv .byte W04 - .byte 34*bgm_test_mvl/mxv + .byte 34*mus_encounter_rich_mvl/mxv .byte W04 - .byte 44*bgm_test_mvl/mxv + .byte 44*mus_encounter_rich_mvl/mxv .byte W04 - .byte 55*bgm_test_mvl/mxv + .byte 55*mus_encounter_rich_mvl/mxv .byte W04 - .byte 64*bgm_test_mvl/mxv + .byte 64*mus_encounter_rich_mvl/mxv .byte W04 - .byte 72*bgm_test_mvl/mxv + .byte 72*mus_encounter_rich_mvl/mxv .byte W04 - .byte 76*bgm_test_mvl/mxv + .byte 76*mus_encounter_rich_mvl/mxv .byte W04 - .byte 82*bgm_test_mvl/mxv + .byte 82*mus_encounter_rich_mvl/mxv .byte W04 - .byte 74*bgm_test_mvl/mxv + .byte 74*mus_encounter_rich_mvl/mxv .byte W12 .byte N08 , Cs4 .byte W08 @@ -47,7 +47,7 @@ bgm_test_1: .byte W08 .byte Ds3 .byte W08 -bgm_test_1_B1: +mus_encounter_rich_1_B1: .byte N04 , Bn3 , v072 .byte W04 .byte N12 , Cn4 , v080 @@ -86,25 +86,25 @@ bgm_test_1_B1: .byte W08 .byte Dn4 , v032 .byte W16 - .byte VOL , 35*bgm_test_mvl/mxv + .byte VOL , 35*mus_encounter_rich_mvl/mxv .byte N40 , Ds4 , v112 .byte W04 - .byte VOL , 37*bgm_test_mvl/mxv + .byte VOL , 37*mus_encounter_rich_mvl/mxv .byte W04 - .byte 37*bgm_test_mvl/mxv + .byte 37*mus_encounter_rich_mvl/mxv .byte W04 - .byte 42*bgm_test_mvl/mxv + .byte 42*mus_encounter_rich_mvl/mxv .byte W04 - .byte 49*bgm_test_mvl/mxv + .byte 49*mus_encounter_rich_mvl/mxv .byte W04 - .byte 59*bgm_test_mvl/mxv + .byte 59*mus_encounter_rich_mvl/mxv .byte W04 .byte MOD , 4 - .byte VOL , 67*bgm_test_mvl/mxv + .byte VOL , 67*mus_encounter_rich_mvl/mxv .byte W04 - .byte 76*bgm_test_mvl/mxv + .byte 76*mus_encounter_rich_mvl/mxv .byte W04 - .byte 74*bgm_test_mvl/mxv + .byte 74*mus_encounter_rich_mvl/mxv .byte W08 .byte MOD , 0 .byte N08 , Gs4 , v064 @@ -115,23 +115,23 @@ bgm_test_1_B1: .byte W08 .byte Ds4 .byte W08 - .byte VOL , 37*bgm_test_mvl/mxv + .byte VOL , 37*mus_encounter_rich_mvl/mxv .byte N40 , Fn4 , v100 .byte W08 - .byte VOL , 42*bgm_test_mvl/mxv + .byte VOL , 42*mus_encounter_rich_mvl/mxv .byte W04 - .byte 50*bgm_test_mvl/mxv + .byte 50*mus_encounter_rich_mvl/mxv .byte W04 - .byte 58*bgm_test_mvl/mxv + .byte 58*mus_encounter_rich_mvl/mxv .byte W04 - .byte 64*bgm_test_mvl/mxv + .byte 64*mus_encounter_rich_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 72*bgm_test_mvl/mxv + .byte VOL , 72*mus_encounter_rich_mvl/mxv .byte W04 - .byte 79*bgm_test_mvl/mxv + .byte 79*mus_encounter_rich_mvl/mxv .byte W04 - .byte 74*bgm_test_mvl/mxv + .byte 74*mus_encounter_rich_mvl/mxv .byte W08 .byte MOD , 0 .byte N08 , Gn4 , v076 @@ -140,16 +140,16 @@ bgm_test_1_B1: .byte W08 .byte Gs4 , v032 .byte W16 - .byte VOL , 44*bgm_test_mvl/mxv + .byte VOL , 44*mus_encounter_rich_mvl/mxv .byte N24 , Ds4 , v096 .byte W04 - .byte VOL , 52*bgm_test_mvl/mxv + .byte VOL , 52*mus_encounter_rich_mvl/mxv .byte W04 - .byte 64*bgm_test_mvl/mxv + .byte 64*mus_encounter_rich_mvl/mxv .byte W04 - .byte 73*bgm_test_mvl/mxv + .byte 73*mus_encounter_rich_mvl/mxv .byte W04 - .byte 75*bgm_test_mvl/mxv + .byte 75*mus_encounter_rich_mvl/mxv .byte W08 .byte N24 , Gn4 , v084 .byte W24 @@ -157,21 +157,21 @@ bgm_test_1_B1: .byte W08 .byte Gs4 , v032 .byte W16 - .byte VOL , 37*bgm_test_mvl/mxv + .byte VOL , 37*mus_encounter_rich_mvl/mxv .byte N40 , Ds4 , v112 .byte W04 - .byte VOL , 42*bgm_test_mvl/mxv + .byte VOL , 42*mus_encounter_rich_mvl/mxv .byte W04 - .byte 50*bgm_test_mvl/mxv + .byte 50*mus_encounter_rich_mvl/mxv .byte W04 - .byte 55*bgm_test_mvl/mxv + .byte 55*mus_encounter_rich_mvl/mxv .byte W04 - .byte 63*bgm_test_mvl/mxv + .byte 63*mus_encounter_rich_mvl/mxv .byte W04 - .byte 72*bgm_test_mvl/mxv + .byte 72*mus_encounter_rich_mvl/mxv .byte W04 .byte MOD , 4 - .byte VOL , 75*bgm_test_mvl/mxv + .byte VOL , 75*mus_encounter_rich_mvl/mxv .byte W16 .byte MOD , 0 .byte N08 , Fn4 , v068 @@ -182,25 +182,25 @@ bgm_test_1_B1: .byte W08 .byte Cs4 , v064 .byte W08 - .byte VOL , 70*bgm_test_mvl/mxv + .byte VOL , 70*mus_encounter_rich_mvl/mxv .byte N40 , Cn4 , v096 .byte W04 - .byte VOL , 76*bgm_test_mvl/mxv + .byte VOL , 76*mus_encounter_rich_mvl/mxv .byte W04 - .byte 82*bgm_test_mvl/mxv + .byte 82*mus_encounter_rich_mvl/mxv .byte W04 - .byte 84*bgm_test_mvl/mxv + .byte 84*mus_encounter_rich_mvl/mxv .byte W12 .byte MOD , 4 - .byte VOL , 79*bgm_test_mvl/mxv + .byte VOL , 79*mus_encounter_rich_mvl/mxv .byte W04 - .byte 71*bgm_test_mvl/mxv + .byte 71*mus_encounter_rich_mvl/mxv .byte W04 - .byte 61*bgm_test_mvl/mxv + .byte 61*mus_encounter_rich_mvl/mxv .byte W04 - .byte 55*bgm_test_mvl/mxv + .byte 55*mus_encounter_rich_mvl/mxv .byte W04 - .byte 75*bgm_test_mvl/mxv + .byte 75*mus_encounter_rich_mvl/mxv .byte N08 , Cn4 , v032 .byte W08 .byte MOD , 0 @@ -208,29 +208,29 @@ bgm_test_1_B1: .byte W16 .byte N08 , Fn4 , v032 .byte W08 - .byte VOL , 47*bgm_test_mvl/mxv + .byte VOL , 47*mus_encounter_rich_mvl/mxv .byte N48 , Ds4 , v112 .byte W04 - .byte VOL , 49*bgm_test_mvl/mxv + .byte VOL , 49*mus_encounter_rich_mvl/mxv .byte W04 - .byte 50*bgm_test_mvl/mxv + .byte 50*mus_encounter_rich_mvl/mxv .byte W04 - .byte 52*bgm_test_mvl/mxv + .byte 52*mus_encounter_rich_mvl/mxv .byte W04 - .byte 56*bgm_test_mvl/mxv + .byte 56*mus_encounter_rich_mvl/mxv .byte W04 - .byte 62*bgm_test_mvl/mxv + .byte 62*mus_encounter_rich_mvl/mxv .byte W04 .byte MOD , 4 - .byte VOL , 68*bgm_test_mvl/mxv + .byte VOL , 68*mus_encounter_rich_mvl/mxv .byte W04 - .byte 75*bgm_test_mvl/mxv + .byte 75*mus_encounter_rich_mvl/mxv .byte W04 - .byte 85*bgm_test_mvl/mxv + .byte 85*mus_encounter_rich_mvl/mxv .byte W04 - .byte 88*bgm_test_mvl/mxv + .byte 88*mus_encounter_rich_mvl/mxv .byte W04 - .byte 75*bgm_test_mvl/mxv + .byte 75*mus_encounter_rich_mvl/mxv .byte W08 .byte MOD , 0 .byte N08 , Cs4 , v096 @@ -239,29 +239,29 @@ bgm_test_1_B1: .byte W08 .byte Cn4 , v088 .byte W08 - .byte VOL , 37*bgm_test_mvl/mxv + .byte VOL , 37*mus_encounter_rich_mvl/mxv .byte N48 , Gs3 , v084 .byte W04 - .byte VOL , 42*bgm_test_mvl/mxv + .byte VOL , 42*mus_encounter_rich_mvl/mxv .byte W04 - .byte 44*bgm_test_mvl/mxv + .byte 44*mus_encounter_rich_mvl/mxv .byte W04 - .byte 46*bgm_test_mvl/mxv + .byte 46*mus_encounter_rich_mvl/mxv .byte W04 - .byte 49*bgm_test_mvl/mxv + .byte 49*mus_encounter_rich_mvl/mxv .byte W04 - .byte 50*bgm_test_mvl/mxv + .byte 50*mus_encounter_rich_mvl/mxv .byte W04 .byte MOD , 4 - .byte VOL , 56*bgm_test_mvl/mxv + .byte VOL , 56*mus_encounter_rich_mvl/mxv .byte W04 - .byte 61*bgm_test_mvl/mxv + .byte 61*mus_encounter_rich_mvl/mxv .byte W04 - .byte 66*bgm_test_mvl/mxv + .byte 66*mus_encounter_rich_mvl/mxv .byte W04 - .byte 76*bgm_test_mvl/mxv + .byte 76*mus_encounter_rich_mvl/mxv .byte W04 - .byte 75*bgm_test_mvl/mxv + .byte 75*mus_encounter_rich_mvl/mxv .byte W08 .byte MOD , 0 .byte N08 , Fn3 @@ -270,25 +270,25 @@ bgm_test_1_B1: .byte W08 .byte Gs3 , v084 .byte W08 - .byte VOL , 42*bgm_test_mvl/mxv + .byte VOL , 42*mus_encounter_rich_mvl/mxv .byte N48 , Cn4 , v112 .byte W08 - .byte VOL , 47*bgm_test_mvl/mxv + .byte VOL , 47*mus_encounter_rich_mvl/mxv .byte W04 - .byte 52*bgm_test_mvl/mxv + .byte 52*mus_encounter_rich_mvl/mxv .byte W04 - .byte 56*bgm_test_mvl/mxv + .byte 56*mus_encounter_rich_mvl/mxv .byte W04 - .byte 63*bgm_test_mvl/mxv + .byte 63*mus_encounter_rich_mvl/mxv .byte W04 - .byte 73*bgm_test_mvl/mxv + .byte 73*mus_encounter_rich_mvl/mxv .byte MOD , 4 .byte W04 - .byte VOL , 78*bgm_test_mvl/mxv + .byte VOL , 78*mus_encounter_rich_mvl/mxv .byte W04 - .byte 84*bgm_test_mvl/mxv + .byte 84*mus_encounter_rich_mvl/mxv .byte W04 - .byte 75*bgm_test_mvl/mxv + .byte 75*mus_encounter_rich_mvl/mxv .byte W12 .byte MOD , 0 .byte N08 , Cs4 , v080 @@ -297,57 +297,57 @@ bgm_test_1_B1: .byte W08 .byte Cn4 , v084 .byte W08 - .byte VOL , 39*bgm_test_mvl/mxv + .byte VOL , 39*mus_encounter_rich_mvl/mxv .byte N48 , As3 , v096 .byte W04 - .byte VOL , 39*bgm_test_mvl/mxv + .byte VOL , 39*mus_encounter_rich_mvl/mxv .byte W08 - .byte 42*bgm_test_mvl/mxv + .byte 42*mus_encounter_rich_mvl/mxv .byte W04 - .byte 44*bgm_test_mvl/mxv + .byte 44*mus_encounter_rich_mvl/mxv .byte W04 - .byte 50*bgm_test_mvl/mxv + .byte 50*mus_encounter_rich_mvl/mxv .byte W04 - .byte 55*bgm_test_mvl/mxv + .byte 55*mus_encounter_rich_mvl/mxv .byte MOD , 4 .byte W04 - .byte VOL , 62*bgm_test_mvl/mxv + .byte VOL , 62*mus_encounter_rich_mvl/mxv .byte W04 - .byte 68*bgm_test_mvl/mxv + .byte 68*mus_encounter_rich_mvl/mxv .byte W04 - .byte 78*bgm_test_mvl/mxv + .byte 78*mus_encounter_rich_mvl/mxv .byte W04 - .byte 74*bgm_test_mvl/mxv + .byte 74*mus_encounter_rich_mvl/mxv .byte W08 .byte MOD , 0 .byte N08 , As3 , v032 .byte W24 .byte GOTO - .word bgm_test_1_B1 + .word mus_encounter_rich_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_test_2: - .byte KEYSH , bgm_test_key+0 +mus_encounter_rich_2: + .byte KEYSH , mus_encounter_rich_key+0 .byte VOICE , 73 - .byte VOL , 14*bgm_test_mvl/mxv + .byte VOL , 14*mus_encounter_rich_mvl/mxv .byte PAN , c_v+32 .byte N48 , As4 , v064 .byte W04 - .byte VOL , 22*bgm_test_mvl/mxv + .byte VOL , 22*mus_encounter_rich_mvl/mxv .byte W04 - .byte 33*bgm_test_mvl/mxv + .byte 33*mus_encounter_rich_mvl/mxv .byte W04 - .byte 40*bgm_test_mvl/mxv + .byte 40*mus_encounter_rich_mvl/mxv .byte W04 - .byte 52*bgm_test_mvl/mxv + .byte 52*mus_encounter_rich_mvl/mxv .byte W04 - .byte 70*bgm_test_mvl/mxv + .byte 70*mus_encounter_rich_mvl/mxv .byte W04 - .byte 79*bgm_test_mvl/mxv + .byte 79*mus_encounter_rich_mvl/mxv .byte W04 - .byte 71*bgm_test_mvl/mxv + .byte 71*mus_encounter_rich_mvl/mxv .byte W20 .byte N08 , Gn4 .byte W08 @@ -355,7 +355,7 @@ bgm_test_2: .byte W08 .byte Cs4 .byte W08 -bgm_test_2_B1: +mus_encounter_rich_2_B1: .byte N04 , Gs4 , v064 .byte W08 .byte N04 @@ -440,7 +440,7 @@ bgm_test_2_B1: .byte W20 .byte N08 , Cs5 , v028 .byte W24 -bgm_test_2_000: +mus_encounter_rich_2_000: .byte N04 , As4 , v064 .byte W08 .byte N04 @@ -455,7 +455,7 @@ bgm_test_2_000: .byte W24 .byte PEND .byte PATT - .word bgm_test_2_000 + .word mus_encounter_rich_2_000 .byte N04 , An4 , v064 .byte W08 .byte Cn5 @@ -474,86 +474,86 @@ bgm_test_2_000: .byte W08 .byte Cn4 .byte W08 - .byte VOL , 50*bgm_test_mvl/mxv + .byte VOL , 50*mus_encounter_rich_mvl/mxv .byte N04 , Cs5 .byte W04 - .byte VOL , 56*bgm_test_mvl/mxv + .byte VOL , 56*mus_encounter_rich_mvl/mxv .byte N04 , Ds5 .byte W04 - .byte VOL , 59*bgm_test_mvl/mxv + .byte VOL , 59*mus_encounter_rich_mvl/mxv .byte N04 , Cs5 .byte W04 - .byte VOL , 64*bgm_test_mvl/mxv + .byte VOL , 64*mus_encounter_rich_mvl/mxv .byte N04 , Ds5 .byte W04 - .byte VOL , 66*bgm_test_mvl/mxv + .byte VOL , 66*mus_encounter_rich_mvl/mxv .byte N04 , Cs5 .byte W04 - .byte VOL , 69*bgm_test_mvl/mxv + .byte VOL , 69*mus_encounter_rich_mvl/mxv .byte N04 , Ds5 .byte W04 - .byte VOL , 73*bgm_test_mvl/mxv + .byte VOL , 73*mus_encounter_rich_mvl/mxv .byte N04 , Cs5 .byte W04 - .byte VOL , 76*bgm_test_mvl/mxv + .byte VOL , 76*mus_encounter_rich_mvl/mxv .byte N04 , Ds5 .byte W04 - .byte VOL , 79*bgm_test_mvl/mxv + .byte VOL , 79*mus_encounter_rich_mvl/mxv .byte N04 , Cs5 .byte W04 - .byte VOL , 81*bgm_test_mvl/mxv + .byte VOL , 81*mus_encounter_rich_mvl/mxv .byte N04 , Ds5 .byte W04 - .byte VOL , 85*bgm_test_mvl/mxv + .byte VOL , 85*mus_encounter_rich_mvl/mxv .byte N04 , Cs5 .byte W04 - .byte VOL , 88*bgm_test_mvl/mxv + .byte VOL , 88*mus_encounter_rich_mvl/mxv .byte N04 , Ds5 .byte W04 - .byte VOL , 71*bgm_test_mvl/mxv + .byte VOL , 71*mus_encounter_rich_mvl/mxv .byte N08 , Gs5 .byte W08 .byte Gs5 , v028 .byte W08 .byte Fn5 , v060 .byte W08 - .byte VOL , 50*bgm_test_mvl/mxv + .byte VOL , 50*mus_encounter_rich_mvl/mxv .byte N04 , Gs4 .byte W04 - .byte VOL , 56*bgm_test_mvl/mxv + .byte VOL , 56*mus_encounter_rich_mvl/mxv .byte N04 , As4 .byte W04 - .byte VOL , 59*bgm_test_mvl/mxv + .byte VOL , 59*mus_encounter_rich_mvl/mxv .byte N04 , Gs4 .byte W04 - .byte VOL , 64*bgm_test_mvl/mxv + .byte VOL , 64*mus_encounter_rich_mvl/mxv .byte N04 , As4 .byte W04 - .byte VOL , 66*bgm_test_mvl/mxv + .byte VOL , 66*mus_encounter_rich_mvl/mxv .byte N04 , Gs4 .byte W04 - .byte VOL , 69*bgm_test_mvl/mxv + .byte VOL , 69*mus_encounter_rich_mvl/mxv .byte N04 , As4 .byte W04 - .byte VOL , 73*bgm_test_mvl/mxv + .byte VOL , 73*mus_encounter_rich_mvl/mxv .byte N04 , Gs4 .byte W04 - .byte VOL , 76*bgm_test_mvl/mxv + .byte VOL , 76*mus_encounter_rich_mvl/mxv .byte N04 , As4 .byte W04 - .byte VOL , 79*bgm_test_mvl/mxv + .byte VOL , 79*mus_encounter_rich_mvl/mxv .byte N04 , Gs4 .byte W04 - .byte VOL , 81*bgm_test_mvl/mxv + .byte VOL , 81*mus_encounter_rich_mvl/mxv .byte N04 , As4 .byte W04 - .byte VOL , 85*bgm_test_mvl/mxv + .byte VOL , 85*mus_encounter_rich_mvl/mxv .byte N04 , Gs4 .byte W04 - .byte VOL , 88*bgm_test_mvl/mxv + .byte VOL , 88*mus_encounter_rich_mvl/mxv .byte N04 , As4 .byte W04 - .byte VOL , 70*bgm_test_mvl/mxv + .byte VOL , 70*mus_encounter_rich_mvl/mxv .byte N08 , Fn5 .byte W08 .byte Fn5 , v028 @@ -611,15 +611,15 @@ bgm_test_2_000: .byte Ds3 , v060 .byte W08 .byte GOTO - .word bgm_test_2_B1 + .word mus_encounter_rich_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_test_3: - .byte KEYSH , bgm_test_key+0 +mus_encounter_rich_3: + .byte KEYSH , mus_encounter_rich_key+0 .byte VOICE , 1 - .byte VOL , 74*bgm_test_mvl/mxv + .byte VOL , 74*mus_encounter_rich_mvl/mxv .byte PAN , c_v-32 .byte N48 , Cs3 , v080 .byte W48 @@ -629,7 +629,7 @@ bgm_test_3: .byte W08 .byte Ds2 .byte W08 -bgm_test_3_B1: +mus_encounter_rich_3_B1: .byte N24 , Ds3 , v080 .byte W24 .byte N08 , Gs2 @@ -777,37 +777,37 @@ bgm_test_3_B1: .byte N24 , Cs3 .byte W24 .byte GOTO - .word bgm_test_3_B1 + .word mus_encounter_rich_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_test_4: - .byte KEYSH , bgm_test_key+0 +mus_encounter_rich_4: + .byte KEYSH , mus_encounter_rich_key+0 .byte VOICE , 58 - .byte VOL , 5*bgm_test_mvl/mxv + .byte VOL , 5*mus_encounter_rich_mvl/mxv .byte PAN , c_v+0 .byte N48 , Ds1 , v064 .byte W04 - .byte VOL , 31*bgm_test_mvl/mxv + .byte VOL , 31*mus_encounter_rich_mvl/mxv .byte W04 - .byte 47*bgm_test_mvl/mxv + .byte 47*mus_encounter_rich_mvl/mxv .byte W04 - .byte 57*bgm_test_mvl/mxv + .byte 57*mus_encounter_rich_mvl/mxv .byte W04 - .byte 61*bgm_test_mvl/mxv + .byte 61*mus_encounter_rich_mvl/mxv .byte W04 - .byte 67*bgm_test_mvl/mxv + .byte 67*mus_encounter_rich_mvl/mxv .byte W04 - .byte 71*bgm_test_mvl/mxv + .byte 71*mus_encounter_rich_mvl/mxv .byte W04 - .byte 73*bgm_test_mvl/mxv + .byte 73*mus_encounter_rich_mvl/mxv .byte W04 - .byte 79*bgm_test_mvl/mxv + .byte 79*mus_encounter_rich_mvl/mxv .byte W04 - .byte 81*bgm_test_mvl/mxv + .byte 81*mus_encounter_rich_mvl/mxv .byte W04 - .byte 94*bgm_test_mvl/mxv + .byte 94*mus_encounter_rich_mvl/mxv .byte W08 .byte N08 , Fn1 , v072 .byte W08 @@ -815,7 +815,7 @@ bgm_test_4: .byte W08 .byte Gn1 .byte W08 -bgm_test_4_B1: +mus_encounter_rich_4_B1: .byte N24 , Gs1 , v072 .byte W24 .byte N08 , Ds2 , v064 @@ -955,16 +955,16 @@ bgm_test_4_B1: .byte Gn2 , v064 .byte W08 .byte GOTO - .word bgm_test_4_B1 + .word mus_encounter_rich_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_test_5: - .byte KEYSH , bgm_test_key+0 +mus_encounter_rich_5: + .byte KEYSH , mus_encounter_rich_key+0 .byte VOICE , 80 .byte PAN , c_v+0 - .byte VOL , 62*bgm_test_mvl/mxv + .byte VOL , 62*mus_encounter_rich_mvl/mxv .byte N48 , Ds1 , v064 .byte W48 .byte N08 , Fn1 , v072 @@ -973,7 +973,7 @@ bgm_test_5: .byte W08 .byte Gn1 .byte W08 -bgm_test_5_B1: +mus_encounter_rich_5_B1: .byte N24 , Gs1 , v072 .byte W24 .byte N08 , Ds2 , v064 @@ -1113,24 +1113,24 @@ bgm_test_5_B1: .byte Gn2 , v064 .byte W08 .byte GOTO - .word bgm_test_5_B1 + .word mus_encounter_rich_5_B1 .byte FINE @******************************************************@ .align 2 -bgm_test: +mus_encounter_rich: .byte 5 @ NumTrks .byte 0 @ NumBlks - .byte bgm_test_pri @ Priority - .byte bgm_test_rev @ Reverb. + .byte mus_encounter_rich_pri @ Priority + .byte mus_encounter_rich_rev @ Reverb. - .word bgm_test_grp + .word mus_encounter_rich_grp - .word bgm_test_1 - .word bgm_test_2 - .word bgm_test_3 - .word bgm_test_4 - .word bgm_test_5 + .word mus_encounter_rich_1 + .word mus_encounter_rich_2 + .word mus_encounter_rich_3 + .word mus_encounter_rich_4 + .word mus_encounter_rich_5 .end diff --git a/sound/songs/bgm_ayasii.s b/sound/songs/mus_encounter_suspicious.s index 01453a757..33044df30 100644 --- a/sound/songs/bgm_ayasii.s +++ b/sound/songs/mus_encounter_suspicious.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_ayasii_grp, voicegroup066 - .equ bgm_ayasii_pri, 0 - .equ bgm_ayasii_rev, reverb_set+50 - .equ bgm_ayasii_mvl, 127 - .equ bgm_ayasii_key, 0 - .equ bgm_ayasii_tbs, 1 - .equ bgm_ayasii_exg, 0 - .equ bgm_ayasii_cmp, 1 + .equ mus_encounter_suspicious_grp, voicegroup066 + .equ mus_encounter_suspicious_pri, 0 + .equ mus_encounter_suspicious_rev, reverb_set+50 + .equ mus_encounter_suspicious_mvl, 127 + .equ mus_encounter_suspicious_key, 0 + .equ mus_encounter_suspicious_tbs, 1 + .equ mus_encounter_suspicious_exg, 0 + .equ mus_encounter_suspicious_cmp, 1 .section .rodata - .global bgm_ayasii + .global mus_encounter_suspicious .align 2 @********************** Track 1 **********************@ -bgm_ayasii_1: - .byte KEYSH , bgm_ayasii_key+0 - .byte TEMPO , 122*bgm_ayasii_tbs/2 +mus_encounter_suspicious_1: + .byte KEYSH , mus_encounter_suspicious_key+0 + .byte TEMPO , 122*mus_encounter_suspicious_tbs/2 .byte VOICE , 17 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 75*bgm_ayasii_mvl/mxv + .byte VOL , 75*mus_encounter_suspicious_mvl/mxv .byte MOD , 2 .byte PAN , c_v+7 .byte N06 , Gs3 , v116 @@ -43,59 +43,59 @@ bgm_ayasii_1: .byte W12 .byte Gs3 .byte W12 - .byte VOL , 30*bgm_ayasii_mvl/mxv + .byte VOL , 30*mus_encounter_suspicious_mvl/mxv .byte N60 , Dn4 .byte W02 - .byte VOL , 31*bgm_ayasii_mvl/mxv + .byte VOL , 31*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 33*bgm_ayasii_mvl/mxv + .byte 33*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 35*bgm_ayasii_mvl/mxv + .byte 35*mus_encounter_suspicious_mvl/mxv .byte W06 - .byte 38*bgm_ayasii_mvl/mxv + .byte 38*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 42*bgm_ayasii_mvl/mxv + .byte 42*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 44*bgm_ayasii_mvl/mxv + .byte 44*mus_encounter_suspicious_mvl/mxv .byte MOD , 11 .byte W02 - .byte VOL , 47*bgm_ayasii_mvl/mxv + .byte VOL , 47*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 52*bgm_ayasii_mvl/mxv + .byte 52*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 58*bgm_ayasii_mvl/mxv + .byte 58*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 63*bgm_ayasii_mvl/mxv + .byte 63*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 76*bgm_ayasii_mvl/mxv + .byte 76*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte W19 - .byte 76*bgm_ayasii_mvl/mxv + .byte 76*mus_encounter_suspicious_mvl/mxv .byte MOD , 2 .byte N12 , Ds4 .byte W12 -bgm_ayasii_1_B1: - .byte VOL , 40*bgm_ayasii_mvl/mxv +mus_encounter_suspicious_1_B1: + .byte VOL , 40*mus_encounter_suspicious_mvl/mxv .byte N36 , Gs4 , v116 .byte W02 - .byte VOL , 44*bgm_ayasii_mvl/mxv + .byte VOL , 44*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 49*bgm_ayasii_mvl/mxv + .byte 49*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 54*bgm_ayasii_mvl/mxv + .byte 54*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 55*bgm_ayasii_mvl/mxv + .byte 55*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 62*bgm_ayasii_mvl/mxv + .byte 62*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 66*bgm_ayasii_mvl/mxv + .byte 66*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 71*bgm_ayasii_mvl/mxv + .byte 71*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte MOD , 11 .byte W12 .byte 2 @@ -105,24 +105,24 @@ bgm_ayasii_1_B1: .byte W12 .byte Ds4 .byte W12 - .byte VOL , 40*bgm_ayasii_mvl/mxv + .byte VOL , 40*mus_encounter_suspicious_mvl/mxv .byte N36 , En4 .byte W02 - .byte VOL , 44*bgm_ayasii_mvl/mxv + .byte VOL , 44*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 49*bgm_ayasii_mvl/mxv + .byte 49*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 54*bgm_ayasii_mvl/mxv + .byte 54*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 55*bgm_ayasii_mvl/mxv + .byte 55*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 62*bgm_ayasii_mvl/mxv + .byte 62*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 66*bgm_ayasii_mvl/mxv + .byte 66*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 71*bgm_ayasii_mvl/mxv + .byte 71*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte MOD , 11 .byte W12 .byte 2 @@ -144,24 +144,24 @@ bgm_ayasii_1_B1: .byte W12 .byte Ds3 .byte W12 - .byte VOL , 40*bgm_ayasii_mvl/mxv + .byte VOL , 40*mus_encounter_suspicious_mvl/mxv .byte N36 , En3 .byte W02 - .byte VOL , 44*bgm_ayasii_mvl/mxv + .byte VOL , 44*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 49*bgm_ayasii_mvl/mxv + .byte 49*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 54*bgm_ayasii_mvl/mxv + .byte 54*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 55*bgm_ayasii_mvl/mxv + .byte 55*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 62*bgm_ayasii_mvl/mxv + .byte 62*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 66*bgm_ayasii_mvl/mxv + .byte 66*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 71*bgm_ayasii_mvl/mxv + .byte 71*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte MOD , 11 .byte W12 .byte 2 @@ -173,24 +173,24 @@ bgm_ayasii_1_B1: .byte Ds3 .byte N06 , Ds4 .byte W12 - .byte VOL , 40*bgm_ayasii_mvl/mxv + .byte VOL , 40*mus_encounter_suspicious_mvl/mxv .byte N36 , As4 .byte W02 - .byte VOL , 44*bgm_ayasii_mvl/mxv + .byte VOL , 44*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 49*bgm_ayasii_mvl/mxv + .byte 49*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 54*bgm_ayasii_mvl/mxv + .byte 54*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 55*bgm_ayasii_mvl/mxv + .byte 55*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 62*bgm_ayasii_mvl/mxv + .byte 62*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 66*bgm_ayasii_mvl/mxv + .byte 66*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 71*bgm_ayasii_mvl/mxv + .byte 71*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte MOD , 11 .byte W12 .byte 2 @@ -200,24 +200,24 @@ bgm_ayasii_1_B1: .byte W12 .byte Fn4 .byte W12 - .byte VOL , 40*bgm_ayasii_mvl/mxv + .byte VOL , 40*mus_encounter_suspicious_mvl/mxv .byte N36 , Fs4 .byte W02 - .byte VOL , 44*bgm_ayasii_mvl/mxv + .byte VOL , 44*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 49*bgm_ayasii_mvl/mxv + .byte 49*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 54*bgm_ayasii_mvl/mxv + .byte 54*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 55*bgm_ayasii_mvl/mxv + .byte 55*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 62*bgm_ayasii_mvl/mxv + .byte 62*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 66*bgm_ayasii_mvl/mxv + .byte 66*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 71*bgm_ayasii_mvl/mxv + .byte 71*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte MOD , 11 .byte W12 .byte 2 @@ -239,24 +239,24 @@ bgm_ayasii_1_B1: .byte W12 .byte Fn3 .byte W12 - .byte VOL , 40*bgm_ayasii_mvl/mxv + .byte VOL , 40*mus_encounter_suspicious_mvl/mxv .byte N36 , Fs3 .byte W02 - .byte VOL , 44*bgm_ayasii_mvl/mxv + .byte VOL , 44*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 49*bgm_ayasii_mvl/mxv + .byte 49*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 54*bgm_ayasii_mvl/mxv + .byte 54*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 55*bgm_ayasii_mvl/mxv + .byte 55*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 62*bgm_ayasii_mvl/mxv + .byte 62*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 66*bgm_ayasii_mvl/mxv + .byte 66*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 71*bgm_ayasii_mvl/mxv + .byte 71*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte MOD , 11 .byte W12 .byte 2 @@ -329,22 +329,22 @@ bgm_ayasii_1_B1: .byte En4 .byte W06 .byte GOTO - .word bgm_ayasii_1_B1 + .word mus_encounter_suspicious_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_ayasii_2: - .byte KEYSH , bgm_ayasii_key+0 +mus_encounter_suspicious_2: + .byte KEYSH , mus_encounter_suspicious_key+0 .byte VOICE , 45 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 63*bgm_ayasii_mvl/mxv + .byte VOL , 63*mus_encounter_suspicious_mvl/mxv .byte PAN , c_v-16 .byte W24 .byte W72 .byte W72 -bgm_ayasii_2_B1: +mus_encounter_suspicious_2_B1: .byte VOICE , 45 .byte W12 .byte N06 , Gs3 , v112 @@ -400,14 +400,14 @@ bgm_ayasii_2_B1: .byte N24 , Fn2 .byte W24 .byte GOTO - .word bgm_ayasii_2_B1 + .word mus_encounter_suspicious_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_ayasii_3: - .byte VOL , 78*bgm_ayasii_mvl/mxv - .byte KEYSH , bgm_ayasii_key+0 +mus_encounter_suspicious_3: + .byte VOL , 78*mus_encounter_suspicious_mvl/mxv + .byte KEYSH , mus_encounter_suspicious_key+0 .byte VOICE , 58 .byte BENDR , 12 .byte LFOS , 44 @@ -420,22 +420,22 @@ bgm_ayasii_3: .byte W06 .byte Bn1 , v088 .byte W06 - .byte VOL , 41*bgm_ayasii_mvl/mxv + .byte VOL , 41*mus_encounter_suspicious_mvl/mxv .byte N36 , Gs1 , v112 .byte W02 - .byte VOL , 44*bgm_ayasii_mvl/mxv + .byte VOL , 44*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 50*bgm_ayasii_mvl/mxv + .byte 50*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 57*bgm_ayasii_mvl/mxv + .byte 57*mus_encounter_suspicious_mvl/mxv .byte W06 - .byte 65*bgm_ayasii_mvl/mxv + .byte 65*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 68*bgm_ayasii_mvl/mxv + .byte 68*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 77*bgm_ayasii_mvl/mxv + .byte 77*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte MOD , 7 .byte W12 .byte 0 @@ -445,37 +445,37 @@ bgm_ayasii_3: .byte W12 .byte En1 .byte W12 - .byte VOL , 23*bgm_ayasii_mvl/mxv + .byte VOL , 23*mus_encounter_suspicious_mvl/mxv .byte N60 , Dn1 .byte W02 - .byte VOL , 27*bgm_ayasii_mvl/mxv + .byte VOL , 27*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 31*bgm_ayasii_mvl/mxv + .byte 31*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 40*bgm_ayasii_mvl/mxv + .byte 40*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 45*bgm_ayasii_mvl/mxv + .byte 45*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 49*bgm_ayasii_mvl/mxv + .byte 49*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 57*bgm_ayasii_mvl/mxv + .byte 57*mus_encounter_suspicious_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 58*bgm_ayasii_mvl/mxv + .byte VOL , 58*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 63*bgm_ayasii_mvl/mxv + .byte 63*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 68*bgm_ayasii_mvl/mxv + .byte 68*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 76*bgm_ayasii_mvl/mxv + .byte 76*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 78*bgm_ayasii_mvl/mxv + .byte 78*mus_encounter_suspicious_mvl/mxv .byte W24 .byte N12 , Ds1 .byte W12 -bgm_ayasii_3_B1: +mus_encounter_suspicious_3_B1: .byte MOD , 0 .byte N12 , Gs1 , v112 .byte W60 @@ -500,7 +500,7 @@ bgm_ayasii_3_B1: .byte W12 .byte Ds1 .byte W12 -bgm_ayasii_3_000: +mus_encounter_suspicious_3_000: .byte N12 , As1 , v112 .byte W60 .byte N06 @@ -511,7 +511,7 @@ bgm_ayasii_3_000: .byte N06 .byte W12 .byte PATT - .word bgm_ayasii_3_000 + .word mus_encounter_suspicious_3_000 .byte N36 , Fs1 , v112 .byte W12 .byte MOD , 8 @@ -568,23 +568,23 @@ bgm_ayasii_3_000: .byte Cn2 , v112 .byte W72 .byte GOTO - .word bgm_ayasii_3_B1 + .word mus_encounter_suspicious_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_ayasii_4: - .byte KEYSH , bgm_ayasii_key+0 +mus_encounter_suspicious_4: + .byte KEYSH , mus_encounter_suspicious_key+0 .byte VOICE , 45 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+28 - .byte VOL , 65*bgm_ayasii_mvl/mxv + .byte VOL , 65*mus_encounter_suspicious_mvl/mxv .byte W24 .byte PAN , c_v+28 .byte W72 .byte W72 -bgm_ayasii_4_B1: +mus_encounter_suspicious_4_B1: .byte VOICE , 45 .byte PAN , c_v+28 .byte W12 @@ -728,18 +728,18 @@ bgm_ayasii_4_B1: .byte N24 , Fn3 , v120 .byte W24 .byte GOTO - .word bgm_ayasii_4_B1 + .word mus_encounter_suspicious_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_ayasii_5: - .byte KEYSH , bgm_ayasii_key+0 +mus_encounter_suspicious_5: + .byte KEYSH , mus_encounter_suspicious_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+24 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte N06 , Bn3 , v112 .byte W06 .byte Ds4 @@ -748,22 +748,22 @@ bgm_ayasii_5: .byte W06 .byte Bn4 .byte W06 - .byte VOL , 11*bgm_ayasii_mvl/mxv + .byte VOL , 11*mus_encounter_suspicious_mvl/mxv .byte N36 , Gs4 .byte W02 - .byte VOL , 14*bgm_ayasii_mvl/mxv + .byte VOL , 14*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 17*bgm_ayasii_mvl/mxv + .byte 17*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 20*bgm_ayasii_mvl/mxv + .byte 20*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 24*bgm_ayasii_mvl/mxv + .byte 24*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 30*bgm_ayasii_mvl/mxv + .byte 30*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 38*bgm_ayasii_mvl/mxv + .byte 38*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte W16 .byte N06 , Gn4 .byte W12 @@ -771,46 +771,46 @@ bgm_ayasii_5: .byte W12 .byte En4 .byte W12 - .byte VOL , 6*bgm_ayasii_mvl/mxv + .byte VOL , 6*mus_encounter_suspicious_mvl/mxv .byte N60 , Bn4 .byte W05 - .byte VOL , 7*bgm_ayasii_mvl/mxv + .byte VOL , 7*mus_encounter_suspicious_mvl/mxv .byte W07 - .byte 9*bgm_ayasii_mvl/mxv + .byte 9*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 11*bgm_ayasii_mvl/mxv + .byte 11*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 12*bgm_ayasii_mvl/mxv + .byte 12*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 14*bgm_ayasii_mvl/mxv + .byte 14*mus_encounter_suspicious_mvl/mxv .byte W06 - .byte 17*bgm_ayasii_mvl/mxv + .byte 17*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 19*bgm_ayasii_mvl/mxv + .byte 19*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 22*bgm_ayasii_mvl/mxv + .byte 22*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 23*bgm_ayasii_mvl/mxv + .byte 23*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 28*bgm_ayasii_mvl/mxv + .byte 28*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 33*bgm_ayasii_mvl/mxv + .byte 33*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 35*bgm_ayasii_mvl/mxv + .byte 35*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 44*bgm_ayasii_mvl/mxv + .byte 44*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 46*bgm_ayasii_mvl/mxv + .byte 46*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 49*bgm_ayasii_mvl/mxv + .byte 49*mus_encounter_suspicious_mvl/mxv .byte W04 .byte N12 , As4 .byte W03 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte W09 -bgm_ayasii_5_B1: +mus_encounter_suspicious_5_B1: .byte N03 , Bn4 , v096 .byte W12 .byte N06 , Bn4 , v032 @@ -890,19 +890,19 @@ bgm_ayasii_5_B1: .byte W72 .byte W72 .byte GOTO - .word bgm_ayasii_5_B1 + .word mus_encounter_suspicious_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_ayasii_6: - .byte KEYSH , bgm_ayasii_key+0 +mus_encounter_suspicious_6: + .byte KEYSH , mus_encounter_suspicious_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte PAN , c_v+63 .byte W24 .byte N36 , Bn3 , v112 @@ -916,51 +916,51 @@ bgm_ayasii_6: .byte W12 .byte Bn3 .byte W12 - .byte VOL , 9*bgm_ayasii_mvl/mxv + .byte VOL , 9*mus_encounter_suspicious_mvl/mxv .byte N60 .byte W05 - .byte VOL , 13*bgm_ayasii_mvl/mxv + .byte VOL , 13*mus_encounter_suspicious_mvl/mxv .byte W07 - .byte 18*bgm_ayasii_mvl/mxv + .byte 18*mus_encounter_suspicious_mvl/mxv .byte W05 - .byte 23*bgm_ayasii_mvl/mxv + .byte 23*mus_encounter_suspicious_mvl/mxv .byte W07 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte MOD , 8 .byte W05 - .byte VOL , 30*bgm_ayasii_mvl/mxv + .byte VOL , 30*mus_encounter_suspicious_mvl/mxv .byte W07 - .byte 35*bgm_ayasii_mvl/mxv + .byte 35*mus_encounter_suspicious_mvl/mxv .byte W05 - .byte 42*bgm_ayasii_mvl/mxv + .byte 42*mus_encounter_suspicious_mvl/mxv .byte W07 - .byte 50*bgm_ayasii_mvl/mxv + .byte 50*mus_encounter_suspicious_mvl/mxv .byte W05 - .byte 54*bgm_ayasii_mvl/mxv + .byte 54*mus_encounter_suspicious_mvl/mxv .byte W07 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte MOD , 2 .byte N12 , As3 .byte W12 -bgm_ayasii_6_B1: - .byte VOL , 13*bgm_ayasii_mvl/mxv +mus_encounter_suspicious_6_B1: + .byte VOL , 13*mus_encounter_suspicious_mvl/mxv .byte N36 , Ds3 , v112 .byte W02 - .byte VOL , 17*bgm_ayasii_mvl/mxv + .byte VOL , 17*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 20*bgm_ayasii_mvl/mxv + .byte 20*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 24*bgm_ayasii_mvl/mxv + .byte 24*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 29*bgm_ayasii_mvl/mxv + .byte 29*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 33*bgm_ayasii_mvl/mxv + .byte 33*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte MOD , 8 .byte W12 .byte 2 @@ -970,24 +970,24 @@ bgm_ayasii_6_B1: .byte W12 .byte Gs3 .byte W12 - .byte VOL , 12*bgm_ayasii_mvl/mxv + .byte VOL , 12*mus_encounter_suspicious_mvl/mxv .byte N36 , Gs2 .byte W02 - .byte VOL , 15*bgm_ayasii_mvl/mxv + .byte VOL , 15*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 19*bgm_ayasii_mvl/mxv + .byte 19*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 22*bgm_ayasii_mvl/mxv + .byte 22*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 24*bgm_ayasii_mvl/mxv + .byte 24*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 30*bgm_ayasii_mvl/mxv + .byte 30*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte MOD , 8 .byte W12 .byte 2 @@ -1009,24 +1009,24 @@ bgm_ayasii_6_B1: .byte W12 .byte Ds2 .byte W12 - .byte VOL , 11*bgm_ayasii_mvl/mxv + .byte VOL , 11*mus_encounter_suspicious_mvl/mxv .byte N36 , Bn1 .byte W02 - .byte VOL , 13*bgm_ayasii_mvl/mxv + .byte VOL , 13*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 17*bgm_ayasii_mvl/mxv + .byte 17*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 19*bgm_ayasii_mvl/mxv + .byte 19*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 23*bgm_ayasii_mvl/mxv + .byte 23*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 33*bgm_ayasii_mvl/mxv + .byte 33*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte MOD , 8 .byte W12 .byte 2 @@ -1036,24 +1036,24 @@ bgm_ayasii_6_B1: .byte W12 .byte Gs1 .byte W12 - .byte VOL , 12*bgm_ayasii_mvl/mxv + .byte VOL , 12*mus_encounter_suspicious_mvl/mxv .byte N36 , Fn3 .byte W02 - .byte VOL , 14*bgm_ayasii_mvl/mxv + .byte VOL , 14*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 18*bgm_ayasii_mvl/mxv + .byte 18*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 23*bgm_ayasii_mvl/mxv + .byte 23*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 31*bgm_ayasii_mvl/mxv + .byte 31*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 40*bgm_ayasii_mvl/mxv + .byte 40*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte MOD , 8 .byte W12 .byte 2 @@ -1063,24 +1063,24 @@ bgm_ayasii_6_B1: .byte W12 .byte As3 .byte W12 - .byte VOL , 9*bgm_ayasii_mvl/mxv + .byte VOL , 9*mus_encounter_suspicious_mvl/mxv .byte N36 , As2 .byte W02 - .byte VOL , 12*bgm_ayasii_mvl/mxv + .byte VOL , 12*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 14*bgm_ayasii_mvl/mxv + .byte 14*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 19*bgm_ayasii_mvl/mxv + .byte 19*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 20*bgm_ayasii_mvl/mxv + .byte 20*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 25*bgm_ayasii_mvl/mxv + .byte 25*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 29*bgm_ayasii_mvl/mxv + .byte 29*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 38*bgm_ayasii_mvl/mxv + .byte 38*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 39*bgm_ayasii_mvl/mxv + .byte 39*mus_encounter_suspicious_mvl/mxv .byte MOD , 8 .byte W12 .byte 2 @@ -1102,25 +1102,25 @@ bgm_ayasii_6_B1: .byte W12 .byte Fn2 .byte W12 - .byte VOL , 9*bgm_ayasii_mvl/mxv + .byte VOL , 9*mus_encounter_suspicious_mvl/mxv .byte N36 , Cs2 .byte W02 - .byte VOL , 14*bgm_ayasii_mvl/mxv + .byte VOL , 14*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 18*bgm_ayasii_mvl/mxv + .byte 18*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 22*bgm_ayasii_mvl/mxv + .byte 22*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 24*bgm_ayasii_mvl/mxv + .byte 24*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 28*bgm_ayasii_mvl/mxv + .byte 28*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 30*bgm_ayasii_mvl/mxv + .byte 30*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte W12 .byte MOD , 2 .byte N06 , Cn2 @@ -1148,20 +1148,20 @@ bgm_ayasii_6_B1: .byte W12 .byte W72 .byte GOTO - .word bgm_ayasii_6_B1 + .word mus_encounter_suspicious_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_ayasii_7: - .byte KEYSH , bgm_ayasii_key+0 +mus_encounter_suspicious_7: + .byte KEYSH , mus_encounter_suspicious_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte N06 , Gs2 , v112 .byte W06 .byte Gn2 @@ -1187,7 +1187,7 @@ bgm_ayasii_7: .byte W36 .byte N12 , Ds1 .byte W12 -bgm_ayasii_7_B1: +mus_encounter_suspicious_7_B1: .byte MOD , 0 .byte N12 , Gs1 , v112 .byte W60 @@ -1212,7 +1212,7 @@ bgm_ayasii_7_B1: .byte W12 .byte Ds1 .byte W12 -bgm_ayasii_7_000: +mus_encounter_suspicious_7_000: .byte N12 , As1 , v112 .byte W60 .byte N06 @@ -1223,7 +1223,7 @@ bgm_ayasii_7_000: .byte N06 .byte W12 .byte PATT - .word bgm_ayasii_7_000 + .word mus_encounter_suspicious_7_000 .byte N36 , Fs1 , v112 .byte W12 .byte MOD , 8 @@ -1263,16 +1263,16 @@ bgm_ayasii_7_000: .byte W72 .byte W72 .byte GOTO - .word bgm_ayasii_7_B1 + .word mus_encounter_suspicious_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_ayasii_8: - .byte KEYSH , bgm_ayasii_key+0 +mus_encounter_suspicious_8: + .byte KEYSH , mus_encounter_suspicious_key+0 .byte VOICE , 127 .byte PAN , c_v+0 - .byte VOL , 26*bgm_ayasii_mvl/mxv + .byte VOL , 26*mus_encounter_suspicious_mvl/mxv .byte N02 , En5 , v108 .byte W06 .byte En5 , v072 @@ -1282,20 +1282,20 @@ bgm_ayasii_8: .byte En5 , v068 .byte W06 .byte VOICE , 126 - .byte VOL , 4*bgm_ayasii_mvl/mxv + .byte VOL , 4*mus_encounter_suspicious_mvl/mxv .byte N36 , Gn5 , v108 .byte W02 - .byte VOL , 6*bgm_ayasii_mvl/mxv + .byte VOL , 6*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 9*bgm_ayasii_mvl/mxv + .byte 9*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 12*bgm_ayasii_mvl/mxv + .byte 12*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 14*bgm_ayasii_mvl/mxv + .byte 14*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 22*bgm_ayasii_mvl/mxv + .byte 22*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 26*bgm_ayasii_mvl/mxv + .byte 26*mus_encounter_suspicious_mvl/mxv .byte W19 .byte VOICE , 127 .byte N02 , En5 @@ -1304,7 +1304,7 @@ bgm_ayasii_8: .byte W12 .byte En5 , v088 .byte W12 -bgm_ayasii_8_000: +mus_encounter_suspicious_8_000: .byte N02 , En5 , v108 .byte W03 .byte En5 , v032 @@ -1354,8 +1354,8 @@ bgm_ayasii_8_000: .byte En5 , v120 .byte W03 .byte PEND -bgm_ayasii_8_B1: -bgm_ayasii_8_001: +mus_encounter_suspicious_8_B1: +mus_encounter_suspicious_8_001: .byte VOICE , 126 .byte N12 , Gn5 , v112 .byte W12 @@ -1376,19 +1376,19 @@ bgm_ayasii_8_001: .byte W06 .byte PEND .byte PATT - .word bgm_ayasii_8_001 + .word mus_encounter_suspicious_8_001 .byte PATT - .word bgm_ayasii_8_001 + .word mus_encounter_suspicious_8_001 .byte PATT - .word bgm_ayasii_8_000 + .word mus_encounter_suspicious_8_000 .byte PATT - .word bgm_ayasii_8_001 + .word mus_encounter_suspicious_8_001 .byte PATT - .word bgm_ayasii_8_001 + .word mus_encounter_suspicious_8_001 .byte PATT - .word bgm_ayasii_8_001 + .word mus_encounter_suspicious_8_001 .byte PATT - .word bgm_ayasii_8_000 + .word mus_encounter_suspicious_8_000 .byte N02 , En5 , v112 .byte W12 .byte En5 , v056 @@ -1402,9 +1402,9 @@ bgm_ayasii_8_001: .byte En5 , v056 .byte W12 .byte PATT - .word bgm_ayasii_8_001 + .word mus_encounter_suspicious_8_001 .byte PATT - .word bgm_ayasii_8_000 + .word mus_encounter_suspicious_8_000 .byte N02 , En5 , v112 .byte W24 .byte N02 @@ -1418,20 +1418,20 @@ bgm_ayasii_8_001: .byte N02 , En5 .byte W12 .byte GOTO - .word bgm_ayasii_8_B1 + .word mus_encounter_suspicious_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_ayasii_9: - .byte KEYSH , bgm_ayasii_key+0 +mus_encounter_suspicious_9: + .byte KEYSH , mus_encounter_suspicious_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-59 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte BEND , c_v+1 .byte N06 , Gs2 , v112 .byte W06 @@ -1459,26 +1459,26 @@ bgm_ayasii_9: .byte 2 .byte N12 , Ds3 .byte W12 -bgm_ayasii_9_B1: - .byte VOL , 13*bgm_ayasii_mvl/mxv +mus_encounter_suspicious_9_B1: + .byte VOL , 13*mus_encounter_suspicious_mvl/mxv .byte N36 , Gs3 , v112 .byte W02 - .byte VOL , 17*bgm_ayasii_mvl/mxv + .byte VOL , 17*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 20*bgm_ayasii_mvl/mxv + .byte 20*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 24*bgm_ayasii_mvl/mxv + .byte 24*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 29*bgm_ayasii_mvl/mxv + .byte 29*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 33*bgm_ayasii_mvl/mxv + .byte 33*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte W12 .byte MOD , 2 .byte N06 , Gn3 @@ -1487,25 +1487,25 @@ bgm_ayasii_9_B1: .byte W12 .byte Ds3 .byte W12 - .byte VOL , 12*bgm_ayasii_mvl/mxv + .byte VOL , 12*mus_encounter_suspicious_mvl/mxv .byte N36 , En3 .byte W02 - .byte VOL , 15*bgm_ayasii_mvl/mxv + .byte VOL , 15*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 19*bgm_ayasii_mvl/mxv + .byte 19*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 22*bgm_ayasii_mvl/mxv + .byte 22*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 24*bgm_ayasii_mvl/mxv + .byte 24*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 30*bgm_ayasii_mvl/mxv + .byte 30*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte W12 .byte MOD , 2 .byte N06 , Ds3 @@ -1526,25 +1526,25 @@ bgm_ayasii_9_B1: .byte W12 .byte Ds2 .byte W12 - .byte VOL , 11*bgm_ayasii_mvl/mxv + .byte VOL , 11*mus_encounter_suspicious_mvl/mxv .byte N36 , En2 .byte W02 - .byte VOL , 13*bgm_ayasii_mvl/mxv + .byte VOL , 13*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 17*bgm_ayasii_mvl/mxv + .byte 17*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 19*bgm_ayasii_mvl/mxv + .byte 19*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 23*bgm_ayasii_mvl/mxv + .byte 23*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 33*bgm_ayasii_mvl/mxv + .byte 33*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte W12 .byte MOD , 2 .byte N06 , Ds2 @@ -1555,25 +1555,25 @@ bgm_ayasii_9_B1: .byte Ds2 .byte N06 , Ds3 .byte W12 - .byte VOL , 12*bgm_ayasii_mvl/mxv + .byte VOL , 12*mus_encounter_suspicious_mvl/mxv .byte N36 , As3 .byte W02 - .byte VOL , 14*bgm_ayasii_mvl/mxv + .byte VOL , 14*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 18*bgm_ayasii_mvl/mxv + .byte 18*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 23*bgm_ayasii_mvl/mxv + .byte 23*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 27*bgm_ayasii_mvl/mxv + .byte 27*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 31*bgm_ayasii_mvl/mxv + .byte 31*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 40*bgm_ayasii_mvl/mxv + .byte 40*mus_encounter_suspicious_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte W12 .byte MOD , 2 .byte N06 , An3 @@ -1582,25 +1582,25 @@ bgm_ayasii_9_B1: .byte W12 .byte Fn3 .byte W12 - .byte VOL , 9*bgm_ayasii_mvl/mxv + .byte VOL , 9*mus_encounter_suspicious_mvl/mxv .byte N36 , Fs3 .byte W02 - .byte VOL , 12*bgm_ayasii_mvl/mxv + .byte VOL , 12*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 14*bgm_ayasii_mvl/mxv + .byte 14*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 19*bgm_ayasii_mvl/mxv + .byte 19*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 20*bgm_ayasii_mvl/mxv + .byte 20*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 25*bgm_ayasii_mvl/mxv + .byte 25*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 29*bgm_ayasii_mvl/mxv + .byte 29*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 38*bgm_ayasii_mvl/mxv + .byte 38*mus_encounter_suspicious_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte W12 .byte MOD , 2 .byte N06 , Fn3 @@ -1621,25 +1621,25 @@ bgm_ayasii_9_B1: .byte W12 .byte Fn2 .byte W12 - .byte VOL , 9*bgm_ayasii_mvl/mxv + .byte VOL , 9*mus_encounter_suspicious_mvl/mxv .byte N36 , Fs2 .byte W02 - .byte VOL , 14*bgm_ayasii_mvl/mxv + .byte VOL , 14*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 18*bgm_ayasii_mvl/mxv + .byte 18*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 22*bgm_ayasii_mvl/mxv + .byte 22*mus_encounter_suspicious_mvl/mxv .byte W04 - .byte 24*bgm_ayasii_mvl/mxv + .byte 24*mus_encounter_suspicious_mvl/mxv .byte W02 - .byte 28*bgm_ayasii_mvl/mxv + .byte 28*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 30*bgm_ayasii_mvl/mxv + .byte 30*mus_encounter_suspicious_mvl/mxv .byte W03 - .byte 36*bgm_ayasii_mvl/mxv + .byte 36*mus_encounter_suspicious_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 39*bgm_ayasii_mvl/mxv + .byte VOL , 39*mus_encounter_suspicious_mvl/mxv .byte W12 .byte MOD , 2 .byte N06 , Fn2 @@ -1711,28 +1711,28 @@ bgm_ayasii_9_B1: .byte En3 .byte W06 .byte GOTO - .word bgm_ayasii_9_B1 + .word mus_encounter_suspicious_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_ayasii: +mus_encounter_suspicious: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_ayasii_pri @ Priority - .byte bgm_ayasii_rev @ Reverb. + .byte mus_encounter_suspicious_pri @ Priority + .byte mus_encounter_suspicious_rev @ Reverb. - .word bgm_ayasii_grp + .word mus_encounter_suspicious_grp - .word bgm_ayasii_1 - .word bgm_ayasii_2 - .word bgm_ayasii_3 - .word bgm_ayasii_4 - .word bgm_ayasii_5 - .word bgm_ayasii_6 - .word bgm_ayasii_7 - .word bgm_ayasii_8 - .word bgm_ayasii_9 + .word mus_encounter_suspicious_1 + .word mus_encounter_suspicious_2 + .word mus_encounter_suspicious_3 + .word mus_encounter_suspicious_4 + .word mus_encounter_suspicious_5 + .word mus_encounter_suspicious_6 + .word mus_encounter_suspicious_7 + .word mus_encounter_suspicious_8 + .word mus_encounter_suspicious_9 .end diff --git a/sound/songs/bgm_swimeye.s b/sound/songs/mus_encounter_swimmer.s index 404f17531..06562867b 100644 --- a/sound/songs/bgm_swimeye.s +++ b/sound/songs/mus_encounter_swimmer.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_swimeye_grp, voicegroup033 - .equ bgm_swimeye_pri, 0 - .equ bgm_swimeye_rev, reverb_set+50 - .equ bgm_swimeye_mvl, 127 - .equ bgm_swimeye_key, 0 - .equ bgm_swimeye_tbs, 1 - .equ bgm_swimeye_exg, 0 - .equ bgm_swimeye_cmp, 1 + .equ mus_encounter_swimmer_grp, voicegroup033 + .equ mus_encounter_swimmer_pri, 0 + .equ mus_encounter_swimmer_rev, reverb_set+50 + .equ mus_encounter_swimmer_mvl, 127 + .equ mus_encounter_swimmer_key, 0 + .equ mus_encounter_swimmer_tbs, 1 + .equ mus_encounter_swimmer_exg, 0 + .equ mus_encounter_swimmer_cmp, 1 .section .rodata - .global bgm_swimeye + .global mus_encounter_swimmer .align 2 @********************** Track 1 **********************@ -bgm_swimeye_1: - .byte KEYSH , bgm_swimeye_key+0 - .byte TEMPO , 142*bgm_swimeye_tbs/2 +mus_encounter_swimmer_1: + .byte KEYSH , mus_encounter_swimmer_key+0 + .byte TEMPO , 142*mus_encounter_swimmer_tbs/2 .byte VOICE , 46 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte PAN , c_v-9 .byte W03 .byte N06 , Dn5 , v092 @@ -52,9 +52,9 @@ bgm_swimeye_1: .byte W12 .byte Cs5 .byte W12 -bgm_swimeye_1_B1: +mus_encounter_swimmer_1_B1: .byte VOICE , 60 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte PAN , c_v+4 .byte N30 , Ds4 , v112 .byte W36 @@ -82,26 +82,26 @@ bgm_swimeye_1_B1: .byte W24 .byte Cs4 .byte W24 -bgm_swimeye_1_000: +mus_encounter_swimmer_1_000: .byte N68 , Bn3 , v112 .byte W32 .byte W01 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 70*bgm_swimeye_mvl/mxv + .byte 70*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 53*bgm_swimeye_mvl/mxv + .byte 53*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 42*bgm_swimeye_mvl/mxv + .byte 42*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 27*bgm_swimeye_mvl/mxv + .byte 27*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 9*bgm_swimeye_mvl/mxv + .byte 9*mus_encounter_swimmer_mvl/mxv .byte W06 .byte PEND - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N30 , Ds4 .byte W36 .byte N12 , En4 @@ -129,39 +129,39 @@ bgm_swimeye_1_000: .byte Cs4 .byte W24 .byte PATT - .word bgm_swimeye_1_000 + .word mus_encounter_swimmer_1_000 .byte GOTO - .word bgm_swimeye_1_B1 + .word mus_encounter_swimmer_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_swimeye_2: - .byte VOL , 80*bgm_swimeye_mvl/mxv - .byte KEYSH , bgm_swimeye_key+0 +mus_encounter_swimmer_2: + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv + .byte KEYSH , mus_encounter_swimmer_key+0 .byte VOICE , 33 .byte N72 , Bn0 , v120 .byte W72 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N24 , Fs1 .byte W24 .byte En1 .byte W24 .byte Ds1 .byte W24 -bgm_swimeye_2_B1: - .byte VOL , 80*bgm_swimeye_mvl/mxv +mus_encounter_swimmer_2_B1: + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N48 , En1 , v120 .byte W48 .byte N12 , Bn0 .byte W24 -bgm_swimeye_2_000: +mus_encounter_swimmer_2_000: .byte N48 , En1 , v120 .byte W48 .byte N12 , Bn0 .byte W24 .byte PEND -bgm_swimeye_2_001: +mus_encounter_swimmer_2_001: .byte N12 , Fs1 , v120 .byte W24 .byte N12 @@ -169,7 +169,7 @@ bgm_swimeye_2_001: .byte N24 , Cs1 .byte W24 .byte PEND -bgm_swimeye_2_002: +mus_encounter_swimmer_2_002: .byte N12 , Bn0 , v120 .byte W24 .byte Ds1 @@ -178,22 +178,22 @@ bgm_swimeye_2_002: .byte W24 .byte PEND .byte PATT - .word bgm_swimeye_2_000 + .word mus_encounter_swimmer_2_000 .byte PATT - .word bgm_swimeye_2_000 + .word mus_encounter_swimmer_2_000 .byte PATT - .word bgm_swimeye_2_001 + .word mus_encounter_swimmer_2_001 .byte PATT - .word bgm_swimeye_2_002 + .word mus_encounter_swimmer_2_002 .byte GOTO - .word bgm_swimeye_2_B1 + .word mus_encounter_swimmer_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_swimeye_3: - .byte VOL , 80*bgm_swimeye_mvl/mxv - .byte KEYSH , bgm_swimeye_key+0 +mus_encounter_swimmer_3: + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv + .byte KEYSH , mus_encounter_swimmer_key+0 .byte VOICE , 46 .byte PAN , c_v+9 .byte N06 , Cs5 , v092 @@ -203,7 +203,7 @@ bgm_swimeye_3: .byte BEND , c_v+0 .byte W48 .byte VOICE , 48 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte PAN , c_v-8 .byte N24 , Fs2 , v072 .byte W24 @@ -211,9 +211,9 @@ bgm_swimeye_3: .byte W24 .byte An2 .byte W24 -bgm_swimeye_3_B1: +mus_encounter_swimmer_3_B1: .byte VOICE , 48 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N30 , Bn2 , v072 .byte W36 .byte N12 , Gs2 @@ -254,40 +254,40 @@ bgm_swimeye_3_B1: .byte W12 .byte Ds4 .byte W12 -bgm_swimeye_3_000: +mus_encounter_swimmer_3_000: .byte VOICE , 60 .byte N21 , Bn2 , v072 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 29*bgm_swimeye_mvl/mxv + .byte 29*mus_encounter_swimmer_mvl/mxv .byte W03 .byte VOICE , 48 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N06 , Bn2 , v092 .byte W24 .byte Ds3 .byte W24 .byte PEND .byte PATT - .word bgm_swimeye_3_000 + .word mus_encounter_swimmer_3_000 .byte VOICE , 60 .byte N21 , An2 , v072 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 29*bgm_swimeye_mvl/mxv + .byte 29*mus_encounter_swimmer_mvl/mxv .byte W03 .byte VOICE , 48 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N06 , An2 , v092 .byte W24 .byte Fs3 @@ -306,15 +306,15 @@ bgm_swimeye_3_000: .byte Ds3 .byte W12 .byte GOTO - .word bgm_swimeye_3_B1 + .word mus_encounter_swimmer_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_swimeye_4: - .byte KEYSH , bgm_swimeye_key+0 +mus_encounter_swimmer_4: + .byte KEYSH , mus_encounter_swimmer_key+0 .byte VOICE , 80 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte PAN , c_v+48 .byte XCMD , xIECV , 13 .byte xIECL , 8 @@ -325,90 +325,90 @@ bgm_swimeye_4: .byte N06 .byte W24 .byte VOICE , 4 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Ds3 , v060 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , En3 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Fs3 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 -bgm_swimeye_4_B1: +mus_encounter_swimmer_4_B1: .byte VOICE , 80 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Gs3 , v060 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Gs4 , v052 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Gs3 , v060 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Gs4 , v052 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Gs3 , v060 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N12 , Cs4 , v052 .byte W12 .byte Fs2 , v060 @@ -423,13 +423,13 @@ bgm_swimeye_4_B1: .byte W12 .byte N24 , An4 , v052 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N12 , Fs2 , v060 .byte W12 .byte Bn2 @@ -438,16 +438,16 @@ bgm_swimeye_4_B1: .byte W12 .byte Ds3 .byte W12 -bgm_swimeye_4_000: +mus_encounter_swimmer_4_000: .byte N21 , En3 , v060 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N12 , En3 , v040 .byte W12 .byte Bn3 @@ -458,16 +458,16 @@ bgm_swimeye_4_000: .byte W12 .byte PEND .byte PATT - .word bgm_swimeye_4_000 + .word mus_encounter_swimmer_4_000 .byte N21 , Ds3 , v060 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N12 , Ds3 , v040 .byte W12 .byte An3 @@ -478,40 +478,40 @@ bgm_swimeye_4_000: .byte W12 .byte N21 , Fs4 , v060 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Fs3 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Bn3 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 .byte GOTO - .word bgm_swimeye_4_B1 + .word mus_encounter_swimmer_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_swimeye_5: - .byte KEYSH , bgm_swimeye_key+0 +mus_encounter_swimmer_5: + .byte KEYSH , mus_encounter_swimmer_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte XCMD , xIECV , 13 .byte xIECL , 8 .byte PAN , c_v+0 @@ -522,90 +522,90 @@ bgm_swimeye_5: .byte N06 .byte W24 .byte VOICE , 5 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Fs3 , v060 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Gs3 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , An3 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 -bgm_swimeye_5_B1: +mus_encounter_swimmer_5_B1: .byte VOICE , 81 - .byte VOL , 80*bgm_swimeye_mvl/mxv + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Bn3 , v060 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Bn4 , v052 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Bn3 , v060 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Bn4 , v052 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Bn3 , v060 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N12 , Fs4 , v052 .byte W12 .byte An2 , v060 @@ -620,13 +620,13 @@ bgm_swimeye_5_B1: .byte W12 .byte N24 , Bn4 , v052 .byte W12 - .byte VOL , 76*bgm_swimeye_mvl/mxv + .byte VOL , 76*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 65*bgm_swimeye_mvl/mxv + .byte 65*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 41*bgm_swimeye_mvl/mxv + .byte 41*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N12 , An2 , v060 .byte W12 .byte Ds3 @@ -635,16 +635,16 @@ bgm_swimeye_5_B1: .byte W12 .byte Fs3 .byte W12 -bgm_swimeye_5_000: +mus_encounter_swimmer_5_000: .byte N21 , Gs3 , v060 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte W06 .byte N12 , Gs3 , v040 .byte W12 @@ -656,16 +656,16 @@ bgm_swimeye_5_000: .byte W06 .byte PEND .byte PATT - .word bgm_swimeye_5_000 + .word mus_encounter_swimmer_5_000 .byte N21 , Fs3 , v060 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte W06 .byte N12 , Fs3 , v040 .byte W12 @@ -677,42 +677,42 @@ bgm_swimeye_5_000: .byte W06 .byte N21 , An4 , v060 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , An3 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 - .byte 80*bgm_swimeye_mvl/mxv + .byte 80*mus_encounter_swimmer_mvl/mxv .byte N21 , Ds4 .byte W12 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 62*bgm_swimeye_mvl/mxv + .byte 62*mus_encounter_swimmer_mvl/mxv .byte W03 - .byte 47*bgm_swimeye_mvl/mxv + .byte 47*mus_encounter_swimmer_mvl/mxv .byte W06 .byte GOTO - .word bgm_swimeye_5_B1 + .word mus_encounter_swimmer_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_swimeye_6: - .byte KEYSH , bgm_swimeye_key+0 - .byte VOL , 80*bgm_swimeye_mvl/mxv +mus_encounter_swimmer_6: + .byte KEYSH , mus_encounter_swimmer_key+0 + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte W72 .byte W72 -bgm_swimeye_6_B1: +mus_encounter_swimmer_6_B1: .byte VOICE , 73 .byte W72 .byte W72 @@ -750,17 +750,17 @@ bgm_swimeye_6_B1: .byte Fs5 .byte W12 .byte GOTO - .word bgm_swimeye_6_B1 + .word mus_encounter_swimmer_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_swimeye_7: - .byte KEYSH , bgm_swimeye_key+0 +mus_encounter_swimmer_7: + .byte KEYSH , mus_encounter_swimmer_key+0 .byte W72 .byte VOICE , 126 .byte PAN , c_v-48 - .byte VOL , 75*bgm_swimeye_mvl/mxv + .byte VOL , 75*mus_encounter_swimmer_mvl/mxv .byte N12 , Gs4 , v040 .byte W24 .byte VOICE , 127 @@ -769,8 +769,8 @@ bgm_swimeye_7: .byte VOICE , 126 .byte N12 , Gs4 , v040 .byte W12 -bgm_swimeye_7_B1: -bgm_swimeye_7_000: +mus_encounter_swimmer_7_B1: +mus_encounter_swimmer_7_000: .byte VOICE , 127 .byte N06 , Gs4 , v052 .byte W12 @@ -785,7 +785,7 @@ bgm_swimeye_7_000: .byte Gs4 , v040 .byte W12 .byte PEND -bgm_swimeye_7_001: +mus_encounter_swimmer_7_001: .byte N06 , Gs4 , v052 .byte W12 .byte Gs4 , v040 @@ -800,8 +800,8 @@ bgm_swimeye_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_swimeye_7_001 -bgm_swimeye_7_002: + .word mus_encounter_swimmer_7_001 +mus_encounter_swimmer_7_002: .byte N06 , Gs4 , v052 .byte W12 .byte Gs4 , v040 @@ -817,22 +817,22 @@ bgm_swimeye_7_002: .byte W12 .byte PEND .byte PATT - .word bgm_swimeye_7_000 + .word mus_encounter_swimmer_7_000 .byte PATT - .word bgm_swimeye_7_001 + .word mus_encounter_swimmer_7_001 .byte PATT - .word bgm_swimeye_7_001 + .word mus_encounter_swimmer_7_001 .byte PATT - .word bgm_swimeye_7_002 + .word mus_encounter_swimmer_7_002 .byte GOTO - .word bgm_swimeye_7_B1 + .word mus_encounter_swimmer_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_swimeye_8: - .byte KEYSH , bgm_swimeye_key+0 - .byte VOL , 80*bgm_swimeye_mvl/mxv +mus_encounter_swimmer_8: + .byte KEYSH , mus_encounter_swimmer_key+0 + .byte VOL , 80*mus_encounter_swimmer_mvl/mxv .byte W72 .byte N06 , Cn1 , v112 .byte W24 @@ -846,7 +846,7 @@ bgm_swimeye_8: .byte W03 .byte N06 , En1 , v088 .byte W12 -bgm_swimeye_8_B1: +mus_encounter_swimmer_8_B1: .byte VOICE , 0 .byte N06 , Cn1 , v112 .byte W24 @@ -856,7 +856,7 @@ bgm_swimeye_8_B1: .byte W12 .byte En1 , v088 .byte W12 -bgm_swimeye_8_000: +mus_encounter_swimmer_8_000: .byte N06 , Cn1 , v112 .byte W24 .byte En1 , v088 @@ -870,7 +870,7 @@ bgm_swimeye_8_000: .byte N06 , En1 , v088 .byte W12 .byte PEND -bgm_swimeye_8_001: +mus_encounter_swimmer_8_001: .byte N06 , Cn1 , v112 .byte W24 .byte En1 , v088 @@ -883,7 +883,7 @@ bgm_swimeye_8_001: .byte W12 .byte PEND .byte PATT - .word bgm_swimeye_8_000 + .word mus_encounter_swimmer_8_000 .byte N06 , Cn1 , v112 .byte W24 .byte En1 , v088 @@ -893,33 +893,33 @@ bgm_swimeye_8_001: .byte En1 , v088 .byte W12 .byte PATT - .word bgm_swimeye_8_000 + .word mus_encounter_swimmer_8_000 .byte PATT - .word bgm_swimeye_8_001 + .word mus_encounter_swimmer_8_001 .byte PATT - .word bgm_swimeye_8_000 + .word mus_encounter_swimmer_8_000 .byte GOTO - .word bgm_swimeye_8_B1 + .word mus_encounter_swimmer_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_swimeye: +mus_encounter_swimmer: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_swimeye_pri @ Priority - .byte bgm_swimeye_rev @ Reverb. + .byte mus_encounter_swimmer_pri @ Priority + .byte mus_encounter_swimmer_rev @ Reverb. - .word bgm_swimeye_grp + .word mus_encounter_swimmer_grp - .word bgm_swimeye_1 - .word bgm_swimeye_2 - .word bgm_swimeye_3 - .word bgm_swimeye_4 - .word bgm_swimeye_5 - .word bgm_swimeye_6 - .word bgm_swimeye_7 - .word bgm_swimeye_8 + .word mus_encounter_swimmer_1 + .word mus_encounter_swimmer_2 + .word mus_encounter_swimmer_3 + .word mus_encounter_swimmer_4 + .word mus_encounter_swimmer_5 + .word mus_encounter_swimmer_6 + .word mus_encounter_swimmer_7 + .word mus_encounter_swimmer_8 .end diff --git a/sound/songs/bgm_hutago.s b/sound/songs/mus_encounter_twins.s index 2987917fb..104e84ee4 100644 --- a/sound/songs/bgm_hutago.s +++ b/sound/songs/mus_encounter_twins.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_hutago_grp, voicegroup092 - .equ bgm_hutago_pri, 0 - .equ bgm_hutago_rev, reverb_set+50 - .equ bgm_hutago_mvl, 127 - .equ bgm_hutago_key, 0 - .equ bgm_hutago_tbs, 1 - .equ bgm_hutago_exg, 0 - .equ bgm_hutago_cmp, 1 + .equ mus_encounter_twins_grp, voicegroup092 + .equ mus_encounter_twins_pri, 0 + .equ mus_encounter_twins_rev, reverb_set+50 + .equ mus_encounter_twins_mvl, 127 + .equ mus_encounter_twins_key, 0 + .equ mus_encounter_twins_tbs, 1 + .equ mus_encounter_twins_exg, 0 + .equ mus_encounter_twins_cmp, 1 .section .rodata - .global bgm_hutago + .global mus_encounter_twins .align 2 @********************** Track 1 **********************@ -bgm_hutago_1: - .byte KEYSH , bgm_hutago_key+0 - .byte TEMPO , 134*bgm_hutago_tbs/2 +mus_encounter_twins_1: + .byte KEYSH , mus_encounter_twins_key+0 + .byte TEMPO , 134*mus_encounter_twins_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 39*bgm_hutago_mvl/mxv + .byte VOL , 39*mus_encounter_twins_mvl/mxv .byte N03 , En5 , v112 .byte W12 .byte En5 , v060 @@ -52,7 +52,7 @@ bgm_hutago_1: .byte W12 .byte En5 , v112 .byte W12 -bgm_hutago_1_B1: +mus_encounter_twins_1_B1: .byte N03 , En5 , v112 .byte W12 .byte En5 , v064 @@ -134,22 +134,22 @@ bgm_hutago_1_B1: .byte N03 .byte W12 .byte GOTO - .word bgm_hutago_1_B1 + .word mus_encounter_twins_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_hutago_2: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_2: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 39*bgm_hutago_mvl/mxv + .byte VOL , 39*mus_encounter_twins_mvl/mxv .byte W96 .byte W24 .byte N06 , Gn5 , v096 .byte W72 -bgm_hutago_2_B1: +mus_encounter_twins_2_B1: .byte W96 .byte W36 .byte N06 , Gn5 , v080 @@ -163,18 +163,18 @@ bgm_hutago_2_B1: .byte N06 .byte W60 .byte GOTO - .word bgm_hutago_2_B1 + .word mus_encounter_twins_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_hutago_3: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_3: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 38 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 75*bgm_hutago_mvl/mxv + .byte VOL , 75*mus_encounter_twins_mvl/mxv .byte BEND , c_v-2 .byte W03 .byte c_v+0 @@ -196,7 +196,7 @@ bgm_hutago_3: .byte W12 .byte An1 .byte W12 -bgm_hutago_3_B1: +mus_encounter_twins_3_B1: .byte N24 , Gn1 , v112 .byte W06 .byte BEND , c_v+3 @@ -287,17 +287,17 @@ bgm_hutago_3_B1: .byte An1 .byte W12 .byte GOTO - .word bgm_hutago_3_B1 + .word mus_encounter_twins_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_hutago_4: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_4: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte PAN , c_v-35 - .byte VOL , 46*bgm_hutago_mvl/mxv + .byte VOL , 46*mus_encounter_twins_mvl/mxv .byte N06 , An3 , v112 .byte W24 .byte Cn4 @@ -326,7 +326,7 @@ bgm_hutago_4: .byte W03 .byte Cn3 .byte W03 -bgm_hutago_4_B1: +mus_encounter_twins_4_B1: .byte N06 , Dn3 , v112 .byte W12 .byte N03 , Dn3 , v068 @@ -422,23 +422,23 @@ bgm_hutago_4_B1: .byte c_v+0 .byte W06 .byte GOTO - .word bgm_hutago_4_B1 + .word mus_encounter_twins_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_hutago_5: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_5: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 24 .byte LFOS , 44 - .byte VOL , 55*bgm_hutago_mvl/mxv + .byte VOL , 55*mus_encounter_twins_mvl/mxv .byte W12 .byte N03 , Cs5 , v112 .byte W24 .byte N03 .byte W60 .byte W96 -bgm_hutago_5_B1: +mus_encounter_twins_5_B1: .byte W96 .byte W96 .byte W96 @@ -448,18 +448,18 @@ bgm_hutago_5_B1: .byte Cs5 , v080 .byte W36 .byte GOTO - .word bgm_hutago_5_B1 + .word mus_encounter_twins_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_hutago_6: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_6: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 56*bgm_hutago_mvl/mxv + .byte VOL , 56*mus_encounter_twins_mvl/mxv .byte BEND , c_v+0 .byte N06 , Dn4 , v112 .byte W12 @@ -504,7 +504,7 @@ bgm_hutago_6: .byte W03 .byte An3 .byte W03 -bgm_hutago_6_B1: +mus_encounter_twins_6_B1: .byte N24 , Bn3 , v112 .byte W12 .byte BEND , c_v-5 @@ -601,18 +601,18 @@ bgm_hutago_6_B1: .byte c_v+0 .byte W06 .byte GOTO - .word bgm_hutago_6_B1 + .word mus_encounter_twins_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_hutago_7: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_7: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 - .byte VOL , 40*bgm_hutago_mvl/mxv + .byte VOL , 40*mus_encounter_twins_mvl/mxv .byte PAN , c_v-62 .byte W96 .byte N03 , An3 , v112 @@ -625,7 +625,7 @@ bgm_hutago_7: .byte W06 .byte N36 , Dn3 .byte W72 -bgm_hutago_7_B1: +mus_encounter_twins_7_B1: .byte PAN , c_v+0 .byte N03 , Dn3 , v112 .byte W12 @@ -649,7 +649,7 @@ bgm_hutago_7_B1: .byte W12 .byte Dn3 .byte W12 -bgm_hutago_7_000: +mus_encounter_twins_7_000: .byte N03 , Cn3 , v112 .byte W12 .byte Fn3 @@ -696,21 +696,21 @@ bgm_hutago_7_000: .byte Dn3 .byte W12 .byte PATT - .word bgm_hutago_7_000 + .word mus_encounter_twins_7_000 .byte GOTO - .word bgm_hutago_7_B1 + .word mus_encounter_twins_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_hutago_8: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_8: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+63 - .byte VOL , 40*bgm_hutago_mvl/mxv + .byte VOL , 40*mus_encounter_twins_mvl/mxv .byte W96 .byte N03 , Fs4 , v112 .byte W06 @@ -722,8 +722,8 @@ bgm_hutago_8: .byte W06 .byte N36 , An3 .byte W72 -bgm_hutago_8_B1: -bgm_hutago_8_000: +mus_encounter_twins_8_B1: +mus_encounter_twins_8_000: .byte PAN , c_v+63 .byte N03 , Gn3 , v112 .byte W12 @@ -751,7 +751,7 @@ bgm_hutago_8_000: .byte Bn3 .byte W12 .byte PEND -bgm_hutago_8_001: +mus_encounter_twins_8_001: .byte PAN , c_v+63 .byte N03 , An3 , v112 .byte W12 @@ -780,19 +780,19 @@ bgm_hutago_8_001: .byte W12 .byte PEND .byte PATT - .word bgm_hutago_8_000 + .word mus_encounter_twins_8_000 .byte PATT - .word bgm_hutago_8_001 + .word mus_encounter_twins_8_001 .byte GOTO - .word bgm_hutago_8_B1 + .word mus_encounter_twins_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_hutago_9: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_9: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 0 - .byte VOL , 58*bgm_hutago_mvl/mxv + .byte VOL , 58*mus_encounter_twins_mvl/mxv .byte PAN , c_v+0 .byte N06 , En3 , v112 .byte W12 @@ -820,8 +820,8 @@ bgm_hutago_9: .byte W06 .byte Dn3 , v112 .byte W72 -bgm_hutago_9_B1: -bgm_hutago_9_000: +mus_encounter_twins_9_B1: +mus_encounter_twins_9_000: .byte N06 , En3 , v112 .byte W12 .byte En3 , v072 @@ -842,7 +842,7 @@ bgm_hutago_9_000: .byte N06 .byte W36 .byte PATT - .word bgm_hutago_9_000 + .word mus_encounter_twins_9_000 .byte N06 , En3 , v112 .byte W12 .byte En3 , v072 @@ -856,18 +856,18 @@ bgm_hutago_9_000: .byte N06 .byte W12 .byte GOTO - .word bgm_hutago_9_B1 + .word mus_encounter_twins_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_hutago_10: - .byte KEYSH , bgm_hutago_key+0 +mus_encounter_twins_10: + .byte KEYSH , mus_encounter_twins_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 - .byte VOL , 27*bgm_hutago_mvl/mxv + .byte VOL , 27*mus_encounter_twins_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+2 .byte N06 , Dn4 , v112 @@ -905,7 +905,7 @@ bgm_hutago_10: .byte W03 .byte An3 .byte W03 -bgm_hutago_10_B1: +mus_encounter_twins_10_B1: .byte N06 , Bn3 , v112 .byte W24 .byte Gn3 @@ -981,29 +981,29 @@ bgm_hutago_10_B1: .byte N06 , Dn3 .byte W24 .byte GOTO - .word bgm_hutago_10_B1 + .word mus_encounter_twins_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_hutago: +mus_encounter_twins: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_hutago_pri @ Priority - .byte bgm_hutago_rev @ Reverb. + .byte mus_encounter_twins_pri @ Priority + .byte mus_encounter_twins_rev @ Reverb. - .word bgm_hutago_grp + .word mus_encounter_twins_grp - .word bgm_hutago_1 - .word bgm_hutago_2 - .word bgm_hutago_3 - .word bgm_hutago_4 - .word bgm_hutago_5 - .word bgm_hutago_6 - .word bgm_hutago_7 - .word bgm_hutago_8 - .word bgm_hutago_9 - .word bgm_hutago_10 + .word mus_encounter_twins_1 + .word mus_encounter_twins_2 + .word mus_encounter_twins_3 + .word mus_encounter_twins_4 + .word mus_encounter_twins_5 + .word mus_encounter_twins_6 + .word mus_encounter_twins_7 + .word mus_encounter_twins_8 + .word mus_encounter_twins_9 + .word mus_encounter_twins_10 .end diff --git a/sound/songs/bgm_end.s b/sound/songs/mus_end.s index 8f95bbbdf..00365c689 100644 --- a/sound/songs/bgm_end.s +++ b/sound/songs/mus_end.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_end_grp, voicegroup099 - .equ bgm_end_pri, 0 - .equ bgm_end_rev, reverb_set+50 - .equ bgm_end_mvl, 127 - .equ bgm_end_key, 0 - .equ bgm_end_tbs, 1 - .equ bgm_end_exg, 0 - .equ bgm_end_cmp, 1 + .equ mus_end_grp, voicegroup099 + .equ mus_end_pri, 0 + .equ mus_end_rev, reverb_set+50 + .equ mus_end_mvl, 127 + .equ mus_end_key, 0 + .equ mus_end_tbs, 1 + .equ mus_end_exg, 0 + .equ mus_end_cmp, 1 .section .rodata - .global bgm_end + .global mus_end .align 2 @********************** Track 1 **********************@ -bgm_end_1: - .byte KEYSH , bgm_end_key+0 - .byte TEMPO , 138*bgm_end_tbs/2 +mus_end_1: + .byte KEYSH , mus_end_key+0 + .byte TEMPO , 138*mus_end_tbs/2 .byte VOICE , 24 .byte PAN , c_v+0 - .byte VOL , 30*bgm_end_mvl/mxv + .byte VOL , 30*mus_end_mvl/mxv .byte N03 , Cn4 , v112 .byte W24 .byte Dn4 @@ -33,87 +33,87 @@ bgm_end_1: .byte W03 .byte Ds4 .byte W03 -bgm_end_1_B1: - .byte TEMPO , 138*bgm_end_tbs/2 +mus_end_1_B1: + .byte TEMPO , 138*mus_end_tbs/2 .byte N03 , Gn4 , v112 .byte W42 .byte As3 , v064 .byte W03 .byte Ds4 , v068 .byte W03 - .byte TEMPO , 132*bgm_end_tbs/2 + .byte TEMPO , 132*mus_end_tbs/2 .byte An4 , v112 .byte W24 - .byte TEMPO , 124*bgm_end_tbs/2 + .byte TEMPO , 124*mus_end_tbs/2 .byte W24 - .byte TEMPO , 140*bgm_end_tbs/2 + .byte TEMPO , 140*mus_end_tbs/2 .byte As4 .byte W42 .byte Gn4 , v052 .byte W03 .byte As4 , v056 .byte W03 - .byte TEMPO , 132*bgm_end_tbs/2 + .byte TEMPO , 132*mus_end_tbs/2 .byte Dn5 , v068 .byte W03 .byte Fn5 , v112 .byte W21 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte W24 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte W96 .byte Ds5 .byte W24 .byte Dn5 .byte W24 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte Cn5 .byte W24 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte W12 - .byte TEMPO , 116*bgm_end_tbs/2 + .byte TEMPO , 116*mus_end_tbs/2 .byte Ds5 .byte W06 .byte Dn4 , v064 .byte W03 .byte Fn4 , v072 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte An4 , v076 .byte W03 .byte Dn5 , v112 .byte W44 .byte W01 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte N01 , Fn4 .byte W16 .byte Gn4 .byte W08 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W08 .byte Gs4 .byte W04 - .byte TEMPO , 108*bgm_end_tbs/2 + .byte TEMPO , 108*mus_end_tbs/2 .byte W06 .byte N03 , An3 , v068 .byte W03 .byte Dn4 , v076 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte An4 , v112 .byte W48 - .byte TEMPO , 132*bgm_end_tbs/2 + .byte TEMPO , 132*mus_end_tbs/2 .byte Cn5 .byte W24 - .byte TEMPO , 124*bgm_end_tbs/2 + .byte TEMPO , 124*mus_end_tbs/2 .byte W12 - .byte TEMPO , 114*bgm_end_tbs/2 + .byte TEMPO , 114*mus_end_tbs/2 .byte W06 .byte Dn4 , v068 .byte W03 .byte Gn4 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte N01 , Cn5 , v112 .byte W16 .byte Dn5 @@ -129,12 +129,12 @@ bgm_end_1_B1: .byte W03 .byte Fn4 , v068 .byte W03 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte N01 , As4 , v112 .byte W16 .byte An4 .byte W08 - .byte TEMPO , 100*bgm_end_tbs/2 + .byte TEMPO , 100*mus_end_tbs/2 .byte W08 .byte As4 .byte W04 @@ -146,7 +146,7 @@ bgm_end_1_B1: .byte W03 .byte Ds4 .byte W03 - .byte TEMPO , 140*bgm_end_tbs/2 + .byte TEMPO , 140*mus_end_tbs/2 .byte Gn4 , v112 .byte W42 .byte As3 , v064 @@ -161,25 +161,25 @@ bgm_end_1_B1: .byte W03 .byte As4 , v056 .byte W03 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte Ds5 , v068 .byte W03 .byte Gn5 , v112 .byte W21 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W12 - .byte TEMPO , 112*bgm_end_tbs/2 + .byte TEMPO , 112*mus_end_tbs/2 .byte W12 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte W96 .byte An5 .byte W24 .byte Gn5 .byte W24 - .byte TEMPO , 132*bgm_end_tbs/2 + .byte TEMPO , 132*mus_end_tbs/2 .byte Fn5 .byte W24 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte W12 .byte Ds5 .byte W06 @@ -187,7 +187,7 @@ bgm_end_1_B1: .byte W03 .byte An4 , v072 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte Dn5 , v076 .byte W03 .byte Fn5 , v112 @@ -203,38 +203,38 @@ bgm_end_1_B1: .byte W24 .byte N01 , Gs5 .byte W24 - .byte TEMPO , 130*bgm_end_tbs/2 + .byte TEMPO , 130*mus_end_tbs/2 .byte W16 .byte Gn5 .byte W08 - .byte TEMPO , 126*bgm_end_tbs/2 + .byte TEMPO , 126*mus_end_tbs/2 .byte W08 .byte Dn5 .byte W04 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W06 .byte N03 , Gn4 , v068 .byte W03 .byte As4 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte Fn5 , v112 .byte W24 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W24 .byte Ds5 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte W21 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte W24 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte Dn5 .byte W48 - .byte TEMPO , 130*bgm_end_tbs/2 + .byte TEMPO , 130*mus_end_tbs/2 .byte Fn5 .byte W24 - .byte TEMPO , 120*bgm_end_tbs/2 + .byte TEMPO , 120*mus_end_tbs/2 .byte W12 .byte Ds3 , v064 .byte W03 @@ -244,7 +244,7 @@ bgm_end_1_B1: .byte W03 .byte Ds4 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte An4 , v112 .byte W12 .byte As4 @@ -257,17 +257,17 @@ bgm_end_1_B1: .byte W68 .byte W01 .byte W48 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte W24 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W12 - .byte TEMPO , 108*bgm_end_tbs/2 + .byte TEMPO , 108*mus_end_tbs/2 .byte W06 .byte En4 , v068 .byte W03 .byte Gn4 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte An4 , v112 .byte W12 .byte As4 @@ -279,12 +279,12 @@ bgm_end_1_B1: .byte Gn5 , v112 .byte W72 .byte W48 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte N01 , An5 .byte W16 .byte Gn5 .byte W08 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W08 .byte En5 .byte W10 @@ -292,8 +292,8 @@ bgm_end_1_B1: .byte W03 .byte Cn5 , v064 .byte W03 -bgm_end_1_000: - .byte TEMPO , 138*bgm_end_tbs/2 +mus_end_1_000: + .byte TEMPO , 138*mus_end_tbs/2 .byte N03 , Fn5 , v112 .byte W96 .byte PEND @@ -321,27 +321,27 @@ bgm_end_1_000: .byte Dn5 .byte W44 .byte W01 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte Ds5 .byte W24 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W24 .byte PATT - .word bgm_end_1_000 + .word mus_end_1_000 .byte W24 .byte N03 , Dn5 , v112 .byte W24 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte Ds5 .byte W24 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte Fn5 .byte W18 .byte As4 , v056 .byte W03 .byte Dn5 , v060 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte As5 , v112 .byte W24 .byte Fn5 @@ -350,35 +350,35 @@ bgm_end_1_000: .byte W03 .byte Dn5 .byte W03 - .byte TEMPO , 132*bgm_end_tbs/2 + .byte TEMPO , 132*mus_end_tbs/2 .byte N01 , Ds5 , v112 .byte W16 .byte Fn5 .byte W08 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte W08 .byte Dn5 .byte W04 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W12 -bgm_end_1_001: - .byte TEMPO , 138*bgm_end_tbs/2 +mus_end_1_001: + .byte TEMPO , 138*mus_end_tbs/2 .byte N03 , Cn5 , v112 .byte W96 .byte PEND -bgm_end_1_002: +mus_end_1_002: .byte W48 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte W24 - .byte TEMPO , 112*bgm_end_tbs/2 + .byte TEMPO , 112*mus_end_tbs/2 .byte W24 .byte PEND - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte W96 .byte W48 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte W24 - .byte TEMPO , 108*bgm_end_tbs/2 + .byte TEMPO , 108*mus_end_tbs/2 .byte W15 .byte N03 , Cn4 , v056 .byte W03 @@ -386,7 +386,7 @@ bgm_end_1_002: .byte W03 .byte Fn4 , v064 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte An4 .byte W03 .byte Cn5 , v112 @@ -396,14 +396,14 @@ bgm_end_1_002: .byte W48 .byte Ds5 .byte W60 - .byte TEMPO , 134*bgm_end_tbs/2 + .byte TEMPO , 134*mus_end_tbs/2 .byte W12 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte W12 - .byte TEMPO , 126*bgm_end_tbs/2 + .byte TEMPO , 126*mus_end_tbs/2 .byte W12 -bgm_end_1_003: - .byte TEMPO , 138*bgm_end_tbs/2 +mus_end_1_003: + .byte TEMPO , 138*mus_end_tbs/2 .byte W24 .byte N03 , Cn5 , v112 .byte W24 @@ -416,40 +416,40 @@ bgm_end_1_003: .byte W24 .byte Gn5 .byte W24 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte An5 .byte W24 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte W12 - .byte TEMPO , 102*bgm_end_tbs/2 + .byte TEMPO , 102*mus_end_tbs/2 .byte Cn6 .byte W06 .byte Fn4 , v064 .byte W03 .byte As4 , v072 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte Dn5 .byte W03 .byte Fn5 , v112 .byte W92 .byte W01 .byte PATT - .word bgm_end_1_002 - .byte TEMPO , 138*bgm_end_tbs/2 + .word mus_end_1_002 + .byte TEMPO , 138*mus_end_tbs/2 .byte W96 .byte W48 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W24 - .byte TEMPO , 112*bgm_end_tbs/2 + .byte TEMPO , 112*mus_end_tbs/2 .byte W12 - .byte TEMPO , 102*bgm_end_tbs/2 + .byte TEMPO , 102*mus_end_tbs/2 .byte W06 .byte N03 , Dn4 , v064 .byte W03 .byte Fn4 , v068 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte As4 .byte W03 .byte Dn5 , v112 @@ -457,26 +457,26 @@ bgm_end_1_003: .byte W01 .byte Ds5 .byte W24 - .byte TEMPO , 132*bgm_end_tbs/2 + .byte TEMPO , 132*mus_end_tbs/2 .byte W12 - .byte TEMPO , 126*bgm_end_tbs/2 + .byte TEMPO , 126*mus_end_tbs/2 .byte W12 .byte PATT - .word bgm_end_1_000 + .word mus_end_1_000 .byte W24 .byte N03 , Dn5 , v112 .byte W24 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte Ds5 .byte W24 - .byte TEMPO , 116*bgm_end_tbs/2 + .byte TEMPO , 116*mus_end_tbs/2 .byte Fn5 .byte W18 .byte Dn5 , v064 .byte W03 .byte Fn5 , v068 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte As5 , v112 .byte W24 .byte Fn5 @@ -485,28 +485,28 @@ bgm_end_1_003: .byte W03 .byte Cn5 .byte W03 - .byte TEMPO , 128*bgm_end_tbs/2 + .byte TEMPO , 128*mus_end_tbs/2 .byte N01 , Ds5 , v112 .byte W16 .byte Fn5 .byte W08 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte W08 .byte Dn5 .byte W16 .byte PATT - .word bgm_end_1_001 + .word mus_end_1_001 .byte W48 - .byte TEMPO , 126*bgm_end_tbs/2 + .byte TEMPO , 126*mus_end_tbs/2 .byte W24 - .byte TEMPO , 108*bgm_end_tbs/2 + .byte TEMPO , 108*mus_end_tbs/2 .byte W24 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte W96 .byte W48 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte W24 - .byte TEMPO , 108*bgm_end_tbs/2 + .byte TEMPO , 108*mus_end_tbs/2 .byte W15 .byte N03 , Ds4 , v064 .byte W03 @@ -514,32 +514,32 @@ bgm_end_1_003: .byte W03 .byte An4 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte Cn5 , v112 .byte W48 .byte Dn5 .byte W24 - .byte TEMPO , 132*bgm_end_tbs/2 + .byte TEMPO , 132*mus_end_tbs/2 .byte W12 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte W12 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte Ds5 .byte W48 - .byte TEMPO , 134*bgm_end_tbs/2 + .byte TEMPO , 134*mus_end_tbs/2 .byte W24 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte W24 .byte PATT - .word bgm_end_1_003 + .word mus_end_1_003 .byte N03 , An5 , v112 .byte W24 .byte Gn5 .byte W24 - .byte TEMPO , 122*bgm_end_tbs/2 + .byte TEMPO , 122*mus_end_tbs/2 .byte An5 .byte W24 - .byte TEMPO , 102*bgm_end_tbs/2 + .byte TEMPO , 102*mus_end_tbs/2 .byte W12 .byte Cn6 .byte W06 @@ -547,27 +547,27 @@ bgm_end_1_003: .byte W03 .byte Fn5 , v068 .byte W03 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte As5 , v064 .byte W03 .byte Dn6 , v112 .byte W92 .byte W01 .byte W48 - .byte TEMPO , 130*bgm_end_tbs/2 + .byte TEMPO , 130*mus_end_tbs/2 .byte W24 - .byte TEMPO , 112*bgm_end_tbs/2 + .byte TEMPO , 112*mus_end_tbs/2 .byte W24 - .byte TEMPO , 138*bgm_end_tbs/2 + .byte TEMPO , 138*mus_end_tbs/2 .byte W96 .byte W24 - .byte TEMPO , 132*bgm_end_tbs/2 + .byte TEMPO , 132*mus_end_tbs/2 .byte As3 .byte W24 - .byte TEMPO , 118*bgm_end_tbs/2 + .byte TEMPO , 118*mus_end_tbs/2 .byte Cn4 .byte W24 - .byte TEMPO , 102*bgm_end_tbs/2 + .byte TEMPO , 102*mus_end_tbs/2 .byte Dn4 .byte W12 .byte Ds3 , v064 @@ -579,22 +579,22 @@ bgm_end_1_003: .byte Ds4 .byte W03 .byte GOTO - .word bgm_end_1_B1 + .word mus_end_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_end_2: - .byte KEYSH , bgm_end_key+0 +mus_end_2: + .byte KEYSH , mus_end_key+0 .byte VOICE , 24 .byte PAN , c_v+0 - .byte VOL , 36*bgm_end_mvl/mxv + .byte VOL , 36*mus_end_mvl/mxv .byte N03 , Gs2 , v112 .byte W24 .byte Fn2 .byte W24 -bgm_end_2_B1: -bgm_end_2_000: +mus_end_2_B1: +mus_end_2_000: .byte N03 , Ds2 , v112 .byte W24 .byte As2 , v068 @@ -604,7 +604,7 @@ bgm_end_2_000: .byte As2 .byte W24 .byte PEND -bgm_end_2_001: +mus_end_2_001: .byte N03 , Gn3 , v068 .byte W24 .byte As2 @@ -614,7 +614,7 @@ bgm_end_2_001: .byte As2 .byte W24 .byte PEND -bgm_end_2_002: +mus_end_2_002: .byte N03 , Ds2 , v112 .byte W24 .byte Cn3 , v068 @@ -624,7 +624,7 @@ bgm_end_2_002: .byte Cn3 .byte W24 .byte PEND -bgm_end_2_003: +mus_end_2_003: .byte N03 , An3 , v068 .byte W24 .byte Cn3 @@ -634,7 +634,7 @@ bgm_end_2_003: .byte Cn3 .byte W24 .byte PEND -bgm_end_2_004: +mus_end_2_004: .byte N03 , Dn2 , v112 .byte W24 .byte An2 , v068 @@ -644,7 +644,7 @@ bgm_end_2_004: .byte An2 .byte W24 .byte PEND -bgm_end_2_005: +mus_end_2_005: .byte N03 , Fn3 , v068 .byte W24 .byte An2 @@ -663,17 +663,17 @@ bgm_end_2_005: .byte En2 .byte W48 .byte PATT - .word bgm_end_2_000 + .word mus_end_2_000 .byte PATT - .word bgm_end_2_001 + .word mus_end_2_001 .byte PATT - .word bgm_end_2_002 + .word mus_end_2_002 .byte PATT - .word bgm_end_2_003 + .word mus_end_2_003 .byte PATT - .word bgm_end_2_004 + .word mus_end_2_004 .byte PATT - .word bgm_end_2_005 + .word mus_end_2_005 .byte N01 , Gn3 , v112 .byte W32 .byte Dn3 , v100 @@ -703,7 +703,7 @@ bgm_end_2_005: .byte As2 .byte W24 .byte PATT - .word bgm_end_2_001 + .word mus_end_2_001 .byte N03 , En2 , v112 .byte W24 .byte As2 , v068 @@ -713,7 +713,7 @@ bgm_end_2_005: .byte As2 .byte W24 .byte PATT - .word bgm_end_2_001 + .word mus_end_2_001 .byte N03 , Fn2 , v112 .byte W24 .byte As2 , v068 @@ -733,7 +733,7 @@ bgm_end_2_005: .byte Cn4 , v080 .byte W96 .byte W96 -bgm_end_2_006: +mus_end_2_006: .byte N03 , As2 , v112 .byte W24 .byte Fn3 , v068 @@ -743,7 +743,7 @@ bgm_end_2_006: .byte Fn3 .byte W24 .byte PEND -bgm_end_2_007: +mus_end_2_007: .byte N03 , As2 , v112 .byte W24 .byte Gn3 , v068 @@ -753,7 +753,7 @@ bgm_end_2_007: .byte Gn3 .byte W24 .byte PEND -bgm_end_2_008: +mus_end_2_008: .byte N03 , As2 , v112 .byte W24 .byte An3 , v068 @@ -771,7 +771,7 @@ bgm_end_2_008: .byte W24 .byte Dn3 .byte W24 -bgm_end_2_009: +mus_end_2_009: .byte N03 , Fn2 , v112 .byte W24 .byte Cn3 , v068 @@ -781,7 +781,7 @@ bgm_end_2_009: .byte Cn3 .byte W24 .byte PEND -bgm_end_2_010: +mus_end_2_010: .byte N03 , Fn2 , v112 .byte W24 .byte Dn3 , v068 @@ -791,7 +791,7 @@ bgm_end_2_010: .byte Dn3 .byte W24 .byte PEND -bgm_end_2_011: +mus_end_2_011: .byte N03 , Fn2 , v112 .byte W24 .byte Ds3 , v068 @@ -801,7 +801,7 @@ bgm_end_2_011: .byte Ds3 .byte W24 .byte PEND -bgm_end_2_012: +mus_end_2_012: .byte N03 , Fn2 , v112 .byte W24 .byte Fn3 , v068 @@ -812,8 +812,8 @@ bgm_end_2_012: .byte W24 .byte PEND .byte PATT - .word bgm_end_2_011 -bgm_end_2_013: + .word mus_end_2_011 +mus_end_2_013: .byte N03 , Fn2 , v112 .byte W24 .byte Fn3 , v068 @@ -824,15 +824,15 @@ bgm_end_2_013: .byte W24 .byte PEND .byte PATT - .word bgm_end_2_011 + .word mus_end_2_011 .byte PATT - .word bgm_end_2_013 + .word mus_end_2_013 .byte PATT - .word bgm_end_2_006 + .word mus_end_2_006 .byte PATT - .word bgm_end_2_007 + .word mus_end_2_007 .byte PATT - .word bgm_end_2_008 + .word mus_end_2_008 .byte N03 , As2 , v112 .byte W24 .byte Cn4 , v068 @@ -842,11 +842,11 @@ bgm_end_2_013: .byte Fn3 .byte W24 .byte PATT - .word bgm_end_2_006 + .word mus_end_2_006 .byte PATT - .word bgm_end_2_007 + .word mus_end_2_007 .byte PATT - .word bgm_end_2_008 + .word mus_end_2_008 .byte N03 , As2 , v112 .byte W24 .byte As3 , v068 @@ -856,21 +856,21 @@ bgm_end_2_013: .byte As3 .byte W24 .byte PATT - .word bgm_end_2_009 + .word mus_end_2_009 .byte PATT - .word bgm_end_2_010 + .word mus_end_2_010 .byte PATT - .word bgm_end_2_011 + .word mus_end_2_011 .byte PATT - .word bgm_end_2_012 + .word mus_end_2_012 .byte PATT - .word bgm_end_2_011 + .word mus_end_2_011 .byte PATT - .word bgm_end_2_013 + .word mus_end_2_013 .byte PATT - .word bgm_end_2_011 + .word mus_end_2_011 .byte PATT - .word bgm_end_2_013 + .word mus_end_2_013 .byte N03 , As3 , v112 .byte W24 .byte Fn3 @@ -904,21 +904,21 @@ bgm_end_2_013: .byte Fn2 .byte W24 .byte GOTO - .word bgm_end_2_B1 + .word mus_end_2_B1 .byte FINE @******************************************************@ .align 2 -bgm_end: +mus_end: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte bgm_end_pri @ Priority - .byte bgm_end_rev @ Reverb. + .byte mus_end_pri @ Priority + .byte mus_end_rev @ Reverb. - .word bgm_end_grp + .word mus_end_grp - .word bgm_end_1 - .word bgm_end_2 + .word mus_end_1 + .word mus_end_2 .end diff --git a/sound/songs/bgm_rainbow.s b/sound/songs/mus_ever_grande.s index ab04ca574..ae18d067e 100644 --- a/sound/songs/bgm_rainbow.s +++ b/sound/songs/mus_ever_grande.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_rainbow_grp, voicegroup065 - .equ bgm_rainbow_pri, 0 - .equ bgm_rainbow_rev, reverb_set+50 - .equ bgm_rainbow_mvl, 127 - .equ bgm_rainbow_key, 0 - .equ bgm_rainbow_tbs, 1 - .equ bgm_rainbow_exg, 0 - .equ bgm_rainbow_cmp, 1 + .equ mus_ever_grande_grp, voicegroup065 + .equ mus_ever_grande_pri, 0 + .equ mus_ever_grande_rev, reverb_set+50 + .equ mus_ever_grande_mvl, 127 + .equ mus_ever_grande_key, 0 + .equ mus_ever_grande_tbs, 1 + .equ mus_ever_grande_exg, 0 + .equ mus_ever_grande_cmp, 1 .section .rodata - .global bgm_rainbow + .global mus_ever_grande .align 2 @********************** Track 1 **********************@ -bgm_rainbow_1: - .byte KEYSH , bgm_rainbow_key+0 - .byte TEMPO , 128*bgm_rainbow_tbs/2 +mus_ever_grande_1: + .byte KEYSH , mus_ever_grande_key+0 + .byte TEMPO , 128*mus_ever_grande_tbs/2 .byte VOICE , 24 .byte LFOS , 44 .byte PAN , c_v+30 - .byte VOL , 59*bgm_rainbow_mvl/mxv + .byte VOL , 59*mus_ever_grande_mvl/mxv .byte N04 , Gn2 , v112 .byte W04 .byte As2 @@ -108,7 +108,7 @@ bgm_rainbow_1: .byte W24 .byte Fn2 .byte W24 -bgm_rainbow_1_B1: +mus_ever_grande_1_B1: .byte N20 , As2 , v112 .byte W24 .byte N24 , Fn2 @@ -441,17 +441,17 @@ bgm_rainbow_1_B1: .byte Cn4 .byte W48 .byte GOTO - .word bgm_rainbow_1_B1 + .word mus_ever_grande_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_rainbow_2: - .byte KEYSH , bgm_rainbow_key+0 +mus_ever_grande_2: + .byte KEYSH , mus_ever_grande_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 81*bgm_rainbow_mvl/mxv + .byte VOL , 81*mus_ever_grande_mvl/mxv .byte N04 , Fn3 , v112 .byte W04 .byte Gn3 @@ -486,8 +486,8 @@ bgm_rainbow_2: .byte W48 .byte Cn4 .byte W48 -bgm_rainbow_2_B1: -bgm_rainbow_2_000: +mus_ever_grande_2_B1: +mus_ever_grande_2_000: .byte N16 , Dn4 , v112 .byte W16 .byte N04 , Ds4 @@ -505,7 +505,7 @@ bgm_rainbow_2_000: .byte PEND .byte W96 .byte EOT -bgm_rainbow_2_001: +mus_ever_grande_2_001: .byte N16 , Dn4 , v112 .byte W16 .byte N04 , Ds4 @@ -521,7 +521,7 @@ bgm_rainbow_2_001: .byte Dn4 .byte W08 .byte PEND -bgm_rainbow_2_002: +mus_ever_grande_2_002: .byte N16 , Cn4 , v112 .byte W16 .byte N04 , Dn4 @@ -535,7 +535,7 @@ bgm_rainbow_2_002: .byte Dn4 .byte W24 .byte PEND -bgm_rainbow_2_003: +mus_ever_grande_2_003: .byte N48 , As3 , v112 .byte W48 .byte N24 , Cn4 @@ -568,15 +568,15 @@ bgm_rainbow_2_003: .byte N56 , Cn4 .byte W56 .byte PATT - .word bgm_rainbow_2_000 + .word mus_ever_grande_2_000 .byte W96 .byte EOT , Cn4 .byte PATT - .word bgm_rainbow_2_001 + .word mus_ever_grande_2_001 .byte PATT - .word bgm_rainbow_2_002 + .word mus_ever_grande_2_002 .byte PATT - .word bgm_rainbow_2_003 + .word mus_ever_grande_2_003 .byte N24 , Dn4 , v112 .byte W24 .byte N04 , Fn4 @@ -745,17 +745,17 @@ bgm_rainbow_2_003: .byte W96 .byte EOT .byte GOTO - .word bgm_rainbow_2_B1 + .word mus_ever_grande_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_rainbow_3: - .byte KEYSH , bgm_rainbow_key+0 +mus_ever_grande_3: + .byte KEYSH , mus_ever_grande_key+0 .byte VOICE , 35 .byte BENDR , 12 .byte LFOS , 44 - .byte VOL , 86*bgm_rainbow_mvl/mxv + .byte VOL , 86*mus_ever_grande_mvl/mxv .byte PAN , c_v+0 .byte W24 .byte N04 , Cn1 , v096 @@ -834,7 +834,7 @@ bgm_rainbow_3: .byte W08 .byte An1 , v084 .byte W08 -bgm_rainbow_3_B1: +mus_ever_grande_3_B1: .byte N04 , As1 , v112 .byte W16 .byte N04 @@ -853,7 +853,7 @@ bgm_rainbow_3_B1: .byte W16 .byte N04 .byte W08 -bgm_rainbow_3_000: +mus_ever_grande_3_000: .byte N04 , An1 , v112 .byte W16 .byte N04 @@ -875,7 +875,7 @@ bgm_rainbow_3_000: .byte An1 .byte W08 .byte PEND -bgm_rainbow_3_001: +mus_ever_grande_3_001: .byte N04 , Gs1 , v112 .byte W16 .byte N04 @@ -895,7 +895,7 @@ bgm_rainbow_3_001: .byte N04 .byte W08 .byte PEND -bgm_rainbow_3_002: +mus_ever_grande_3_002: .byte N04 , Gn1 , v112 .byte W16 .byte N04 @@ -917,7 +917,7 @@ bgm_rainbow_3_002: .byte Gn1 .byte W08 .byte PEND -bgm_rainbow_3_003: +mus_ever_grande_3_003: .byte N04 , Fs1 , v112 .byte W16 .byte N04 @@ -937,7 +937,7 @@ bgm_rainbow_3_003: .byte N04 .byte W08 .byte PEND -bgm_rainbow_3_004: +mus_ever_grande_3_004: .byte N04 , Fn1 , v112 .byte W16 .byte N04 @@ -957,7 +957,7 @@ bgm_rainbow_3_004: .byte N04 .byte W08 .byte PEND -bgm_rainbow_3_005: +mus_ever_grande_3_005: .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -1020,11 +1020,11 @@ bgm_rainbow_3_005: .byte As1 .byte W08 .byte PATT - .word bgm_rainbow_3_000 + .word mus_ever_grande_3_000 .byte PATT - .word bgm_rainbow_3_001 + .word mus_ever_grande_3_001 .byte PATT - .word bgm_rainbow_3_002 + .word mus_ever_grande_3_002 .byte N04 , Fs1 , v112 .byte W16 .byte N04 @@ -1046,9 +1046,9 @@ bgm_rainbow_3_005: .byte Fs1 .byte W08 .byte PATT - .word bgm_rainbow_3_004 + .word mus_ever_grande_3_004 .byte PATT - .word bgm_rainbow_3_005 + .word mus_ever_grande_3_005 .byte N04 , Ds1 , v112 .byte W16 .byte N04 @@ -1070,7 +1070,7 @@ bgm_rainbow_3_005: .byte Fn2 .byte W08 .byte PATT - .word bgm_rainbow_3_003 + .word mus_ever_grande_3_003 .byte N04 , Fs1 , v112 .byte W16 .byte N04 @@ -1092,7 +1092,7 @@ bgm_rainbow_3_005: .byte Fs1 .byte W08 .byte PATT - .word bgm_rainbow_3_004 + .word mus_ever_grande_3_004 .byte N04 , Fn1 , v112 .byte W16 .byte N04 @@ -1352,24 +1352,24 @@ bgm_rainbow_3_005: .byte Cn2 .byte W08 .byte GOTO - .word bgm_rainbow_3_B1 + .word mus_ever_grande_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_rainbow_4: - .byte KEYSH , bgm_rainbow_key+0 +mus_ever_grande_4: + .byte KEYSH , mus_ever_grande_key+0 .byte VOICE , 14 .byte LFOS , 44 .byte PAN , c_v-20 - .byte VOL , 68*bgm_rainbow_mvl/mxv + .byte VOL , 68*mus_ever_grande_mvl/mxv .byte W24 .byte W96 .byte W96 .byte W96 .byte W96 -bgm_rainbow_4_B1: - .byte VOL , 68*bgm_rainbow_mvl/mxv +mus_ever_grande_4_B1: + .byte VOL , 68*mus_ever_grande_mvl/mxv .byte W96 .byte W24 .byte N24 , Fn3 , v112 @@ -1402,77 +1402,77 @@ bgm_rainbow_4_B1: .byte W24 .byte N96 , As4 .byte W24 - .byte VOL , 67*bgm_rainbow_mvl/mxv + .byte VOL , 67*mus_ever_grande_mvl/mxv .byte W01 - .byte 67*bgm_rainbow_mvl/mxv + .byte 67*mus_ever_grande_mvl/mxv .byte W03 - .byte 65*bgm_rainbow_mvl/mxv + .byte 65*mus_ever_grande_mvl/mxv .byte W01 - .byte 64*bgm_rainbow_mvl/mxv + .byte 64*mus_ever_grande_mvl/mxv .byte W03 - .byte 62*bgm_rainbow_mvl/mxv + .byte 62*mus_ever_grande_mvl/mxv .byte W01 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W03 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W01 - .byte 57*bgm_rainbow_mvl/mxv + .byte 57*mus_ever_grande_mvl/mxv .byte W03 - .byte 56*bgm_rainbow_mvl/mxv + .byte 56*mus_ever_grande_mvl/mxv .byte W01 - .byte 54*bgm_rainbow_mvl/mxv + .byte 54*mus_ever_grande_mvl/mxv .byte W03 - .byte 51*bgm_rainbow_mvl/mxv + .byte 51*mus_ever_grande_mvl/mxv .byte W01 - .byte 50*bgm_rainbow_mvl/mxv + .byte 50*mus_ever_grande_mvl/mxv .byte W03 - .byte 48*bgm_rainbow_mvl/mxv + .byte 48*mus_ever_grande_mvl/mxv .byte W04 - .byte 43*bgm_rainbow_mvl/mxv + .byte 43*mus_ever_grande_mvl/mxv .byte W01 - .byte 42*bgm_rainbow_mvl/mxv + .byte 42*mus_ever_grande_mvl/mxv .byte W03 - .byte 41*bgm_rainbow_mvl/mxv + .byte 41*mus_ever_grande_mvl/mxv .byte W01 - .byte 39*bgm_rainbow_mvl/mxv + .byte 39*mus_ever_grande_mvl/mxv .byte W03 - .byte 37*bgm_rainbow_mvl/mxv + .byte 37*mus_ever_grande_mvl/mxv .byte W01 - .byte 35*bgm_rainbow_mvl/mxv + .byte 35*mus_ever_grande_mvl/mxv .byte W03 - .byte 34*bgm_rainbow_mvl/mxv + .byte 34*mus_ever_grande_mvl/mxv .byte W01 - .byte 32*bgm_rainbow_mvl/mxv + .byte 32*mus_ever_grande_mvl/mxv .byte W03 - .byte 29*bgm_rainbow_mvl/mxv + .byte 29*mus_ever_grande_mvl/mxv .byte W01 - .byte 29*bgm_rainbow_mvl/mxv + .byte 29*mus_ever_grande_mvl/mxv .byte W03 - .byte 27*bgm_rainbow_mvl/mxv + .byte 27*mus_ever_grande_mvl/mxv .byte W01 - .byte 25*bgm_rainbow_mvl/mxv + .byte 25*mus_ever_grande_mvl/mxv .byte W03 - .byte 23*bgm_rainbow_mvl/mxv + .byte 23*mus_ever_grande_mvl/mxv .byte W01 - .byte 20*bgm_rainbow_mvl/mxv + .byte 20*mus_ever_grande_mvl/mxv .byte W03 - .byte 19*bgm_rainbow_mvl/mxv + .byte 19*mus_ever_grande_mvl/mxv .byte W01 - .byte 16*bgm_rainbow_mvl/mxv + .byte 16*mus_ever_grande_mvl/mxv .byte W03 - .byte 12*bgm_rainbow_mvl/mxv + .byte 12*mus_ever_grande_mvl/mxv .byte W01 - .byte 10*bgm_rainbow_mvl/mxv + .byte 10*mus_ever_grande_mvl/mxv .byte W03 - .byte 6*bgm_rainbow_mvl/mxv + .byte 6*mus_ever_grande_mvl/mxv .byte W01 - .byte 6*bgm_rainbow_mvl/mxv + .byte 6*mus_ever_grande_mvl/mxv .byte W03 - .byte 3*bgm_rainbow_mvl/mxv + .byte 3*mus_ever_grande_mvl/mxv .byte W04 .byte VOICE , 56 .byte W24 - .byte VOL , 68*bgm_rainbow_mvl/mxv + .byte VOL , 68*mus_ever_grande_mvl/mxv .byte N08 , An3 .byte W08 .byte Fn3 @@ -1493,71 +1493,71 @@ bgm_rainbow_4_B1: .byte W04 .byte N96 , Dn4 , v112 .byte W24 - .byte VOL , 67*bgm_rainbow_mvl/mxv + .byte VOL , 67*mus_ever_grande_mvl/mxv .byte W01 - .byte 64*bgm_rainbow_mvl/mxv + .byte 64*mus_ever_grande_mvl/mxv .byte W04 - .byte 63*bgm_rainbow_mvl/mxv + .byte 63*mus_ever_grande_mvl/mxv .byte W03 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W01 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W03 - .byte 57*bgm_rainbow_mvl/mxv + .byte 57*mus_ever_grande_mvl/mxv .byte W01 - .byte 56*bgm_rainbow_mvl/mxv + .byte 56*mus_ever_grande_mvl/mxv .byte W03 - .byte 53*bgm_rainbow_mvl/mxv + .byte 53*mus_ever_grande_mvl/mxv .byte W01 - .byte 51*bgm_rainbow_mvl/mxv + .byte 51*mus_ever_grande_mvl/mxv .byte W03 - .byte 48*bgm_rainbow_mvl/mxv + .byte 48*mus_ever_grande_mvl/mxv .byte W04 - .byte 43*bgm_rainbow_mvl/mxv + .byte 43*mus_ever_grande_mvl/mxv .byte W01 - .byte 41*bgm_rainbow_mvl/mxv + .byte 41*mus_ever_grande_mvl/mxv .byte W03 - .byte 38*bgm_rainbow_mvl/mxv + .byte 38*mus_ever_grande_mvl/mxv .byte W01 - .byte 35*bgm_rainbow_mvl/mxv + .byte 35*mus_ever_grande_mvl/mxv .byte W03 - .byte 35*bgm_rainbow_mvl/mxv + .byte 35*mus_ever_grande_mvl/mxv .byte W01 - .byte 32*bgm_rainbow_mvl/mxv + .byte 32*mus_ever_grande_mvl/mxv .byte W03 - .byte 31*bgm_rainbow_mvl/mxv + .byte 31*mus_ever_grande_mvl/mxv .byte W01 - .byte 29*bgm_rainbow_mvl/mxv + .byte 29*mus_ever_grande_mvl/mxv .byte W03 - .byte 26*bgm_rainbow_mvl/mxv + .byte 26*mus_ever_grande_mvl/mxv .byte W01 - .byte 24*bgm_rainbow_mvl/mxv + .byte 24*mus_ever_grande_mvl/mxv .byte W03 - .byte 20*bgm_rainbow_mvl/mxv + .byte 20*mus_ever_grande_mvl/mxv .byte W01 - .byte 19*bgm_rainbow_mvl/mxv + .byte 19*mus_ever_grande_mvl/mxv .byte W03 - .byte 16*bgm_rainbow_mvl/mxv + .byte 16*mus_ever_grande_mvl/mxv .byte W01 - .byte 14*bgm_rainbow_mvl/mxv + .byte 14*mus_ever_grande_mvl/mxv .byte W03 - .byte 12*bgm_rainbow_mvl/mxv + .byte 12*mus_ever_grande_mvl/mxv .byte W01 - .byte 10*bgm_rainbow_mvl/mxv + .byte 10*mus_ever_grande_mvl/mxv .byte W03 - .byte 9*bgm_rainbow_mvl/mxv + .byte 9*mus_ever_grande_mvl/mxv .byte W01 - .byte 8*bgm_rainbow_mvl/mxv + .byte 8*mus_ever_grande_mvl/mxv .byte W03 - .byte 6*bgm_rainbow_mvl/mxv + .byte 6*mus_ever_grande_mvl/mxv .byte W01 - .byte 6*bgm_rainbow_mvl/mxv + .byte 6*mus_ever_grande_mvl/mxv .byte W03 - .byte 3*bgm_rainbow_mvl/mxv + .byte 3*mus_ever_grande_mvl/mxv .byte W05 - .byte 2*bgm_rainbow_mvl/mxv + .byte 2*mus_ever_grande_mvl/mxv .byte W03 - .byte 68*bgm_rainbow_mvl/mxv + .byte 68*mus_ever_grande_mvl/mxv .byte N24 , Ds4 .byte W24 .byte Dn4 @@ -1634,7 +1634,7 @@ bgm_rainbow_4_B1: .byte W24 .byte Ds4 .byte W24 -bgm_rainbow_4_000: +mus_ever_grande_4_000: .byte N48 , Fn4 , v112 .byte W48 .byte Cs4 @@ -1660,175 +1660,175 @@ bgm_rainbow_4_000: .byte Cs4 .byte W08 .byte PATT - .word bgm_rainbow_4_000 + .word mus_ever_grande_4_000 .byte N48 , Cs5 , v112 .byte W12 - .byte VOL , 67*bgm_rainbow_mvl/mxv + .byte VOL , 67*mus_ever_grande_mvl/mxv .byte W01 - .byte 65*bgm_rainbow_mvl/mxv + .byte 65*mus_ever_grande_mvl/mxv .byte W03 - .byte 64*bgm_rainbow_mvl/mxv + .byte 64*mus_ever_grande_mvl/mxv .byte W01 - .byte 63*bgm_rainbow_mvl/mxv + .byte 63*mus_ever_grande_mvl/mxv .byte W03 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W01 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W03 - .byte 57*bgm_rainbow_mvl/mxv + .byte 57*mus_ever_grande_mvl/mxv .byte W01 - .byte 56*bgm_rainbow_mvl/mxv + .byte 56*mus_ever_grande_mvl/mxv .byte W03 - .byte 54*bgm_rainbow_mvl/mxv + .byte 54*mus_ever_grande_mvl/mxv .byte W04 - .byte 51*bgm_rainbow_mvl/mxv + .byte 51*mus_ever_grande_mvl/mxv .byte W04 - .byte 48*bgm_rainbow_mvl/mxv + .byte 48*mus_ever_grande_mvl/mxv .byte W01 - .byte 45*bgm_rainbow_mvl/mxv + .byte 45*mus_ever_grande_mvl/mxv .byte W03 - .byte 41*bgm_rainbow_mvl/mxv + .byte 41*mus_ever_grande_mvl/mxv .byte W01 - .byte 38*bgm_rainbow_mvl/mxv + .byte 38*mus_ever_grande_mvl/mxv .byte W03 - .byte 35*bgm_rainbow_mvl/mxv + .byte 35*mus_ever_grande_mvl/mxv .byte W01 - .byte 31*bgm_rainbow_mvl/mxv + .byte 31*mus_ever_grande_mvl/mxv .byte W03 - .byte 68*bgm_rainbow_mvl/mxv + .byte 68*mus_ever_grande_mvl/mxv .byte N48 , Cn5 .byte W12 - .byte VOL , 67*bgm_rainbow_mvl/mxv + .byte VOL , 67*mus_ever_grande_mvl/mxv .byte W01 - .byte 65*bgm_rainbow_mvl/mxv + .byte 65*mus_ever_grande_mvl/mxv .byte W03 - .byte 64*bgm_rainbow_mvl/mxv + .byte 64*mus_ever_grande_mvl/mxv .byte W01 - .byte 63*bgm_rainbow_mvl/mxv + .byte 63*mus_ever_grande_mvl/mxv .byte W03 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W01 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W03 - .byte 57*bgm_rainbow_mvl/mxv + .byte 57*mus_ever_grande_mvl/mxv .byte W01 - .byte 56*bgm_rainbow_mvl/mxv + .byte 56*mus_ever_grande_mvl/mxv .byte W03 - .byte 54*bgm_rainbow_mvl/mxv + .byte 54*mus_ever_grande_mvl/mxv .byte W04 - .byte 51*bgm_rainbow_mvl/mxv + .byte 51*mus_ever_grande_mvl/mxv .byte W04 - .byte 48*bgm_rainbow_mvl/mxv + .byte 48*mus_ever_grande_mvl/mxv .byte W01 - .byte 45*bgm_rainbow_mvl/mxv + .byte 45*mus_ever_grande_mvl/mxv .byte W03 - .byte 41*bgm_rainbow_mvl/mxv + .byte 41*mus_ever_grande_mvl/mxv .byte W01 - .byte 38*bgm_rainbow_mvl/mxv + .byte 38*mus_ever_grande_mvl/mxv .byte W03 - .byte 35*bgm_rainbow_mvl/mxv + .byte 35*mus_ever_grande_mvl/mxv .byte W01 - .byte 31*bgm_rainbow_mvl/mxv + .byte 31*mus_ever_grande_mvl/mxv .byte W03 - .byte 68*bgm_rainbow_mvl/mxv + .byte 68*mus_ever_grande_mvl/mxv .byte N48 , As4 .byte W12 - .byte VOL , 67*bgm_rainbow_mvl/mxv + .byte VOL , 67*mus_ever_grande_mvl/mxv .byte W01 - .byte 65*bgm_rainbow_mvl/mxv + .byte 65*mus_ever_grande_mvl/mxv .byte W03 - .byte 64*bgm_rainbow_mvl/mxv + .byte 64*mus_ever_grande_mvl/mxv .byte W01 - .byte 63*bgm_rainbow_mvl/mxv + .byte 63*mus_ever_grande_mvl/mxv .byte W03 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W01 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W03 - .byte 57*bgm_rainbow_mvl/mxv + .byte 57*mus_ever_grande_mvl/mxv .byte W01 - .byte 56*bgm_rainbow_mvl/mxv + .byte 56*mus_ever_grande_mvl/mxv .byte W03 - .byte 54*bgm_rainbow_mvl/mxv + .byte 54*mus_ever_grande_mvl/mxv .byte W04 - .byte 51*bgm_rainbow_mvl/mxv + .byte 51*mus_ever_grande_mvl/mxv .byte W04 - .byte 48*bgm_rainbow_mvl/mxv + .byte 48*mus_ever_grande_mvl/mxv .byte W01 - .byte 45*bgm_rainbow_mvl/mxv + .byte 45*mus_ever_grande_mvl/mxv .byte W03 - .byte 41*bgm_rainbow_mvl/mxv + .byte 41*mus_ever_grande_mvl/mxv .byte W01 - .byte 38*bgm_rainbow_mvl/mxv + .byte 38*mus_ever_grande_mvl/mxv .byte W03 - .byte 35*bgm_rainbow_mvl/mxv + .byte 35*mus_ever_grande_mvl/mxv .byte W01 - .byte 31*bgm_rainbow_mvl/mxv + .byte 31*mus_ever_grande_mvl/mxv .byte W03 - .byte 68*bgm_rainbow_mvl/mxv + .byte 68*mus_ever_grande_mvl/mxv .byte N48 , Cn5 .byte W12 - .byte VOL , 67*bgm_rainbow_mvl/mxv + .byte VOL , 67*mus_ever_grande_mvl/mxv .byte W01 - .byte 65*bgm_rainbow_mvl/mxv + .byte 65*mus_ever_grande_mvl/mxv .byte W03 - .byte 64*bgm_rainbow_mvl/mxv + .byte 64*mus_ever_grande_mvl/mxv .byte W01 - .byte 63*bgm_rainbow_mvl/mxv + .byte 63*mus_ever_grande_mvl/mxv .byte W03 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W01 - .byte 60*bgm_rainbow_mvl/mxv + .byte 60*mus_ever_grande_mvl/mxv .byte W03 - .byte 57*bgm_rainbow_mvl/mxv + .byte 57*mus_ever_grande_mvl/mxv .byte W01 - .byte 56*bgm_rainbow_mvl/mxv + .byte 56*mus_ever_grande_mvl/mxv .byte W03 - .byte 54*bgm_rainbow_mvl/mxv + .byte 54*mus_ever_grande_mvl/mxv .byte W04 - .byte 51*bgm_rainbow_mvl/mxv + .byte 51*mus_ever_grande_mvl/mxv .byte W04 - .byte 48*bgm_rainbow_mvl/mxv + .byte 48*mus_ever_grande_mvl/mxv .byte W01 - .byte 45*bgm_rainbow_mvl/mxv + .byte 45*mus_ever_grande_mvl/mxv .byte W03 - .byte 41*bgm_rainbow_mvl/mxv + .byte 41*mus_ever_grande_mvl/mxv .byte W01 - .byte 38*bgm_rainbow_mvl/mxv + .byte 38*mus_ever_grande_mvl/mxv .byte W03 - .byte 35*bgm_rainbow_mvl/mxv + .byte 35*mus_ever_grande_mvl/mxv .byte W01 - .byte 31*bgm_rainbow_mvl/mxv + .byte 31*mus_ever_grande_mvl/mxv .byte W03 .byte GOTO - .word bgm_rainbow_4_B1 - .byte VOL , 68*bgm_rainbow_mvl/mxv + .word mus_ever_grande_4_B1 + .byte VOL , 68*mus_ever_grande_mvl/mxv .byte FINE @********************** Track 5 **********************@ -bgm_rainbow_5: - .byte KEYSH , bgm_rainbow_key+0 +mus_ever_grande_5: + .byte KEYSH , mus_ever_grande_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v-63 - .byte VOL , 37*bgm_rainbow_mvl/mxv + .byte VOL , 37*mus_ever_grande_mvl/mxv .byte W24 .byte TIE , Ds3 , v112 .byte W96 .byte W96 .byte EOT -bgm_rainbow_5_000: +mus_ever_grande_5_000: .byte N48 , Cn3 , v112 .byte W48 .byte N48 .byte W48 .byte PEND .byte PATT - .word bgm_rainbow_5_000 -bgm_rainbow_5_B1: + .word mus_ever_grande_5_000 +mus_ever_grande_5_B1: .byte N16 , Fn3 , v112 .byte W16 .byte N04 @@ -1845,7 +1845,7 @@ bgm_rainbow_5_B1: .byte W08 .byte W96 .byte EOT -bgm_rainbow_5_001: +mus_ever_grande_5_001: .byte N16 , Fn3 , v112 .byte W16 .byte N04 @@ -1861,7 +1861,7 @@ bgm_rainbow_5_001: .byte N04 .byte W08 .byte PEND -bgm_rainbow_5_002: +mus_ever_grande_5_002: .byte N16 , Fn3 , v112 .byte W24 .byte N24 @@ -1927,9 +1927,9 @@ bgm_rainbow_5_002: .byte Fn3 .byte W08 .byte PATT - .word bgm_rainbow_5_001 + .word mus_ever_grande_5_001 .byte PATT - .word bgm_rainbow_5_002 + .word mus_ever_grande_5_002 .byte N48 , Ds3 , v112 .byte W48 .byte N24 @@ -1958,7 +1958,7 @@ bgm_rainbow_5_002: .byte W32 .byte N24 , Fn3 .byte W24 -bgm_rainbow_5_003: +mus_ever_grande_5_003: .byte N64 , Fs3 , v112 .byte W64 .byte N04 @@ -1982,7 +1982,7 @@ bgm_rainbow_5_003: .byte W56 .byte W96 .byte PATT - .word bgm_rainbow_5_003 + .word mus_ever_grande_5_003 .byte N24 , Fs3 , v112 .byte W24 .byte N24 @@ -2059,19 +2059,19 @@ bgm_rainbow_5_003: .byte W96 .byte EOT .byte GOTO - .word bgm_rainbow_5_B1 + .word mus_ever_grande_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_rainbow_6: - .byte KEYSH , bgm_rainbow_key+0 +mus_ever_grande_6: + .byte KEYSH , mus_ever_grande_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+63 - .byte VOL , 37*bgm_rainbow_mvl/mxv + .byte VOL , 37*mus_ever_grande_mvl/mxv .byte W24 .byte TIE , As3 , v112 .byte W96 @@ -2085,7 +2085,7 @@ bgm_rainbow_6: .byte W48 .byte An3 .byte W48 -bgm_rainbow_6_B1: +mus_ever_grande_6_B1: .byte N16 , As3 , v112 .byte W16 .byte N04 @@ -2102,7 +2102,7 @@ bgm_rainbow_6_B1: .byte W08 .byte W96 .byte EOT -bgm_rainbow_6_000: +mus_ever_grande_6_000: .byte N16 , Gs3 , v112 .byte W16 .byte N04 @@ -2182,7 +2182,7 @@ bgm_rainbow_6_000: .byte An3 .byte W08 .byte PATT - .word bgm_rainbow_6_000 + .word mus_ever_grande_6_000 .byte N16 , Gn3 , v112 .byte W24 .byte N24 @@ -2219,7 +2219,7 @@ bgm_rainbow_6_000: .byte W32 .byte N24 , An3 .byte W24 -bgm_rainbow_6_001: +mus_ever_grande_6_001: .byte N64 , Cs4 , v112 .byte W64 .byte N04 @@ -2243,7 +2243,7 @@ bgm_rainbow_6_001: .byte W56 .byte W96 .byte PATT - .word bgm_rainbow_6_001 + .word mus_ever_grande_6_001 .byte N24 , Cs4 , v112 .byte W24 .byte N24 @@ -2323,18 +2323,18 @@ bgm_rainbow_6_001: .byte W96 .byte EOT .byte GOTO - .word bgm_rainbow_6_B1 + .word mus_ever_grande_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_rainbow_7: - .byte KEYSH , bgm_rainbow_key+0 +mus_ever_grande_7: + .byte KEYSH , mus_ever_grande_key+0 .byte VOICE , 127 .byte PAN , c_v+0 - .byte VOL , 54*bgm_rainbow_mvl/mxv + .byte VOL , 54*mus_ever_grande_mvl/mxv .byte W24 -bgm_rainbow_7_000: +mus_ever_grande_7_000: .byte N01 , En5 , v112 .byte W08 .byte En5 , v064 @@ -2362,7 +2362,7 @@ bgm_rainbow_7_000: .byte En5 , v064 .byte W08 .byte PEND -bgm_rainbow_7_001: +mus_ever_grande_7_001: .byte N01 , En5 , v112 .byte W08 .byte En5 , v064 @@ -2389,7 +2389,7 @@ bgm_rainbow_7_001: .byte W08 .byte PEND .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte N01 , En5 , v112 .byte W08 .byte En5 , v064 @@ -2416,21 +2416,21 @@ bgm_rainbow_7_001: .byte W04 .byte En5 , v064 .byte W08 -bgm_rainbow_7_B1: +mus_ever_grande_7_B1: .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte N01 , En5 , v112 .byte W08 .byte En5 , v064 @@ -2456,67 +2456,67 @@ bgm_rainbow_7_B1: .byte En5 , v064 .byte W08 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte PATT - .word bgm_rainbow_7_000 + .word mus_ever_grande_7_000 .byte PATT - .word bgm_rainbow_7_001 + .word mus_ever_grande_7_001 .byte GOTO - .word bgm_rainbow_7_B1 + .word mus_ever_grande_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_rainbow_8: - .byte KEYSH , bgm_rainbow_key+0 +mus_ever_grande_8: + .byte KEYSH , mus_ever_grande_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+0 - .byte VOL , 45*bgm_rainbow_mvl/mxv + .byte VOL , 45*mus_ever_grande_mvl/mxv .byte W24 .byte BEND , c_v+2 .byte TIE , Dn4 , v112 @@ -2551,7 +2551,7 @@ bgm_rainbow_8: .byte W08 .byte N08 , Ds4 .byte W08 -bgm_rainbow_8_B1: +mus_ever_grande_8_B1: .byte BEND , c_v+2 .byte N16 , Dn4 , v112 .byte W16 @@ -2569,7 +2569,7 @@ bgm_rainbow_8_B1: .byte W08 .byte W96 .byte EOT -bgm_rainbow_8_000: +mus_ever_grande_8_000: .byte N16 , Dn4 , v112 .byte W16 .byte N04 , Ds4 @@ -2585,7 +2585,7 @@ bgm_rainbow_8_000: .byte Dn4 .byte W08 .byte PEND -bgm_rainbow_8_001: +mus_ever_grande_8_001: .byte N16 , Cn4 , v112 .byte W16 .byte N04 , Dn4 @@ -2599,7 +2599,7 @@ bgm_rainbow_8_001: .byte Dn4 .byte W24 .byte PEND -bgm_rainbow_8_002: +mus_ever_grande_8_002: .byte N48 , As3 , v112 .byte W48 .byte N24 , Cn4 @@ -2648,11 +2648,11 @@ bgm_rainbow_8_002: .byte W96 .byte EOT .byte PATT - .word bgm_rainbow_8_000 + .word mus_ever_grande_8_000 .byte PATT - .word bgm_rainbow_8_001 + .word mus_ever_grande_8_001 .byte PATT - .word bgm_rainbow_8_002 + .word mus_ever_grande_8_002 .byte N24 , Dn4 , v112 .byte W24 .byte N04 , Fn4 @@ -2801,27 +2801,27 @@ bgm_rainbow_8_002: .byte W96 .byte EOT .byte GOTO - .word bgm_rainbow_8_B1 + .word mus_ever_grande_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_rainbow: +mus_ever_grande: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_rainbow_pri @ Priority - .byte bgm_rainbow_rev @ Reverb. + .byte mus_ever_grande_pri @ Priority + .byte mus_ever_grande_rev @ Reverb. - .word bgm_rainbow_grp + .word mus_ever_grande_grp - .word bgm_rainbow_1 - .word bgm_rainbow_2 - .word bgm_rainbow_3 - .word bgm_rainbow_4 - .word bgm_rainbow_5 - .word bgm_rainbow_6 - .word bgm_rainbow_7 - .word bgm_rainbow_8 + .word mus_ever_grande_1 + .word mus_ever_grande_2 + .word mus_ever_grande_3 + .word mus_ever_grande_4 + .word mus_ever_grande_5 + .word mus_ever_grande_6 + .word mus_ever_grande_7 + .word mus_ever_grande_8 .end diff --git a/sound/songs/bgm_shinka.s b/sound/songs/mus_evolution.s index 64adf44e0..6cd0c40ec 100644 --- a/sound/songs/bgm_shinka.s +++ b/sound/songs/mus_evolution.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_shinka_grp, voicegroup023 - .equ bgm_shinka_pri, 0 - .equ bgm_shinka_rev, reverb_set+50 - .equ bgm_shinka_mvl, 127 - .equ bgm_shinka_key, 0 - .equ bgm_shinka_tbs, 1 - .equ bgm_shinka_exg, 0 - .equ bgm_shinka_cmp, 1 + .equ mus_evolution_grp, voicegroup023 + .equ mus_evolution_pri, 0 + .equ mus_evolution_rev, reverb_set+50 + .equ mus_evolution_mvl, 127 + .equ mus_evolution_key, 0 + .equ mus_evolution_tbs, 1 + .equ mus_evolution_exg, 0 + .equ mus_evolution_cmp, 1 .section .rodata - .global bgm_shinka + .global mus_evolution .align 2 @********************** Track 1 **********************@ -bgm_shinka_1: - .byte KEYSH , bgm_shinka_key+0 - .byte TEMPO , 120*bgm_shinka_tbs/2 +mus_evolution_1: + .byte KEYSH , mus_evolution_key+0 + .byte TEMPO , 120*mus_evolution_tbs/2 .byte VOICE , 60 - .byte VOL , 80*bgm_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_mvl/mxv .byte N06 , Gn3 , v080 .byte W24 .byte Gn3 , v056 @@ -28,7 +28,7 @@ bgm_shinka_1: .byte W24 .byte Gn3 , v064 .byte W24 -bgm_shinka_1_000: +mus_evolution_1_000: .byte N06 , Gn3 , v068 .byte W24 .byte Gn3 , v072 @@ -40,7 +40,7 @@ bgm_shinka_1_000: .byte MOD , 6 .byte W15 .byte PEND -bgm_shinka_1_001: +mus_evolution_1_001: .byte MOD , 0 .byte N06 , Gn3 , v080 .byte W24 @@ -51,7 +51,7 @@ bgm_shinka_1_001: .byte Gn3 , v064 .byte W24 .byte PEND -bgm_shinka_1_002: +mus_evolution_1_002: .byte N06 , Gn3 , v068 .byte W24 .byte Gn3 , v072 @@ -64,15 +64,15 @@ bgm_shinka_1_002: .byte W15 .byte PEND .byte PATT - .word bgm_shinka_1_001 + .word mus_evolution_1_001 .byte PATT - .word bgm_shinka_1_000 + .word mus_evolution_1_000 .byte PATT - .word bgm_shinka_1_001 + .word mus_evolution_1_001 .byte PATT - .word bgm_shinka_1_002 -bgm_shinka_1_B1: -bgm_shinka_1_003: + .word mus_evolution_1_002 +mus_evolution_1_B1: +mus_evolution_1_003: .byte MOD , 0 .byte N06 , An3 , v080 .byte W24 @@ -83,7 +83,7 @@ bgm_shinka_1_003: .byte An3 , v064 .byte W24 .byte PEND -bgm_shinka_1_004: +mus_evolution_1_004: .byte N06 , An3 , v068 .byte W24 .byte An3 , v072 @@ -96,8 +96,8 @@ bgm_shinka_1_004: .byte W15 .byte PEND .byte PATT - .word bgm_shinka_1_003 -bgm_shinka_1_005: + .word mus_evolution_1_003 +mus_evolution_1_005: .byte N06 , An3 , v068 .byte W24 .byte An3 , v072 @@ -110,25 +110,25 @@ bgm_shinka_1_005: .byte W15 .byte PEND .byte PATT - .word bgm_shinka_1_003 + .word mus_evolution_1_003 .byte PATT - .word bgm_shinka_1_004 + .word mus_evolution_1_004 .byte PATT - .word bgm_shinka_1_003 + .word mus_evolution_1_003 .byte PATT - .word bgm_shinka_1_005 + .word mus_evolution_1_005 .byte GOTO - .word bgm_shinka_1_B1 + .word mus_evolution_1_B1 .byte MOD , 0 .byte FINE @********************** Track 2 **********************@ -bgm_shinka_2: - .byte KEYSH , bgm_shinka_key+0 +mus_evolution_2: + .byte KEYSH , mus_evolution_key+0 .byte VOICE , 60 .byte PAN , c_v+16 - .byte VOL , 80*bgm_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_mvl/mxv .byte N06 , Cn3 , v080 .byte W24 .byte Dn3 , v056 @@ -137,7 +137,7 @@ bgm_shinka_2: .byte W24 .byte Dn3 , v064 .byte W24 -bgm_shinka_2_000: +mus_evolution_2_000: .byte N06 , Cn3 , v068 .byte W24 .byte Dn3 , v072 @@ -149,7 +149,7 @@ bgm_shinka_2_000: .byte MOD , 6 .byte W15 .byte PEND -bgm_shinka_2_001: +mus_evolution_2_001: .byte MOD , 0 .byte N06 , Cn3 , v080 .byte W24 @@ -160,7 +160,7 @@ bgm_shinka_2_001: .byte Dn3 , v064 .byte W24 .byte PEND -bgm_shinka_2_002: +mus_evolution_2_002: .byte N06 , Cn3 , v068 .byte W24 .byte Dn3 , v072 @@ -173,15 +173,15 @@ bgm_shinka_2_002: .byte W15 .byte PEND .byte PATT - .word bgm_shinka_2_001 + .word mus_evolution_2_001 .byte PATT - .word bgm_shinka_2_000 + .word mus_evolution_2_000 .byte PATT - .word bgm_shinka_2_001 + .word mus_evolution_2_001 .byte PATT - .word bgm_shinka_2_002 -bgm_shinka_2_B1: -bgm_shinka_2_003: + .word mus_evolution_2_002 +mus_evolution_2_B1: +mus_evolution_2_003: .byte MOD , 0 .byte N06 , Dn3 , v080 .byte W24 @@ -192,7 +192,7 @@ bgm_shinka_2_003: .byte En3 , v064 .byte W24 .byte PEND -bgm_shinka_2_004: +mus_evolution_2_004: .byte N06 , Dn3 , v068 .byte W24 .byte En3 , v072 @@ -205,8 +205,8 @@ bgm_shinka_2_004: .byte W15 .byte PEND .byte PATT - .word bgm_shinka_2_003 -bgm_shinka_2_005: + .word mus_evolution_2_003 +mus_evolution_2_005: .byte N06 , Dn3 , v068 .byte W24 .byte En3 , v072 @@ -219,24 +219,24 @@ bgm_shinka_2_005: .byte W15 .byte PEND .byte PATT - .word bgm_shinka_2_003 + .word mus_evolution_2_003 .byte PATT - .word bgm_shinka_2_004 + .word mus_evolution_2_004 .byte PATT - .word bgm_shinka_2_003 + .word mus_evolution_2_003 .byte PATT - .word bgm_shinka_2_005 + .word mus_evolution_2_005 .byte GOTO - .word bgm_shinka_2_B1 + .word mus_evolution_2_B1 .byte MOD , 0 .byte FINE @********************** Track 3 **********************@ -bgm_shinka_3: - .byte KEYSH , bgm_shinka_key+0 +mus_evolution_3: + .byte KEYSH , mus_evolution_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_mvl/mxv .byte N06 , Cn1 , v080 .byte W24 .byte Dn1 @@ -245,7 +245,7 @@ bgm_shinka_3: .byte W24 .byte Dn1 .byte W24 -bgm_shinka_3_000: +mus_evolution_3_000: .byte N06 , Cn1 , v080 .byte W24 .byte Dn1 @@ -264,8 +264,8 @@ bgm_shinka_3_000: .byte Dn1 .byte W24 .byte PATT - .word bgm_shinka_3_000 -bgm_shinka_3_001: + .word mus_evolution_3_000 +mus_evolution_3_001: .byte N03 , Cn2 , v080 .byte W12 .byte Cn1 @@ -292,13 +292,13 @@ bgm_shinka_3_001: .byte W06 .byte PEND .byte PATT - .word bgm_shinka_3_001 + .word mus_evolution_3_001 .byte PATT - .word bgm_shinka_3_001 + .word mus_evolution_3_001 .byte PATT - .word bgm_shinka_3_001 -bgm_shinka_3_B1: -bgm_shinka_3_002: + .word mus_evolution_3_001 +mus_evolution_3_B1: +mus_evolution_3_002: .byte N03 , Dn2 , v080 .byte W12 .byte Dn1 @@ -325,29 +325,29 @@ bgm_shinka_3_002: .byte W06 .byte PEND .byte PATT - .word bgm_shinka_3_002 + .word mus_evolution_3_002 .byte PATT - .word bgm_shinka_3_002 + .word mus_evolution_3_002 .byte PATT - .word bgm_shinka_3_002 + .word mus_evolution_3_002 .byte PATT - .word bgm_shinka_3_002 + .word mus_evolution_3_002 .byte PATT - .word bgm_shinka_3_002 + .word mus_evolution_3_002 .byte PATT - .word bgm_shinka_3_002 + .word mus_evolution_3_002 .byte PATT - .word bgm_shinka_3_002 + .word mus_evolution_3_002 .byte GOTO - .word bgm_shinka_3_B1 + .word mus_evolution_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_shinka_4: - .byte KEYSH , bgm_shinka_key+0 +mus_evolution_4: + .byte KEYSH , mus_evolution_key+0 .byte VOICE , 47 - .byte VOL , 80*bgm_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_mvl/mxv .byte PAN , c_v-6 .byte N12 , Cn2 , v112 .byte W24 @@ -395,7 +395,7 @@ bgm_shinka_4: .byte W06 .byte Dn2 , v120 .byte W06 -bgm_shinka_4_000: +mus_evolution_4_000: .byte N12 , Cn2 , v112 .byte W24 .byte Dn2 @@ -407,7 +407,7 @@ bgm_shinka_4_000: .byte N12 .byte W12 .byte PEND -bgm_shinka_4_001: +mus_evolution_4_001: .byte N12 , Cn2 , v112 .byte W24 .byte Dn2 @@ -426,11 +426,11 @@ bgm_shinka_4_001: .byte W06 .byte PEND .byte PATT - .word bgm_shinka_4_000 + .word mus_evolution_4_000 .byte PATT - .word bgm_shinka_4_001 -bgm_shinka_4_B1: -bgm_shinka_4_002: + .word mus_evolution_4_001 +mus_evolution_4_B1: +mus_evolution_4_002: .byte N12 , Dn2 , v112 .byte W24 .byte En2 @@ -442,7 +442,7 @@ bgm_shinka_4_002: .byte N12 .byte W12 .byte PEND -bgm_shinka_4_003: +mus_evolution_4_003: .byte N12 , Dn2 , v112 .byte W24 .byte En2 @@ -461,8 +461,8 @@ bgm_shinka_4_003: .byte W06 .byte PEND .byte PATT - .word bgm_shinka_4_002 -bgm_shinka_4_004: + .word mus_evolution_4_002 +mus_evolution_4_004: .byte N15 , Dn2 , v112 .byte W24 .byte N12 , En2 @@ -481,26 +481,26 @@ bgm_shinka_4_004: .byte W06 .byte PEND .byte PATT - .word bgm_shinka_4_002 + .word mus_evolution_4_002 .byte PATT - .word bgm_shinka_4_004 + .word mus_evolution_4_004 .byte PATT - .word bgm_shinka_4_002 + .word mus_evolution_4_002 .byte PATT - .word bgm_shinka_4_003 + .word mus_evolution_4_003 .byte GOTO - .word bgm_shinka_4_B1 + .word mus_evolution_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_shinka_5: - .byte KEYSH , bgm_shinka_key+0 +mus_evolution_5: + .byte KEYSH , mus_evolution_key+0 .byte VOICE , 83 .byte PAN , c_v-47 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 80*bgm_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_mvl/mxv .byte N06 , Cn3 , v056 .byte W24 .byte Dn3 , v032 @@ -509,7 +509,7 @@ bgm_shinka_5: .byte W24 .byte Dn3 , v040 .byte W24 -bgm_shinka_5_000: +mus_evolution_5_000: .byte N06 , Cn3 , v044 .byte W24 .byte Dn3 , v048 @@ -519,7 +519,7 @@ bgm_shinka_5_000: .byte N24 , Dn3 , v056 .byte W24 .byte PEND -bgm_shinka_5_001: +mus_evolution_5_001: .byte N06 , Cn3 , v056 .byte W24 .byte Dn3 , v032 @@ -530,17 +530,17 @@ bgm_shinka_5_001: .byte W24 .byte PEND .byte PATT - .word bgm_shinka_5_000 + .word mus_evolution_5_000 .byte PATT - .word bgm_shinka_5_001 + .word mus_evolution_5_001 .byte PATT - .word bgm_shinka_5_000 + .word mus_evolution_5_000 .byte PATT - .word bgm_shinka_5_001 + .word mus_evolution_5_001 .byte PATT - .word bgm_shinka_5_000 -bgm_shinka_5_B1: -bgm_shinka_5_002: + .word mus_evolution_5_000 +mus_evolution_5_B1: +mus_evolution_5_002: .byte N06 , Dn3 , v056 .byte W24 .byte En3 , v032 @@ -550,7 +550,7 @@ bgm_shinka_5_002: .byte En3 , v040 .byte W24 .byte PEND -bgm_shinka_5_003: +mus_evolution_5_003: .byte N06 , Dn3 , v044 .byte W24 .byte En3 , v048 @@ -561,30 +561,30 @@ bgm_shinka_5_003: .byte W24 .byte PEND .byte PATT - .word bgm_shinka_5_002 + .word mus_evolution_5_002 .byte PATT - .word bgm_shinka_5_003 + .word mus_evolution_5_003 .byte PATT - .word bgm_shinka_5_002 + .word mus_evolution_5_002 .byte PATT - .word bgm_shinka_5_003 + .word mus_evolution_5_003 .byte PATT - .word bgm_shinka_5_002 + .word mus_evolution_5_002 .byte PATT - .word bgm_shinka_5_003 + .word mus_evolution_5_003 .byte GOTO - .word bgm_shinka_5_B1 + .word mus_evolution_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_shinka_6: - .byte KEYSH , bgm_shinka_key+0 +mus_evolution_6: + .byte KEYSH , mus_evolution_key+0 .byte VOICE , 84 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte PAN , c_v+48 - .byte VOL , 80*bgm_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_mvl/mxv .byte BEND , c_v+0 .byte N06 , An2 , v056 .byte W24 @@ -594,7 +594,7 @@ bgm_shinka_6: .byte W24 .byte Bn2 , v040 .byte W24 -bgm_shinka_6_000: +mus_evolution_6_000: .byte N06 , An2 , v044 .byte W24 .byte Bn2 , v048 @@ -604,7 +604,7 @@ bgm_shinka_6_000: .byte N24 , Bn2 , v056 .byte W24 .byte PEND -bgm_shinka_6_001: +mus_evolution_6_001: .byte N06 , An2 , v056 .byte W24 .byte Bn2 , v032 @@ -615,17 +615,17 @@ bgm_shinka_6_001: .byte W24 .byte PEND .byte PATT - .word bgm_shinka_6_000 + .word mus_evolution_6_000 .byte PATT - .word bgm_shinka_6_001 + .word mus_evolution_6_001 .byte PATT - .word bgm_shinka_6_000 + .word mus_evolution_6_000 .byte PATT - .word bgm_shinka_6_001 + .word mus_evolution_6_001 .byte PATT - .word bgm_shinka_6_000 -bgm_shinka_6_B1: -bgm_shinka_6_002: + .word mus_evolution_6_000 +mus_evolution_6_B1: +mus_evolution_6_002: .byte N06 , Bn2 , v056 .byte W24 .byte Cs3 , v032 @@ -635,7 +635,7 @@ bgm_shinka_6_002: .byte Cs3 , v040 .byte W24 .byte PEND -bgm_shinka_6_003: +mus_evolution_6_003: .byte N06 , Bn2 , v044 .byte W24 .byte Cs3 , v048 @@ -646,26 +646,26 @@ bgm_shinka_6_003: .byte W24 .byte PEND .byte PATT - .word bgm_shinka_6_002 + .word mus_evolution_6_002 .byte PATT - .word bgm_shinka_6_003 + .word mus_evolution_6_003 .byte PATT - .word bgm_shinka_6_002 + .word mus_evolution_6_002 .byte PATT - .word bgm_shinka_6_003 + .word mus_evolution_6_003 .byte PATT - .word bgm_shinka_6_002 + .word mus_evolution_6_002 .byte PATT - .word bgm_shinka_6_003 + .word mus_evolution_6_003 .byte GOTO - .word bgm_shinka_6_B1 + .word mus_evolution_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_shinka_7: - .byte VOL , 80*bgm_shinka_mvl/mxv - .byte KEYSH , bgm_shinka_key+0 +mus_evolution_7: + .byte VOL , 80*mus_evolution_mvl/mxv + .byte KEYSH , mus_evolution_key+0 .byte VOICE , 0 .byte PAN , c_v+0 .byte N06 , En1 , v112 @@ -804,7 +804,7 @@ bgm_shinka_7: .byte W03 .byte En1 , v120 .byte W03 -bgm_shinka_7_000: +mus_evolution_7_000: .byte N06 , En1 , v127 .byte W06 .byte En1 , v036 @@ -838,7 +838,7 @@ bgm_shinka_7_000: .byte N06 .byte W06 .byte PEND -bgm_shinka_7_001: +mus_evolution_7_001: .byte N06 , En1 , v127 .byte W06 .byte En1 , v036 @@ -880,44 +880,44 @@ bgm_shinka_7_001: .byte En1 , v120 .byte W03 .byte PEND -bgm_shinka_7_B1: +mus_evolution_7_B1: .byte PATT - .word bgm_shinka_7_000 + .word mus_evolution_7_000 .byte PATT - .word bgm_shinka_7_001 + .word mus_evolution_7_001 .byte PATT - .word bgm_shinka_7_000 + .word mus_evolution_7_000 .byte PATT - .word bgm_shinka_7_001 + .word mus_evolution_7_001 .byte PATT - .word bgm_shinka_7_000 + .word mus_evolution_7_000 .byte PATT - .word bgm_shinka_7_001 + .word mus_evolution_7_001 .byte PATT - .word bgm_shinka_7_000 + .word mus_evolution_7_000 .byte PATT - .word bgm_shinka_7_001 + .word mus_evolution_7_001 .byte GOTO - .word bgm_shinka_7_B1 + .word mus_evolution_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_shinka: +mus_evolution: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_shinka_pri @ Priority - .byte bgm_shinka_rev @ Reverb. + .byte mus_evolution_pri @ Priority + .byte mus_evolution_rev @ Reverb. - .word bgm_shinka_grp + .word mus_evolution_grp - .word bgm_shinka_1 - .word bgm_shinka_2 - .word bgm_shinka_3 - .word bgm_shinka_4 - .word bgm_shinka_5 - .word bgm_shinka_6 - .word bgm_shinka_7 + .word mus_evolution_1 + .word mus_evolution_2 + .word mus_evolution_3 + .word mus_evolution_4 + .word mus_evolution_5 + .word mus_evolution_6 + .word mus_evolution_7 .end diff --git a/sound/songs/bgm_me_shinka.s b/sound/songs/mus_evolution_intro.s index a8023124a..e37e2ddb3 100644 --- a/sound/songs/bgm_me_shinka.s +++ b/sound/songs/mus_evolution_intro.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_me_shinka_grp, voicegroup023 - .equ bgm_me_shinka_pri, 0 - .equ bgm_me_shinka_rev, reverb_set+50 - .equ bgm_me_shinka_mvl, 127 - .equ bgm_me_shinka_key, 0 - .equ bgm_me_shinka_tbs, 1 - .equ bgm_me_shinka_exg, 0 - .equ bgm_me_shinka_cmp, 1 + .equ mus_evolution_intro_grp, voicegroup023 + .equ mus_evolution_intro_pri, 0 + .equ mus_evolution_intro_rev, reverb_set+50 + .equ mus_evolution_intro_mvl, 127 + .equ mus_evolution_intro_key, 0 + .equ mus_evolution_intro_tbs, 1 + .equ mus_evolution_intro_exg, 0 + .equ mus_evolution_intro_cmp, 1 .section .rodata - .global bgm_me_shinka + .global mus_evolution_intro .align 2 @********************** Track 1 **********************@ -bgm_me_shinka_1: - .byte KEYSH , bgm_me_shinka_key+0 - .byte TEMPO , 120*bgm_me_shinka_tbs/2 +mus_evolution_intro_1: + .byte KEYSH , mus_evolution_intro_key+0 + .byte TEMPO , 120*mus_evolution_intro_tbs/2 .byte VOICE , 47 - .byte VOL , 80*bgm_me_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_intro_mvl/mxv .byte PAN , c_v-8 .byte N24 , Dn2 , v127 .byte W48 @@ -27,10 +27,10 @@ bgm_me_shinka_1: @********************** Track 2 **********************@ -bgm_me_shinka_2: - .byte KEYSH , bgm_me_shinka_key+0 +mus_evolution_intro_2: + .byte KEYSH , mus_evolution_intro_key+0 .byte VOICE , 80 - .byte VOL , 80*bgm_me_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_intro_mvl/mxv .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v+0 @@ -46,12 +46,12 @@ bgm_me_shinka_2: @********************** Track 3 **********************@ -bgm_me_shinka_3: - .byte KEYSH , bgm_me_shinka_key+0 +mus_evolution_intro_3: + .byte KEYSH , mus_evolution_intro_key+0 .byte VOICE , 82 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 80*bgm_me_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_intro_mvl/mxv .byte BEND , c_v+2 .byte W06 .byte N06 , Gn4 , v032 @@ -66,10 +66,10 @@ bgm_me_shinka_3: @********************** Track 4 **********************@ -bgm_me_shinka_4: - .byte KEYSH , bgm_me_shinka_key+0 +mus_evolution_intro_4: + .byte KEYSH , mus_evolution_intro_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_me_shinka_mvl/mxv + .byte VOL , 80*mus_evolution_intro_mvl/mxv .byte PAN , c_v+23 .byte N48 , Bn2 , v100 .byte W48 @@ -78,17 +78,17 @@ bgm_me_shinka_4: @******************************************************@ .align 2 -bgm_me_shinka: +mus_evolution_intro: .byte 4 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_shinka_pri @ Priority - .byte bgm_me_shinka_rev @ Reverb. + .byte mus_evolution_intro_pri @ Priority + .byte mus_evolution_intro_rev @ Reverb. - .word bgm_me_shinka_grp + .word mus_evolution_intro_grp - .word bgm_me_shinka_1 - .word bgm_me_shinka_2 - .word bgm_me_shinka_3 - .word bgm_me_shinka_4 + .word mus_evolution_intro_1 + .word mus_evolution_intro_2 + .word mus_evolution_intro_3 + .word mus_evolution_intro_4 .end diff --git a/sound/songs/bgm_fanfa5.s b/sound/songs/mus_evolved.s index c08ccc80b..91cf6ea24 100644 --- a/sound/songs/bgm_fanfa5.s +++ b/sound/songs/mus_evolved.s @@ -1,41 +1,41 @@ .include "MPlayDef.s" - .equ bgm_fanfa5_grp, voicegroup009 - .equ bgm_fanfa5_pri, 5 - .equ bgm_fanfa5_rev, reverb_set+50 - .equ bgm_fanfa5_mvl, 127 - .equ bgm_fanfa5_key, 0 - .equ bgm_fanfa5_tbs, 1 - .equ bgm_fanfa5_exg, 0 - .equ bgm_fanfa5_cmp, 1 + .equ mus_evolved_grp, voicegroup009 + .equ mus_evolved_pri, 5 + .equ mus_evolved_rev, reverb_set+50 + .equ mus_evolved_mvl, 127 + .equ mus_evolved_key, 0 + .equ mus_evolved_tbs, 1 + .equ mus_evolved_exg, 0 + .equ mus_evolved_cmp, 1 .section .rodata - .global bgm_fanfa5 + .global mus_evolved .align 2 @********************** Track 1 **********************@ -bgm_fanfa5_1: - .byte KEYSH , bgm_fanfa5_key+0 +mus_evolved_1: + .byte KEYSH , mus_evolved_key+0 .byte W12 - .byte TEMPO , 150*bgm_fanfa5_tbs/2 + .byte TEMPO , 150*mus_evolved_tbs/2 .byte VOICE , 56 .byte PAN , c_v+18 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte N22 , Ds4 , v092 .byte W16 - .byte VOL , 68*bgm_fanfa5_mvl/mxv + .byte VOL , 68*mus_evolved_mvl/mxv .byte W04 - .byte 36*bgm_fanfa5_mvl/mxv + .byte 36*mus_evolved_mvl/mxv .byte W04 - .byte 90*bgm_fanfa5_mvl/mxv + .byte 90*mus_evolved_mvl/mxv .byte N22 , Cn4 .byte W16 - .byte VOL , 68*bgm_fanfa5_mvl/mxv + .byte VOL , 68*mus_evolved_mvl/mxv .byte W04 - .byte 36*bgm_fanfa5_mvl/mxv + .byte 36*mus_evolved_mvl/mxv .byte W04 - .byte 90*bgm_fanfa5_mvl/mxv + .byte 90*mus_evolved_mvl/mxv .byte N16 , Gs3 .byte W16 .byte N06 , Ds3 @@ -68,36 +68,36 @@ bgm_fanfa5_1: @********************** Track 2 **********************@ -bgm_fanfa5_2: - .byte KEYSH , bgm_fanfa5_key+0 +mus_evolved_2: + .byte KEYSH , mus_evolved_key+0 .byte W12 .byte VOICE , 56 .byte PAN , c_v-16 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte N22 , Cn5 , v100 .byte W16 - .byte VOL , 68*bgm_fanfa5_mvl/mxv + .byte VOL , 68*mus_evolved_mvl/mxv .byte W04 - .byte 36*bgm_fanfa5_mvl/mxv + .byte 36*mus_evolved_mvl/mxv .byte W04 - .byte 90*bgm_fanfa5_mvl/mxv + .byte 90*mus_evolved_mvl/mxv .byte N22 , Gs4 .byte W16 - .byte VOL , 68*bgm_fanfa5_mvl/mxv + .byte VOL , 68*mus_evolved_mvl/mxv .byte W04 - .byte 36*bgm_fanfa5_mvl/mxv + .byte 36*mus_evolved_mvl/mxv .byte W04 - .byte 90*bgm_fanfa5_mvl/mxv + .byte 90*mus_evolved_mvl/mxv .byte N40 , Ds4 .byte W12 .byte MOD , 6 .byte W28 - .byte VOL , 68*bgm_fanfa5_mvl/mxv + .byte VOL , 68*mus_evolved_mvl/mxv .byte MOD , 0 .byte W04 - .byte VOL , 36*bgm_fanfa5_mvl/mxv + .byte VOL , 36*mus_evolved_mvl/mxv .byte W04 - .byte 90*bgm_fanfa5_mvl/mxv + .byte 90*mus_evolved_mvl/mxv .byte N04 , Cs5 .byte W08 .byte N04 @@ -120,11 +120,11 @@ bgm_fanfa5_2: @********************** Track 3 **********************@ -bgm_fanfa5_3: - .byte KEYSH , bgm_fanfa5_key+0 +mus_evolved_3: + .byte KEYSH , mus_evolved_key+0 .byte W12 .byte VOICE , 88 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte N12 , Ds1 , v080 .byte W24 .byte N12 @@ -148,19 +148,19 @@ bgm_fanfa5_3: @********************** Track 4 **********************@ -bgm_fanfa5_4: - .byte KEYSH , bgm_fanfa5_key+0 +mus_evolved_4: + .byte KEYSH , mus_evolved_key+0 .byte W12 .byte VOICE , 82 .byte PAN , c_v-48 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte N08 , Gs4 , v040 .byte W08 .byte Ds4 .byte W08 .byte Cn4 .byte W08 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte N08 , Gs4 .byte W08 .byte Ds4 @@ -201,12 +201,12 @@ bgm_fanfa5_4: @********************** Track 5 **********************@ -bgm_fanfa5_5: - .byte KEYSH , bgm_fanfa5_key+0 +mus_evolved_5: + .byte KEYSH , mus_evolved_key+0 .byte W12 .byte VOICE , 83 .byte PAN , c_v+48 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte W04 .byte N08 , Gs4 , v040 .byte W08 @@ -214,7 +214,7 @@ bgm_fanfa5_5: .byte W08 .byte Cn4 .byte W04 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte W04 .byte N08 , Gs4 .byte W08 @@ -257,13 +257,13 @@ bgm_fanfa5_5: @********************** Track 6 **********************@ -bgm_fanfa5_6: - .byte KEYSH , bgm_fanfa5_key+0 +mus_evolved_6: + .byte KEYSH , mus_evolved_key+0 .byte W12 .byte VOICE , 47 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte W24 - .byte 90*bgm_fanfa5_mvl/mxv + .byte 90*mus_evolved_mvl/mxv .byte W56 .byte N08 , Cn2 , v127 .byte W08 @@ -284,15 +284,15 @@ bgm_fanfa5_6: @********************** Track 7 **********************@ -bgm_fanfa5_7: - .byte KEYSH , bgm_fanfa5_key+0 +mus_evolved_7: + .byte KEYSH , mus_evolved_key+0 .byte W12 .byte VOICE , 0 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte N04 , En1 , v112 .byte N80 , An2 , v120 .byte W24 - .byte VOL , 90*bgm_fanfa5_mvl/mxv + .byte VOL , 90*mus_evolved_mvl/mxv .byte N04 , En1 , v112 .byte W08 .byte En1 , v092 @@ -331,20 +331,20 @@ bgm_fanfa5_7: @******************************************************@ .align 2 -bgm_fanfa5: +mus_evolved: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_fanfa5_pri @ Priority - .byte bgm_fanfa5_rev @ Reverb. + .byte mus_evolved_pri @ Priority + .byte mus_evolved_rev @ Reverb. - .word bgm_fanfa5_grp + .word mus_evolved_grp - .word bgm_fanfa5_1 - .word bgm_fanfa5_2 - .word bgm_fanfa5_3 - .word bgm_fanfa5_4 - .word bgm_fanfa5_5 - .word bgm_fanfa5_6 - .word bgm_fanfa5_7 + .word mus_evolved_1 + .word mus_evolved_2 + .word mus_evolved_3 + .word mus_evolved_4 + .word mus_evolved_5 + .word mus_evolved_6 + .word mus_evolved_7 .end diff --git a/sound/songs/bgm_tonekusa.s b/sound/songs/mus_fallarbor.s index 0507fed2a..dee381ab3 100644 --- a/sound/songs/bgm_tonekusa.s +++ b/sound/songs/mus_fallarbor.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_tonekusa_grp, voicegroup080 - .equ bgm_tonekusa_pri, 0 - .equ bgm_tonekusa_rev, reverb_set+50 - .equ bgm_tonekusa_mvl, 127 - .equ bgm_tonekusa_key, 0 - .equ bgm_tonekusa_tbs, 1 - .equ bgm_tonekusa_exg, 0 - .equ bgm_tonekusa_cmp, 1 + .equ mus_fallarbor_grp, voicegroup080 + .equ mus_fallarbor_pri, 0 + .equ mus_fallarbor_rev, reverb_set+50 + .equ mus_fallarbor_mvl, 127 + .equ mus_fallarbor_key, 0 + .equ mus_fallarbor_tbs, 1 + .equ mus_fallarbor_exg, 0 + .equ mus_fallarbor_cmp, 1 .section .rodata - .global bgm_tonekusa + .global mus_fallarbor .align 2 @********************** Track 1 **********************@ -bgm_tonekusa_1: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_1_B1: - .byte TEMPO , 148*bgm_tonekusa_tbs/2 +mus_fallarbor_1: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_1_B1: + .byte TEMPO , 148*mus_fallarbor_tbs/2 .byte VOICE , 24 .byte PAN , c_v+0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte N72 , Fn4 , v048 @@ -29,16 +29,16 @@ bgm_tonekusa_1_B1: .byte MOD , 4 .byte W24 .byte 7 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte W05 - .byte 59*bgm_tonekusa_mvl/mxv + .byte 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte N12 , Ds4 .byte W12 .byte Dn4 @@ -47,16 +47,16 @@ bgm_tonekusa_1_B1: .byte W24 .byte MOD , 5 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N12 , As3 .byte W12 @@ -75,46 +75,46 @@ bgm_tonekusa_1_B1: .byte MOD , 5 .byte W24 .byte 7 - .byte VOL , 97*bgm_tonekusa_mvl/mxv + .byte VOL , 97*mus_fallarbor_mvl/mxv .byte W05 - .byte 87*bgm_tonekusa_mvl/mxv + .byte 87*mus_fallarbor_mvl/mxv .byte W07 - .byte 81*bgm_tonekusa_mvl/mxv + .byte 81*mus_fallarbor_mvl/mxv .byte W05 - .byte 72*bgm_tonekusa_mvl/mxv + .byte 72*mus_fallarbor_mvl/mxv .byte W07 - .byte 59*bgm_tonekusa_mvl/mxv + .byte 59*mus_fallarbor_mvl/mxv .byte W05 - .byte 34*bgm_tonekusa_mvl/mxv + .byte 34*mus_fallarbor_mvl/mxv .byte W07 - .byte 18*bgm_tonekusa_mvl/mxv + .byte 18*mus_fallarbor_mvl/mxv .byte W05 - .byte 3*bgm_tonekusa_mvl/mxv + .byte 3*mus_fallarbor_mvl/mxv .byte W01 - .byte 11*bgm_tonekusa_mvl/mxv + .byte 11*mus_fallarbor_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte N72 , Gn4 .byte W24 .byte MOD , 4 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N12 , An4 .byte W12 .byte As4 .byte W12 -bgm_tonekusa_1_000: +mus_fallarbor_1_000: .byte N24 , Fn4 , v048 .byte W24 .byte Dn4 @@ -128,16 +128,16 @@ bgm_tonekusa_1_000: .byte W24 .byte MOD , 4 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N12 , Ds4 .byte W12 @@ -148,40 +148,40 @@ bgm_tonekusa_1_000: .byte MOD , 4 .byte W24 .byte 7 - .byte VOL , 97*bgm_tonekusa_mvl/mxv + .byte VOL , 97*mus_fallarbor_mvl/mxv .byte W05 - .byte 87*bgm_tonekusa_mvl/mxv + .byte 87*mus_fallarbor_mvl/mxv .byte W07 - .byte 81*bgm_tonekusa_mvl/mxv + .byte 81*mus_fallarbor_mvl/mxv .byte W05 - .byte 72*bgm_tonekusa_mvl/mxv + .byte 72*mus_fallarbor_mvl/mxv .byte W07 - .byte 59*bgm_tonekusa_mvl/mxv + .byte 59*mus_fallarbor_mvl/mxv .byte W05 - .byte 34*bgm_tonekusa_mvl/mxv + .byte 34*mus_fallarbor_mvl/mxv .byte W07 - .byte 18*bgm_tonekusa_mvl/mxv + .byte 18*mus_fallarbor_mvl/mxv .byte W05 - .byte 3*bgm_tonekusa_mvl/mxv + .byte 3*mus_fallarbor_mvl/mxv .byte W01 - .byte 11*bgm_tonekusa_mvl/mxv + .byte 11*mus_fallarbor_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte N72 , Gn4 .byte W24 .byte MOD , 4 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N12 , Fn4 .byte W12 @@ -195,16 +195,16 @@ bgm_tonekusa_1_000: .byte W48 .byte N48 , Ds4 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N16 .byte W16 @@ -224,16 +224,16 @@ bgm_tonekusa_1_000: .byte 0 .byte N48 , Gn4 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte W12 .byte N12 @@ -243,7 +243,7 @@ bgm_tonekusa_1_000: .byte As4 .byte W12 .byte PATT - .word bgm_tonekusa_1_000 + .word mus_fallarbor_1_000 .byte N48 , Dn4 , v048 .byte W48 .byte N03 , Cn4 @@ -273,16 +273,16 @@ bgm_tonekusa_1_000: .byte W24 .byte MOD , 3 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N12 , Ds4 .byte W12 @@ -294,16 +294,16 @@ bgm_tonekusa_1_000: .byte W03 .byte N66 , Cn4 .byte W42 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N12 , As3 .byte W12 @@ -321,16 +321,16 @@ bgm_tonekusa_1_000: .byte W24 .byte N72 , Fn4 .byte W48 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N12 , Ds4 .byte W12 @@ -361,16 +361,16 @@ bgm_tonekusa_1_000: .byte W03 .byte N44 , Dn4 .byte W21 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N02 , Ds4 .byte W02 @@ -382,17 +382,17 @@ bgm_tonekusa_1_000: .byte W16 .byte N72 , Cn4 .byte W48 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 .byte VOICE , 48 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N12 , Fn4 , v040 .byte W12 @@ -416,16 +416,16 @@ bgm_tonekusa_1_000: .byte W48 .byte N48 , Ds4 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte N04 .byte W04 @@ -447,18 +447,18 @@ bgm_tonekusa_1_000: .byte W24 .byte N44 , Gn4 .byte W24 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 .byte MOD , 0 .byte W12 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte N12 , Gn4 , v036 .byte W12 .byte An4 , v032 @@ -487,16 +487,16 @@ bgm_tonekusa_1_000: .byte W12 .byte N72 , As3 , v044 .byte W48 - .byte VOL , 89*bgm_tonekusa_mvl/mxv + .byte VOL , 89*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 59*bgm_tonekusa_mvl/mxv + .byte VOL , 59*mus_fallarbor_mvl/mxv .byte W07 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W05 - .byte 5*bgm_tonekusa_mvl/mxv + .byte 5*mus_fallarbor_mvl/mxv .byte W07 - .byte 100*bgm_tonekusa_mvl/mxv + .byte 100*mus_fallarbor_mvl/mxv .byte MOD , 0 .byte W24 .byte VOICE , 24 @@ -510,16 +510,16 @@ bgm_tonekusa_1_000: .byte Ds4 .byte W12 .byte GOTO - .word bgm_tonekusa_1_B1 + .word mus_fallarbor_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_tonekusa_2: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_2_B1: +mus_fallarbor_2: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_2_B1: .byte VOICE , 45 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v-15 @@ -643,17 +643,17 @@ bgm_tonekusa_2_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_tonekusa_2_B1 + .word mus_fallarbor_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_tonekusa_3: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_3_B1: +mus_fallarbor_3: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_3_B1: .byte VOICE , 48 .byte PAN , c_v+0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte W96 @@ -738,16 +738,16 @@ bgm_tonekusa_3_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_tonekusa_3_B1 + .word mus_fallarbor_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_tonekusa_4: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_4_B1: +mus_fallarbor_4: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_4_B1: .byte VOICE , 45 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte PAN , c_v+0 .byte BENDR , 12 .byte LFOS , 44 @@ -882,33 +882,33 @@ bgm_tonekusa_4_B1: .byte W24 .byte N48 , As1 .byte W24 - .byte VOL , 81*bgm_tonekusa_mvl/mxv + .byte VOL , 81*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 61*bgm_tonekusa_mvl/mxv + .byte VOL , 61*mus_fallarbor_mvl/mxv .byte W07 - .byte 37*bgm_tonekusa_mvl/mxv + .byte 37*mus_fallarbor_mvl/mxv .byte W05 - .byte 15*bgm_tonekusa_mvl/mxv + .byte 15*mus_fallarbor_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte W48 .byte VOICE , 60 .byte N72 , Fn1 .byte W24 .byte MOD , 7 .byte W24 - .byte VOL , 81*bgm_tonekusa_mvl/mxv + .byte VOL , 81*mus_fallarbor_mvl/mxv .byte W05 - .byte 61*bgm_tonekusa_mvl/mxv + .byte 61*mus_fallarbor_mvl/mxv .byte W07 - .byte 37*bgm_tonekusa_mvl/mxv + .byte 37*mus_fallarbor_mvl/mxv .byte W05 - .byte 15*bgm_tonekusa_mvl/mxv + .byte 15*mus_fallarbor_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte N12 , An1 .byte W12 .byte Cn2 @@ -929,16 +929,16 @@ bgm_tonekusa_4_B1: .byte W24 .byte MOD , 7 .byte W24 - .byte VOL , 81*bgm_tonekusa_mvl/mxv + .byte VOL , 81*mus_fallarbor_mvl/mxv .byte W05 - .byte 61*bgm_tonekusa_mvl/mxv + .byte 61*mus_fallarbor_mvl/mxv .byte W07 - .byte 37*bgm_tonekusa_mvl/mxv + .byte 37*mus_fallarbor_mvl/mxv .byte W05 - .byte 15*bgm_tonekusa_mvl/mxv + .byte 15*mus_fallarbor_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte N12 , Dn2 .byte W12 .byte Fn2 @@ -955,16 +955,16 @@ bgm_tonekusa_4_B1: .byte W24 .byte MOD , 6 .byte W24 - .byte VOL , 81*bgm_tonekusa_mvl/mxv + .byte VOL , 81*mus_fallarbor_mvl/mxv .byte W05 - .byte 61*bgm_tonekusa_mvl/mxv + .byte 61*mus_fallarbor_mvl/mxv .byte W07 - .byte 37*bgm_tonekusa_mvl/mxv + .byte 37*mus_fallarbor_mvl/mxv .byte W05 - .byte 15*bgm_tonekusa_mvl/mxv + .byte 15*mus_fallarbor_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte N12 , Fn2 .byte W12 .byte Gn2 @@ -1016,7 +1016,7 @@ bgm_tonekusa_4_B1: .byte W12 .byte MOD , 6 .byte W12 -bgm_tonekusa_4_000: +mus_fallarbor_4_000: .byte MOD , 0 .byte N24 , Fn1 , v072 .byte W24 @@ -1060,22 +1060,22 @@ bgm_tonekusa_4_000: .byte MOD , 6 .byte W12 .byte PATT - .word bgm_tonekusa_4_000 + .word mus_fallarbor_4_000 .byte MOD , 0 .byte N72 , As1 , v072 .byte W24 .byte MOD , 7 .byte W24 - .byte VOL , 81*bgm_tonekusa_mvl/mxv + .byte VOL , 81*mus_fallarbor_mvl/mxv .byte W05 - .byte 62*bgm_tonekusa_mvl/mxv + .byte 62*mus_fallarbor_mvl/mxv .byte W07 - .byte 40*bgm_tonekusa_mvl/mxv + .byte 40*mus_fallarbor_mvl/mxv .byte W05 - .byte 19*bgm_tonekusa_mvl/mxv + .byte 19*mus_fallarbor_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte N12 , Gs1 .byte W12 .byte An1 @@ -1087,28 +1087,28 @@ bgm_tonekusa_4_000: .byte 0 .byte N48 , Fn2 .byte W24 - .byte VOL , 81*bgm_tonekusa_mvl/mxv + .byte VOL , 81*mus_fallarbor_mvl/mxv .byte MOD , 6 .byte W05 - .byte VOL , 62*bgm_tonekusa_mvl/mxv + .byte VOL , 62*mus_fallarbor_mvl/mxv .byte W07 - .byte 40*bgm_tonekusa_mvl/mxv + .byte 40*mus_fallarbor_mvl/mxv .byte W05 - .byte 19*bgm_tonekusa_mvl/mxv + .byte 19*mus_fallarbor_mvl/mxv .byte W07 .byte GOTO - .word bgm_tonekusa_4_B1 + .word mus_fallarbor_4_B1 .byte MOD , 0 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte FINE @********************** Track 5 **********************@ -bgm_tonekusa_5: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_5_B1: +mus_fallarbor_5: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_5_B1: .byte VOICE , 46 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte PAN , c_v+12 .byte BENDR , 12 .byte LFOS , 44 @@ -1343,7 +1343,7 @@ bgm_tonekusa_5_B1: .byte W12 .byte N12 , Fn4 , v016 .byte W12 -bgm_tonekusa_5_000: +mus_fallarbor_5_000: .byte VOICE , 24 .byte BEND , c_v+0 .byte N12 , As3 , v032 @@ -1444,7 +1444,7 @@ bgm_tonekusa_5_000: .byte BEND , c_v+6 .byte W12 .byte PATT - .word bgm_tonekusa_5_000 + .word mus_fallarbor_5_000 .byte N12 , Dn4 , v040 .byte W12 .byte Cn4 , v048 @@ -1511,56 +1511,56 @@ bgm_tonekusa_5_000: .byte As4 , v028 .byte W84 .byte GOTO - .word bgm_tonekusa_5_B1 + .word mus_fallarbor_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_tonekusa_6: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_6_B1: +mus_fallarbor_6: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_6_B1: .byte VOICE , 80 .byte PAN , c_v-60 - .byte VOL , 39*bgm_tonekusa_mvl/mxv + .byte VOL , 39*mus_fallarbor_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte W96 .byte W96 .byte W96 - .byte VOL , 4*bgm_tonekusa_mvl/mxv + .byte VOL , 4*mus_fallarbor_mvl/mxv .byte N72 , Dn3 , v072 .byte W02 - .byte VOL , 9*bgm_tonekusa_mvl/mxv + .byte VOL , 9*mus_fallarbor_mvl/mxv .byte W03 - .byte 12*bgm_tonekusa_mvl/mxv + .byte 12*mus_fallarbor_mvl/mxv .byte W03 - .byte 15*bgm_tonekusa_mvl/mxv + .byte 15*mus_fallarbor_mvl/mxv .byte W04 - .byte 18*bgm_tonekusa_mvl/mxv + .byte 18*mus_fallarbor_mvl/mxv .byte W02 - .byte 20*bgm_tonekusa_mvl/mxv + .byte 20*mus_fallarbor_mvl/mxv .byte W03 - .byte 23*bgm_tonekusa_mvl/mxv + .byte 23*mus_fallarbor_mvl/mxv .byte W03 - .byte 25*bgm_tonekusa_mvl/mxv + .byte 25*mus_fallarbor_mvl/mxv .byte W04 - .byte 28*bgm_tonekusa_mvl/mxv + .byte 28*mus_fallarbor_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 29*bgm_tonekusa_mvl/mxv + .byte VOL , 29*mus_fallarbor_mvl/mxv .byte W03 - .byte 33*bgm_tonekusa_mvl/mxv + .byte 33*mus_fallarbor_mvl/mxv .byte W03 - .byte 34*bgm_tonekusa_mvl/mxv + .byte 34*mus_fallarbor_mvl/mxv .byte W06 - .byte 37*bgm_tonekusa_mvl/mxv + .byte 37*mus_fallarbor_mvl/mxv .byte W10 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W24 .byte MOD , 0 .byte N24 , Cs3 .byte W24 - .byte VOL , 33*bgm_tonekusa_mvl/mxv + .byte VOL , 33*mus_fallarbor_mvl/mxv .byte N48 , Ds3 .byte W24 .byte MOD , 6 @@ -1676,7 +1676,7 @@ bgm_tonekusa_6_B1: .byte W24 .byte Bn1 .byte W24 - .byte VOL , 39*bgm_tonekusa_mvl/mxv + .byte VOL , 39*mus_fallarbor_mvl/mxv .byte N12 , Cn2 .byte W12 .byte Fn3 @@ -1821,7 +1821,7 @@ bgm_tonekusa_6_B1: .byte W12 .byte Ds4 .byte W12 -bgm_tonekusa_6_000: +mus_fallarbor_6_000: .byte N12 , As3 , v072 .byte W12 .byte Fn3 @@ -1856,7 +1856,7 @@ bgm_tonekusa_6_000: .byte An2 .byte W12 .byte PATT - .word bgm_tonekusa_6_000 + .word mus_fallarbor_6_000 .byte N12 , Gn2 , v072 .byte W12 .byte Cn4 @@ -1938,56 +1938,56 @@ bgm_tonekusa_6_000: .byte Dn3 .byte W12 .byte GOTO - .word bgm_tonekusa_6_B1 + .word mus_fallarbor_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_tonekusa_7: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_7_B1: +mus_fallarbor_7: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_7_B1: .byte VOICE , 81 .byte PAN , c_v+63 - .byte VOL , 39*bgm_tonekusa_mvl/mxv + .byte VOL , 39*mus_fallarbor_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte W96 .byte W96 .byte W96 - .byte VOL , 4*bgm_tonekusa_mvl/mxv + .byte VOL , 4*mus_fallarbor_mvl/mxv .byte N72 , Fn3 , v072 .byte W02 - .byte VOL , 9*bgm_tonekusa_mvl/mxv + .byte VOL , 9*mus_fallarbor_mvl/mxv .byte W03 - .byte 12*bgm_tonekusa_mvl/mxv + .byte 12*mus_fallarbor_mvl/mxv .byte W03 - .byte 15*bgm_tonekusa_mvl/mxv + .byte 15*mus_fallarbor_mvl/mxv .byte W04 - .byte 18*bgm_tonekusa_mvl/mxv + .byte 18*mus_fallarbor_mvl/mxv .byte W02 - .byte 20*bgm_tonekusa_mvl/mxv + .byte 20*mus_fallarbor_mvl/mxv .byte W03 - .byte 23*bgm_tonekusa_mvl/mxv + .byte 23*mus_fallarbor_mvl/mxv .byte W03 - .byte 25*bgm_tonekusa_mvl/mxv + .byte 25*mus_fallarbor_mvl/mxv .byte W04 - .byte 28*bgm_tonekusa_mvl/mxv + .byte 28*mus_fallarbor_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 29*bgm_tonekusa_mvl/mxv + .byte VOL , 29*mus_fallarbor_mvl/mxv .byte W03 - .byte 33*bgm_tonekusa_mvl/mxv + .byte 33*mus_fallarbor_mvl/mxv .byte W03 - .byte 34*bgm_tonekusa_mvl/mxv + .byte 34*mus_fallarbor_mvl/mxv .byte W06 - .byte 37*bgm_tonekusa_mvl/mxv + .byte 37*mus_fallarbor_mvl/mxv .byte W10 - .byte 39*bgm_tonekusa_mvl/mxv + .byte 39*mus_fallarbor_mvl/mxv .byte W24 .byte MOD , 0 .byte N24 , Fs3 .byte W24 - .byte VOL , 31*bgm_tonekusa_mvl/mxv + .byte VOL , 31*mus_fallarbor_mvl/mxv .byte N48 , Gn3 .byte W24 .byte MOD , 6 @@ -2008,7 +2008,7 @@ bgm_tonekusa_7_B1: .byte W24 .byte MOD , 6 .byte W24 -bgm_tonekusa_7_000: +mus_fallarbor_7_000: .byte MOD , 0 .byte N48 , As3 , v072 .byte W24 @@ -2056,7 +2056,7 @@ bgm_tonekusa_7_000: .byte MOD , 6 .byte W24 .byte PATT - .word bgm_tonekusa_7_000 + .word mus_fallarbor_7_000 .byte MOD , 0 .byte N48 , An3 , v072 .byte W24 @@ -2098,7 +2098,7 @@ bgm_tonekusa_7_000: .byte W24 .byte As2 .byte W24 - .byte VOL , 37*bgm_tonekusa_mvl/mxv + .byte VOL , 37*mus_fallarbor_mvl/mxv .byte N12 , Fn2 .byte W12 .byte An3 @@ -2243,7 +2243,7 @@ bgm_tonekusa_7_000: .byte W12 .byte Gn4 .byte W12 -bgm_tonekusa_7_001: +mus_fallarbor_7_001: .byte N12 , Dn4 , v072 .byte W12 .byte As3 @@ -2278,7 +2278,7 @@ bgm_tonekusa_7_001: .byte Ds3 .byte W12 .byte PATT - .word bgm_tonekusa_7_001 + .word mus_fallarbor_7_001 .byte N12 , As2 , v072 .byte W12 .byte Ds4 @@ -2360,17 +2360,17 @@ bgm_tonekusa_7_001: .byte Fn3 .byte W12 .byte GOTO - .word bgm_tonekusa_7_B1 + .word mus_fallarbor_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_tonekusa_8: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_8_B1: +mus_fallarbor_8: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_8_B1: .byte VOICE , 82 .byte PAN , c_v+0 - .byte VOL , 37*bgm_tonekusa_mvl/mxv + .byte VOL , 37*mus_fallarbor_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte BEND , c_v+1 @@ -2380,7 +2380,7 @@ bgm_tonekusa_8_B1: .byte W12 .byte Dn4 .byte W12 -bgm_tonekusa_8_000: +mus_fallarbor_8_000: .byte N72 , Cn4 , v064 .byte W72 .byte N12 , As3 @@ -2388,7 +2388,7 @@ bgm_tonekusa_8_000: .byte Cn4 .byte W12 .byte PEND -bgm_tonekusa_8_001: +mus_fallarbor_8_001: .byte N24 , Dn4 , v064 .byte W24 .byte Ds4 @@ -2406,7 +2406,7 @@ bgm_tonekusa_8_001: .byte W12 .byte As4 .byte W12 -bgm_tonekusa_8_002: +mus_fallarbor_8_002: .byte N24 , Fn4 , v064 .byte W24 .byte Dn4 @@ -2430,7 +2430,7 @@ bgm_tonekusa_8_002: .byte W12 .byte Ds4 .byte W12 -bgm_tonekusa_8_003: +mus_fallarbor_8_003: .byte N24 , Fn4 , v064 .byte W24 .byte Dn4 @@ -2438,7 +2438,7 @@ bgm_tonekusa_8_003: .byte N12 , As3 .byte W48 .byte PEND -bgm_tonekusa_8_004: +mus_fallarbor_8_004: .byte N48 , Ds4 , v064 .byte W48 .byte N16 @@ -2452,7 +2452,7 @@ bgm_tonekusa_8_004: .byte W48 .byte Fn4 .byte W48 -bgm_tonekusa_8_005: +mus_fallarbor_8_005: .byte N48 , Gn4 , v064 .byte W60 .byte N12 @@ -2463,7 +2463,7 @@ bgm_tonekusa_8_005: .byte W12 .byte PEND .byte PATT - .word bgm_tonekusa_8_002 + .word mus_fallarbor_8_002 .byte N48 , Dn4 , v064 .byte W48 .byte N03 , Cn4 @@ -2496,9 +2496,9 @@ bgm_tonekusa_8_005: .byte Dn4 .byte W12 .byte PATT - .word bgm_tonekusa_8_000 + .word mus_fallarbor_8_000 .byte PATT - .word bgm_tonekusa_8_001 + .word mus_fallarbor_8_001 .byte N72 , Fn4 , v064 .byte W72 .byte N12 , Ds4 @@ -2516,7 +2516,7 @@ bgm_tonekusa_8_005: .byte N03 , En4 .byte W03 .byte PATT - .word bgm_tonekusa_8_002 + .word mus_fallarbor_8_002 .byte N48 , Dn4 , v064 .byte W48 .byte N16 @@ -2540,9 +2540,9 @@ bgm_tonekusa_8_005: .byte Gn4 .byte W12 .byte PATT - .word bgm_tonekusa_8_003 + .word mus_fallarbor_8_003 .byte PATT - .word bgm_tonekusa_8_004 + .word mus_fallarbor_8_004 .byte N24 , Dn4 , v064 .byte W24 .byte Ds4 @@ -2552,7 +2552,7 @@ bgm_tonekusa_8_005: .byte Fs4 .byte W24 .byte PATT - .word bgm_tonekusa_8_005 + .word mus_fallarbor_8_005 .byte N24 , Dn5 , v064 .byte W24 .byte Cn5 @@ -2581,16 +2581,16 @@ bgm_tonekusa_8_005: .byte Ds4 .byte W12 .byte GOTO - .word bgm_tonekusa_8_B1 + .word mus_fallarbor_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_tonekusa_9: - .byte KEYSH , bgm_tonekusa_key+0 -bgm_tonekusa_9_B1: +mus_fallarbor_9: + .byte KEYSH , mus_fallarbor_key+0 +mus_fallarbor_9_B1: .byte VOICE , 46 - .byte VOL , 100*bgm_tonekusa_mvl/mxv + .byte VOL , 100*mus_fallarbor_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+11 @@ -2627,7 +2627,7 @@ bgm_tonekusa_9_B1: .byte W12 .byte N12 , As5 , v020 .byte W36 -bgm_tonekusa_9_000: +mus_fallarbor_9_000: .byte N06 , Fn5 , v048 .byte W12 .byte N12 , Fn5 , v020 @@ -2638,7 +2638,7 @@ bgm_tonekusa_9_000: .byte W36 .byte PEND .byte PATT - .word bgm_tonekusa_9_000 + .word mus_fallarbor_9_000 .byte N06 , Cn5 , v048 .byte W12 .byte N12 , Cn5 , v020 @@ -2820,28 +2820,28 @@ bgm_tonekusa_9_000: .byte W96 .byte W96 .byte GOTO - .word bgm_tonekusa_9_B1 + .word mus_fallarbor_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_tonekusa: +mus_fallarbor: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_tonekusa_pri @ Priority - .byte bgm_tonekusa_rev @ Reverb. + .byte mus_fallarbor_pri @ Priority + .byte mus_fallarbor_rev @ Reverb. - .word bgm_tonekusa_grp + .word mus_fallarbor_grp - .word bgm_tonekusa_1 - .word bgm_tonekusa_2 - .word bgm_tonekusa_3 - .word bgm_tonekusa_4 - .word bgm_tonekusa_5 - .word bgm_tonekusa_6 - .word bgm_tonekusa_7 - .word bgm_tonekusa_8 - .word bgm_tonekusa_9 + .word mus_fallarbor_1 + .word mus_fallarbor_2 + .word mus_fallarbor_3 + .word mus_fallarbor_4 + .word mus_fallarbor_5 + .word mus_fallarbor_6 + .word mus_fallarbor_7 + .word mus_fallarbor_8 + .word mus_fallarbor_9 .end diff --git a/sound/songs/bgm_tsuretek.s b/sound/songs/mus_follow_me.s index f0c51e321..0744e2d01 100644 --- a/sound/songs/bgm_tsuretek.s +++ b/sound/songs/mus_follow_me.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_tsuretek_grp, voicegroup063 - .equ bgm_tsuretek_pri, 0 - .equ bgm_tsuretek_rev, reverb_set+50 - .equ bgm_tsuretek_mvl, 127 - .equ bgm_tsuretek_key, 0 - .equ bgm_tsuretek_tbs, 1 - .equ bgm_tsuretek_exg, 0 - .equ bgm_tsuretek_cmp, 1 + .equ mus_follow_me_grp, voicegroup063 + .equ mus_follow_me_pri, 0 + .equ mus_follow_me_rev, reverb_set+50 + .equ mus_follow_me_mvl, 127 + .equ mus_follow_me_key, 0 + .equ mus_follow_me_tbs, 1 + .equ mus_follow_me_exg, 0 + .equ mus_follow_me_cmp, 1 .section .rodata - .global bgm_tsuretek + .global mus_follow_me .align 2 @********************** Track 1 **********************@ -bgm_tsuretek_1: - .byte KEYSH , bgm_tsuretek_key+0 - .byte TEMPO , 128*bgm_tsuretek_tbs/2 +mus_follow_me_1: + .byte KEYSH , mus_follow_me_key+0 + .byte TEMPO , 128*mus_follow_me_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 35*bgm_tsuretek_mvl/mxv + .byte VOL , 35*mus_follow_me_mvl/mxv .byte PAN , c_v+0 .byte N04 , Cn5 , v112 .byte W16 @@ -65,8 +65,8 @@ bgm_tsuretek_1: .byte W04 .byte N04 .byte W04 -bgm_tsuretek_1_B1: -bgm_tsuretek_1_000: +mus_follow_me_1_B1: +mus_follow_me_1_000: .byte N04 , Cn5 , v112 .byte W16 .byte N04 @@ -89,12 +89,12 @@ bgm_tsuretek_1_000: .byte W04 .byte PEND .byte PATT - .word bgm_tsuretek_1_000 + .word mus_follow_me_1_000 .byte PATT - .word bgm_tsuretek_1_000 + .word mus_follow_me_1_000 .byte PATT - .word bgm_tsuretek_1_000 -bgm_tsuretek_1_001: + .word mus_follow_me_1_000 +mus_follow_me_1_001: .byte N04 , Cn5 , v112 .byte W16 .byte N04 @@ -128,7 +128,7 @@ bgm_tsuretek_1_001: .byte Cn5 , v040 .byte W04 .byte PEND -bgm_tsuretek_1_002: +mus_follow_me_1_002: .byte N04 , Cn5 , v112 .byte W12 .byte N04 @@ -155,30 +155,30 @@ bgm_tsuretek_1_002: .byte W04 .byte PEND .byte PATT - .word bgm_tsuretek_1_000 + .word mus_follow_me_1_000 .byte PATT - .word bgm_tsuretek_1_000 + .word mus_follow_me_1_000 .byte PATT - .word bgm_tsuretek_1_000 + .word mus_follow_me_1_000 .byte PATT - .word bgm_tsuretek_1_000 + .word mus_follow_me_1_000 .byte PATT - .word bgm_tsuretek_1_001 + .word mus_follow_me_1_001 .byte PATT - .word bgm_tsuretek_1_002 + .word mus_follow_me_1_002 .byte GOTO - .word bgm_tsuretek_1_B1 + .word mus_follow_me_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_tsuretek_2: - .byte KEYSH , bgm_tsuretek_key+0 +mus_follow_me_2: + .byte KEYSH , mus_follow_me_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 54*bgm_tsuretek_mvl/mxv + .byte VOL , 54*mus_follow_me_mvl/mxv .byte N16 , En5 , v112 .byte W16 .byte N04 , Dn5 @@ -209,7 +209,7 @@ bgm_tsuretek_2: .byte W08 .byte En5 .byte W48 -bgm_tsuretek_2_B1: +mus_follow_me_2_B1: .byte N04 , An3 , v112 .byte W16 .byte Cs4 @@ -327,20 +327,20 @@ bgm_tsuretek_2_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_tsuretek_2_B1 + .word mus_follow_me_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_tsuretek_3: - .byte KEYSH , bgm_tsuretek_key+0 +mus_follow_me_3: + .byte KEYSH , mus_follow_me_key+0 .byte VOICE , 35 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+3 - .byte VOL , 74*bgm_tsuretek_mvl/mxv + .byte VOL , 74*mus_follow_me_mvl/mxv .byte N04 , Gs1 , v127 .byte W08 .byte Bn1 @@ -381,7 +381,7 @@ bgm_tsuretek_3: .byte W04 .byte c_v-62 .byte W04 -bgm_tsuretek_3_B1: +mus_follow_me_3_B1: .byte BEND , c_v+0 .byte N04 , An1 , v127 .byte W24 @@ -395,7 +395,7 @@ bgm_tsuretek_3_B1: .byte W16 .byte N04 , Gs1 .byte W08 -bgm_tsuretek_3_000: +mus_follow_me_3_000: .byte N04 , An1 , v127 .byte W24 .byte N16 , En1 @@ -410,8 +410,8 @@ bgm_tsuretek_3_000: .byte W08 .byte PEND .byte PATT - .word bgm_tsuretek_3_000 -bgm_tsuretek_3_001: + .word mus_follow_me_3_000 +mus_follow_me_3_001: .byte N04 , Gs1 , v127 .byte W24 .byte N16 , En1 @@ -428,13 +428,13 @@ bgm_tsuretek_3_001: .byte W96 .byte W96 .byte PATT - .word bgm_tsuretek_3_000 + .word mus_follow_me_3_000 .byte PATT - .word bgm_tsuretek_3_000 + .word mus_follow_me_3_000 .byte PATT - .word bgm_tsuretek_3_000 + .word mus_follow_me_3_000 .byte PATT - .word bgm_tsuretek_3_001 + .word mus_follow_me_3_001 .byte N04 , En1 , v127 .byte W16 .byte N04 @@ -460,17 +460,17 @@ bgm_tsuretek_3_001: .byte N16 , Bn1 .byte W48 .byte GOTO - .word bgm_tsuretek_3_B1 + .word mus_follow_me_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_tsuretek_4: - .byte KEYSH , bgm_tsuretek_key+0 +mus_follow_me_4: + .byte KEYSH , mus_follow_me_key+0 .byte VOICE , 45 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 46*bgm_tsuretek_mvl/mxv + .byte VOL , 46*mus_follow_me_mvl/mxv .byte PAN , c_v-17 .byte N16 , Bn4 , v112 .byte W16 @@ -502,8 +502,8 @@ bgm_tsuretek_4: .byte W08 .byte Gs4 .byte W48 -bgm_tsuretek_4_B1: -bgm_tsuretek_4_000: +mus_follow_me_4_B1: +mus_follow_me_4_000: .byte N04 , En3 , v112 .byte W16 .byte An3 @@ -517,7 +517,7 @@ bgm_tsuretek_4_000: .byte N16 , Fs4 .byte W24 .byte PEND -bgm_tsuretek_4_001: +mus_follow_me_4_001: .byte N04 , En3 , v112 .byte W16 .byte An3 @@ -566,9 +566,9 @@ bgm_tsuretek_4_001: .byte W96 .byte W96 .byte PATT - .word bgm_tsuretek_4_000 + .word mus_follow_me_4_000 .byte PATT - .word bgm_tsuretek_4_001 + .word mus_follow_me_4_001 .byte N04 , An2 , v112 .byte W08 .byte En3 @@ -604,19 +604,19 @@ bgm_tsuretek_4_001: .byte W96 .byte W96 .byte GOTO - .word bgm_tsuretek_4_B1 + .word mus_follow_me_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_tsuretek_5: - .byte KEYSH , bgm_tsuretek_key+0 +mus_follow_me_5: + .byte KEYSH , mus_follow_me_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 37*bgm_tsuretek_mvl/mxv + .byte VOL , 37*mus_follow_me_mvl/mxv .byte PAN , c_v-62 .byte N16 , En3 , v112 .byte W16 @@ -648,8 +648,8 @@ bgm_tsuretek_5: .byte W08 .byte En3 .byte W48 -bgm_tsuretek_5_B1: -bgm_tsuretek_5_000: +mus_follow_me_5_B1: +mus_follow_me_5_000: .byte W16 .byte N04 , An2 , v112 .byte W04 @@ -668,7 +668,7 @@ bgm_tsuretek_5_000: .byte N04 , Gs2 .byte W08 .byte PEND -bgm_tsuretek_5_001: +mus_follow_me_5_001: .byte W16 .byte N04 , An2 , v112 .byte W04 @@ -687,7 +687,7 @@ bgm_tsuretek_5_001: .byte N04 , Bn2 .byte W08 .byte PEND -bgm_tsuretek_5_002: +mus_follow_me_5_002: .byte W16 .byte N04 , An2 , v112 .byte W04 @@ -706,7 +706,7 @@ bgm_tsuretek_5_002: .byte N04 , Bn2 .byte W08 .byte PEND -bgm_tsuretek_5_003: +mus_follow_me_5_003: .byte W16 .byte N04 , Bn2 , v112 .byte W04 @@ -728,30 +728,30 @@ bgm_tsuretek_5_003: .byte W96 .byte W96 .byte PATT - .word bgm_tsuretek_5_000 + .word mus_follow_me_5_000 .byte PATT - .word bgm_tsuretek_5_001 + .word mus_follow_me_5_001 .byte PATT - .word bgm_tsuretek_5_002 + .word mus_follow_me_5_002 .byte PATT - .word bgm_tsuretek_5_003 + .word mus_follow_me_5_003 .byte W96 .byte W96 .byte GOTO - .word bgm_tsuretek_5_B1 + .word mus_follow_me_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_tsuretek_6: - .byte KEYSH , bgm_tsuretek_key+0 +mus_follow_me_6: + .byte KEYSH , mus_follow_me_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 37*bgm_tsuretek_mvl/mxv + .byte VOL , 37*mus_follow_me_mvl/mxv .byte N16 , Bn3 , v112 .byte W16 .byte N04 , An3 @@ -782,8 +782,8 @@ bgm_tsuretek_6: .byte W08 .byte Gs3 .byte W48 -bgm_tsuretek_6_B1: -bgm_tsuretek_6_000: +mus_follow_me_6_B1: +mus_follow_me_6_000: .byte W16 .byte N04 , Cs3 , v112 .byte W04 @@ -802,7 +802,7 @@ bgm_tsuretek_6_000: .byte N04 , Bn2 .byte W08 .byte PEND -bgm_tsuretek_6_001: +mus_follow_me_6_001: .byte W16 .byte N04 , Cs3 , v112 .byte W04 @@ -821,7 +821,7 @@ bgm_tsuretek_6_001: .byte N04 , En3 .byte W08 .byte PEND -bgm_tsuretek_6_002: +mus_follow_me_6_002: .byte W16 .byte N04 , Cs3 , v112 .byte W04 @@ -840,7 +840,7 @@ bgm_tsuretek_6_002: .byte N04 , Dn3 .byte W08 .byte PEND -bgm_tsuretek_6_003: +mus_follow_me_6_003: .byte W16 .byte N04 , Dn3 , v112 .byte W04 @@ -862,26 +862,26 @@ bgm_tsuretek_6_003: .byte W96 .byte W96 .byte PATT - .word bgm_tsuretek_6_000 + .word mus_follow_me_6_000 .byte PATT - .word bgm_tsuretek_6_001 + .word mus_follow_me_6_001 .byte PATT - .word bgm_tsuretek_6_002 + .word mus_follow_me_6_002 .byte PATT - .word bgm_tsuretek_6_003 + .word mus_follow_me_6_003 .byte W96 .byte W96 .byte GOTO - .word bgm_tsuretek_6_B1 + .word mus_follow_me_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_tsuretek_7: - .byte KEYSH , bgm_tsuretek_key+0 +mus_follow_me_7: + .byte KEYSH , mus_follow_me_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 55*bgm_tsuretek_mvl/mxv + .byte VOL , 55*mus_follow_me_mvl/mxv .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -924,8 +924,8 @@ bgm_tsuretek_7: .byte W04 .byte N04 .byte W04 -bgm_tsuretek_7_B1: -bgm_tsuretek_7_000: +mus_follow_me_7_B1: +mus_follow_me_7_000: .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -948,12 +948,12 @@ bgm_tsuretek_7_000: .byte W04 .byte PEND .byte PATT - .word bgm_tsuretek_7_000 + .word mus_follow_me_7_000 .byte PATT - .word bgm_tsuretek_7_000 + .word mus_follow_me_7_000 .byte PATT - .word bgm_tsuretek_7_000 -bgm_tsuretek_7_001: + .word mus_follow_me_7_000 +mus_follow_me_7_001: .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -987,7 +987,7 @@ bgm_tsuretek_7_001: .byte En1 , v040 .byte W04 .byte PEND -bgm_tsuretek_7_002: +mus_follow_me_7_002: .byte N04 , En1 , v112 .byte W12 .byte N04 @@ -1014,32 +1014,32 @@ bgm_tsuretek_7_002: .byte W04 .byte PEND .byte PATT - .word bgm_tsuretek_7_000 + .word mus_follow_me_7_000 .byte PATT - .word bgm_tsuretek_7_000 + .word mus_follow_me_7_000 .byte PATT - .word bgm_tsuretek_7_000 + .word mus_follow_me_7_000 .byte PATT - .word bgm_tsuretek_7_000 + .word mus_follow_me_7_000 .byte PATT - .word bgm_tsuretek_7_001 + .word mus_follow_me_7_001 .byte PATT - .word bgm_tsuretek_7_002 + .word mus_follow_me_7_002 .byte GOTO - .word bgm_tsuretek_7_B1 + .word mus_follow_me_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_tsuretek_8: - .byte KEYSH , bgm_tsuretek_key+0 +mus_follow_me_8: + .byte KEYSH , mus_follow_me_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 32*bgm_tsuretek_mvl/mxv + .byte VOL , 32*mus_follow_me_mvl/mxv .byte N16 , En5 , v112 .byte W16 .byte N04 , Dn5 @@ -1070,7 +1070,7 @@ bgm_tsuretek_8: .byte W08 .byte En5 .byte W48 -bgm_tsuretek_8_B1: +mus_follow_me_8_B1: .byte N04 , An3 , v112 .byte W16 .byte Cs4 @@ -1123,7 +1123,7 @@ bgm_tsuretek_8_B1: .byte W08 .byte An4 .byte W04 - .byte VOL , 32*bgm_tsuretek_mvl/mxv + .byte VOL , 32*mus_follow_me_mvl/mxv .byte PAN , c_v+0 .byte W12 .byte N04 @@ -1191,27 +1191,27 @@ bgm_tsuretek_8_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_tsuretek_8_B1 + .word mus_follow_me_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_tsuretek: +mus_follow_me: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_tsuretek_pri @ Priority - .byte bgm_tsuretek_rev @ Reverb. + .byte mus_follow_me_pri @ Priority + .byte mus_follow_me_rev @ Reverb. - .word bgm_tsuretek_grp + .word mus_follow_me_grp - .word bgm_tsuretek_1 - .word bgm_tsuretek_2 - .word bgm_tsuretek_3 - .word bgm_tsuretek_4 - .word bgm_tsuretek_5 - .word bgm_tsuretek_6 - .word bgm_tsuretek_7 - .word bgm_tsuretek_8 + .word mus_follow_me_1 + .word mus_follow_me_2 + .word mus_follow_me_3 + .word mus_follow_me_4 + .word mus_follow_me_5 + .word mus_follow_me_6 + .word mus_follow_me_7 + .word mus_follow_me_8 .end diff --git a/sound/songs/bgm_machi_s3.s b/sound/songs/mus_fortree.s index 624b2132f..e2e22db41 100644 --- a/sound/songs/bgm_machi_s3.s +++ b/sound/songs/mus_fortree.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_machi_s3_grp, voicegroup029 - .equ bgm_machi_s3_pri, 0 - .equ bgm_machi_s3_rev, reverb_set+50 - .equ bgm_machi_s3_mvl, 127 - .equ bgm_machi_s3_key, 0 - .equ bgm_machi_s3_tbs, 1 - .equ bgm_machi_s3_exg, 0 - .equ bgm_machi_s3_cmp, 1 + .equ mus_fortree_grp, voicegroup029 + .equ mus_fortree_pri, 0 + .equ mus_fortree_rev, reverb_set+50 + .equ mus_fortree_mvl, 127 + .equ mus_fortree_key, 0 + .equ mus_fortree_tbs, 1 + .equ mus_fortree_exg, 0 + .equ mus_fortree_cmp, 1 .section .rodata - .global bgm_machi_s3 + .global mus_fortree .align 2 @********************** Track 1 **********************@ -bgm_machi_s3_1: - .byte KEYSH , bgm_machi_s3_key+0 - .byte TEMPO , 128*bgm_machi_s3_tbs/2 +mus_fortree_1: + .byte KEYSH , mus_fortree_key+0 + .byte TEMPO , 128*mus_fortree_tbs/2 .byte VOICE , 73 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte LFOS , 36 .byte PAN , c_v-5 .byte N08 , Fn4 , v112 @@ -40,28 +40,28 @@ bgm_machi_s3_1: .byte W08 .byte N72 , Cn4 .byte W24 - .byte VOL , 75*bgm_machi_s3_mvl/mxv + .byte VOL , 75*mus_fortree_mvl/mxv .byte MOD , 7 .byte W08 - .byte VOL , 70*bgm_machi_s3_mvl/mxv + .byte VOL , 70*mus_fortree_mvl/mxv .byte W08 - .byte 63*bgm_machi_s3_mvl/mxv + .byte 63*mus_fortree_mvl/mxv .byte W08 - .byte 55*bgm_machi_s3_mvl/mxv + .byte 55*mus_fortree_mvl/mxv .byte W08 - .byte 45*bgm_machi_s3_mvl/mxv + .byte 45*mus_fortree_mvl/mxv .byte W04 - .byte 36*bgm_machi_s3_mvl/mxv + .byte 36*mus_fortree_mvl/mxv .byte W04 - .byte 26*bgm_machi_s3_mvl/mxv + .byte 26*mus_fortree_mvl/mxv .byte W04 - .byte 13*bgm_machi_s3_mvl/mxv + .byte 13*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W24 -bgm_machi_s3_1_B1: -bgm_machi_s3_1_000: - .byte VOL , 80*bgm_machi_s3_mvl/mxv +mus_fortree_1_B1: +mus_fortree_1_000: + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , Fn3 , v112 .byte W16 .byte An3 @@ -70,11 +70,11 @@ bgm_machi_s3_1_000: .byte W16 .byte N16 , Cn4 .byte W08 - .byte VOL , 68*bgm_machi_s3_mvl/mxv + .byte VOL , 68*mus_fortree_mvl/mxv .byte W04 - .byte 49*bgm_machi_s3_mvl/mxv + .byte 49*mus_fortree_mvl/mxv .byte W12 - .byte 80*bgm_machi_s3_mvl/mxv + .byte 80*mus_fortree_mvl/mxv .byte N08 , Dn4 .byte W08 .byte En4 @@ -82,7 +82,7 @@ bgm_machi_s3_1_000: .byte Fn4 .byte W08 .byte PEND -bgm_machi_s3_1_001: +mus_fortree_1_001: .byte N32 , Gn4 , v112 .byte W16 .byte MOD , 7 @@ -91,23 +91,23 @@ bgm_machi_s3_1_001: .byte W08 .byte N44 , Fn4 .byte W20 - .byte VOL , 72*bgm_machi_s3_mvl/mxv + .byte VOL , 72*mus_fortree_mvl/mxv .byte MOD , 7 .byte W04 - .byte VOL , 62*bgm_machi_s3_mvl/mxv + .byte VOL , 62*mus_fortree_mvl/mxv .byte W04 - .byte 52*bgm_machi_s3_mvl/mxv + .byte 52*mus_fortree_mvl/mxv .byte W04 - .byte 39*bgm_machi_s3_mvl/mxv + .byte 39*mus_fortree_mvl/mxv .byte W04 - .byte 24*bgm_machi_s3_mvl/mxv + .byte 24*mus_fortree_mvl/mxv .byte W04 - .byte 8*bgm_machi_s3_mvl/mxv + .byte 8*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W12 .byte PEND - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N32 , Gn4 .byte W16 .byte MOD , 7 @@ -128,27 +128,27 @@ bgm_machi_s3_1_001: .byte W08 .byte N84 , Cn4 .byte W24 - .byte VOL , 75*bgm_machi_s3_mvl/mxv + .byte VOL , 75*mus_fortree_mvl/mxv .byte W12 .byte MOD , 7 .byte W04 - .byte VOL , 70*bgm_machi_s3_mvl/mxv + .byte VOL , 70*mus_fortree_mvl/mxv .byte W12 - .byte 63*bgm_machi_s3_mvl/mxv + .byte 63*mus_fortree_mvl/mxv .byte W08 - .byte 55*bgm_machi_s3_mvl/mxv + .byte 55*mus_fortree_mvl/mxv .byte W08 - .byte 45*bgm_machi_s3_mvl/mxv + .byte 45*mus_fortree_mvl/mxv .byte W04 - .byte 36*bgm_machi_s3_mvl/mxv + .byte 36*mus_fortree_mvl/mxv .byte W04 - .byte 26*bgm_machi_s3_mvl/mxv + .byte 26*mus_fortree_mvl/mxv .byte W04 - .byte 13*bgm_machi_s3_mvl/mxv + .byte 13*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , As3 .byte W16 .byte An3 @@ -157,11 +157,11 @@ bgm_machi_s3_1_001: .byte W16 .byte N16 , Gn3 .byte W08 - .byte VOL , 68*bgm_machi_s3_mvl/mxv + .byte VOL , 68*mus_fortree_mvl/mxv .byte W04 - .byte 49*bgm_machi_s3_mvl/mxv + .byte 49*mus_fortree_mvl/mxv .byte W12 - .byte 80*bgm_machi_s3_mvl/mxv + .byte 80*mus_fortree_mvl/mxv .byte N08 .byte W08 .byte An3 @@ -178,21 +178,21 @@ bgm_machi_s3_1_001: .byte W16 .byte MOD , 7 .byte W04 - .byte VOL , 72*bgm_machi_s3_mvl/mxv + .byte VOL , 72*mus_fortree_mvl/mxv .byte W04 - .byte 62*bgm_machi_s3_mvl/mxv + .byte 62*mus_fortree_mvl/mxv .byte W04 - .byte 52*bgm_machi_s3_mvl/mxv + .byte 52*mus_fortree_mvl/mxv .byte W04 - .byte 39*bgm_machi_s3_mvl/mxv + .byte 39*mus_fortree_mvl/mxv .byte W04 - .byte 24*bgm_machi_s3_mvl/mxv + .byte 24*mus_fortree_mvl/mxv .byte W04 - .byte 8*bgm_machi_s3_mvl/mxv + .byte 8*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , Dn4 .byte W16 .byte Cn4 @@ -201,14 +201,14 @@ bgm_machi_s3_1_001: .byte W16 .byte N16 , As3 .byte W08 - .byte VOL , 68*bgm_machi_s3_mvl/mxv + .byte VOL , 68*mus_fortree_mvl/mxv .byte MOD , 7 .byte W04 - .byte VOL , 49*bgm_machi_s3_mvl/mxv + .byte VOL , 49*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W08 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , Fn4 .byte W08 .byte Gn4 @@ -217,31 +217,31 @@ bgm_machi_s3_1_001: .byte W08 .byte N84 , En4 .byte W24 - .byte VOL , 75*bgm_machi_s3_mvl/mxv + .byte VOL , 75*mus_fortree_mvl/mxv .byte W12 .byte MOD , 7 .byte W04 - .byte VOL , 70*bgm_machi_s3_mvl/mxv + .byte VOL , 70*mus_fortree_mvl/mxv .byte W12 - .byte 63*bgm_machi_s3_mvl/mxv + .byte 63*mus_fortree_mvl/mxv .byte W08 - .byte 55*bgm_machi_s3_mvl/mxv + .byte 55*mus_fortree_mvl/mxv .byte W08 - .byte 45*bgm_machi_s3_mvl/mxv + .byte 45*mus_fortree_mvl/mxv .byte W04 - .byte 36*bgm_machi_s3_mvl/mxv + .byte 36*mus_fortree_mvl/mxv .byte W04 - .byte 26*bgm_machi_s3_mvl/mxv + .byte 26*mus_fortree_mvl/mxv .byte W04 - .byte 13*bgm_machi_s3_mvl/mxv + .byte 13*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W12 .byte PATT - .word bgm_machi_s3_1_000 + .word mus_fortree_1_000 .byte PATT - .word bgm_machi_s3_1_001 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .word mus_fortree_1_001 + .byte VOL , 80*mus_fortree_mvl/mxv .byte N36 , Gn4 , v112 .byte W16 .byte MOD , 7 @@ -250,14 +250,14 @@ bgm_machi_s3_1_001: .byte W08 .byte N16 , Fn4 .byte W08 - .byte VOL , 68*bgm_machi_s3_mvl/mxv + .byte VOL , 68*mus_fortree_mvl/mxv .byte MOD , 7 .byte W04 - .byte VOL , 49*bgm_machi_s3_mvl/mxv + .byte VOL , 49*mus_fortree_mvl/mxv .byte W08 .byte MOD , 0 .byte W04 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , En4 .byte W08 .byte N16 , Fn4 @@ -268,21 +268,21 @@ bgm_machi_s3_1_001: .byte W36 .byte MOD , 7 .byte W24 - .byte VOL , 72*bgm_machi_s3_mvl/mxv + .byte VOL , 72*mus_fortree_mvl/mxv .byte W04 - .byte 62*bgm_machi_s3_mvl/mxv + .byte 62*mus_fortree_mvl/mxv .byte W04 - .byte 52*bgm_machi_s3_mvl/mxv + .byte 52*mus_fortree_mvl/mxv .byte W04 - .byte 39*bgm_machi_s3_mvl/mxv + .byte 39*mus_fortree_mvl/mxv .byte W04 - .byte 24*bgm_machi_s3_mvl/mxv + .byte 24*mus_fortree_mvl/mxv .byte W04 - .byte 8*bgm_machi_s3_mvl/mxv + .byte 8*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , As4 .byte W16 .byte An4 @@ -291,14 +291,14 @@ bgm_machi_s3_1_001: .byte W16 .byte N16 , Dn4 .byte W08 - .byte VOL , 68*bgm_machi_s3_mvl/mxv + .byte VOL , 68*mus_fortree_mvl/mxv .byte MOD , 7 .byte W04 - .byte VOL , 49*bgm_machi_s3_mvl/mxv + .byte VOL , 49*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W08 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , Gn4 .byte W08 .byte N16 , An4 @@ -314,14 +314,14 @@ bgm_machi_s3_1_001: .byte W24 .byte N16 , Fn4 .byte W08 - .byte VOL , 68*bgm_machi_s3_mvl/mxv + .byte VOL , 68*mus_fortree_mvl/mxv .byte MOD , 7 .byte W04 - .byte VOL , 49*bgm_machi_s3_mvl/mxv + .byte VOL , 49*mus_fortree_mvl/mxv .byte W04 .byte MOD , 0 .byte W08 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , An3 .byte W16 .byte As3 @@ -343,14 +343,14 @@ bgm_machi_s3_1_001: .byte 0 .byte W12 .byte GOTO - .word bgm_machi_s3_1_B1 + .word mus_fortree_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_machi_s3_2: - .byte VOL , 80*bgm_machi_s3_mvl/mxv - .byte KEYSH , bgm_machi_s3_key+0 +mus_fortree_2: + .byte VOL , 80*mus_fortree_mvl/mxv + .byte KEYSH , mus_fortree_key+0 .byte VOICE , 35 .byte PAN , c_v+7 .byte N04 , Fn1 , v100 @@ -377,7 +377,7 @@ bgm_machi_s3_2: .byte W16 .byte N08 , En1 .byte W08 -bgm_machi_s3_2_B1: +mus_fortree_2_B1: .byte N36 , Fn1 , v100 .byte W40 .byte N08 @@ -568,14 +568,14 @@ bgm_machi_s3_2_B1: .byte N08 , En1 .byte W08 .byte GOTO - .word bgm_machi_s3_2_B1 + .word mus_fortree_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_machi_s3_3: - .byte KEYSH , bgm_machi_s3_key+0 - .byte VOL , 80*bgm_machi_s3_mvl/mxv +mus_fortree_3: + .byte KEYSH , mus_fortree_key+0 + .byte VOL , 80*mus_fortree_mvl/mxv .byte W96 .byte PAN , c_v-8 .byte W64 @@ -586,8 +586,8 @@ bgm_machi_s3_3: .byte W16 .byte N08 , En2 .byte W08 -bgm_machi_s3_3_B1: -bgm_machi_s3_3_000: +mus_fortree_3_B1: +mus_fortree_3_000: .byte N16 , Fn2 , v088 .byte W16 .byte N04 @@ -599,7 +599,7 @@ bgm_machi_s3_3_000: .byte N04 .byte W08 .byte PEND -bgm_machi_s3_3_001: +mus_fortree_3_001: .byte N04 , As2 , v088 .byte W08 .byte N04 @@ -613,7 +613,7 @@ bgm_machi_s3_3_001: .byte N04 .byte W08 .byte PEND -bgm_machi_s3_3_002: +mus_fortree_3_002: .byte N16 , As2 , v088 .byte W16 .byte N04 @@ -627,7 +627,7 @@ bgm_machi_s3_3_002: .byte N08 , As2 .byte W08 .byte PEND -bgm_machi_s3_3_003: +mus_fortree_3_003: .byte N16 , An2 , v088 .byte W16 .byte N04 , Fn2 @@ -702,13 +702,13 @@ bgm_machi_s3_3_003: .byte Cn3 .byte W08 .byte PATT - .word bgm_machi_s3_3_000 + .word mus_fortree_3_000 .byte PATT - .word bgm_machi_s3_3_001 + .word mus_fortree_3_001 .byte PATT - .word bgm_machi_s3_3_002 + .word mus_fortree_3_002 .byte PATT - .word bgm_machi_s3_3_003 + .word mus_fortree_3_003 .byte N08 , As2 , v088 .byte W16 .byte An2 @@ -756,14 +756,14 @@ bgm_machi_s3_3_003: .byte N08 , En2 .byte W08 .byte GOTO - .word bgm_machi_s3_3_B1 + .word mus_fortree_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_machi_s3_4: - .byte KEYSH , bgm_machi_s3_key+0 - .byte VOL , 80*bgm_machi_s3_mvl/mxv +mus_fortree_4: + .byte KEYSH , mus_fortree_key+0 + .byte VOL , 80*mus_fortree_mvl/mxv .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte PAN , c_v+48 @@ -776,8 +776,8 @@ bgm_machi_s3_4: .byte W16 .byte N04 , As2 .byte W08 -bgm_machi_s3_4_B1: -bgm_machi_s3_4_000: +mus_fortree_4_B1: +mus_fortree_4_000: .byte N24 , Cn3 , v052 .byte W24 .byte N04 , Fn3 @@ -791,7 +791,7 @@ bgm_machi_s3_4_000: .byte N04 , Cn3 .byte W08 .byte PEND -bgm_machi_s3_4_001: +mus_fortree_4_001: .byte N04 , Fn3 , v052 .byte W08 .byte N04 @@ -807,7 +807,7 @@ bgm_machi_s3_4_001: .byte N04 , Fn3 .byte W08 .byte PEND -bgm_machi_s3_4_002: +mus_fortree_4_002: .byte N24 , Cs4 , v052 .byte W24 .byte N04 , Fn3 @@ -817,7 +817,7 @@ bgm_machi_s3_4_002: .byte N32 , As3 .byte W32 .byte PEND -bgm_machi_s3_4_003: +mus_fortree_4_003: .byte N04 , Fn3 , v052 .byte W08 .byte N04 @@ -900,13 +900,13 @@ bgm_machi_s3_4_003: .byte Gn2 .byte W08 .byte PATT - .word bgm_machi_s3_4_000 + .word mus_fortree_4_000 .byte PATT - .word bgm_machi_s3_4_001 + .word mus_fortree_4_001 .byte PATT - .word bgm_machi_s3_4_002 + .word mus_fortree_4_002 .byte PATT - .word bgm_machi_s3_4_003 + .word mus_fortree_4_003 .byte N08 , Gn4 , v052 .byte W16 .byte Fn4 @@ -960,14 +960,14 @@ bgm_machi_s3_4_003: .byte N04 , As2 .byte W08 .byte GOTO - .word bgm_machi_s3_4_B1 + .word mus_fortree_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_machi_s3_5: - .byte KEYSH , bgm_machi_s3_key+0 - .byte VOL , 80*bgm_machi_s3_mvl/mxv +mus_fortree_5: + .byte KEYSH , mus_fortree_key+0 + .byte VOL , 80*mus_fortree_mvl/mxv .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte PAN , c_v-1 @@ -980,8 +980,8 @@ bgm_machi_s3_5: .byte W16 .byte N04 , Gn2 .byte W08 -bgm_machi_s3_5_B1: -bgm_machi_s3_5_000: +mus_fortree_5_B1: +mus_fortree_5_000: .byte N24 , An2 , v052 .byte W24 .byte N04 , Cn3 @@ -995,7 +995,7 @@ bgm_machi_s3_5_000: .byte N04 , An2 .byte W08 .byte PEND -bgm_machi_s3_5_001: +mus_fortree_5_001: .byte N04 , Dn3 , v052 .byte W08 .byte N04 @@ -1011,7 +1011,7 @@ bgm_machi_s3_5_001: .byte N04 , Dn3 .byte W08 .byte PEND -bgm_machi_s3_5_002: +mus_fortree_5_002: .byte N24 , As3 , v052 .byte W24 .byte N04 , Cs3 @@ -1021,7 +1021,7 @@ bgm_machi_s3_5_002: .byte N32 , Fn3 .byte W32 .byte PEND -bgm_machi_s3_5_003: +mus_fortree_5_003: .byte N04 , Cn3 , v052 .byte W08 .byte N04 @@ -1102,13 +1102,13 @@ bgm_machi_s3_5_003: .byte En2 .byte W08 .byte PATT - .word bgm_machi_s3_5_000 + .word mus_fortree_5_000 .byte PATT - .word bgm_machi_s3_5_001 + .word mus_fortree_5_001 .byte PATT - .word bgm_machi_s3_5_002 + .word mus_fortree_5_002 .byte PATT - .word bgm_machi_s3_5_003 + .word mus_fortree_5_003 .byte N08 , Dn4 , v052 .byte W16 .byte Cn4 @@ -1162,18 +1162,18 @@ bgm_machi_s3_5_003: .byte N04 , Gn2 .byte W08 .byte GOTO - .word bgm_machi_s3_5_B1 + .word mus_fortree_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_machi_s3_6: - .byte KEYSH , bgm_machi_s3_key+0 +mus_fortree_6: + .byte KEYSH , mus_fortree_key+0 .byte LFOS , 36 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte W96 .byte W96 -bgm_machi_s3_6_B1: +mus_fortree_6_B1: .byte VOICE , 74 .byte W96 .byte W96 @@ -1199,14 +1199,14 @@ bgm_machi_s3_6_B1: .byte W36 .byte MOD , 7 .byte W12 - .byte VOL , 60*bgm_machi_s3_mvl/mxv + .byte VOL , 60*mus_fortree_mvl/mxv .byte W24 - .byte 40*bgm_machi_s3_mvl/mxv + .byte 40*mus_fortree_mvl/mxv .byte W12 .byte MOD , 0 .byte W12 .byte VOICE , 81 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , As2 .byte W16 .byte An2 @@ -1229,10 +1229,10 @@ bgm_machi_s3_6_B1: .byte W16 .byte N32 , Cn3 .byte W24 - .byte VOL , 60*bgm_machi_s3_mvl/mxv + .byte VOL , 60*mus_fortree_mvl/mxv .byte W32 .byte VOICE , 74 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , As4 .byte W16 .byte An4 @@ -1251,19 +1251,19 @@ bgm_machi_s3_6_B1: .byte W16 .byte Dn5 .byte W08 -bgm_machi_s3_6_000: +mus_fortree_6_000: .byte N84 , Cn5 , v048 .byte W36 .byte MOD , 7 .byte W12 - .byte VOL , 60*bgm_machi_s3_mvl/mxv + .byte VOL , 60*mus_fortree_mvl/mxv .byte W24 - .byte 40*bgm_machi_s3_mvl/mxv + .byte 40*mus_fortree_mvl/mxv .byte W12 .byte MOD , 0 .byte W12 .byte PEND - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte W96 .byte W96 .byte N36 , As4 @@ -1285,9 +1285,9 @@ bgm_machi_s3_6_000: .byte N08 , As4 .byte W08 .byte PATT - .word bgm_machi_s3_6_000 + .word mus_fortree_6_000 .byte VOICE , 81 - .byte VOL , 80*bgm_machi_s3_mvl/mxv + .byte VOL , 80*mus_fortree_mvl/mxv .byte N08 , As3 , v052 .byte W16 .byte An3 @@ -1330,15 +1330,15 @@ bgm_machi_s3_6_000: .byte 0 .byte W12 .byte GOTO - .word bgm_machi_s3_6_B1 + .word mus_fortree_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_machi_s3_7: - .byte KEYSH , bgm_machi_s3_key+0 +mus_fortree_7: + .byte KEYSH , mus_fortree_key+0 .byte VOICE , 127 - .byte VOL , 75*bgm_machi_s3_mvl/mxv + .byte VOL , 75*mus_fortree_mvl/mxv .byte PAN , c_v-32 .byte N08 , Gs4 , v052 .byte W24 @@ -1366,7 +1366,7 @@ bgm_machi_s3_7: .byte VOICE , 127 .byte N08 .byte W08 -bgm_machi_s3_7_B1: +mus_fortree_7_B1: .byte VOICE , 125 .byte N08 , Gs4 , v040 .byte W08 @@ -1392,7 +1392,7 @@ bgm_machi_s3_7_B1: .byte W08 .byte Gs4 , v040 .byte W08 -bgm_machi_s3_7_000: +mus_fortree_7_000: .byte N08 , Gs4 , v040 .byte W08 .byte Gs4 , v020 @@ -1419,17 +1419,17 @@ bgm_machi_s3_7_000: .byte W08 .byte PEND .byte PATT - .word bgm_machi_s3_7_000 + .word mus_fortree_7_000 .byte PATT - .word bgm_machi_s3_7_000 + .word mus_fortree_7_000 .byte PATT - .word bgm_machi_s3_7_000 + .word mus_fortree_7_000 .byte PATT - .word bgm_machi_s3_7_000 + .word mus_fortree_7_000 .byte PATT - .word bgm_machi_s3_7_000 + .word mus_fortree_7_000 .byte PATT - .word bgm_machi_s3_7_000 + .word mus_fortree_7_000 .byte VOICE , 127 .byte N08 , Gs4 , v052 .byte W24 @@ -1443,7 +1443,7 @@ bgm_machi_s3_7_000: .byte W16 .byte Gs4 , v040 .byte W08 -bgm_machi_s3_7_001: +mus_fortree_7_001: .byte N08 , Gs4 , v052 .byte W08 .byte Gs4 , v040 @@ -1465,7 +1465,7 @@ bgm_machi_s3_7_001: .byte N08 .byte W08 .byte PEND -bgm_machi_s3_7_002: +mus_fortree_7_002: .byte N08 , Gs4 , v052 .byte W24 .byte N08 @@ -1480,7 +1480,7 @@ bgm_machi_s3_7_002: .byte W08 .byte PEND .byte PATT - .word bgm_machi_s3_7_001 + .word mus_fortree_7_001 .byte N08 , Gs4 , v052 .byte W08 .byte Gs4 , v040 @@ -1522,7 +1522,7 @@ bgm_machi_s3_7_002: .byte Gs4 , v040 .byte W08 .byte PATT - .word bgm_machi_s3_7_002 + .word mus_fortree_7_002 .byte N08 , Gs4 , v052 .byte W08 .byte Gs4 , v040 @@ -1542,14 +1542,14 @@ bgm_machi_s3_7_002: .byte Gs4 , v040 .byte W08 .byte GOTO - .word bgm_machi_s3_7_B1 + .word mus_fortree_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_machi_s3_8: - .byte VOL , 80*bgm_machi_s3_mvl/mxv - .byte KEYSH , bgm_machi_s3_key+0 +mus_fortree_8: + .byte VOL , 80*mus_fortree_mvl/mxv + .byte KEYSH , mus_fortree_key+0 .byte VOICE , 0 .byte N08 , Cn1 , v116 .byte W08 @@ -1592,8 +1592,8 @@ bgm_machi_s3_8: .byte N08 , En1 , v116 .byte N04 , Dn3 , v064 .byte W08 -bgm_machi_s3_8_B1: -bgm_machi_s3_8_000: +mus_fortree_8_B1: +mus_fortree_8_000: .byte N08 , Cn1 , v116 .byte W08 .byte N04 , Dn3 , v064 @@ -1614,7 +1614,7 @@ bgm_machi_s3_8_000: .byte Dn3 .byte W08 .byte PEND -bgm_machi_s3_8_001: +mus_fortree_8_001: .byte N08 , Cn1 , v116 .byte W08 .byte N04 , Dn3 , v064 @@ -1638,10 +1638,10 @@ bgm_machi_s3_8_001: .byte W08 .byte PEND .byte PATT - .word bgm_machi_s3_8_000 + .word mus_fortree_8_000 .byte PATT - .word bgm_machi_s3_8_001 -bgm_machi_s3_8_002: + .word mus_fortree_8_001 +mus_fortree_8_002: .byte N08 , Cn1 , v116 .byte W16 .byte N04 , Dn3 , v064 @@ -1662,12 +1662,12 @@ bgm_machi_s3_8_002: .byte W08 .byte PEND .byte PATT - .word bgm_machi_s3_8_002 + .word mus_fortree_8_002 .byte PATT - .word bgm_machi_s3_8_002 + .word mus_fortree_8_002 .byte PATT - .word bgm_machi_s3_8_002 -bgm_machi_s3_8_003: + .word mus_fortree_8_002 +mus_fortree_8_003: .byte N08 , Cn1 , v116 .byte W16 .byte N04 , Dn3 , v064 @@ -1689,7 +1689,7 @@ bgm_machi_s3_8_003: .byte N04 .byte W04 .byte PEND -bgm_machi_s3_8_004: +mus_fortree_8_004: .byte N08 , Cn1 , v116 .byte W16 .byte N04 , Dn3 , v064 @@ -1710,9 +1710,9 @@ bgm_machi_s3_8_004: .byte W08 .byte PEND .byte PATT - .word bgm_machi_s3_8_003 + .word mus_fortree_8_003 .byte PATT - .word bgm_machi_s3_8_004 + .word mus_fortree_8_004 .byte N08 , En1 , v116 .byte W16 .byte N08 @@ -1738,31 +1738,31 @@ bgm_machi_s3_8_004: .byte En1 .byte W24 .byte PATT - .word bgm_machi_s3_8_003 + .word mus_fortree_8_003 .byte PATT - .word bgm_machi_s3_8_004 + .word mus_fortree_8_004 .byte GOTO - .word bgm_machi_s3_8_B1 + .word mus_fortree_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_machi_s3: +mus_fortree: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_machi_s3_pri @ Priority - .byte bgm_machi_s3_rev @ Reverb. + .byte mus_fortree_pri @ Priority + .byte mus_fortree_rev @ Reverb. - .word bgm_machi_s3_grp + .word mus_fortree_grp - .word bgm_machi_s3_1 - .word bgm_machi_s3_2 - .word bgm_machi_s3_3 - .word bgm_machi_s3_4 - .word bgm_machi_s3_5 - .word bgm_machi_s3_6 - .word bgm_machi_s3_7 - .word bgm_machi_s3_8 + .word mus_fortree_1 + .word mus_fortree_2 + .word mus_fortree_3 + .word mus_fortree_4 + .word mus_fortree_5 + .word mus_fortree_6 + .word mus_fortree_7 + .word mus_fortree_8 .end diff --git a/sound/songs/bgm_casino.s b/sound/songs/mus_game_corner.s index 89887267a..286d09642 100644 --- a/sound/songs/bgm_casino.s +++ b/sound/songs/mus_game_corner.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_casino_grp, voicegroup069 - .equ bgm_casino_pri, 0 - .equ bgm_casino_rev, reverb_set+50 - .equ bgm_casino_mvl, 127 - .equ bgm_casino_key, 0 - .equ bgm_casino_tbs, 1 - .equ bgm_casino_exg, 0 - .equ bgm_casino_cmp, 1 + .equ mus_game_corner_grp, voicegroup069 + .equ mus_game_corner_pri, 0 + .equ mus_game_corner_rev, reverb_set+50 + .equ mus_game_corner_mvl, 127 + .equ mus_game_corner_key, 0 + .equ mus_game_corner_tbs, 1 + .equ mus_game_corner_exg, 0 + .equ mus_game_corner_cmp, 1 .section .rodata - .global bgm_casino + .global mus_game_corner .align 2 @********************** Track 1 **********************@ -bgm_casino_1: - .byte KEYSH , bgm_casino_key+0 - .byte TEMPO , 182*bgm_casino_tbs/2 +mus_game_corner_1: + .byte KEYSH , mus_game_corner_key+0 + .byte TEMPO , 182*mus_game_corner_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 31*bgm_casino_mvl/mxv + .byte VOL , 31*mus_game_corner_mvl/mxv .byte W06 -bgm_casino_1_B1: -bgm_casino_1_000: +mus_game_corner_1_B1: +mus_game_corner_1_000: .byte VOICE , 127 .byte N04 , En5 , v112 .byte W16 @@ -43,7 +43,7 @@ bgm_casino_1_000: .byte N24 , Gs5 , v096 .byte W24 .byte PEND -bgm_casino_1_001: +mus_game_corner_1_001: .byte VOICE , 127 .byte N04 , En5 , v112 .byte W16 @@ -62,59 +62,59 @@ bgm_casino_1_001: .byte W24 .byte PEND .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte N04 , En5 , v112 .byte W96 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte VOICE , 127 .byte N04 , En5 , v112 .byte W16 @@ -132,7 +132,7 @@ bgm_casino_1_001: .byte W16 .byte En5 , v064 .byte W08 -bgm_casino_1_002: +mus_game_corner_1_002: .byte N04 , En5 , v112 .byte W08 .byte En5 , v092 @@ -153,8 +153,8 @@ bgm_casino_1_002: .byte W08 .byte PEND .byte PATT - .word bgm_casino_1_002 -bgm_casino_1_003: + .word mus_game_corner_1_002 +mus_game_corner_1_003: .byte N04 , En5 , v112 .byte W16 .byte En5 , v064 @@ -175,7 +175,7 @@ bgm_casino_1_003: .byte W08 .byte PEND .byte PATT - .word bgm_casino_1_003 + .word mus_game_corner_1_003 .byte N04 , En5 , v112 .byte W16 .byte En5 , v064 @@ -231,54 +231,54 @@ bgm_casino_1_003: .byte En5 , v064 .byte W08 .byte PATT - .word bgm_casino_1_000 + .word mus_game_corner_1_000 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte PATT - .word bgm_casino_1_001 + .word mus_game_corner_1_001 .byte GOTO - .word bgm_casino_1_B1 + .word mus_game_corner_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_casino_2: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_2: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 54*bgm_casino_mvl/mxv + .byte VOL , 54*mus_game_corner_mvl/mxv .byte PAN , c_v-16 .byte W06 -bgm_casino_2_B1: +mus_game_corner_2_B1: .byte VOICE , 1 - .byte VOL , 52*bgm_casino_mvl/mxv + .byte VOL , 52*mus_game_corner_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -325,7 +325,7 @@ bgm_casino_2_B1: .byte W96 .byte W96 .byte VOICE , 48 - .byte VOL , 30*bgm_casino_mvl/mxv + .byte VOL , 30*mus_game_corner_mvl/mxv .byte N88 , Gn3 .byte W88 .byte N08 , Gs3 @@ -353,7 +353,7 @@ bgm_casino_2_B1: .byte W96 .byte W72 .byte VOICE , 48 - .byte VOL , 14*bgm_casino_mvl/mxv + .byte VOL , 14*mus_game_corner_mvl/mxv .byte N04 , En4 .byte W04 .byte Fn4 @@ -445,7 +445,7 @@ bgm_casino_2_B1: .byte N48 , Cs5 .byte W48 .byte VOICE , 17 - .byte VOL , 22*bgm_casino_mvl/mxv + .byte VOL , 22*mus_game_corner_mvl/mxv .byte N16 , Gs4 .byte W16 .byte N04 , Cn5 @@ -549,14 +549,14 @@ bgm_casino_2_B1: .byte W04 .byte Bn5 .byte W04 - .byte VOL , 20*bgm_casino_mvl/mxv + .byte VOL , 20*mus_game_corner_mvl/mxv .byte N72 , Ds6 .byte W72 .byte N16 , Dn6 .byte W16 .byte N08 , Ds6 .byte W08 - .byte VOL , 23*bgm_casino_mvl/mxv + .byte VOL , 23*mus_game_corner_mvl/mxv .byte N04 , Bn5 .byte W04 .byte N84 , As5 @@ -580,23 +580,23 @@ bgm_casino_2_B1: .byte N48 , Dn6 .byte W48 .byte GOTO - .word bgm_casino_2_B1 + .word mus_game_corner_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_casino_3: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_3: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 35 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 - .byte VOL , 70*bgm_casino_mvl/mxv + .byte VOL , 70*mus_game_corner_mvl/mxv .byte PAN , c_v+0 .byte W06 -bgm_casino_3_B1: - .byte VOL , 70*bgm_casino_mvl/mxv +mus_game_corner_3_B1: + .byte VOL , 70*mus_game_corner_mvl/mxv .byte N08 , Ds1 , v112 .byte W96 .byte En1 @@ -635,7 +635,7 @@ bgm_casino_3_B1: .byte W16 .byte N08 , Dn1 .byte W08 -bgm_casino_3_000: +mus_game_corner_3_000: .byte N08 , Ds1 , v112 .byte W16 .byte Ds2 @@ -647,7 +647,7 @@ bgm_casino_3_000: .byte Cn2 .byte W24 .byte PEND -bgm_casino_3_001: +mus_game_corner_3_001: .byte N08 , As1 , v112 .byte W08 .byte Gn1 @@ -663,7 +663,7 @@ bgm_casino_3_001: .byte Gn1 .byte W08 .byte PEND -bgm_casino_3_002: +mus_game_corner_3_002: .byte N08 , Fn1 , v112 .byte W16 .byte Fn2 @@ -681,7 +681,7 @@ bgm_casino_3_002: .byte Ds2 .byte W08 .byte PEND -bgm_casino_3_003: +mus_game_corner_3_003: .byte N16 , Dn2 , v112 .byte W24 .byte Cn2 @@ -692,10 +692,10 @@ bgm_casino_3_003: .byte W24 .byte PEND .byte PATT - .word bgm_casino_3_000 + .word mus_game_corner_3_000 .byte PATT - .word bgm_casino_3_001 -bgm_casino_3_004: + .word mus_game_corner_3_001 +mus_game_corner_3_004: .byte N08 , Fn1 , v112 .byte W16 .byte Fn2 @@ -720,20 +720,20 @@ bgm_casino_3_004: .byte Dn2 .byte W24 .byte PATT - .word bgm_casino_3_000 + .word mus_game_corner_3_000 .byte PATT - .word bgm_casino_3_001 + .word mus_game_corner_3_001 .byte PATT - .word bgm_casino_3_002 + .word mus_game_corner_3_002 .byte PATT - .word bgm_casino_3_003 + .word mus_game_corner_3_003 .byte PATT - .word bgm_casino_3_000 + .word mus_game_corner_3_000 .byte PATT - .word bgm_casino_3_001 + .word mus_game_corner_3_001 .byte PATT - .word bgm_casino_3_004 - .byte VOL , 72*bgm_casino_mvl/mxv + .word mus_game_corner_3_004 + .byte VOL , 72*mus_game_corner_mvl/mxv .byte N08 , As1 , v112 .byte W24 .byte N72 , As0 @@ -761,7 +761,7 @@ bgm_casino_3_004: .byte W88 .byte N04 , As1 .byte W08 -bgm_casino_3_005: +mus_game_corner_3_005: .byte N72 , Fn2 , v112 .byte W72 .byte N04 , Gn2 @@ -769,7 +769,7 @@ bgm_casino_3_005: .byte Fn2 .byte W08 .byte PEND -bgm_casino_3_006: +mus_game_corner_3_006: .byte N12 , As1 , v112 .byte W16 .byte N04 @@ -854,9 +854,9 @@ bgm_casino_3_006: .byte Cn2 .byte W08 .byte PATT - .word bgm_casino_3_005 + .word mus_game_corner_3_005 .byte PATT - .word bgm_casino_3_006 + .word mus_game_corner_3_006 .byte N12 , Gn2 , v112 .byte W16 .byte N04 , Ds2 @@ -900,25 +900,25 @@ bgm_casino_3_006: .byte W96 .byte W96 .byte GOTO - .word bgm_casino_3_B1 + .word mus_game_corner_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_casino_4: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_4: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 63*bgm_casino_mvl/mxv + .byte VOL , 63*mus_game_corner_mvl/mxv .byte N02 , Fn3 , v112 .byte W02 .byte Gn3 .byte W02 .byte Gs3 .byte W02 -bgm_casino_4_B1: +mus_game_corner_4_B1: .byte VOICE , 56 .byte N08 , Ds4 , v120 .byte W72 @@ -980,16 +980,16 @@ bgm_casino_4_B1: .byte W08 .byte Fn4 , v112 .byte W08 - .byte VOL , 53*bgm_casino_mvl/mxv + .byte VOL , 53*mus_game_corner_mvl/mxv .byte N08 , Fn4 , v036 .byte W16 .byte As4 , v084 .byte W08 - .byte VOL , 64*bgm_casino_mvl/mxv + .byte VOL , 64*mus_game_corner_mvl/mxv .byte N24 , As2 , v112 .byte W24 .byte VOICE , 13 - .byte VOL , 51*bgm_casino_mvl/mxv + .byte VOL , 51*mus_game_corner_mvl/mxv .byte W16 .byte N08 , Gn4 .byte W08 @@ -1032,7 +1032,7 @@ bgm_casino_4_B1: .byte W08 .byte Fs4 .byte W08 - .byte VOL , 33*bgm_casino_mvl/mxv + .byte VOL , 33*mus_game_corner_mvl/mxv .byte N04 , As3 , v104 .byte W04 .byte Gn4 , v096 @@ -1232,7 +1232,7 @@ bgm_casino_4_B1: .byte W96 .byte W96 .byte VOICE , 56 - .byte VOL , 64*bgm_casino_mvl/mxv + .byte VOL , 64*mus_game_corner_mvl/mxv .byte W16 .byte N04 , Gs3 , v112 .byte W04 @@ -1263,14 +1263,14 @@ bgm_casino_4_B1: .byte W96 .byte W96 .byte VOICE , 46 - .byte VOL , 52*bgm_casino_mvl/mxv + .byte VOL , 52*mus_game_corner_mvl/mxv .byte W80 .byte N04 , Cs5 , v112 .byte W08 .byte As4 .byte W08 .byte VOICE , 46 - .byte VOL , 52*bgm_casino_mvl/mxv + .byte VOL , 52*mus_game_corner_mvl/mxv .byte N04 , Gs4 .byte W08 .byte Cn5 , v076 @@ -1464,7 +1464,7 @@ bgm_casino_4_B1: .byte Gn4 .byte W08 .byte VOICE , 1 - .byte VOL , 61*bgm_casino_mvl/mxv + .byte VOL , 61*mus_game_corner_mvl/mxv .byte N04 , Gn3 , v112 .byte W04 .byte N08 , Gn3 , v036 @@ -1666,26 +1666,26 @@ bgm_casino_4_B1: .byte N08 , As3 , v036 .byte W28 .byte GOTO - .word bgm_casino_4_B1 + .word mus_game_corner_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_casino_5: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_5: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 56 .byte PAN , c_v-8 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 68*bgm_casino_mvl/mxv + .byte VOL , 68*mus_game_corner_mvl/mxv .byte N02 , As3 , v112 .byte W02 .byte Cn4 .byte W02 .byte Dn4 .byte W02 -bgm_casino_5_B1: - .byte VOL , 72*bgm_casino_mvl/mxv +mus_game_corner_5_B1: + .byte VOL , 72*mus_game_corner_mvl/mxv .byte N08 , As4 , v120 .byte W08 .byte As4 , v036 @@ -1730,12 +1730,12 @@ bgm_casino_5_B1: .byte W24 .byte W96 .byte VOICE , 1 - .byte VOL , 53*bgm_casino_mvl/mxv + .byte VOL , 53*mus_game_corner_mvl/mxv .byte W64 .byte N04 , An4 , v076 .byte W32 .byte VOICE , 56 - .byte VOL , 72*bgm_casino_mvl/mxv + .byte VOL , 72*mus_game_corner_mvl/mxv .byte W16 .byte N08 , Gn4 , v112 .byte W08 @@ -1801,7 +1801,7 @@ bgm_casino_5_B1: .byte W96 .byte W72 .byte VOICE , 60 - .byte VOL , 62*bgm_casino_mvl/mxv + .byte VOL , 62*mus_game_corner_mvl/mxv .byte N04 , Dn4 , v112 .byte W08 .byte Ds4 @@ -1833,7 +1833,7 @@ bgm_casino_5_B1: .byte W08 .byte As3 , v036 .byte W16 - .byte VOL , 58*bgm_casino_mvl/mxv + .byte VOL , 58*mus_game_corner_mvl/mxv .byte N24 , Gs4 , v112 .byte W24 .byte N08 , Gn4 @@ -1897,7 +1897,7 @@ bgm_casino_5_B1: .byte N96 , As4 , v100 .byte W96 .byte VOICE , 56 - .byte VOL , 62*bgm_casino_mvl/mxv + .byte VOL , 62*mus_game_corner_mvl/mxv .byte N08 , As4 , v036 .byte W16 .byte N04 , Gs4 , v112 @@ -1924,7 +1924,7 @@ bgm_casino_5_B1: .byte W80 .byte W02 .byte VOICE , 24 - .byte VOL , 58*bgm_casino_mvl/mxv + .byte VOL , 58*mus_game_corner_mvl/mxv .byte W24 .byte N24 , Gn4 , v112 .byte W24 @@ -2323,7 +2323,7 @@ bgm_casino_5_B1: .byte N24 , Dn5 , v096 .byte W24 .byte VOICE , 56 - .byte VOL , 72*bgm_casino_mvl/mxv + .byte VOL , 72*mus_game_corner_mvl/mxv .byte N08 , Gn4 , v112 .byte W08 .byte N04 , Gs4 @@ -2331,26 +2331,26 @@ bgm_casino_5_B1: .byte N08 , An4 .byte W08 .byte GOTO - .word bgm_casino_5_B1 + .word mus_game_corner_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_casino_6: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_6: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-61 - .byte VOL , 36*bgm_casino_mvl/mxv + .byte VOL , 36*mus_game_corner_mvl/mxv .byte W04 .byte PAN , c_v-64 .byte W02 -bgm_casino_6_B1: +mus_game_corner_6_B1: .byte PAN , c_v-64 - .byte VOL , 36*bgm_casino_mvl/mxv + .byte VOL , 36*mus_game_corner_mvl/mxv .byte N08 , Gn2 , v112 .byte W96 .byte N08 @@ -2377,7 +2377,7 @@ bgm_casino_6_B1: .byte W02 .byte Fn3 .byte W02 -bgm_casino_6_000: +mus_game_corner_6_000: .byte N02 , Gn3 , v112 .byte W16 .byte N02 @@ -2395,7 +2395,7 @@ bgm_casino_6_000: .byte N02 , Gn3 .byte W08 .byte PEND -bgm_casino_6_001: +mus_game_corner_6_001: .byte N02 , Gn3 , v112 .byte W16 .byte N02 @@ -2415,7 +2415,7 @@ bgm_casino_6_001: .byte Gn3 , v112 .byte W08 .byte PEND -bgm_casino_6_002: +mus_game_corner_6_002: .byte N02 , Gs3 , v112 .byte W16 .byte N02 @@ -2433,7 +2433,7 @@ bgm_casino_6_002: .byte N02 , Gs3 .byte W08 .byte PEND -bgm_casino_6_003: +mus_game_corner_6_003: .byte N02 , Dn4 , v112 .byte W16 .byte N02 @@ -2453,7 +2453,7 @@ bgm_casino_6_003: .byte Gs3 , v112 .byte W08 .byte PEND -bgm_casino_6_004: +mus_game_corner_6_004: .byte N02 , Gn3 , v112 .byte W16 .byte N02 @@ -2474,9 +2474,9 @@ bgm_casino_6_004: .byte W08 .byte PEND .byte PATT - .word bgm_casino_6_001 + .word mus_game_corner_6_001 .byte PATT - .word bgm_casino_6_002 + .word mus_game_corner_6_002 .byte N02 , Dn4 , v112 .byte W04 .byte Ds4 @@ -2506,19 +2506,19 @@ bgm_casino_6_004: .byte Dn3 , v112 .byte W08 .byte PATT - .word bgm_casino_6_000 + .word mus_game_corner_6_000 .byte PATT - .word bgm_casino_6_001 + .word mus_game_corner_6_001 .byte PATT - .word bgm_casino_6_002 + .word mus_game_corner_6_002 .byte PATT - .word bgm_casino_6_003 + .word mus_game_corner_6_003 .byte PATT - .word bgm_casino_6_004 + .word mus_game_corner_6_004 .byte PATT - .word bgm_casino_6_001 + .word mus_game_corner_6_001 .byte PATT - .word bgm_casino_6_002 + .word mus_game_corner_6_002 .byte N04 , Dn4 , v112 .byte W72 .byte VOICE , 80 @@ -2534,10 +2534,10 @@ bgm_casino_6_004: .byte W04 .byte Dn3 .byte W04 - .byte VOL , 31*bgm_casino_mvl/mxv + .byte VOL , 31*mus_game_corner_mvl/mxv .byte N96 , Ds3 .byte W96 -bgm_casino_6_005: +mus_game_corner_6_005: .byte N48 , Dn3 , v112 .byte W48 .byte Cn3 @@ -2604,7 +2604,7 @@ bgm_casino_6_005: .byte N08 , Ds3 .byte W08 .byte PATT - .word bgm_casino_6_005 + .word mus_game_corner_6_005 .byte N60 , Dn3 , v112 .byte W60 .byte W02 @@ -2742,24 +2742,24 @@ bgm_casino_6_005: .byte Fn3 , v112 .byte W32 .byte GOTO - .word bgm_casino_6_B1 + .word mus_game_corner_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_casino_7: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_7: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 36*bgm_casino_mvl/mxv + .byte VOL , 36*mus_game_corner_mvl/mxv .byte PAN , c_v+63 .byte W06 -bgm_casino_7_B1: +mus_game_corner_7_B1: .byte PAN , c_v+63 - .byte VOL , 36*bgm_casino_mvl/mxv + .byte VOL , 36*mus_game_corner_mvl/mxv .byte N08 , Dn3 , v112 .byte W96 .byte Cs3 @@ -2786,7 +2786,7 @@ bgm_casino_7_B1: .byte W02 .byte Cn4 .byte W02 -bgm_casino_7_000: +mus_game_corner_7_000: .byte N02 , Ds4 , v112 .byte W16 .byte As3 @@ -2804,7 +2804,7 @@ bgm_casino_7_000: .byte N02 , Ds4 .byte W08 .byte PEND -bgm_casino_7_001: +mus_game_corner_7_001: .byte N02 , En4 , v112 .byte W16 .byte As3 @@ -2824,7 +2824,7 @@ bgm_casino_7_001: .byte En4 , v112 .byte W08 .byte PEND -bgm_casino_7_002: +mus_game_corner_7_002: .byte N02 , Fn4 , v112 .byte W16 .byte Cn4 @@ -2842,7 +2842,7 @@ bgm_casino_7_002: .byte N02 , Ds4 .byte W08 .byte PEND -bgm_casino_7_003: +mus_game_corner_7_003: .byte N02 , As4 , v112 .byte W16 .byte N02 @@ -2862,7 +2862,7 @@ bgm_casino_7_003: .byte Dn4 , v112 .byte W08 .byte PEND -bgm_casino_7_004: +mus_game_corner_7_004: .byte N02 , Ds4 , v112 .byte W16 .byte As3 @@ -2883,9 +2883,9 @@ bgm_casino_7_004: .byte W08 .byte PEND .byte PATT - .word bgm_casino_7_001 + .word mus_game_corner_7_001 .byte PATT - .word bgm_casino_7_002 + .word mus_game_corner_7_002 .byte N02 , An4 , v112 .byte W04 .byte As4 @@ -2915,19 +2915,19 @@ bgm_casino_7_004: .byte As3 , v112 .byte W08 .byte PATT - .word bgm_casino_7_000 + .word mus_game_corner_7_000 .byte PATT - .word bgm_casino_7_001 + .word mus_game_corner_7_001 .byte PATT - .word bgm_casino_7_002 + .word mus_game_corner_7_002 .byte PATT - .word bgm_casino_7_003 + .word mus_game_corner_7_003 .byte PATT - .word bgm_casino_7_004 + .word mus_game_corner_7_004 .byte PATT - .word bgm_casino_7_001 + .word mus_game_corner_7_001 .byte PATT - .word bgm_casino_7_002 + .word mus_game_corner_7_002 .byte N04 , As4 , v112 .byte W72 .byte VOICE , 81 @@ -2943,7 +2943,7 @@ bgm_casino_7_004: .byte W04 .byte Fs3 .byte W04 - .byte VOL , 31*bgm_casino_mvl/mxv + .byte VOL , 31*mus_game_corner_mvl/mxv .byte N96 , Gn3 .byte W96 .byte N48 , Fn3 @@ -3029,11 +3029,11 @@ bgm_casino_7_004: .byte Gn3 .byte W48 .byte PAN , c_v+0 - .byte VOL , 53*bgm_casino_mvl/mxv + .byte VOL , 53*mus_game_corner_mvl/mxv .byte N24 , Gs1 .byte W96 .byte PAN , c_v+0 - .byte VOL , 52*bgm_casino_mvl/mxv + .byte VOL , 52*mus_game_corner_mvl/mxv .byte N16 .byte W16 .byte N04 , Gs2 @@ -3148,18 +3148,18 @@ bgm_casino_7_004: .byte W96 .byte W96 .byte GOTO - .word bgm_casino_7_B1 + .word mus_game_corner_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_casino_8: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_8: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 54*bgm_casino_mvl/mxv + .byte VOL , 54*mus_game_corner_mvl/mxv .byte W06 -bgm_casino_8_B1: +mus_game_corner_8_B1: .byte W96 .byte W96 .byte W96 @@ -3180,7 +3180,7 @@ bgm_casino_8_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 65*bgm_casino_mvl/mxv + .byte VOL , 65*mus_game_corner_mvl/mxv .byte N48 , An2 , v112 .byte W24 .byte N08 , Cn1 @@ -3201,7 +3201,7 @@ bgm_casino_8_B1: .byte W08 .byte Dn1 .byte W08 -bgm_casino_8_000: +mus_game_corner_8_000: .byte N04 , Cn1 , v112 .byte W48 .byte En1 @@ -3211,7 +3211,7 @@ bgm_casino_8_000: .byte N04 .byte W08 .byte PEND -bgm_casino_8_001: +mus_game_corner_8_001: .byte W16 .byte N04 , Cn1 , v112 .byte W32 @@ -3225,7 +3225,7 @@ bgm_casino_8_001: .byte W08 .byte PEND .byte PATT - .word bgm_casino_8_000 + .word mus_game_corner_8_000 .byte W16 .byte N04 , Cn1 , v112 .byte W32 @@ -3240,11 +3240,11 @@ bgm_casino_8_001: .byte En1 .byte W08 .byte PATT - .word bgm_casino_8_000 + .word mus_game_corner_8_000 .byte PATT - .word bgm_casino_8_001 + .word mus_game_corner_8_001 .byte PATT - .word bgm_casino_8_000 + .word mus_game_corner_8_000 .byte W16 .byte N04 , Cn1 , v112 .byte W32 @@ -3256,7 +3256,7 @@ bgm_casino_8_001: .byte W08 .byte Cn1 .byte W24 - .byte VOL , 54*bgm_casino_mvl/mxv + .byte VOL , 54*mus_game_corner_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -3288,23 +3288,23 @@ bgm_casino_8_001: .byte N04 .byte W08 .byte GOTO - .word bgm_casino_8_B1 + .word mus_game_corner_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_casino_9: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_9: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 36*bgm_casino_mvl/mxv + .byte VOL , 36*mus_game_corner_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W06 -bgm_casino_9_B1: +mus_game_corner_9_B1: .byte BEND , c_v+2 .byte N08 , As4 , v120 .byte W72 @@ -3349,7 +3349,7 @@ bgm_casino_9_B1: .byte W24 .byte As4 .byte W32 -bgm_casino_9_000: +mus_game_corner_9_000: .byte N08 , Ds1 , v112 .byte W16 .byte Ds2 @@ -3361,7 +3361,7 @@ bgm_casino_9_000: .byte Cn2 .byte W24 .byte PEND -bgm_casino_9_001: +mus_game_corner_9_001: .byte N08 , As1 , v112 .byte W08 .byte Gn1 @@ -3377,7 +3377,7 @@ bgm_casino_9_001: .byte Gn1 .byte W08 .byte PEND -bgm_casino_9_002: +mus_game_corner_9_002: .byte N08 , Fn1 , v112 .byte W16 .byte Fn2 @@ -3395,7 +3395,7 @@ bgm_casino_9_002: .byte Ds2 .byte W08 .byte PEND -bgm_casino_9_003: +mus_game_corner_9_003: .byte N16 , Dn2 , v112 .byte W24 .byte Cn2 @@ -3406,10 +3406,10 @@ bgm_casino_9_003: .byte W24 .byte PEND .byte PATT - .word bgm_casino_9_000 + .word mus_game_corner_9_000 .byte PATT - .word bgm_casino_9_001 -bgm_casino_9_004: + .word mus_game_corner_9_001 +mus_game_corner_9_004: .byte N08 , Fn1 , v112 .byte W16 .byte Fn2 @@ -3434,23 +3434,23 @@ bgm_casino_9_004: .byte Dn2 .byte W24 .byte PATT - .word bgm_casino_9_000 + .word mus_game_corner_9_000 .byte PATT - .word bgm_casino_9_001 + .word mus_game_corner_9_001 .byte PATT - .word bgm_casino_9_002 + .word mus_game_corner_9_002 .byte PATT - .word bgm_casino_9_003 + .word mus_game_corner_9_003 .byte PATT - .word bgm_casino_9_000 + .word mus_game_corner_9_000 .byte PATT - .word bgm_casino_9_001 + .word mus_game_corner_9_001 .byte PATT - .word bgm_casino_9_004 + .word mus_game_corner_9_004 .byte N08 , As1 , v112 .byte W96 .byte VOICE , 83 - .byte VOL , 27*bgm_casino_mvl/mxv + .byte VOL , 27*mus_game_corner_mvl/mxv .byte W24 .byte N24 , Gn4 .byte W24 @@ -3612,7 +3612,7 @@ bgm_casino_9_004: .byte Cs5 .byte W48 .byte VOICE , 82 - .byte VOL , 30*bgm_casino_mvl/mxv + .byte VOL , 30*mus_game_corner_mvl/mxv .byte PAN , c_v-64 .byte BEND , c_v+0 .byte N40 , Ds4 @@ -3804,20 +3804,20 @@ bgm_casino_9_004: .byte N08 , An4 .byte W08 .byte GOTO - .word bgm_casino_9_B1 + .word mus_game_corner_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_casino_10: - .byte KEYSH , bgm_casino_key+0 +mus_game_corner_10: + .byte KEYSH , mus_game_corner_key+0 .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+16 - .byte VOL , 49*bgm_casino_mvl/mxv + .byte VOL , 49*mus_game_corner_mvl/mxv .byte W06 -bgm_casino_10_B1: +mus_game_corner_10_B1: .byte N08 , As3 , v112 .byte W96 .byte As2 @@ -4090,7 +4090,7 @@ bgm_casino_10_B1: .byte W24 .byte N16 .byte W24 -bgm_casino_10_000: +mus_game_corner_10_000: .byte N04 , Ds3 , v112 .byte W08 .byte Ds3 , v048 @@ -4113,7 +4113,7 @@ bgm_casino_10_000: .byte N04 .byte W24 .byte PATT - .word bgm_casino_10_000 + .word mus_game_corner_10_000 .byte N04 , Dn3 , v088 .byte W16 .byte Dn3 , v112 @@ -4123,29 +4123,29 @@ bgm_casino_10_000: .byte Dn3 , v112 .byte W32 .byte GOTO - .word bgm_casino_10_B1 + .word mus_game_corner_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_casino: +mus_game_corner: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_casino_pri @ Priority - .byte bgm_casino_rev @ Reverb. + .byte mus_game_corner_pri @ Priority + .byte mus_game_corner_rev @ Reverb. - .word bgm_casino_grp + .word mus_game_corner_grp - .word bgm_casino_1 - .word bgm_casino_2 - .word bgm_casino_3 - .word bgm_casino_4 - .word bgm_casino_5 - .word bgm_casino_6 - .word bgm_casino_7 - .word bgm_casino_8 - .word bgm_casino_9 - .word bgm_casino_10 + .word mus_game_corner_1 + .word mus_game_corner_2 + .word mus_game_corner_3 + .word mus_game_corner_4 + .word mus_game_corner_5 + .word mus_game_corner_6 + .word mus_game_corner_7 + .word mus_game_corner_8 + .word mus_game_corner_9 + .word mus_game_corner_10 .end diff --git a/sound/songs/bgm_nibi.s b/sound/songs/mus_gsc_pewter.s index ae1736dea..38606d2bf 100644 --- a/sound/songs/bgm_nibi.s +++ b/sound/songs/mus_gsc_pewter.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_nibi_grp, voicegroup000 - .equ bgm_nibi_pri, 0 - .equ bgm_nibi_rev, reverb_set+50 - .equ bgm_nibi_mvl, 127 - .equ bgm_nibi_key, 0 - .equ bgm_nibi_tbs, 1 - .equ bgm_nibi_exg, 0 - .equ bgm_nibi_cmp, 1 + .equ mus_gsc_pewter_grp, voicegroup000 + .equ mus_gsc_pewter_pri, 0 + .equ mus_gsc_pewter_rev, reverb_set+50 + .equ mus_gsc_pewter_mvl, 127 + .equ mus_gsc_pewter_key, 0 + .equ mus_gsc_pewter_tbs, 1 + .equ mus_gsc_pewter_exg, 0 + .equ mus_gsc_pewter_cmp, 1 .section .rodata - .global bgm_nibi + .global mus_gsc_pewter .align 2 @********************** Track 1 **********************@ -bgm_nibi_1: - .byte KEYSH , bgm_nibi_key+0 - .byte TEMPO , 128*bgm_nibi_tbs/2 +mus_gsc_pewter_1: + .byte KEYSH , mus_gsc_pewter_key+0 + .byte TEMPO , 128*mus_gsc_pewter_tbs/2 .byte VOICE , 1 - .byte VOL , 80*bgm_nibi_mvl/mxv + .byte VOL , 80*mus_gsc_pewter_mvl/mxv .byte N06 , En3 , v112 .byte W24 .byte N12 @@ -47,8 +47,8 @@ bgm_nibi_1: .byte W24 .byte N48 .byte W72 -bgm_nibi_1_B1: -bgm_nibi_1_000: +mus_gsc_pewter_1_B1: +mus_gsc_pewter_1_000: .byte N06 , Gn3 , v112 .byte W24 .byte N12 @@ -58,7 +58,7 @@ bgm_nibi_1_000: .byte N06 .byte W12 .byte PEND -bgm_nibi_1_001: +mus_gsc_pewter_1_001: .byte N24 , As3 , v112 .byte W36 .byte N12 , Gn3 @@ -70,7 +70,7 @@ bgm_nibi_1_001: .byte As3 .byte W12 .byte PEND -bgm_nibi_1_002: +mus_gsc_pewter_1_002: .byte N06 , An3 , v112 .byte W24 .byte N12 , Fn3 @@ -80,7 +80,7 @@ bgm_nibi_1_002: .byte Cn4 .byte W12 .byte PEND -bgm_nibi_1_003: +mus_gsc_pewter_1_003: .byte W12 .byte N12 , An3 , v112 .byte W24 @@ -91,7 +91,7 @@ bgm_nibi_1_003: .byte N06 , An3 .byte W12 .byte PEND -bgm_nibi_1_004: +mus_gsc_pewter_1_004: .byte N06 , Cn4 , v112 .byte W24 .byte N12 @@ -111,7 +111,7 @@ bgm_nibi_1_004: .byte W24 .byte N06 , Bn3 .byte W12 -bgm_nibi_1_005: +mus_gsc_pewter_1_005: .byte N06 , Gn3 , v112 .byte W24 .byte N12 , En3 @@ -125,15 +125,15 @@ bgm_nibi_1_005: .byte N48 .byte W72 .byte PATT - .word bgm_nibi_1_000 + .word mus_gsc_pewter_1_000 .byte PATT - .word bgm_nibi_1_001 + .word mus_gsc_pewter_1_001 .byte PATT - .word bgm_nibi_1_002 + .word mus_gsc_pewter_1_002 .byte PATT - .word bgm_nibi_1_003 + .word mus_gsc_pewter_1_003 .byte PATT - .word bgm_nibi_1_004 + .word mus_gsc_pewter_1_004 .byte N24 , Fn3 , v112 .byte W36 .byte N06 , Bn3 , v072 @@ -145,13 +145,13 @@ bgm_nibi_1_005: .byte N06 , Bn3 , v112 .byte W12 .byte PATT - .word bgm_nibi_1_005 + .word mus_gsc_pewter_1_005 .byte W24 .byte N48 , Fn3 , v112 .byte W48 .byte N24 , As3 .byte W24 -bgm_nibi_1_006: +mus_gsc_pewter_1_006: .byte N12 , An3 , v112 .byte W12 .byte Cn3 @@ -254,7 +254,7 @@ bgm_nibi_1_006: .byte Gn3 .byte W12 .byte PATT - .word bgm_nibi_1_006 + .word mus_gsc_pewter_1_006 .byte W12 .byte N12 , An3 , v112 .byte W12 @@ -326,15 +326,15 @@ bgm_nibi_1_006: .byte N24 , Gs3 .byte W24 .byte GOTO - .word bgm_nibi_1_B1 + .word mus_gsc_pewter_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_nibi_2: - .byte KEYSH , bgm_nibi_key+0 +mus_gsc_pewter_2: + .byte KEYSH , mus_gsc_pewter_key+0 .byte VOICE , 1 - .byte VOL , 80*bgm_nibi_mvl/mxv + .byte VOL , 80*mus_gsc_pewter_mvl/mxv .byte N24 , Cn2 , v112 .byte W36 .byte N06 , Gn2 @@ -351,7 +351,7 @@ bgm_nibi_2: .byte W24 .byte N06 , Gn2 .byte W12 -bgm_nibi_2_000: +mus_gsc_pewter_2_000: .byte N24 , Cn2 , v112 .byte W36 .byte N06 , Gn2 @@ -364,8 +364,8 @@ bgm_nibi_2_000: .byte W24 .byte N48 .byte W72 -bgm_nibi_2_B1: -bgm_nibi_2_001: +mus_gsc_pewter_2_B1: +mus_gsc_pewter_2_001: .byte N24 , Cn2 , v112 .byte W36 .byte N06 , Gn2 @@ -373,7 +373,7 @@ bgm_nibi_2_001: .byte N24 .byte W48 .byte PEND -bgm_nibi_2_002: +mus_gsc_pewter_2_002: .byte N24 , Cs2 , v112 .byte W36 .byte N06 , Gn2 @@ -385,7 +385,7 @@ bgm_nibi_2_002: .byte N06 , Gn2 .byte W12 .byte PEND -bgm_nibi_2_003: +mus_gsc_pewter_2_003: .byte N24 , Dn2 , v112 .byte W36 .byte N06 , An2 @@ -393,7 +393,7 @@ bgm_nibi_2_003: .byte N24 .byte W48 .byte PEND -bgm_nibi_2_004: +mus_gsc_pewter_2_004: .byte N24 , Dn2 , v112 .byte W36 .byte N06 , An2 @@ -405,7 +405,7 @@ bgm_nibi_2_004: .byte N06 , An2 .byte W12 .byte PEND -bgm_nibi_2_005: +mus_gsc_pewter_2_005: .byte N24 , Fn2 , v112 .byte W36 .byte N06 , Cn3 @@ -413,7 +413,7 @@ bgm_nibi_2_005: .byte N24 .byte W48 .byte PEND -bgm_nibi_2_006: +mus_gsc_pewter_2_006: .byte N24 , Gn2 , v112 .byte W36 .byte N06 , Dn3 @@ -426,30 +426,30 @@ bgm_nibi_2_006: .byte W12 .byte PEND .byte PATT - .word bgm_nibi_2_000 + .word mus_gsc_pewter_2_000 .byte W24 .byte N48 , Dn2 , v112 .byte W72 .byte PATT - .word bgm_nibi_2_001 + .word mus_gsc_pewter_2_001 .byte PATT - .word bgm_nibi_2_002 + .word mus_gsc_pewter_2_002 .byte PATT - .word bgm_nibi_2_003 + .word mus_gsc_pewter_2_003 .byte PATT - .word bgm_nibi_2_004 + .word mus_gsc_pewter_2_004 .byte PATT - .word bgm_nibi_2_005 + .word mus_gsc_pewter_2_005 .byte PATT - .word bgm_nibi_2_006 + .word mus_gsc_pewter_2_006 .byte PATT - .word bgm_nibi_2_000 + .word mus_gsc_pewter_2_000 .byte W24 .byte N48 , Dn2 , v112 .byte W48 .byte N24 , En2 .byte W24 -bgm_nibi_2_007: +mus_gsc_pewter_2_007: .byte N24 , Fn2 , v112 .byte W36 .byte N06 , Cn3 @@ -471,7 +471,7 @@ bgm_nibi_2_007: .byte W24 .byte N12 , An2 .byte W12 -bgm_nibi_2_008: +mus_gsc_pewter_2_008: .byte N24 , En2 , v112 .byte W36 .byte N06 , Bn2 @@ -492,7 +492,7 @@ bgm_nibi_2_008: .byte W24 .byte As2 .byte W24 -bgm_nibi_2_009: +mus_gsc_pewter_2_009: .byte N24 , Dn2 , v112 .byte W36 .byte N06 , An2 @@ -540,7 +540,7 @@ bgm_nibi_2_009: .byte En2 .byte W12 .byte PATT - .word bgm_nibi_2_007 + .word mus_gsc_pewter_2_007 .byte N24 , Fn2 , v112 .byte W36 .byte N06 , An2 @@ -552,7 +552,7 @@ bgm_nibi_2_009: .byte N12 , Fn2 .byte W12 .byte PATT - .word bgm_nibi_2_008 + .word mus_gsc_pewter_2_008 .byte W12 .byte N12 , En2 , v112 .byte W24 @@ -563,7 +563,7 @@ bgm_nibi_2_009: .byte Cs2 .byte W12 .byte PATT - .word bgm_nibi_2_009 + .word mus_gsc_pewter_2_009 .byte N24 , Dn2 , v112 .byte W36 .byte N06 , Gs2 @@ -587,15 +587,15 @@ bgm_nibi_2_009: .byte N24 , Gn1 .byte W24 .byte GOTO - .word bgm_nibi_2_B1 + .word mus_gsc_pewter_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_nibi_3: - .byte KEYSH , bgm_nibi_key+0 +mus_gsc_pewter_3: + .byte KEYSH , mus_gsc_pewter_key+0 .byte VOICE , 1 - .byte VOL , 80*bgm_nibi_mvl/mxv + .byte VOL , 80*mus_gsc_pewter_mvl/mxv .byte N06 , Gn3 , v112 .byte W24 .byte N12 @@ -620,7 +620,7 @@ bgm_nibi_3: .byte W24 .byte N06 , Cn4 .byte W12 -bgm_nibi_3_000: +mus_gsc_pewter_3_000: .byte W24 .byte N48 , Cn4 , v112 .byte W48 @@ -629,8 +629,8 @@ bgm_nibi_3_000: .byte Fn4 .byte W12 .byte PEND -bgm_nibi_3_B1: -bgm_nibi_3_001: +mus_gsc_pewter_3_B1: +mus_gsc_pewter_3_001: .byte N12 , Gn4 , v112 .byte W24 .byte Fn4 @@ -638,7 +638,7 @@ bgm_nibi_3_001: .byte En4 .byte W48 .byte PEND -bgm_nibi_3_002: +mus_gsc_pewter_3_002: .byte W12 .byte N12 , En4 , v112 .byte W12 @@ -653,7 +653,7 @@ bgm_nibi_3_002: .byte En4 .byte W12 .byte PEND -bgm_nibi_3_003: +mus_gsc_pewter_3_003: .byte N12 , Fn4 , v112 .byte W12 .byte Dn4 @@ -665,7 +665,7 @@ bgm_nibi_3_003: .byte Fn4 .byte W12 .byte PEND -bgm_nibi_3_004: +mus_gsc_pewter_3_004: .byte W12 .byte N12 , Cn4 , v112 .byte W24 @@ -678,7 +678,7 @@ bgm_nibi_3_004: .byte En4 .byte W12 .byte PEND -bgm_nibi_3_005: +mus_gsc_pewter_3_005: .byte N12 , Fn4 , v112 .byte W24 .byte En4 @@ -686,7 +686,7 @@ bgm_nibi_3_005: .byte Dn4 .byte W48 .byte PEND -bgm_nibi_3_006: +mus_gsc_pewter_3_006: .byte W12 .byte N12 , Dn4 , v112 .byte W12 @@ -701,7 +701,7 @@ bgm_nibi_3_006: .byte Dn4 .byte W12 .byte PEND -bgm_nibi_3_007: +mus_gsc_pewter_3_007: .byte N12 , En4 , v112 .byte W12 .byte Cn4 @@ -714,21 +714,21 @@ bgm_nibi_3_007: .byte W12 .byte PEND .byte PATT - .word bgm_nibi_3_000 + .word mus_gsc_pewter_3_000 .byte PATT - .word bgm_nibi_3_001 + .word mus_gsc_pewter_3_001 .byte PATT - .word bgm_nibi_3_002 + .word mus_gsc_pewter_3_002 .byte PATT - .word bgm_nibi_3_003 + .word mus_gsc_pewter_3_003 .byte PATT - .word bgm_nibi_3_004 + .word mus_gsc_pewter_3_004 .byte PATT - .word bgm_nibi_3_005 + .word mus_gsc_pewter_3_005 .byte PATT - .word bgm_nibi_3_006 + .word mus_gsc_pewter_3_006 .byte PATT - .word bgm_nibi_3_007 + .word mus_gsc_pewter_3_007 .byte W24 .byte N48 , Cn4 , v112 .byte W48 @@ -838,15 +838,15 @@ bgm_nibi_3_007: .byte N24 , Dn4 .byte W24 .byte GOTO - .word bgm_nibi_3_B1 + .word mus_gsc_pewter_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_nibi_4: - .byte KEYSH , bgm_nibi_key+0 +mus_gsc_pewter_4: + .byte KEYSH , mus_gsc_pewter_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_nibi_mvl/mxv + .byte VOL , 80*mus_gsc_pewter_mvl/mxv .byte N12 , Fs2 , v056 .byte W12 .byte N12 @@ -861,7 +861,7 @@ bgm_nibi_4: .byte W12 .byte As1 , v084 .byte W12 -bgm_nibi_4_000: +mus_gsc_pewter_4_000: .byte N12 , Fs2 , v056 .byte W12 .byte N12 @@ -877,7 +877,7 @@ bgm_nibi_4_000: .byte As1 , v084 .byte W12 .byte PEND -bgm_nibi_4_001: +mus_gsc_pewter_4_001: .byte N12 , Fs2 , v056 .byte W12 .byte N12 @@ -893,7 +893,7 @@ bgm_nibi_4_001: .byte As1 , v084 .byte W12 .byte PEND -bgm_nibi_4_002: +mus_gsc_pewter_4_002: .byte N12 , Fs2 , v056 .byte W12 .byte N12 @@ -909,27 +909,27 @@ bgm_nibi_4_002: .byte N12 .byte W12 .byte PEND -bgm_nibi_4_B1: +mus_gsc_pewter_4_B1: .byte PATT - .word bgm_nibi_4_001 + .word mus_gsc_pewter_4_001 .byte PATT - .word bgm_nibi_4_000 + .word mus_gsc_pewter_4_000 .byte PATT - .word bgm_nibi_4_001 + .word mus_gsc_pewter_4_001 .byte PATT - .word bgm_nibi_4_000 + .word mus_gsc_pewter_4_000 .byte PATT - .word bgm_nibi_4_001 + .word mus_gsc_pewter_4_001 .byte PATT - .word bgm_nibi_4_000 + .word mus_gsc_pewter_4_000 .byte PATT - .word bgm_nibi_4_001 + .word mus_gsc_pewter_4_001 .byte PATT - .word bgm_nibi_4_002 + .word mus_gsc_pewter_4_002 .byte PATT - .word bgm_nibi_4_001 + .word mus_gsc_pewter_4_001 .byte PATT - .word bgm_nibi_4_000 + .word mus_gsc_pewter_4_000 .byte N12 , Fs2 , v056 .byte W12 .byte N12 @@ -945,11 +945,11 @@ bgm_nibi_4_B1: .byte As1 , v084 .byte W12 .byte PATT - .word bgm_nibi_4_000 + .word mus_gsc_pewter_4_000 .byte PATT - .word bgm_nibi_4_001 + .word mus_gsc_pewter_4_001 .byte PATT - .word bgm_nibi_4_000 + .word mus_gsc_pewter_4_000 .byte N12 , Fs2 , v056 .byte W12 .byte N12 @@ -965,8 +965,8 @@ bgm_nibi_4_B1: .byte As1 , v084 .byte W12 .byte PATT - .word bgm_nibi_4_002 -bgm_nibi_4_003: + .word mus_gsc_pewter_4_002 +mus_gsc_pewter_4_003: .byte N12 , Cn1 , v084 .byte W12 .byte As1 @@ -982,7 +982,7 @@ bgm_nibi_4_003: .byte N24 , En1 .byte W24 .byte PEND -bgm_nibi_4_004: +mus_gsc_pewter_4_004: .byte N12 , Cn1 , v084 .byte W12 .byte As1 @@ -1001,8 +1001,8 @@ bgm_nibi_4_004: .byte W12 .byte PEND .byte PATT - .word bgm_nibi_4_003 -bgm_nibi_4_005: + .word mus_gsc_pewter_4_003 +mus_gsc_pewter_4_005: .byte N12 , Cn1 , v084 .byte W12 .byte As1 @@ -1021,17 +1021,17 @@ bgm_nibi_4_005: .byte W12 .byte PEND .byte PATT - .word bgm_nibi_4_003 + .word mus_gsc_pewter_4_003 .byte PATT - .word bgm_nibi_4_004 + .word mus_gsc_pewter_4_004 .byte PATT - .word bgm_nibi_4_003 + .word mus_gsc_pewter_4_003 .byte PATT - .word bgm_nibi_4_004 + .word mus_gsc_pewter_4_004 .byte PATT - .word bgm_nibi_4_003 + .word mus_gsc_pewter_4_003 .byte PATT - .word bgm_nibi_4_004 + .word mus_gsc_pewter_4_004 .byte N12 , Cn1 , v084 .byte W12 .byte As1 @@ -1047,33 +1047,33 @@ bgm_nibi_4_005: .byte En1 .byte W24 .byte PATT - .word bgm_nibi_4_005 + .word mus_gsc_pewter_4_005 .byte PATT - .word bgm_nibi_4_003 + .word mus_gsc_pewter_4_003 .byte PATT - .word bgm_nibi_4_004 + .word mus_gsc_pewter_4_004 .byte PATT - .word bgm_nibi_4_003 + .word mus_gsc_pewter_4_003 .byte PATT - .word bgm_nibi_4_004 + .word mus_gsc_pewter_4_004 .byte GOTO - .word bgm_nibi_4_B1 + .word mus_gsc_pewter_4_B1 .byte FINE @******************************************************@ .align 2 -bgm_nibi: +mus_gsc_pewter: .byte 4 @ NumTrks .byte 0 @ NumBlks - .byte bgm_nibi_pri @ Priority - .byte bgm_nibi_rev @ Reverb. + .byte mus_gsc_pewter_pri @ Priority + .byte mus_gsc_pewter_rev @ Reverb. - .word bgm_nibi_grp + .word mus_gsc_pewter_grp - .word bgm_nibi_1 - .word bgm_nibi_2 - .word bgm_nibi_3 - .word bgm_nibi_4 + .word mus_gsc_pewter_1 + .word mus_gsc_pewter_2 + .word mus_gsc_pewter_3 + .word mus_gsc_pewter_4 .end diff --git a/sound/songs/bgm_field13.s b/sound/songs/mus_gsc_route38.s index e09c90ece..947f57844 100644 --- a/sound/songs/bgm_field13.s +++ b/sound/songs/mus_gsc_route38.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_field13_grp, voicegroup000 - .equ bgm_field13_pri, 0 - .equ bgm_field13_rev, reverb_set+50 - .equ bgm_field13_mvl, 127 - .equ bgm_field13_key, 0 - .equ bgm_field13_tbs, 1 - .equ bgm_field13_exg, 0 - .equ bgm_field13_cmp, 1 + .equ mus_gsc_route38_grp, voicegroup000 + .equ mus_gsc_route38_pri, 0 + .equ mus_gsc_route38_rev, reverb_set+50 + .equ mus_gsc_route38_mvl, 127 + .equ mus_gsc_route38_key, 0 + .equ mus_gsc_route38_tbs, 1 + .equ mus_gsc_route38_exg, 0 + .equ mus_gsc_route38_cmp, 1 .section .rodata - .global bgm_field13 + .global mus_gsc_route38 .align 2 @********************** Track 1 **********************@ -bgm_field13_1: - .byte KEYSH , bgm_field13_key+0 - .byte TEMPO , 130*bgm_field13_tbs/2 +mus_gsc_route38_1: + .byte KEYSH , mus_gsc_route38_key+0 + .byte TEMPO , 130*mus_gsc_route38_tbs/2 .byte VOICE , 56 - .byte VOL , 80*bgm_field13_mvl/mxv + .byte VOL , 80*mus_gsc_route38_mvl/mxv .byte W96 .byte W96 -bgm_field13_1_B1: +mus_gsc_route38_1_B1: .byte W12 .byte VOICE , 48 .byte N11 , Fs2 , v080 @@ -134,7 +134,7 @@ bgm_field13_1_B1: .byte W12 .byte N23 , Cs3 .byte W24 -bgm_field13_1_000: +mus_gsc_route38_1_000: .byte N05 , Bn2 , v104 .byte W12 .byte N05 @@ -157,7 +157,7 @@ bgm_field13_1_000: .byte W24 .byte PEND .byte PATT - .word bgm_field13_1_000 + .word mus_gsc_route38_1_000 .byte N05 , An2 , v104 .byte W12 .byte N05 @@ -238,7 +238,7 @@ bgm_field13_1_000: .byte W12 .byte N23 , Fn3 .byte W24 -bgm_field13_1_001: +mus_gsc_route38_1_001: .byte N05 , Bn2 , v104 .byte W12 .byte N05 @@ -259,17 +259,17 @@ bgm_field13_1_001: .byte W36 .byte PEND .byte PATT - .word bgm_field13_1_001 + .word mus_gsc_route38_1_001 .byte GOTO - .word bgm_field13_1_B1 + .word mus_gsc_route38_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_field13_2: - .byte KEYSH , bgm_field13_key+0 +mus_gsc_route38_2: + .byte KEYSH , mus_gsc_route38_key+0 .byte VOICE , 56 - .byte VOL , 80*bgm_field13_mvl/mxv + .byte VOL , 80*mus_gsc_route38_mvl/mxv .byte N05 , Bn2 , v112 .byte W12 .byte N05 @@ -308,8 +308,8 @@ bgm_field13_2: .byte W12 .byte N23 , Fs3 .byte W24 -bgm_field13_2_B1: -bgm_field13_2_000: +mus_gsc_route38_2_B1: +mus_gsc_route38_2_000: .byte N44 , Bn3 , v112 .byte W60 .byte N11 , Fs3 @@ -336,7 +336,7 @@ bgm_field13_2_000: .byte N23 , Fs3 , v112 .byte W24 .byte PATT - .word bgm_field13_2_000 + .word mus_gsc_route38_2_000 .byte N23 , Cs4 , v112 .byte W24 .byte Bn3 @@ -361,7 +361,7 @@ bgm_field13_2_000: .byte W24 .byte Gs4 .byte W24 -bgm_field13_2_001: +mus_gsc_route38_2_001: .byte N32 , Cs4 , v096 .byte W36 .byte Ds4 @@ -391,7 +391,7 @@ bgm_field13_2_001: .byte Gs4 .byte W24 .byte PATT - .word bgm_field13_2_001 + .word mus_gsc_route38_2_001 .byte N17 , Fs4 , v096 .byte W18 .byte N05 , Ds4 @@ -444,27 +444,27 @@ bgm_field13_2_001: .byte N23 .byte W24 .byte GOTO - .word bgm_field13_2_B1 + .word mus_gsc_route38_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_field13_3: - .byte KEYSH , bgm_field13_key+0 +mus_gsc_route38_3: + .byte KEYSH , mus_gsc_route38_key+0 .byte VOICE , 38 - .byte VOL , 80*bgm_field13_mvl/mxv + .byte VOL , 80*mus_gsc_route38_mvl/mxv .byte N11 , Fs1 , v112 .byte W48 .byte N11 .byte W48 -bgm_field13_3_000: +mus_gsc_route38_3_000: .byte N11 , Fs1 , v112 .byte W48 .byte N11 .byte W48 .byte PEND -bgm_field13_3_B1: -bgm_field13_3_001: +mus_gsc_route38_3_B1: +mus_gsc_route38_3_001: .byte N11 , Fs1 , v112 .byte W12 .byte Bn1 @@ -515,9 +515,9 @@ bgm_field13_3_001: .byte Fs1 .byte W12 .byte PATT - .word bgm_field13_3_001 + .word mus_gsc_route38_3_001 .byte PATT - .word bgm_field13_3_001 + .word mus_gsc_route38_3_001 .byte N11 , An1 , v112 .byte W12 .byte Cs2 @@ -535,8 +535,8 @@ bgm_field13_3_001: .byte An1 .byte W12 .byte PATT - .word bgm_field13_3_001 -bgm_field13_3_002: + .word mus_gsc_route38_3_001 +mus_gsc_route38_3_002: .byte N11 , Bn1 , v112 .byte W12 .byte Ds2 @@ -554,7 +554,7 @@ bgm_field13_3_002: .byte Ds2 .byte W12 .byte PEND -bgm_field13_3_003: +mus_gsc_route38_3_003: .byte N11 , An1 , v112 .byte W12 .byte Cs2 @@ -572,7 +572,7 @@ bgm_field13_3_003: .byte Cs2 .byte W12 .byte PEND -bgm_field13_3_004: +mus_gsc_route38_3_004: .byte N11 , An1 , v112 .byte W12 .byte Cs2 @@ -591,7 +591,7 @@ bgm_field13_3_004: .byte W12 .byte PEND .byte PATT - .word bgm_field13_3_002 + .word mus_gsc_route38_3_002 .byte N11 , Bn1 , v112 .byte W12 .byte Fs2 @@ -609,27 +609,27 @@ bgm_field13_3_004: .byte Fs2 .byte W12 .byte PATT - .word bgm_field13_3_003 + .word mus_gsc_route38_3_003 .byte PATT - .word bgm_field13_3_004 + .word mus_gsc_route38_3_004 .byte PATT - .word bgm_field13_3_002 + .word mus_gsc_route38_3_002 .byte PATT - .word bgm_field13_3_001 + .word mus_gsc_route38_3_001 .byte PATT - .word bgm_field13_3_000 + .word mus_gsc_route38_3_000 .byte PATT - .word bgm_field13_3_000 + .word mus_gsc_route38_3_000 .byte GOTO - .word bgm_field13_3_B1 + .word mus_gsc_route38_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_field13_4: - .byte KEYSH , bgm_field13_key+0 +mus_gsc_route38_4: + .byte KEYSH , mus_gsc_route38_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_field13_mvl/mxv + .byte VOL , 80*mus_gsc_route38_mvl/mxv .byte N05 , En1 , v072 .byte W12 .byte N05 @@ -656,7 +656,7 @@ bgm_field13_4: .byte W06 .byte N05 .byte W06 -bgm_field13_4_000: +mus_gsc_route38_4_000: .byte N05 , En1 , v072 .byte W12 .byte N05 @@ -692,8 +692,8 @@ bgm_field13_4_000: .byte N02 .byte W03 .byte PEND -bgm_field13_4_B1: -bgm_field13_4_001: +mus_gsc_route38_4_B1: +mus_gsc_route38_4_001: .byte N05 , En1 , v072 .byte W12 .byte N05 @@ -722,57 +722,57 @@ bgm_field13_4_001: .byte W06 .byte PEND .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_000 + .word mus_gsc_route38_4_000 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_000 + .word mus_gsc_route38_4_000 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_001 + .word mus_gsc_route38_4_001 .byte PATT - .word bgm_field13_4_000 + .word mus_gsc_route38_4_000 .byte GOTO - .word bgm_field13_4_B1 + .word mus_gsc_route38_4_B1 .byte FINE @******************************************************@ .align 2 -bgm_field13: +mus_gsc_route38: .byte 4 @ NumTrks .byte 0 @ NumBlks - .byte bgm_field13_pri @ Priority - .byte bgm_field13_rev @ Reverb. + .byte mus_gsc_route38_pri @ Priority + .byte mus_gsc_route38_rev @ Reverb. - .word bgm_field13_grp + .word mus_gsc_route38_grp - .word bgm_field13_1 - .word bgm_field13_2 - .word bgm_field13_3 - .word bgm_field13_4 + .word mus_gsc_route38_1 + .word mus_gsc_route38_2 + .word mus_gsc_route38_3 + .word mus_gsc_route38_4 .end diff --git a/sound/songs/bgm_gim.s b/sound/songs/mus_gym.s index 51ea72bd8..c0d6f50fc 100644 --- a/sound/songs/bgm_gim.s +++ b/sound/songs/mus_gym.s @@ -1,44 +1,44 @@ .include "MPlayDef.s" - .equ bgm_gim_grp, voicegroup010 - .equ bgm_gim_pri, 0 - .equ bgm_gim_rev, reverb_set+50 - .equ bgm_gim_mvl, 127 - .equ bgm_gim_key, 0 - .equ bgm_gim_tbs, 1 - .equ bgm_gim_exg, 0 - .equ bgm_gim_cmp, 1 + .equ mus_gym_grp, voicegroup010 + .equ mus_gym_pri, 0 + .equ mus_gym_rev, reverb_set+50 + .equ mus_gym_mvl, 127 + .equ mus_gym_key, 0 + .equ mus_gym_tbs, 1 + .equ mus_gym_exg, 0 + .equ mus_gym_cmp, 1 .section .rodata - .global bgm_gim + .global mus_gym .align 2 @********************** Track 1 **********************@ -bgm_gim_1: - .byte KEYSH , bgm_gim_key+0 -bgm_gim_1_B1: - .byte TEMPO , 128*bgm_gim_tbs/2 +mus_gym_1: + .byte KEYSH , mus_gym_key+0 +mus_gym_1_B1: + .byte TEMPO , 128*mus_gym_tbs/2 .byte VOICE , 56 .byte PAN , c_v+10 - .byte VOL , 80*bgm_gim_mvl/mxv + .byte VOL , 80*mus_gym_mvl/mxv .byte BEND , c_v+0 .byte N30 , En4 , v108 .byte W15 .byte MOD , 6 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 0*bgm_gim_mvl/mxv + .byte VOL , 0*mus_gym_mvl/mxv .byte W06 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N06 , Bn3 .byte W06 .byte En4 @@ -47,18 +47,18 @@ bgm_gim_1_B1: .byte W15 .byte MOD , 6 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 0*bgm_gim_mvl/mxv + .byte VOL , 0*mus_gym_mvl/mxv .byte W06 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N06 , Bn3 .byte W06 .byte Dn4 @@ -69,36 +69,36 @@ bgm_gim_1_B1: .byte MOD , 6 .byte W24 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 - .byte 0*bgm_gim_mvl/mxv + .byte 0*mus_gym_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 80*bgm_gim_mvl/mxv + .byte VOL , 80*mus_gym_mvl/mxv .byte N24 , Ds4 .byte W24 .byte N66 , En4 .byte W24 .byte MOD , 6 .byte W30 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 0*bgm_gim_mvl/mxv + .byte VOL , 0*mus_gym_mvl/mxv .byte W06 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N06 , Bn3 .byte W06 .byte N18 , En4 @@ -111,34 +111,34 @@ bgm_gim_1_B1: .byte W18 .byte MOD , 6 .byte W36 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 0*bgm_gim_mvl/mxv + .byte VOL , 0*mus_gym_mvl/mxv .byte W06 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N66 , En4 .byte W30 .byte MOD , 6 .byte W24 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 0*bgm_gim_mvl/mxv + .byte VOL , 0*mus_gym_mvl/mxv .byte W06 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N06 , Bn3 .byte W06 .byte N18 , En4 @@ -155,34 +155,34 @@ bgm_gim_1_B1: .byte MOD , 6 .byte W24 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 0*bgm_gim_mvl/mxv + .byte VOL , 0*mus_gym_mvl/mxv .byte W06 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N66 , Gs4 .byte W30 .byte MOD , 6 .byte W24 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 0*bgm_gim_mvl/mxv + .byte VOL , 0*mus_gym_mvl/mxv .byte W06 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N06 , Fs4 .byte W06 .byte N18 , Gs4 @@ -209,18 +209,18 @@ bgm_gim_1_B1: .byte W24 .byte MOD , 6 .byte W30 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 - .byte 46*bgm_gim_mvl/mxv + .byte 46*mus_gym_mvl/mxv .byte W03 - .byte 26*bgm_gim_mvl/mxv + .byte 26*mus_gym_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 0*bgm_gim_mvl/mxv + .byte VOL , 0*mus_gym_mvl/mxv .byte W06 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N06 , Fs4 .byte W06 .byte N18 , Gs4 @@ -320,15 +320,15 @@ bgm_gim_1_B1: .byte N24 , Fs5 .byte W24 .byte GOTO - .word bgm_gim_1_B1 + .word mus_gym_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_gim_2: - .byte VOL , 80*bgm_gim_mvl/mxv - .byte KEYSH , bgm_gim_key+0 -bgm_gim_2_B1: +mus_gym_2: + .byte VOL , 80*mus_gym_mvl/mxv + .byte KEYSH , mus_gym_key+0 +mus_gym_2_B1: .byte VOICE , 87 .byte N12 , En2 , v080 .byte W12 @@ -374,7 +374,7 @@ bgm_gim_2_B1: .byte W06 .byte N21 .byte W24 -bgm_gim_2_000: +mus_gym_2_000: .byte N06 , En1 , v080 .byte W18 .byte N06 @@ -388,7 +388,7 @@ bgm_gim_2_000: .byte N18 .byte W18 .byte PEND -bgm_gim_2_001: +mus_gym_2_001: .byte N06 , Dn1 , v080 .byte W18 .byte N06 @@ -403,7 +403,7 @@ bgm_gim_2_001: .byte W18 .byte PEND .byte PATT - .word bgm_gim_2_000 + .word mus_gym_2_000 .byte N06 , Dn1 , v080 .byte W18 .byte N06 @@ -417,11 +417,11 @@ bgm_gim_2_001: .byte N18 , Fs1 .byte W18 .byte PATT - .word bgm_gim_2_000 + .word mus_gym_2_000 .byte PATT - .word bgm_gim_2_001 + .word mus_gym_2_001 .byte PATT - .word bgm_gim_2_000 + .word mus_gym_2_000 .byte N06 , Dn1 , v080 .byte W18 .byte N06 @@ -435,9 +435,9 @@ bgm_gim_2_001: .byte N18 , An1 .byte W18 .byte PATT - .word bgm_gim_2_000 + .word mus_gym_2_000 .byte PATT - .word bgm_gim_2_001 + .word mus_gym_2_001 .byte N06 , Cs1 , v080 .byte W18 .byte N06 @@ -515,19 +515,19 @@ bgm_gim_2_001: .byte Ds2 .byte W06 .byte GOTO - .word bgm_gim_2_B1 + .word mus_gym_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_gim_3: - .byte KEYSH , bgm_gim_key+0 -bgm_gim_3_B1: +mus_gym_3: + .byte KEYSH , mus_gym_key+0 +mus_gym_3_B1: .byte VOICE , 85 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v+48 - .byte VOL , 80*bgm_gim_mvl/mxv + .byte VOL , 80*mus_gym_mvl/mxv .byte BEND , c_v+0 .byte N12 , Gs3 , v064 .byte W12 @@ -554,27 +554,27 @@ bgm_gim_3_B1: .byte N12 .byte W24 .byte VOICE , 81 - .byte VOL , 49*bgm_gim_mvl/mxv + .byte VOL , 49*mus_gym_mvl/mxv .byte N12 , Fs3 .byte W06 - .byte VOL , 52*bgm_gim_mvl/mxv + .byte VOL , 52*mus_gym_mvl/mxv .byte W03 - .byte 54*bgm_gim_mvl/mxv + .byte 54*mus_gym_mvl/mxv .byte W03 .byte VOICE , 88 - .byte VOL , 58*bgm_gim_mvl/mxv + .byte VOL , 58*mus_gym_mvl/mxv .byte N12 .byte W06 - .byte VOL , 62*bgm_gim_mvl/mxv + .byte VOL , 62*mus_gym_mvl/mxv .byte W06 - .byte 66*bgm_gim_mvl/mxv + .byte 66*mus_gym_mvl/mxv .byte N12 .byte W06 - .byte VOL , 71*bgm_gim_mvl/mxv + .byte VOL , 71*mus_gym_mvl/mxv .byte W03 - .byte 76*bgm_gim_mvl/mxv + .byte 76*mus_gym_mvl/mxv .byte W03 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N12 .byte W12 .byte VOICE , 81 @@ -598,7 +598,7 @@ bgm_gim_3_B1: .byte W06 .byte N18 , Bn2 .byte W18 -bgm_gim_3_000: +mus_gym_3_000: .byte N12 , Dn3 , v052 .byte W12 .byte VOICE , 88 @@ -620,7 +620,7 @@ bgm_gim_3_000: .byte N18 , Fs3 .byte W18 .byte PEND -bgm_gim_3_001: +mus_gym_3_001: .byte N12 , En3 , v052 .byte W12 .byte VOICE , 88 @@ -643,9 +643,9 @@ bgm_gim_3_001: .byte W18 .byte PEND .byte PATT - .word bgm_gim_3_000 + .word mus_gym_3_000 .byte PATT - .word bgm_gim_3_001 + .word mus_gym_3_001 .byte N12 , Dn3 , v052 .byte W12 .byte VOICE , 88 @@ -665,7 +665,7 @@ bgm_gim_3_001: .byte N24 .byte W24 .byte PATT - .word bgm_gim_3_001 + .word mus_gym_3_001 .byte N12 , Dn3 , v052 .byte W12 .byte VOICE , 88 @@ -696,65 +696,65 @@ bgm_gim_3_001: .byte W18 .byte N12 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 49*bgm_gim_mvl/mxv + .byte 49*mus_gym_mvl/mxv .byte W05 - .byte 52*bgm_gim_mvl/mxv + .byte 52*mus_gym_mvl/mxv .byte W01 .byte VOICE , 89 .byte N12 .byte W04 - .byte VOL , 56*bgm_gim_mvl/mxv + .byte VOL , 56*mus_gym_mvl/mxv .byte W02 .byte MOD , 6 .byte W03 - .byte VOL , 59*bgm_gim_mvl/mxv + .byte VOL , 59*mus_gym_mvl/mxv .byte W03 .byte N12 .byte W02 - .byte VOL , 62*bgm_gim_mvl/mxv + .byte VOL , 62*mus_gym_mvl/mxv .byte W05 - .byte 66*bgm_gim_mvl/mxv + .byte 66*mus_gym_mvl/mxv .byte W05 - .byte 69*bgm_gim_mvl/mxv + .byte 69*mus_gym_mvl/mxv .byte N12 .byte W05 - .byte VOL , 73*bgm_gim_mvl/mxv + .byte VOL , 73*mus_gym_mvl/mxv .byte W07 .byte VOICE , 85 - .byte VOL , 80*bgm_gim_mvl/mxv + .byte VOL , 80*mus_gym_mvl/mxv .byte MOD , 0 .byte N12 , Fs3 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 49*bgm_gim_mvl/mxv + .byte 49*mus_gym_mvl/mxv .byte W05 - .byte 52*bgm_gim_mvl/mxv + .byte 52*mus_gym_mvl/mxv .byte W01 .byte VOICE , 89 .byte N12 .byte W03 .byte MOD , 6 .byte W01 - .byte VOL , 56*bgm_gim_mvl/mxv + .byte VOL , 56*mus_gym_mvl/mxv .byte W05 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W03 .byte N12 .byte W02 - .byte VOL , 62*bgm_gim_mvl/mxv + .byte VOL , 62*mus_gym_mvl/mxv .byte W05 - .byte 66*bgm_gim_mvl/mxv + .byte 66*mus_gym_mvl/mxv .byte W05 - .byte 69*bgm_gim_mvl/mxv + .byte 69*mus_gym_mvl/mxv .byte N12 .byte W05 - .byte VOL , 73*bgm_gim_mvl/mxv + .byte VOL , 73*mus_gym_mvl/mxv .byte W07 .byte VOICE , 85 - .byte VOL , 79*bgm_gim_mvl/mxv + .byte VOL , 79*mus_gym_mvl/mxv .byte MOD , 0 .byte PAN , c_v+47 .byte N12 , Bn3 , v060 @@ -859,19 +859,19 @@ bgm_gim_3_001: .byte Bn4 .byte W06 .byte GOTO - .word bgm_gim_3_B1 + .word mus_gym_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_gim_4: - .byte KEYSH , bgm_gim_key+0 -bgm_gim_4_B1: +mus_gym_4: + .byte KEYSH , mus_gym_key+0 +mus_gym_4_B1: .byte VOICE , 84 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v-48 - .byte VOL , 80*bgm_gim_mvl/mxv + .byte VOL , 80*mus_gym_mvl/mxv .byte N12 , Bn3 , v064 .byte W12 .byte N03 , Bn2 @@ -897,29 +897,29 @@ bgm_gim_4_B1: .byte N12 .byte W24 .byte VOICE , 80 - .byte VOL , 49*bgm_gim_mvl/mxv + .byte VOL , 49*mus_gym_mvl/mxv .byte N48 , An3 .byte W06 - .byte VOL , 52*bgm_gim_mvl/mxv + .byte VOL , 52*mus_gym_mvl/mxv .byte W03 .byte MOD , 6 - .byte VOL , 54*bgm_gim_mvl/mxv + .byte VOL , 54*mus_gym_mvl/mxv .byte W03 - .byte 58*bgm_gim_mvl/mxv + .byte 58*mus_gym_mvl/mxv .byte W06 - .byte 62*bgm_gim_mvl/mxv + .byte 62*mus_gym_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 66*bgm_gim_mvl/mxv + .byte VOL , 66*mus_gym_mvl/mxv .byte W06 - .byte 71*bgm_gim_mvl/mxv + .byte 71*mus_gym_mvl/mxv .byte W03 - .byte 76*bgm_gim_mvl/mxv + .byte 76*mus_gym_mvl/mxv .byte W03 .byte MOD , 6 - .byte VOL , 80*bgm_gim_mvl/mxv + .byte VOL , 80*mus_gym_mvl/mxv .byte W12 -bgm_gim_4_000: +mus_gym_4_000: .byte N48 , Gs3 , v052 .byte W24 .byte MOD , 3 @@ -934,7 +934,7 @@ bgm_gim_4_000: .byte N18 , En3 .byte W18 .byte PEND -bgm_gim_4_001: +mus_gym_4_001: .byte N48 , Fs3 , v052 .byte W24 .byte MOD , 3 @@ -950,11 +950,11 @@ bgm_gim_4_001: .byte W18 .byte PEND .byte PATT - .word bgm_gim_4_000 + .word mus_gym_4_000 .byte PATT - .word bgm_gim_4_001 + .word mus_gym_4_001 .byte PATT - .word bgm_gim_4_000 + .word mus_gym_4_000 .byte N48 , Fs3 , v052 .byte W24 .byte MOD , 3 @@ -967,7 +967,7 @@ bgm_gim_4_001: .byte N24 .byte W24 .byte PATT - .word bgm_gim_4_000 + .word mus_gym_4_000 .byte N48 , Fs3 , v052 .byte W24 .byte MOD , 3 @@ -988,48 +988,48 @@ bgm_gim_4_001: .byte W18 .byte N48 , Gn3 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 49*bgm_gim_mvl/mxv + .byte 49*mus_gym_mvl/mxv .byte W05 - .byte 52*bgm_gim_mvl/mxv + .byte 52*mus_gym_mvl/mxv .byte W05 - .byte 56*bgm_gim_mvl/mxv + .byte 56*mus_gym_mvl/mxv .byte W05 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W05 - .byte 62*bgm_gim_mvl/mxv + .byte 62*mus_gym_mvl/mxv .byte W05 - .byte 66*bgm_gim_mvl/mxv + .byte 66*mus_gym_mvl/mxv .byte W05 - .byte 69*bgm_gim_mvl/mxv + .byte 69*mus_gym_mvl/mxv .byte W05 - .byte 73*bgm_gim_mvl/mxv + .byte 73*mus_gym_mvl/mxv .byte W07 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N48 , An3 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 49*bgm_gim_mvl/mxv + .byte 49*mus_gym_mvl/mxv .byte W05 - .byte 52*bgm_gim_mvl/mxv + .byte 52*mus_gym_mvl/mxv .byte W05 - .byte 56*bgm_gim_mvl/mxv + .byte 56*mus_gym_mvl/mxv .byte W05 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W05 - .byte 62*bgm_gim_mvl/mxv + .byte 62*mus_gym_mvl/mxv .byte W05 - .byte 66*bgm_gim_mvl/mxv + .byte 66*mus_gym_mvl/mxv .byte W05 - .byte 69*bgm_gim_mvl/mxv + .byte 69*mus_gym_mvl/mxv .byte W05 - .byte 73*bgm_gim_mvl/mxv + .byte 73*mus_gym_mvl/mxv .byte W07 .byte VOICE , 84 .byte PAN , c_v+0 - .byte VOL , 79*bgm_gim_mvl/mxv + .byte VOL , 79*mus_gym_mvl/mxv .byte N12 , En4 , v060 .byte W12 .byte N03 , En3 @@ -1155,15 +1155,15 @@ bgm_gim_4_001: .byte Ds5 .byte W06 .byte GOTO - .word bgm_gim_4_B1 + .word mus_gym_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_gim_5: - .byte VOL , 80*bgm_gim_mvl/mxv - .byte KEYSH , bgm_gim_key+0 -bgm_gim_5_B1: +mus_gym_5: + .byte VOL , 80*mus_gym_mvl/mxv + .byte KEYSH , mus_gym_key+0 +mus_gym_5_B1: .byte PAN , c_v+15 .byte W96 .byte W96 @@ -1326,60 +1326,60 @@ bgm_gim_5_B1: .byte W18 .byte N48 , Cn5 , v112 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 49*bgm_gim_mvl/mxv + .byte 49*mus_gym_mvl/mxv .byte W05 - .byte 52*bgm_gim_mvl/mxv + .byte 52*mus_gym_mvl/mxv .byte W05 - .byte 56*bgm_gim_mvl/mxv + .byte 56*mus_gym_mvl/mxv .byte W05 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W05 - .byte 62*bgm_gim_mvl/mxv + .byte 62*mus_gym_mvl/mxv .byte W05 - .byte 66*bgm_gim_mvl/mxv + .byte 66*mus_gym_mvl/mxv .byte W05 - .byte 69*bgm_gim_mvl/mxv + .byte 69*mus_gym_mvl/mxv .byte W05 - .byte 73*bgm_gim_mvl/mxv + .byte 73*mus_gym_mvl/mxv .byte W07 - .byte 80*bgm_gim_mvl/mxv + .byte 80*mus_gym_mvl/mxv .byte N48 , Dn5 .byte W03 - .byte VOL , 70*bgm_gim_mvl/mxv + .byte VOL , 70*mus_gym_mvl/mxv .byte W03 - .byte 49*bgm_gim_mvl/mxv + .byte 49*mus_gym_mvl/mxv .byte W05 - .byte 52*bgm_gim_mvl/mxv + .byte 52*mus_gym_mvl/mxv .byte W05 - .byte 56*bgm_gim_mvl/mxv + .byte 56*mus_gym_mvl/mxv .byte W05 - .byte 59*bgm_gim_mvl/mxv + .byte 59*mus_gym_mvl/mxv .byte W05 - .byte 62*bgm_gim_mvl/mxv + .byte 62*mus_gym_mvl/mxv .byte W05 - .byte 66*bgm_gim_mvl/mxv + .byte 66*mus_gym_mvl/mxv .byte W05 - .byte 69*bgm_gim_mvl/mxv + .byte 69*mus_gym_mvl/mxv .byte W05 - .byte 73*bgm_gim_mvl/mxv + .byte 73*mus_gym_mvl/mxv .byte W07 - .byte 79*bgm_gim_mvl/mxv + .byte 79*mus_gym_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_gim_5_B1 + .word mus_gym_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_gim_6: - .byte VOL , 80*bgm_gim_mvl/mxv - .byte KEYSH , bgm_gim_key+0 -bgm_gim_6_B1: +mus_gym_6: + .byte VOL , 80*mus_gym_mvl/mxv + .byte KEYSH , mus_gym_key+0 +mus_gym_6_B1: .byte VOICE , 47 .byte PAN , c_v-17 .byte BEND , c_v+0 @@ -1413,7 +1413,7 @@ bgm_gim_6_B1: .byte W06 .byte N12 , Bn1 .byte W18 -bgm_gim_6_000: +mus_gym_6_000: .byte N12 , Dn2 , v100 .byte W48 .byte N12 @@ -1423,7 +1423,7 @@ bgm_gim_6_000: .byte N12 , An1 .byte W18 .byte PEND -bgm_gim_6_001: +mus_gym_6_001: .byte N12 , En2 , v100 .byte W72 .byte N06 , En2 , v088 @@ -1432,13 +1432,13 @@ bgm_gim_6_001: .byte W18 .byte PEND .byte PATT - .word bgm_gim_6_000 + .word mus_gym_6_000 .byte PATT - .word bgm_gim_6_001 + .word mus_gym_6_001 .byte PATT - .word bgm_gim_6_000 + .word mus_gym_6_000 .byte PATT - .word bgm_gim_6_001 + .word mus_gym_6_001 .byte N12 , Dn2 , v100 .byte W48 .byte Dn2 , v088 @@ -1514,16 +1514,16 @@ bgm_gim_6_001: .byte Bn1 , v116 .byte W06 .byte GOTO - .word bgm_gim_6_B1 + .word mus_gym_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_gim_7: - .byte KEYSH , bgm_gim_key+0 -bgm_gim_7_B1: +mus_gym_7: + .byte KEYSH , mus_gym_key+0 +mus_gym_7_B1: .byte VOICE , 0 - .byte VOL , 80*bgm_gim_mvl/mxv + .byte VOL , 80*mus_gym_mvl/mxv .byte N06 , En1 , v112 .byte N48 , Bn2 , v092 .byte W12 @@ -1618,7 +1618,7 @@ bgm_gim_7_B1: .byte W03 .byte N03 .byte W03 -bgm_gim_7_000: +mus_gym_7_000: .byte N06 , En1 , v112 .byte W18 .byte En1 , v080 @@ -1650,7 +1650,7 @@ bgm_gim_7_000: .byte N03 .byte W03 .byte PEND -bgm_gim_7_001: +mus_gym_7_001: .byte N06 , En1 , v112 .byte W18 .byte En1 , v080 @@ -1677,15 +1677,15 @@ bgm_gim_7_001: .byte W03 .byte PEND .byte PATT - .word bgm_gim_7_000 + .word mus_gym_7_000 .byte PATT - .word bgm_gim_7_001 + .word mus_gym_7_001 .byte PATT - .word bgm_gim_7_000 + .word mus_gym_7_000 .byte PATT - .word bgm_gim_7_001 + .word mus_gym_7_001 .byte PATT - .word bgm_gim_7_000 + .word mus_gym_7_000 .byte N48 , Bn2 , v092 .byte W96 .byte W96 @@ -1859,26 +1859,26 @@ bgm_gim_7_001: .byte En1 , v104 .byte W03 .byte GOTO - .word bgm_gim_7_B1 + .word mus_gym_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_gim: +mus_gym: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_gim_pri @ Priority - .byte bgm_gim_rev @ Reverb. + .byte mus_gym_pri @ Priority + .byte mus_gym_rev @ Reverb. - .word bgm_gim_grp + .word mus_gym_grp - .word bgm_gim_1 - .word bgm_gim_2 - .word bgm_gim_3 - .word bgm_gim_4 - .word bgm_gim_5 - .word bgm_gim_6 - .word bgm_gim_7 + .word mus_gym_1 + .word mus_gym_2 + .word mus_gym_3 + .word mus_gym_4 + .word mus_gym_5 + .word mus_gym_6 + .word mus_gym_7 .end diff --git a/sound/songs/bgm_dendou.s b/sound/songs/mus_hall_of_fame.s index 8aed5918d..7a0d44c9c 100644 --- a/sound/songs/bgm_dendou.s +++ b/sound/songs/mus_hall_of_fame.s @@ -1,33 +1,33 @@ .include "MPlayDef.s" - .equ bgm_dendou_grp, voicegroup079 - .equ bgm_dendou_pri, 0 - .equ bgm_dendou_rev, reverb_set+50 - .equ bgm_dendou_mvl, 127 - .equ bgm_dendou_key, 0 - .equ bgm_dendou_tbs, 1 - .equ bgm_dendou_exg, 0 - .equ bgm_dendou_cmp, 1 + .equ mus_hall_of_fame_grp, voicegroup079 + .equ mus_hall_of_fame_pri, 0 + .equ mus_hall_of_fame_rev, reverb_set+50 + .equ mus_hall_of_fame_mvl, 127 + .equ mus_hall_of_fame_key, 0 + .equ mus_hall_of_fame_tbs, 1 + .equ mus_hall_of_fame_exg, 0 + .equ mus_hall_of_fame_cmp, 1 .section .rodata - .global bgm_dendou + .global mus_hall_of_fame .align 2 @********************** Track 1 **********************@ -bgm_dendou_1: - .byte KEYSH , bgm_dendou_key+0 - .byte TEMPO , 122*bgm_dendou_tbs/2 +mus_hall_of_fame_1: + .byte KEYSH , mus_hall_of_fame_key+0 + .byte TEMPO , 122*mus_hall_of_fame_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 30*bgm_dendou_mvl/mxv + .byte VOL , 30*mus_hall_of_fame_mvl/mxv .byte W12 -bgm_dendou_1_B1: +mus_hall_of_fame_1_B1: .byte W96 .byte W96 -bgm_dendou_1_000: +mus_hall_of_fame_1_000: .byte N02 , Gs5 , v112 .byte W08 .byte Gs5 , v084 @@ -52,51 +52,51 @@ bgm_dendou_1_000: .byte W08 .byte PEND .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte PATT - .word bgm_dendou_1_000 + .word mus_hall_of_fame_1_000 .byte GOTO - .word bgm_dendou_1_B1 + .word mus_hall_of_fame_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_dendou_2: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_2: + .byte KEYSH , mus_hall_of_fame_key+0 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 49*bgm_dendou_mvl/mxv + .byte VOL , 49*mus_hall_of_fame_mvl/mxv .byte W12 -bgm_dendou_2_B1: +mus_hall_of_fame_2_B1: .byte VOICE , 56 - .byte VOL , 78*bgm_dendou_mvl/mxv + .byte VOL , 78*mus_hall_of_fame_mvl/mxv .byte N04 , An3 , v116 .byte W08 .byte Gs3 @@ -145,7 +145,7 @@ bgm_dendou_2_B1: .byte W08 .byte Gs3 .byte W08 - .byte VOL , 49*bgm_dendou_mvl/mxv + .byte VOL , 49*mus_hall_of_fame_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -160,7 +160,7 @@ bgm_dendou_2_B1: .byte W92 .byte VOICE , 14 .byte W04 - .byte VOL , 57*bgm_dendou_mvl/mxv + .byte VOL , 57*mus_hall_of_fame_mvl/mxv .byte N40 , An4 , v112 .byte W48 .byte Fs4 @@ -182,22 +182,22 @@ bgm_dendou_2_B1: .byte Gn4 .byte W24 .byte GOTO - .word bgm_dendou_2_B1 - .byte VOL , 47*bgm_dendou_mvl/mxv + .word mus_hall_of_fame_2_B1 + .byte VOL , 47*mus_hall_of_fame_mvl/mxv .byte FINE @********************** Track 3 **********************@ -bgm_dendou_3: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_3: + .byte KEYSH , mus_hall_of_fame_key+0 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+14 - .byte VOL , 40*bgm_dendou_mvl/mxv + .byte VOL , 40*mus_hall_of_fame_mvl/mxv .byte W12 -bgm_dendou_3_B1: +mus_hall_of_fame_3_B1: .byte VOICE , 60 .byte W96 .byte W96 @@ -307,25 +307,25 @@ bgm_dendou_3_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_dendou_3_B1 + .word mus_hall_of_fame_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_dendou_4: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_4: + .byte KEYSH , mus_hall_of_fame_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-13 - .byte VOL , 72*bgm_dendou_mvl/mxv + .byte VOL , 72*mus_hall_of_fame_mvl/mxv .byte N04 , An2 , v112 .byte W04 .byte N04 .byte W04 .byte N04 .byte W04 -bgm_dendou_4_B1: +mus_hall_of_fame_4_B1: .byte N12 , En2 , v112 .byte W32 .byte N04 , An2 @@ -370,7 +370,7 @@ bgm_dendou_4_B1: .byte W08 .byte N08 .byte W08 -bgm_dendou_4_000: +mus_hall_of_fame_4_000: .byte N08 , Dn2 , v112 .byte W16 .byte N04 , An1 @@ -384,7 +384,7 @@ bgm_dendou_4_000: .byte An3 , v112 .byte W04 .byte PEND -bgm_dendou_4_001: +mus_hall_of_fame_4_001: .byte N24 , An2 , v112 .byte W24 .byte N04 , Dn2 , v060 @@ -447,9 +447,9 @@ bgm_dendou_4_001: .byte N08 .byte W08 .byte PATT - .word bgm_dendou_4_000 + .word mus_hall_of_fame_4_000 .byte PATT - .word bgm_dendou_4_001 + .word mus_hall_of_fame_4_001 .byte N06 , Dn3 , v112 .byte W08 .byte N08 , Dn2 @@ -482,7 +482,7 @@ bgm_dendou_4_001: .byte W04 .byte N04 .byte W04 -bgm_dendou_4_002: +mus_hall_of_fame_4_002: .byte N12 , Cn2 , v112 .byte W56 .byte N04 , Cn2 , v108 @@ -494,7 +494,7 @@ bgm_dendou_4_002: .byte N04 , Gn1 , v080 .byte W08 .byte PEND -bgm_dendou_4_003: +mus_hall_of_fame_4_003: .byte N12 , Bn1 , v112 .byte W64 .byte N04 , Fs1 , v084 @@ -538,9 +538,9 @@ bgm_dendou_4_003: .byte N04 .byte W04 .byte PATT - .word bgm_dendou_4_002 + .word mus_hall_of_fame_4_002 .byte PATT - .word bgm_dendou_4_003 + .word mus_hall_of_fame_4_003 .byte W08 .byte N04 , Fn2 , v084 .byte W08 @@ -565,19 +565,19 @@ bgm_dendou_4_003: .byte Cn2 , v112 .byte W04 .byte GOTO - .word bgm_dendou_4_B1 + .word mus_hall_of_fame_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_dendou_5: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_5: + .byte KEYSH , mus_hall_of_fame_key+0 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 60*bgm_dendou_mvl/mxv + .byte VOL , 60*mus_hall_of_fame_mvl/mxv .byte PAN , c_v+0 .byte W12 -bgm_dendou_5_B1: +mus_hall_of_fame_5_B1: .byte VOICE , 48 .byte N08 , An4 , v112 .byte W08 @@ -635,7 +635,7 @@ bgm_dendou_5_B1: .byte W06 .byte N02 , Ds4 , v096 .byte W02 - .byte VOL , 63*bgm_dendou_mvl/mxv + .byte VOL , 63*mus_hall_of_fame_mvl/mxv .byte N08 , Dn4 , v112 .byte W08 .byte N04 , An3 @@ -646,18 +646,18 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 54*bgm_dendou_mvl/mxv + .byte VOL , 54*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 49*bgm_dendou_mvl/mxv + .byte 49*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 40*bgm_dendou_mvl/mxv + .byte 40*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 28*bgm_dendou_mvl/mxv + .byte 28*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 20*bgm_dendou_mvl/mxv + .byte 20*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 63*bgm_dendou_mvl/mxv + .byte VOL , 63*mus_hall_of_fame_mvl/mxv .byte W24 .byte N08 , Dn4 .byte W08 @@ -669,18 +669,18 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 54*bgm_dendou_mvl/mxv + .byte VOL , 54*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 49*bgm_dendou_mvl/mxv + .byte 49*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 40*bgm_dendou_mvl/mxv + .byte 40*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 28*bgm_dendou_mvl/mxv + .byte 28*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 20*bgm_dendou_mvl/mxv + .byte 20*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 63*bgm_dendou_mvl/mxv + .byte VOL , 63*mus_hall_of_fame_mvl/mxv .byte N04 , Gn4 .byte W08 .byte Fs4 @@ -697,18 +697,18 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 54*bgm_dendou_mvl/mxv + .byte VOL , 54*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 49*bgm_dendou_mvl/mxv + .byte 49*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 40*bgm_dendou_mvl/mxv + .byte 40*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 28*bgm_dendou_mvl/mxv + .byte 28*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 20*bgm_dendou_mvl/mxv + .byte 20*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 63*bgm_dendou_mvl/mxv + .byte VOL , 63*mus_hall_of_fame_mvl/mxv .byte W22 .byte N02 , Cs4 , v096 .byte W02 @@ -722,24 +722,24 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 54*bgm_dendou_mvl/mxv + .byte VOL , 54*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 49*bgm_dendou_mvl/mxv + .byte 49*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 40*bgm_dendou_mvl/mxv + .byte 40*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 28*bgm_dendou_mvl/mxv + .byte 28*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 20*bgm_dendou_mvl/mxv + .byte 20*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 63*bgm_dendou_mvl/mxv + .byte VOL , 63*mus_hall_of_fame_mvl/mxv .byte N04 , En4 .byte W16 .byte VOICE , 56 .byte N04 , Cn4 .byte W04 - .byte VOL , 76*bgm_dendou_mvl/mxv + .byte VOL , 76*mus_hall_of_fame_mvl/mxv .byte W02 .byte N02 , Ds5 , v096 .byte W02 @@ -753,18 +753,18 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 68*bgm_dendou_mvl/mxv + .byte VOL , 68*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 62*bgm_dendou_mvl/mxv + .byte 62*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 49*bgm_dendou_mvl/mxv + .byte 49*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 35*bgm_dendou_mvl/mxv + .byte 35*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 24*bgm_dendou_mvl/mxv + .byte 24*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 78*bgm_dendou_mvl/mxv + .byte VOL , 78*mus_hall_of_fame_mvl/mxv .byte W24 .byte N08 , Dn5 .byte W08 @@ -776,18 +776,18 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 68*bgm_dendou_mvl/mxv + .byte VOL , 68*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 62*bgm_dendou_mvl/mxv + .byte 62*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 49*bgm_dendou_mvl/mxv + .byte 49*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 35*bgm_dendou_mvl/mxv + .byte 35*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 24*bgm_dendou_mvl/mxv + .byte 24*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 78*bgm_dendou_mvl/mxv + .byte VOL , 78*mus_hall_of_fame_mvl/mxv .byte N04 , Gn5 .byte W08 .byte Fs5 @@ -804,18 +804,18 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 68*bgm_dendou_mvl/mxv + .byte VOL , 68*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 62*bgm_dendou_mvl/mxv + .byte 62*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 49*bgm_dendou_mvl/mxv + .byte 49*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 35*bgm_dendou_mvl/mxv + .byte 35*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 24*bgm_dendou_mvl/mxv + .byte 24*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 78*bgm_dendou_mvl/mxv + .byte VOL , 78*mus_hall_of_fame_mvl/mxv .byte W24 .byte N04 , Cn5 .byte W08 @@ -843,7 +843,7 @@ bgm_dendou_5_B1: .byte W04 .byte VOICE , 24 .byte W04 - .byte VOL , 68*bgm_dendou_mvl/mxv + .byte VOL , 68*mus_hall_of_fame_mvl/mxv .byte N04 , Fs4 .byte W08 .byte Gn4 @@ -854,18 +854,18 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 68*bgm_dendou_mvl/mxv + .byte VOL , 68*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 62*bgm_dendou_mvl/mxv + .byte 62*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 49*bgm_dendou_mvl/mxv + .byte 49*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 35*bgm_dendou_mvl/mxv + .byte 35*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 24*bgm_dendou_mvl/mxv + .byte 24*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 69*bgm_dendou_mvl/mxv + .byte VOL , 69*mus_hall_of_fame_mvl/mxv .byte N16 , Fs4 .byte W16 .byte N04 , Gn4 @@ -927,7 +927,7 @@ bgm_dendou_5_B1: .byte Cn5 .byte W04 .byte VOICE , 48 - .byte VOL , 54*bgm_dendou_mvl/mxv + .byte VOL , 54*mus_hall_of_fame_mvl/mxv .byte N04 , Fs4 .byte W08 .byte Gn4 @@ -966,18 +966,18 @@ bgm_dendou_5_B1: .byte W24 .byte MOD , 7 .byte W04 - .byte VOL , 47*bgm_dendou_mvl/mxv + .byte VOL , 47*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 44*bgm_dendou_mvl/mxv + .byte 44*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 37*bgm_dendou_mvl/mxv + .byte 37*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 28*bgm_dendou_mvl/mxv + .byte 28*mus_hall_of_fame_mvl/mxv .byte W04 - .byte 24*bgm_dendou_mvl/mxv + .byte 24*mus_hall_of_fame_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 54*bgm_dendou_mvl/mxv + .byte VOL , 54*mus_hall_of_fame_mvl/mxv .byte N08 , En5 .byte W24 .byte N04 , Fn5 @@ -1005,21 +1005,21 @@ bgm_dendou_5_B1: .byte An5 .byte W08 .byte GOTO - .word bgm_dendou_5_B1 + .word mus_hall_of_fame_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_dendou_6: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_6: + .byte KEYSH , mus_hall_of_fame_key+0 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-61 - .byte VOL , 33*bgm_dendou_mvl/mxv + .byte VOL , 33*mus_hall_of_fame_mvl/mxv .byte W12 -bgm_dendou_6_B1: +mus_hall_of_fame_6_B1: .byte VOICE , 80 .byte N08 , An3 , v112 .byte W08 @@ -1229,7 +1229,7 @@ bgm_dendou_6_B1: .byte W08 .byte Cn4 .byte W08 -bgm_dendou_6_000: +mus_hall_of_fame_6_000: .byte N04 , Dn6 , v112 .byte W08 .byte N04 @@ -1264,11 +1264,11 @@ bgm_dendou_6_000: .byte W08 .byte PEND .byte PATT - .word bgm_dendou_6_000 + .word mus_hall_of_fame_6_000 .byte PATT - .word bgm_dendou_6_000 + .word mus_hall_of_fame_6_000 .byte PATT - .word bgm_dendou_6_000 + .word mus_hall_of_fame_6_000 .byte N04 , An5 , v112 .byte W08 .byte Gn5 @@ -1404,23 +1404,23 @@ bgm_dendou_6_000: .byte Gn4 .byte W04 .byte GOTO - .word bgm_dendou_6_B1 + .word mus_hall_of_fame_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_dendou_7: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_7: + .byte KEYSH , mus_hall_of_fame_key+0 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 33*bgm_dendou_mvl/mxv + .byte VOL , 33*mus_hall_of_fame_mvl/mxv .byte W12 -bgm_dendou_7_B1: +mus_hall_of_fame_7_B1: .byte VOICE , 81 - .byte VOL , 36*bgm_dendou_mvl/mxv + .byte VOL , 36*mus_hall_of_fame_mvl/mxv .byte PAN , c_v+63 .byte N08 , En4 , v112 .byte W08 @@ -1632,7 +1632,7 @@ bgm_dendou_7_B1: .byte W04 .byte PAN , c_v+0 .byte W04 - .byte VOL , 50*bgm_dendou_mvl/mxv + .byte VOL , 50*mus_hall_of_fame_mvl/mxv .byte N16 , Dn2 .byte W24 .byte Dn2 , v088 @@ -1647,7 +1647,7 @@ bgm_dendou_7_B1: .byte W16 .byte N04 , An1 , v112 .byte W08 -bgm_dendou_7_000: +mus_hall_of_fame_7_000: .byte N16 , Cn2 , v112 .byte W24 .byte N08 , Cn2 , v088 @@ -1663,7 +1663,7 @@ bgm_dendou_7_000: .byte N04 , Gn1 , v112 .byte W08 .byte PEND -bgm_dendou_7_001: +mus_hall_of_fame_7_001: .byte N16 , Bn1 , v112 .byte W24 .byte N08 , Bn1 , v088 @@ -1679,7 +1679,7 @@ bgm_dendou_7_001: .byte N04 , Fs1 , v112 .byte W08 .byte PEND -bgm_dendou_7_002: +mus_hall_of_fame_7_002: .byte W08 .byte N04 , As1 , v112 .byte W08 @@ -1713,24 +1713,24 @@ bgm_dendou_7_002: .byte N04 , An1 , v112 .byte W08 .byte PATT - .word bgm_dendou_7_000 + .word mus_hall_of_fame_7_000 .byte PATT - .word bgm_dendou_7_001 + .word mus_hall_of_fame_7_001 .byte PATT - .word bgm_dendou_7_002 + .word mus_hall_of_fame_7_002 .byte GOTO - .word bgm_dendou_7_B1 + .word mus_hall_of_fame_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_dendou_8: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_8: + .byte KEYSH , mus_hall_of_fame_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 44*bgm_dendou_mvl/mxv + .byte VOL , 44*mus_hall_of_fame_mvl/mxv .byte W12 -bgm_dendou_8_B1: +mus_hall_of_fame_8_B1: .byte N48 , An2 , v112 .byte W48 .byte An2 , v092 @@ -1760,23 +1760,23 @@ bgm_dendou_8_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_dendou_8_B1 + .word mus_hall_of_fame_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_dendou_9: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_9: + .byte KEYSH , mus_hall_of_fame_key+0 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 50*bgm_dendou_mvl/mxv + .byte VOL , 50*mus_hall_of_fame_mvl/mxv .byte W12 -bgm_dendou_9_B1: +mus_hall_of_fame_9_B1: .byte VOICE , 82 - .byte VOL , 67*bgm_dendou_mvl/mxv + .byte VOL , 67*mus_hall_of_fame_mvl/mxv .byte N12 , An1 , v112 .byte W32 .byte N04 , An1 , v088 @@ -1805,7 +1805,7 @@ bgm_dendou_9_B1: .byte W16 .byte N04 .byte W08 -bgm_dendou_9_000: +mus_hall_of_fame_9_000: .byte N06 , Dn2 , v112 .byte W08 .byte N02 @@ -1833,7 +1833,7 @@ bgm_dendou_9_000: .byte N02 .byte W04 .byte PEND -bgm_dendou_9_001: +mus_hall_of_fame_9_001: .byte N06 , Dn2 , v112 .byte W08 .byte N02 @@ -1902,9 +1902,9 @@ bgm_dendou_9_001: .byte Dn2 .byte W08 .byte PATT - .word bgm_dendou_9_000 + .word mus_hall_of_fame_9_000 .byte PATT - .word bgm_dendou_9_001 + .word mus_hall_of_fame_9_001 .byte N06 , Dn2 , v112 .byte W08 .byte N02 @@ -1938,7 +1938,7 @@ bgm_dendou_9_001: .byte An1 .byte W32 .byte VOICE , 83 - .byte VOL , 40*bgm_dendou_mvl/mxv + .byte VOL , 40*mus_hall_of_fame_mvl/mxv .byte BEND , c_v+1 .byte N04 , Fs4 .byte W08 @@ -2065,24 +2065,24 @@ bgm_dendou_9_001: .byte An5 .byte W08 .byte GOTO - .word bgm_dendou_9_B1 + .word mus_hall_of_fame_9_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 10 **********************@ -bgm_dendou_10: - .byte KEYSH , bgm_dendou_key+0 +mus_hall_of_fame_10: + .byte KEYSH , mus_hall_of_fame_key+0 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+13 - .byte VOL , 54*bgm_dendou_mvl/mxv + .byte VOL , 54*mus_hall_of_fame_mvl/mxv .byte W12 -bgm_dendou_10_B1: +mus_hall_of_fame_10_B1: .byte VOICE , 48 .byte W96 .byte W96 -bgm_dendou_10_000: +mus_hall_of_fame_10_000: .byte N08 , Fs3 , v112 .byte W08 .byte N04 , Dn3 @@ -2093,7 +2093,7 @@ bgm_dendou_10_000: .byte W72 .byte PEND .byte PATT - .word bgm_dendou_10_000 + .word mus_hall_of_fame_10_000 .byte N08 , En3 , v112 .byte W08 .byte N04 , Cn3 @@ -2137,7 +2137,7 @@ bgm_dendou_10_000: .byte W72 .byte W92 .byte VOICE , 56 - .byte VOL , 38*bgm_dendou_mvl/mxv + .byte VOL , 38*mus_hall_of_fame_mvl/mxv .byte W04 .byte W48 .byte N04 , An3 @@ -2275,29 +2275,29 @@ bgm_dendou_10_000: .byte Cn4 .byte W24 .byte GOTO - .word bgm_dendou_10_B1 + .word mus_hall_of_fame_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_dendou: +mus_hall_of_fame: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_dendou_pri @ Priority - .byte bgm_dendou_rev @ Reverb. + .byte mus_hall_of_fame_pri @ Priority + .byte mus_hall_of_fame_rev @ Reverb. - .word bgm_dendou_grp + .word mus_hall_of_fame_grp - .word bgm_dendou_1 - .word bgm_dendou_2 - .word bgm_dendou_3 - .word bgm_dendou_4 - .word bgm_dendou_5 - .word bgm_dendou_6 - .word bgm_dendou_7 - .word bgm_dendou_8 - .word bgm_dendou_9 - .word bgm_dendou_10 + .word mus_hall_of_fame_1 + .word mus_hall_of_fame_2 + .word mus_hall_of_fame_3 + .word mus_hall_of_fame_4 + .word mus_hall_of_fame_5 + .word mus_hall_of_fame_6 + .word mus_hall_of_fame_7 + .word mus_hall_of_fame_8 + .word mus_hall_of_fame_9 + .word mus_hall_of_fame_10 .end diff --git a/sound/songs/bgm_eikou_r.s b/sound/songs/mus_hall_of_fame_room.s index 0d5718394..4cae7a93b 100644 --- a/sound/songs/bgm_eikou_r.s +++ b/sound/songs/mus_hall_of_fame_room.s @@ -1,30 +1,30 @@ .include "MPlayDef.s" - .equ bgm_eikou_r_grp, voicegroup090 - .equ bgm_eikou_r_pri, 0 - .equ bgm_eikou_r_rev, reverb_set+50 - .equ bgm_eikou_r_mvl, 127 - .equ bgm_eikou_r_key, 0 - .equ bgm_eikou_r_tbs, 1 - .equ bgm_eikou_r_exg, 0 - .equ bgm_eikou_r_cmp, 1 + .equ mus_hall_of_fame_room_grp, voicegroup090 + .equ mus_hall_of_fame_room_pri, 0 + .equ mus_hall_of_fame_room_rev, reverb_set+50 + .equ mus_hall_of_fame_room_mvl, 127 + .equ mus_hall_of_fame_room_key, 0 + .equ mus_hall_of_fame_room_tbs, 1 + .equ mus_hall_of_fame_room_exg, 0 + .equ mus_hall_of_fame_room_cmp, 1 .section .rodata - .global bgm_eikou_r + .global mus_hall_of_fame_room .align 2 @********************** Track 1 **********************@ -bgm_eikou_r_1: - .byte KEYSH , bgm_eikou_r_key+0 - .byte TEMPO , 114*bgm_eikou_r_tbs/2 +mus_hall_of_fame_room_1: + .byte KEYSH , mus_hall_of_fame_room_key+0 + .byte TEMPO , 114*mus_hall_of_fame_room_tbs/2 .byte VOICE , 46 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 47*bgm_eikou_r_mvl/mxv + .byte VOL , 47*mus_hall_of_fame_room_mvl/mxv .byte PAN , c_v-32 .byte W24 -bgm_eikou_r_1_B1: +mus_hall_of_fame_room_1_B1: .byte PAN , c_v-42 .byte N04 , As3 , v112 .byte W04 @@ -853,18 +853,18 @@ bgm_eikou_r_1_B1: .byte En4 .byte W04 .byte GOTO - .word bgm_eikou_r_1_B1 + .word mus_hall_of_fame_room_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_eikou_r_2: - .byte KEYSH , bgm_eikou_r_key+0 +mus_hall_of_fame_room_2: + .byte KEYSH , mus_hall_of_fame_room_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+11 - .byte VOL , 31*bgm_eikou_r_mvl/mxv + .byte VOL , 31*mus_hall_of_fame_room_mvl/mxv .byte N04 , En3 , v112 .byte W04 .byte Fs3 @@ -877,7 +877,7 @@ bgm_eikou_r_2: .byte W04 .byte Cs4 .byte W04 -bgm_eikou_r_2_B1: +mus_hall_of_fame_room_2_B1: .byte N96 , Dn4 , v112 .byte W96 .byte Cs4 @@ -913,23 +913,23 @@ bgm_eikou_r_2_B1: .byte W96 .byte EOT .byte GOTO - .word bgm_eikou_r_2_B1 + .word mus_hall_of_fame_room_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_eikou_r_3: - .byte KEYSH , bgm_eikou_r_key+0 +mus_hall_of_fame_room_3: + .byte KEYSH , mus_hall_of_fame_room_key+0 .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 67*bgm_eikou_r_mvl/mxv + .byte VOL , 67*mus_hall_of_fame_room_mvl/mxv .byte W24 -bgm_eikou_r_3_B1: -bgm_eikou_r_3_000: +mus_hall_of_fame_room_3_B1: +mus_hall_of_fame_room_3_000: .byte N04 , Dn1 , v112 .byte W24 .byte N04 @@ -968,7 +968,7 @@ bgm_eikou_r_3_000: .byte N04 .byte W08 .byte PATT - .word bgm_eikou_r_3_000 + .word mus_hall_of_fame_room_3_000 .byte N04 , Dn1 , v112 .byte W24 .byte N04 @@ -990,11 +990,11 @@ bgm_eikou_r_3_000: .byte Dn1 .byte W08 .byte PATT - .word bgm_eikou_r_3_000 + .word mus_hall_of_fame_room_3_000 .byte PATT - .word bgm_eikou_r_3_000 + .word mus_hall_of_fame_room_3_000 .byte PATT - .word bgm_eikou_r_3_000 + .word mus_hall_of_fame_room_3_000 .byte N08 , Dn1 , v112 .byte W08 .byte N04 , An1 @@ -1110,18 +1110,18 @@ bgm_eikou_r_3_000: .byte N48 , Cs2 .byte W48 .byte GOTO - .word bgm_eikou_r_3_B1 + .word mus_hall_of_fame_room_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_eikou_r_4: - .byte KEYSH , bgm_eikou_r_key+0 +mus_hall_of_fame_room_4: + .byte KEYSH , mus_hall_of_fame_room_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-11 - .byte VOL , 31*bgm_eikou_r_mvl/mxv + .byte VOL , 31*mus_hall_of_fame_room_mvl/mxv .byte N04 , As2 , v112 .byte W04 .byte Bn2 @@ -1134,9 +1134,9 @@ bgm_eikou_r_4: .byte W04 .byte Fs3 .byte W04 -bgm_eikou_r_4_B1: +mus_hall_of_fame_room_4_B1: .byte PAN , c_v-10 - .byte VOL , 31*bgm_eikou_r_mvl/mxv + .byte VOL , 31*mus_hall_of_fame_room_mvl/mxv .byte N96 , Gn3 , v112 .byte W96 .byte Fs3 @@ -1155,7 +1155,7 @@ bgm_eikou_r_4_B1: .byte EOT .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 50*bgm_eikou_r_mvl/mxv + .byte VOL , 50*mus_hall_of_fame_room_mvl/mxv .byte N40 , Gn3 .byte W40 .byte N08 , Ds3 @@ -1239,20 +1239,20 @@ bgm_eikou_r_4_B1: .byte N96 , Cs4 .byte W96 .byte GOTO - .word bgm_eikou_r_4_B1 + .word mus_hall_of_fame_room_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_eikou_r_5: - .byte KEYSH , bgm_eikou_r_key+0 +mus_hall_of_fame_room_5: + .byte KEYSH , mus_hall_of_fame_room_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-64 - .byte VOL , 34*bgm_eikou_r_mvl/mxv + .byte VOL , 34*mus_hall_of_fame_room_mvl/mxv .byte N04 , Gn2 , v112 .byte W04 .byte An2 @@ -1265,7 +1265,7 @@ bgm_eikou_r_5: .byte W04 .byte Dn3 .byte W04 -bgm_eikou_r_5_B1: +mus_hall_of_fame_room_5_B1: .byte N96 , Ds3 , v112 .byte W96 .byte Dn3 @@ -1282,7 +1282,7 @@ bgm_eikou_r_5_B1: .byte W96 .byte W96 .byte EOT -bgm_eikou_r_5_000: +mus_hall_of_fame_room_5_000: .byte N32 , Ds3 , v112 .byte W32 .byte N04 , Gn3 @@ -1317,7 +1317,7 @@ bgm_eikou_r_5_000: .byte Dn3 .byte W04 .byte PATT - .word bgm_eikou_r_5_000 + .word mus_hall_of_fame_room_5_000 .byte N40 , Fn3 , v112 .byte W40 .byte N08 , Cn3 @@ -1367,20 +1367,20 @@ bgm_eikou_r_5_000: .byte W96 .byte EOT .byte GOTO - .word bgm_eikou_r_5_B1 + .word mus_hall_of_fame_room_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_eikou_r_6: - .byte KEYSH , bgm_eikou_r_key+0 +mus_hall_of_fame_room_6: + .byte KEYSH , mus_hall_of_fame_room_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 34*bgm_eikou_r_mvl/mxv + .byte VOL , 34*mus_hall_of_fame_room_mvl/mxv .byte N04 , Cs3 , v112 .byte W04 .byte Dn3 @@ -1393,7 +1393,7 @@ bgm_eikou_r_6: .byte W04 .byte An3 .byte W04 -bgm_eikou_r_6_B1: +mus_hall_of_fame_room_6_B1: .byte N96 , As3 , v112 .byte W96 .byte An3 @@ -1505,22 +1505,22 @@ bgm_eikou_r_6_B1: .byte W96 .byte EOT .byte GOTO - .word bgm_eikou_r_6_B1 + .word mus_hall_of_fame_room_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_eikou_r_7: - .byte VOL , 80*bgm_eikou_r_mvl/mxv - .byte KEYSH , bgm_eikou_r_key+0 +mus_hall_of_fame_room_7: + .byte VOL , 80*mus_hall_of_fame_room_mvl/mxv + .byte KEYSH , mus_hall_of_fame_room_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte W24 -bgm_eikou_r_7_B1: -bgm_eikou_r_7_000: +mus_hall_of_fame_room_7_B1: +mus_hall_of_fame_room_7_000: .byte N04 , Dn1 , v112 .byte W24 .byte N04 @@ -1539,20 +1539,20 @@ bgm_eikou_r_7_000: .byte W08 .byte PEND .byte PATT - .word bgm_eikou_r_7_000 + .word mus_hall_of_fame_room_7_000 .byte PATT - .word bgm_eikou_r_7_000 + .word mus_hall_of_fame_room_7_000 .byte PATT - .word bgm_eikou_r_7_000 + .word mus_hall_of_fame_room_7_000 .byte PATT - .word bgm_eikou_r_7_000 + .word mus_hall_of_fame_room_7_000 .byte PATT - .word bgm_eikou_r_7_000 + .word mus_hall_of_fame_room_7_000 .byte PATT - .word bgm_eikou_r_7_000 + .word mus_hall_of_fame_room_7_000 .byte PATT - .word bgm_eikou_r_7_000 -bgm_eikou_r_7_001: + .word mus_hall_of_fame_room_7_000 +mus_hall_of_fame_room_7_001: .byte N04 , Dn1 , v112 .byte W24 .byte N04 @@ -1571,40 +1571,40 @@ bgm_eikou_r_7_001: .byte W08 .byte PEND .byte PATT - .word bgm_eikou_r_7_001 + .word mus_hall_of_fame_room_7_001 .byte PATT - .word bgm_eikou_r_7_001 + .word mus_hall_of_fame_room_7_001 .byte PATT - .word bgm_eikou_r_7_001 + .word mus_hall_of_fame_room_7_001 .byte PATT - .word bgm_eikou_r_7_001 + .word mus_hall_of_fame_room_7_001 .byte PATT - .word bgm_eikou_r_7_001 + .word mus_hall_of_fame_room_7_001 .byte PATT - .word bgm_eikou_r_7_001 + .word mus_hall_of_fame_room_7_001 .byte PATT - .word bgm_eikou_r_7_001 + .word mus_hall_of_fame_room_7_001 .byte GOTO - .word bgm_eikou_r_7_B1 + .word mus_hall_of_fame_room_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_eikou_r: +mus_hall_of_fame_room: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_eikou_r_pri @ Priority - .byte bgm_eikou_r_rev @ Reverb. + .byte mus_hall_of_fame_room_pri @ Priority + .byte mus_hall_of_fame_room_rev @ Reverb. - .word bgm_eikou_r_grp + .word mus_hall_of_fame_room_grp - .word bgm_eikou_r_1 - .word bgm_eikou_r_2 - .word bgm_eikou_r_3 - .word bgm_eikou_r_4 - .word bgm_eikou_r_5 - .word bgm_eikou_r_6 - .word bgm_eikou_r_7 + .word mus_hall_of_fame_room_1 + .word mus_hall_of_fame_room_2 + .word mus_hall_of_fame_room_3 + .word mus_hall_of_fame_room_4 + .word mus_hall_of_fame_room_5 + .word mus_hall_of_fame_room_6 + .word mus_hall_of_fame_room_7 .end diff --git a/sound/songs/bgm_me_asa.s b/sound/songs/mus_heal.s index cd0180d7d..a24645bcf 100644 --- a/sound/songs/bgm_me_asa.s +++ b/sound/songs/mus_heal.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_me_asa_grp, voicegroup009 - .equ bgm_me_asa_pri, 5 - .equ bgm_me_asa_rev, reverb_set+50 - .equ bgm_me_asa_mvl, 127 - .equ bgm_me_asa_key, 0 - .equ bgm_me_asa_tbs, 1 - .equ bgm_me_asa_exg, 0 - .equ bgm_me_asa_cmp, 1 + .equ mus_heal_grp, voicegroup009 + .equ mus_heal_pri, 5 + .equ mus_heal_rev, reverb_set+50 + .equ mus_heal_mvl, 127 + .equ mus_heal_key, 0 + .equ mus_heal_tbs, 1 + .equ mus_heal_exg, 0 + .equ mus_heal_cmp, 1 .section .rodata - .global bgm_me_asa + .global mus_heal .align 2 @********************** Track 1 **********************@ -bgm_me_asa_1: - .byte KEYSH , bgm_me_asa_key+0 - .byte TEMPO , 132*bgm_me_asa_tbs/2 +mus_heal_1: + .byte KEYSH , mus_heal_key+0 + .byte TEMPO , 132*mus_heal_tbs/2 .byte VOICE , 46 - .byte VOL , 90*bgm_me_asa_mvl/mxv + .byte VOL , 90*mus_heal_mvl/mxv .byte PAN , c_v+0 .byte N12 , Bn4 , v112 .byte W12 @@ -42,10 +42,10 @@ bgm_me_asa_1: @********************** Track 2 **********************@ -bgm_me_asa_2: - .byte KEYSH , bgm_me_asa_key+0 +mus_heal_2: + .byte KEYSH , mus_heal_key+0 .byte VOICE , 46 - .byte VOL , 90*bgm_me_asa_mvl/mxv + .byte VOL , 90*mus_heal_mvl/mxv .byte PAN , c_v+48 .byte N06 , En4 , v080 .byte W12 @@ -68,10 +68,10 @@ bgm_me_asa_2: @********************** Track 3 **********************@ -bgm_me_asa_3: - .byte KEYSH , bgm_me_asa_key+0 +mus_heal_3: + .byte KEYSH , mus_heal_key+0 .byte VOICE , 46 - .byte VOL , 90*bgm_me_asa_mvl/mxv + .byte VOL , 90*mus_heal_mvl/mxv .byte PAN , c_v-47 .byte W12 .byte N06 , Gs3 , v080 @@ -93,9 +93,9 @@ bgm_me_asa_3: @********************** Track 4 **********************@ -bgm_me_asa_4: - .byte VOL , 90*bgm_me_asa_mvl/mxv - .byte KEYSH , bgm_me_asa_key+0 +mus_heal_4: + .byte VOL , 90*mus_heal_mvl/mxv + .byte KEYSH , mus_heal_key+0 .byte VOICE , 100 .byte PAN , c_v+0 .byte W12 @@ -134,17 +134,17 @@ bgm_me_asa_4: @******************************************************@ .align 2 -bgm_me_asa: +mus_heal: .byte 4 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_asa_pri @ Priority - .byte bgm_me_asa_rev @ Reverb. + .byte mus_heal_pri @ Priority + .byte mus_heal_rev @ Reverb. - .word bgm_me_asa_grp + .word mus_heal_grp - .word bgm_me_asa_1 - .word bgm_me_asa_2 - .word bgm_me_asa_3 - .word bgm_me_asa_4 + .word mus_heal_1 + .word mus_heal_2 + .word mus_heal_3 + .word mus_heal_4 .end diff --git a/sound/songs/bgm_event0.s b/sound/songs/mus_help.s index 976d1d899..41ba8805f 100644 --- a/sound/songs/bgm_event0.s +++ b/sound/songs/mus_help.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_event0_grp, voicegroup053 - .equ bgm_event0_pri, 0 - .equ bgm_event0_rev, reverb_set+50 - .equ bgm_event0_mvl, 127 - .equ bgm_event0_key, 0 - .equ bgm_event0_tbs, 1 - .equ bgm_event0_exg, 0 - .equ bgm_event0_cmp, 1 + .equ mus_help_grp, voicegroup053 + .equ mus_help_pri, 0 + .equ mus_help_rev, reverb_set+50 + .equ mus_help_mvl, 127 + .equ mus_help_key, 0 + .equ mus_help_tbs, 1 + .equ mus_help_exg, 0 + .equ mus_help_cmp, 1 .section .rodata - .global bgm_event0 + .global mus_help .align 2 @********************** Track 1 **********************@ -bgm_event0_1: - .byte KEYSH , bgm_event0_key+0 - .byte TEMPO , 136*bgm_event0_tbs/2 +mus_help_1: + .byte KEYSH , mus_help_key+0 + .byte TEMPO , 136*mus_help_tbs/2 .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 49*bgm_event0_mvl/mxv + .byte VOL , 49*mus_help_mvl/mxv .byte N03 , Dn5 , v112 .byte W03 .byte Ds5 @@ -39,13 +39,13 @@ bgm_event0_1: .byte W12 .byte Bn4 .byte W18 - .byte TEMPO , 112*bgm_event0_tbs/2 + .byte TEMPO , 112*mus_help_tbs/2 .byte N24 , As4 .byte W15 - .byte TEMPO , 156*bgm_event0_tbs/2 + .byte TEMPO , 156*mus_help_tbs/2 .byte W09 -bgm_event0_1_B1: -bgm_event0_1_000: +mus_help_1_B1: +mus_help_1_000: .byte W12 .byte N09 , Gn4 , v112 .byte W09 @@ -84,7 +84,7 @@ bgm_event0_1_000: .byte N06 , Gs4 , v036 .byte W15 .byte PATT - .word bgm_event0_1_000 + .word mus_help_1_000 .byte W12 .byte N09 , An4 , v112 .byte W09 @@ -106,24 +106,24 @@ bgm_event0_1_000: .byte As4 , v116 .byte W06 .byte GOTO - .word bgm_event0_1_B1 + .word mus_help_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_event0_2: - .byte KEYSH , bgm_event0_key+0 +mus_help_2: + .byte KEYSH , mus_help_key+0 .byte VOICE , 38 .byte PAN , c_v+7 - .byte VOL , 78*bgm_event0_mvl/mxv + .byte VOL , 78*mus_help_mvl/mxv .byte W06 .byte W66 .byte N06 , Gn2 , v112 .byte W06 .byte N24 , Gn1 .byte W24 -bgm_event0_2_B1: -bgm_event0_2_000: +mus_help_2_B1: +mus_help_2_000: .byte N12 , Cn1 , v112 .byte W12 .byte N03 , Cn2 @@ -164,7 +164,7 @@ bgm_event0_2_000: .byte N03 , Cn2 .byte W12 .byte PATT - .word bgm_event0_2_000 + .word mus_help_2_000 .byte N12 , Cn1 , v112 .byte W12 .byte N03 , Cn2 @@ -186,16 +186,16 @@ bgm_event0_2_000: .byte Gn2 , v112 .byte W06 .byte GOTO - .word bgm_event0_2_B1 + .word mus_help_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_event0_3: - .byte KEYSH , bgm_event0_key+0 +mus_help_3: + .byte KEYSH , mus_help_key+0 .byte VOICE , 73 .byte PAN , c_v-46 - .byte VOL , 39*bgm_event0_mvl/mxv + .byte VOL , 39*mus_help_mvl/mxv .byte W06 .byte N06 , Bn4 , v112 .byte W06 @@ -213,8 +213,8 @@ bgm_event0_3: .byte W18 .byte N24 , Fn4 .byte W24 -bgm_event0_3_B1: -bgm_event0_3_000: +mus_help_3_B1: +mus_help_3_000: .byte W12 .byte N09 , Cn4 , v112 .byte W18 @@ -235,7 +235,7 @@ bgm_event0_3_000: .byte N03 .byte W18 .byte PATT - .word bgm_event0_3_000 + .word mus_help_3_000 .byte W12 .byte N09 , Dn4 , v112 .byte W18 @@ -252,16 +252,16 @@ bgm_event0_3_000: .byte Fn4 , v116 .byte W06 .byte GOTO - .word bgm_event0_3_B1 + .word mus_help_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_event0_4: - .byte KEYSH , bgm_event0_key+0 +mus_help_4: + .byte KEYSH , mus_help_key+0 .byte VOICE , 87 .byte PAN , c_v+0 - .byte VOL , 48*bgm_event0_mvl/mxv + .byte VOL , 48*mus_help_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 12 .byte xIECV , 22 @@ -273,8 +273,8 @@ bgm_event0_4: .byte W06 .byte N24 , Gn1 .byte W24 -bgm_event0_4_B1: -bgm_event0_4_000: +mus_help_4_B1: +mus_help_4_000: .byte N12 , Cn1 , v112 .byte W12 .byte N03 , Cn2 @@ -315,7 +315,7 @@ bgm_event0_4_000: .byte N03 , Cn2 .byte W12 .byte PATT - .word bgm_event0_4_000 + .word mus_help_4_000 .byte N12 , Cn1 , v112 .byte W12 .byte N03 , Cn2 @@ -337,28 +337,28 @@ bgm_event0_4_000: .byte Gn2 , v112 .byte W06 .byte GOTO - .word bgm_event0_4_B1 + .word mus_help_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_event0_5: - .byte KEYSH , bgm_event0_key+0 +mus_help_5: + .byte KEYSH , mus_help_key+0 .byte VOICE , 82 .byte PAN , c_v+63 .byte LFOS , 44 .byte XCMD , xIECV , 12 .byte xIECV , 22 .byte BENDR , 12 - .byte VOL , 50*bgm_event0_mvl/mxv + .byte VOL , 50*mus_help_mvl/mxv .byte W06 .byte W66 .byte N06 , Bn2 , v084 .byte W06 .byte N24 , Gn3 , v088 .byte W24 -bgm_event0_5_B1: -bgm_event0_5_000: +mus_help_5_B1: +mus_help_5_000: .byte PAN , c_v-62 .byte N03 , Gn3 , v096 .byte W06 @@ -433,7 +433,7 @@ bgm_event0_5_000: .byte Gs2 .byte W06 .byte PATT - .word bgm_event0_5_000 + .word mus_help_5_000 .byte PAN , c_v-62 .byte N03 , An3 , v096 .byte W06 @@ -468,28 +468,28 @@ bgm_event0_5_000: .byte Fn3 .byte W06 .byte GOTO - .word bgm_event0_5_B1 + .word mus_help_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_event0_6: - .byte KEYSH , bgm_event0_key+0 +mus_help_6: + .byte KEYSH , mus_help_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 12 .byte xIECV , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 40*bgm_event0_mvl/mxv + .byte VOL , 40*mus_help_mvl/mxv .byte W06 .byte W66 .byte N06 , Gn3 , v112 .byte W06 .byte N24 , Bn3 .byte W24 -bgm_event0_6_B1: -bgm_event0_6_000: +mus_help_6_B1: +mus_help_6_000: .byte N12 , Ds3 , v112 .byte W18 .byte N06 @@ -508,7 +508,7 @@ bgm_event0_6_000: .byte N06 .byte W30 .byte PATT - .word bgm_event0_6_000 + .word mus_help_6_000 .byte N12 , Fn3 , v112 .byte W18 .byte N06 @@ -524,16 +524,16 @@ bgm_event0_6_000: .byte Bn3 , v116 .byte W06 .byte GOTO - .word bgm_event0_6_B1 + .word mus_help_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_event0_7: - .byte KEYSH , bgm_event0_key+0 +mus_help_7: + .byte KEYSH , mus_help_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 62*bgm_event0_mvl/mxv + .byte VOL , 62*mus_help_mvl/mxv .byte W06 .byte N06 , En1 , v112 .byte W06 @@ -558,8 +558,8 @@ bgm_event0_7: .byte W06 .byte N06 .byte W06 -bgm_event0_7_B1: -bgm_event0_7_000: +mus_help_7_B1: +mus_help_7_000: .byte N06 , Fs1 , v112 .byte W06 .byte Fs1 , v072 @@ -622,7 +622,7 @@ bgm_event0_7_000: .byte Fs1 , v068 .byte W06 .byte PATT - .word bgm_event0_7_000 + .word mus_help_7_000 .byte N06 , Fs1 , v112 .byte W06 .byte Fs1 , v072 @@ -652,26 +652,26 @@ bgm_event0_7_000: .byte N12 , As1 , v112 .byte W12 .byte GOTO - .word bgm_event0_7_B1 + .word mus_help_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_event0: +mus_help: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_event0_pri @ Priority - .byte bgm_event0_rev @ Reverb. + .byte mus_help_pri @ Priority + .byte mus_help_rev @ Reverb. - .word bgm_event0_grp + .word mus_help_grp - .word bgm_event0_1 - .word bgm_event0_2 - .word bgm_event0_3 - .word bgm_event0_4 - .word bgm_event0_5 - .word bgm_event0_6 - .word bgm_event0_7 + .word mus_help_1 + .word mus_help_2 + .word mus_help_3 + .word mus_help_4 + .word mus_help_5 + .word mus_help_6 + .word mus_help_7 .end diff --git a/sound/songs/bgm_demo1.s b/sound/songs/mus_intro.s index 340d61a93..1e53236fa 100644 --- a/sound/songs/bgm_demo1.s +++ b/sound/songs/mus_intro.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_demo1_grp, voicegroup057 - .equ bgm_demo1_pri, 0 - .equ bgm_demo1_rev, reverb_set+50 - .equ bgm_demo1_mvl, 127 - .equ bgm_demo1_key, 0 - .equ bgm_demo1_tbs, 1 - .equ bgm_demo1_exg, 0 - .equ bgm_demo1_cmp, 1 + .equ mus_intro_grp, voicegroup057 + .equ mus_intro_pri, 0 + .equ mus_intro_rev, reverb_set+50 + .equ mus_intro_mvl, 127 + .equ mus_intro_key, 0 + .equ mus_intro_tbs, 1 + .equ mus_intro_exg, 0 + .equ mus_intro_cmp, 1 .section .rodata - .global bgm_demo1 + .global mus_intro .align 2 @********************** Track 1 **********************@ -bgm_demo1_1: - .byte KEYSH , bgm_demo1_key+0 - .byte TEMPO , 118*bgm_demo1_tbs/2 +mus_intro_1: + .byte KEYSH , mus_intro_key+0 + .byte TEMPO , 118*mus_intro_tbs/2 .byte VOICE , 48 .byte PAN , c_v+35 - .byte VOL , 51*bgm_demo1_mvl/mxv + .byte VOL , 51*mus_intro_mvl/mxv .byte LFOS , 44 .byte W96 .byte W96 @@ -28,21 +28,21 @@ bgm_demo1_1: .byte W96 .byte W96 .byte W96 - .byte TEMPO , 128*bgm_demo1_tbs/2 + .byte TEMPO , 128*mus_intro_tbs/2 .byte W96 - .byte TEMPO , 136*bgm_demo1_tbs/2 + .byte TEMPO , 136*mus_intro_tbs/2 .byte W48 - .byte TEMPO , 60*bgm_demo1_tbs/2 + .byte TEMPO , 60*mus_intro_tbs/2 .byte W24 - .byte TEMPO , 62*bgm_demo1_tbs/2 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte TEMPO , 62*mus_intro_tbs/2 + .byte VOL , 34*mus_intro_mvl/mxv .byte W12 - .byte TEMPO , 48*bgm_demo1_tbs/2 + .byte TEMPO , 48*mus_intro_tbs/2 .byte N06 , Gn3 , v112 .byte W06 .byte An3 .byte W06 - .byte TEMPO , 154*bgm_demo1_tbs/2 + .byte TEMPO , 154*mus_intro_tbs/2 .byte PAN , c_v-34 .byte N06 , Gn3 .byte W06 @@ -274,49 +274,49 @@ bgm_demo1_1: .byte W24 .byte TIE , Gn3 .byte W48 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte W20 - .byte 30*bgm_demo1_mvl/mxv + .byte 30*mus_intro_mvl/mxv .byte W06 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W10 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W05 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W03 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W04 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W02 - .byte 15*bgm_demo1_mvl/mxv + .byte 15*mus_intro_mvl/mxv .byte W03 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W09 - .byte 9*bgm_demo1_mvl/mxv + .byte 9*mus_intro_mvl/mxv .byte W03 - .byte 5*bgm_demo1_mvl/mxv + .byte 5*mus_intro_mvl/mxv .byte W09 - .byte 4*bgm_demo1_mvl/mxv + .byte 4*mus_intro_mvl/mxv .byte W06 - .byte 2*bgm_demo1_mvl/mxv + .byte 2*mus_intro_mvl/mxv .byte W16 .byte EOT - .byte TEMPO , 106*bgm_demo1_tbs/2 + .byte TEMPO , 106*mus_intro_tbs/2 .byte W96 .byte W96 .byte FINE @********************** Track 2 **********************@ -bgm_demo1_2: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_2: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 73 .byte PAN , c_v+0 .byte LFOS , 44 - .byte VOL , 65*bgm_demo1_mvl/mxv + .byte VOL , 65*mus_intro_mvl/mxv .byte BEND , c_v+0 .byte W72 - .byte VOL , 66*bgm_demo1_mvl/mxv + .byte VOL , 66*mus_intro_mvl/mxv .byte N03 , Gn5 , v072 .byte W03 .byte An5 @@ -327,7 +327,7 @@ bgm_demo1_2: .byte W06 .byte En5 .byte W06 - .byte VOL , 68*bgm_demo1_mvl/mxv + .byte VOL , 68*mus_intro_mvl/mxv .byte N06 , Cn5 .byte W06 .byte Cn5 , v028 @@ -338,50 +338,50 @@ bgm_demo1_2: .byte W09 .byte MOD , 2 .byte W12 - .byte VOL , 65*bgm_demo1_mvl/mxv + .byte VOL , 65*mus_intro_mvl/mxv .byte W02 - .byte 61*bgm_demo1_mvl/mxv + .byte 61*mus_intro_mvl/mxv .byte W03 - .byte 59*bgm_demo1_mvl/mxv + .byte 59*mus_intro_mvl/mxv .byte W03 - .byte 54*bgm_demo1_mvl/mxv + .byte 54*mus_intro_mvl/mxv .byte W04 .byte MOD , 6 - .byte VOL , 52*bgm_demo1_mvl/mxv + .byte VOL , 52*mus_intro_mvl/mxv .byte W02 - .byte 48*bgm_demo1_mvl/mxv + .byte 48*mus_intro_mvl/mxv .byte W03 - .byte 45*bgm_demo1_mvl/mxv + .byte 45*mus_intro_mvl/mxv .byte W03 - .byte 43*bgm_demo1_mvl/mxv + .byte 43*mus_intro_mvl/mxv .byte W04 - .byte 41*bgm_demo1_mvl/mxv + .byte 41*mus_intro_mvl/mxv .byte W02 - .byte 40*bgm_demo1_mvl/mxv + .byte 40*mus_intro_mvl/mxv .byte W03 - .byte 36*bgm_demo1_mvl/mxv + .byte 36*mus_intro_mvl/mxv .byte W03 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte W04 .byte MOD , 9 - .byte VOL , 32*bgm_demo1_mvl/mxv + .byte VOL , 32*mus_intro_mvl/mxv .byte W02 - .byte 31*bgm_demo1_mvl/mxv + .byte 31*mus_intro_mvl/mxv .byte W03 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W03 - .byte 27*bgm_demo1_mvl/mxv + .byte 27*mus_intro_mvl/mxv .byte W04 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W02 - .byte 21*bgm_demo1_mvl/mxv + .byte 21*mus_intro_mvl/mxv .byte W03 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W03 - .byte 14*bgm_demo1_mvl/mxv + .byte 14*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 68*bgm_demo1_mvl/mxv + .byte VOL , 68*mus_intro_mvl/mxv .byte N03 , Gs4 , v084 .byte W03 .byte N21 , An4 , v092 @@ -395,52 +395,52 @@ bgm_demo1_2: .byte N92 , Gn5 , v100 .byte W21 .byte MOD , 6 - .byte VOL , 67*bgm_demo1_mvl/mxv + .byte VOL , 67*mus_intro_mvl/mxv .byte W02 - .byte 63*bgm_demo1_mvl/mxv + .byte 63*mus_intro_mvl/mxv .byte W03 - .byte 62*bgm_demo1_mvl/mxv + .byte 62*mus_intro_mvl/mxv .byte W03 - .byte 58*bgm_demo1_mvl/mxv + .byte 58*mus_intro_mvl/mxv .byte W04 - .byte 56*bgm_demo1_mvl/mxv + .byte 56*mus_intro_mvl/mxv .byte W02 - .byte 55*bgm_demo1_mvl/mxv + .byte 55*mus_intro_mvl/mxv .byte W03 - .byte 52*bgm_demo1_mvl/mxv + .byte 52*mus_intro_mvl/mxv .byte W03 - .byte 51*bgm_demo1_mvl/mxv + .byte 51*mus_intro_mvl/mxv .byte W06 - .byte 48*bgm_demo1_mvl/mxv + .byte 48*mus_intro_mvl/mxv .byte W03 - .byte 45*bgm_demo1_mvl/mxv + .byte 45*mus_intro_mvl/mxv .byte W03 - .byte 44*bgm_demo1_mvl/mxv + .byte 44*mus_intro_mvl/mxv .byte W04 - .byte 41*bgm_demo1_mvl/mxv + .byte 41*mus_intro_mvl/mxv .byte W02 - .byte 39*bgm_demo1_mvl/mxv + .byte 39*mus_intro_mvl/mxv .byte W03 - .byte 37*bgm_demo1_mvl/mxv + .byte 37*mus_intro_mvl/mxv .byte W03 - .byte 35*bgm_demo1_mvl/mxv + .byte 35*mus_intro_mvl/mxv .byte W04 .byte MOD , 12 .byte W02 - .byte VOL , 32*bgm_demo1_mvl/mxv + .byte VOL , 32*mus_intro_mvl/mxv .byte W03 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W03 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W06 - .byte 27*bgm_demo1_mvl/mxv + .byte 27*mus_intro_mvl/mxv .byte W03 - .byte 25*bgm_demo1_mvl/mxv + .byte 25*mus_intro_mvl/mxv .byte W03 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 68*bgm_demo1_mvl/mxv + .byte VOL , 68*mus_intro_mvl/mxv .byte N03 , Fn5 , v092 .byte W03 .byte Gn5 , v096 @@ -451,7 +451,7 @@ bgm_demo1_2: .byte W06 .byte Dn5 , v100 .byte W06 - .byte VOL , 68*bgm_demo1_mvl/mxv + .byte VOL , 68*mus_intro_mvl/mxv .byte BEND , c_v+0 .byte N06 , Cn5 .byte W12 @@ -461,89 +461,89 @@ bgm_demo1_2: .byte W09 .byte MOD , 2 .byte W24 - .byte VOL , 67*bgm_demo1_mvl/mxv + .byte VOL , 67*mus_intro_mvl/mxv .byte W02 - .byte 65*bgm_demo1_mvl/mxv + .byte 65*mus_intro_mvl/mxv .byte W03 - .byte 63*bgm_demo1_mvl/mxv + .byte 63*mus_intro_mvl/mxv .byte W03 - .byte 59*bgm_demo1_mvl/mxv + .byte 59*mus_intro_mvl/mxv .byte W04 - .byte 58*bgm_demo1_mvl/mxv + .byte 58*mus_intro_mvl/mxv .byte W02 - .byte 55*bgm_demo1_mvl/mxv + .byte 55*mus_intro_mvl/mxv .byte W03 - .byte 54*bgm_demo1_mvl/mxv + .byte 54*mus_intro_mvl/mxv .byte W03 - .byte 51*bgm_demo1_mvl/mxv + .byte 51*mus_intro_mvl/mxv .byte W04 - .byte 47*bgm_demo1_mvl/mxv + .byte 47*mus_intro_mvl/mxv .byte W02 - .byte 45*bgm_demo1_mvl/mxv + .byte 45*mus_intro_mvl/mxv .byte W03 - .byte 43*bgm_demo1_mvl/mxv + .byte 43*mus_intro_mvl/mxv .byte W03 - .byte 40*bgm_demo1_mvl/mxv + .byte 40*mus_intro_mvl/mxv .byte W04 - .byte 39*bgm_demo1_mvl/mxv + .byte 39*mus_intro_mvl/mxv .byte W02 - .byte 37*bgm_demo1_mvl/mxv + .byte 37*mus_intro_mvl/mxv .byte W03 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte W03 - .byte 33*bgm_demo1_mvl/mxv + .byte 33*mus_intro_mvl/mxv .byte W04 - .byte 32*bgm_demo1_mvl/mxv + .byte 32*mus_intro_mvl/mxv .byte W02 - .byte 31*bgm_demo1_mvl/mxv + .byte 31*mus_intro_mvl/mxv .byte W03 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W03 - .byte 27*bgm_demo1_mvl/mxv + .byte 27*mus_intro_mvl/mxv .byte W04 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W05 - .byte 25*bgm_demo1_mvl/mxv + .byte 25*mus_intro_mvl/mxv .byte W03 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W04 .byte MOD , 6 - .byte VOL , 27*bgm_demo1_mvl/mxv + .byte VOL , 27*mus_intro_mvl/mxv .byte W05 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W03 - .byte 31*bgm_demo1_mvl/mxv + .byte 31*mus_intro_mvl/mxv .byte W04 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte W02 - .byte 36*bgm_demo1_mvl/mxv + .byte 36*mus_intro_mvl/mxv .byte W03 - .byte 41*bgm_demo1_mvl/mxv + .byte 41*mus_intro_mvl/mxv .byte W03 - .byte 43*bgm_demo1_mvl/mxv + .byte 43*mus_intro_mvl/mxv .byte W04 .byte MOD , 9 - .byte VOL , 47*bgm_demo1_mvl/mxv + .byte VOL , 47*mus_intro_mvl/mxv .byte W02 - .byte 51*bgm_demo1_mvl/mxv + .byte 51*mus_intro_mvl/mxv .byte W03 - .byte 52*bgm_demo1_mvl/mxv + .byte 52*mus_intro_mvl/mxv .byte W03 - .byte 58*bgm_demo1_mvl/mxv + .byte 58*mus_intro_mvl/mxv .byte W04 - .byte 62*bgm_demo1_mvl/mxv + .byte 62*mus_intro_mvl/mxv .byte W02 - .byte 63*bgm_demo1_mvl/mxv + .byte 63*mus_intro_mvl/mxv .byte W01 - .byte 63*bgm_demo1_mvl/mxv + .byte 63*mus_intro_mvl/mxv .byte W02 - .byte 66*bgm_demo1_mvl/mxv + .byte 66*mus_intro_mvl/mxv .byte W03 - .byte 67*bgm_demo1_mvl/mxv + .byte 67*mus_intro_mvl/mxv .byte W04 .byte EOT .byte MOD , 0 - .byte VOL , 72*bgm_demo1_mvl/mxv + .byte VOL , 72*mus_intro_mvl/mxv .byte N06 , Fn5 , v112 .byte W06 .byte En5 @@ -553,7 +553,7 @@ bgm_demo1_2: .byte Cn5 .byte W06 .byte VOICE , 60 - .byte VOL , 68*bgm_demo1_mvl/mxv + .byte VOL , 68*mus_intro_mvl/mxv .byte N24 , An4 , v052 .byte W24 .byte Bn4 @@ -570,7 +570,7 @@ bgm_demo1_2: .byte Dn4 .byte W06 .byte VOICE , 60 - .byte VOL , 68*bgm_demo1_mvl/mxv + .byte VOL , 68*mus_intro_mvl/mxv .byte N06 , En4 .byte W12 .byte Fn4 @@ -578,32 +578,32 @@ bgm_demo1_2: .byte N60 , Gn4 .byte W24 .byte MOD , 4 - .byte VOL , 66*bgm_demo1_mvl/mxv + .byte VOL , 66*mus_intro_mvl/mxv .byte W02 - .byte 63*bgm_demo1_mvl/mxv + .byte 63*mus_intro_mvl/mxv .byte W03 - .byte 60*bgm_demo1_mvl/mxv + .byte 60*mus_intro_mvl/mxv .byte W03 - .byte 56*bgm_demo1_mvl/mxv + .byte 56*mus_intro_mvl/mxv .byte W04 - .byte 52*bgm_demo1_mvl/mxv + .byte 52*mus_intro_mvl/mxv .byte W02 - .byte 47*bgm_demo1_mvl/mxv + .byte 47*mus_intro_mvl/mxv .byte W03 - .byte 43*bgm_demo1_mvl/mxv + .byte 43*mus_intro_mvl/mxv .byte W03 - .byte 37*bgm_demo1_mvl/mxv + .byte 37*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 36*bgm_demo1_mvl/mxv + .byte VOL , 36*mus_intro_mvl/mxv .byte W02 - .byte 33*bgm_demo1_mvl/mxv + .byte 33*mus_intro_mvl/mxv .byte W03 - .byte 31*bgm_demo1_mvl/mxv + .byte 31*mus_intro_mvl/mxv .byte W03 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W04 - .byte 68*bgm_demo1_mvl/mxv + .byte 68*mus_intro_mvl/mxv .byte N03 , Fs4 , v092 .byte W03 .byte Fn4 @@ -681,28 +681,28 @@ bgm_demo1_2: .byte W06 .byte VOICE , 60 .byte PAN , c_v-12 - .byte VOL , 58*bgm_demo1_mvl/mxv + .byte VOL , 58*mus_intro_mvl/mxv .byte N60 , En5 , v112 .byte W24 .byte MOD , 4 - .byte VOL , 54*bgm_demo1_mvl/mxv + .byte VOL , 54*mus_intro_mvl/mxv .byte W02 - .byte 51*bgm_demo1_mvl/mxv + .byte 51*mus_intro_mvl/mxv .byte W03 - .byte 48*bgm_demo1_mvl/mxv + .byte 48*mus_intro_mvl/mxv .byte W03 - .byte 46*bgm_demo1_mvl/mxv + .byte 46*mus_intro_mvl/mxv .byte W06 - .byte 45*bgm_demo1_mvl/mxv + .byte 45*mus_intro_mvl/mxv .byte W06 - .byte 43*bgm_demo1_mvl/mxv + .byte 43*mus_intro_mvl/mxv .byte W06 - .byte 42*bgm_demo1_mvl/mxv + .byte 42*mus_intro_mvl/mxv .byte W03 - .byte 41*bgm_demo1_mvl/mxv + .byte 41*mus_intro_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 56*bgm_demo1_mvl/mxv + .byte VOL , 56*mus_intro_mvl/mxv .byte N06 , Fn5 .byte W12 .byte En5 @@ -714,7 +714,7 @@ bgm_demo1_2: .byte N06 , Fn5 .byte W06 .byte PAN , c_v-16 - .byte VOL , 56*bgm_demo1_mvl/mxv + .byte VOL , 56*mus_intro_mvl/mxv .byte N24 , Gn5 , v092 .byte W24 .byte Fn5 @@ -727,7 +727,7 @@ bgm_demo1_2: .byte W16 .byte VOICE , 60 .byte PAN , c_v-16 - .byte VOL , 62*bgm_demo1_mvl/mxv + .byte VOL , 62*mus_intro_mvl/mxv .byte N06 , Gn3 , v112 .byte W12 .byte Dn3 @@ -763,59 +763,59 @@ bgm_demo1_2: .byte TIE , Gn4 .byte W48 .byte MOD , 7 - .byte VOL , 62*bgm_demo1_mvl/mxv + .byte VOL , 62*mus_intro_mvl/mxv .byte W02 - .byte 60*bgm_demo1_mvl/mxv + .byte 60*mus_intro_mvl/mxv .byte W03 - .byte 58*bgm_demo1_mvl/mxv + .byte 58*mus_intro_mvl/mxv .byte W03 - .byte 55*bgm_demo1_mvl/mxv + .byte 55*mus_intro_mvl/mxv .byte W04 - .byte 54*bgm_demo1_mvl/mxv + .byte 54*mus_intro_mvl/mxv .byte W02 - .byte 51*bgm_demo1_mvl/mxv + .byte 51*mus_intro_mvl/mxv .byte W03 - .byte 51*bgm_demo1_mvl/mxv + .byte 51*mus_intro_mvl/mxv .byte W03 - .byte 48*bgm_demo1_mvl/mxv + .byte 48*mus_intro_mvl/mxv .byte W06 - .byte 45*bgm_demo1_mvl/mxv + .byte 45*mus_intro_mvl/mxv .byte W03 - .byte 43*bgm_demo1_mvl/mxv + .byte 43*mus_intro_mvl/mxv .byte W03 - .byte 41*bgm_demo1_mvl/mxv + .byte 41*mus_intro_mvl/mxv .byte W04 - .byte 38*bgm_demo1_mvl/mxv + .byte 38*mus_intro_mvl/mxv .byte W02 - .byte 36*bgm_demo1_mvl/mxv + .byte 36*mus_intro_mvl/mxv .byte W03 - .byte 35*bgm_demo1_mvl/mxv + .byte 35*mus_intro_mvl/mxv .byte W03 - .byte 33*bgm_demo1_mvl/mxv + .byte 33*mus_intro_mvl/mxv .byte W06 - .byte 30*bgm_demo1_mvl/mxv + .byte 30*mus_intro_mvl/mxv .byte W03 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W03 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W04 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W02 - .byte 20*bgm_demo1_mvl/mxv + .byte 20*mus_intro_mvl/mxv .byte W03 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W03 - .byte 14*bgm_demo1_mvl/mxv + .byte 14*mus_intro_mvl/mxv .byte W06 - .byte 12*bgm_demo1_mvl/mxv + .byte 12*mus_intro_mvl/mxv .byte W03 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W07 - .byte 10*bgm_demo1_mvl/mxv + .byte 10*mus_intro_mvl/mxv .byte W02 - .byte 7*bgm_demo1_mvl/mxv + .byte 7*mus_intro_mvl/mxv .byte W03 - .byte 6*bgm_demo1_mvl/mxv + .byte 6*mus_intro_mvl/mxv .byte W07 .byte EOT .byte MOD , 1 @@ -825,12 +825,12 @@ bgm_demo1_2: @********************** Track 3 **********************@ -bgm_demo1_3: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_3: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 58 .byte PAN , c_v+0 .byte LFOS , 44 - .byte VOL , 88*bgm_demo1_mvl/mxv + .byte VOL , 88*mus_intro_mvl/mxv .byte W96 .byte W48 .byte N06 , Cn2 , v072 @@ -863,18 +863,18 @@ bgm_demo1_3: .byte W12 .byte MOD , 8 .byte W12 - .byte VOL , 85*bgm_demo1_mvl/mxv + .byte VOL , 85*mus_intro_mvl/mxv .byte W03 - .byte 77*bgm_demo1_mvl/mxv + .byte 77*mus_intro_mvl/mxv .byte W02 - .byte 75*bgm_demo1_mvl/mxv + .byte 75*mus_intro_mvl/mxv .byte W01 - .byte 72*bgm_demo1_mvl/mxv + .byte 72*mus_intro_mvl/mxv .byte W03 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 87*bgm_demo1_mvl/mxv + .byte VOL , 87*mus_intro_mvl/mxv .byte N09 , Gn2 , v080 .byte W12 .byte Fn2 @@ -893,18 +893,18 @@ bgm_demo1_3: .byte W12 .byte MOD , 8 .byte W12 - .byte VOL , 85*bgm_demo1_mvl/mxv + .byte VOL , 85*mus_intro_mvl/mxv .byte W03 - .byte 77*bgm_demo1_mvl/mxv + .byte 77*mus_intro_mvl/mxv .byte W02 - .byte 75*bgm_demo1_mvl/mxv + .byte 75*mus_intro_mvl/mxv .byte W01 - .byte 72*bgm_demo1_mvl/mxv + .byte 72*mus_intro_mvl/mxv .byte W03 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 87*bgm_demo1_mvl/mxv + .byte VOL , 87*mus_intro_mvl/mxv .byte N09 , Cn3 , v072 .byte W12 .byte Dn3 @@ -923,24 +923,24 @@ bgm_demo1_3: .byte W12 .byte MOD , 8 .byte W24 - .byte VOL , 85*bgm_demo1_mvl/mxv + .byte VOL , 85*mus_intro_mvl/mxv .byte W02 - .byte 79*bgm_demo1_mvl/mxv + .byte 79*mus_intro_mvl/mxv .byte W03 - .byte 75*bgm_demo1_mvl/mxv + .byte 75*mus_intro_mvl/mxv .byte W03 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W04 - .byte 65*bgm_demo1_mvl/mxv + .byte 65*mus_intro_mvl/mxv .byte W02 - .byte 60*bgm_demo1_mvl/mxv + .byte 60*mus_intro_mvl/mxv .byte W03 - .byte 58*bgm_demo1_mvl/mxv + .byte 58*mus_intro_mvl/mxv .byte W03 - .byte 56*bgm_demo1_mvl/mxv + .byte 56*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 89*bgm_demo1_mvl/mxv + .byte VOL , 89*mus_intro_mvl/mxv .byte N12 , Fn1 , v096 .byte W12 .byte N06 , Dn2 @@ -955,18 +955,18 @@ bgm_demo1_3: .byte W12 .byte MOD , 8 .byte W12 - .byte VOL , 85*bgm_demo1_mvl/mxv + .byte VOL , 85*mus_intro_mvl/mxv .byte W03 - .byte 77*bgm_demo1_mvl/mxv + .byte 77*mus_intro_mvl/mxv .byte W02 - .byte 75*bgm_demo1_mvl/mxv + .byte 75*mus_intro_mvl/mxv .byte W01 - .byte 72*bgm_demo1_mvl/mxv + .byte 72*mus_intro_mvl/mxv .byte W03 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 90*bgm_demo1_mvl/mxv + .byte VOL , 90*mus_intro_mvl/mxv .byte N12 , An2 , v080 .byte W12 .byte Gn2 , v072 @@ -995,24 +995,24 @@ bgm_demo1_3: .byte W08 .byte N36 , Gn0 , v088 .byte W12 - .byte VOL , 89*bgm_demo1_mvl/mxv + .byte VOL , 89*mus_intro_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 80*bgm_demo1_mvl/mxv + .byte VOL , 80*mus_intro_mvl/mxv .byte W03 - .byte 69*bgm_demo1_mvl/mxv + .byte 69*mus_intro_mvl/mxv .byte W03 - .byte 67*bgm_demo1_mvl/mxv + .byte 67*mus_intro_mvl/mxv .byte W04 - .byte 60*bgm_demo1_mvl/mxv + .byte 60*mus_intro_mvl/mxv .byte W02 - .byte 56*bgm_demo1_mvl/mxv + .byte 56*mus_intro_mvl/mxv .byte W04 - .byte 51*bgm_demo1_mvl/mxv + .byte 51*mus_intro_mvl/mxv .byte W02 - .byte 40*bgm_demo1_mvl/mxv + .byte 40*mus_intro_mvl/mxv .byte W04 - .byte 90*bgm_demo1_mvl/mxv + .byte 90*mus_intro_mvl/mxv .byte MOD , 0 .byte N06 , Gn1 , v112 .byte W06 @@ -1091,58 +1091,58 @@ bgm_demo1_3: .byte En0 , v036 .byte W12 .byte VOICE , 58 - .byte VOL , 78*bgm_demo1_mvl/mxv + .byte VOL , 78*mus_intro_mvl/mxv .byte N48 , Gn1 , v112 .byte W24 - .byte VOL , 77*bgm_demo1_mvl/mxv + .byte VOL , 77*mus_intro_mvl/mxv .byte MOD , 10 .byte W02 - .byte VOL , 75*bgm_demo1_mvl/mxv + .byte VOL , 75*mus_intro_mvl/mxv .byte W03 - .byte 72*bgm_demo1_mvl/mxv + .byte 72*mus_intro_mvl/mxv .byte W03 - .byte 69*bgm_demo1_mvl/mxv + .byte 69*mus_intro_mvl/mxv .byte W04 - .byte 65*bgm_demo1_mvl/mxv + .byte 65*mus_intro_mvl/mxv .byte W02 - .byte 61*bgm_demo1_mvl/mxv + .byte 61*mus_intro_mvl/mxv .byte W03 - .byte 57*bgm_demo1_mvl/mxv + .byte 57*mus_intro_mvl/mxv .byte W03 - .byte 54*bgm_demo1_mvl/mxv + .byte 54*mus_intro_mvl/mxv .byte W04 - .byte 78*bgm_demo1_mvl/mxv + .byte 78*mus_intro_mvl/mxv .byte MOD , 0 .byte N48 , Fn1 .byte W24 - .byte VOL , 73*bgm_demo1_mvl/mxv + .byte VOL , 73*mus_intro_mvl/mxv .byte MOD , 10 .byte W02 - .byte VOL , 70*bgm_demo1_mvl/mxv + .byte VOL , 70*mus_intro_mvl/mxv .byte W03 - .byte 65*bgm_demo1_mvl/mxv + .byte 65*mus_intro_mvl/mxv .byte W03 - .byte 60*bgm_demo1_mvl/mxv + .byte 60*mus_intro_mvl/mxv .byte W04 - .byte 57*bgm_demo1_mvl/mxv + .byte 57*mus_intro_mvl/mxv .byte W02 - .byte 55*bgm_demo1_mvl/mxv + .byte 55*mus_intro_mvl/mxv .byte W03 - .byte 48*bgm_demo1_mvl/mxv + .byte 48*mus_intro_mvl/mxv .byte W03 - .byte 46*bgm_demo1_mvl/mxv + .byte 46*mus_intro_mvl/mxv .byte W04 - .byte 79*bgm_demo1_mvl/mxv + .byte 79*mus_intro_mvl/mxv .byte MOD , 0 .byte N30 , Dn1 .byte W15 - .byte VOL , 75*bgm_demo1_mvl/mxv + .byte VOL , 75*mus_intro_mvl/mxv .byte W02 - .byte 73*bgm_demo1_mvl/mxv + .byte 73*mus_intro_mvl/mxv .byte W03 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W04 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W06 .byte N06 , Cn1 , v116 .byte W06 @@ -1151,64 +1151,64 @@ bgm_demo1_3: .byte An0 .byte W06 .byte VOICE , 58 - .byte VOL , 79*bgm_demo1_mvl/mxv + .byte VOL , 79*mus_intro_mvl/mxv .byte TIE , Gn0 .byte W48 - .byte VOL , 80*bgm_demo1_mvl/mxv + .byte VOL , 80*mus_intro_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 76*bgm_demo1_mvl/mxv + .byte VOL , 76*mus_intro_mvl/mxv .byte W03 - .byte 74*bgm_demo1_mvl/mxv + .byte 74*mus_intro_mvl/mxv .byte W07 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W05 - .byte 68*bgm_demo1_mvl/mxv + .byte 68*mus_intro_mvl/mxv .byte W03 - .byte 66*bgm_demo1_mvl/mxv + .byte 66*mus_intro_mvl/mxv .byte W04 - .byte 64*bgm_demo1_mvl/mxv + .byte 64*mus_intro_mvl/mxv .byte W05 - .byte 62*bgm_demo1_mvl/mxv + .byte 62*mus_intro_mvl/mxv .byte W03 - .byte 60*bgm_demo1_mvl/mxv + .byte 60*mus_intro_mvl/mxv .byte W06 - .byte 56*bgm_demo1_mvl/mxv + .byte 56*mus_intro_mvl/mxv .byte W03 - .byte 55*bgm_demo1_mvl/mxv + .byte 55*mus_intro_mvl/mxv .byte W07 - .byte 51*bgm_demo1_mvl/mxv + .byte 51*mus_intro_mvl/mxv .byte W08 - .byte 47*bgm_demo1_mvl/mxv + .byte 47*mus_intro_mvl/mxv .byte W04 - .byte 45*bgm_demo1_mvl/mxv + .byte 45*mus_intro_mvl/mxv .byte W02 - .byte 39*bgm_demo1_mvl/mxv + .byte 39*mus_intro_mvl/mxv .byte W03 - .byte 38*bgm_demo1_mvl/mxv + .byte 38*mus_intro_mvl/mxv .byte W07 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte W02 - .byte 30*bgm_demo1_mvl/mxv + .byte 30*mus_intro_mvl/mxv .byte W03 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W03 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W04 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W02 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W03 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W03 - .byte 5*bgm_demo1_mvl/mxv + .byte 5*mus_intro_mvl/mxv .byte W04 .byte EOT - .byte VOL , 4*bgm_demo1_mvl/mxv + .byte VOL , 4*mus_intro_mvl/mxv .byte MOD , 0 .byte W24 .byte VOICE , 47 - .byte VOL , 86*bgm_demo1_mvl/mxv + .byte VOL , 86*mus_intro_mvl/mxv .byte W48 .byte N20 , Gn1 , v084 .byte W24 @@ -1218,12 +1218,12 @@ bgm_demo1_3: @********************** Track 4 **********************@ -bgm_demo1_4: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_4: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 45 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte BEND , c_v+1 .byte N03 , En4 , v068 .byte W06 @@ -1258,7 +1258,7 @@ bgm_demo1_4: .byte En4 , v012 .byte W06 .byte PAN , c_v-32 - .byte VOL , 45*bgm_demo1_mvl/mxv + .byte VOL , 45*mus_intro_mvl/mxv .byte BEND , c_v+0 .byte N06 , Gn3 , v092 .byte W06 @@ -1292,7 +1292,7 @@ bgm_demo1_4: .byte W06 .byte Dn5 , v036 .byte W06 - .byte VOL , 45*bgm_demo1_mvl/mxv + .byte VOL , 45*mus_intro_mvl/mxv .byte W48 .byte PAN , c_v-32 .byte N06 , Gn3 , v112 @@ -1405,7 +1405,7 @@ bgm_demo1_4: .byte Cn4 , v036 .byte W06 .byte VOICE , 56 - .byte VOL , 90*bgm_demo1_mvl/mxv + .byte VOL , 90*mus_intro_mvl/mxv .byte PAN , c_v-19 .byte N06 , Fn3 , v120 .byte W06 @@ -1418,16 +1418,16 @@ bgm_demo1_4: .byte N24 , An3 .byte W12 .byte MOD , 7 - .byte VOL , 87*bgm_demo1_mvl/mxv + .byte VOL , 87*mus_intro_mvl/mxv .byte W02 - .byte 77*bgm_demo1_mvl/mxv + .byte 77*mus_intro_mvl/mxv .byte W04 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W02 - .byte 63*bgm_demo1_mvl/mxv + .byte 63*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 90*bgm_demo1_mvl/mxv + .byte VOL , 90*mus_intro_mvl/mxv .byte N06 , An3 , v120 .byte W06 .byte An3 , v036 @@ -1439,18 +1439,18 @@ bgm_demo1_4: .byte N24 , Cn4 .byte W12 .byte MOD , 7 - .byte VOL , 84*bgm_demo1_mvl/mxv + .byte VOL , 84*mus_intro_mvl/mxv .byte W02 - .byte 73*bgm_demo1_mvl/mxv + .byte 73*mus_intro_mvl/mxv .byte W04 - .byte 70*bgm_demo1_mvl/mxv + .byte 70*mus_intro_mvl/mxv .byte W02 - .byte 62*bgm_demo1_mvl/mxv + .byte 62*mus_intro_mvl/mxv .byte W03 - .byte 60*bgm_demo1_mvl/mxv + .byte 60*mus_intro_mvl/mxv .byte W01 .byte MOD , 0 - .byte VOL , 90*bgm_demo1_mvl/mxv + .byte VOL , 90*mus_intro_mvl/mxv .byte N12 , Bn3 , v124 .byte W12 .byte N03 , As3 , v096 @@ -1475,33 +1475,33 @@ bgm_demo1_4: .byte W04 .byte N36 , Gn4 , v120 .byte W09 - .byte VOL , 87*bgm_demo1_mvl/mxv + .byte VOL , 87*mus_intro_mvl/mxv .byte W03 - .byte 81*bgm_demo1_mvl/mxv + .byte 81*mus_intro_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 73*bgm_demo1_mvl/mxv + .byte VOL , 73*mus_intro_mvl/mxv .byte W03 - .byte 62*bgm_demo1_mvl/mxv + .byte 62*mus_intro_mvl/mxv .byte W03 - .byte 53*bgm_demo1_mvl/mxv + .byte 53*mus_intro_mvl/mxv .byte W04 - .byte 46*bgm_demo1_mvl/mxv + .byte 46*mus_intro_mvl/mxv .byte W02 - .byte 35*bgm_demo1_mvl/mxv + .byte 35*mus_intro_mvl/mxv .byte W03 - .byte 30*bgm_demo1_mvl/mxv + .byte 30*mus_intro_mvl/mxv .byte W03 - .byte 25*bgm_demo1_mvl/mxv + .byte 25*mus_intro_mvl/mxv .byte W04 - .byte 73*bgm_demo1_mvl/mxv + .byte 73*mus_intro_mvl/mxv .byte MOD , 0 .byte N06 , Bn3 , v112 .byte W06 .byte Gn3 .byte W06 .byte PAN , c_v+20 - .byte VOL , 73*bgm_demo1_mvl/mxv + .byte VOL , 73*mus_intro_mvl/mxv .byte W36 .byte N06 , Cn4 .byte W06 @@ -1605,7 +1605,7 @@ bgm_demo1_4: .byte N06 , En4 , v080 .byte W06 .byte PAN , c_v+26 - .byte VOL , 62*bgm_demo1_mvl/mxv + .byte VOL , 62*mus_intro_mvl/mxv .byte N24 , Gn4 , v084 .byte W24 .byte Fn4 , v088 @@ -1620,7 +1620,7 @@ bgm_demo1_4: .byte PAN , c_v+21 .byte W96 .byte VOICE , 46 - .byte VOL , 79*bgm_demo1_mvl/mxv + .byte VOL , 79*mus_intro_mvl/mxv .byte W48 .byte N04 , Gn3 , v056 .byte W04 @@ -1737,12 +1737,12 @@ bgm_demo1_4: @********************** Track 5 **********************@ -bgm_demo1_5: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_5: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 1 .byte PAN , c_v-47 .byte LFOS , 44 - .byte VOL , 37*bgm_demo1_mvl/mxv + .byte VOL , 37*mus_intro_mvl/mxv .byte BEND , c_v+0 .byte N03 , En4 , v068 .byte W06 @@ -1773,73 +1773,73 @@ bgm_demo1_5: .byte W06 .byte En4 , v032 .byte W06 - .byte VOL , 43*bgm_demo1_mvl/mxv + .byte VOL , 43*mus_intro_mvl/mxv .byte W02 - .byte 42*bgm_demo1_mvl/mxv + .byte 42*mus_intro_mvl/mxv .byte W03 - .byte 39*bgm_demo1_mvl/mxv + .byte 39*mus_intro_mvl/mxv .byte W03 - .byte 37*bgm_demo1_mvl/mxv + .byte 37*mus_intro_mvl/mxv .byte W06 - .byte 36*bgm_demo1_mvl/mxv + .byte 36*mus_intro_mvl/mxv .byte W03 - .byte 33*bgm_demo1_mvl/mxv + .byte 33*mus_intro_mvl/mxv .byte W03 - .byte 31*bgm_demo1_mvl/mxv + .byte 31*mus_intro_mvl/mxv .byte W04 - .byte 30*bgm_demo1_mvl/mxv + .byte 30*mus_intro_mvl/mxv .byte W02 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W03 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W03 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W04 - .byte 25*bgm_demo1_mvl/mxv + .byte 25*mus_intro_mvl/mxv .byte W02 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W03 - .byte 21*bgm_demo1_mvl/mxv + .byte 21*mus_intro_mvl/mxv .byte W03 - .byte 20*bgm_demo1_mvl/mxv + .byte 20*mus_intro_mvl/mxv .byte W04 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W02 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W03 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W03 - .byte 16*bgm_demo1_mvl/mxv + .byte 16*mus_intro_mvl/mxv .byte W04 - .byte 15*bgm_demo1_mvl/mxv + .byte 15*mus_intro_mvl/mxv .byte W05 - .byte 14*bgm_demo1_mvl/mxv + .byte 14*mus_intro_mvl/mxv .byte W03 - .byte 13*bgm_demo1_mvl/mxv + .byte 13*mus_intro_mvl/mxv .byte W04 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W02 - .byte 10*bgm_demo1_mvl/mxv + .byte 10*mus_intro_mvl/mxv .byte W06 - .byte 9*bgm_demo1_mvl/mxv + .byte 9*mus_intro_mvl/mxv .byte W06 - .byte 7*bgm_demo1_mvl/mxv + .byte 7*mus_intro_mvl/mxv .byte W03 - .byte 5*bgm_demo1_mvl/mxv + .byte 5*mus_intro_mvl/mxv .byte W03 - .byte 4*bgm_demo1_mvl/mxv + .byte 4*mus_intro_mvl/mxv .byte W06 - .byte 3*bgm_demo1_mvl/mxv + .byte 3*mus_intro_mvl/mxv .byte W03 - .byte 2*bgm_demo1_mvl/mxv + .byte 2*mus_intro_mvl/mxv .byte W03 - .byte 2*bgm_demo1_mvl/mxv + .byte 2*mus_intro_mvl/mxv .byte W04 - .byte 1*bgm_demo1_mvl/mxv + .byte 1*mus_intro_mvl/mxv .byte W12 - .byte 45*bgm_demo1_mvl/mxv + .byte 45*mus_intro_mvl/mxv .byte W96 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte BEND , c_v+0 .byte W24 .byte PAN , c_v+47 @@ -1872,7 +1872,7 @@ bgm_demo1_5: .byte W96 .byte W96 .byte VOICE , 47 - .byte VOL , 88*bgm_demo1_mvl/mxv + .byte VOL , 88*mus_intro_mvl/mxv .byte N03 , Gn2 , v124 .byte W06 .byte Gn2 , v112 @@ -1961,14 +1961,14 @@ bgm_demo1_5: .byte W12 .byte W96 .byte VOICE , 46 - .byte VOL , 62*bgm_demo1_mvl/mxv + .byte VOL , 62*mus_intro_mvl/mxv .byte W48 .byte PAN , c_v-32 .byte BEND , c_v-2 .byte W48 .byte W96 .byte PAN , c_v-46 - .byte VOL , 45*bgm_demo1_mvl/mxv + .byte VOL , 45*mus_intro_mvl/mxv .byte W04 .byte N04 , Bn5 , v032 .byte W04 @@ -2013,14 +2013,14 @@ bgm_demo1_5: @********************** Track 6 **********************@ -bgm_demo1_6: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_6: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 45 - .byte VOL , 54*bgm_demo1_mvl/mxv + .byte VOL , 54*mus_intro_mvl/mxv .byte LFOS , 44 .byte PAN , c_v+32 .byte W03 - .byte VOL , 56*bgm_demo1_mvl/mxv + .byte VOL , 56*mus_intro_mvl/mxv .byte W92 .byte W01 .byte PAN , c_v+32 @@ -2044,80 +2044,80 @@ bgm_demo1_6: .byte PAN , c_v-51 .byte W96 .byte VOICE , 48 - .byte VOL , 4*bgm_demo1_mvl/mxv + .byte VOL , 4*mus_intro_mvl/mxv .byte N96 , Dn5 , v064 .byte W15 .byte PAN , c_v-43 .byte W02 - .byte VOL , 5*bgm_demo1_mvl/mxv + .byte VOL , 5*mus_intro_mvl/mxv .byte PAN , c_v-38 .byte W03 - .byte VOL , 7*bgm_demo1_mvl/mxv + .byte VOL , 7*mus_intro_mvl/mxv .byte PAN , c_v-34 .byte W04 - .byte VOL , 9*bgm_demo1_mvl/mxv + .byte VOL , 9*mus_intro_mvl/mxv .byte PAN , c_v-26 .byte W02 - .byte VOL , 14*bgm_demo1_mvl/mxv + .byte VOL , 14*mus_intro_mvl/mxv .byte W03 - .byte 15*bgm_demo1_mvl/mxv + .byte 15*mus_intro_mvl/mxv .byte PAN , c_v-22 .byte W03 - .byte VOL , 19*bgm_demo1_mvl/mxv + .byte VOL , 19*mus_intro_mvl/mxv .byte PAN , c_v-19 .byte W04 - .byte VOL , 21*bgm_demo1_mvl/mxv + .byte VOL , 21*mus_intro_mvl/mxv .byte PAN , c_v-13 .byte W02 - .byte VOL , 25*bgm_demo1_mvl/mxv + .byte VOL , 25*mus_intro_mvl/mxv .byte PAN , c_v-7 .byte W03 - .byte VOL , 29*bgm_demo1_mvl/mxv + .byte VOL , 29*mus_intro_mvl/mxv .byte PAN , c_v-2 .byte W03 - .byte VOL , 32*bgm_demo1_mvl/mxv + .byte VOL , 32*mus_intro_mvl/mxv .byte PAN , c_v+5 .byte W04 .byte c_v+12 .byte W02 - .byte VOL , 36*bgm_demo1_mvl/mxv + .byte VOL , 36*mus_intro_mvl/mxv .byte PAN , c_v+19 .byte W03 - .byte VOL , 38*bgm_demo1_mvl/mxv + .byte VOL , 38*mus_intro_mvl/mxv .byte PAN , c_v+24 .byte W03 - .byte VOL , 42*bgm_demo1_mvl/mxv + .byte VOL , 42*mus_intro_mvl/mxv .byte PAN , c_v+29 .byte W04 .byte c_v+35 .byte W02 - .byte VOL , 32*bgm_demo1_mvl/mxv + .byte VOL , 32*mus_intro_mvl/mxv .byte PAN , c_v+38 .byte W03 - .byte VOL , 24*bgm_demo1_mvl/mxv + .byte VOL , 24*mus_intro_mvl/mxv .byte PAN , c_v+41 .byte W03 .byte c_v+45 .byte W04 .byte c_v+47 .byte W02 - .byte VOL , 21*bgm_demo1_mvl/mxv + .byte VOL , 21*mus_intro_mvl/mxv .byte PAN , c_v+51 .byte W03 - .byte VOL , 17*bgm_demo1_mvl/mxv + .byte VOL , 17*mus_intro_mvl/mxv .byte PAN , c_v+53 .byte W03 - .byte VOL , 12*bgm_demo1_mvl/mxv + .byte VOL , 12*mus_intro_mvl/mxv .byte PAN , c_v+56 .byte W04 - .byte VOL , 11*bgm_demo1_mvl/mxv + .byte VOL , 11*mus_intro_mvl/mxv .byte W02 - .byte 9*bgm_demo1_mvl/mxv + .byte 9*mus_intro_mvl/mxv .byte W03 - .byte 7*bgm_demo1_mvl/mxv + .byte 7*mus_intro_mvl/mxv .byte W07 .byte PAN , c_v+28 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N06 , An4 , v032 .byte W06 .byte Cn4 , v036 @@ -2215,7 +2215,7 @@ bgm_demo1_6: .byte Bn4 .byte W06 .byte PAN , c_v+25 - .byte VOL , 39*bgm_demo1_mvl/mxv + .byte VOL , 39*mus_intro_mvl/mxv .byte N06 , Gn3 .byte W06 .byte Bn3 @@ -2234,29 +2234,29 @@ bgm_demo1_6: .byte W06 .byte N36 , Bn4 .byte W15 - .byte VOL , 36*bgm_demo1_mvl/mxv + .byte VOL , 36*mus_intro_mvl/mxv .byte W02 - .byte 32*bgm_demo1_mvl/mxv + .byte 32*mus_intro_mvl/mxv .byte W03 - .byte 27*bgm_demo1_mvl/mxv + .byte 27*mus_intro_mvl/mxv .byte W04 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W02 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W03 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W03 - .byte 14*bgm_demo1_mvl/mxv + .byte 14*mus_intro_mvl/mxv .byte W01 - .byte 14*bgm_demo1_mvl/mxv + .byte 14*mus_intro_mvl/mxv .byte W03 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W05 - .byte 10*bgm_demo1_mvl/mxv + .byte 10*mus_intro_mvl/mxv .byte W07 .byte VOICE , 56 .byte PAN , c_v+30 - .byte VOL , 39*bgm_demo1_mvl/mxv + .byte VOL , 39*mus_intro_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -2267,7 +2267,7 @@ bgm_demo1_6: .byte VOICE , 48 .byte W01 .byte PAN , c_v-2 - .byte VOL , 56*bgm_demo1_mvl/mxv + .byte VOL , 56*mus_intro_mvl/mxv .byte N48 , Dn5 .byte W48 .byte En5 @@ -2277,53 +2277,53 @@ bgm_demo1_6: .byte W48 .byte TIE , Gn5 .byte W48 - .byte VOL , 53*bgm_demo1_mvl/mxv + .byte VOL , 53*mus_intro_mvl/mxv .byte W05 - .byte 50*bgm_demo1_mvl/mxv + .byte 50*mus_intro_mvl/mxv .byte W03 - .byte 48*bgm_demo1_mvl/mxv + .byte 48*mus_intro_mvl/mxv .byte W04 - .byte 45*bgm_demo1_mvl/mxv + .byte 45*mus_intro_mvl/mxv .byte W02 - .byte 43*bgm_demo1_mvl/mxv + .byte 43*mus_intro_mvl/mxv .byte W03 - .byte 42*bgm_demo1_mvl/mxv + .byte 42*mus_intro_mvl/mxv .byte W07 - .byte 38*bgm_demo1_mvl/mxv + .byte 38*mus_intro_mvl/mxv .byte W02 - .byte 37*bgm_demo1_mvl/mxv + .byte 37*mus_intro_mvl/mxv .byte W06 - .byte 32*bgm_demo1_mvl/mxv + .byte 32*mus_intro_mvl/mxv .byte W06 - .byte 31*bgm_demo1_mvl/mxv + .byte 31*mus_intro_mvl/mxv .byte W03 - .byte 27*bgm_demo1_mvl/mxv + .byte 27*mus_intro_mvl/mxv .byte W07 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W02 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W03 - .byte 21*bgm_demo1_mvl/mxv + .byte 21*mus_intro_mvl/mxv .byte W03 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W04 - .byte 16*bgm_demo1_mvl/mxv + .byte 16*mus_intro_mvl/mxv .byte W05 - .byte 14*bgm_demo1_mvl/mxv + .byte 14*mus_intro_mvl/mxv .byte W03 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W06 - .byte 9*bgm_demo1_mvl/mxv + .byte 9*mus_intro_mvl/mxv .byte W03 - .byte 8*bgm_demo1_mvl/mxv + .byte 8*mus_intro_mvl/mxv .byte W03 - .byte 7*bgm_demo1_mvl/mxv + .byte 7*mus_intro_mvl/mxv .byte W04 - .byte 4*bgm_demo1_mvl/mxv + .byte 4*mus_intro_mvl/mxv .byte W02 - .byte 3*bgm_demo1_mvl/mxv + .byte 3*mus_intro_mvl/mxv .byte W03 - .byte 2*bgm_demo1_mvl/mxv + .byte 2*mus_intro_mvl/mxv .byte W07 .byte EOT .byte W96 @@ -2332,18 +2332,18 @@ bgm_demo1_6: @********************** Track 7 **********************@ -bgm_demo1_7: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_7: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 84 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 22*bgm_demo1_mvl/mxv + .byte VOL , 22*mus_intro_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W72 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte BEND , c_v+0 .byte W24 .byte VOICE , 85 @@ -2388,24 +2388,24 @@ bgm_demo1_7: .byte N36 , An2 , v096 .byte W12 .byte MOD , 8 - .byte VOL , 33*bgm_demo1_mvl/mxv + .byte VOL , 33*mus_intro_mvl/mxv .byte W02 - .byte 30*bgm_demo1_mvl/mxv + .byte 30*mus_intro_mvl/mxv .byte W03 - .byte 27*bgm_demo1_mvl/mxv + .byte 27*mus_intro_mvl/mxv .byte W03 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W04 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W02 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W03 - .byte 21*bgm_demo1_mvl/mxv + .byte 21*mus_intro_mvl/mxv .byte W03 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N09 , Gn2 .byte W12 .byte Fn2 @@ -2423,24 +2423,24 @@ bgm_demo1_7: .byte N36 , Bn2 , v096 .byte W12 .byte MOD , 8 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte W02 - .byte 31*bgm_demo1_mvl/mxv + .byte 31*mus_intro_mvl/mxv .byte W03 - .byte 30*bgm_demo1_mvl/mxv + .byte 30*mus_intro_mvl/mxv .byte W03 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W04 - .byte 27*bgm_demo1_mvl/mxv + .byte 27*mus_intro_mvl/mxv .byte W02 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W03 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W03 - .byte 23*bgm_demo1_mvl/mxv + .byte 23*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N09 , Cn3 .byte W12 .byte Dn3 @@ -2460,24 +2460,24 @@ bgm_demo1_7: .byte W12 .byte MOD , 8 .byte W24 - .byte VOL , 32*bgm_demo1_mvl/mxv + .byte VOL , 32*mus_intro_mvl/mxv .byte W02 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W03 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W04 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W03 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W02 - .byte 21*bgm_demo1_mvl/mxv + .byte 21*mus_intro_mvl/mxv .byte W03 - .byte 18*bgm_demo1_mvl/mxv + .byte 18*mus_intro_mvl/mxv .byte W03 - .byte 16*bgm_demo1_mvl/mxv + .byte 16*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N12 , Fn1 , v096 .byte W12 .byte N06 , Dn2 @@ -2492,23 +2492,23 @@ bgm_demo1_7: .byte W12 .byte MOD , 8 .byte W12 - .byte VOL , 33*bgm_demo1_mvl/mxv + .byte VOL , 33*mus_intro_mvl/mxv .byte W02 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W03 - .byte 23*bgm_demo1_mvl/mxv + .byte 23*mus_intro_mvl/mxv .byte W03 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N12 , An2 , v100 .byte W12 .byte Gn2 , v096 .byte W12 .byte VOICE , 81 .byte PAN , c_v-64 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N06 , Fn1 , v112 .byte W12 .byte N12 , En1 @@ -2541,28 +2541,28 @@ bgm_demo1_7: .byte N36 , Gn1 .byte W12 .byte MOD , 6 - .byte VOL , 33*bgm_demo1_mvl/mxv + .byte VOL , 33*mus_intro_mvl/mxv .byte W02 - .byte 32*bgm_demo1_mvl/mxv + .byte 32*mus_intro_mvl/mxv .byte W03 - .byte 30*bgm_demo1_mvl/mxv + .byte 30*mus_intro_mvl/mxv .byte W03 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W04 .byte MOD , 9 - .byte VOL , 24*bgm_demo1_mvl/mxv + .byte VOL , 24*mus_intro_mvl/mxv .byte W02 - .byte 21*bgm_demo1_mvl/mxv + .byte 21*mus_intro_mvl/mxv .byte W03 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W07 - .byte 40*bgm_demo1_mvl/mxv + .byte 40*mus_intro_mvl/mxv .byte MOD , 0 .byte N06 , Fn2 .byte W06 .byte Dn2 .byte W06 - .byte VOL , 38*bgm_demo1_mvl/mxv + .byte VOL , 38*mus_intro_mvl/mxv .byte MOD , 0 .byte PAN , c_v+0 .byte W96 @@ -2572,30 +2572,30 @@ bgm_demo1_7: .byte N60 , En4 .byte W24 .byte MOD , 4 - .byte VOL , 37*bgm_demo1_mvl/mxv + .byte VOL , 37*mus_intro_mvl/mxv .byte W02 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte W03 - .byte 33*bgm_demo1_mvl/mxv + .byte 33*mus_intro_mvl/mxv .byte W03 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W04 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W02 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W03 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W03 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W04 - .byte 15*bgm_demo1_mvl/mxv + .byte 15*mus_intro_mvl/mxv .byte W02 - .byte 12*bgm_demo1_mvl/mxv + .byte 12*mus_intro_mvl/mxv .byte W03 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 39*bgm_demo1_mvl/mxv + .byte VOL , 39*mus_intro_mvl/mxv .byte N06 , Fn4 , v084 .byte W12 .byte En4 @@ -2630,7 +2630,7 @@ bgm_demo1_7: .byte W04 .byte Fn6 .byte W04 - .byte VOL , 24*bgm_demo1_mvl/mxv + .byte VOL , 24*mus_intro_mvl/mxv .byte N04 , Bn6 .byte W04 .byte Gn6 @@ -2722,18 +2722,18 @@ bgm_demo1_7: @********************** Track 8 **********************@ -bgm_demo1_8: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_8: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 22*bgm_demo1_mvl/mxv + .byte VOL , 22*mus_intro_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte VOICE , 86 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte PAN , c_v+63 .byte N06 , Dn3 , v048 .byte W12 @@ -2776,30 +2776,30 @@ bgm_demo1_8: .byte W03 .byte Cn4 .byte W03 - .byte VOL , 32*bgm_demo1_mvl/mxv + .byte VOL , 32*mus_intro_mvl/mxv .byte N42 , Bn3 .byte W05 - .byte VOL , 26*bgm_demo1_mvl/mxv + .byte VOL , 26*mus_intro_mvl/mxv .byte W01 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W03 .byte MOD , 6 .byte W03 - .byte VOL , 26*bgm_demo1_mvl/mxv + .byte VOL , 26*mus_intro_mvl/mxv .byte W05 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W01 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W06 .byte MOD , 8 - .byte VOL , 21*bgm_demo1_mvl/mxv + .byte VOL , 21*mus_intro_mvl/mxv .byte W05 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W07 - .byte 18*bgm_demo1_mvl/mxv + .byte 18*mus_intro_mvl/mxv .byte W06 .byte MOD , 0 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N03 , Cn4 .byte W03 .byte Cs4 @@ -2809,7 +2809,7 @@ bgm_demo1_8: .byte MOD , 8 .byte W12 .byte 0 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N03 , Bn3 .byte W03 .byte Cn4 @@ -2917,7 +2917,7 @@ bgm_demo1_8: .byte W06 .byte Gn4 .byte W06 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N03 , Fn4 .byte W06 .byte Dn4 , v112 @@ -2938,33 +2938,33 @@ bgm_demo1_8: .byte N36 , Gn5 , v032 .byte W12 .byte MOD , 6 - .byte VOL , 28*bgm_demo1_mvl/mxv + .byte VOL , 28*mus_intro_mvl/mxv .byte W02 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W03 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W03 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W04 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W02 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W03 - .byte 10*bgm_demo1_mvl/mxv + .byte 10*mus_intro_mvl/mxv .byte W03 - .byte 9*bgm_demo1_mvl/mxv + .byte 9*mus_intro_mvl/mxv .byte W04 .byte MOD , 0 .byte N03 , Fn5 .byte W03 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N03 , Dn5 .byte W03 .byte Bn4 .byte W03 .byte Gn4 .byte W03 - .byte VOL , 33*bgm_demo1_mvl/mxv + .byte VOL , 33*mus_intro_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cn4 , v096 .byte W12 @@ -3036,29 +3036,29 @@ bgm_demo1_8: .byte W06 .byte N60 , Cn5 .byte W24 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte MOD , 5 .byte W02 - .byte VOL , 31*bgm_demo1_mvl/mxv + .byte VOL , 31*mus_intro_mvl/mxv .byte W03 - .byte 29*bgm_demo1_mvl/mxv + .byte 29*mus_intro_mvl/mxv .byte W07 - .byte 25*bgm_demo1_mvl/mxv + .byte 25*mus_intro_mvl/mxv .byte W02 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W03 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W03 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W04 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W02 - .byte 14*bgm_demo1_mvl/mxv + .byte 14*mus_intro_mvl/mxv .byte W03 - .byte 10*bgm_demo1_mvl/mxv + .byte 10*mus_intro_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte N06 , Dn5 .byte W12 .byte Cn5 @@ -3079,85 +3079,85 @@ bgm_demo1_8: .byte W16 .byte N48 , Bn4 , v096 .byte W24 - .byte VOL , 29*bgm_demo1_mvl/mxv + .byte VOL , 29*mus_intro_mvl/mxv .byte MOD , 5 .byte W04 - .byte VOL , 25*bgm_demo1_mvl/mxv + .byte VOL , 25*mus_intro_mvl/mxv .byte W04 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W04 - .byte 18*bgm_demo1_mvl/mxv + .byte 18*mus_intro_mvl/mxv .byte W04 - .byte 15*bgm_demo1_mvl/mxv + .byte 15*mus_intro_mvl/mxv .byte W08 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte MOD , 0 .byte N48 , Cn5 .byte W24 - .byte VOL , 31*bgm_demo1_mvl/mxv + .byte VOL , 31*mus_intro_mvl/mxv .byte MOD , 5 .byte W04 - .byte VOL , 28*bgm_demo1_mvl/mxv + .byte VOL , 28*mus_intro_mvl/mxv .byte W04 - .byte 25*bgm_demo1_mvl/mxv + .byte 25*mus_intro_mvl/mxv .byte W04 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W04 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W08 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte MOD , 0 .byte N48 , Dn5 .byte W24 - .byte VOL , 29*bgm_demo1_mvl/mxv + .byte VOL , 29*mus_intro_mvl/mxv .byte MOD , 5 .byte W04 - .byte VOL , 26*bgm_demo1_mvl/mxv + .byte VOL , 26*mus_intro_mvl/mxv .byte W04 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W04 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W04 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W04 - .byte 15*bgm_demo1_mvl/mxv + .byte 15*mus_intro_mvl/mxv .byte W04 - .byte 34*bgm_demo1_mvl/mxv + .byte 34*mus_intro_mvl/mxv .byte MOD , 0 .byte TIE , Fn5 , v064 .byte W24 - .byte VOL , 32*bgm_demo1_mvl/mxv + .byte VOL , 32*mus_intro_mvl/mxv .byte MOD , 8 .byte W04 - .byte VOL , 31*bgm_demo1_mvl/mxv + .byte VOL , 31*mus_intro_mvl/mxv .byte W08 - .byte 28*bgm_demo1_mvl/mxv + .byte 28*mus_intro_mvl/mxv .byte W04 - .byte 26*bgm_demo1_mvl/mxv + .byte 26*mus_intro_mvl/mxv .byte W08 - .byte 25*bgm_demo1_mvl/mxv + .byte 25*mus_intro_mvl/mxv .byte W04 - .byte 24*bgm_demo1_mvl/mxv + .byte 24*mus_intro_mvl/mxv .byte W08 - .byte 22*bgm_demo1_mvl/mxv + .byte 22*mus_intro_mvl/mxv .byte W08 - .byte 21*bgm_demo1_mvl/mxv + .byte 21*mus_intro_mvl/mxv .byte W04 - .byte 19*bgm_demo1_mvl/mxv + .byte 19*mus_intro_mvl/mxv .byte W08 - .byte 18*bgm_demo1_mvl/mxv + .byte 18*mus_intro_mvl/mxv .byte W08 - .byte 17*bgm_demo1_mvl/mxv + .byte 17*mus_intro_mvl/mxv .byte W04 - .byte 15*bgm_demo1_mvl/mxv + .byte 15*mus_intro_mvl/mxv .byte W08 - .byte 14*bgm_demo1_mvl/mxv + .byte 14*mus_intro_mvl/mxv .byte W04 - .byte 12*bgm_demo1_mvl/mxv + .byte 12*mus_intro_mvl/mxv .byte W08 - .byte 11*bgm_demo1_mvl/mxv + .byte 11*mus_intro_mvl/mxv .byte W04 - .byte 9*bgm_demo1_mvl/mxv + .byte 9*mus_intro_mvl/mxv .byte W04 .byte EOT .byte MOD , 0 @@ -3168,10 +3168,10 @@ bgm_demo1_8: @********************** Track 9 **********************@ -bgm_demo1_9: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_9: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 0 - .byte VOL , 51*bgm_demo1_mvl/mxv + .byte VOL , 51*mus_intro_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -3249,15 +3249,15 @@ bgm_demo1_9: @********************** Track 10 **********************@ -bgm_demo1_10: - .byte KEYSH , bgm_demo1_key+0 +mus_intro_10: + .byte KEYSH , mus_intro_key+0 .byte VOICE , 73 .byte PAN , c_v+0 .byte LFOS , 16 .byte XCMD , xIECV , 6 .byte xIECV , 4 .byte BENDR , 12 - .byte VOL , 22*bgm_demo1_mvl/mxv + .byte VOL , 22*mus_intro_mvl/mxv .byte N06 , En5 , v020 .byte W12 .byte Fn5 , v024 @@ -3282,7 +3282,7 @@ bgm_demo1_10: .byte 8 .byte W24 .byte 0 - .byte VOL , 22*bgm_demo1_mvl/mxv + .byte VOL , 22*mus_intro_mvl/mxv .byte N03 , Gs3 .byte W03 .byte N21 , An3 @@ -3301,7 +3301,7 @@ bgm_demo1_10: .byte 14 .byte W24 .byte 0 - .byte VOL , 28*bgm_demo1_mvl/mxv + .byte VOL , 28*mus_intro_mvl/mxv .byte W24 .byte BEND , c_v+0 .byte W24 @@ -3331,7 +3331,7 @@ bgm_demo1_10: .byte W06 .byte En4 .byte W06 - .byte VOL , 31*bgm_demo1_mvl/mxv + .byte VOL , 31*mus_intro_mvl/mxv .byte N24 , Cn4 .byte W12 .byte MOD , 6 @@ -3365,14 +3365,14 @@ bgm_demo1_10: .byte W08 .byte Dn5 , v056 .byte W08 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte BEND , c_v+0 .byte W12 .byte MOD , 5 .byte W24 .byte 0 .byte W12 - .byte VOL , 34*bgm_demo1_mvl/mxv + .byte VOL , 34*mus_intro_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -3408,23 +3408,23 @@ bgm_demo1_10: @******************************************************@ .align 2 -bgm_demo1: +mus_intro: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_demo1_pri @ Priority - .byte bgm_demo1_rev @ Reverb. + .byte mus_intro_pri @ Priority + .byte mus_intro_rev @ Reverb. - .word bgm_demo1_grp + .word mus_intro_grp - .word bgm_demo1_1 - .word bgm_demo1_2 - .word bgm_demo1_3 - .word bgm_demo1_4 - .word bgm_demo1_5 - .word bgm_demo1_6 - .word bgm_demo1_7 - .word bgm_demo1_8 - .word bgm_demo1_9 - .word bgm_demo1_10 + .word mus_intro_1 + .word mus_intro_2 + .word mus_intro_3 + .word mus_intro_4 + .word mus_intro_5 + .word mus_intro_6 + .word mus_intro_7 + .word mus_intro_8 + .word mus_intro_9 + .word mus_intro_10 .end diff --git a/sound/songs/bgm_t_battle.s b/sound/songs/mus_intro_battle.s index 43d60972a..2ba68361c 100644 --- a/sound/songs/bgm_t_battle.s +++ b/sound/songs/mus_intro_battle.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_t_battle_grp, voicegroup085 - .equ bgm_t_battle_pri, 0 - .equ bgm_t_battle_rev, reverb_set+50 - .equ bgm_t_battle_mvl, 127 - .equ bgm_t_battle_key, 0 - .equ bgm_t_battle_tbs, 1 - .equ bgm_t_battle_exg, 0 - .equ bgm_t_battle_cmp, 1 + .equ mus_intro_battle_grp, voicegroup085 + .equ mus_intro_battle_pri, 0 + .equ mus_intro_battle_rev, reverb_set+50 + .equ mus_intro_battle_mvl, 127 + .equ mus_intro_battle_key, 0 + .equ mus_intro_battle_tbs, 1 + .equ mus_intro_battle_exg, 0 + .equ mus_intro_battle_cmp, 1 .section .rodata - .global bgm_t_battle + .global mus_intro_battle .align 2 @********************** Track 1 **********************@ -bgm_t_battle_1: - .byte KEYSH , bgm_t_battle_key+0 - .byte TEMPO , 184*bgm_t_battle_tbs/2 +mus_intro_battle_1: + .byte KEYSH , mus_intro_battle_key+0 + .byte TEMPO , 184*mus_intro_battle_tbs/2 .byte VOICE , 46 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 74*bgm_t_battle_mvl/mxv + .byte VOL , 74*mus_intro_battle_mvl/mxv .byte PAN , c_v-46 .byte N04 , Fn2 , v112 .byte W04 @@ -78,7 +78,7 @@ bgm_t_battle_1: .byte W96 .byte W96 .byte VOICE , 127 - .byte VOL , 53*bgm_t_battle_mvl/mxv + .byte VOL , 53*mus_intro_battle_mvl/mxv .byte PAN , c_v+0 .byte N02 , Fs5 .byte W08 @@ -139,30 +139,30 @@ bgm_t_battle_1: .byte W96 .byte W96 .byte W24 - .byte TEMPO , 158*bgm_t_battle_tbs/2 + .byte TEMPO , 158*mus_intro_battle_tbs/2 .byte W24 - .byte TEMPO , 148*bgm_t_battle_tbs/2 + .byte TEMPO , 148*mus_intro_battle_tbs/2 .byte W24 - .byte TEMPO , 138*bgm_t_battle_tbs/2 + .byte TEMPO , 138*mus_intro_battle_tbs/2 .byte W24 .byte W12 .byte FINE @********************** Track 2 **********************@ -bgm_t_battle_2: - .byte KEYSH , bgm_t_battle_key+0 +mus_intro_battle_2: + .byte KEYSH , mus_intro_battle_key+0 .byte VOICE , 46 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 77*bgm_t_battle_mvl/mxv + .byte VOL , 77*mus_intro_battle_mvl/mxv .byte PAN , c_v-7 .byte W96 .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 77*bgm_t_battle_mvl/mxv + .byte VOL , 77*mus_intro_battle_mvl/mxv .byte N03 , Ds4 , v112 .byte W06 .byte N06 , Dn4 @@ -229,64 +229,64 @@ bgm_t_battle_2: .byte N48 , Ds5 , v072 .byte W24 .byte MOD , 6 - .byte VOL , 77*bgm_t_battle_mvl/mxv + .byte VOL , 77*mus_intro_battle_mvl/mxv .byte W02 - .byte 68*bgm_t_battle_mvl/mxv + .byte 68*mus_intro_battle_mvl/mxv .byte W03 - .byte 57*bgm_t_battle_mvl/mxv + .byte 57*mus_intro_battle_mvl/mxv .byte W03 - .byte 51*bgm_t_battle_mvl/mxv + .byte 51*mus_intro_battle_mvl/mxv .byte W04 - .byte 46*bgm_t_battle_mvl/mxv + .byte 46*mus_intro_battle_mvl/mxv .byte W02 - .byte 39*bgm_t_battle_mvl/mxv + .byte 39*mus_intro_battle_mvl/mxv .byte W03 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W03 - .byte 20*bgm_t_battle_mvl/mxv + .byte 20*mus_intro_battle_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 77*bgm_t_battle_mvl/mxv + .byte VOL , 77*mus_intro_battle_mvl/mxv .byte N48 , Ds3 , v104 .byte W24 .byte MOD , 6 - .byte VOL , 72*bgm_t_battle_mvl/mxv + .byte VOL , 72*mus_intro_battle_mvl/mxv .byte W02 - .byte 60*bgm_t_battle_mvl/mxv + .byte 60*mus_intro_battle_mvl/mxv .byte W03 - .byte 46*bgm_t_battle_mvl/mxv + .byte 46*mus_intro_battle_mvl/mxv .byte W03 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W04 - .byte 32*bgm_t_battle_mvl/mxv + .byte 32*mus_intro_battle_mvl/mxv .byte W02 - .byte 24*bgm_t_battle_mvl/mxv + .byte 24*mus_intro_battle_mvl/mxv .byte W03 - .byte 17*bgm_t_battle_mvl/mxv + .byte 17*mus_intro_battle_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 77*bgm_t_battle_mvl/mxv + .byte VOL , 77*mus_intro_battle_mvl/mxv .byte N48 , Cs4 , v108 .byte W24 .byte MOD , 6 - .byte VOL , 76*bgm_t_battle_mvl/mxv + .byte VOL , 76*mus_intro_battle_mvl/mxv .byte W02 - .byte 72*bgm_t_battle_mvl/mxv + .byte 72*mus_intro_battle_mvl/mxv .byte W03 - .byte 68*bgm_t_battle_mvl/mxv + .byte 68*mus_intro_battle_mvl/mxv .byte W03 - .byte 59*bgm_t_battle_mvl/mxv + .byte 59*mus_intro_battle_mvl/mxv .byte W04 - .byte 54*bgm_t_battle_mvl/mxv + .byte 54*mus_intro_battle_mvl/mxv .byte W02 - .byte 41*bgm_t_battle_mvl/mxv + .byte 41*mus_intro_battle_mvl/mxv .byte W03 - .byte 25*bgm_t_battle_mvl/mxv + .byte 25*mus_intro_battle_mvl/mxv .byte W03 - .byte 20*bgm_t_battle_mvl/mxv + .byte 20*mus_intro_battle_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 77*bgm_t_battle_mvl/mxv + .byte VOL , 77*mus_intro_battle_mvl/mxv .byte N04 , Ds3 , v112 .byte W08 .byte N04 @@ -343,7 +343,7 @@ bgm_t_battle_2: .byte W03 .byte Cs4 .byte W03 - .byte VOL , 78*bgm_t_battle_mvl/mxv + .byte VOL , 78*mus_intro_battle_mvl/mxv .byte N03 , Ds4 .byte W06 .byte N06 , Dn4 @@ -389,114 +389,114 @@ bgm_t_battle_2: .byte N96 , Ds5 , v100 .byte W48 .byte MOD , 7 - .byte VOL , 79*bgm_t_battle_mvl/mxv + .byte VOL , 79*mus_intro_battle_mvl/mxv .byte W02 - .byte 72*bgm_t_battle_mvl/mxv + .byte 72*mus_intro_battle_mvl/mxv .byte W03 - .byte 66*bgm_t_battle_mvl/mxv + .byte 66*mus_intro_battle_mvl/mxv .byte W03 - .byte 59*bgm_t_battle_mvl/mxv + .byte 59*mus_intro_battle_mvl/mxv .byte W04 - .byte 55*bgm_t_battle_mvl/mxv + .byte 55*mus_intro_battle_mvl/mxv .byte W02 - .byte 48*bgm_t_battle_mvl/mxv + .byte 48*mus_intro_battle_mvl/mxv .byte W03 - .byte 42*bgm_t_battle_mvl/mxv + .byte 42*mus_intro_battle_mvl/mxv .byte W03 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W04 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W02 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W03 - .byte 29*bgm_t_battle_mvl/mxv + .byte 29*mus_intro_battle_mvl/mxv .byte W03 - .byte 24*bgm_t_battle_mvl/mxv + .byte 24*mus_intro_battle_mvl/mxv .byte W04 - .byte 20*bgm_t_battle_mvl/mxv + .byte 20*mus_intro_battle_mvl/mxv .byte W05 - .byte 17*bgm_t_battle_mvl/mxv + .byte 17*mus_intro_battle_mvl/mxv .byte W03 - .byte 13*bgm_t_battle_mvl/mxv + .byte 13*mus_intro_battle_mvl/mxv .byte W04 .byte PAN , c_v+0 .byte MOD , 1 - .byte VOL , 79*bgm_t_battle_mvl/mxv + .byte VOL , 79*mus_intro_battle_mvl/mxv .byte N08 , As4 , v112 .byte W12 .byte FINE @********************** Track 3 **********************@ -bgm_t_battle_3: - .byte KEYSH , bgm_t_battle_key+0 +mus_intro_battle_3: + .byte KEYSH , mus_intro_battle_key+0 .byte VOICE , 58 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 40*bgm_t_battle_mvl/mxv + .byte VOL , 40*mus_intro_battle_mvl/mxv .byte N48 , As1 , v112 .byte W02 - .byte VOL , 42*bgm_t_battle_mvl/mxv + .byte VOL , 42*mus_intro_battle_mvl/mxv .byte W03 - .byte 44*bgm_t_battle_mvl/mxv + .byte 44*mus_intro_battle_mvl/mxv .byte W03 - .byte 47*bgm_t_battle_mvl/mxv + .byte 47*mus_intro_battle_mvl/mxv .byte W04 - .byte 48*bgm_t_battle_mvl/mxv + .byte 48*mus_intro_battle_mvl/mxv .byte W02 - .byte 51*bgm_t_battle_mvl/mxv + .byte 51*mus_intro_battle_mvl/mxv .byte W03 - .byte 55*bgm_t_battle_mvl/mxv + .byte 55*mus_intro_battle_mvl/mxv .byte W03 - .byte 59*bgm_t_battle_mvl/mxv + .byte 59*mus_intro_battle_mvl/mxv .byte W04 - .byte 62*bgm_t_battle_mvl/mxv + .byte 62*mus_intro_battle_mvl/mxv .byte W02 - .byte 64*bgm_t_battle_mvl/mxv + .byte 64*mus_intro_battle_mvl/mxv .byte W03 - .byte 67*bgm_t_battle_mvl/mxv + .byte 67*mus_intro_battle_mvl/mxv .byte W03 - .byte 72*bgm_t_battle_mvl/mxv + .byte 72*mus_intro_battle_mvl/mxv .byte W04 - .byte 74*bgm_t_battle_mvl/mxv + .byte 74*mus_intro_battle_mvl/mxv .byte W02 - .byte 77*bgm_t_battle_mvl/mxv + .byte 77*mus_intro_battle_mvl/mxv .byte W03 - .byte 80*bgm_t_battle_mvl/mxv + .byte 80*mus_intro_battle_mvl/mxv .byte W03 - .byte 81*bgm_t_battle_mvl/mxv + .byte 81*mus_intro_battle_mvl/mxv .byte W04 - .byte 64*bgm_t_battle_mvl/mxv + .byte 64*mus_intro_battle_mvl/mxv .byte N48 , Fn1 .byte W02 - .byte VOL , 66*bgm_t_battle_mvl/mxv + .byte VOL , 66*mus_intro_battle_mvl/mxv .byte W03 - .byte 69*bgm_t_battle_mvl/mxv + .byte 69*mus_intro_battle_mvl/mxv .byte W03 - .byte 69*bgm_t_battle_mvl/mxv + .byte 69*mus_intro_battle_mvl/mxv .byte W04 - .byte 72*bgm_t_battle_mvl/mxv + .byte 72*mus_intro_battle_mvl/mxv .byte W02 - .byte 74*bgm_t_battle_mvl/mxv + .byte 74*mus_intro_battle_mvl/mxv .byte W03 - .byte 76*bgm_t_battle_mvl/mxv + .byte 76*mus_intro_battle_mvl/mxv .byte W03 - .byte 78*bgm_t_battle_mvl/mxv + .byte 78*mus_intro_battle_mvl/mxv .byte W04 - .byte 80*bgm_t_battle_mvl/mxv + .byte 80*mus_intro_battle_mvl/mxv .byte W02 - .byte 83*bgm_t_battle_mvl/mxv + .byte 83*mus_intro_battle_mvl/mxv .byte W03 - .byte 84*bgm_t_battle_mvl/mxv + .byte 84*mus_intro_battle_mvl/mxv .byte W03 - .byte 86*bgm_t_battle_mvl/mxv + .byte 86*mus_intro_battle_mvl/mxv .byte W04 - .byte 87*bgm_t_battle_mvl/mxv + .byte 87*mus_intro_battle_mvl/mxv .byte W02 - .byte 88*bgm_t_battle_mvl/mxv + .byte 88*mus_intro_battle_mvl/mxv .byte W10 .byte W96 .byte W96 @@ -509,44 +509,44 @@ bgm_t_battle_3: .byte W96 .byte N96 , Ds2 .byte W24 - .byte VOL , 80*bgm_t_battle_mvl/mxv + .byte VOL , 80*mus_intro_battle_mvl/mxv .byte W05 - .byte 74*bgm_t_battle_mvl/mxv + .byte 74*mus_intro_battle_mvl/mxv .byte W07 - .byte 71*bgm_t_battle_mvl/mxv + .byte 71*mus_intro_battle_mvl/mxv .byte W05 - .byte 69*bgm_t_battle_mvl/mxv + .byte 69*mus_intro_battle_mvl/mxv .byte W07 - .byte 66*bgm_t_battle_mvl/mxv + .byte 66*mus_intro_battle_mvl/mxv .byte W05 - .byte 64*bgm_t_battle_mvl/mxv + .byte 64*mus_intro_battle_mvl/mxv .byte W07 - .byte 59*bgm_t_battle_mvl/mxv + .byte 59*mus_intro_battle_mvl/mxv .byte W05 - .byte 52*bgm_t_battle_mvl/mxv + .byte 52*mus_intro_battle_mvl/mxv .byte W07 - .byte 46*bgm_t_battle_mvl/mxv + .byte 46*mus_intro_battle_mvl/mxv .byte W05 - .byte 40*bgm_t_battle_mvl/mxv + .byte 40*mus_intro_battle_mvl/mxv .byte W07 - .byte 35*bgm_t_battle_mvl/mxv + .byte 35*mus_intro_battle_mvl/mxv .byte W05 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W07 .byte VOICE , 47 - .byte VOL , 88*bgm_t_battle_mvl/mxv + .byte VOL , 88*mus_intro_battle_mvl/mxv .byte N08 .byte W12 .byte FINE @********************** Track 4 **********************@ -bgm_t_battle_4: - .byte KEYSH , bgm_t_battle_key+0 +mus_intro_battle_4: + .byte KEYSH , mus_intro_battle_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 88*bgm_t_battle_mvl/mxv + .byte VOL , 88*mus_intro_battle_mvl/mxv .byte PAN , c_v-32 .byte W48 .byte N06 , Fn2 , v127 @@ -633,7 +633,7 @@ bgm_t_battle_4: .byte W96 .byte W96 .byte VOICE , 56 - .byte VOL , 56*bgm_t_battle_mvl/mxv + .byte VOL , 56*mus_intro_battle_mvl/mxv .byte N04 , Cs5 , v112 .byte W08 .byte An4 @@ -658,7 +658,7 @@ bgm_t_battle_4: .byte W08 .byte Cs4 .byte W08 - .byte VOL , 88*bgm_t_battle_mvl/mxv + .byte VOL , 88*mus_intro_battle_mvl/mxv .byte N04 , An3 .byte W08 .byte Cs4 @@ -700,7 +700,7 @@ bgm_t_battle_4: .byte Dn4 .byte W04 .byte VOICE , 47 - .byte VOL , 88*bgm_t_battle_mvl/mxv + .byte VOL , 88*mus_intro_battle_mvl/mxv .byte PAN , c_v+25 .byte N06 , Ds2 , v127 .byte W06 @@ -748,46 +748,46 @@ bgm_t_battle_4: .byte PAN , c_v-35 .byte N96 , Ds1 , v124 .byte W24 - .byte VOL , 78*bgm_t_battle_mvl/mxv + .byte VOL , 78*mus_intro_battle_mvl/mxv .byte W02 - .byte 77*bgm_t_battle_mvl/mxv + .byte 77*mus_intro_battle_mvl/mxv .byte W03 - .byte 76*bgm_t_battle_mvl/mxv + .byte 76*mus_intro_battle_mvl/mxv .byte W07 - .byte 74*bgm_t_battle_mvl/mxv + .byte 74*mus_intro_battle_mvl/mxv .byte W02 - .byte 72*bgm_t_battle_mvl/mxv + .byte 72*mus_intro_battle_mvl/mxv .byte W06 - .byte 72*bgm_t_battle_mvl/mxv + .byte 72*mus_intro_battle_mvl/mxv .byte W06 - .byte 69*bgm_t_battle_mvl/mxv + .byte 69*mus_intro_battle_mvl/mxv .byte W03 - .byte 69*bgm_t_battle_mvl/mxv + .byte 69*mus_intro_battle_mvl/mxv .byte W03 - .byte 67*bgm_t_battle_mvl/mxv + .byte 67*mus_intro_battle_mvl/mxv .byte W04 - .byte 66*bgm_t_battle_mvl/mxv + .byte 66*mus_intro_battle_mvl/mxv .byte W02 - .byte 64*bgm_t_battle_mvl/mxv + .byte 64*mus_intro_battle_mvl/mxv .byte W03 - .byte 62*bgm_t_battle_mvl/mxv + .byte 62*mus_intro_battle_mvl/mxv .byte W03 - .byte 60*bgm_t_battle_mvl/mxv + .byte 60*mus_intro_battle_mvl/mxv .byte W06 - .byte 57*bgm_t_battle_mvl/mxv + .byte 57*mus_intro_battle_mvl/mxv .byte W03 - .byte 52*bgm_t_battle_mvl/mxv + .byte 52*mus_intro_battle_mvl/mxv .byte W03 - .byte 49*bgm_t_battle_mvl/mxv + .byte 49*mus_intro_battle_mvl/mxv .byte W04 - .byte 47*bgm_t_battle_mvl/mxv + .byte 47*mus_intro_battle_mvl/mxv .byte W02 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W03 - .byte 20*bgm_t_battle_mvl/mxv + .byte 20*mus_intro_battle_mvl/mxv .byte W07 .byte VOICE , 1 - .byte VOL , 64*bgm_t_battle_mvl/mxv + .byte VOL , 64*mus_intro_battle_mvl/mxv .byte PAN , c_v+0 .byte N08 , Ds6 , v120 .byte W12 @@ -795,87 +795,87 @@ bgm_t_battle_4: @********************** Track 5 **********************@ -bgm_t_battle_5: - .byte KEYSH , bgm_t_battle_key+0 +mus_intro_battle_5: + .byte KEYSH , mus_intro_battle_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+8 - .byte VOL , 2*bgm_t_battle_mvl/mxv + .byte VOL , 2*mus_intro_battle_mvl/mxv .byte N48 , As4 , v112 .byte W02 - .byte VOL , 3*bgm_t_battle_mvl/mxv + .byte VOL , 3*mus_intro_battle_mvl/mxv .byte W03 - .byte 6*bgm_t_battle_mvl/mxv + .byte 6*mus_intro_battle_mvl/mxv .byte W08 - .byte 6*bgm_t_battle_mvl/mxv + .byte 6*mus_intro_battle_mvl/mxv .byte W08 - .byte 8*bgm_t_battle_mvl/mxv + .byte 8*mus_intro_battle_mvl/mxv .byte W03 - .byte 9*bgm_t_battle_mvl/mxv + .byte 9*mus_intro_battle_mvl/mxv .byte W04 - .byte 11*bgm_t_battle_mvl/mxv + .byte 11*mus_intro_battle_mvl/mxv .byte W01 - .byte 13*bgm_t_battle_mvl/mxv + .byte 13*mus_intro_battle_mvl/mxv .byte W03 - .byte 15*bgm_t_battle_mvl/mxv + .byte 15*mus_intro_battle_mvl/mxv .byte W01 - .byte 16*bgm_t_battle_mvl/mxv + .byte 16*mus_intro_battle_mvl/mxv .byte W03 - .byte 18*bgm_t_battle_mvl/mxv + .byte 18*mus_intro_battle_mvl/mxv .byte W01 - .byte 20*bgm_t_battle_mvl/mxv + .byte 20*mus_intro_battle_mvl/mxv .byte W03 - .byte 24*bgm_t_battle_mvl/mxv + .byte 24*mus_intro_battle_mvl/mxv .byte W01 - .byte 27*bgm_t_battle_mvl/mxv + .byte 27*mus_intro_battle_mvl/mxv .byte W03 - .byte 29*bgm_t_battle_mvl/mxv + .byte 29*mus_intro_battle_mvl/mxv .byte W04 .byte N36 , Fn5 .byte W02 - .byte VOL , 26*bgm_t_battle_mvl/mxv + .byte VOL , 26*mus_intro_battle_mvl/mxv .byte W02 - .byte 27*bgm_t_battle_mvl/mxv + .byte 27*mus_intro_battle_mvl/mxv .byte W04 - .byte 29*bgm_t_battle_mvl/mxv + .byte 29*mus_intro_battle_mvl/mxv .byte W05 - .byte 32*bgm_t_battle_mvl/mxv + .byte 32*mus_intro_battle_mvl/mxv .byte W03 - .byte 34*bgm_t_battle_mvl/mxv + .byte 34*mus_intro_battle_mvl/mxv .byte W08 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W01 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W04 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W03 - .byte 40*bgm_t_battle_mvl/mxv + .byte 40*mus_intro_battle_mvl/mxv .byte W01 - .byte 42*bgm_t_battle_mvl/mxv + .byte 42*mus_intro_battle_mvl/mxv .byte W03 - .byte 46*bgm_t_battle_mvl/mxv + .byte 46*mus_intro_battle_mvl/mxv .byte N03 , Dn5 .byte W01 - .byte VOL , 49*bgm_t_battle_mvl/mxv + .byte VOL , 49*mus_intro_battle_mvl/mxv .byte W02 .byte N03 , As4 .byte W01 - .byte VOL , 52*bgm_t_battle_mvl/mxv + .byte VOL , 52*mus_intro_battle_mvl/mxv .byte W01 - .byte 55*bgm_t_battle_mvl/mxv + .byte 55*mus_intro_battle_mvl/mxv .byte W01 .byte N03 , Gs4 .byte W02 - .byte VOL , 59*bgm_t_battle_mvl/mxv + .byte VOL , 59*mus_intro_battle_mvl/mxv .byte W01 - .byte 66*bgm_t_battle_mvl/mxv + .byte 66*mus_intro_battle_mvl/mxv .byte N03 , Fn4 .byte W03 .byte PAN , c_v-21 - .byte VOL , 52*bgm_t_battle_mvl/mxv + .byte VOL , 52*mus_intro_battle_mvl/mxv .byte W06 .byte N03 , An3 .byte W06 @@ -1017,7 +1017,7 @@ bgm_t_battle_5: .byte Cn4 .byte W06 .byte VOICE , 56 - .byte VOL , 66*bgm_t_battle_mvl/mxv + .byte VOL , 66*mus_intro_battle_mvl/mxv .byte PAN , c_v-21 .byte N04 , An5 .byte W08 @@ -1060,7 +1060,7 @@ bgm_t_battle_5: .byte N12 , Fn5 .byte W24 .byte PAN , c_v-24 - .byte VOL , 56*bgm_t_battle_mvl/mxv + .byte VOL , 56*mus_intro_battle_mvl/mxv .byte N06 , As3 .byte W06 .byte N03 , An3 @@ -1107,7 +1107,7 @@ bgm_t_battle_5: .byte W12 .byte VOICE , 46 .byte PAN , c_v-32 - .byte VOL , 66*bgm_t_battle_mvl/mxv + .byte VOL , 66*mus_intro_battle_mvl/mxv .byte N06 , As5 .byte W06 .byte Gs5 @@ -1142,7 +1142,7 @@ bgm_t_battle_5: .byte W06 .byte Fn4 , v076 .byte W06 - .byte VOL , 66*bgm_t_battle_mvl/mxv + .byte VOL , 66*mus_intro_battle_mvl/mxv .byte PAN , c_v+31 .byte N06 , Ds4 , v060 .byte W12 @@ -1150,81 +1150,81 @@ bgm_t_battle_5: @********************** Track 6 **********************@ -bgm_t_battle_6: - .byte KEYSH , bgm_t_battle_key+0 +mus_intro_battle_6: + .byte KEYSH , mus_intro_battle_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-63 - .byte VOL , 6*bgm_t_battle_mvl/mxv + .byte VOL , 6*mus_intro_battle_mvl/mxv .byte N48 , As2 , v112 .byte W02 - .byte VOL , 9*bgm_t_battle_mvl/mxv + .byte VOL , 9*mus_intro_battle_mvl/mxv .byte W03 - .byte 13*bgm_t_battle_mvl/mxv + .byte 13*mus_intro_battle_mvl/mxv .byte W03 - .byte 14*bgm_t_battle_mvl/mxv + .byte 14*mus_intro_battle_mvl/mxv .byte W04 - .byte 15*bgm_t_battle_mvl/mxv + .byte 15*mus_intro_battle_mvl/mxv .byte W02 - .byte 18*bgm_t_battle_mvl/mxv + .byte 18*mus_intro_battle_mvl/mxv .byte W03 - .byte 20*bgm_t_battle_mvl/mxv + .byte 20*mus_intro_battle_mvl/mxv .byte W03 - .byte 23*bgm_t_battle_mvl/mxv + .byte 23*mus_intro_battle_mvl/mxv .byte W04 - .byte 24*bgm_t_battle_mvl/mxv + .byte 24*mus_intro_battle_mvl/mxv .byte W02 - .byte 28*bgm_t_battle_mvl/mxv + .byte 28*mus_intro_battle_mvl/mxv .byte W03 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W03 - .byte 35*bgm_t_battle_mvl/mxv + .byte 35*mus_intro_battle_mvl/mxv .byte W04 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W02 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W03 - .byte 42*bgm_t_battle_mvl/mxv + .byte 42*mus_intro_battle_mvl/mxv .byte W03 - .byte 43*bgm_t_battle_mvl/mxv + .byte 43*mus_intro_battle_mvl/mxv .byte W04 - .byte 32*bgm_t_battle_mvl/mxv + .byte 32*mus_intro_battle_mvl/mxv .byte N48 , Fn3 .byte W02 - .byte VOL , 35*bgm_t_battle_mvl/mxv + .byte VOL , 35*mus_intro_battle_mvl/mxv .byte W03 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W03 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W04 - .byte 40*bgm_t_battle_mvl/mxv + .byte 40*mus_intro_battle_mvl/mxv .byte W02 - .byte 42*bgm_t_battle_mvl/mxv + .byte 42*mus_intro_battle_mvl/mxv .byte W03 - .byte 45*bgm_t_battle_mvl/mxv + .byte 45*mus_intro_battle_mvl/mxv .byte W03 - .byte 49*bgm_t_battle_mvl/mxv + .byte 49*mus_intro_battle_mvl/mxv .byte W04 - .byte 51*bgm_t_battle_mvl/mxv + .byte 51*mus_intro_battle_mvl/mxv .byte W02 - .byte 55*bgm_t_battle_mvl/mxv + .byte 55*mus_intro_battle_mvl/mxv .byte W03 - .byte 58*bgm_t_battle_mvl/mxv + .byte 58*mus_intro_battle_mvl/mxv .byte W03 - .byte 60*bgm_t_battle_mvl/mxv + .byte 60*mus_intro_battle_mvl/mxv .byte W04 - .byte 62*bgm_t_battle_mvl/mxv + .byte 62*mus_intro_battle_mvl/mxv .byte W02 - .byte 64*bgm_t_battle_mvl/mxv + .byte 64*mus_intro_battle_mvl/mxv .byte W03 - .byte 67*bgm_t_battle_mvl/mxv + .byte 67*mus_intro_battle_mvl/mxv .byte W03 - .byte 70*bgm_t_battle_mvl/mxv + .byte 70*mus_intro_battle_mvl/mxv .byte W04 - .byte 44*bgm_t_battle_mvl/mxv + .byte 44*mus_intro_battle_mvl/mxv .byte W06 .byte N06 , An3 .byte W06 @@ -1285,44 +1285,44 @@ bgm_t_battle_6: .byte N48 , As4 .byte W24 .byte MOD , 6 - .byte VOL , 41*bgm_t_battle_mvl/mxv + .byte VOL , 41*mus_intro_battle_mvl/mxv .byte W05 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W07 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W05 - .byte 28*bgm_t_battle_mvl/mxv + .byte 28*mus_intro_battle_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 44*bgm_t_battle_mvl/mxv + .byte VOL , 44*mus_intro_battle_mvl/mxv .byte N48 , As2 .byte W24 .byte MOD , 6 - .byte VOL , 42*bgm_t_battle_mvl/mxv + .byte VOL , 42*mus_intro_battle_mvl/mxv .byte W05 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W07 - .byte 30*bgm_t_battle_mvl/mxv + .byte 30*mus_intro_battle_mvl/mxv .byte W05 - .byte 25*bgm_t_battle_mvl/mxv + .byte 25*mus_intro_battle_mvl/mxv .byte W03 - .byte 22*bgm_t_battle_mvl/mxv + .byte 22*mus_intro_battle_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 44*bgm_t_battle_mvl/mxv + .byte VOL , 44*mus_intro_battle_mvl/mxv .byte N48 , Fs3 .byte W24 .byte MOD , 6 - .byte VOL , 38*bgm_t_battle_mvl/mxv + .byte VOL , 38*mus_intro_battle_mvl/mxv .byte W05 - .byte 34*bgm_t_battle_mvl/mxv + .byte 34*mus_intro_battle_mvl/mxv .byte W07 - .byte 30*bgm_t_battle_mvl/mxv + .byte 30*mus_intro_battle_mvl/mxv .byte W05 - .byte 25*bgm_t_battle_mvl/mxv + .byte 25*mus_intro_battle_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 44*bgm_t_battle_mvl/mxv + .byte VOL , 44*mus_intro_battle_mvl/mxv .byte N04 , Fs2 .byte W08 .byte N04 @@ -1422,24 +1422,24 @@ bgm_t_battle_6: .byte N96 , Gn3 .byte W48 .byte MOD , 7 - .byte VOL , 41*bgm_t_battle_mvl/mxv + .byte VOL , 41*mus_intro_battle_mvl/mxv .byte W05 - .byte 37*bgm_t_battle_mvl/mxv + .byte 37*mus_intro_battle_mvl/mxv .byte W07 - .byte 35*bgm_t_battle_mvl/mxv + .byte 35*mus_intro_battle_mvl/mxv .byte W05 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W07 - .byte 27*bgm_t_battle_mvl/mxv + .byte 27*mus_intro_battle_mvl/mxv .byte W05 - .byte 24*bgm_t_battle_mvl/mxv + .byte 24*mus_intro_battle_mvl/mxv .byte W07 - .byte 22*bgm_t_battle_mvl/mxv + .byte 22*mus_intro_battle_mvl/mxv .byte W05 - .byte 20*bgm_t_battle_mvl/mxv + .byte 20*mus_intro_battle_mvl/mxv .byte W07 .byte MOD , 1 - .byte VOL , 51*bgm_t_battle_mvl/mxv + .byte VOL , 51*mus_intro_battle_mvl/mxv .byte N06 .byte N08 , Gn5 .byte W12 @@ -1447,81 +1447,81 @@ bgm_t_battle_6: @********************** Track 7 **********************@ -bgm_t_battle_7: - .byte KEYSH , bgm_t_battle_key+0 +mus_intro_battle_7: + .byte KEYSH , mus_intro_battle_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 6*bgm_t_battle_mvl/mxv + .byte VOL , 6*mus_intro_battle_mvl/mxv .byte N48 , Dn4 , v112 .byte W02 - .byte VOL , 9*bgm_t_battle_mvl/mxv + .byte VOL , 9*mus_intro_battle_mvl/mxv .byte W03 - .byte 13*bgm_t_battle_mvl/mxv + .byte 13*mus_intro_battle_mvl/mxv .byte W03 - .byte 14*bgm_t_battle_mvl/mxv + .byte 14*mus_intro_battle_mvl/mxv .byte W04 - .byte 15*bgm_t_battle_mvl/mxv + .byte 15*mus_intro_battle_mvl/mxv .byte W02 - .byte 18*bgm_t_battle_mvl/mxv + .byte 18*mus_intro_battle_mvl/mxv .byte W03 - .byte 20*bgm_t_battle_mvl/mxv + .byte 20*mus_intro_battle_mvl/mxv .byte W03 - .byte 23*bgm_t_battle_mvl/mxv + .byte 23*mus_intro_battle_mvl/mxv .byte W04 - .byte 24*bgm_t_battle_mvl/mxv + .byte 24*mus_intro_battle_mvl/mxv .byte W02 - .byte 28*bgm_t_battle_mvl/mxv + .byte 28*mus_intro_battle_mvl/mxv .byte W03 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W03 - .byte 35*bgm_t_battle_mvl/mxv + .byte 35*mus_intro_battle_mvl/mxv .byte W04 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W02 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W03 - .byte 42*bgm_t_battle_mvl/mxv + .byte 42*mus_intro_battle_mvl/mxv .byte W03 - .byte 43*bgm_t_battle_mvl/mxv + .byte 43*mus_intro_battle_mvl/mxv .byte W04 - .byte 32*bgm_t_battle_mvl/mxv + .byte 32*mus_intro_battle_mvl/mxv .byte N48 , As4 .byte W02 - .byte VOL , 35*bgm_t_battle_mvl/mxv + .byte VOL , 35*mus_intro_battle_mvl/mxv .byte W03 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W03 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W04 - .byte 40*bgm_t_battle_mvl/mxv + .byte 40*mus_intro_battle_mvl/mxv .byte W02 - .byte 42*bgm_t_battle_mvl/mxv + .byte 42*mus_intro_battle_mvl/mxv .byte W03 - .byte 45*bgm_t_battle_mvl/mxv + .byte 45*mus_intro_battle_mvl/mxv .byte W03 - .byte 49*bgm_t_battle_mvl/mxv + .byte 49*mus_intro_battle_mvl/mxv .byte W04 - .byte 51*bgm_t_battle_mvl/mxv + .byte 51*mus_intro_battle_mvl/mxv .byte W02 - .byte 55*bgm_t_battle_mvl/mxv + .byte 55*mus_intro_battle_mvl/mxv .byte W03 - .byte 58*bgm_t_battle_mvl/mxv + .byte 58*mus_intro_battle_mvl/mxv .byte W03 - .byte 60*bgm_t_battle_mvl/mxv + .byte 60*mus_intro_battle_mvl/mxv .byte W04 - .byte 62*bgm_t_battle_mvl/mxv + .byte 62*mus_intro_battle_mvl/mxv .byte W02 - .byte 64*bgm_t_battle_mvl/mxv + .byte 64*mus_intro_battle_mvl/mxv .byte W03 - .byte 67*bgm_t_battle_mvl/mxv + .byte 67*mus_intro_battle_mvl/mxv .byte W03 - .byte 70*bgm_t_battle_mvl/mxv + .byte 70*mus_intro_battle_mvl/mxv .byte W04 - .byte 44*bgm_t_battle_mvl/mxv + .byte 44*mus_intro_battle_mvl/mxv .byte W06 .byte N06 , An2 .byte W06 @@ -1583,88 +1583,88 @@ bgm_t_battle_7: .byte N48 , As3 .byte W24 .byte MOD , 6 - .byte VOL , 42*bgm_t_battle_mvl/mxv + .byte VOL , 42*mus_intro_battle_mvl/mxv .byte W01 - .byte 40*bgm_t_battle_mvl/mxv + .byte 40*mus_intro_battle_mvl/mxv .byte W03 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W04 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W01 - .byte 35*bgm_t_battle_mvl/mxv + .byte 35*mus_intro_battle_mvl/mxv .byte W03 - .byte 33*bgm_t_battle_mvl/mxv + .byte 33*mus_intro_battle_mvl/mxv .byte W01 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W03 - .byte 29*bgm_t_battle_mvl/mxv + .byte 29*mus_intro_battle_mvl/mxv .byte W01 - .byte 27*bgm_t_battle_mvl/mxv + .byte 27*mus_intro_battle_mvl/mxv .byte W03 - .byte 27*bgm_t_battle_mvl/mxv + .byte 27*mus_intro_battle_mvl/mxv .byte W01 - .byte 26*bgm_t_battle_mvl/mxv + .byte 26*mus_intro_battle_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 44*bgm_t_battle_mvl/mxv + .byte VOL , 44*mus_intro_battle_mvl/mxv .byte N48 .byte W24 .byte MOD , 6 - .byte VOL , 42*bgm_t_battle_mvl/mxv + .byte VOL , 42*mus_intro_battle_mvl/mxv .byte W01 - .byte 41*bgm_t_battle_mvl/mxv + .byte 41*mus_intro_battle_mvl/mxv .byte W03 - .byte 39*bgm_t_battle_mvl/mxv + .byte 39*mus_intro_battle_mvl/mxv .byte W01 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W03 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W01 - .byte 34*bgm_t_battle_mvl/mxv + .byte 34*mus_intro_battle_mvl/mxv .byte W03 - .byte 32*bgm_t_battle_mvl/mxv + .byte 32*mus_intro_battle_mvl/mxv .byte W01 - .byte 31*bgm_t_battle_mvl/mxv + .byte 31*mus_intro_battle_mvl/mxv .byte W03 - .byte 29*bgm_t_battle_mvl/mxv + .byte 29*mus_intro_battle_mvl/mxv .byte W01 - .byte 26*bgm_t_battle_mvl/mxv + .byte 26*mus_intro_battle_mvl/mxv .byte W03 - .byte 23*bgm_t_battle_mvl/mxv + .byte 23*mus_intro_battle_mvl/mxv .byte W01 - .byte 22*bgm_t_battle_mvl/mxv + .byte 22*mus_intro_battle_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 44*bgm_t_battle_mvl/mxv + .byte VOL , 44*mus_intro_battle_mvl/mxv .byte N48 , Bn3 .byte W24 .byte MOD , 6 - .byte VOL , 43*bgm_t_battle_mvl/mxv + .byte VOL , 43*mus_intro_battle_mvl/mxv .byte W01 - .byte 41*bgm_t_battle_mvl/mxv + .byte 41*mus_intro_battle_mvl/mxv .byte W03 - .byte 39*bgm_t_battle_mvl/mxv + .byte 39*mus_intro_battle_mvl/mxv .byte W01 - .byte 38*bgm_t_battle_mvl/mxv + .byte 38*mus_intro_battle_mvl/mxv .byte W03 - .byte 36*bgm_t_battle_mvl/mxv + .byte 36*mus_intro_battle_mvl/mxv .byte W01 - .byte 33*bgm_t_battle_mvl/mxv + .byte 33*mus_intro_battle_mvl/mxv .byte W03 - .byte 32*bgm_t_battle_mvl/mxv + .byte 32*mus_intro_battle_mvl/mxv .byte W01 - .byte 30*bgm_t_battle_mvl/mxv + .byte 30*mus_intro_battle_mvl/mxv .byte W03 - .byte 27*bgm_t_battle_mvl/mxv + .byte 27*mus_intro_battle_mvl/mxv .byte W01 - .byte 26*bgm_t_battle_mvl/mxv + .byte 26*mus_intro_battle_mvl/mxv .byte W03 - .byte 24*bgm_t_battle_mvl/mxv + .byte 24*mus_intro_battle_mvl/mxv .byte W01 - .byte 22*bgm_t_battle_mvl/mxv + .byte 22*mus_intro_battle_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 44*bgm_t_battle_mvl/mxv + .byte VOL , 44*mus_intro_battle_mvl/mxv .byte N04 , Cs3 .byte W08 .byte N04 @@ -1776,18 +1776,18 @@ bgm_t_battle_7: .byte MOD , 7 .byte W48 .byte 1 - .byte VOL , 44*bgm_t_battle_mvl/mxv + .byte VOL , 44*mus_intro_battle_mvl/mxv .byte N06 , Ds1 .byte W12 .byte FINE @********************** Track 8 **********************@ -bgm_t_battle_8: - .byte KEYSH , bgm_t_battle_key+0 +mus_intro_battle_8: + .byte KEYSH , mus_intro_battle_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 72*bgm_t_battle_mvl/mxv + .byte VOL , 72*mus_intro_battle_mvl/mxv .byte N03 , En1 , v068 .byte W03 .byte N03 @@ -1852,7 +1852,7 @@ bgm_t_battle_8: .byte W03 .byte En1 , v112 .byte W03 -bgm_t_battle_8_000: +mus_intro_battle_8_000: .byte N06 , En1 , v112 .byte W12 .byte N06 @@ -1980,7 +1980,7 @@ bgm_t_battle_8_000: .byte W03 .byte N03 .byte W03 - .byte VOL , 63*bgm_t_battle_mvl/mxv + .byte VOL , 63*mus_intro_battle_mvl/mxv .byte N04 , Fs1 , v112 .byte N48 , An2 , v084 .byte W08 @@ -2032,7 +2032,7 @@ bgm_t_battle_8_000: .byte W08 .byte N04 .byte W08 - .byte VOL , 72*bgm_t_battle_mvl/mxv + .byte VOL , 72*mus_intro_battle_mvl/mxv .byte N03 , En1 , v112 .byte W03 .byte En1 , v064 @@ -2101,7 +2101,7 @@ bgm_t_battle_8_000: .byte N48 , An2 , v084 .byte W48 .byte PATT - .word bgm_t_battle_8_000 + .word mus_intro_battle_8_000 .byte N06 , En1 , v112 .byte W12 .byte N06 @@ -2150,15 +2150,15 @@ bgm_t_battle_8_000: @********************** Track 9 **********************@ -bgm_t_battle_9: - .byte KEYSH , bgm_t_battle_key+0 +mus_intro_battle_9: + .byte KEYSH , mus_intro_battle_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 65*bgm_t_battle_mvl/mxv + .byte VOL , 65*mus_intro_battle_mvl/mxv .byte W48 .byte N06 , Fn2 , v092 .byte W12 @@ -2337,22 +2337,22 @@ bgm_t_battle_9: @******************************************************@ .align 2 -bgm_t_battle: +mus_intro_battle: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_t_battle_pri @ Priority - .byte bgm_t_battle_rev @ Reverb. + .byte mus_intro_battle_pri @ Priority + .byte mus_intro_battle_rev @ Reverb. - .word bgm_t_battle_grp + .word mus_intro_battle_grp - .word bgm_t_battle_1 - .word bgm_t_battle_2 - .word bgm_t_battle_3 - .word bgm_t_battle_4 - .word bgm_t_battle_5 - .word bgm_t_battle_6 - .word bgm_t_battle_7 - .word bgm_t_battle_8 - .word bgm_t_battle_9 + .word mus_intro_battle_1 + .word mus_intro_battle_2 + .word mus_intro_battle_3 + .word mus_intro_battle_4 + .word mus_intro_battle_5 + .word mus_intro_battle_6 + .word mus_intro_battle_7 + .word mus_intro_battle_8 + .word mus_intro_battle_9 .end diff --git a/sound/songs/bgm_fanfa1.s b/sound/songs/mus_level_up.s index ac5b1f2f6..7508d5572 100644 --- a/sound/songs/bgm_fanfa1.s +++ b/sound/songs/mus_level_up.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_fanfa1_grp, voicegroup009 - .equ bgm_fanfa1_pri, 5 - .equ bgm_fanfa1_rev, reverb_set+50 - .equ bgm_fanfa1_mvl, 127 - .equ bgm_fanfa1_key, 0 - .equ bgm_fanfa1_tbs, 1 - .equ bgm_fanfa1_exg, 0 - .equ bgm_fanfa1_cmp, 1 + .equ mus_level_up_grp, voicegroup009 + .equ mus_level_up_pri, 5 + .equ mus_level_up_rev, reverb_set+50 + .equ mus_level_up_mvl, 127 + .equ mus_level_up_key, 0 + .equ mus_level_up_tbs, 1 + .equ mus_level_up_exg, 0 + .equ mus_level_up_cmp, 1 .section .rodata - .global bgm_fanfa1 + .global mus_level_up .align 2 @********************** Track 1 **********************@ -bgm_fanfa1_1: - .byte KEYSH , bgm_fanfa1_key+0 - .byte TEMPO , 174*bgm_fanfa1_tbs/2 +mus_level_up_1: + .byte KEYSH , mus_level_up_key+0 + .byte TEMPO , 174*mus_level_up_tbs/2 .byte VOICE , 46 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 90*bgm_fanfa1_mvl/mxv + .byte VOL , 90*mus_level_up_mvl/mxv .byte PAN , c_v+48 .byte W08 .byte N04 , Bn3 , v100 @@ -39,12 +39,12 @@ bgm_fanfa1_1: @********************** Track 2 **********************@ -bgm_fanfa1_2: - .byte KEYSH , bgm_fanfa1_key+0 +mus_level_up_2: + .byte KEYSH , mus_level_up_key+0 .byte VOICE , 46 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 90*bgm_fanfa1_mvl/mxv + .byte VOL , 90*mus_level_up_mvl/mxv .byte W08 .byte PAN , c_v-16 .byte N04 , En4 , v100 @@ -65,12 +65,12 @@ bgm_fanfa1_2: @********************** Track 3 **********************@ -bgm_fanfa1_3: - .byte KEYSH , bgm_fanfa1_key+0 +mus_level_up_3: + .byte KEYSH , mus_level_up_key+0 .byte VOICE , 46 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 90*bgm_fanfa1_mvl/mxv + .byte VOL , 90*mus_level_up_mvl/mxv .byte PAN , c_v-48 .byte W08 .byte N04 , Gs3 , v068 @@ -88,12 +88,12 @@ bgm_fanfa1_3: @********************** Track 4 **********************@ -bgm_fanfa1_4: - .byte KEYSH , bgm_fanfa1_key+0 +mus_level_up_4: + .byte KEYSH , mus_level_up_key+0 .byte VOICE , 84 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 90*bgm_fanfa1_mvl/mxv + .byte VOL , 90*mus_level_up_mvl/mxv .byte W08 .byte N04 , Bn3 , v048 .byte W04 @@ -111,26 +111,26 @@ bgm_fanfa1_4: .byte W10 .byte MOD , 5 .byte W03 - .byte VOL , 71*bgm_fanfa1_mvl/mxv + .byte VOL , 71*mus_level_up_mvl/mxv .byte W03 - .byte 48*bgm_fanfa1_mvl/mxv + .byte 48*mus_level_up_mvl/mxv .byte W03 - .byte 25*bgm_fanfa1_mvl/mxv + .byte 25*mus_level_up_mvl/mxv .byte W03 - .byte 10*bgm_fanfa1_mvl/mxv + .byte 10*mus_level_up_mvl/mxv .byte W03 - .byte 0*bgm_fanfa1_mvl/mxv + .byte 0*mus_level_up_mvl/mxv .byte W15 .byte FINE @********************** Track 5 **********************@ -bgm_fanfa1_5: - .byte KEYSH , bgm_fanfa1_key+0 +mus_level_up_5: + .byte KEYSH , mus_level_up_key+0 .byte VOICE , 85 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 90*bgm_fanfa1_mvl/mxv + .byte VOL , 90*mus_level_up_mvl/mxv .byte W08 .byte N04 , En4 , v048 .byte W04 @@ -148,33 +148,33 @@ bgm_fanfa1_5: .byte W10 .byte MOD , 5 .byte W03 - .byte VOL , 71*bgm_fanfa1_mvl/mxv + .byte VOL , 71*mus_level_up_mvl/mxv .byte W03 - .byte 48*bgm_fanfa1_mvl/mxv + .byte 48*mus_level_up_mvl/mxv .byte W03 - .byte 25*bgm_fanfa1_mvl/mxv + .byte 25*mus_level_up_mvl/mxv .byte W03 - .byte 10*bgm_fanfa1_mvl/mxv + .byte 10*mus_level_up_mvl/mxv .byte W03 - .byte 0*bgm_fanfa1_mvl/mxv + .byte 0*mus_level_up_mvl/mxv .byte W15 .byte FINE @******************************************************@ .align 2 -bgm_fanfa1: +mus_level_up: .byte 5 @ NumTrks .byte 0 @ NumBlks - .byte bgm_fanfa1_pri @ Priority - .byte bgm_fanfa1_rev @ Reverb. + .byte mus_level_up_pri @ Priority + .byte mus_level_up_rev @ Reverb. - .word bgm_fanfa1_grp + .word mus_level_up_grp - .word bgm_fanfa1_1 - .word bgm_fanfa1_2 - .word bgm_fanfa1_3 - .word bgm_fanfa1_4 - .word bgm_fanfa1_5 + .word mus_level_up_1 + .word mus_level_up_2 + .word mus_level_up_3 + .word mus_level_up_4 + .word mus_level_up_5 .end diff --git a/sound/songs/bgm_minamo.s b/sound/songs/mus_lilycove.s index fb087ec8b..f8a37151d 100644 --- a/sound/songs/bgm_minamo.s +++ b/sound/songs/mus_lilycove.s @@ -1,35 +1,35 @@ .include "MPlayDef.s" - .equ bgm_minamo_grp, voicegroup051 - .equ bgm_minamo_pri, 0 - .equ bgm_minamo_rev, reverb_set+50 - .equ bgm_minamo_mvl, 127 - .equ bgm_minamo_key, 0 - .equ bgm_minamo_tbs, 1 - .equ bgm_minamo_exg, 0 - .equ bgm_minamo_cmp, 1 + .equ mus_lilycove_grp, voicegroup051 + .equ mus_lilycove_pri, 0 + .equ mus_lilycove_rev, reverb_set+50 + .equ mus_lilycove_mvl, 127 + .equ mus_lilycove_key, 0 + .equ mus_lilycove_tbs, 1 + .equ mus_lilycove_exg, 0 + .equ mus_lilycove_cmp, 1 .section .rodata - .global bgm_minamo + .global mus_lilycove .align 2 @********************** Track 1 **********************@ -bgm_minamo_1: - .byte KEYSH , bgm_minamo_key+0 -bgm_minamo_1_B1: - .byte TEMPO , 80*bgm_minamo_tbs/2 +mus_lilycove_1: + .byte KEYSH , mus_lilycove_key+0 +mus_lilycove_1_B1: + .byte TEMPO , 80*mus_lilycove_tbs/2 .byte VOICE , 45 .byte LFOS , 44 .byte PAN , c_v-44 - .byte VOL , 58*bgm_minamo_mvl/mxv + .byte VOL , 58*mus_lilycove_mvl/mxv .byte W24 - .byte TEMPO , 92*bgm_minamo_tbs/2 + .byte TEMPO , 92*mus_lilycove_tbs/2 .byte W72 .byte W48 - .byte TEMPO , 80*bgm_minamo_tbs/2 + .byte TEMPO , 80*mus_lilycove_tbs/2 .byte W36 - .byte TEMPO , 92*bgm_minamo_tbs/2 + .byte TEMPO , 92*mus_lilycove_tbs/2 .byte W12 .byte W96 .byte W48 @@ -182,36 +182,36 @@ bgm_minamo_1_B1: .byte W03 .byte N44 , Ds4 .byte W21 - .byte VOL , 52*bgm_minamo_mvl/mxv + .byte VOL , 52*mus_lilycove_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 48*bgm_minamo_mvl/mxv + .byte VOL , 48*mus_lilycove_mvl/mxv .byte W03 - .byte 42*bgm_minamo_mvl/mxv + .byte 42*mus_lilycove_mvl/mxv .byte W03 - .byte 40*bgm_minamo_mvl/mxv + .byte 40*mus_lilycove_mvl/mxv .byte W04 - .byte 36*bgm_minamo_mvl/mxv + .byte 36*mus_lilycove_mvl/mxv .byte W02 - .byte 34*bgm_minamo_mvl/mxv + .byte 34*mus_lilycove_mvl/mxv .byte W03 - .byte 31*bgm_minamo_mvl/mxv + .byte 31*mus_lilycove_mvl/mxv .byte W07 .byte MOD , 0 .byte N06 , Ds4 , v036 .byte W24 .byte W96 .byte W48 - .byte TEMPO , 76*bgm_minamo_tbs/2 + .byte TEMPO , 76*mus_lilycove_tbs/2 .byte VOICE , 46 - .byte VOL , 53*bgm_minamo_mvl/mxv + .byte VOL , 53*mus_lilycove_mvl/mxv .byte N12 , Cs3 , v112 .byte W12 .byte Ds3 .byte W12 .byte En3 .byte W09 - .byte TEMPO , 86*bgm_minamo_tbs/2 + .byte TEMPO , 86*mus_lilycove_tbs/2 .byte W03 .byte Fn3 .byte W12 @@ -221,8 +221,8 @@ bgm_minamo_1_B1: .byte W06 .byte An3 .byte W06 - .byte TEMPO , 92*bgm_minamo_tbs/2 - .byte VOL , 56*bgm_minamo_mvl/mxv + .byte TEMPO , 92*mus_lilycove_tbs/2 + .byte VOL , 56*mus_lilycove_mvl/mxv .byte N02 , Fs3 .byte W02 .byte As3 @@ -348,7 +348,7 @@ bgm_minamo_1_B1: .byte N06 , Fn5 , v036 .byte W09 .byte VOICE , 48 - .byte VOL , 42*bgm_minamo_mvl/mxv + .byte VOL , 42*mus_lilycove_mvl/mxv .byte W09 .byte N03 , Cn3 , v112 .byte W03 @@ -428,17 +428,17 @@ bgm_minamo_1_B1: .byte W03 .byte Dn3 .byte W03 - .byte TEMPO , 88*bgm_minamo_tbs/2 + .byte TEMPO , 88*mus_lilycove_tbs/2 .byte N30 , Ds3 .byte W15 .byte MOD , 6 .byte W09 - .byte TEMPO , 86*bgm_minamo_tbs/2 + .byte TEMPO , 86*mus_lilycove_tbs/2 .byte 0 .byte W06 .byte N06 , Ds3 , v036 .byte W06 - .byte TEMPO , 74*bgm_minamo_tbs/2 + .byte TEMPO , 74*mus_lilycove_tbs/2 .byte N12 , Fs3 , v112 .byte W12 .byte N03 , En3 @@ -457,7 +457,7 @@ bgm_minamo_1_B1: .byte W03 .byte As3 .byte W03 - .byte TEMPO , 92*bgm_minamo_tbs/2 + .byte TEMPO , 92*mus_lilycove_tbs/2 .byte VOICE , 60 .byte N36 , Bn3 .byte W24 @@ -519,7 +519,7 @@ bgm_minamo_1_B1: .byte W06 .byte En4 .byte W06 - .byte TEMPO , 90*bgm_minamo_tbs/2 + .byte TEMPO , 90*mus_lilycove_tbs/2 .byte N12 , Gn4 .byte W12 .byte N03 , En4 @@ -530,10 +530,10 @@ bgm_minamo_1_B1: .byte W06 .byte N12 , Dn4 .byte W12 - .byte TEMPO , 74*bgm_minamo_tbs/2 + .byte TEMPO , 74*mus_lilycove_tbs/2 .byte Cn4 .byte W12 - .byte TEMPO , 68*bgm_minamo_tbs/2 + .byte TEMPO , 68*mus_lilycove_tbs/2 .byte Bn3 .byte W12 .byte N06 , An3 @@ -541,16 +541,16 @@ bgm_minamo_1_B1: .byte Gn3 .byte W06 .byte GOTO - .word bgm_minamo_1_B1 + .word mus_lilycove_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_minamo_2: - .byte KEYSH , bgm_minamo_key+0 -bgm_minamo_2_B1: +mus_lilycove_2: + .byte KEYSH , mus_lilycove_key+0 +mus_lilycove_2_B1: .byte VOICE , 48 - .byte VOL , 85*bgm_minamo_mvl/mxv + .byte VOL , 85*mus_lilycove_mvl/mxv .byte PAN , c_v+0 .byte N12 , Bn1 , v112 .byte W12 @@ -870,7 +870,7 @@ bgm_minamo_2_B1: .byte W09 .byte N12 , Cs2 , v112 .byte W12 -bgm_minamo_2_000: +mus_lilycove_2_000: .byte N03 , Gs2 , v112 .byte W03 .byte N06 , Gs2 , v036 @@ -953,7 +953,7 @@ bgm_minamo_2_000: .byte N12 , Cs2 , v112 .byte W12 .byte PATT - .word bgm_minamo_2_000 + .word mus_lilycove_2_000 .byte VOICE , 58 .byte N12 , En1 , v112 .byte W12 @@ -1129,17 +1129,17 @@ bgm_minamo_2_000: .byte An1 , v124 .byte W06 .byte GOTO - .word bgm_minamo_2_B1 + .word mus_lilycove_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_minamo_3: - .byte KEYSH , bgm_minamo_key+0 -bgm_minamo_3_B1: +mus_lilycove_3: + .byte KEYSH , mus_lilycove_key+0 +mus_lilycove_3_B1: .byte VOICE , 45 .byte PAN , c_v+44 - .byte VOL , 56*bgm_minamo_mvl/mxv + .byte VOL , 56*mus_lilycove_mvl/mxv .byte W09 .byte N03 , Gn3 , v064 .byte W03 @@ -1245,7 +1245,7 @@ bgm_minamo_3_B1: .byte W03 .byte Fs3 , v032 .byte W03 -bgm_minamo_3_000: +mus_lilycove_3_000: .byte N12 , Gn3 , v112 .byte W12 .byte N06 , Gn3 , v032 @@ -1304,7 +1304,7 @@ bgm_minamo_3_000: .byte N06 , Cn4 , v032 .byte W09 .byte VOICE , 48 - .byte VOL , 42*bgm_minamo_mvl/mxv + .byte VOL , 42*mus_lilycove_mvl/mxv .byte W09 .byte N03 , An3 , v064 .byte W03 @@ -1339,7 +1339,7 @@ bgm_minamo_3_000: .byte Fs3 , v032 .byte W03 .byte PATT - .word bgm_minamo_3_000 + .word mus_lilycove_3_000 .byte N03 , Fs3 , v112 .byte W03 .byte N06 , Fs3 , v032 @@ -1371,7 +1371,7 @@ bgm_minamo_3_000: .byte N06 , Gs3 , v032 .byte W09 .byte VOICE , 45 - .byte VOL , 56*bgm_minamo_mvl/mxv + .byte VOL , 56*mus_lilycove_mvl/mxv .byte W09 .byte N03 , Gn3 , v064 .byte W03 @@ -1693,163 +1693,163 @@ bgm_minamo_3_000: .byte N06 , Bn3 , v032 .byte W09 .byte GOTO - .word bgm_minamo_3_B1 + .word mus_lilycove_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_minamo_4: - .byte KEYSH , bgm_minamo_key+0 -bgm_minamo_4_B1: +mus_lilycove_4: + .byte KEYSH , mus_lilycove_key+0 +mus_lilycove_4_B1: .byte VOICE , 48 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 8*bgm_minamo_mvl/mxv + .byte VOL , 8*mus_lilycove_mvl/mxv .byte TIE , Fs4 , v112 .byte W02 - .byte VOL , 9*bgm_minamo_mvl/mxv + .byte VOL , 9*mus_lilycove_mvl/mxv .byte W12 - .byte 10*bgm_minamo_mvl/mxv + .byte 10*mus_lilycove_mvl/mxv .byte W03 - .byte 14*bgm_minamo_mvl/mxv + .byte 14*mus_lilycove_mvl/mxv .byte W07 - .byte 18*bgm_minamo_mvl/mxv + .byte 18*mus_lilycove_mvl/mxv .byte W05 - .byte 20*bgm_minamo_mvl/mxv + .byte 20*mus_lilycove_mvl/mxv .byte W03 - .byte 21*bgm_minamo_mvl/mxv + .byte 21*mus_lilycove_mvl/mxv .byte W04 - .byte 23*bgm_minamo_mvl/mxv + .byte 23*mus_lilycove_mvl/mxv .byte W02 - .byte 24*bgm_minamo_mvl/mxv + .byte 24*mus_lilycove_mvl/mxv .byte W03 - .byte 26*bgm_minamo_mvl/mxv + .byte 26*mus_lilycove_mvl/mxv .byte W03 - .byte 29*bgm_minamo_mvl/mxv + .byte 29*mus_lilycove_mvl/mxv .byte W04 - .byte 30*bgm_minamo_mvl/mxv + .byte 30*mus_lilycove_mvl/mxv .byte W02 - .byte 32*bgm_minamo_mvl/mxv + .byte 32*mus_lilycove_mvl/mxv .byte W03 - .byte 34*bgm_minamo_mvl/mxv + .byte 34*mus_lilycove_mvl/mxv .byte W07 - .byte 35*bgm_minamo_mvl/mxv + .byte 35*mus_lilycove_mvl/mxv .byte W02 - .byte 36*bgm_minamo_mvl/mxv + .byte 36*mus_lilycove_mvl/mxv .byte W03 - .byte 38*bgm_minamo_mvl/mxv + .byte 38*mus_lilycove_mvl/mxv .byte W03 - .byte 41*bgm_minamo_mvl/mxv + .byte 41*mus_lilycove_mvl/mxv .byte W04 - .byte 42*bgm_minamo_mvl/mxv + .byte 42*mus_lilycove_mvl/mxv .byte W02 - .byte 44*bgm_minamo_mvl/mxv + .byte 44*mus_lilycove_mvl/mxv .byte W03 - .byte 48*bgm_minamo_mvl/mxv + .byte 48*mus_lilycove_mvl/mxv .byte W03 - .byte 51*bgm_minamo_mvl/mxv + .byte 51*mus_lilycove_mvl/mxv .byte W04 - .byte 52*bgm_minamo_mvl/mxv + .byte 52*mus_lilycove_mvl/mxv .byte W02 - .byte 56*bgm_minamo_mvl/mxv + .byte 56*mus_lilycove_mvl/mxv .byte W03 - .byte 58*bgm_minamo_mvl/mxv + .byte 58*mus_lilycove_mvl/mxv .byte W03 - .byte 59*bgm_minamo_mvl/mxv + .byte 59*mus_lilycove_mvl/mxv .byte W04 .byte W02 - .byte 62*bgm_minamo_mvl/mxv + .byte 62*mus_lilycove_mvl/mxv .byte W04 - .byte 62*bgm_minamo_mvl/mxv + .byte 62*mus_lilycove_mvl/mxv .byte W02 - .byte 59*bgm_minamo_mvl/mxv + .byte 59*mus_lilycove_mvl/mxv .byte W04 - .byte 58*bgm_minamo_mvl/mxv + .byte 58*mus_lilycove_mvl/mxv .byte W02 - .byte 54*bgm_minamo_mvl/mxv + .byte 54*mus_lilycove_mvl/mxv .byte W03 - .byte 51*bgm_minamo_mvl/mxv + .byte 51*mus_lilycove_mvl/mxv .byte W03 - .byte 49*bgm_minamo_mvl/mxv + .byte 49*mus_lilycove_mvl/mxv .byte W04 - .byte 48*bgm_minamo_mvl/mxv + .byte 48*mus_lilycove_mvl/mxv .byte W02 - .byte 44*bgm_minamo_mvl/mxv + .byte 44*mus_lilycove_mvl/mxv .byte W03 - .byte 41*bgm_minamo_mvl/mxv + .byte 41*mus_lilycove_mvl/mxv .byte W01 .byte EOT .byte N06 , En4 .byte W02 - .byte VOL , 40*bgm_minamo_mvl/mxv + .byte VOL , 40*mus_lilycove_mvl/mxv .byte W04 - .byte 38*bgm_minamo_mvl/mxv + .byte 38*mus_lilycove_mvl/mxv .byte N06 , Ds4 .byte W02 - .byte VOL , 35*bgm_minamo_mvl/mxv + .byte VOL , 35*mus_lilycove_mvl/mxv .byte W03 - .byte 34*bgm_minamo_mvl/mxv + .byte 34*mus_lilycove_mvl/mxv .byte W01 .byte N06 , En4 .byte W02 - .byte VOL , 32*bgm_minamo_mvl/mxv + .byte VOL , 32*mus_lilycove_mvl/mxv .byte W04 - .byte 29*bgm_minamo_mvl/mxv + .byte 29*mus_lilycove_mvl/mxv .byte TIE , Fs4 .byte W02 - .byte VOL , 24*bgm_minamo_mvl/mxv + .byte VOL , 24*mus_lilycove_mvl/mxv .byte W03 - .byte 23*bgm_minamo_mvl/mxv + .byte 23*mus_lilycove_mvl/mxv .byte W09 - .byte 21*bgm_minamo_mvl/mxv + .byte 21*mus_lilycove_mvl/mxv .byte W03 - .byte 20*bgm_minamo_mvl/mxv + .byte 20*mus_lilycove_mvl/mxv .byte W03 - .byte 21*bgm_minamo_mvl/mxv + .byte 21*mus_lilycove_mvl/mxv .byte W06 - .byte 20*bgm_minamo_mvl/mxv + .byte 20*mus_lilycove_mvl/mxv .byte W15 - .byte 26*bgm_minamo_mvl/mxv + .byte 26*mus_lilycove_mvl/mxv .byte W03 - .byte 29*bgm_minamo_mvl/mxv + .byte 29*mus_lilycove_mvl/mxv .byte W04 - .byte 30*bgm_minamo_mvl/mxv + .byte 30*mus_lilycove_mvl/mxv .byte W02 - .byte 32*bgm_minamo_mvl/mxv + .byte 32*mus_lilycove_mvl/mxv .byte W03 - .byte 34*bgm_minamo_mvl/mxv + .byte 34*mus_lilycove_mvl/mxv .byte W07 - .byte 35*bgm_minamo_mvl/mxv + .byte 35*mus_lilycove_mvl/mxv .byte W02 - .byte 36*bgm_minamo_mvl/mxv + .byte 36*mus_lilycove_mvl/mxv .byte W03 - .byte 38*bgm_minamo_mvl/mxv + .byte 38*mus_lilycove_mvl/mxv .byte W03 - .byte 41*bgm_minamo_mvl/mxv + .byte 41*mus_lilycove_mvl/mxv .byte W04 - .byte 42*bgm_minamo_mvl/mxv + .byte 42*mus_lilycove_mvl/mxv .byte W02 - .byte 44*bgm_minamo_mvl/mxv + .byte 44*mus_lilycove_mvl/mxv .byte W03 - .byte 48*bgm_minamo_mvl/mxv + .byte 48*mus_lilycove_mvl/mxv .byte W03 - .byte 51*bgm_minamo_mvl/mxv + .byte 51*mus_lilycove_mvl/mxv .byte W04 - .byte 52*bgm_minamo_mvl/mxv + .byte 52*mus_lilycove_mvl/mxv .byte W02 - .byte 56*bgm_minamo_mvl/mxv + .byte 56*mus_lilycove_mvl/mxv .byte W03 - .byte 58*bgm_minamo_mvl/mxv + .byte 58*mus_lilycove_mvl/mxv .byte W03 - .byte 59*bgm_minamo_mvl/mxv + .byte 59*mus_lilycove_mvl/mxv .byte W06 - .byte 62*bgm_minamo_mvl/mxv + .byte 62*mus_lilycove_mvl/mxv .byte W04 - .byte 62*bgm_minamo_mvl/mxv + .byte 62*mus_lilycove_mvl/mxv .byte W02 - .byte 59*bgm_minamo_mvl/mxv + .byte 59*mus_lilycove_mvl/mxv .byte W01 - .byte 68*bgm_minamo_mvl/mxv + .byte 68*mus_lilycove_mvl/mxv .byte W03 .byte EOT .byte N06 , Ds4 @@ -1908,37 +1908,37 @@ bgm_minamo_4_B1: .byte W03 .byte En4 .byte W03 - .byte VOL , 61*bgm_minamo_mvl/mxv + .byte VOL , 61*mus_lilycove_mvl/mxv .byte N03 , Fn4 .byte W03 - .byte VOL , 62*bgm_minamo_mvl/mxv + .byte VOL , 62*mus_lilycove_mvl/mxv .byte N24 , Fs4 .byte W02 - .byte VOL , 63*bgm_minamo_mvl/mxv + .byte VOL , 63*mus_lilycove_mvl/mxv .byte W01 - .byte 68*bgm_minamo_mvl/mxv + .byte 68*mus_lilycove_mvl/mxv .byte W09 .byte W12 .byte N03 , En4 .byte W06 .byte N06 , Fs4 .byte W06 - .byte VOL , 34*bgm_minamo_mvl/mxv + .byte VOL , 34*mus_lilycove_mvl/mxv .byte N48 , Ds4 .byte W02 - .byte VOL , 39*bgm_minamo_mvl/mxv + .byte VOL , 39*mus_lilycove_mvl/mxv .byte W03 - .byte 44*bgm_minamo_mvl/mxv + .byte 44*mus_lilycove_mvl/mxv .byte W03 - .byte 50*bgm_minamo_mvl/mxv + .byte 50*mus_lilycove_mvl/mxv .byte W04 - .byte 53*bgm_minamo_mvl/mxv + .byte 53*mus_lilycove_mvl/mxv .byte W02 - .byte 57*bgm_minamo_mvl/mxv + .byte 57*mus_lilycove_mvl/mxv .byte W03 - .byte 61*bgm_minamo_mvl/mxv + .byte 61*mus_lilycove_mvl/mxv .byte W01 - .byte 68*bgm_minamo_mvl/mxv + .byte 68*mus_lilycove_mvl/mxv .byte W30 .byte N03 , Fs4 .byte W06 @@ -2001,7 +2001,7 @@ bgm_minamo_4_B1: .byte N06 , Ds4 , v036 .byte W24 .byte VOICE , 45 - .byte VOL , 76*bgm_minamo_mvl/mxv + .byte VOL , 76*mus_lilycove_mvl/mxv .byte N06 , Ds4 , v112 .byte W06 .byte Ds4 , v036 @@ -2051,7 +2051,7 @@ bgm_minamo_4_B1: .byte En4 , v036 .byte W06 .byte VOICE , 48 - .byte VOL , 65*bgm_minamo_mvl/mxv + .byte VOL , 65*mus_lilycove_mvl/mxv .byte N12 , Cs4 , v112 .byte W12 .byte Ds4 @@ -2296,22 +2296,22 @@ bgm_minamo_4_B1: .byte En4 .byte W12 .byte GOTO - .word bgm_minamo_4_B1 + .word mus_lilycove_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_minamo_5: - .byte KEYSH , bgm_minamo_key+0 -bgm_minamo_5_B1: +mus_lilycove_5: + .byte KEYSH , mus_lilycove_key+0 +mus_lilycove_5_B1: .byte VOICE , 82 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 32*bgm_minamo_mvl/mxv + .byte VOL , 32*mus_lilycove_mvl/mxv .byte W96 .byte W96 .byte W96 -bgm_minamo_5_000: +mus_lilycove_5_000: .byte W09 .byte N03 , Cn3 , v112 .byte W03 @@ -2358,7 +2358,7 @@ bgm_minamo_5_000: .byte W48 .byte W96 .byte PATT - .word bgm_minamo_5_000 + .word mus_lilycove_5_000 .byte N06 , Bn2 , v112 .byte W06 .byte Ds3 @@ -2473,17 +2473,17 @@ bgm_minamo_5_000: .byte Gn2 .byte W06 .byte GOTO - .word bgm_minamo_5_B1 + .word mus_lilycove_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_minamo_6: - .byte KEYSH , bgm_minamo_key+0 -bgm_minamo_6_B1: +mus_lilycove_6: + .byte KEYSH , mus_lilycove_key+0 +mus_lilycove_6_B1: .byte VOICE , 45 .byte PAN , c_v-33 - .byte VOL , 66*bgm_minamo_mvl/mxv + .byte VOL , 66*mus_lilycove_mvl/mxv .byte W12 .byte N03 , Ds3 , v112 .byte W03 @@ -2557,7 +2557,7 @@ bgm_minamo_6_B1: .byte W12 .byte VOICE , 80 .byte PAN , c_v+0 - .byte VOL , 42*bgm_minamo_mvl/mxv + .byte VOL , 42*mus_lilycove_mvl/mxv .byte W12 .byte N03 , En3 .byte W03 @@ -2587,7 +2587,7 @@ bgm_minamo_6_B1: .byte W03 .byte Ds3 , v036 .byte W03 -bgm_minamo_6_000: +mus_lilycove_6_000: .byte N12 , En3 , v112 .byte W12 .byte N06 , En3 , v036 @@ -2671,7 +2671,7 @@ bgm_minamo_6_000: .byte Ds3 , v036 .byte W03 .byte PATT - .word bgm_minamo_6_000 + .word mus_lilycove_6_000 .byte N03 , Ds3 , v112 .byte W03 .byte N06 , Ds3 , v036 @@ -2822,7 +2822,7 @@ bgm_minamo_6_000: .byte W03 .byte N06 , Fs3 , v036 .byte W09 -bgm_minamo_6_001: +mus_lilycove_6_001: .byte N03 , Fs3 , v112 .byte W03 .byte N06 , Fs3 , v036 @@ -2905,7 +2905,7 @@ bgm_minamo_6_001: .byte N06 , Fs3 , v036 .byte W09 .byte PATT - .word bgm_minamo_6_001 + .word mus_lilycove_6_001 .byte N03 , En3 , v112 .byte W03 .byte En3 , v036 @@ -2935,25 +2935,25 @@ bgm_minamo_6_001: .byte N06 , En3 , v036 .byte W09 .byte GOTO - .word bgm_minamo_6_B1 + .word mus_lilycove_6_B1 .byte FINE @******************************************************@ .align 2 -bgm_minamo: +mus_lilycove: .byte 6 @ NumTrks .byte 0 @ NumBlks - .byte bgm_minamo_pri @ Priority - .byte bgm_minamo_rev @ Reverb. + .byte mus_lilycove_pri @ Priority + .byte mus_lilycove_rev @ Reverb. - .word bgm_minamo_grp + .word mus_lilycove_grp - .word bgm_minamo_1 - .word bgm_minamo_2 - .word bgm_minamo_3 - .word bgm_minamo_4 - .word bgm_minamo_5 - .word bgm_minamo_6 + .word mus_lilycove_1 + .word mus_lilycove_2 + .word mus_lilycove_3 + .word mus_lilycove_4 + .word mus_lilycove_5 + .word mus_lilycove_6 .end diff --git a/sound/songs/bgm_bijyutu.s b/sound/songs/mus_lilycove_museum.s index fc1b17083..bc924115d 100644 --- a/sound/songs/bgm_bijyutu.s +++ b/sound/songs/mus_lilycove_museum.s @@ -1,43 +1,43 @@ .include "MPlayDef.s" - .equ bgm_bijyutu_grp, voicegroup017 - .equ bgm_bijyutu_pri, 0 - .equ bgm_bijyutu_rev, reverb_set+50 - .equ bgm_bijyutu_mvl, 127 - .equ bgm_bijyutu_key, 0 - .equ bgm_bijyutu_tbs, 1 - .equ bgm_bijyutu_exg, 0 - .equ bgm_bijyutu_cmp, 1 + .equ mus_lilycove_museum_grp, voicegroup017 + .equ mus_lilycove_museum_pri, 0 + .equ mus_lilycove_museum_rev, reverb_set+50 + .equ mus_lilycove_museum_mvl, 127 + .equ mus_lilycove_museum_key, 0 + .equ mus_lilycove_museum_tbs, 1 + .equ mus_lilycove_museum_exg, 0 + .equ mus_lilycove_museum_cmp, 1 .section .rodata - .global bgm_bijyutu + .global mus_lilycove_museum .align 2 @********************** Track 1 **********************@ -bgm_bijyutu_1: - .byte KEYSH , bgm_bijyutu_key+0 - .byte TEMPO , 68*bgm_bijyutu_tbs/2 +mus_lilycove_museum_1: + .byte KEYSH , mus_lilycove_museum_key+0 + .byte TEMPO , 68*mus_lilycove_museum_tbs/2 .byte VOICE , 48 - .byte VOL , 41*bgm_bijyutu_mvl/mxv + .byte VOL , 41*mus_lilycove_museum_mvl/mxv .byte N24 , Dn3 , v092 .byte W02 - .byte VOL , 45*bgm_bijyutu_mvl/mxv + .byte VOL , 45*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 50*bgm_bijyutu_mvl/mxv + .byte 50*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 55*bgm_bijyutu_mvl/mxv + .byte 55*mus_lilycove_museum_mvl/mxv .byte W04 - .byte 60*bgm_bijyutu_mvl/mxv + .byte 60*mus_lilycove_museum_mvl/mxv .byte W02 - .byte 66*bgm_bijyutu_mvl/mxv + .byte 66*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 78*bgm_bijyutu_mvl/mxv + .byte 78*mus_lilycove_museum_mvl/mxv .byte W04 -bgm_bijyutu_1_B1: - .byte VOL , 80*bgm_bijyutu_mvl/mxv +mus_lilycove_museum_1_B1: + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte PAN , c_v+0 .byte N12 , Gn3 , v092 .byte W12 @@ -55,7 +55,7 @@ bgm_bijyutu_1_B1: .byte W12 .byte Gn3 .byte W12 -bgm_bijyutu_1_000: +mus_lilycove_museum_1_000: .byte N03 , Fs3 , v084 .byte W03 .byte Gn3 @@ -81,7 +81,7 @@ bgm_bijyutu_1_000: .byte Fs3 .byte W12 .byte PEND -bgm_bijyutu_1_001: +mus_lilycove_museum_1_001: .byte N12 , Gn3 , v092 .byte W12 .byte En3 @@ -140,9 +140,9 @@ bgm_bijyutu_1_001: .byte Gn3 .byte W12 .byte PATT - .word bgm_bijyutu_1_000 + .word mus_lilycove_museum_1_000 .byte PATT - .word bgm_bijyutu_1_001 + .word mus_lilycove_museum_1_001 .byte N03 , Fs4 , v084 .byte W03 .byte Gn4 @@ -331,102 +331,102 @@ bgm_bijyutu_1_001: .byte W12 .byte N24 , An4 .byte W24 - .byte VOL , 42*bgm_bijyutu_mvl/mxv + .byte VOL , 42*mus_lilycove_museum_mvl/mxv .byte PAN , c_v-16 .byte N44 , Gn2 , v092 .byte W06 - .byte VOL , 52*bgm_bijyutu_mvl/mxv + .byte VOL , 52*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 63*bgm_bijyutu_mvl/mxv + .byte 63*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W19 - .byte 42*bgm_bijyutu_mvl/mxv + .byte 42*mus_lilycove_museum_mvl/mxv .byte N44 , Dn2 .byte W06 - .byte VOL , 52*bgm_bijyutu_mvl/mxv + .byte VOL , 52*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 63*bgm_bijyutu_mvl/mxv + .byte 63*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W19 - .byte 42*bgm_bijyutu_mvl/mxv + .byte 42*mus_lilycove_museum_mvl/mxv .byte N44 , Fs2 .byte W06 - .byte VOL , 52*bgm_bijyutu_mvl/mxv + .byte VOL , 52*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 63*bgm_bijyutu_mvl/mxv + .byte 63*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W19 - .byte 42*bgm_bijyutu_mvl/mxv + .byte 42*mus_lilycove_museum_mvl/mxv .byte N44 , Cn2 .byte W06 - .byte VOL , 52*bgm_bijyutu_mvl/mxv + .byte VOL , 52*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 63*bgm_bijyutu_mvl/mxv + .byte 63*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W19 - .byte 42*bgm_bijyutu_mvl/mxv + .byte 42*mus_lilycove_museum_mvl/mxv .byte N44 , En2 .byte W06 - .byte VOL , 52*bgm_bijyutu_mvl/mxv + .byte VOL , 52*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 63*bgm_bijyutu_mvl/mxv + .byte 63*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W19 - .byte 42*bgm_bijyutu_mvl/mxv + .byte 42*mus_lilycove_museum_mvl/mxv .byte N48 , Bn1 .byte W06 - .byte VOL , 52*bgm_bijyutu_mvl/mxv + .byte VOL , 52*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 63*bgm_bijyutu_mvl/mxv + .byte 63*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W19 .byte N48 , Dn2 .byte W06 - .byte VOL , 71*bgm_bijyutu_mvl/mxv + .byte VOL , 71*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 65*bgm_bijyutu_mvl/mxv + .byte 65*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 50*bgm_bijyutu_mvl/mxv + .byte 50*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 60*bgm_bijyutu_mvl/mxv + .byte 60*mus_lilycove_museum_mvl/mxv .byte W04 - .byte 66*bgm_bijyutu_mvl/mxv + .byte 66*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 73*bgm_bijyutu_mvl/mxv + .byte 73*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 76*bgm_bijyutu_mvl/mxv + .byte 76*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W09 .byte PAN , c_v+0 .byte N12 , Cn3 , v072 @@ -437,7 +437,7 @@ bgm_bijyutu_1_001: .byte W12 .byte Fs3 .byte W12 -bgm_bijyutu_1_002: +mus_lilycove_museum_1_002: .byte N12 , Gn3 , v084 .byte W12 .byte Dn3 @@ -520,7 +520,7 @@ bgm_bijyutu_1_002: .byte Cn4 .byte W12 .byte PATT - .word bgm_bijyutu_1_002 + .word mus_lilycove_museum_1_002 .byte N03 , Fs3 , v076 .byte W03 .byte Gn3 @@ -564,28 +564,28 @@ bgm_bijyutu_1_002: .byte N44 , An3 .byte W24 .byte W03 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 63*bgm_bijyutu_mvl/mxv + .byte 63*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 44*bgm_bijyutu_mvl/mxv + .byte 44*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 25*bgm_bijyutu_mvl/mxv + .byte 25*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 15*bgm_bijyutu_mvl/mxv + .byte 15*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 6*bgm_bijyutu_mvl/mxv + .byte 6*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 55*bgm_bijyutu_mvl/mxv + .byte 55*mus_lilycove_museum_mvl/mxv .byte N24 , Fs3 .byte W03 - .byte VOL , 61*bgm_bijyutu_mvl/mxv + .byte VOL , 61*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 66*bgm_bijyutu_mvl/mxv + .byte 66*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W12 .byte N12 , Gn3 .byte W12 @@ -593,167 +593,167 @@ bgm_bijyutu_1_002: .byte W12 .byte N68 , Gn3 .byte W18 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 75*bgm_bijyutu_mvl/mxv + .byte 75*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 59*bgm_bijyutu_mvl/mxv + .byte 59*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 49*bgm_bijyutu_mvl/mxv + .byte 49*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 39*bgm_bijyutu_mvl/mxv + .byte 39*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 3*bgm_bijyutu_mvl/mxv + .byte 3*mus_lilycove_museum_mvl/mxv .byte W13 - .byte 41*bgm_bijyutu_mvl/mxv + .byte 41*mus_lilycove_museum_mvl/mxv .byte N24 , Dn3 .byte W02 - .byte VOL , 45*bgm_bijyutu_mvl/mxv + .byte VOL , 45*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 50*bgm_bijyutu_mvl/mxv + .byte 50*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 55*bgm_bijyutu_mvl/mxv + .byte 55*mus_lilycove_museum_mvl/mxv .byte W04 - .byte 60*bgm_bijyutu_mvl/mxv + .byte 60*mus_lilycove_museum_mvl/mxv .byte W02 - .byte 66*bgm_bijyutu_mvl/mxv + .byte 66*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 78*bgm_bijyutu_mvl/mxv + .byte 78*mus_lilycove_museum_mvl/mxv .byte W04 .byte GOTO - .word bgm_bijyutu_1_B1 + .word mus_lilycove_museum_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_bijyutu_2: - .byte KEYSH , bgm_bijyutu_key+0 +mus_lilycove_museum_2: + .byte KEYSH , mus_lilycove_museum_key+0 .byte LFOS , 38 .byte XCMD , xIECV , 9 .byte xIECL , 8 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte W24 -bgm_bijyutu_2_B1: +mus_lilycove_museum_2_B1: .byte PAN , c_v-48 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 .byte VOICE , 83 - .byte VOL , 25*bgm_bijyutu_mvl/mxv + .byte VOL , 25*mus_lilycove_museum_mvl/mxv .byte N96 , Dn3 , v048 .byte W06 - .byte VOL , 34*bgm_bijyutu_mvl/mxv + .byte VOL , 34*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 69*bgm_bijyutu_mvl/mxv + .byte 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W12 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 30*bgm_bijyutu_mvl/mxv + .byte 30*mus_lilycove_museum_mvl/mxv .byte W06 -bgm_bijyutu_2_000: - .byte VOL , 25*bgm_bijyutu_mvl/mxv +mus_lilycove_museum_2_000: + .byte VOL , 25*mus_lilycove_museum_mvl/mxv .byte N96 , Cn3 , v048 .byte W06 - .byte VOL , 34*bgm_bijyutu_mvl/mxv + .byte VOL , 34*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 69*bgm_bijyutu_mvl/mxv + .byte 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W12 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 30*bgm_bijyutu_mvl/mxv + .byte 30*mus_lilycove_museum_mvl/mxv .byte W06 .byte PEND - .byte 25*bgm_bijyutu_mvl/mxv + .byte 25*mus_lilycove_museum_mvl/mxv .byte N96 , Bn2 .byte W06 - .byte VOL , 34*bgm_bijyutu_mvl/mxv + .byte VOL , 34*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 69*bgm_bijyutu_mvl/mxv + .byte 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W12 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 30*bgm_bijyutu_mvl/mxv + .byte 30*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte N48 , An2 .byte W06 - .byte VOL , 62*bgm_bijyutu_mvl/mxv + .byte VOL , 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 69*bgm_bijyutu_mvl/mxv + .byte 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W18 .byte N48 , Cn3 , v056 .byte W48 @@ -842,244 +842,244 @@ bgm_bijyutu_2_000: .byte W96 .byte VOICE , 83 .byte PAN , c_v-48 - .byte VOL , 25*bgm_bijyutu_mvl/mxv + .byte VOL , 25*mus_lilycove_museum_mvl/mxv .byte XCMD , xIECV , 9 .byte xIECL , 8 .byte N96 , Dn3 , v048 .byte W06 - .byte VOL , 34*bgm_bijyutu_mvl/mxv + .byte VOL , 34*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 69*bgm_bijyutu_mvl/mxv + .byte 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W12 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 30*bgm_bijyutu_mvl/mxv + .byte 30*mus_lilycove_museum_mvl/mxv .byte W06 .byte PATT - .word bgm_bijyutu_2_000 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .word mus_lilycove_museum_2_000 + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte N48 , Bn2 , v048 .byte W06 - .byte VOL , 62*bgm_bijyutu_mvl/mxv + .byte VOL , 62*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 69*bgm_bijyutu_mvl/mxv + .byte 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W18 .byte N48 , An2 .byte W48 .byte N96 .byte W12 - .byte VOL , 78*bgm_bijyutu_mvl/mxv + .byte VOL , 78*mus_lilycove_museum_mvl/mxv .byte W12 - .byte 76*bgm_bijyutu_mvl/mxv + .byte 76*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 66*bgm_bijyutu_mvl/mxv + .byte 66*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 58*bgm_bijyutu_mvl/mxv + .byte 58*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 52*bgm_bijyutu_mvl/mxv + .byte 52*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 47*bgm_bijyutu_mvl/mxv + .byte 47*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 38*bgm_bijyutu_mvl/mxv + .byte 38*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 31*bgm_bijyutu_mvl/mxv + .byte 31*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 21*bgm_bijyutu_mvl/mxv + .byte 21*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 11*bgm_bijyutu_mvl/mxv + .byte 11*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 1*bgm_bijyutu_mvl/mxv + .byte 1*mus_lilycove_museum_mvl/mxv .byte W07 .byte W96 .byte GOTO - .word bgm_bijyutu_2_B1 + .word mus_lilycove_museum_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_bijyutu_3: - .byte KEYSH , bgm_bijyutu_key+0 +mus_lilycove_museum_3: + .byte KEYSH , mus_lilycove_museum_key+0 .byte XCMD , xIECV , 9 .byte xIECL , 8 .byte LFOS , 38 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte W24 -bgm_bijyutu_3_B1: +mus_lilycove_museum_3_B1: .byte PAN , c_v+48 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 .byte W96 .byte W96 .byte VOICE , 84 - .byte VOL , 25*bgm_bijyutu_mvl/mxv + .byte VOL , 25*mus_lilycove_museum_mvl/mxv .byte N12 , Bn2 , v048 .byte W06 - .byte VOL , 34*bgm_bijyutu_mvl/mxv + .byte VOL , 34*mus_lilycove_museum_mvl/mxv .byte W06 .byte VOICE , 85 - .byte VOL , 46*bgm_bijyutu_mvl/mxv + .byte VOL , 46*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 69*bgm_bijyutu_mvl/mxv + .byte VOL , 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 77*bgm_bijyutu_mvl/mxv + .byte VOL , 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N12 .byte W12 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 68*bgm_bijyutu_mvl/mxv + .byte VOL , 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 30*bgm_bijyutu_mvl/mxv + .byte VOL , 30*mus_lilycove_museum_mvl/mxv .byte W06 -bgm_bijyutu_3_000: +mus_lilycove_museum_3_000: .byte VOICE , 84 - .byte VOL , 25*bgm_bijyutu_mvl/mxv + .byte VOL , 25*mus_lilycove_museum_mvl/mxv .byte N12 , An2 , v048 .byte W06 - .byte VOL , 34*bgm_bijyutu_mvl/mxv + .byte VOL , 34*mus_lilycove_museum_mvl/mxv .byte W06 .byte VOICE , 85 - .byte VOL , 46*bgm_bijyutu_mvl/mxv + .byte VOL , 46*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 69*bgm_bijyutu_mvl/mxv + .byte VOL , 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 77*bgm_bijyutu_mvl/mxv + .byte VOL , 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N12 .byte W12 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 68*bgm_bijyutu_mvl/mxv + .byte VOL , 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 30*bgm_bijyutu_mvl/mxv + .byte VOL , 30*mus_lilycove_museum_mvl/mxv .byte W06 .byte PEND .byte VOICE , 84 - .byte VOL , 25*bgm_bijyutu_mvl/mxv + .byte VOL , 25*mus_lilycove_museum_mvl/mxv .byte N12 , Gn2 .byte W06 - .byte VOL , 34*bgm_bijyutu_mvl/mxv + .byte VOL , 34*mus_lilycove_museum_mvl/mxv .byte W06 .byte VOICE , 85 - .byte VOL , 46*bgm_bijyutu_mvl/mxv + .byte VOL , 46*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 69*bgm_bijyutu_mvl/mxv + .byte VOL , 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 77*bgm_bijyutu_mvl/mxv + .byte VOL , 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N12 .byte W12 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 68*bgm_bijyutu_mvl/mxv + .byte VOL , 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 30*bgm_bijyutu_mvl/mxv + .byte VOL , 30*mus_lilycove_museum_mvl/mxv .byte W06 .byte VOICE , 84 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte N12 , Fs2 .byte W06 - .byte VOL , 62*bgm_bijyutu_mvl/mxv + .byte VOL , 62*mus_lilycove_museum_mvl/mxv .byte W06 .byte VOICE , 85 - .byte VOL , 69*bgm_bijyutu_mvl/mxv + .byte VOL , 69*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte W06 .byte N12 .byte W12 @@ -1207,66 +1207,66 @@ bgm_bijyutu_3_000: .byte W96 .byte VOICE , 84 .byte PAN , c_v+49 - .byte VOL , 25*bgm_bijyutu_mvl/mxv + .byte VOL , 25*mus_lilycove_museum_mvl/mxv .byte XCMD , xIECV , 9 .byte xIECL , 8 .byte BEND , c_v+0 .byte N12 , Bn2 , v048 .byte W06 - .byte VOL , 34*bgm_bijyutu_mvl/mxv + .byte VOL , 34*mus_lilycove_museum_mvl/mxv .byte W06 .byte VOICE , 85 - .byte VOL , 46*bgm_bijyutu_mvl/mxv + .byte VOL , 46*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 69*bgm_bijyutu_mvl/mxv + .byte VOL , 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 77*bgm_bijyutu_mvl/mxv + .byte VOL , 77*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N12 .byte W12 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 68*bgm_bijyutu_mvl/mxv + .byte VOL , 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 62*bgm_bijyutu_mvl/mxv + .byte 62*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 46*bgm_bijyutu_mvl/mxv + .byte 46*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 30*bgm_bijyutu_mvl/mxv + .byte VOL , 30*mus_lilycove_museum_mvl/mxv .byte W06 .byte PATT - .word bgm_bijyutu_3_000 + .word mus_lilycove_museum_3_000 .byte VOICE , 84 - .byte VOL , 54*bgm_bijyutu_mvl/mxv + .byte VOL , 54*mus_lilycove_museum_mvl/mxv .byte N12 , Gn2 , v048 .byte W06 - .byte VOL , 62*bgm_bijyutu_mvl/mxv + .byte VOL , 62*mus_lilycove_museum_mvl/mxv .byte W06 .byte VOICE , 85 - .byte VOL , 69*bgm_bijyutu_mvl/mxv + .byte VOL , 69*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 77*bgm_bijyutu_mvl/mxv + .byte 77*mus_lilycove_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte W06 .byte N12 .byte W12 @@ -1284,53 +1284,53 @@ bgm_bijyutu_3_000: .byte N12 , Fs2 .byte W12 .byte VOICE , 85 - .byte VOL , 78*bgm_bijyutu_mvl/mxv + .byte VOL , 78*mus_lilycove_museum_mvl/mxv .byte N12 .byte W12 - .byte VOL , 76*bgm_bijyutu_mvl/mxv + .byte VOL , 76*mus_lilycove_museum_mvl/mxv .byte N12 .byte W05 - .byte VOL , 68*bgm_bijyutu_mvl/mxv + .byte VOL , 68*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 66*bgm_bijyutu_mvl/mxv + .byte 66*mus_lilycove_museum_mvl/mxv .byte N12 .byte W05 - .byte VOL , 62*bgm_bijyutu_mvl/mxv + .byte VOL , 62*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 58*bgm_bijyutu_mvl/mxv + .byte 58*mus_lilycove_museum_mvl/mxv .byte N12 .byte W05 - .byte VOL , 52*bgm_bijyutu_mvl/mxv + .byte VOL , 52*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 47*bgm_bijyutu_mvl/mxv + .byte 47*mus_lilycove_museum_mvl/mxv .byte N12 .byte W05 - .byte VOL , 38*bgm_bijyutu_mvl/mxv + .byte VOL , 38*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 31*bgm_bijyutu_mvl/mxv + .byte 31*mus_lilycove_museum_mvl/mxv .byte N12 .byte W05 - .byte VOL , 21*bgm_bijyutu_mvl/mxv + .byte VOL , 21*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 11*bgm_bijyutu_mvl/mxv + .byte 11*mus_lilycove_museum_mvl/mxv .byte N12 .byte W05 - .byte VOL , 1*bgm_bijyutu_mvl/mxv + .byte VOL , 1*mus_lilycove_museum_mvl/mxv .byte W07 .byte W96 .byte GOTO - .word bgm_bijyutu_3_B1 + .word mus_lilycove_museum_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_bijyutu_4: - .byte KEYSH , bgm_bijyutu_key+0 +mus_lilycove_museum_4: + .byte KEYSH , mus_lilycove_museum_key+0 .byte VOICE , 0 .byte W24 -bgm_bijyutu_4_B1: +mus_lilycove_museum_4_B1: .byte PAN , c_v-8 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte N24 , Gn2 , v100 .byte W24 .byte N36 , Gn1 @@ -1339,7 +1339,7 @@ bgm_bijyutu_4_B1: .byte W24 .byte N12 , Gn2 .byte W12 -bgm_bijyutu_4_000: +mus_lilycove_museum_4_000: .byte N24 , Fs2 , v100 .byte W24 .byte N36 , Fs1 @@ -1349,7 +1349,7 @@ bgm_bijyutu_4_000: .byte N12 , Cn2 .byte W12 .byte PEND -bgm_bijyutu_4_001: +mus_lilycove_museum_4_001: .byte N24 , En2 , v100 .byte W24 .byte N36 , En1 @@ -1361,7 +1361,7 @@ bgm_bijyutu_4_001: .byte Bn2 .byte W12 .byte PEND -bgm_bijyutu_4_002: +mus_lilycove_museum_4_002: .byte N24 , Dn3 , v100 .byte W24 .byte N36 , Dn1 @@ -1371,7 +1371,7 @@ bgm_bijyutu_4_002: .byte N12 , An2 .byte W12 .byte PEND -bgm_bijyutu_4_003: +mus_lilycove_museum_4_003: .byte N24 , Gn2 , v100 .byte W24 .byte N36 , Gn1 @@ -1382,9 +1382,9 @@ bgm_bijyutu_4_003: .byte W12 .byte PEND .byte PATT - .word bgm_bijyutu_4_000 + .word mus_lilycove_museum_4_000 .byte PATT - .word bgm_bijyutu_4_001 + .word mus_lilycove_museum_4_001 .byte N24 , Dn2 , v100 .byte W24 .byte N36 , Dn1 @@ -1561,17 +1561,17 @@ bgm_bijyutu_4_003: .byte An3 .byte W12 .byte PATT - .word bgm_bijyutu_4_003 + .word mus_lilycove_museum_4_003 .byte PATT - .word bgm_bijyutu_4_000 + .word mus_lilycove_museum_4_000 .byte PATT - .word bgm_bijyutu_4_001 + .word mus_lilycove_museum_4_001 .byte PATT - .word bgm_bijyutu_4_002 + .word mus_lilycove_museum_4_002 .byte PATT - .word bgm_bijyutu_4_003 + .word mus_lilycove_museum_4_003 .byte PATT - .word bgm_bijyutu_4_000 + .word mus_lilycove_museum_4_000 .byte N24 , En2 , v100 .byte W24 .byte En1 @@ -1592,36 +1592,36 @@ bgm_bijyutu_4_003: .byte W12 .byte N44 .byte W21 - .byte VOL , 67*bgm_bijyutu_mvl/mxv + .byte VOL , 67*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 57*bgm_bijyutu_mvl/mxv + .byte 57*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 45*bgm_bijyutu_mvl/mxv + .byte 45*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 39*bgm_bijyutu_mvl/mxv + .byte 39*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 21*bgm_bijyutu_mvl/mxv + .byte 21*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 1*bgm_bijyutu_mvl/mxv + .byte 1*mus_lilycove_museum_mvl/mxv .byte W09 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N48 , Bn2 .byte W48 .byte Gn1 .byte W48 .byte GOTO - .word bgm_bijyutu_4_B1 + .word mus_lilycove_museum_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_bijyutu_5: - .byte KEYSH , bgm_bijyutu_key+0 +mus_lilycove_museum_5: + .byte KEYSH , mus_lilycove_museum_key+0 .byte VOICE , 0 .byte W24 -bgm_bijyutu_5_B1: +mus_lilycove_museum_5_B1: .byte PAN , c_v+8 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte N48 , Bn2 , v100 .byte W60 .byte N12 , Gn2 @@ -1630,7 +1630,7 @@ bgm_bijyutu_5_B1: .byte W12 .byte Bn2 .byte W12 -bgm_bijyutu_5_000: +mus_lilycove_museum_5_000: .byte N48 , An2 , v100 .byte W48 .byte N12 , Cn3 @@ -1642,7 +1642,7 @@ bgm_bijyutu_5_000: .byte Fs2 .byte W12 .byte PEND -bgm_bijyutu_5_001: +mus_lilycove_museum_5_001: .byte N48 , Gn2 , v100 .byte W48 .byte N12 , Gn3 @@ -1654,7 +1654,7 @@ bgm_bijyutu_5_001: .byte Gn3 .byte W12 .byte PEND -bgm_bijyutu_5_002: +mus_lilycove_museum_5_002: .byte N48 , An3 , v100 .byte W48 .byte N24 , Cn3 @@ -1664,7 +1664,7 @@ bgm_bijyutu_5_002: .byte Cn3 .byte W12 .byte PEND -bgm_bijyutu_5_003: +mus_lilycove_museum_5_003: .byte N48 , Bn2 , v100 .byte W60 .byte N12 , Gn2 @@ -1675,9 +1675,9 @@ bgm_bijyutu_5_003: .byte W12 .byte PEND .byte PATT - .word bgm_bijyutu_5_000 + .word mus_lilycove_museum_5_000 .byte PATT - .word bgm_bijyutu_5_001 + .word mus_lilycove_museum_5_001 .byte N48 , An3 , v100 .byte W48 .byte N24 , Fs3 @@ -1793,17 +1793,17 @@ bgm_bijyutu_5_003: .byte Cn3 .byte W12 .byte PATT - .word bgm_bijyutu_5_003 + .word mus_lilycove_museum_5_003 .byte PATT - .word bgm_bijyutu_5_000 + .word mus_lilycove_museum_5_000 .byte PATT - .word bgm_bijyutu_5_001 + .word mus_lilycove_museum_5_001 .byte PATT - .word bgm_bijyutu_5_002 + .word mus_lilycove_museum_5_002 .byte PATT - .word bgm_bijyutu_5_003 + .word mus_lilycove_museum_5_003 .byte PATT - .word bgm_bijyutu_5_000 + .word mus_lilycove_museum_5_000 .byte N48 , Gn2 , v100 .byte W48 .byte N24 @@ -1821,34 +1821,34 @@ bgm_bijyutu_5_003: .byte W09 .byte N42 , Dn3 .byte W18 - .byte VOL , 67*bgm_bijyutu_mvl/mxv + .byte VOL , 67*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 57*bgm_bijyutu_mvl/mxv + .byte 57*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 45*bgm_bijyutu_mvl/mxv + .byte 45*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 39*bgm_bijyutu_mvl/mxv + .byte 39*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 21*bgm_bijyutu_mvl/mxv + .byte 21*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 1*bgm_bijyutu_mvl/mxv + .byte 1*mus_lilycove_museum_mvl/mxv .byte W09 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N48 .byte W48 .byte Bn2 .byte W48 .byte GOTO - .word bgm_bijyutu_5_B1 + .word mus_lilycove_museum_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_bijyutu_6: - .byte KEYSH , bgm_bijyutu_key+0 +mus_lilycove_museum_6: + .byte KEYSH , mus_lilycove_museum_key+0 .byte W24 -bgm_bijyutu_6_B1: - .byte VOL , 80*bgm_bijyutu_mvl/mxv +mus_lilycove_museum_6_B1: + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -1875,250 +1875,250 @@ bgm_bijyutu_6_B1: .byte An1 .byte W24 .byte VOICE , 58 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte PAN , c_v+16 .byte N44 , Gn1 , v112 .byte W24 - .byte VOL , 76*bgm_bijyutu_mvl/mxv + .byte VOL , 76*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 65*bgm_bijyutu_mvl/mxv + .byte 65*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 37*bgm_bijyutu_mvl/mxv + .byte 37*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N44 , Dn1 .byte W24 - .byte VOL , 76*bgm_bijyutu_mvl/mxv + .byte VOL , 76*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 65*bgm_bijyutu_mvl/mxv + .byte 65*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 37*bgm_bijyutu_mvl/mxv + .byte 37*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N44 , Fs1 .byte W24 - .byte VOL , 76*bgm_bijyutu_mvl/mxv + .byte VOL , 76*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 65*bgm_bijyutu_mvl/mxv + .byte 65*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 37*bgm_bijyutu_mvl/mxv + .byte 37*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N44 , Cn1 .byte W24 - .byte VOL , 76*bgm_bijyutu_mvl/mxv + .byte VOL , 76*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 65*bgm_bijyutu_mvl/mxv + .byte 65*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 37*bgm_bijyutu_mvl/mxv + .byte 37*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N44 , En1 .byte W24 - .byte VOL , 76*bgm_bijyutu_mvl/mxv + .byte VOL , 76*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 65*bgm_bijyutu_mvl/mxv + .byte 65*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 37*bgm_bijyutu_mvl/mxv + .byte 37*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N44 , Bn0 .byte W24 - .byte VOL , 76*bgm_bijyutu_mvl/mxv + .byte VOL , 76*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 65*bgm_bijyutu_mvl/mxv + .byte 65*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 37*bgm_bijyutu_mvl/mxv + .byte 37*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W07 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N96 , Dn1 .byte W52 .byte W01 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 69*bgm_bijyutu_mvl/mxv + .byte 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 60*bgm_bijyutu_mvl/mxv + .byte 60*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 48*bgm_bijyutu_mvl/mxv + .byte 48*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 39*bgm_bijyutu_mvl/mxv + .byte 39*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 20*bgm_bijyutu_mvl/mxv + .byte 20*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 3*bgm_bijyutu_mvl/mxv + .byte 3*mus_lilycove_museum_mvl/mxv .byte W07 .byte W96 .byte W96 .byte W96 .byte W72 - .byte 56*bgm_bijyutu_mvl/mxv + .byte 56*mus_lilycove_museum_mvl/mxv .byte PAN , c_v+0 .byte N24 , Fs1 .byte W06 - .byte VOL , 69*bgm_bijyutu_mvl/mxv + .byte VOL , 69*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W12 .byte N72 , Gn1 .byte W06 - .byte VOL , 73*bgm_bijyutu_mvl/mxv + .byte VOL , 73*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 60*bgm_bijyutu_mvl/mxv + .byte 60*mus_lilycove_museum_mvl/mxv .byte W02 - .byte 53*bgm_bijyutu_mvl/mxv + .byte 53*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 52*bgm_bijyutu_mvl/mxv + .byte 52*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 53*bgm_bijyutu_mvl/mxv + .byte 53*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 55*bgm_bijyutu_mvl/mxv + .byte 55*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 61*bgm_bijyutu_mvl/mxv + .byte 61*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 70*bgm_bijyutu_mvl/mxv + .byte 70*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W13 - .byte 76*bgm_bijyutu_mvl/mxv + .byte 76*mus_lilycove_museum_mvl/mxv .byte W02 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 64*bgm_bijyutu_mvl/mxv + .byte 64*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 52*bgm_bijyutu_mvl/mxv + .byte 52*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 37*bgm_bijyutu_mvl/mxv + .byte 37*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 26*bgm_bijyutu_mvl/mxv + .byte 26*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 14*bgm_bijyutu_mvl/mxv + .byte 14*mus_lilycove_museum_mvl/mxv .byte W10 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N12 .byte W12 .byte N72 , Fs1 .byte W06 - .byte VOL , 73*bgm_bijyutu_mvl/mxv + .byte VOL , 73*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 60*bgm_bijyutu_mvl/mxv + .byte 60*mus_lilycove_museum_mvl/mxv .byte W02 - .byte 53*bgm_bijyutu_mvl/mxv + .byte 53*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 52*bgm_bijyutu_mvl/mxv + .byte 52*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 53*bgm_bijyutu_mvl/mxv + .byte 53*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 54*bgm_bijyutu_mvl/mxv + .byte 54*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 55*bgm_bijyutu_mvl/mxv + .byte 55*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 61*bgm_bijyutu_mvl/mxv + .byte 61*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 70*bgm_bijyutu_mvl/mxv + .byte 70*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte W13 - .byte 76*bgm_bijyutu_mvl/mxv + .byte 76*mus_lilycove_museum_mvl/mxv .byte W02 - .byte 74*bgm_bijyutu_mvl/mxv + .byte 74*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 64*bgm_bijyutu_mvl/mxv + .byte 64*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 52*bgm_bijyutu_mvl/mxv + .byte 52*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 37*bgm_bijyutu_mvl/mxv + .byte 37*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 26*bgm_bijyutu_mvl/mxv + .byte 26*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 17*bgm_bijyutu_mvl/mxv + .byte 17*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 14*bgm_bijyutu_mvl/mxv + .byte 14*mus_lilycove_museum_mvl/mxv .byte W10 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N12 .byte W12 .byte N24 , En1 .byte W12 - .byte VOL , 68*bgm_bijyutu_mvl/mxv + .byte VOL , 68*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 58*bgm_bijyutu_mvl/mxv + .byte 58*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 42*bgm_bijyutu_mvl/mxv + .byte 42*mus_lilycove_museum_mvl/mxv .byte W03 - .byte 23*bgm_bijyutu_mvl/mxv + .byte 23*mus_lilycove_museum_mvl/mxv .byte W15 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N12 , Bn1 .byte W12 .byte N32 , An1 .byte W18 - .byte VOL , 74*bgm_bijyutu_mvl/mxv + .byte VOL , 74*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 52*bgm_bijyutu_mvl/mxv + .byte 52*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 31*bgm_bijyutu_mvl/mxv + .byte 31*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 80*bgm_bijyutu_mvl/mxv + .byte 80*mus_lilycove_museum_mvl/mxv .byte N12 , En1 .byte W12 .byte N96 , Dn1 .byte W36 - .byte VOL , 80*bgm_bijyutu_mvl/mxv + .byte VOL , 80*mus_lilycove_museum_mvl/mxv .byte W05 - .byte 75*bgm_bijyutu_mvl/mxv + .byte 75*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 68*bgm_bijyutu_mvl/mxv + .byte 68*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 63*bgm_bijyutu_mvl/mxv + .byte 63*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 57*bgm_bijyutu_mvl/mxv + .byte 57*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 45*bgm_bijyutu_mvl/mxv + .byte 45*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 32*bgm_bijyutu_mvl/mxv + .byte 32*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 10*bgm_bijyutu_mvl/mxv + .byte 10*mus_lilycove_museum_mvl/mxv .byte W06 - .byte 7*bgm_bijyutu_mvl/mxv + .byte 7*mus_lilycove_museum_mvl/mxv .byte W13 .byte W96 .byte GOTO - .word bgm_bijyutu_6_B1 + .word mus_lilycove_museum_6_B1 .byte FINE @******************************************************@ .align 2 -bgm_bijyutu: +mus_lilycove_museum: .byte 6 @ NumTrks .byte 0 @ NumBlks - .byte bgm_bijyutu_pri @ Priority - .byte bgm_bijyutu_rev @ Reverb. + .byte mus_lilycove_museum_pri @ Priority + .byte mus_lilycove_museum_rev @ Reverb. - .word bgm_bijyutu_grp + .word mus_lilycove_museum_grp - .word bgm_bijyutu_1 - .word bgm_bijyutu_2 - .word bgm_bijyutu_3 - .word bgm_bijyutu_4 - .word bgm_bijyutu_5 - .word bgm_bijyutu_6 + .word mus_lilycove_museum_1 + .word mus_lilycove_museum_2 + .word mus_lilycove_museum_3 + .word mus_lilycove_museum_4 + .word mus_lilycove_museum_5 + .word mus_lilycove_museum_6 .end diff --git a/sound/songs/bgm_test1.s b/sound/songs/mus_link_contest_p1.s index 882b40b36..d55aaeccd 100644 --- a/sound/songs/bgm_test1.s +++ b/sound/songs/mus_link_contest_p1.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_test1_grp, voicegroup036 - .equ bgm_test1_pri, 0 - .equ bgm_test1_rev, reverb_set+50 - .equ bgm_test1_mvl, 127 - .equ bgm_test1_key, 0 - .equ bgm_test1_tbs, 1 - .equ bgm_test1_exg, 0 - .equ bgm_test1_cmp, 1 + .equ mus_link_contest_p1_grp, voicegroup036 + .equ mus_link_contest_p1_pri, 0 + .equ mus_link_contest_p1_rev, reverb_set+50 + .equ mus_link_contest_p1_mvl, 127 + .equ mus_link_contest_p1_key, 0 + .equ mus_link_contest_p1_tbs, 1 + .equ mus_link_contest_p1_exg, 0 + .equ mus_link_contest_p1_cmp, 1 .section .rodata - .global bgm_test1 + .global mus_link_contest_p1 .align 2 @********************** Track 1 **********************@ -bgm_test1_1: - .byte KEYSH , bgm_test1_key+0 -bgm_test1_1_B1: - .byte TEMPO , 128*bgm_test1_tbs/2 +mus_link_contest_p1_1: + .byte KEYSH , mus_link_contest_p1_key+0 +mus_link_contest_p1_1_B1: + .byte TEMPO , 128*mus_link_contest_p1_tbs/2 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 56*bgm_test1_mvl/mxv + .byte VOL , 56*mus_link_contest_p1_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fn4 , v112 .byte W12 @@ -214,7 +214,7 @@ bgm_test1_1_B1: .byte W48 .byte 24 .byte W48 - .byte VOL , 38*bgm_test1_mvl/mxv + .byte VOL , 38*mus_link_contest_p1_mvl/mxv .byte W12 .byte N03 , Dn4 .byte W06 @@ -283,19 +283,19 @@ bgm_test1_1_B1: .byte Fs4 .byte W03 .byte GOTO - .word bgm_test1_1_B1 + .word mus_link_contest_p1_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_test1_2: - .byte KEYSH , bgm_test1_key+0 -bgm_test1_2_B1: +mus_link_contest_p1_2: + .byte KEYSH , mus_link_contest_p1_key+0 +mus_link_contest_p1_2_B1: .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 79*bgm_test1_mvl/mxv + .byte VOL , 79*mus_link_contest_p1_mvl/mxv .byte N06 , Fn4 , v112 .byte W12 .byte N03 @@ -485,7 +485,7 @@ bgm_test1_2_B1: .byte W48 .byte 24 .byte W48 - .byte VOL , 63*bgm_test1_mvl/mxv + .byte VOL , 63*mus_link_contest_p1_mvl/mxv .byte W12 .byte N03 , Dn4 .byte W06 @@ -554,19 +554,19 @@ bgm_test1_2_B1: .byte Fs4 .byte W03 .byte GOTO - .word bgm_test1_2_B1 + .word mus_link_contest_p1_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_test1_3: - .byte KEYSH , bgm_test1_key+0 -bgm_test1_3_B1: +mus_link_contest_p1_3: + .byte KEYSH , mus_link_contest_p1_key+0 +mus_link_contest_p1_3_B1: .byte VOICE , 60 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 41*bgm_test1_mvl/mxv + .byte VOL , 41*mus_link_contest_p1_mvl/mxv .byte BEND , c_v+1 .byte W96 .byte W96 @@ -576,11 +576,11 @@ bgm_test1_3_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 63*bgm_test1_mvl/mxv + .byte VOL , 63*mus_link_contest_p1_mvl/mxv .byte W96 .byte W96 .byte VOICE , 73 - .byte VOL , 56*bgm_test1_mvl/mxv + .byte VOL , 56*mus_link_contest_p1_mvl/mxv .byte N04 , Dn4 , v112 .byte W08 .byte Ds4 @@ -711,7 +711,7 @@ bgm_test1_3_B1: .byte W12 .byte N06 .byte W06 - .byte VOL , 45*bgm_test1_mvl/mxv + .byte VOL , 45*mus_link_contest_p1_mvl/mxv .byte W12 .byte N03 , Dn4 .byte W06 @@ -776,20 +776,20 @@ bgm_test1_3_B1: .byte N18 , Gs4 .byte W24 .byte GOTO - .word bgm_test1_3_B1 + .word mus_link_contest_p1_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_test1_4: - .byte KEYSH , bgm_test1_key+0 -bgm_test1_4_B1: +mus_link_contest_p1_4: + .byte KEYSH , mus_link_contest_p1_key+0 +mus_link_contest_p1_4_B1: .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_test1_mvl/mxv + .byte VOL , 45*mus_link_contest_p1_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -801,7 +801,7 @@ bgm_test1_4_B1: .byte W96 .byte W96 .byte W96 -bgm_test1_4_000: +mus_link_contest_p1_4_000: .byte N06 , Gn3 , v112 .byte W06 .byte N03 , Gn3 , v096 @@ -812,8 +812,8 @@ bgm_test1_4_000: .byte W78 .byte PEND .byte PATT - .word bgm_test1_4_000 -bgm_test1_4_001: + .word mus_link_contest_p1_4_000 +mus_link_contest_p1_4_001: .byte N06 , An3 , v112 .byte W06 .byte N03 , An3 , v096 @@ -823,7 +823,7 @@ bgm_test1_4_001: .byte N03 .byte W78 .byte PEND -bgm_test1_4_002: +mus_link_contest_p1_4_002: .byte N06 , As3 , v112 .byte W06 .byte N03 , As3 , v096 @@ -834,13 +834,13 @@ bgm_test1_4_002: .byte W78 .byte PEND .byte PATT - .word bgm_test1_4_000 + .word mus_link_contest_p1_4_000 .byte PATT - .word bgm_test1_4_000 + .word mus_link_contest_p1_4_000 .byte PATT - .word bgm_test1_4_001 + .word mus_link_contest_p1_4_001 .byte PATT - .word bgm_test1_4_002 + .word mus_link_contest_p1_4_002 .byte N03 , Dn4 , v112 .byte W06 .byte As3 @@ -924,20 +924,20 @@ bgm_test1_4_002: .byte W48 .byte W03 .byte GOTO - .word bgm_test1_4_B1 + .word mus_link_contest_p1_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_test1_5: - .byte KEYSH , bgm_test1_key+0 -bgm_test1_5_B1: +mus_link_contest_p1_5: + .byte KEYSH , mus_link_contest_p1_key+0 +mus_link_contest_p1_5_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_test1_mvl/mxv + .byte VOL , 45*mus_link_contest_p1_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -949,7 +949,7 @@ bgm_test1_5_B1: .byte W96 .byte W96 .byte W96 -bgm_test1_5_000: +mus_link_contest_p1_5_000: .byte N06 , Fn4 , v112 .byte W06 .byte N03 , Fn4 , v096 @@ -960,8 +960,8 @@ bgm_test1_5_000: .byte W78 .byte PEND .byte PATT - .word bgm_test1_5_000 -bgm_test1_5_001: + .word mus_link_contest_p1_5_000 +mus_link_contest_p1_5_001: .byte N06 , Fn4 , v112 .byte W06 .byte N03 , Fn4 , v096 @@ -972,15 +972,15 @@ bgm_test1_5_001: .byte W78 .byte PEND .byte PATT - .word bgm_test1_5_000 + .word mus_link_contest_p1_5_000 .byte PATT - .word bgm_test1_5_000 + .word mus_link_contest_p1_5_000 .byte PATT - .word bgm_test1_5_000 + .word mus_link_contest_p1_5_000 .byte PATT - .word bgm_test1_5_001 + .word mus_link_contest_p1_5_001 .byte PATT - .word bgm_test1_5_000 + .word mus_link_contest_p1_5_000 .byte N03 , As4 , v112 .byte W06 .byte Fn4 @@ -1064,17 +1064,17 @@ bgm_test1_5_001: .byte W48 .byte W03 .byte GOTO - .word bgm_test1_5_B1 + .word mus_link_contest_p1_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_test1_6: - .byte KEYSH , bgm_test1_key+0 -bgm_test1_6_B1: +mus_link_contest_p1_6: + .byte KEYSH , mus_link_contest_p1_key+0 +mus_link_contest_p1_6_B1: .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 41*bgm_test1_mvl/mxv + .byte VOL , 41*mus_link_contest_p1_mvl/mxv .byte N06 , En1 , v112 .byte N48 , An2 , v092 .byte W06 @@ -1157,7 +1157,7 @@ bgm_test1_6_B1: .byte N06 .byte N24 , An2 .byte W48 -bgm_test1_6_000: +mus_link_contest_p1_6_000: .byte N06 , En1 , v112 .byte W12 .byte N06 @@ -1275,7 +1275,7 @@ bgm_test1_6_000: .byte N03 .byte W03 .byte PATT - .word bgm_test1_6_000 + .word mus_link_contest_p1_6_000 .byte N06 , En1 , v112 .byte W36 .byte N03 @@ -1362,7 +1362,7 @@ bgm_test1_6_000: .byte W06 .byte Cn1 .byte W12 -bgm_test1_6_001: +mus_link_contest_p1_6_001: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1411,8 +1411,8 @@ bgm_test1_6_001: .byte En1 , v088 .byte W06 .byte PATT - .word bgm_test1_6_001 -bgm_test1_6_002: + .word mus_link_contest_p1_6_001 +mus_link_contest_p1_6_002: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1435,7 +1435,7 @@ bgm_test1_6_002: .byte W06 .byte PEND .byte PATT - .word bgm_test1_6_001 + .word mus_link_contest_p1_6_001 .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1463,10 +1463,10 @@ bgm_test1_6_002: .byte En1 , v092 .byte W06 .byte PATT - .word bgm_test1_6_001 + .word mus_link_contest_p1_6_001 .byte PATT - .word bgm_test1_6_002 -bgm_test1_6_003: + .word mus_link_contest_p1_6_002 +mus_link_contest_p1_6_003: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v088 @@ -1489,9 +1489,9 @@ bgm_test1_6_003: .byte W06 .byte PEND .byte PATT - .word bgm_test1_6_003 + .word mus_link_contest_p1_6_003 .byte PATT - .word bgm_test1_6_003 + .word mus_link_contest_p1_6_003 .byte N06 , Dn1 , v112 .byte W06 .byte Dn1 , v080 @@ -1517,21 +1517,21 @@ bgm_test1_6_003: .byte Cn1 , v096 .byte W06 .byte GOTO - .word bgm_test1_6_B1 + .word mus_link_contest_p1_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_test1_7: - .byte KEYSH , bgm_test1_key+0 -bgm_test1_7_B1: +mus_link_contest_p1_7: + .byte KEYSH , mus_link_contest_p1_key+0 +mus_link_contest_p1_7_B1: .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 79*bgm_test1_mvl/mxv + .byte VOL , 79*mus_link_contest_p1_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 @@ -1543,7 +1543,7 @@ bgm_test1_7_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 38*bgm_test1_mvl/mxv + .byte VOL , 38*mus_link_contest_p1_mvl/mxv .byte BEND , c_v+1 .byte N04 , Dn4 , v112 .byte W08 @@ -1675,7 +1675,7 @@ bgm_test1_7_B1: .byte W12 .byte N06 .byte W06 - .byte VOL , 45*bgm_test1_mvl/mxv + .byte VOL , 45*mus_link_contest_p1_mvl/mxv .byte W12 .byte N03 , Dn4 .byte W06 @@ -1740,26 +1740,26 @@ bgm_test1_7_B1: .byte N18 , Gs4 .byte W24 .byte GOTO - .word bgm_test1_7_B1 + .word mus_link_contest_p1_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_test1: +mus_link_contest_p1: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_test1_pri @ Priority - .byte bgm_test1_rev @ Reverb. + .byte mus_link_contest_p1_pri @ Priority + .byte mus_link_contest_p1_rev @ Reverb. - .word bgm_test1_grp + .word mus_link_contest_p1_grp - .word bgm_test1_1 - .word bgm_test1_2 - .word bgm_test1_3 - .word bgm_test1_4 - .word bgm_test1_5 - .word bgm_test1_6 - .word bgm_test1_7 + .word mus_link_contest_p1_1 + .word mus_link_contest_p1_2 + .word mus_link_contest_p1_3 + .word mus_link_contest_p1_4 + .word mus_link_contest_p1_5 + .word mus_link_contest_p1_6 + .word mus_link_contest_p1_7 .end diff --git a/sound/songs/bgm_test2.s b/sound/songs/mus_link_contest_p2.s index 626f87c63..afea074b4 100644 --- a/sound/songs/bgm_test2.s +++ b/sound/songs/mus_link_contest_p2.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_test2_grp, voicegroup037 - .equ bgm_test2_pri, 0 - .equ bgm_test2_rev, reverb_set+50 - .equ bgm_test2_mvl, 127 - .equ bgm_test2_key, 0 - .equ bgm_test2_tbs, 1 - .equ bgm_test2_exg, 0 - .equ bgm_test2_cmp, 1 + .equ mus_link_contest_p2_grp, voicegroup037 + .equ mus_link_contest_p2_pri, 0 + .equ mus_link_contest_p2_rev, reverb_set+50 + .equ mus_link_contest_p2_mvl, 127 + .equ mus_link_contest_p2_key, 0 + .equ mus_link_contest_p2_tbs, 1 + .equ mus_link_contest_p2_exg, 0 + .equ mus_link_contest_p2_cmp, 1 .section .rodata - .global bgm_test2 + .global mus_link_contest_p2 .align 2 @********************** Track 1 **********************@ -bgm_test2_1: - .byte KEYSH , bgm_test2_key+0 -bgm_test2_1_B1: - .byte TEMPO , 128*bgm_test2_tbs/2 +mus_link_contest_p2_1: + .byte KEYSH , mus_link_contest_p2_key+0 +mus_link_contest_p2_1_B1: + .byte TEMPO , 128*mus_link_contest_p2_tbs/2 .byte VOICE , 60 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 54*bgm_test2_mvl/mxv + .byte VOL , 54*mus_link_contest_p2_mvl/mxv .byte BEND , c_v+1 .byte W96 .byte W96 @@ -74,21 +74,21 @@ bgm_test2_1_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_test2_1_B1 + .word mus_link_contest_p2_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_test2_2: - .byte KEYSH , bgm_test2_key+0 -bgm_test2_2_B1: +mus_link_contest_p2_2: + .byte KEYSH , mus_link_contest_p2_key+0 +mus_link_contest_p2_2_B1: .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 90*bgm_test2_mvl/mxv + .byte VOL , 90*mus_link_contest_p2_mvl/mxv .byte N06 , Fn1 , v127 .byte W12 .byte N03 @@ -476,19 +476,19 @@ bgm_test2_2_B1: .byte Fs1 .byte W06 .byte GOTO - .word bgm_test2_2_B1 + .word mus_link_contest_p2_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_test2_3: - .byte KEYSH , bgm_test2_key+0 -bgm_test2_3_B1: +mus_link_contest_p2_3: + .byte KEYSH , mus_link_contest_p2_key+0 +mus_link_contest_p2_3_B1: .byte VOICE , 60 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 66*bgm_test2_mvl/mxv + .byte VOL , 66*mus_link_contest_p2_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -497,7 +497,7 @@ bgm_test2_3_B1: .byte W96 .byte W96 .byte W96 - .byte 63*bgm_test2_mvl/mxv + .byte 63*mus_link_contest_p2_mvl/mxv .byte W48 .byte N06 , As3 , v112 .byte W06 @@ -524,7 +524,7 @@ bgm_test2_3_B1: .byte Ds4 .byte W24 .byte VOICE , 17 - .byte VOL , 34*bgm_test2_mvl/mxv + .byte VOL , 34*mus_link_contest_p2_mvl/mxv .byte N04 , Dn5 .byte W08 .byte Ds5 @@ -660,20 +660,20 @@ bgm_test2_3_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_test2_3_B1 + .word mus_link_contest_p2_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_test2_4: - .byte KEYSH , bgm_test2_key+0 -bgm_test2_4_B1: +mus_link_contest_p2_4: + .byte KEYSH , mus_link_contest_p2_key+0 +mus_link_contest_p2_4_B1: .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_test2_mvl/mxv + .byte VOL , 45*mus_link_contest_p2_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -723,7 +723,7 @@ bgm_test2_4_B1: .byte W96 .byte W96 .byte W96 -bgm_test2_4_000: +mus_link_contest_p2_4_000: .byte W24 .byte N06 , Gn3 , v112 .byte W06 @@ -735,8 +735,8 @@ bgm_test2_4_000: .byte W54 .byte PEND .byte PATT - .word bgm_test2_4_000 -bgm_test2_4_001: + .word mus_link_contest_p2_4_000 +mus_link_contest_p2_4_001: .byte W24 .byte N06 , An3 , v112 .byte W06 @@ -747,7 +747,7 @@ bgm_test2_4_001: .byte N03 .byte W54 .byte PEND -bgm_test2_4_002: +mus_link_contest_p2_4_002: .byte W24 .byte N06 , As3 , v112 .byte W06 @@ -759,13 +759,13 @@ bgm_test2_4_002: .byte W54 .byte PEND .byte PATT - .word bgm_test2_4_000 + .word mus_link_contest_p2_4_000 .byte PATT - .word bgm_test2_4_000 + .word mus_link_contest_p2_4_000 .byte PATT - .word bgm_test2_4_001 + .word mus_link_contest_p2_4_001 .byte PATT - .word bgm_test2_4_002 + .word mus_link_contest_p2_4_002 .byte W24 .byte N03 , As2 , v112 .byte W06 @@ -851,20 +851,20 @@ bgm_test2_4_002: .byte Ds4 .byte W03 .byte GOTO - .word bgm_test2_4_B1 + .word mus_link_contest_p2_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_test2_5: - .byte KEYSH , bgm_test2_key+0 -bgm_test2_5_B1: +mus_link_contest_p2_5: + .byte KEYSH , mus_link_contest_p2_key+0 +mus_link_contest_p2_5_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_test2_mvl/mxv + .byte VOL , 45*mus_link_contest_p2_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -916,7 +916,7 @@ bgm_test2_5_B1: .byte W96 .byte W96 .byte W96 -bgm_test2_5_000: +mus_link_contest_p2_5_000: .byte W24 .byte N06 , Fn4 , v112 .byte W06 @@ -928,8 +928,8 @@ bgm_test2_5_000: .byte W54 .byte PEND .byte PATT - .word bgm_test2_5_000 -bgm_test2_5_001: + .word mus_link_contest_p2_5_000 +mus_link_contest_p2_5_001: .byte W24 .byte N06 , Fn4 , v112 .byte W06 @@ -940,7 +940,7 @@ bgm_test2_5_001: .byte N03 .byte W54 .byte PEND -bgm_test2_5_002: +mus_link_contest_p2_5_002: .byte W24 .byte N06 , Ds4 , v112 .byte W06 @@ -952,13 +952,13 @@ bgm_test2_5_002: .byte W54 .byte PEND .byte PATT - .word bgm_test2_5_000 + .word mus_link_contest_p2_5_000 .byte PATT - .word bgm_test2_5_000 + .word mus_link_contest_p2_5_000 .byte PATT - .word bgm_test2_5_001 + .word mus_link_contest_p2_5_001 .byte PATT - .word bgm_test2_5_002 + .word mus_link_contest_p2_5_002 .byte W24 .byte N03 , Fn3 , v112 .byte W06 @@ -1044,17 +1044,17 @@ bgm_test2_5_002: .byte As4 .byte W03 .byte GOTO - .word bgm_test2_5_B1 + .word mus_link_contest_p2_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_test2_6: - .byte KEYSH , bgm_test2_key+0 -bgm_test2_6_B1: +mus_link_contest_p2_6: + .byte KEYSH , mus_link_contest_p2_key+0 +mus_link_contest_p2_6_B1: .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 68*bgm_test2_mvl/mxv + .byte VOL , 68*mus_link_contest_p2_mvl/mxv .byte N06 , En1 , v112 .byte N48 , An2 , v092 .byte W06 @@ -1137,7 +1137,7 @@ bgm_test2_6_B1: .byte N06 .byte N24 , An2 .byte W48 -bgm_test2_6_000: +mus_link_contest_p2_6_000: .byte N06 , En1 , v112 .byte W12 .byte N06 @@ -1255,7 +1255,7 @@ bgm_test2_6_000: .byte N03 .byte W03 .byte PATT - .word bgm_test2_6_000 + .word mus_link_contest_p2_6_000 .byte N06 , En1 , v112 .byte W36 .byte N03 @@ -1342,7 +1342,7 @@ bgm_test2_6_000: .byte W06 .byte Cn1 .byte W12 -bgm_test2_6_001: +mus_link_contest_p2_6_001: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1391,8 +1391,8 @@ bgm_test2_6_001: .byte En1 , v088 .byte W06 .byte PATT - .word bgm_test2_6_001 -bgm_test2_6_002: + .word mus_link_contest_p2_6_001 +mus_link_contest_p2_6_002: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1415,7 +1415,7 @@ bgm_test2_6_002: .byte W06 .byte PEND .byte PATT - .word bgm_test2_6_001 + .word mus_link_contest_p2_6_001 .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1443,10 +1443,10 @@ bgm_test2_6_002: .byte En1 , v092 .byte W06 .byte PATT - .word bgm_test2_6_001 + .word mus_link_contest_p2_6_001 .byte PATT - .word bgm_test2_6_002 -bgm_test2_6_003: + .word mus_link_contest_p2_6_002 +mus_link_contest_p2_6_003: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v088 @@ -1469,9 +1469,9 @@ bgm_test2_6_003: .byte W06 .byte PEND .byte PATT - .word bgm_test2_6_003 + .word mus_link_contest_p2_6_003 .byte PATT - .word bgm_test2_6_003 + .word mus_link_contest_p2_6_003 .byte N06 , Dn1 , v112 .byte W06 .byte Dn1 , v080 @@ -1497,21 +1497,21 @@ bgm_test2_6_003: .byte Cn1 , v096 .byte W06 .byte GOTO - .word bgm_test2_6_B1 + .word mus_link_contest_p2_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_test2_7: - .byte KEYSH , bgm_test2_key+0 -bgm_test2_7_B1: +mus_link_contest_p2_7: + .byte KEYSH , mus_link_contest_p2_key+0 +mus_link_contest_p2_7_B1: .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 68*bgm_test2_mvl/mxv + .byte VOL , 68*mus_link_contest_p2_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fn1 , v112 .byte W12 @@ -1671,7 +1671,7 @@ bgm_test2_7_B1: .byte W12 .byte Dn1 .byte W12 - .byte VOL , 38*bgm_test2_mvl/mxv + .byte VOL , 38*mus_link_contest_p2_mvl/mxv .byte BEND , c_v+1 .byte N06 , Ds1 .byte W12 @@ -1825,7 +1825,7 @@ bgm_test2_7_B1: .byte W12 .byte An1 .byte W06 - .byte VOL , 45*bgm_test2_mvl/mxv + .byte VOL , 45*mus_link_contest_p2_mvl/mxv .byte N06 , As1 .byte W24 .byte N06 @@ -1903,26 +1903,26 @@ bgm_test2_7_B1: .byte Fs1 .byte W06 .byte GOTO - .word bgm_test2_7_B1 + .word mus_link_contest_p2_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_test2: +mus_link_contest_p2: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_test2_pri @ Priority - .byte bgm_test2_rev @ Reverb. + .byte mus_link_contest_p2_pri @ Priority + .byte mus_link_contest_p2_rev @ Reverb. - .word bgm_test2_grp + .word mus_link_contest_p2_grp - .word bgm_test2_1 - .word bgm_test2_2 - .word bgm_test2_3 - .word bgm_test2_4 - .word bgm_test2_5 - .word bgm_test2_6 - .word bgm_test2_7 + .word mus_link_contest_p2_1 + .word mus_link_contest_p2_2 + .word mus_link_contest_p2_3 + .word mus_link_contest_p2_4 + .word mus_link_contest_p2_5 + .word mus_link_contest_p2_6 + .word mus_link_contest_p2_7 .end diff --git a/sound/songs/bgm_test3.s b/sound/songs/mus_link_contest_p3.s index 06641901d..30986ade3 100644 --- a/sound/songs/bgm_test3.s +++ b/sound/songs/mus_link_contest_p3.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_test3_grp, voicegroup038 - .equ bgm_test3_pri, 0 - .equ bgm_test3_rev, reverb_set+50 - .equ bgm_test3_mvl, 127 - .equ bgm_test3_key, 0 - .equ bgm_test3_tbs, 1 - .equ bgm_test3_exg, 0 - .equ bgm_test3_cmp, 1 + .equ mus_link_contest_p3_grp, voicegroup038 + .equ mus_link_contest_p3_pri, 0 + .equ mus_link_contest_p3_rev, reverb_set+50 + .equ mus_link_contest_p3_mvl, 127 + .equ mus_link_contest_p3_key, 0 + .equ mus_link_contest_p3_tbs, 1 + .equ mus_link_contest_p3_exg, 0 + .equ mus_link_contest_p3_cmp, 1 .section .rodata - .global bgm_test3 + .global mus_link_contest_p3 .align 2 @********************** Track 1 **********************@ -bgm_test3_1: - .byte KEYSH , bgm_test3_key+0 -bgm_test3_1_B1: - .byte TEMPO , 128*bgm_test3_tbs/2 +mus_link_contest_p3_1: + .byte KEYSH , mus_link_contest_p3_key+0 +mus_link_contest_p3_1_B1: + .byte TEMPO , 128*mus_link_contest_p3_tbs/2 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 60*bgm_test3_mvl/mxv + .byte VOL , 60*mus_link_contest_p3_mvl/mxv .byte BEND , c_v+1 .byte N06 , An3 , v112 .byte W12 @@ -210,7 +210,7 @@ bgm_test3_1_B1: .byte W48 .byte 24 .byte W48 - .byte VOL , 45*bgm_test3_mvl/mxv + .byte VOL , 45*mus_link_contest_p3_mvl/mxv .byte W12 .byte N03 , As3 .byte W06 @@ -279,21 +279,21 @@ bgm_test3_1_B1: .byte Cn4 .byte W03 .byte GOTO - .word bgm_test3_1_B1 + .word mus_link_contest_p3_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_test3_2: - .byte KEYSH , bgm_test3_key+0 -bgm_test3_2_B1: +mus_link_contest_p3_2: + .byte KEYSH , mus_link_contest_p3_key+0 +mus_link_contest_p3_2_B1: .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 68*bgm_test3_mvl/mxv + .byte VOL , 68*mus_link_contest_p3_mvl/mxv .byte BEND , c_v+1 .byte W96 .byte W96 @@ -534,20 +534,20 @@ bgm_test3_2_B1: .byte Fs1 .byte W06 .byte GOTO - .word bgm_test3_2_B1 + .word mus_link_contest_p3_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_test3_3: - .byte KEYSH , bgm_test3_key+0 -bgm_test3_3_B1: +mus_link_contest_p3_3: + .byte KEYSH , mus_link_contest_p3_key+0 +mus_link_contest_p3_3_B1: .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_test3_mvl/mxv + .byte VOL , 45*mus_link_contest_p3_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -559,7 +559,7 @@ bgm_test3_3_B1: .byte W96 .byte W96 .byte W96 -bgm_test3_3_000: +mus_link_contest_p3_3_000: .byte W48 .byte N06 , Gn3 , v112 .byte W06 @@ -570,7 +570,7 @@ bgm_test3_3_000: .byte N03 .byte W30 .byte PEND -bgm_test3_3_001: +mus_link_contest_p3_3_001: .byte W48 .byte N06 , Gn3 , v112 .byte W06 @@ -579,7 +579,7 @@ bgm_test3_3_001: .byte Ds3 , v112 .byte W30 .byte PEND -bgm_test3_3_002: +mus_link_contest_p3_3_002: .byte W48 .byte N06 , An3 , v112 .byte W06 @@ -590,7 +590,7 @@ bgm_test3_3_002: .byte N03 .byte W30 .byte PEND -bgm_test3_3_003: +mus_link_contest_p3_3_003: .byte W48 .byte N06 , As3 , v112 .byte W06 @@ -600,13 +600,13 @@ bgm_test3_3_003: .byte W30 .byte PEND .byte PATT - .word bgm_test3_3_000 + .word mus_link_contest_p3_3_000 .byte PATT - .word bgm_test3_3_001 + .word mus_link_contest_p3_3_001 .byte PATT - .word bgm_test3_3_002 + .word mus_link_contest_p3_3_002 .byte PATT - .word bgm_test3_3_003 + .word mus_link_contest_p3_3_003 .byte W48 .byte N03 , Dn4 , v112 .byte W06 @@ -692,20 +692,20 @@ bgm_test3_3_003: .byte W48 .byte W03 .byte GOTO - .word bgm_test3_3_B1 + .word mus_link_contest_p3_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_test3_4: - .byte KEYSH , bgm_test3_key+0 -bgm_test3_4_B1: +mus_link_contest_p3_4: + .byte KEYSH , mus_link_contest_p3_key+0 +mus_link_contest_p3_4_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_test3_mvl/mxv + .byte VOL , 45*mus_link_contest_p3_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -717,7 +717,7 @@ bgm_test3_4_B1: .byte W96 .byte W96 .byte W96 -bgm_test3_4_000: +mus_link_contest_p3_4_000: .byte W48 .byte N06 , Fn4 , v112 .byte W06 @@ -728,7 +728,7 @@ bgm_test3_4_000: .byte N03 .byte W30 .byte PEND -bgm_test3_4_001: +mus_link_contest_p3_4_001: .byte W48 .byte N06 , Fn4 , v112 .byte W06 @@ -737,7 +737,7 @@ bgm_test3_4_001: .byte Dn4 , v112 .byte W30 .byte PEND -bgm_test3_4_002: +mus_link_contest_p3_4_002: .byte W48 .byte N06 , Fn4 , v112 .byte W06 @@ -756,11 +756,11 @@ bgm_test3_4_002: .byte Ds4 .byte W30 .byte PATT - .word bgm_test3_4_000 + .word mus_link_contest_p3_4_000 .byte PATT - .word bgm_test3_4_001 + .word mus_link_contest_p3_4_001 .byte PATT - .word bgm_test3_4_002 + .word mus_link_contest_p3_4_002 .byte W48 .byte N06 , Dn4 , v112 .byte W06 @@ -853,17 +853,17 @@ bgm_test3_4_002: .byte W48 .byte W03 .byte GOTO - .word bgm_test3_4_B1 + .word mus_link_contest_p3_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_test3_5: - .byte KEYSH , bgm_test3_key+0 -bgm_test3_5_B1: +mus_link_contest_p3_5: + .byte KEYSH , mus_link_contest_p3_key+0 +mus_link_contest_p3_5_B1: .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 35*bgm_test3_mvl/mxv + .byte VOL , 35*mus_link_contest_p3_mvl/mxv .byte N06 , En1 , v112 .byte N48 , An2 , v092 .byte W06 @@ -946,7 +946,7 @@ bgm_test3_5_B1: .byte N06 .byte N24 , An2 .byte W48 -bgm_test3_5_000: +mus_link_contest_p3_5_000: .byte N06 , En1 , v112 .byte W12 .byte N06 @@ -1064,7 +1064,7 @@ bgm_test3_5_000: .byte N03 .byte W03 .byte PATT - .word bgm_test3_5_000 + .word mus_link_contest_p3_5_000 .byte N06 , En1 , v112 .byte W36 .byte N03 @@ -1151,7 +1151,7 @@ bgm_test3_5_000: .byte W06 .byte Cn1 .byte W12 -bgm_test3_5_001: +mus_link_contest_p3_5_001: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1200,8 +1200,8 @@ bgm_test3_5_001: .byte En1 , v088 .byte W06 .byte PATT - .word bgm_test3_5_001 -bgm_test3_5_002: + .word mus_link_contest_p3_5_001 +mus_link_contest_p3_5_002: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1224,7 +1224,7 @@ bgm_test3_5_002: .byte W06 .byte PEND .byte PATT - .word bgm_test3_5_001 + .word mus_link_contest_p3_5_001 .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1252,10 +1252,10 @@ bgm_test3_5_002: .byte En1 , v092 .byte W06 .byte PATT - .word bgm_test3_5_001 + .word mus_link_contest_p3_5_001 .byte PATT - .word bgm_test3_5_002 -bgm_test3_5_003: + .word mus_link_contest_p3_5_002 +mus_link_contest_p3_5_003: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v088 @@ -1278,9 +1278,9 @@ bgm_test3_5_003: .byte W06 .byte PEND .byte PATT - .word bgm_test3_5_003 + .word mus_link_contest_p3_5_003 .byte PATT - .word bgm_test3_5_003 + .word mus_link_contest_p3_5_003 .byte N06 , Dn1 , v112 .byte W06 .byte Dn1 , v080 @@ -1306,21 +1306,21 @@ bgm_test3_5_003: .byte Cn1 , v096 .byte W06 .byte GOTO - .word bgm_test3_5_B1 + .word mus_link_contest_p3_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_test3_6: - .byte KEYSH , bgm_test3_key+0 -bgm_test3_6_B1: +mus_link_contest_p3_6: + .byte KEYSH , mus_link_contest_p3_key+0 +mus_link_contest_p3_6_B1: .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 45*bgm_test3_mvl/mxv + .byte VOL , 45*mus_link_contest_p3_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fn1 , v112 .byte W12 @@ -1480,7 +1480,7 @@ bgm_test3_6_B1: .byte W12 .byte Dn1 .byte W12 - .byte VOL , 38*bgm_test3_mvl/mxv + .byte VOL , 38*mus_link_contest_p3_mvl/mxv .byte BEND , c_v+0 .byte N04 , Dn4 .byte W08 @@ -1612,7 +1612,7 @@ bgm_test3_6_B1: .byte W12 .byte N06 .byte W06 - .byte VOL , 45*bgm_test3_mvl/mxv + .byte VOL , 45*mus_link_contest_p3_mvl/mxv .byte W12 .byte N03 , Dn4 .byte W06 @@ -1677,20 +1677,20 @@ bgm_test3_6_B1: .byte N18 , Gs4 .byte W24 .byte GOTO - .word bgm_test3_6_B1 + .word mus_link_contest_p3_6_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 7 **********************@ -bgm_test3_7: - .byte KEYSH , bgm_test3_key+0 -bgm_test3_7_B1: +mus_link_contest_p3_7: + .byte KEYSH , mus_link_contest_p3_key+0 +mus_link_contest_p3_7_B1: .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 75*bgm_test3_mvl/mxv + .byte VOL , 75*mus_link_contest_p3_mvl/mxv .byte N06 , An3 , v112 .byte W12 .byte N03 @@ -1875,7 +1875,7 @@ bgm_test3_7_B1: .byte W96 .byte W96 .byte 24 - .byte VOL , 68*bgm_test3_mvl/mxv + .byte VOL , 68*mus_link_contest_p3_mvl/mxv .byte W12 .byte N03 , As3 .byte W06 @@ -1944,26 +1944,26 @@ bgm_test3_7_B1: .byte Cn4 .byte W03 .byte GOTO - .word bgm_test3_7_B1 + .word mus_link_contest_p3_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_test3: +mus_link_contest_p3: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_test3_pri @ Priority - .byte bgm_test3_rev @ Reverb. + .byte mus_link_contest_p3_pri @ Priority + .byte mus_link_contest_p3_rev @ Reverb. - .word bgm_test3_grp + .word mus_link_contest_p3_grp - .word bgm_test3_1 - .word bgm_test3_2 - .word bgm_test3_3 - .word bgm_test3_4 - .word bgm_test3_5 - .word bgm_test3_6 - .word bgm_test3_7 + .word mus_link_contest_p3_1 + .word mus_link_contest_p3_2 + .word mus_link_contest_p3_3 + .word mus_link_contest_p3_4 + .word mus_link_contest_p3_5 + .word mus_link_contest_p3_6 + .word mus_link_contest_p3_7 .end diff --git a/sound/songs/bgm_test4.s b/sound/songs/mus_link_contest_p4.s index cbe5371f9..b5c519f6a 100644 --- a/sound/songs/bgm_test4.s +++ b/sound/songs/mus_link_contest_p4.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_test4_grp, voicegroup039 - .equ bgm_test4_pri, 0 - .equ bgm_test4_rev, reverb_set+50 - .equ bgm_test4_mvl, 127 - .equ bgm_test4_key, 0 - .equ bgm_test4_tbs, 1 - .equ bgm_test4_exg, 0 - .equ bgm_test4_cmp, 1 + .equ mus_link_contest_p4_grp, voicegroup039 + .equ mus_link_contest_p4_pri, 0 + .equ mus_link_contest_p4_rev, reverb_set+50 + .equ mus_link_contest_p4_mvl, 127 + .equ mus_link_contest_p4_key, 0 + .equ mus_link_contest_p4_tbs, 1 + .equ mus_link_contest_p4_exg, 0 + .equ mus_link_contest_p4_cmp, 1 .section .rodata - .global bgm_test4 + .global mus_link_contest_p4 .align 2 @********************** Track 1 **********************@ -bgm_test4_1: - .byte KEYSH , bgm_test4_key+0 -bgm_test4_1_B1: - .byte TEMPO , 128*bgm_test4_tbs/2 +mus_link_contest_p4_1: + .byte KEYSH , mus_link_contest_p4_key+0 +mus_link_contest_p4_1_B1: + .byte TEMPO , 128*mus_link_contest_p4_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 43*bgm_test4_mvl/mxv + .byte VOL , 43*mus_link_contest_p4_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 @@ -35,7 +35,7 @@ bgm_test4_1_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 66*bgm_test4_mvl/mxv + .byte VOL , 66*mus_link_contest_p4_mvl/mxv .byte W96 .byte W96 .byte N06 , Ds1 , v112 @@ -267,20 +267,20 @@ bgm_test4_1_B1: .byte Fs1 .byte W06 .byte GOTO - .word bgm_test4_1_B1 + .word mus_link_contest_p4_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_test4_2: - .byte KEYSH , bgm_test4_key+0 -bgm_test4_2_B1: +mus_link_contest_p4_2: + .byte KEYSH , mus_link_contest_p4_key+0 +mus_link_contest_p4_2_B1: .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_test4_mvl/mxv + .byte VOL , 45*mus_link_contest_p4_mvl/mxv .byte PAN , c_v+0 .byte N06 , Fn2 , v112 .byte W12 @@ -470,7 +470,7 @@ bgm_test4_2_B1: .byte W22 .byte Ds3 .byte W24 -bgm_test4_2_000: +mus_link_contest_p4_2_000: .byte W72 .byte N06 , Gn3 , v112 .byte W06 @@ -481,7 +481,7 @@ bgm_test4_2_000: .byte N03 .byte W06 .byte PEND -bgm_test4_2_001: +mus_link_contest_p4_2_001: .byte W72 .byte N06 , Gn3 , v112 .byte W06 @@ -492,7 +492,7 @@ bgm_test4_2_001: .byte As3 , v112 .byte W06 .byte PEND -bgm_test4_2_002: +mus_link_contest_p4_2_002: .byte W72 .byte N06 , An3 , v112 .byte W06 @@ -509,11 +509,11 @@ bgm_test4_2_002: .byte N06 , An3 .byte W06 .byte PATT - .word bgm_test4_2_000 + .word mus_link_contest_p4_2_000 .byte PATT - .word bgm_test4_2_001 + .word mus_link_contest_p4_2_001 .byte PATT - .word bgm_test4_2_002 + .word mus_link_contest_p4_2_002 .byte W72 .byte N06 , Fn3 , v112 .byte W06 @@ -606,20 +606,20 @@ bgm_test4_2_002: .byte Ds4 .byte W03 .byte GOTO - .word bgm_test4_2_B1 + .word mus_link_contest_p4_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_test4_3: - .byte KEYSH , bgm_test4_key+0 -bgm_test4_3_B1: +mus_link_contest_p4_3: + .byte KEYSH , mus_link_contest_p4_key+0 +mus_link_contest_p4_3_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 45*bgm_test4_mvl/mxv + .byte VOL , 45*mus_link_contest_p4_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cn4 , v112 .byte W12 @@ -821,7 +821,7 @@ bgm_test4_3_B1: .byte W24 .byte N24 .byte W24 -bgm_test4_3_000: +mus_link_contest_p4_3_000: .byte W72 .byte N06 , Fn4 , v112 .byte W06 @@ -832,7 +832,7 @@ bgm_test4_3_000: .byte N03 .byte W06 .byte PEND -bgm_test4_3_001: +mus_link_contest_p4_3_001: .byte W72 .byte N06 , Ds4 , v112 .byte W06 @@ -841,7 +841,7 @@ bgm_test4_3_001: .byte Gn4 , v112 .byte W06 .byte PEND -bgm_test4_3_002: +mus_link_contest_p4_3_002: .byte W72 .byte N06 , Fn4 , v112 .byte W06 @@ -858,11 +858,11 @@ bgm_test4_3_002: .byte N06 , Dn4 .byte W06 .byte PATT - .word bgm_test4_3_000 + .word mus_link_contest_p4_3_000 .byte PATT - .word bgm_test4_3_001 + .word mus_link_contest_p4_3_001 .byte PATT - .word bgm_test4_3_002 + .word mus_link_contest_p4_3_002 .byte W72 .byte N06 , As3 , v112 .byte W06 @@ -955,17 +955,17 @@ bgm_test4_3_002: .byte As4 .byte W03 .byte GOTO - .word bgm_test4_3_B1 + .word mus_link_contest_p4_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_test4_4: - .byte KEYSH , bgm_test4_key+0 -bgm_test4_4_B1: +mus_link_contest_p4_4: + .byte KEYSH , mus_link_contest_p4_key+0 +mus_link_contest_p4_4_B1: .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 90*bgm_test4_mvl/mxv + .byte VOL , 90*mus_link_contest_p4_mvl/mxv .byte N06 , En1 , v112 .byte N48 , An2 , v092 .byte W06 @@ -1048,7 +1048,7 @@ bgm_test4_4_B1: .byte N06 .byte N24 , An2 .byte W48 -bgm_test4_4_000: +mus_link_contest_p4_4_000: .byte N06 , En1 , v112 .byte W12 .byte N06 @@ -1166,7 +1166,7 @@ bgm_test4_4_000: .byte N03 .byte W03 .byte PATT - .word bgm_test4_4_000 + .word mus_link_contest_p4_4_000 .byte N06 , En1 , v112 .byte W36 .byte N03 @@ -1253,7 +1253,7 @@ bgm_test4_4_000: .byte W06 .byte Cn1 .byte W12 -bgm_test4_4_001: +mus_link_contest_p4_4_001: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1302,8 +1302,8 @@ bgm_test4_4_001: .byte En1 , v088 .byte W06 .byte PATT - .word bgm_test4_4_001 -bgm_test4_4_002: + .word mus_link_contest_p4_4_001 +mus_link_contest_p4_4_002: .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1326,7 +1326,7 @@ bgm_test4_4_002: .byte W06 .byte PEND .byte PATT - .word bgm_test4_4_001 + .word mus_link_contest_p4_4_001 .byte N06 , Cn1 , v112 .byte W12 .byte N03 @@ -1354,10 +1354,10 @@ bgm_test4_4_002: .byte En1 , v092 .byte W06 .byte PATT - .word bgm_test4_4_001 + .word mus_link_contest_p4_4_001 .byte PATT - .word bgm_test4_4_002 -bgm_test4_4_003: + .word mus_link_contest_p4_4_002 +mus_link_contest_p4_4_003: .byte N06 , Cn1 , v112 .byte W18 .byte Cn1 , v088 @@ -1380,9 +1380,9 @@ bgm_test4_4_003: .byte W06 .byte PEND .byte PATT - .word bgm_test4_4_003 + .word mus_link_contest_p4_4_003 .byte PATT - .word bgm_test4_4_003 + .word mus_link_contest_p4_4_003 .byte N06 , Dn1 , v112 .byte W06 .byte Dn1 , v080 @@ -1408,21 +1408,21 @@ bgm_test4_4_003: .byte Cn1 , v096 .byte W06 .byte GOTO - .word bgm_test4_4_B1 + .word mus_link_contest_p4_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_test4_5: - .byte KEYSH , bgm_test4_key+0 -bgm_test4_5_B1: +mus_link_contest_p4_5: + .byte KEYSH , mus_link_contest_p4_key+0 +mus_link_contest_p4_5_B1: .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 68*bgm_test4_mvl/mxv + .byte VOL , 68*mus_link_contest_p4_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fn1 , v112 .byte W12 @@ -1582,7 +1582,7 @@ bgm_test4_5_B1: .byte W12 .byte Dn1 .byte W12 - .byte VOL , 22*bgm_test4_mvl/mxv + .byte VOL , 22*mus_link_contest_p4_mvl/mxv .byte BEND , c_v+1 .byte N04 , Dn4 .byte W08 @@ -1714,7 +1714,7 @@ bgm_test4_5_B1: .byte W12 .byte N06 .byte W06 - .byte VOL , 68*bgm_test4_mvl/mxv + .byte VOL , 68*mus_link_contest_p4_mvl/mxv .byte W12 .byte N03 , Dn4 .byte W06 @@ -1779,24 +1779,24 @@ bgm_test4_5_B1: .byte N18 , Gs4 .byte W24 .byte GOTO - .word bgm_test4_5_B1 + .word mus_link_contest_p4_5_B1 .byte FINE @******************************************************@ .align 2 -bgm_test4: +mus_link_contest_p4: .byte 5 @ NumTrks .byte 0 @ NumBlks - .byte bgm_test4_pri @ Priority - .byte bgm_test4_rev @ Reverb. + .byte mus_link_contest_p4_pri @ Priority + .byte mus_link_contest_p4_rev @ Reverb. - .word bgm_test4_grp + .word mus_link_contest_p4_grp - .word bgm_test4_1 - .word bgm_test4_2 - .word bgm_test4_3 - .word bgm_test4_4 - .word bgm_test4_5 + .word mus_link_contest_p4_1 + .word mus_link_contest_p4_2 + .word mus_link_contest_p4_3 + .word mus_link_contest_p4_4 + .word mus_link_contest_p4_5 .end diff --git a/sound/songs/bgm_mishiro.s b/sound/songs/mus_littleroot.s index 287d74f38..be44ab72d 100644 --- a/sound/songs/bgm_mishiro.s +++ b/sound/songs/mus_littleroot.s @@ -1,23 +1,23 @@ .include "MPlayDef.s" - .equ bgm_mishiro_grp, voicegroup048 - .equ bgm_mishiro_pri, 0 - .equ bgm_mishiro_rev, reverb_set+50 - .equ bgm_mishiro_mvl, 127 - .equ bgm_mishiro_key, 0 - .equ bgm_mishiro_tbs, 1 - .equ bgm_mishiro_exg, 0 - .equ bgm_mishiro_cmp, 1 + .equ mus_littleroot_grp, voicegroup048 + .equ mus_littleroot_pri, 0 + .equ mus_littleroot_rev, reverb_set+50 + .equ mus_littleroot_mvl, 127 + .equ mus_littleroot_key, 0 + .equ mus_littleroot_tbs, 1 + .equ mus_littleroot_exg, 0 + .equ mus_littleroot_cmp, 1 .section .rodata - .global bgm_mishiro + .global mus_littleroot .align 2 @********************** Track 1 **********************@ -bgm_mishiro_1: - .byte KEYSH , bgm_mishiro_key+0 - .byte TEMPO , 108*bgm_mishiro_tbs/2 +mus_littleroot_1: + .byte KEYSH , mus_littleroot_key+0 + .byte TEMPO , 108*mus_littleroot_tbs/2 .byte VOICE , 48 .byte LFOS , 44 .byte PAN , c_v+4 @@ -25,10 +25,10 @@ bgm_mishiro_1: .byte BENDR , 12 .byte PAN , c_v-16 .byte LFOS , 44 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte W12 .byte W24 -bgm_mishiro_1_B1: +mus_littleroot_1_B1: .byte W96 .byte W96 .byte W96 @@ -42,16 +42,16 @@ bgm_mishiro_1_B1: .byte N32 , Cn4 , v108 .byte W21 .byte MOD , 3 - .byte VOL , 36*bgm_mishiro_mvl/mxv + .byte VOL , 36*mus_littleroot_mvl/mxv .byte W03 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W03 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , As3 , v104 .byte W12 .byte Cn4 , v112 @@ -117,25 +117,25 @@ bgm_mishiro_1_B1: .byte W12 .byte N48 , As3 .byte W24 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte W03 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W03 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 4 - .byte VOL , 27*bgm_mishiro_mvl/mxv + .byte VOL , 27*mus_littleroot_mvl/mxv .byte W03 - .byte 27*bgm_mishiro_mvl/mxv + .byte 27*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W03 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , Dn4 .byte W12 .byte N06 @@ -146,25 +146,25 @@ bgm_mishiro_1_B1: .byte W12 .byte N48 , As3 .byte W24 - .byte VOL , 36*bgm_mishiro_mvl/mxv + .byte VOL , 36*mus_littleroot_mvl/mxv .byte W03 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W03 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 6 - .byte VOL , 27*bgm_mishiro_mvl/mxv + .byte VOL , 27*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W03 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N03 , En4 .byte W03 .byte N09 , Fn4 @@ -177,33 +177,33 @@ bgm_mishiro_1_B1: .byte W12 .byte N72 , Gn3 .byte W24 - .byte VOL , 36*bgm_mishiro_mvl/mxv + .byte VOL , 36*mus_littleroot_mvl/mxv .byte W02 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W03 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W03 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W04 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W02 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W06 - .byte 27*bgm_mishiro_mvl/mxv + .byte 27*mus_littleroot_mvl/mxv .byte W06 - .byte 26*bgm_mishiro_mvl/mxv + .byte 26*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W07 .byte MOD , 4 - .byte VOL , 24*bgm_mishiro_mvl/mxv + .byte VOL , 24*mus_littleroot_mvl/mxv .byte W02 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W06 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 .byte W12 .byte Fn3 @@ -211,16 +211,16 @@ bgm_mishiro_1_B1: .byte N36 , En3 .byte W24 .byte MOD , 4 - .byte VOL , 36*bgm_mishiro_mvl/mxv + .byte VOL , 36*mus_littleroot_mvl/mxv .byte W03 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W03 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , Dn3 .byte W12 .byte Cn3 @@ -234,43 +234,43 @@ bgm_mishiro_1_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_mishiro_1_B1 + .word mus_littleroot_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_mishiro_2: - .byte KEYSH , bgm_mishiro_key+0 +mus_littleroot_2: + .byte KEYSH , mus_littleroot_key+0 .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 .byte LFOS , 44 .byte MOD , 0 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte N12 , Cn4 , v112 .byte W12 .byte Fn4 .byte W12 .byte Gn4 .byte W12 -bgm_mishiro_2_B1: +mus_littleroot_2_B1: .byte VOICE , 73 .byte N03 , Gs4 , v112 .byte W03 .byte N32 , An4 .byte W21 .byte MOD , 6 - .byte VOL , 41*bgm_mishiro_mvl/mxv + .byte VOL , 41*mus_littleroot_mvl/mxv .byte W02 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W03 - .byte 35*bgm_mishiro_mvl/mxv + .byte 35*mus_littleroot_mvl/mxv .byte W04 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte N12 , Gn4 , v084 .byte W12 .byte N11 , An4 , v092 @@ -284,16 +284,16 @@ bgm_mishiro_2_B1: .byte N36 , Cn5 , v112 .byte W24 .byte MOD , 6 - .byte VOL , 41*bgm_mishiro_mvl/mxv + .byte VOL , 41*mus_littleroot_mvl/mxv .byte W02 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W03 - .byte 30*bgm_mishiro_mvl/mxv + .byte 30*mus_littleroot_mvl/mxv .byte W03 - .byte 23*bgm_mishiro_mvl/mxv + .byte 23*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte N12 , Dn5 .byte W12 .byte An4 , v100 @@ -343,24 +343,24 @@ bgm_mishiro_2_B1: .byte N48 , Fn4 , v112 .byte W24 .byte MOD , 7 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte W02 - .byte 40*bgm_mishiro_mvl/mxv + .byte 40*mus_littleroot_mvl/mxv .byte W03 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W03 - .byte 36*bgm_mishiro_mvl/mxv + .byte 36*mus_littleroot_mvl/mxv .byte W04 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W02 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W03 - .byte 28*bgm_mishiro_mvl/mxv + .byte 28*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte N12 , Cn5 .byte W12 .byte N06 , As4 , v100 @@ -374,24 +374,24 @@ bgm_mishiro_2_B1: .byte N48 , Fn4 , v104 .byte W24 .byte MOD , 7 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte W02 - .byte 40*bgm_mishiro_mvl/mxv + .byte 40*mus_littleroot_mvl/mxv .byte W03 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W03 - .byte 36*bgm_mishiro_mvl/mxv + .byte 36*mus_littleroot_mvl/mxv .byte W04 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W02 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W03 - .byte 28*bgm_mishiro_mvl/mxv + .byte 28*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte N03 , Cs5 , v092 .byte W03 .byte N09 , Dn5 , v096 @@ -406,36 +406,36 @@ bgm_mishiro_2_B1: .byte W12 .byte N72 , Fn4 .byte W24 - .byte VOL , 42*bgm_mishiro_mvl/mxv + .byte VOL , 42*mus_littleroot_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte W03 - .byte 40*bgm_mishiro_mvl/mxv + .byte 40*mus_littleroot_mvl/mxv .byte W03 - .byte 38*bgm_mishiro_mvl/mxv + .byte 38*mus_littleroot_mvl/mxv .byte W04 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W05 - .byte 36*bgm_mishiro_mvl/mxv + .byte 36*mus_littleroot_mvl/mxv .byte W03 - .byte 35*bgm_mishiro_mvl/mxv + .byte 35*mus_littleroot_mvl/mxv .byte W04 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W02 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W03 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W03 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W06 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 - .byte 28*bgm_mishiro_mvl/mxv + .byte 28*mus_littleroot_mvl/mxv .byte W04 - .byte 24*bgm_mishiro_mvl/mxv + .byte 24*mus_littleroot_mvl/mxv .byte W03 - .byte 43*bgm_mishiro_mvl/mxv + .byte 43*mus_littleroot_mvl/mxv .byte MOD , 0 .byte N12 , En4 , v100 .byte W12 @@ -444,20 +444,20 @@ bgm_mishiro_2_B1: .byte N36 , En4 , v112 .byte W24 .byte MOD , 6 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte W02 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W03 - .byte 28*bgm_mishiro_mvl/mxv + .byte 28*mus_littleroot_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte N12 , Fn4 , v100 .byte W12 .byte Gn4 , v112 .byte W12 .byte VOICE , 48 - .byte VOL , 41*bgm_mishiro_mvl/mxv + .byte VOL , 41*mus_littleroot_mvl/mxv .byte N12 , Cn4 , v096 .byte W12 .byte Cn5 @@ -469,22 +469,22 @@ bgm_mishiro_2_B1: .byte N32 , An4 , v112 .byte W21 .byte MOD , 3 - .byte VOL , 39*bgm_mishiro_mvl/mxv + .byte VOL , 39*mus_littleroot_mvl/mxv .byte W02 - .byte 35*bgm_mishiro_mvl/mxv + .byte 35*mus_littleroot_mvl/mxv .byte W01 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W02 - .byte 30*bgm_mishiro_mvl/mxv + .byte 30*mus_littleroot_mvl/mxv .byte W01 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W02 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W01 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte N12 , Gn4 , v104 .byte W12 .byte An4 , v112 @@ -550,25 +550,25 @@ bgm_mishiro_2_B1: .byte W12 .byte N48 , Fn4 .byte W24 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte W02 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W03 - .byte 36*bgm_mishiro_mvl/mxv + .byte 36*mus_littleroot_mvl/mxv .byte W03 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 4 - .byte VOL , 31*bgm_mishiro_mvl/mxv + .byte VOL , 31*mus_littleroot_mvl/mxv .byte W02 - .byte 26*bgm_mishiro_mvl/mxv + .byte 26*mus_littleroot_mvl/mxv .byte W03 - .byte 24*bgm_mishiro_mvl/mxv + .byte 24*mus_littleroot_mvl/mxv .byte W03 - .byte 18*bgm_mishiro_mvl/mxv + .byte 18*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte N12 , Cn5 .byte W12 .byte N06 , As4 @@ -581,25 +581,25 @@ bgm_mishiro_2_B1: .byte W12 .byte N48 , Fn4 .byte W24 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte W02 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W03 - .byte 36*bgm_mishiro_mvl/mxv + .byte 36*mus_littleroot_mvl/mxv .byte W03 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 6 - .byte VOL , 31*bgm_mishiro_mvl/mxv + .byte VOL , 31*mus_littleroot_mvl/mxv .byte W02 - .byte 26*bgm_mishiro_mvl/mxv + .byte 26*mus_littleroot_mvl/mxv .byte W03 - .byte 24*bgm_mishiro_mvl/mxv + .byte 24*mus_littleroot_mvl/mxv .byte W03 - .byte 18*bgm_mishiro_mvl/mxv + .byte 18*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte N03 , Cs5 .byte W03 .byte N09 , Dn5 @@ -614,36 +614,36 @@ bgm_mishiro_2_B1: .byte W12 .byte N72 , Fn4 .byte W24 - .byte VOL , 39*bgm_mishiro_mvl/mxv + .byte VOL , 39*mus_littleroot_mvl/mxv .byte W02 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W06 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W04 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W02 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W03 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W06 - .byte 27*bgm_mishiro_mvl/mxv + .byte 27*mus_littleroot_mvl/mxv .byte W03 - .byte 26*bgm_mishiro_mvl/mxv + .byte 26*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 4 .byte W02 - .byte VOL , 24*bgm_mishiro_mvl/mxv + .byte VOL , 24*mus_littleroot_mvl/mxv .byte W03 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W04 - .byte 20*bgm_mishiro_mvl/mxv + .byte 20*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte N12 , En4 .byte W12 .byte Fn4 @@ -651,16 +651,16 @@ bgm_mishiro_2_B1: .byte N36 , Gn4 .byte W24 .byte MOD , 4 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte W03 - .byte 36*bgm_mishiro_mvl/mxv + .byte 36*mus_littleroot_mvl/mxv .byte W03 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W03 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 40*bgm_mishiro_mvl/mxv + .byte VOL , 40*mus_littleroot_mvl/mxv .byte N12 , An4 .byte W12 .byte As4 @@ -668,7 +668,7 @@ bgm_mishiro_2_B1: .byte As4 , v032 .byte W12 .byte VOICE , 73 - .byte VOL , 46*bgm_mishiro_mvl/mxv + .byte VOL , 46*mus_littleroot_mvl/mxv .byte N12 , An4 , v112 .byte W12 .byte As4 @@ -676,24 +676,24 @@ bgm_mishiro_2_B1: .byte N48 , Cn5 .byte W24 .byte MOD , 7 - .byte VOL , 41*bgm_mishiro_mvl/mxv + .byte VOL , 41*mus_littleroot_mvl/mxv .byte W02 - .byte 39*bgm_mishiro_mvl/mxv + .byte 39*mus_littleroot_mvl/mxv .byte W03 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W03 - .byte 34*bgm_mishiro_mvl/mxv + .byte 34*mus_littleroot_mvl/mxv .byte W04 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W02 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 - .byte 27*bgm_mishiro_mvl/mxv + .byte 27*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_mishiro_mvl/mxv + .byte VOL , 45*mus_littleroot_mvl/mxv .byte N12 , Cs5 .byte W12 .byte As4 @@ -722,26 +722,26 @@ bgm_mishiro_2_B1: .byte N48 , Gn4 .byte W24 .byte MOD , 7 - .byte VOL , 42*bgm_mishiro_mvl/mxv + .byte VOL , 42*mus_littleroot_mvl/mxv .byte W02 - .byte 40*bgm_mishiro_mvl/mxv + .byte 40*mus_littleroot_mvl/mxv .byte W03 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W03 - .byte 35*bgm_mishiro_mvl/mxv + .byte 35*mus_littleroot_mvl/mxv .byte W04 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W02 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W03 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 .byte N12 , Gn4 , v032 .byte W12 - .byte VOL , 45*bgm_mishiro_mvl/mxv + .byte VOL , 45*mus_littleroot_mvl/mxv .byte N03 , En4 , v112 .byte W03 .byte N09 , Fn4 @@ -773,27 +773,27 @@ bgm_mishiro_2_B1: .byte N48 , Cn5 .byte W24 .byte MOD , 4 - .byte VOL , 42*bgm_mishiro_mvl/mxv + .byte VOL , 42*mus_littleroot_mvl/mxv .byte W02 - .byte 40*bgm_mishiro_mvl/mxv + .byte 40*mus_littleroot_mvl/mxv .byte W03 - .byte 39*bgm_mishiro_mvl/mxv + .byte 39*mus_littleroot_mvl/mxv .byte W03 - .byte 37*bgm_mishiro_mvl/mxv + .byte 37*mus_littleroot_mvl/mxv .byte W04 - .byte 35*bgm_mishiro_mvl/mxv + .byte 35*mus_littleroot_mvl/mxv .byte W02 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 - .byte 30*bgm_mishiro_mvl/mxv + .byte 30*mus_littleroot_mvl/mxv .byte W03 - .byte 28*bgm_mishiro_mvl/mxv + .byte 28*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 25*bgm_mishiro_mvl/mxv + .byte VOL , 25*mus_littleroot_mvl/mxv .byte N12 , Cn5 , v032 .byte W12 - .byte VOL , 45*bgm_mishiro_mvl/mxv + .byte VOL , 45*mus_littleroot_mvl/mxv .byte N12 , An4 , v112 .byte W12 .byte Cs5 @@ -818,28 +818,28 @@ bgm_mishiro_2_B1: .byte W12 .byte N48 , Gn5 .byte W24 - .byte VOL , 42*bgm_mishiro_mvl/mxv + .byte VOL , 42*mus_littleroot_mvl/mxv .byte MOD , 4 .byte W02 - .byte VOL , 38*bgm_mishiro_mvl/mxv + .byte VOL , 38*mus_littleroot_mvl/mxv .byte W03 - .byte 35*bgm_mishiro_mvl/mxv + .byte 35*mus_littleroot_mvl/mxv .byte W03 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W04 - .byte 28*bgm_mishiro_mvl/mxv + .byte 28*mus_littleroot_mvl/mxv .byte W02 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W03 - .byte 24*bgm_mishiro_mvl/mxv + .byte 24*mus_littleroot_mvl/mxv .byte W03 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 22*bgm_mishiro_mvl/mxv + .byte VOL , 22*mus_littleroot_mvl/mxv .byte N12 , Gn5 , v032 .byte W12 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte N03 , En5 , v112 .byte W03 .byte N09 , Fn5 @@ -862,19 +862,19 @@ bgm_mishiro_2_B1: .byte W12 .byte VOICE , 73 .byte MOD , 0 - .byte VOL , 47*bgm_mishiro_mvl/mxv + .byte VOL , 47*mus_littleroot_mvl/mxv .byte N12 , As4 .byte W12 .byte Gn4 .byte W12 .byte GOTO - .word bgm_mishiro_2_B1 + .word mus_littleroot_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_mishiro_3: - .byte KEYSH , bgm_mishiro_key+0 +mus_littleroot_3: + .byte KEYSH , mus_littleroot_key+0 .byte VOICE , 35 .byte BENDR , 12 .byte LFOS , 44 @@ -882,26 +882,26 @@ bgm_mishiro_3: .byte LFOS , 44 .byte PAN , c_v+0 .byte LFOS , 44 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N06 , Cn1 , v127 .byte W12 .byte N24 , En1 , v112 .byte W24 -bgm_mishiro_3_B1: +mus_littleroot_3_B1: .byte N24 , Fn1 , v120 .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Fn1 , v028 .byte W12 .byte N06 , Fn1 , v108 @@ -924,16 +924,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , An1 , v028 .byte W12 .byte N06 , An1 , v112 @@ -952,16 +952,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Dn1 , v028 .byte W12 .byte N06 , An1 , v112 @@ -984,16 +984,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Cn1 , v028 .byte W12 .byte N06 , An1 , v112 @@ -1014,16 +1014,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Fn1 , v028 .byte W12 .byte N06 , As0 , v112 @@ -1046,16 +1046,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Gn1 , v028 .byte W12 .byte N06 , Dn1 , v112 @@ -1078,16 +1078,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Cn2 , v028 .byte W12 .byte N06 , Cn2 , v112 @@ -1108,16 +1108,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , En1 , v028 .byte W12 .byte N06 , En1 , v112 @@ -1140,16 +1140,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Fn1 , v028 .byte W12 .byte N06 , Fn1 , v112 @@ -1172,16 +1172,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , An1 , v028 .byte W12 .byte N06 , An1 , v112 @@ -1204,16 +1204,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Dn1 , v028 .byte W12 .byte N06 , An1 , v112 @@ -1234,16 +1234,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Cn1 , v028 .byte W12 .byte N06 , An1 , v112 @@ -1264,16 +1264,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Fn1 , v028 .byte W12 .byte N06 , As0 , v112 @@ -1296,16 +1296,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Gn1 , v028 .byte W12 .byte N06 , Gn1 , v112 @@ -1328,16 +1328,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Cn2 , v028 .byte W12 .byte N06 , Cn2 , v112 @@ -1358,16 +1358,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , En1 , v028 .byte W12 .byte N06 , En1 , v112 @@ -1390,16 +1390,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Cn2 , v028 .byte W12 .byte N06 , Cn2 , v112 @@ -1422,16 +1422,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , An1 , v028 .byte W12 .byte N06 , Dn2 , v112 @@ -1454,16 +1454,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , As1 , v028 .byte W12 .byte N06 , Gn1 , v112 @@ -1486,16 +1486,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Cn2 , v028 .byte W12 .byte N06 , An1 , v112 @@ -1518,16 +1518,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , An1 , v028 .byte W12 .byte N06 , An1 , v112 @@ -1550,16 +1550,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Fn1 , v028 .byte W12 .byte N06 , Dn2 , v112 @@ -1582,16 +1582,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , As1 , v028 .byte W12 .byte N06 , Gn1 , v112 @@ -1614,16 +1614,16 @@ bgm_mishiro_3_B1: .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 88*bgm_mishiro_mvl/mxv + .byte VOL , 88*mus_littleroot_mvl/mxv .byte W03 - .byte 75*bgm_mishiro_mvl/mxv + .byte 75*mus_littleroot_mvl/mxv .byte W03 - .byte 62*bgm_mishiro_mvl/mxv + .byte 62*mus_littleroot_mvl/mxv .byte W03 - .byte 50*bgm_mishiro_mvl/mxv + .byte 50*mus_littleroot_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 100*bgm_mishiro_mvl/mxv + .byte VOL , 100*mus_littleroot_mvl/mxv .byte N12 , Cn2 , v028 .byte W12 .byte N06 , Fn2 , v112 @@ -1643,22 +1643,22 @@ bgm_mishiro_3_B1: .byte Gn1 , v028 .byte W06 .byte GOTO - .word bgm_mishiro_3_B1 + .word mus_littleroot_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_mishiro_4: - .byte KEYSH , bgm_mishiro_key+0 +mus_littleroot_4: + .byte KEYSH , mus_littleroot_key+0 .byte VOICE , 45 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+32 - .byte VOL , 62*bgm_mishiro_mvl/mxv + .byte VOL , 62*mus_littleroot_mvl/mxv .byte W12 .byte W24 -bgm_mishiro_4_B1: +mus_littleroot_4_B1: .byte VOICE , 45 .byte W24 .byte N06 , Fn3 , v112 @@ -1704,7 +1704,7 @@ bgm_mishiro_4_B1: .byte W06 .byte N12 , Dn3 , v040 .byte W06 -bgm_mishiro_4_000: +mus_littleroot_4_000: .byte W24 .byte N06 , As3 , v112 .byte W06 @@ -1716,7 +1716,7 @@ bgm_mishiro_4_000: .byte W18 .byte PEND .byte PATT - .word bgm_mishiro_4_000 + .word mus_littleroot_4_000 .byte W24 .byte N06 , Cn4 , v112 .byte W06 @@ -1727,7 +1727,7 @@ bgm_mishiro_4_000: .byte N12 , Cn4 , v040 .byte W18 .byte PATT - .word bgm_mishiro_4_000 + .word mus_littleroot_4_000 .byte W96 .byte W96 .byte W96 @@ -1738,7 +1738,7 @@ bgm_mishiro_4_000: .byte W96 .byte W60 .byte VOICE , 0 - .byte VOL , 50*bgm_mishiro_mvl/mxv + .byte VOL , 50*mus_littleroot_mvl/mxv .byte W36 .byte W96 .byte W96 @@ -1748,20 +1748,20 @@ bgm_mishiro_4_000: .byte W96 .byte W96 .byte GOTO - .word bgm_mishiro_4_B1 + .word mus_littleroot_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_mishiro_5: - .byte KEYSH , bgm_mishiro_key+0 +mus_littleroot_5: + .byte KEYSH , mus_littleroot_key+0 .byte VOICE , 1 .byte PAN , c_v+0 .byte LFOS , 44 - .byte VOL , 50*bgm_mishiro_mvl/mxv + .byte VOL , 50*mus_littleroot_mvl/mxv .byte W12 .byte W24 -bgm_mishiro_5_B1: +mus_littleroot_5_B1: .byte W96 .byte W96 .byte W96 @@ -1889,23 +1889,23 @@ bgm_mishiro_5_B1: .byte Gn5 .byte W12 .byte GOTO - .word bgm_mishiro_5_B1 + .word mus_littleroot_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_mishiro_6: - .byte KEYSH , bgm_mishiro_key+0 +mus_littleroot_6: + .byte KEYSH , mus_littleroot_key+0 .byte VOICE , 45 .byte PAN , c_v-8 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v-32 - .byte VOL , 68*bgm_mishiro_mvl/mxv + .byte VOL , 68*mus_littleroot_mvl/mxv .byte W12 .byte W24 -bgm_mishiro_6_B1: +mus_littleroot_6_B1: .byte VOICE , 45 .byte N06 , Fn2 , v112 .byte W06 @@ -2182,13 +2182,13 @@ bgm_mishiro_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_mishiro_6_B1 + .word mus_littleroot_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_mishiro_7: - .byte KEYSH , bgm_mishiro_key+0 +mus_littleroot_7: + .byte KEYSH , mus_littleroot_key+0 .byte VOICE , 4 .byte LFOS , 44 .byte XCMD , xIECV , 18 @@ -2198,33 +2198,33 @@ bgm_mishiro_7: .byte xIECV , 8 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , Cn4 , v064 .byte W12 .byte Fn4 .byte W12 .byte Gn4 .byte W12 -bgm_mishiro_7_B1: +mus_littleroot_7_B1: .byte VOICE , 4 .byte PAN , c_v+0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte BEND , c_v+1 .byte N03 , Gs4 , v064 .byte W03 .byte N32 , An4 .byte W21 .byte MOD , 6 - .byte VOL , 34*bgm_mishiro_mvl/mxv + .byte VOL , 34*mus_littleroot_mvl/mxv .byte W02 - .byte 24*bgm_mishiro_mvl/mxv + .byte 24*mus_littleroot_mvl/mxv .byte W03 - .byte 18*bgm_mishiro_mvl/mxv + .byte 18*mus_littleroot_mvl/mxv .byte W03 - .byte 12*bgm_mishiro_mvl/mxv + .byte 12*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , Gn4 .byte W12 .byte An4 @@ -2238,16 +2238,16 @@ bgm_mishiro_7_B1: .byte N36 , Cn5 .byte W24 .byte MOD , 6 - .byte VOL , 32*bgm_mishiro_mvl/mxv + .byte VOL , 32*mus_littleroot_mvl/mxv .byte W02 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W03 - .byte 18*bgm_mishiro_mvl/mxv + .byte 18*mus_littleroot_mvl/mxv .byte W03 - .byte 15*bgm_mishiro_mvl/mxv + .byte 15*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , Dn5 .byte W12 .byte An4 @@ -2297,24 +2297,24 @@ bgm_mishiro_7_B1: .byte N48 , Fn4 .byte W24 .byte MOD , 7 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte W02 - .byte 32*bgm_mishiro_mvl/mxv + .byte 32*mus_littleroot_mvl/mxv .byte W03 - .byte 27*bgm_mishiro_mvl/mxv + .byte 27*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W04 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W02 - .byte 18*bgm_mishiro_mvl/mxv + .byte 18*mus_littleroot_mvl/mxv .byte W03 - .byte 16*bgm_mishiro_mvl/mxv + .byte 16*mus_littleroot_mvl/mxv .byte W03 - .byte 15*bgm_mishiro_mvl/mxv + .byte 15*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , Cn5 .byte W12 .byte N06 , As4 @@ -2328,24 +2328,24 @@ bgm_mishiro_7_B1: .byte N48 , Fn4 .byte W24 .byte MOD , 7 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte W02 - .byte 36*bgm_mishiro_mvl/mxv + .byte 36*mus_littleroot_mvl/mxv .byte W03 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W03 - .byte 30*bgm_mishiro_mvl/mxv + .byte 30*mus_littleroot_mvl/mxv .byte W04 - .byte 27*bgm_mishiro_mvl/mxv + .byte 27*mus_littleroot_mvl/mxv .byte W02 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W03 - .byte 18*bgm_mishiro_mvl/mxv + .byte 18*mus_littleroot_mvl/mxv .byte W03 - .byte 16*bgm_mishiro_mvl/mxv + .byte 16*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N03 , Cs5 .byte W03 .byte N09 , Dn5 @@ -2361,34 +2361,34 @@ bgm_mishiro_7_B1: .byte N72 , Fn4 .byte W24 .byte MOD , 7 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte W02 - .byte 36*bgm_mishiro_mvl/mxv + .byte 36*mus_littleroot_mvl/mxv .byte W03 - .byte 35*bgm_mishiro_mvl/mxv + .byte 35*mus_littleroot_mvl/mxv .byte W03 - .byte 33*bgm_mishiro_mvl/mxv + .byte 33*mus_littleroot_mvl/mxv .byte W04 - .byte 31*bgm_mishiro_mvl/mxv + .byte 31*mus_littleroot_mvl/mxv .byte W02 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 - .byte 28*bgm_mishiro_mvl/mxv + .byte 28*mus_littleroot_mvl/mxv .byte W03 - .byte 25*bgm_mishiro_mvl/mxv + .byte 25*mus_littleroot_mvl/mxv .byte W06 - .byte 23*bgm_mishiro_mvl/mxv + .byte 23*mus_littleroot_mvl/mxv .byte W03 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W03 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W04 - .byte 20*bgm_mishiro_mvl/mxv + .byte 20*mus_littleroot_mvl/mxv .byte W05 - .byte 19*bgm_mishiro_mvl/mxv + .byte 19*mus_littleroot_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , En4 .byte W12 .byte Dn4 @@ -2396,23 +2396,23 @@ bgm_mishiro_7_B1: .byte N36 , En4 .byte W24 .byte MOD , 6 - .byte VOL , 35*bgm_mishiro_mvl/mxv + .byte VOL , 35*mus_littleroot_mvl/mxv .byte W02 - .byte 29*bgm_mishiro_mvl/mxv + .byte 29*mus_littleroot_mvl/mxv .byte W03 - .byte 23*bgm_mishiro_mvl/mxv + .byte 23*mus_littleroot_mvl/mxv .byte W03 - .byte 22*bgm_mishiro_mvl/mxv + .byte 22*mus_littleroot_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 37*bgm_mishiro_mvl/mxv + .byte VOL , 37*mus_littleroot_mvl/mxv .byte N12 , Fn4 .byte W12 .byte Gn4 .byte W48 .byte VOICE , 6 .byte PAN , c_v-61 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fn2 , v112 .byte W06 @@ -2702,7 +2702,7 @@ bgm_mishiro_7_B1: .byte W06 .byte En3 , v032 .byte W06 -bgm_mishiro_7_000: +mus_littleroot_7_000: .byte N06 , Dn3 , v112 .byte W06 .byte Dn3 , v032 @@ -2833,7 +2833,7 @@ bgm_mishiro_7_000: .byte En4 , v032 .byte W06 .byte PATT - .word bgm_mishiro_7_000 + .word mus_littleroot_7_000 .byte N06 , As2 , v112 .byte W06 .byte As2 , v032 @@ -2899,13 +2899,13 @@ bgm_mishiro_7_000: .byte Gn4 , v032 .byte W06 .byte GOTO - .word bgm_mishiro_7_B1 + .word mus_littleroot_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_mishiro_8: - .byte KEYSH , bgm_mishiro_key+0 +mus_littleroot_8: + .byte KEYSH , mus_littleroot_key+0 .byte VOICE , 5 .byte LFOS , 44 .byte XCMD , xIECV , 18 @@ -2915,10 +2915,10 @@ bgm_mishiro_8: .byte XCMD , xIECV , 12 .byte xIECV , 8 .byte LFOS , 44 - .byte VOL , 50*bgm_mishiro_mvl/mxv + .byte VOL , 50*mus_littleroot_mvl/mxv .byte W12 .byte W24 -bgm_mishiro_8_B1: +mus_littleroot_8_B1: .byte VOICE , 5 .byte W96 .byte W96 @@ -2929,7 +2929,7 @@ bgm_mishiro_8_B1: .byte W96 .byte W96 .byte 7 - .byte VOL , 44*bgm_mishiro_mvl/mxv + .byte VOL , 44*mus_littleroot_mvl/mxv .byte W24 .byte N06 , Fn3 , v112 .byte W06 @@ -2982,7 +2982,7 @@ bgm_mishiro_8_B1: .byte W06 .byte Dn3 , v032 .byte W06 -bgm_mishiro_8_000: +mus_littleroot_8_000: .byte W24 .byte N06 , As3 , v112 .byte W06 @@ -2998,8 +2998,8 @@ bgm_mishiro_8_000: .byte W06 .byte PEND .byte PATT - .word bgm_mishiro_8_000 -bgm_mishiro_8_001: + .word mus_littleroot_8_000 +mus_littleroot_8_001: .byte W24 .byte N06 , Cn4 , v112 .byte W06 @@ -3028,7 +3028,7 @@ bgm_mishiro_8_001: .byte W06 .byte An3 , v032 .byte W18 -bgm_mishiro_8_002: +mus_littleroot_8_002: .byte W24 .byte N06 , Dn4 , v112 .byte W06 @@ -3067,7 +3067,7 @@ bgm_mishiro_8_002: .byte An3 , v032 .byte W18 .byte PATT - .word bgm_mishiro_8_002 + .word mus_littleroot_8_002 .byte W24 .byte N06 , As3 , v112 .byte W06 @@ -3078,21 +3078,21 @@ bgm_mishiro_8_002: .byte Bn3 , v032 .byte W18 .byte PATT - .word bgm_mishiro_8_001 + .word mus_littleroot_8_001 .byte GOTO - .word bgm_mishiro_8_B1 + .word mus_littleroot_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_mishiro_9: - .byte KEYSH , bgm_mishiro_key+0 +mus_littleroot_9: + .byte KEYSH , mus_littleroot_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 42*bgm_mishiro_mvl/mxv + .byte VOL , 42*mus_littleroot_mvl/mxv .byte W12 .byte W24 -bgm_mishiro_9_B1: +mus_littleroot_9_B1: .byte W96 .byte W96 .byte W96 @@ -3101,7 +3101,7 @@ bgm_mishiro_9_B1: .byte W96 .byte W96 .byte W96 -bgm_mishiro_9_000: +mus_littleroot_9_000: .byte N06 , Fs2 , v084 .byte W12 .byte Fs2 , v064 @@ -3120,58 +3120,58 @@ bgm_mishiro_9_000: .byte W12 .byte PEND .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte PATT - .word bgm_mishiro_9_000 + .word mus_littleroot_9_000 .byte GOTO - .word bgm_mishiro_9_B1 + .word mus_littleroot_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_mishiro: +mus_littleroot: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_mishiro_pri @ Priority - .byte bgm_mishiro_rev @ Reverb. + .byte mus_littleroot_pri @ Priority + .byte mus_littleroot_rev @ Reverb. - .word bgm_mishiro_grp + .word mus_littleroot_grp - .word bgm_mishiro_1 - .word bgm_mishiro_2 - .word bgm_mishiro_3 - .word bgm_mishiro_4 - .word bgm_mishiro_5 - .word bgm_mishiro_6 - .word bgm_mishiro_7 - .word bgm_mishiro_8 - .word bgm_mishiro_9 + .word mus_littleroot_1 + .word mus_littleroot_2 + .word mus_littleroot_3 + .word mus_littleroot_4 + .word mus_littleroot_5 + .word mus_littleroot_6 + .word mus_littleroot_7 + .word mus_littleroot_8 + .word mus_littleroot_9 .end diff --git a/sound/songs/bgm_tetsuji.s b/sound/songs/mus_littleroot_test.s index de5ffa3f3..8567de27c 100644 --- a/sound/songs/bgm_tetsuji.s +++ b/sound/songs/mus_littleroot_test.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_tetsuji_grp, voicegroup031 - .equ bgm_tetsuji_pri, 0 - .equ bgm_tetsuji_rev, reverb_set+50 - .equ bgm_tetsuji_mvl, 127 - .equ bgm_tetsuji_key, 0 - .equ bgm_tetsuji_tbs, 1 - .equ bgm_tetsuji_exg, 0 - .equ bgm_tetsuji_cmp, 1 + .equ mus_littleroot_test_grp, voicegroup031 + .equ mus_littleroot_test_pri, 0 + .equ mus_littleroot_test_rev, reverb_set+50 + .equ mus_littleroot_test_mvl, 127 + .equ mus_littleroot_test_key, 0 + .equ mus_littleroot_test_tbs, 1 + .equ mus_littleroot_test_exg, 0 + .equ mus_littleroot_test_cmp, 1 .section .rodata - .global bgm_tetsuji + .global mus_littleroot_test .align 2 @********************** Track 1 **********************@ -bgm_tetsuji_1: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_1_B1: - .byte TEMPO , 108*bgm_tetsuji_tbs/2 +mus_littleroot_test_1: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_1_B1: + .byte TEMPO , 108*mus_littleroot_test_tbs/2 .byte VOICE , 48 .byte PAN , c_v-16 .byte LFOS , 44 - .byte VOL , 37*bgm_tetsuji_mvl/mxv + .byte VOL , 37*mus_littleroot_test_mvl/mxv .byte W48 .byte N03 , Bn3 , v112 .byte W03 @@ -118,24 +118,24 @@ bgm_tetsuji_1_B1: .byte W96 .byte W48 .byte GOTO - .word bgm_tetsuji_1_B1 + .word mus_littleroot_test_1_B1 .byte W48 .byte FINE @********************** Track 2 **********************@ -bgm_tetsuji_2: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_2_B1: +mus_littleroot_test_2: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_2_B1: .byte VOICE , 73 .byte LFOS , 44 .byte MOD , 0 - .byte VOL , 44*bgm_tetsuji_mvl/mxv + .byte VOL , 44*mus_littleroot_test_mvl/mxv .byte PAN , c_v+0 .byte N12 , Gn4 , v112 .byte W12 .byte VOICE , 48 - .byte VOL , 37*bgm_tetsuji_mvl/mxv + .byte VOL , 37*mus_littleroot_test_mvl/mxv .byte N12 , Cn4 .byte W12 .byte Cn5 @@ -262,7 +262,7 @@ bgm_tetsuji_2_B1: .byte As4 , v032 .byte W12 .byte VOICE , 73 - .byte VOL , 50*bgm_tetsuji_mvl/mxv + .byte VOL , 50*mus_littleroot_test_mvl/mxv .byte N12 , An4 , v112 .byte W12 .byte As4 @@ -328,7 +328,7 @@ bgm_tetsuji_2_B1: .byte Gn4 , v032 .byte W12 .byte VOICE , 48 - .byte VOL , 41*bgm_tetsuji_mvl/mxv + .byte VOL , 41*mus_littleroot_test_mvl/mxv .byte N12 , An4 , v112 .byte W12 .byte As4 @@ -391,25 +391,25 @@ bgm_tetsuji_2_B1: .byte W12 .byte VOICE , 73 .byte MOD , 0 - .byte VOL , 50*bgm_tetsuji_mvl/mxv + .byte VOL , 50*mus_littleroot_test_mvl/mxv .byte N12 , As4 .byte W12 .byte Gn4 .byte W12 .byte GOTO - .word bgm_tetsuji_2_B1 + .word mus_littleroot_test_2_B1 .byte W48 .byte FINE @********************** Track 3 **********************@ -bgm_tetsuji_3: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_3_B1: +mus_littleroot_test_3: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_3_B1: .byte VOICE , 35 .byte PAN , c_v+0 .byte LFOS , 44 - .byte VOL , 99*bgm_tetsuji_mvl/mxv + .byte VOL , 99*mus_littleroot_test_mvl/mxv .byte N06 , Cn1 , v112 .byte W06 .byte Cn1 , v028 @@ -737,19 +737,19 @@ bgm_tetsuji_3_B1: .byte Gn1 , v028 .byte W06 .byte GOTO - .word bgm_tetsuji_3_B1 + .word mus_littleroot_test_3_B1 .byte W48 .byte FINE @********************** Track 4 **********************@ -bgm_tetsuji_4: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_4_B1: +mus_littleroot_test_4: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_4_B1: .byte VOICE , 45 .byte LFOS , 44 .byte PAN , c_v+32 - .byte VOL , 62*bgm_tetsuji_mvl/mxv + .byte VOL , 62*mus_littleroot_test_mvl/mxv .byte W24 .byte N06 , As3 , v112 .byte W06 @@ -765,7 +765,7 @@ bgm_tetsuji_4_B1: .byte W96 .byte W12 .byte VOICE , 0 - .byte VOL , 50*bgm_tetsuji_mvl/mxv + .byte VOL , 50*mus_littleroot_test_mvl/mxv .byte W84 .byte W96 .byte W96 @@ -775,19 +775,19 @@ bgm_tetsuji_4_B1: .byte W96 .byte W48 .byte GOTO - .word bgm_tetsuji_4_B1 + .word mus_littleroot_test_4_B1 .byte W48 .byte FINE @********************** Track 5 **********************@ -bgm_tetsuji_5: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_5_B1: +mus_littleroot_test_5: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_5_B1: .byte VOICE , 1 .byte PAN , c_v+0 .byte LFOS , 44 - .byte VOL , 50*bgm_tetsuji_mvl/mxv + .byte VOL , 50*mus_littleroot_test_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -908,19 +908,19 @@ bgm_tetsuji_5_B1: .byte Gn5 .byte W12 .byte GOTO - .word bgm_tetsuji_5_B1 + .word mus_littleroot_test_5_B1 .byte W48 .byte FINE @********************** Track 6 **********************@ -bgm_tetsuji_6: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_6_B1: +mus_littleroot_test_6: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_6_B1: .byte VOICE , 45 .byte LFOS , 44 .byte PAN , c_v-32 - .byte VOL , 72*bgm_tetsuji_mvl/mxv + .byte VOL , 72*mus_littleroot_test_mvl/mxv .byte N06 , Cn3 , v112 .byte W06 .byte Cn3 , v040 @@ -956,21 +956,21 @@ bgm_tetsuji_6_B1: .byte W96 .byte W48 .byte GOTO - .word bgm_tetsuji_6_B1 + .word mus_littleroot_test_6_B1 .byte W48 .byte FINE @********************** Track 7 **********************@ -bgm_tetsuji_7: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_7_B1: +mus_littleroot_test_7: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_7_B1: .byte VOICE , 4 .byte PAN , c_v-63 .byte XCMD , xIECV , 12 .byte xIECV , 8 .byte LFOS , 44 - .byte VOL , 58*bgm_tetsuji_mvl/mxv + .byte VOL , 58*mus_littleroot_test_mvl/mxv .byte W48 .byte N06 , Fn2 , v112 .byte W06 @@ -1277,7 +1277,7 @@ bgm_tetsuji_7_B1: .byte W06 .byte An3 , v032 .byte W06 -bgm_tetsuji_7_000: +mus_littleroot_test_7_000: .byte N06 , Bn2 , v112 .byte W06 .byte Bn2 , v032 @@ -1408,7 +1408,7 @@ bgm_tetsuji_7_000: .byte An3 , v032 .byte W06 .byte PATT - .word bgm_tetsuji_7_000 + .word mus_littleroot_test_7_000 .byte N06 , Bn2 , v112 .byte W06 .byte Bn2 , v032 @@ -1458,21 +1458,21 @@ bgm_tetsuji_7_000: .byte Gn4 , v032 .byte W06 .byte GOTO - .word bgm_tetsuji_7_B1 + .word mus_littleroot_test_7_B1 .byte W48 .byte FINE @********************** Track 8 **********************@ -bgm_tetsuji_8: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_8_B1: +mus_littleroot_test_8: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_8_B1: .byte VOICE , 5 .byte PAN , c_v+63 .byte XCMD , xIECV , 12 .byte xIECV , 8 .byte LFOS , 44 - .byte VOL , 50*bgm_tetsuji_mvl/mxv + .byte VOL , 50*mus_littleroot_test_mvl/mxv .byte W72 .byte N06 , Fn3 , v112 .byte W06 @@ -1576,7 +1576,7 @@ bgm_tetsuji_8_B1: .byte W06 .byte An3 , v032 .byte W18 -bgm_tetsuji_8_000: +mus_littleroot_test_8_000: .byte W24 .byte N06 , An3 , v112 .byte W06 @@ -1587,7 +1587,7 @@ bgm_tetsuji_8_000: .byte Dn4 , v032 .byte W18 .byte PEND -bgm_tetsuji_8_001: +mus_littleroot_test_8_001: .byte W24 .byte N06 , An3 , v112 .byte W06 @@ -1617,9 +1617,9 @@ bgm_tetsuji_8_001: .byte Cn4 , v032 .byte W18 .byte PATT - .word bgm_tetsuji_8_000 + .word mus_littleroot_test_8_000 .byte PATT - .word bgm_tetsuji_8_001 + .word mus_littleroot_test_8_001 .byte W24 .byte N06 , Bn3 , v112 .byte W06 @@ -1635,18 +1635,18 @@ bgm_tetsuji_8_001: .byte Cn4 , v032 .byte W18 .byte GOTO - .word bgm_tetsuji_8_B1 + .word mus_littleroot_test_8_B1 .byte W48 .byte FINE @********************** Track 9 **********************@ -bgm_tetsuji_9: - .byte KEYSH , bgm_tetsuji_key+0 -bgm_tetsuji_9_B1: +mus_littleroot_test_9: + .byte KEYSH , mus_littleroot_test_key+0 +mus_littleroot_test_9_B1: .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 40*bgm_tetsuji_mvl/mxv + .byte VOL , 40*mus_littleroot_test_mvl/mxv .byte W48 .byte N06 , Fs2 , v084 .byte W12 @@ -1656,7 +1656,7 @@ bgm_tetsuji_9_B1: .byte W12 .byte Fs2 , v068 .byte W12 -bgm_tetsuji_9_000: +mus_littleroot_test_9_000: .byte N06 , Fs2 , v084 .byte W12 .byte Fs2 , v064 @@ -1675,33 +1675,33 @@ bgm_tetsuji_9_000: .byte W12 .byte PEND .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte PATT - .word bgm_tetsuji_9_000 + .word mus_littleroot_test_9_000 .byte N06 , Fs2 , v084 .byte W12 .byte Fs2 , v064 @@ -1711,29 +1711,29 @@ bgm_tetsuji_9_000: .byte Fs2 , v068 .byte W12 .byte GOTO - .word bgm_tetsuji_9_B1 + .word mus_littleroot_test_9_B1 .byte W48 .byte FINE @******************************************************@ .align 2 -bgm_tetsuji: +mus_littleroot_test: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_tetsuji_pri @ Priority - .byte bgm_tetsuji_rev @ Reverb. + .byte mus_littleroot_test_pri @ Priority + .byte mus_littleroot_test_rev @ Reverb. - .word bgm_tetsuji_grp + .word mus_littleroot_test_grp - .word bgm_tetsuji_1 - .word bgm_tetsuji_2 - .word bgm_tetsuji_3 - .word bgm_tetsuji_4 - .word bgm_tetsuji_5 - .word bgm_tetsuji_6 - .word bgm_tetsuji_7 - .word bgm_tetsuji_8 - .word bgm_tetsuji_9 + .word mus_littleroot_test_1 + .word mus_littleroot_test_2 + .word mus_littleroot_test_3 + .word mus_littleroot_test_4 + .word mus_littleroot_test_5 + .word mus_littleroot_test_6 + .word mus_littleroot_test_7 + .word mus_littleroot_test_8 + .word mus_littleroot_test_9 .end diff --git a/sound/songs/bgm_me_wasure.s b/sound/songs/mus_move_deleted.s index 34eabc907..2eb044b7d 100644 --- a/sound/songs/bgm_me_wasure.s +++ b/sound/songs/mus_move_deleted.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_me_wasure_grp, voicegroup009 - .equ bgm_me_wasure_pri, 5 - .equ bgm_me_wasure_rev, reverb_set+50 - .equ bgm_me_wasure_mvl, 127 - .equ bgm_me_wasure_key, 0 - .equ bgm_me_wasure_tbs, 1 - .equ bgm_me_wasure_exg, 0 - .equ bgm_me_wasure_cmp, 1 + .equ mus_move_deleted_grp, voicegroup009 + .equ mus_move_deleted_pri, 5 + .equ mus_move_deleted_rev, reverb_set+50 + .equ mus_move_deleted_mvl, 127 + .equ mus_move_deleted_key, 0 + .equ mus_move_deleted_tbs, 1 + .equ mus_move_deleted_exg, 0 + .equ mus_move_deleted_cmp, 1 .section .rodata - .global bgm_me_wasure + .global mus_move_deleted .align 2 @********************** Track 1 **********************@ -bgm_me_wasure_1: - .byte KEYSH , bgm_me_wasure_key+0 - .byte TEMPO , 150*bgm_me_wasure_tbs/2 +mus_move_deleted_1: + .byte KEYSH , mus_move_deleted_key+0 + .byte TEMPO , 150*mus_move_deleted_tbs/2 .byte W12 .byte VOICE , 13 - .byte VOL , 90*bgm_me_wasure_mvl/mxv + .byte VOL , 90*mus_move_deleted_mvl/mxv .byte N06 , En3 , v068 .byte W06 .byte Bn3 @@ -49,11 +49,11 @@ bgm_me_wasure_1: @********************** Track 2 **********************@ -bgm_me_wasure_2: - .byte KEYSH , bgm_me_wasure_key+0 +mus_move_deleted_2: + .byte KEYSH , mus_move_deleted_key+0 .byte W12 .byte VOICE , 13 - .byte VOL , 90*bgm_me_wasure_mvl/mxv + .byte VOL , 90*mus_move_deleted_mvl/mxv .byte W03 .byte N06 , Gs3 , v068 .byte W06 @@ -83,13 +83,13 @@ bgm_me_wasure_2: @********************** Track 3 **********************@ -bgm_me_wasure_3: - .byte KEYSH , bgm_me_wasure_key+0 +mus_move_deleted_3: + .byte KEYSH , mus_move_deleted_key+0 .byte W12 .byte BEND , c_v+1 .byte W24 .byte VOICE , 13 - .byte VOL , 90*bgm_me_wasure_mvl/mxv + .byte VOL , 90*mus_move_deleted_mvl/mxv .byte PAN , c_v-48 .byte W12 .byte N12 , En5 , v012 @@ -111,13 +111,13 @@ bgm_me_wasure_3: @********************** Track 4 **********************@ -bgm_me_wasure_4: - .byte KEYSH , bgm_me_wasure_key+0 +mus_move_deleted_4: + .byte KEYSH , mus_move_deleted_key+0 .byte W12 .byte BEND , c_v-2 .byte W24 .byte VOICE , 13 - .byte VOL , 90*bgm_me_wasure_mvl/mxv + .byte VOL , 90*mus_move_deleted_mvl/mxv .byte PAN , c_v+48 .byte W24 .byte N12 , En5 , v012 @@ -139,13 +139,13 @@ bgm_me_wasure_4: @********************** Track 5 **********************@ -bgm_me_wasure_5: - .byte KEYSH , bgm_me_wasure_key+0 +mus_move_deleted_5: + .byte KEYSH , mus_move_deleted_key+0 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte W12 .byte VOICE , 84 - .byte VOL , 90*bgm_me_wasure_mvl/mxv + .byte VOL , 90*mus_move_deleted_mvl/mxv .byte W21 .byte N12 , En2 , v072 .byte W03 @@ -161,13 +161,13 @@ bgm_me_wasure_5: @********************** Track 6 **********************@ -bgm_me_wasure_6: - .byte KEYSH , bgm_me_wasure_key+0 +mus_move_deleted_6: + .byte KEYSH , mus_move_deleted_key+0 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte W12 .byte VOICE , 85 - .byte VOL , 90*bgm_me_wasure_mvl/mxv + .byte VOL , 90*mus_move_deleted_mvl/mxv .byte BEND , c_v+8 .byte W24 .byte N12 , En2 , v052 @@ -182,19 +182,19 @@ bgm_me_wasure_6: @******************************************************@ .align 2 -bgm_me_wasure: +mus_move_deleted: .byte 6 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_wasure_pri @ Priority - .byte bgm_me_wasure_rev @ Reverb. + .byte mus_move_deleted_pri @ Priority + .byte mus_move_deleted_rev @ Reverb. - .word bgm_me_wasure_grp + .word mus_move_deleted_grp - .word bgm_me_wasure_1 - .word bgm_me_wasure_2 - .word bgm_me_wasure_3 - .word bgm_me_wasure_4 - .word bgm_me_wasure_5 - .word bgm_me_wasure_6 + .word mus_move_deleted_1 + .word mus_move_deleted_2 + .word mus_move_deleted_3 + .word mus_move_deleted_4 + .word mus_move_deleted_5 + .word mus_move_deleted_6 .end diff --git a/sound/songs/bgm_tozan.s b/sound/songs/mus_mt_chimney.s index 42c47046d..70617a521 100644 --- a/sound/songs/bgm_tozan.s +++ b/sound/songs/mus_mt_chimney.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_tozan_grp, voicegroup049 - .equ bgm_tozan_pri, 0 - .equ bgm_tozan_rev, reverb_set+50 - .equ bgm_tozan_mvl, 127 - .equ bgm_tozan_key, 0 - .equ bgm_tozan_tbs, 1 - .equ bgm_tozan_exg, 0 - .equ bgm_tozan_cmp, 1 + .equ mus_mt_chimney_grp, voicegroup049 + .equ mus_mt_chimney_pri, 0 + .equ mus_mt_chimney_rev, reverb_set+50 + .equ mus_mt_chimney_mvl, 127 + .equ mus_mt_chimney_key, 0 + .equ mus_mt_chimney_tbs, 1 + .equ mus_mt_chimney_exg, 0 + .equ mus_mt_chimney_cmp, 1 .section .rodata - .global bgm_tozan + .global mus_mt_chimney .align 2 @********************** Track 1 **********************@ -bgm_tozan_1: - .byte KEYSH , bgm_tozan_key+0 - .byte TEMPO , 124*bgm_tozan_tbs/2 +mus_mt_chimney_1: + .byte KEYSH , mus_mt_chimney_key+0 + .byte TEMPO , 124*mus_mt_chimney_tbs/2 .byte VOICE , 127 .byte PAN , c_v-64 - .byte VOL , 27*bgm_tozan_mvl/mxv + .byte VOL , 27*mus_mt_chimney_mvl/mxv .byte N03 , Cn4 , v112 .byte W12 .byte Cn4 , v096 @@ -69,45 +69,45 @@ bgm_tozan_1: .byte N03 .byte W06 .byte VOICE , 126 - .byte VOL , 3*bgm_tozan_mvl/mxv + .byte VOL , 3*mus_mt_chimney_mvl/mxv .byte PAN , c_v-1 .byte N48 , Fn4 , v120 .byte W02 - .byte VOL , 4*bgm_tozan_mvl/mxv + .byte VOL , 4*mus_mt_chimney_mvl/mxv .byte W03 - .byte 6*bgm_tozan_mvl/mxv + .byte 6*mus_mt_chimney_mvl/mxv .byte W03 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W04 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W02 - .byte 8*bgm_tozan_mvl/mxv + .byte 8*mus_mt_chimney_mvl/mxv .byte W03 - .byte 11*bgm_tozan_mvl/mxv + .byte 11*mus_mt_chimney_mvl/mxv .byte W03 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W04 - .byte 15*bgm_tozan_mvl/mxv + .byte 15*mus_mt_chimney_mvl/mxv .byte W02 - .byte 18*bgm_tozan_mvl/mxv + .byte 18*mus_mt_chimney_mvl/mxv .byte W03 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W03 - .byte 25*bgm_tozan_mvl/mxv + .byte 25*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W03 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W03 -bgm_tozan_1_B1: -bgm_tozan_1_000: +mus_mt_chimney_1_B1: +mus_mt_chimney_1_000: .byte VOICE , 127 .byte PAN , c_v-64 - .byte VOL , 27*bgm_tozan_mvl/mxv + .byte VOL , 27*mus_mt_chimney_mvl/mxv .byte N03 , Cn4 , v112 .byte W12 .byte En4 , v064 @@ -125,7 +125,7 @@ bgm_tozan_1_000: .byte N06 , Gn3 , v124 .byte W24 .byte PEND -bgm_tozan_1_001: +mus_mt_chimney_1_001: .byte VOICE , 127 .byte PAN , c_v-64 .byte N03 , Cn4 , v112 @@ -149,7 +149,7 @@ bgm_tozan_1_001: .byte N03 , Gn3 , v064 .byte W12 .byte PEND -bgm_tozan_1_002: +mus_mt_chimney_1_002: .byte VOICE , 127 .byte PAN , c_v-64 .byte N03 , Cn4 , v112 @@ -169,7 +169,7 @@ bgm_tozan_1_002: .byte N06 , Gn3 , v124 .byte W24 .byte PEND -bgm_tozan_1_003: +mus_mt_chimney_1_003: .byte VOICE , 127 .byte PAN , c_v-64 .byte N03 , Cn4 , v112 @@ -183,46 +183,46 @@ bgm_tozan_1_003: .byte Cn4 , v112 .byte W12 .byte VOICE , 126 - .byte VOL , 3*bgm_tozan_mvl/mxv + .byte VOL , 3*mus_mt_chimney_mvl/mxv .byte PAN , c_v-1 .byte N48 , Fn4 , v120 .byte W02 - .byte VOL , 4*bgm_tozan_mvl/mxv + .byte VOL , 4*mus_mt_chimney_mvl/mxv .byte W03 - .byte 6*bgm_tozan_mvl/mxv + .byte 6*mus_mt_chimney_mvl/mxv .byte W03 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W04 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W02 - .byte 8*bgm_tozan_mvl/mxv + .byte 8*mus_mt_chimney_mvl/mxv .byte W03 - .byte 11*bgm_tozan_mvl/mxv + .byte 11*mus_mt_chimney_mvl/mxv .byte W03 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W04 .byte VOICE , 125 - .byte VOL , 15*bgm_tozan_mvl/mxv + .byte VOL , 15*mus_mt_chimney_mvl/mxv .byte W02 - .byte 18*bgm_tozan_mvl/mxv + .byte 18*mus_mt_chimney_mvl/mxv .byte W03 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W03 - .byte 25*bgm_tozan_mvl/mxv + .byte 25*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W03 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W03 .byte PEND .byte PATT - .word bgm_tozan_1_000 + .word mus_mt_chimney_1_000 .byte PATT - .word bgm_tozan_1_001 + .word mus_mt_chimney_1_001 .byte VOICE , 127 .byte PAN , c_v-64 .byte N03 , Cn4 , v112 @@ -262,43 +262,43 @@ bgm_tozan_1_003: .byte Cn4 , v112 .byte W12 .byte VOICE , 126 - .byte VOL , 3*bgm_tozan_mvl/mxv + .byte VOL , 3*mus_mt_chimney_mvl/mxv .byte N48 , Fn4 , v120 .byte W02 - .byte VOL , 4*bgm_tozan_mvl/mxv + .byte VOL , 4*mus_mt_chimney_mvl/mxv .byte W03 - .byte 6*bgm_tozan_mvl/mxv + .byte 6*mus_mt_chimney_mvl/mxv .byte W03 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W04 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W02 - .byte 8*bgm_tozan_mvl/mxv + .byte 8*mus_mt_chimney_mvl/mxv .byte W03 - .byte 11*bgm_tozan_mvl/mxv + .byte 11*mus_mt_chimney_mvl/mxv .byte W03 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W04 .byte PAN , c_v+0 - .byte VOL , 15*bgm_tozan_mvl/mxv + .byte VOL , 15*mus_mt_chimney_mvl/mxv .byte W02 - .byte 18*bgm_tozan_mvl/mxv + .byte 18*mus_mt_chimney_mvl/mxv .byte W03 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W03 - .byte 25*bgm_tozan_mvl/mxv + .byte 25*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W03 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W03 .byte PATT - .word bgm_tozan_1_000 -bgm_tozan_1_004: + .word mus_mt_chimney_1_000 +mus_mt_chimney_1_004: .byte VOICE , 127 .byte PAN , c_v-64 .byte N03 , Cn4 , v112 @@ -325,8 +325,8 @@ bgm_tozan_1_004: .byte W06 .byte PEND .byte PATT - .word bgm_tozan_1_002 -bgm_tozan_1_005: + .word mus_mt_chimney_1_002 +mus_mt_chimney_1_005: .byte VOICE , 127 .byte PAN , c_v-64 .byte N03 , Cn4 , v112 @@ -340,48 +340,48 @@ bgm_tozan_1_005: .byte Cn4 , v112 .byte W12 .byte VOICE , 126 - .byte VOL , 3*bgm_tozan_mvl/mxv + .byte VOL , 3*mus_mt_chimney_mvl/mxv .byte PAN , c_v-1 .byte N48 , Fn4 , v120 .byte W02 - .byte VOL , 4*bgm_tozan_mvl/mxv + .byte VOL , 4*mus_mt_chimney_mvl/mxv .byte W03 - .byte 6*bgm_tozan_mvl/mxv + .byte 6*mus_mt_chimney_mvl/mxv .byte W03 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W04 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W02 - .byte 8*bgm_tozan_mvl/mxv + .byte 8*mus_mt_chimney_mvl/mxv .byte W03 - .byte 11*bgm_tozan_mvl/mxv + .byte 11*mus_mt_chimney_mvl/mxv .byte W03 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W04 - .byte 15*bgm_tozan_mvl/mxv + .byte 15*mus_mt_chimney_mvl/mxv .byte W02 - .byte 18*bgm_tozan_mvl/mxv + .byte 18*mus_mt_chimney_mvl/mxv .byte W03 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W03 - .byte 25*bgm_tozan_mvl/mxv + .byte 25*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W03 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W03 .byte PEND .byte VOICE , 127 .byte PAN , c_v-64 - .byte VOL , 24*bgm_tozan_mvl/mxv + .byte VOL , 24*mus_mt_chimney_mvl/mxv .byte PAN , c_v-64 .byte N03 , Cn4 , v112 .byte W03 - .byte VOL , 27*bgm_tozan_mvl/mxv + .byte VOL , 27*mus_mt_chimney_mvl/mxv .byte W09 .byte N03 , En4 , v064 .byte W06 @@ -402,10 +402,10 @@ bgm_tozan_1_005: .byte Fn4 .byte W12 .byte PATT - .word bgm_tozan_1_001 + .word mus_mt_chimney_1_001 .byte PATT - .word bgm_tozan_1_002 -bgm_tozan_1_006: + .word mus_mt_chimney_1_002 +mus_mt_chimney_1_006: .byte VOICE , 127 .byte PAN , c_v-64 .byte N03 , Cn4 , v112 @@ -440,7 +440,7 @@ bgm_tozan_1_006: .byte PEND .byte VOICE , 127 .byte PAN , c_v-64 - .byte VOL , 29*bgm_tozan_mvl/mxv + .byte VOL , 29*mus_mt_chimney_mvl/mxv .byte N03 , En4 , v112 .byte W06 .byte En4 , v060 @@ -476,7 +476,7 @@ bgm_tozan_1_006: .byte W06 .byte En4 , v064 .byte W06 -bgm_tozan_1_007: +mus_mt_chimney_1_007: .byte PAN , c_v-62 .byte N03 , En4 , v112 .byte W06 @@ -517,8 +517,8 @@ bgm_tozan_1_007: .byte W06 .byte PEND .byte PATT - .word bgm_tozan_1_007 -bgm_tozan_1_008: + .word mus_mt_chimney_1_007 +mus_mt_chimney_1_008: .byte PAN , c_v-62 .byte N03 , En4 , v112 .byte W06 @@ -557,7 +557,7 @@ bgm_tozan_1_008: .byte W06 .byte PEND .byte PATT - .word bgm_tozan_1_008 + .word mus_mt_chimney_1_008 .byte PAN , c_v-62 .byte N03 , En4 , v112 .byte W06 @@ -595,7 +595,7 @@ bgm_tozan_1_008: .byte En4 , v064 .byte W06 .byte PAN , c_v-62 - .byte VOL , 39*bgm_tozan_mvl/mxv + .byte VOL , 39*mus_mt_chimney_mvl/mxv .byte W06 .byte N03 , Cn4 , v112 .byte W12 @@ -609,10 +609,10 @@ bgm_tozan_1_008: .byte W06 .byte En4 , v092 .byte W06 -bgm_tozan_1_009: +mus_mt_chimney_1_009: .byte VOICE , 127 .byte PAN , c_v-64 - .byte VOL , 27*bgm_tozan_mvl/mxv + .byte VOL , 27*mus_mt_chimney_mvl/mxv .byte N03 , Cn4 , v112 .byte W12 .byte En4 , v064 @@ -631,15 +631,15 @@ bgm_tozan_1_009: .byte W24 .byte PEND .byte PATT - .word bgm_tozan_1_001 + .word mus_mt_chimney_1_001 .byte PATT - .word bgm_tozan_1_002 + .word mus_mt_chimney_1_002 .byte PATT - .word bgm_tozan_1_003 + .word mus_mt_chimney_1_003 .byte PATT - .word bgm_tozan_1_009 + .word mus_mt_chimney_1_009 .byte PATT - .word bgm_tozan_1_001 + .word mus_mt_chimney_1_001 .byte VOICE , 127 .byte PAN , c_v-64 .byte N03 , Cn4 , v112 @@ -678,51 +678,51 @@ bgm_tozan_1_009: .byte Cn4 , v112 .byte W12 .byte VOICE , 126 - .byte VOL , 3*bgm_tozan_mvl/mxv + .byte VOL , 3*mus_mt_chimney_mvl/mxv .byte N48 , Fn4 , v120 .byte W02 - .byte VOL , 4*bgm_tozan_mvl/mxv + .byte VOL , 4*mus_mt_chimney_mvl/mxv .byte W03 - .byte 6*bgm_tozan_mvl/mxv + .byte 6*mus_mt_chimney_mvl/mxv .byte W03 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W04 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W02 - .byte 8*bgm_tozan_mvl/mxv + .byte 8*mus_mt_chimney_mvl/mxv .byte W03 - .byte 11*bgm_tozan_mvl/mxv + .byte 11*mus_mt_chimney_mvl/mxv .byte W03 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W04 .byte PAN , c_v+0 - .byte VOL , 15*bgm_tozan_mvl/mxv + .byte VOL , 15*mus_mt_chimney_mvl/mxv .byte W02 - .byte 18*bgm_tozan_mvl/mxv + .byte 18*mus_mt_chimney_mvl/mxv .byte W03 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W03 - .byte 25*bgm_tozan_mvl/mxv + .byte 25*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W03 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W03 .byte PATT - .word bgm_tozan_1_000 + .word mus_mt_chimney_1_000 .byte PATT - .word bgm_tozan_1_004 + .word mus_mt_chimney_1_004 .byte PATT - .word bgm_tozan_1_002 + .word mus_mt_chimney_1_002 .byte PATT - .word bgm_tozan_1_005 + .word mus_mt_chimney_1_005 .byte VOICE , 127 .byte PAN , c_v-64 - .byte VOL , 27*bgm_tozan_mvl/mxv + .byte VOL , 27*mus_mt_chimney_mvl/mxv .byte N03 , Cn4 , v112 .byte W12 .byte En4 , v064 @@ -744,49 +744,49 @@ bgm_tozan_1_009: .byte Fn4 .byte W12 .byte PATT - .word bgm_tozan_1_001 + .word mus_mt_chimney_1_001 .byte PATT - .word bgm_tozan_1_002 + .word mus_mt_chimney_1_002 .byte PATT - .word bgm_tozan_1_006 + .word mus_mt_chimney_1_006 .byte W24 .byte VOICE , 126 - .byte VOL , 3*bgm_tozan_mvl/mxv + .byte VOL , 3*mus_mt_chimney_mvl/mxv .byte PAN , c_v-1 .byte N48 , Fn4 , v120 .byte W02 - .byte VOL , 4*bgm_tozan_mvl/mxv + .byte VOL , 4*mus_mt_chimney_mvl/mxv .byte W03 - .byte 6*bgm_tozan_mvl/mxv + .byte 6*mus_mt_chimney_mvl/mxv .byte W03 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W04 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W02 - .byte 8*bgm_tozan_mvl/mxv + .byte 8*mus_mt_chimney_mvl/mxv .byte W03 - .byte 11*bgm_tozan_mvl/mxv + .byte 11*mus_mt_chimney_mvl/mxv .byte W03 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W04 .byte PAN , c_v+0 - .byte VOL , 15*bgm_tozan_mvl/mxv + .byte VOL , 15*mus_mt_chimney_mvl/mxv .byte W02 - .byte 18*bgm_tozan_mvl/mxv + .byte 18*mus_mt_chimney_mvl/mxv .byte W03 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W03 - .byte 25*bgm_tozan_mvl/mxv + .byte 25*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W03 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W03 - .byte 27*bgm_tozan_mvl/mxv + .byte 27*mus_mt_chimney_mvl/mxv .byte N03 , Cn4 , v112 .byte W06 .byte Cn4 , v064 @@ -797,42 +797,42 @@ bgm_tozan_1_009: .byte W06 .byte W24 .byte VOICE , 126 - .byte VOL , 3*bgm_tozan_mvl/mxv + .byte VOL , 3*mus_mt_chimney_mvl/mxv .byte PAN , c_v-1 .byte N48 , Fn4 , v120 .byte W02 - .byte VOL , 4*bgm_tozan_mvl/mxv + .byte VOL , 4*mus_mt_chimney_mvl/mxv .byte W03 - .byte 6*bgm_tozan_mvl/mxv + .byte 6*mus_mt_chimney_mvl/mxv .byte W03 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W04 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W02 - .byte 8*bgm_tozan_mvl/mxv + .byte 8*mus_mt_chimney_mvl/mxv .byte W03 - .byte 11*bgm_tozan_mvl/mxv + .byte 11*mus_mt_chimney_mvl/mxv .byte W03 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W04 .byte PAN , c_v+0 - .byte VOL , 15*bgm_tozan_mvl/mxv + .byte VOL , 15*mus_mt_chimney_mvl/mxv .byte W02 - .byte 18*bgm_tozan_mvl/mxv + .byte 18*mus_mt_chimney_mvl/mxv .byte W03 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W03 - .byte 25*bgm_tozan_mvl/mxv + .byte 25*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W03 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W03 - .byte 27*bgm_tozan_mvl/mxv + .byte 27*mus_mt_chimney_mvl/mxv .byte N03 , Cn4 , v112 .byte W06 .byte Cn4 , v064 @@ -841,38 +841,38 @@ bgm_tozan_1_009: .byte W06 .byte Cn4 , v064 .byte W06 - .byte VOL , 9*bgm_tozan_mvl/mxv + .byte VOL , 9*mus_mt_chimney_mvl/mxv .byte N24 , Fn4 , v112 .byte W02 - .byte VOL , 11*bgm_tozan_mvl/mxv + .byte VOL , 11*mus_mt_chimney_mvl/mxv .byte W03 - .byte 15*bgm_tozan_mvl/mxv + .byte 15*mus_mt_chimney_mvl/mxv .byte W03 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W04 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W02 - .byte 27*bgm_tozan_mvl/mxv + .byte 27*mus_mt_chimney_mvl/mxv .byte W03 - .byte 39*bgm_tozan_mvl/mxv + .byte 39*mus_mt_chimney_mvl/mxv .byte W30 .byte W01 - .byte 9*bgm_tozan_mvl/mxv + .byte 9*mus_mt_chimney_mvl/mxv .byte N24 .byte W02 - .byte VOL , 9*bgm_tozan_mvl/mxv + .byte VOL , 9*mus_mt_chimney_mvl/mxv .byte W03 - .byte 13*bgm_tozan_mvl/mxv + .byte 13*mus_mt_chimney_mvl/mxv .byte W03 - .byte 15*bgm_tozan_mvl/mxv + .byte 15*mus_mt_chimney_mvl/mxv .byte W04 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W02 - .byte 29*bgm_tozan_mvl/mxv + .byte 29*mus_mt_chimney_mvl/mxv .byte W03 - .byte 40*bgm_tozan_mvl/mxv + .byte 40*mus_mt_chimney_mvl/mxv .byte W04 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W24 .byte W03 .byte W96 @@ -881,16 +881,16 @@ bgm_tozan_1_009: .byte W96 .byte W96 .byte GOTO - .word bgm_tozan_1_B1 + .word mus_mt_chimney_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_tozan_2: - .byte KEYSH , bgm_tozan_key+0 +mus_mt_chimney_2: + .byte KEYSH , mus_mt_chimney_key+0 .byte VOICE , 47 .byte LFOS , 44 - .byte VOL , 70*bgm_tozan_mvl/mxv + .byte VOL , 70*mus_mt_chimney_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+19 .byte BEND , c_v+0 @@ -916,13 +916,13 @@ bgm_tozan_2: .byte W06 .byte N03 .byte W06 -bgm_tozan_2_B1: +mus_mt_chimney_2_B1: .byte PAN , c_v+16 .byte N12 , Ds2 , v112 .byte W12 .byte N06 , Gs1 .byte W84 -bgm_tozan_2_000: +mus_mt_chimney_2_000: .byte N03 , Bn2 , v112 .byte W06 .byte N03 @@ -942,7 +942,7 @@ bgm_tozan_2_000: .byte N03 .byte W06 .byte PEND -bgm_tozan_2_001: +mus_mt_chimney_2_001: .byte N12 , Ds2 , v112 .byte W12 .byte N06 , Gs1 @@ -952,7 +952,7 @@ bgm_tozan_2_001: .byte N03 .byte W06 .byte PEND -bgm_tozan_2_002: +mus_mt_chimney_2_002: .byte N03 , Ds2 , v112 .byte W06 .byte N03 @@ -970,7 +970,7 @@ bgm_tozan_2_002: .byte N06 , Gs1 .byte W36 .byte PEND -bgm_tozan_2_003: +mus_mt_chimney_2_003: .byte N12 , Ds2 , v112 .byte W12 .byte N06 , Ds1 @@ -980,7 +980,7 @@ bgm_tozan_2_003: .byte N03 .byte W06 .byte PEND -bgm_tozan_2_004: +mus_mt_chimney_2_004: .byte N12 , Ds2 , v112 .byte W12 .byte N06 , Ds1 @@ -995,7 +995,7 @@ bgm_tozan_2_004: .byte W36 .byte PEND .byte W96 -bgm_tozan_2_005: +mus_mt_chimney_2_005: .byte VOICE , 56 .byte W06 .byte N03 , Ds3 , v112 @@ -1033,7 +1033,7 @@ bgm_tozan_2_005: .byte As2 .byte W06 .byte PEND -bgm_tozan_2_006: +mus_mt_chimney_2_006: .byte VOICE , 47 .byte N12 , Ds2 , v112 .byte W12 @@ -1041,10 +1041,10 @@ bgm_tozan_2_006: .byte W84 .byte PEND .byte PATT - .word bgm_tozan_2_000 + .word mus_mt_chimney_2_000 .byte PATT - .word bgm_tozan_2_001 -bgm_tozan_2_007: + .word mus_mt_chimney_2_001 +mus_mt_chimney_2_007: .byte N03 , Ds2 , v112 .byte W06 .byte N03 @@ -1052,7 +1052,7 @@ bgm_tozan_2_007: .byte N06 , Gs1 .byte W84 .byte PEND -bgm_tozan_2_008: +mus_mt_chimney_2_008: .byte N12 , Ds2 , v112 .byte W12 .byte N05 , Ds1 @@ -1063,10 +1063,10 @@ bgm_tozan_2_008: .byte W06 .byte PEND .byte PATT - .word bgm_tozan_2_004 + .word mus_mt_chimney_2_004 .byte VOICE , 56 .byte W96 -bgm_tozan_2_009: +mus_mt_chimney_2_009: .byte W48 .byte VOICE , 60 .byte N48 , Gn3 , v112 @@ -1087,35 +1087,35 @@ bgm_tozan_2_009: .byte N06 , Gs1 .byte W84 .byte PATT - .word bgm_tozan_2_000 + .word mus_mt_chimney_2_000 .byte PATT - .word bgm_tozan_2_001 + .word mus_mt_chimney_2_001 .byte PATT - .word bgm_tozan_2_002 + .word mus_mt_chimney_2_002 .byte PATT - .word bgm_tozan_2_003 + .word mus_mt_chimney_2_003 .byte PATT - .word bgm_tozan_2_004 + .word mus_mt_chimney_2_004 .byte W96 .byte PATT - .word bgm_tozan_2_005 + .word mus_mt_chimney_2_005 .byte PATT - .word bgm_tozan_2_006 + .word mus_mt_chimney_2_006 .byte PATT - .word bgm_tozan_2_000 + .word mus_mt_chimney_2_000 .byte PATT - .word bgm_tozan_2_001 + .word mus_mt_chimney_2_001 .byte PATT - .word bgm_tozan_2_007 + .word mus_mt_chimney_2_007 .byte PATT - .word bgm_tozan_2_008 + .word mus_mt_chimney_2_008 .byte PATT - .word bgm_tozan_2_004 + .word mus_mt_chimney_2_004 .byte VOICE , 56 .byte W96 .byte PATT - .word bgm_tozan_2_009 -bgm_tozan_2_010: + .word mus_mt_chimney_2_009 +mus_mt_chimney_2_010: .byte N12 , Gs2 , v112 .byte W12 .byte Gs1 @@ -1130,7 +1130,7 @@ bgm_tozan_2_010: .byte W36 .byte PEND .byte PATT - .word bgm_tozan_2_010 + .word mus_mt_chimney_2_010 .byte N12 , Gs2 , v112 .byte W12 .byte Gs1 @@ -1207,16 +1207,16 @@ bgm_tozan_2_010: .byte N12 , Gs1 , v127 .byte W84 .byte GOTO - .word bgm_tozan_2_B1 + .word mus_mt_chimney_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_tozan_3: - .byte KEYSH , bgm_tozan_key+0 +mus_mt_chimney_3: + .byte KEYSH , mus_mt_chimney_key+0 .byte VOICE , 56 .byte LFOS , 44 - .byte VOL , 32*bgm_tozan_mvl/mxv + .byte VOL , 32*mus_mt_chimney_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v+0 .byte N24 , Gn1 , v112 @@ -1229,7 +1229,7 @@ bgm_tozan_3: .byte W12 .byte MOD , 6 .byte W12 - .byte VOL , 41*bgm_tozan_mvl/mxv + .byte VOL , 41*mus_mt_chimney_mvl/mxv .byte PAN , c_v+47 .byte MOD , 0 .byte N24 , As1 @@ -1244,74 +1244,74 @@ bgm_tozan_3: .byte W09 .byte 6 .byte W12 - .byte VOL , 58*bgm_tozan_mvl/mxv + .byte VOL , 58*mus_mt_chimney_mvl/mxv .byte PAN , c_v+9 .byte MOD , 0 .byte N96 , As2 .byte W12 - .byte VOL , 36*bgm_tozan_mvl/mxv + .byte VOL , 36*mus_mt_chimney_mvl/mxv .byte W02 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W03 - .byte 21*bgm_tozan_mvl/mxv + .byte 21*mus_mt_chimney_mvl/mxv .byte W03 - .byte 17*bgm_tozan_mvl/mxv + .byte 17*mus_mt_chimney_mvl/mxv .byte W04 - .byte 14*bgm_tozan_mvl/mxv + .byte 14*mus_mt_chimney_mvl/mxv .byte W02 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W01 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W02 - .byte 14*bgm_tozan_mvl/mxv + .byte 14*mus_mt_chimney_mvl/mxv .byte W03 - .byte 17*bgm_tozan_mvl/mxv + .byte 17*mus_mt_chimney_mvl/mxv .byte W04 - .byte 18*bgm_tozan_mvl/mxv + .byte 18*mus_mt_chimney_mvl/mxv .byte W02 - .byte 20*bgm_tozan_mvl/mxv + .byte 20*mus_mt_chimney_mvl/mxv .byte W03 - .byte 23*bgm_tozan_mvl/mxv + .byte 23*mus_mt_chimney_mvl/mxv .byte W03 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W04 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte MOD , 5 .byte W02 - .byte VOL , 29*bgm_tozan_mvl/mxv + .byte VOL , 29*mus_mt_chimney_mvl/mxv .byte W03 - .byte 31*bgm_tozan_mvl/mxv + .byte 31*mus_mt_chimney_mvl/mxv .byte W03 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 38*bgm_tozan_mvl/mxv + .byte 38*mus_mt_chimney_mvl/mxv .byte W02 - .byte 41*bgm_tozan_mvl/mxv + .byte 41*mus_mt_chimney_mvl/mxv .byte W03 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W03 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 49*bgm_tozan_mvl/mxv + .byte VOL , 49*mus_mt_chimney_mvl/mxv .byte W02 - .byte 55*bgm_tozan_mvl/mxv + .byte 55*mus_mt_chimney_mvl/mxv .byte W03 - .byte 57*bgm_tozan_mvl/mxv + .byte 57*mus_mt_chimney_mvl/mxv .byte W03 - .byte 60*bgm_tozan_mvl/mxv + .byte 60*mus_mt_chimney_mvl/mxv .byte W04 - .byte 62*bgm_tozan_mvl/mxv + .byte 62*mus_mt_chimney_mvl/mxv .byte W02 - .byte 64*bgm_tozan_mvl/mxv + .byte 64*mus_mt_chimney_mvl/mxv .byte W03 - .byte 68*bgm_tozan_mvl/mxv + .byte 68*mus_mt_chimney_mvl/mxv .byte W03 - .byte 72*bgm_tozan_mvl/mxv + .byte 72*mus_mt_chimney_mvl/mxv .byte W04 -bgm_tozan_3_B1: +mus_mt_chimney_3_B1: .byte VOICE , 56 - .byte VOL , 65*bgm_tozan_mvl/mxv + .byte VOL , 65*mus_mt_chimney_mvl/mxv .byte MOD , 1 .byte PAN , c_v+0 .byte W06 @@ -1347,9 +1347,9 @@ bgm_tozan_3_B1: .byte W12 .byte Fn3 .byte W12 -bgm_tozan_3_000: +mus_mt_chimney_3_000: .byte PAN , c_v-48 - .byte VOL , 74*bgm_tozan_mvl/mxv + .byte VOL , 74*mus_mt_chimney_mvl/mxv .byte N03 , Bn3 , v112 .byte W03 .byte Bn3 , v032 @@ -1389,7 +1389,7 @@ bgm_tozan_3_000: .byte N06 , Dn4 , v032 .byte W03 .byte PEND - .byte VOL , 55*bgm_tozan_mvl/mxv + .byte VOL , 55*mus_mt_chimney_mvl/mxv .byte PAN , c_v-18 .byte W03 .byte c_v-16 @@ -1415,7 +1415,7 @@ bgm_tozan_3_000: .byte W12 .byte Fn3 .byte W12 - .byte VOL , 66*bgm_tozan_mvl/mxv + .byte VOL , 66*mus_mt_chimney_mvl/mxv .byte PAN , c_v-24 .byte N06 , Fs3 .byte W06 @@ -1457,7 +1457,7 @@ bgm_tozan_3_000: .byte W03 .byte N06 , Bn4 , v112 .byte W06 -bgm_tozan_3_001: +mus_mt_chimney_3_001: .byte N06 , Ds5 , v112 .byte W06 .byte N03 , Dn5 @@ -1477,7 +1477,7 @@ bgm_tozan_3_001: .byte N09 , Ds4 , v032 .byte W12 .byte PEND -bgm_tozan_3_002: +mus_mt_chimney_3_002: .byte W06 .byte N03 , Gn3 , v112 .byte W03 @@ -1508,65 +1508,65 @@ bgm_tozan_3_002: .byte PEND .byte N96 , Ds3 .byte W03 - .byte VOL , 66*bgm_tozan_mvl/mxv + .byte VOL , 66*mus_mt_chimney_mvl/mxv .byte W03 - .byte 58*bgm_tozan_mvl/mxv + .byte 58*mus_mt_chimney_mvl/mxv .byte W02 - .byte 43*bgm_tozan_mvl/mxv + .byte 43*mus_mt_chimney_mvl/mxv .byte W04 - .byte 36*bgm_tozan_mvl/mxv + .byte 36*mus_mt_chimney_mvl/mxv .byte W02 - .byte 27*bgm_tozan_mvl/mxv + .byte 27*mus_mt_chimney_mvl/mxv .byte W04 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W06 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W02 - .byte 20*bgm_tozan_mvl/mxv + .byte 20*mus_mt_chimney_mvl/mxv .byte W04 - .byte 23*bgm_tozan_mvl/mxv + .byte 23*mus_mt_chimney_mvl/mxv .byte W02 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W04 - .byte 29*bgm_tozan_mvl/mxv + .byte 29*mus_mt_chimney_mvl/mxv .byte W02 - .byte 32*bgm_tozan_mvl/mxv + .byte 32*mus_mt_chimney_mvl/mxv .byte W04 - .byte 33*bgm_tozan_mvl/mxv + .byte 33*mus_mt_chimney_mvl/mxv .byte W02 - .byte 36*bgm_tozan_mvl/mxv + .byte 36*mus_mt_chimney_mvl/mxv .byte W04 - .byte 36*bgm_tozan_mvl/mxv + .byte 36*mus_mt_chimney_mvl/mxv .byte W02 - .byte 39*bgm_tozan_mvl/mxv + .byte 39*mus_mt_chimney_mvl/mxv .byte W04 - .byte 40*bgm_tozan_mvl/mxv + .byte 40*mus_mt_chimney_mvl/mxv .byte W02 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W04 - .byte 44*bgm_tozan_mvl/mxv + .byte 44*mus_mt_chimney_mvl/mxv .byte W06 - .byte 47*bgm_tozan_mvl/mxv + .byte 47*mus_mt_chimney_mvl/mxv .byte W02 - .byte 49*bgm_tozan_mvl/mxv + .byte 49*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 54*bgm_tozan_mvl/mxv + .byte VOL , 54*mus_mt_chimney_mvl/mxv .byte W02 - .byte 57*bgm_tozan_mvl/mxv + .byte 57*mus_mt_chimney_mvl/mxv .byte W04 - .byte 60*bgm_tozan_mvl/mxv + .byte 60*mus_mt_chimney_mvl/mxv .byte W02 - .byte 63*bgm_tozan_mvl/mxv + .byte 63*mus_mt_chimney_mvl/mxv .byte W04 - .byte 66*bgm_tozan_mvl/mxv + .byte 66*mus_mt_chimney_mvl/mxv .byte W02 - .byte 68*bgm_tozan_mvl/mxv + .byte 68*mus_mt_chimney_mvl/mxv .byte W04 - .byte 73*bgm_tozan_mvl/mxv + .byte 73*mus_mt_chimney_mvl/mxv .byte W06 .byte VOICE , 56 - .byte VOL , 65*bgm_tozan_mvl/mxv + .byte VOL , 65*mus_mt_chimney_mvl/mxv .byte MOD , 1 .byte W06 .byte N03 , Ds4 @@ -1614,7 +1614,7 @@ bgm_tozan_3_002: .byte Gn3 .byte W06 .byte VOICE , 56 - .byte VOL , 65*bgm_tozan_mvl/mxv + .byte VOL , 65*mus_mt_chimney_mvl/mxv .byte W12 .byte N06 , As3 , v112 .byte W06 @@ -1634,9 +1634,9 @@ bgm_tozan_3_002: .byte W12 .byte Fn3 .byte W12 -bgm_tozan_3_003: +mus_mt_chimney_3_003: .byte PAN , c_v-48 - .byte VOL , 74*bgm_tozan_mvl/mxv + .byte VOL , 74*mus_mt_chimney_mvl/mxv .byte N03 , Bn3 , v112 .byte W03 .byte Bn3 , v032 @@ -1671,7 +1671,7 @@ bgm_tozan_3_003: .byte W06 .byte PEND .byte PAN , c_v-32 - .byte VOL , 55*bgm_tozan_mvl/mxv + .byte VOL , 55*mus_mt_chimney_mvl/mxv .byte N03 , Ds3 .byte W03 .byte Ds3 , v032 @@ -1698,7 +1698,7 @@ bgm_tozan_3_003: .byte W12 .byte Fn3 .byte W12 - .byte VOL , 66*bgm_tozan_mvl/mxv + .byte VOL , 66*mus_mt_chimney_mvl/mxv .byte N06 , Fs3 .byte W06 .byte N03 , Gs3 @@ -1739,7 +1739,7 @@ bgm_tozan_3_003: .byte W03 .byte N06 , Bn4 , v112 .byte W06 -bgm_tozan_3_004: +mus_mt_chimney_3_004: .byte N06 , Ds5 , v112 .byte W06 .byte N03 , Dn5 @@ -1760,47 +1760,47 @@ bgm_tozan_3_004: .byte W12 .byte PEND .byte PATT - .word bgm_tozan_3_002 -bgm_tozan_3_005: + .word mus_mt_chimney_3_002 +mus_mt_chimney_3_005: .byte N96 , Ds3 , v112 .byte W48 - .byte VOL , 66*bgm_tozan_mvl/mxv + .byte VOL , 66*mus_mt_chimney_mvl/mxv .byte W02 - .byte 62*bgm_tozan_mvl/mxv + .byte 62*mus_mt_chimney_mvl/mxv .byte W03 - .byte 61*bgm_tozan_mvl/mxv + .byte 61*mus_mt_chimney_mvl/mxv .byte W03 - .byte 55*bgm_tozan_mvl/mxv + .byte 55*mus_mt_chimney_mvl/mxv .byte W04 - .byte 52*bgm_tozan_mvl/mxv + .byte 52*mus_mt_chimney_mvl/mxv .byte W02 - .byte 48*bgm_tozan_mvl/mxv + .byte 48*mus_mt_chimney_mvl/mxv .byte W03 - .byte 41*bgm_tozan_mvl/mxv + .byte 41*mus_mt_chimney_mvl/mxv .byte W03 - .byte 38*bgm_tozan_mvl/mxv + .byte 38*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 34*bgm_tozan_mvl/mxv + .byte VOL , 34*mus_mt_chimney_mvl/mxv .byte W02 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W03 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W03 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W04 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W02 - .byte 12*bgm_tozan_mvl/mxv + .byte 12*mus_mt_chimney_mvl/mxv .byte W03 - .byte 7*bgm_tozan_mvl/mxv + .byte 7*mus_mt_chimney_mvl/mxv .byte W03 - .byte 3*bgm_tozan_mvl/mxv + .byte 3*mus_mt_chimney_mvl/mxv .byte W04 .byte PEND .byte VOICE , 60 .byte MOD , 1 - .byte VOL , 68*bgm_tozan_mvl/mxv + .byte VOL , 68*mus_mt_chimney_mvl/mxv .byte N96 , Ds2 .byte W72 .byte MOD , 7 @@ -1808,7 +1808,7 @@ bgm_tozan_3_005: .byte VOICE , 56 .byte MOD , 1 .byte PAN , c_v+16 - .byte VOL , 68*bgm_tozan_mvl/mxv + .byte VOL , 68*mus_mt_chimney_mvl/mxv .byte N06 , Fs4 .byte W06 .byte N03 , Fn4 , v076 @@ -1879,7 +1879,7 @@ bgm_tozan_3_005: .byte Gs3 .byte W09 .byte W96 - .byte VOL , 68*bgm_tozan_mvl/mxv + .byte VOL , 68*mus_mt_chimney_mvl/mxv .byte W48 .byte N03 , As3 , v112 .byte W06 @@ -1917,7 +1917,7 @@ bgm_tozan_3_005: .byte W03 .byte MOD , 1 .byte PAN , c_v-39 - .byte VOL , 57*bgm_tozan_mvl/mxv + .byte VOL , 57*mus_mt_chimney_mvl/mxv .byte W06 .byte N03 , Fn3 , v112 .byte W03 @@ -1952,9 +1952,9 @@ bgm_tozan_3_005: .byte Fn3 .byte W12 .byte PATT - .word bgm_tozan_3_000 + .word mus_mt_chimney_3_000 .byte PAN , c_v-32 - .byte VOL , 54*bgm_tozan_mvl/mxv + .byte VOL , 54*mus_mt_chimney_mvl/mxv .byte W09 .byte N03 , En3 , v112 .byte W03 @@ -1977,7 +1977,7 @@ bgm_tozan_3_005: .byte W12 .byte Fn3 .byte W12 - .byte VOL , 67*bgm_tozan_mvl/mxv + .byte VOL , 67*mus_mt_chimney_mvl/mxv .byte N06 , Fs3 .byte W06 .byte N03 , Gs3 @@ -2019,72 +2019,72 @@ bgm_tozan_3_005: .byte N06 , Bn4 , v112 .byte W06 .byte PATT - .word bgm_tozan_3_001 + .word mus_mt_chimney_3_001 .byte PATT - .word bgm_tozan_3_002 + .word mus_mt_chimney_3_002 .byte N96 , Ds3 , v112 .byte W03 - .byte VOL , 66*bgm_tozan_mvl/mxv + .byte VOL , 66*mus_mt_chimney_mvl/mxv .byte W03 - .byte 58*bgm_tozan_mvl/mxv + .byte 58*mus_mt_chimney_mvl/mxv .byte W02 - .byte 43*bgm_tozan_mvl/mxv + .byte 43*mus_mt_chimney_mvl/mxv .byte W04 - .byte 36*bgm_tozan_mvl/mxv + .byte 36*mus_mt_chimney_mvl/mxv .byte W02 - .byte 27*bgm_tozan_mvl/mxv + .byte 27*mus_mt_chimney_mvl/mxv .byte W04 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W06 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W02 - .byte 20*bgm_tozan_mvl/mxv + .byte 20*mus_mt_chimney_mvl/mxv .byte W04 - .byte 23*bgm_tozan_mvl/mxv + .byte 23*mus_mt_chimney_mvl/mxv .byte W02 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W04 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W02 - .byte 25*bgm_tozan_mvl/mxv + .byte 25*mus_mt_chimney_mvl/mxv .byte W04 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W06 - .byte 27*bgm_tozan_mvl/mxv + .byte 27*mus_mt_chimney_mvl/mxv .byte W02 - .byte 29*bgm_tozan_mvl/mxv + .byte 29*mus_mt_chimney_mvl/mxv .byte W04 - .byte 30*bgm_tozan_mvl/mxv + .byte 30*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 38*bgm_tozan_mvl/mxv + .byte 38*mus_mt_chimney_mvl/mxv .byte W02 - .byte 41*bgm_tozan_mvl/mxv + .byte 41*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W02 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 46*bgm_tozan_mvl/mxv + .byte VOL , 46*mus_mt_chimney_mvl/mxv .byte W02 - .byte 49*bgm_tozan_mvl/mxv + .byte 49*mus_mt_chimney_mvl/mxv .byte W04 - .byte 52*bgm_tozan_mvl/mxv + .byte 52*mus_mt_chimney_mvl/mxv .byte W02 - .byte 58*bgm_tozan_mvl/mxv + .byte 58*mus_mt_chimney_mvl/mxv .byte W04 - .byte 63*bgm_tozan_mvl/mxv + .byte 63*mus_mt_chimney_mvl/mxv .byte W02 - .byte 69*bgm_tozan_mvl/mxv + .byte 69*mus_mt_chimney_mvl/mxv .byte W04 - .byte 75*bgm_tozan_mvl/mxv + .byte 75*mus_mt_chimney_mvl/mxv .byte W06 .byte VOICE , 56 - .byte VOL , 65*bgm_tozan_mvl/mxv + .byte VOL , 65*mus_mt_chimney_mvl/mxv .byte MOD , 1 - .byte VOL , 65*bgm_tozan_mvl/mxv + .byte VOL , 65*mus_mt_chimney_mvl/mxv .byte W06 .byte N03 , Ds4 .byte W03 @@ -2131,7 +2131,7 @@ bgm_tozan_3_005: .byte Gn3 .byte W06 .byte VOICE , 56 - .byte VOL , 54*bgm_tozan_mvl/mxv + .byte VOL , 54*mus_mt_chimney_mvl/mxv .byte W12 .byte N06 , As3 , v112 .byte W06 @@ -2152,9 +2152,9 @@ bgm_tozan_3_005: .byte Fn3 .byte W12 .byte PATT - .word bgm_tozan_3_003 + .word mus_mt_chimney_3_003 .byte PAN , c_v-32 - .byte VOL , 54*bgm_tozan_mvl/mxv + .byte VOL , 54*mus_mt_chimney_mvl/mxv .byte N03 , Ds3 , v112 .byte W03 .byte Ds3 , v032 @@ -2181,7 +2181,7 @@ bgm_tozan_3_005: .byte W12 .byte Fn3 .byte W12 - .byte VOL , 66*bgm_tozan_mvl/mxv + .byte VOL , 66*mus_mt_chimney_mvl/mxv .byte N06 , Fs3 .byte W06 .byte N03 , Gs3 @@ -2223,14 +2223,14 @@ bgm_tozan_3_005: .byte N06 , Bn4 , v112 .byte W06 .byte PATT - .word bgm_tozan_3_004 + .word mus_mt_chimney_3_004 .byte PATT - .word bgm_tozan_3_002 + .word mus_mt_chimney_3_002 .byte PATT - .word bgm_tozan_3_005 + .word mus_mt_chimney_3_005 .byte VOICE , 60 .byte MOD , 1 - .byte VOL , 71*bgm_tozan_mvl/mxv + .byte VOL , 71*mus_mt_chimney_mvl/mxv .byte N96 , Ds2 , v112 .byte W72 .byte MOD , 7 @@ -2351,18 +2351,18 @@ bgm_tozan_3_005: .byte W96 .byte W96 .byte GOTO - .word bgm_tozan_3_B1 + .word mus_mt_chimney_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_tozan_4: - .byte KEYSH , bgm_tozan_key+0 +mus_mt_chimney_4: + .byte KEYSH , mus_mt_chimney_key+0 .byte VOICE , 60 .byte LFOS , 44 .byte MOD , 1 .byte PAN , c_v-48 - .byte VOL , 55*bgm_tozan_mvl/mxv + .byte VOL , 55*mus_mt_chimney_mvl/mxv .byte BEND , c_v+0 .byte N24 , Ds2 , v112 .byte W12 @@ -2375,7 +2375,7 @@ bgm_tozan_4: .byte MOD , 3 .byte W12 .byte PAN , c_v-31 - .byte VOL , 65*bgm_tozan_mvl/mxv + .byte VOL , 65*mus_mt_chimney_mvl/mxv .byte MOD , 0 .byte N24 , Gn2 .byte W12 @@ -2389,76 +2389,76 @@ bgm_tozan_4: .byte W09 .byte 3 .byte W12 - .byte VOL , 72*bgm_tozan_mvl/mxv + .byte VOL , 72*mus_mt_chimney_mvl/mxv .byte MOD , 0 .byte PAN , c_v+0 .byte N96 , Ds3 , v124 .byte W09 - .byte VOL , 67*bgm_tozan_mvl/mxv + .byte VOL , 67*mus_mt_chimney_mvl/mxv .byte W03 - .byte 63*bgm_tozan_mvl/mxv + .byte 63*mus_mt_chimney_mvl/mxv .byte W02 - .byte 60*bgm_tozan_mvl/mxv + .byte 60*mus_mt_chimney_mvl/mxv .byte W03 - .byte 57*bgm_tozan_mvl/mxv + .byte 57*mus_mt_chimney_mvl/mxv .byte W03 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W04 - .byte 48*bgm_tozan_mvl/mxv + .byte 48*mus_mt_chimney_mvl/mxv .byte W02 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W01 - .byte 47*bgm_tozan_mvl/mxv + .byte 47*mus_mt_chimney_mvl/mxv .byte W02 - .byte 48*bgm_tozan_mvl/mxv + .byte 48*mus_mt_chimney_mvl/mxv .byte W03 - .byte 50*bgm_tozan_mvl/mxv + .byte 50*mus_mt_chimney_mvl/mxv .byte W04 - .byte 50*bgm_tozan_mvl/mxv + .byte 50*mus_mt_chimney_mvl/mxv .byte W02 - .byte 51*bgm_tozan_mvl/mxv + .byte 51*mus_mt_chimney_mvl/mxv .byte W03 - .byte 52*bgm_tozan_mvl/mxv + .byte 52*mus_mt_chimney_mvl/mxv .byte W03 - .byte 55*bgm_tozan_mvl/mxv + .byte 55*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 4 - .byte VOL , 55*bgm_tozan_mvl/mxv + .byte VOL , 55*mus_mt_chimney_mvl/mxv .byte W02 - .byte 57*bgm_tozan_mvl/mxv + .byte 57*mus_mt_chimney_mvl/mxv .byte W03 - .byte 58*bgm_tozan_mvl/mxv + .byte 58*mus_mt_chimney_mvl/mxv .byte W03 - .byte 60*bgm_tozan_mvl/mxv + .byte 60*mus_mt_chimney_mvl/mxv .byte W06 - .byte 62*bgm_tozan_mvl/mxv + .byte 62*mus_mt_chimney_mvl/mxv .byte W03 - .byte 63*bgm_tozan_mvl/mxv + .byte 63*mus_mt_chimney_mvl/mxv .byte W03 - .byte 65*bgm_tozan_mvl/mxv + .byte 65*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 67*bgm_tozan_mvl/mxv + .byte VOL , 67*mus_mt_chimney_mvl/mxv .byte W02 - .byte 69*bgm_tozan_mvl/mxv + .byte 69*mus_mt_chimney_mvl/mxv .byte W03 - .byte 70*bgm_tozan_mvl/mxv + .byte 70*mus_mt_chimney_mvl/mxv .byte W03 - .byte 73*bgm_tozan_mvl/mxv + .byte 73*mus_mt_chimney_mvl/mxv .byte W04 - .byte 73*bgm_tozan_mvl/mxv + .byte 73*mus_mt_chimney_mvl/mxv .byte W02 - .byte 75*bgm_tozan_mvl/mxv + .byte 75*mus_mt_chimney_mvl/mxv .byte W03 - .byte 76*bgm_tozan_mvl/mxv + .byte 76*mus_mt_chimney_mvl/mxv .byte W03 - .byte 77*bgm_tozan_mvl/mxv + .byte 77*mus_mt_chimney_mvl/mxv .byte W04 -bgm_tozan_4_B1: +mus_mt_chimney_4_B1: .byte VOICE , 60 .byte PAN , c_v+0 .byte MOD , 0 - .byte VOL , 74*bgm_tozan_mvl/mxv + .byte VOL , 74*mus_mt_chimney_mvl/mxv .byte W06 .byte N03 , As3 , v088 .byte W03 @@ -2492,7 +2492,7 @@ bgm_tozan_4_B1: .byte W12 .byte Cs4 .byte W12 -bgm_tozan_4_000: +mus_mt_chimney_4_000: .byte VOICE , 56 .byte N03 , Ds4 , v112 .byte W03 @@ -2510,7 +2510,7 @@ bgm_tozan_4_000: .byte W03 .byte N09 , Ds4 , v020 .byte W03 - .byte VOL , 58*bgm_tozan_mvl/mxv + .byte VOL , 58*mus_mt_chimney_mvl/mxv .byte PAN , c_v+32 .byte W12 .byte N03 , Bn3 , v112 @@ -2534,10 +2534,10 @@ bgm_tozan_4_000: .byte N03 , As3 .byte W06 .byte PEND -bgm_tozan_4_001: +mus_mt_chimney_4_001: .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 73*bgm_tozan_mvl/mxv + .byte VOL , 73*mus_mt_chimney_mvl/mxv .byte W09 .byte N03 , An3 , v112 .byte W03 @@ -2577,64 +2577,64 @@ bgm_tozan_4_001: .byte W03 .byte N60 , Gs4 .byte W06 - .byte VOL , 67*bgm_tozan_mvl/mxv + .byte VOL , 67*mus_mt_chimney_mvl/mxv .byte W02 - .byte 58*bgm_tozan_mvl/mxv + .byte 58*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v-16 .byte W03 - .byte VOL , 46*bgm_tozan_mvl/mxv + .byte VOL , 46*mus_mt_chimney_mvl/mxv .byte PAN , c_v-32 .byte W02 - .byte VOL , 33*bgm_tozan_mvl/mxv + .byte VOL , 33*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v-48 .byte W03 - .byte VOL , 29*bgm_tozan_mvl/mxv + .byte VOL , 29*mus_mt_chimney_mvl/mxv .byte W03 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W03 - .byte 29*bgm_tozan_mvl/mxv + .byte 29*mus_mt_chimney_mvl/mxv .byte W02 - .byte 32*bgm_tozan_mvl/mxv + .byte 32*mus_mt_chimney_mvl/mxv .byte W04 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W02 - .byte 36*bgm_tozan_mvl/mxv + .byte 36*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 38*bgm_tozan_mvl/mxv + .byte VOL , 38*mus_mt_chimney_mvl/mxv .byte PAN , c_v-32 .byte W02 - .byte VOL , 42*bgm_tozan_mvl/mxv + .byte VOL , 42*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W03 - .byte VOL , 47*bgm_tozan_mvl/mxv + .byte VOL , 47*mus_mt_chimney_mvl/mxv .byte PAN , c_v+16 .byte W02 - .byte VOL , 49*bgm_tozan_mvl/mxv + .byte VOL , 49*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v+32 .byte W03 - .byte VOL , 55*bgm_tozan_mvl/mxv + .byte VOL , 55*mus_mt_chimney_mvl/mxv .byte PAN , c_v+48 .byte W02 - .byte VOL , 63*bgm_tozan_mvl/mxv + .byte VOL , 63*mus_mt_chimney_mvl/mxv .byte W04 - .byte 72*bgm_tozan_mvl/mxv + .byte 72*mus_mt_chimney_mvl/mxv .byte W02 - .byte 52*bgm_tozan_mvl/mxv + .byte 52*mus_mt_chimney_mvl/mxv .byte W01 - .byte 78*bgm_tozan_mvl/mxv + .byte 78*mus_mt_chimney_mvl/mxv .byte W03 .byte VOICE , 60 .byte MOD , 1 - .byte VOL , 73*bgm_tozan_mvl/mxv + .byte VOL , 73*mus_mt_chimney_mvl/mxv .byte PAN , c_v+0 .byte N06 , Ds4 .byte W03 - .byte VOL , 75*bgm_tozan_mvl/mxv + .byte VOL , 75*mus_mt_chimney_mvl/mxv .byte W03 .byte N06 , As3 .byte W06 @@ -2666,7 +2666,7 @@ bgm_tozan_4_001: .byte W06 .byte N09 , Ds3 , v020 .byte W12 -bgm_tozan_4_002: +mus_mt_chimney_4_002: .byte VOICE , 56 .byte W06 .byte N03 , Gn2 , v112 @@ -2699,72 +2699,72 @@ bgm_tozan_4_002: .byte PEND .byte N96 , As3 .byte W03 - .byte VOL , 69*bgm_tozan_mvl/mxv + .byte VOL , 69*mus_mt_chimney_mvl/mxv .byte W03 - .byte 58*bgm_tozan_mvl/mxv + .byte 58*mus_mt_chimney_mvl/mxv .byte W02 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W04 - .byte 39*bgm_tozan_mvl/mxv + .byte 39*mus_mt_chimney_mvl/mxv .byte W02 - .byte 31*bgm_tozan_mvl/mxv + .byte 31*mus_mt_chimney_mvl/mxv .byte W04 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W02 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W04 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W02 - .byte 20*bgm_tozan_mvl/mxv + .byte 20*mus_mt_chimney_mvl/mxv .byte W04 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W02 - .byte 23*bgm_tozan_mvl/mxv + .byte 23*mus_mt_chimney_mvl/mxv .byte W04 - .byte 23*bgm_tozan_mvl/mxv + .byte 23*mus_mt_chimney_mvl/mxv .byte W02 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 30*bgm_tozan_mvl/mxv + .byte 30*mus_mt_chimney_mvl/mxv .byte W04 - .byte 33*bgm_tozan_mvl/mxv + .byte 33*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 38*bgm_tozan_mvl/mxv + .byte 38*mus_mt_chimney_mvl/mxv .byte W02 - .byte 40*bgm_tozan_mvl/mxv + .byte 40*mus_mt_chimney_mvl/mxv .byte W04 - .byte 42*bgm_tozan_mvl/mxv + .byte 42*mus_mt_chimney_mvl/mxv .byte W02 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W04 - .byte 49*bgm_tozan_mvl/mxv + .byte 49*mus_mt_chimney_mvl/mxv .byte W02 - .byte 50*bgm_tozan_mvl/mxv + .byte 50*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 54*bgm_tozan_mvl/mxv + .byte VOL , 54*mus_mt_chimney_mvl/mxv .byte W02 - .byte 57*bgm_tozan_mvl/mxv + .byte 57*mus_mt_chimney_mvl/mxv .byte W04 - .byte 63*bgm_tozan_mvl/mxv + .byte 63*mus_mt_chimney_mvl/mxv .byte W02 - .byte 68*bgm_tozan_mvl/mxv + .byte 68*mus_mt_chimney_mvl/mxv .byte W04 - .byte 73*bgm_tozan_mvl/mxv + .byte 73*mus_mt_chimney_mvl/mxv .byte W02 - .byte 75*bgm_tozan_mvl/mxv + .byte 75*mus_mt_chimney_mvl/mxv .byte W10 -bgm_tozan_4_003: +mus_mt_chimney_4_003: .byte MOD , 1 - .byte VOL , 73*bgm_tozan_mvl/mxv + .byte VOL , 73*mus_mt_chimney_mvl/mxv .byte N12 , As3 , v020 .byte W96 .byte PEND -bgm_tozan_4_004: +mus_mt_chimney_4_004: .byte W12 .byte N06 , Fs4 , v112 .byte W06 @@ -2795,7 +2795,7 @@ bgm_tozan_4_004: .byte Cs4 .byte W12 .byte PEND -bgm_tozan_4_005: +mus_mt_chimney_4_005: .byte N03 , Ds4 , v112 .byte W03 .byte Ds4 , v020 @@ -2814,7 +2814,7 @@ bgm_tozan_4_005: .byte W03 .byte VOICE , 56 .byte PAN , c_v+32 - .byte VOL , 58*bgm_tozan_mvl/mxv + .byte VOL , 58*mus_mt_chimney_mvl/mxv .byte W12 .byte N03 , Bn3 , v112 .byte W06 @@ -2835,7 +2835,7 @@ bgm_tozan_4_005: .byte PEND .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 74*bgm_tozan_mvl/mxv + .byte VOL , 74*mus_mt_chimney_mvl/mxv .byte N03 , Gs3 .byte W03 .byte Gs3 , v020 @@ -2878,59 +2878,59 @@ bgm_tozan_4_005: .byte W03 .byte N60 , Gs4 .byte W06 - .byte VOL , 67*bgm_tozan_mvl/mxv + .byte VOL , 67*mus_mt_chimney_mvl/mxv .byte W02 - .byte 58*bgm_tozan_mvl/mxv + .byte 58*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v-16 .byte W03 - .byte VOL , 46*bgm_tozan_mvl/mxv + .byte VOL , 46*mus_mt_chimney_mvl/mxv .byte PAN , c_v-32 .byte W02 - .byte VOL , 33*bgm_tozan_mvl/mxv + .byte VOL , 33*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v-48 .byte W03 - .byte VOL , 29*bgm_tozan_mvl/mxv + .byte VOL , 29*mus_mt_chimney_mvl/mxv .byte W03 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W03 - .byte 29*bgm_tozan_mvl/mxv + .byte 29*mus_mt_chimney_mvl/mxv .byte W02 - .byte 32*bgm_tozan_mvl/mxv + .byte 32*mus_mt_chimney_mvl/mxv .byte W04 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W02 - .byte 36*bgm_tozan_mvl/mxv + .byte 36*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 38*bgm_tozan_mvl/mxv + .byte VOL , 38*mus_mt_chimney_mvl/mxv .byte PAN , c_v-32 .byte W02 - .byte VOL , 42*bgm_tozan_mvl/mxv + .byte VOL , 42*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W03 - .byte VOL , 47*bgm_tozan_mvl/mxv + .byte VOL , 47*mus_mt_chimney_mvl/mxv .byte PAN , c_v+16 .byte W02 - .byte VOL , 49*bgm_tozan_mvl/mxv + .byte VOL , 49*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v+32 .byte W03 - .byte VOL , 55*bgm_tozan_mvl/mxv + .byte VOL , 55*mus_mt_chimney_mvl/mxv .byte PAN , c_v+48 .byte W02 - .byte VOL , 63*bgm_tozan_mvl/mxv + .byte VOL , 63*mus_mt_chimney_mvl/mxv .byte W04 - .byte 72*bgm_tozan_mvl/mxv + .byte 72*mus_mt_chimney_mvl/mxv .byte W02 - .byte 52*bgm_tozan_mvl/mxv + .byte 52*mus_mt_chimney_mvl/mxv .byte W01 - .byte 78*bgm_tozan_mvl/mxv + .byte 78*mus_mt_chimney_mvl/mxv .byte W03 .byte MOD , 1 - .byte VOL , 73*bgm_tozan_mvl/mxv + .byte VOL , 73*mus_mt_chimney_mvl/mxv .byte PAN , c_v+0 .byte N06 , Ds4 .byte W06 @@ -2965,8 +2965,8 @@ bgm_tozan_4_005: .byte Ds3 , v020 .byte W12 .byte PATT - .word bgm_tozan_4_002 -bgm_tozan_4_006: + .word mus_mt_chimney_4_002 +mus_mt_chimney_4_006: .byte PAN , c_v-5 .byte TIE , As3 , v104 .byte W12 @@ -2977,68 +2977,68 @@ bgm_tozan_4_006: .byte c_v-53 .byte W12 .byte c_v-62 - .byte VOL , 73*bgm_tozan_mvl/mxv + .byte VOL , 73*mus_mt_chimney_mvl/mxv .byte W02 - .byte 68*bgm_tozan_mvl/mxv + .byte 68*mus_mt_chimney_mvl/mxv .byte W03 - .byte 63*bgm_tozan_mvl/mxv + .byte 63*mus_mt_chimney_mvl/mxv .byte W03 - .byte 57*bgm_tozan_mvl/mxv + .byte 57*mus_mt_chimney_mvl/mxv .byte W04 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W02 - .byte 48*bgm_tozan_mvl/mxv + .byte 48*mus_mt_chimney_mvl/mxv .byte W03 - .byte 44*bgm_tozan_mvl/mxv + .byte 44*mus_mt_chimney_mvl/mxv .byte W03 - .byte 41*bgm_tozan_mvl/mxv + .byte 41*mus_mt_chimney_mvl/mxv .byte W04 - .byte 37*bgm_tozan_mvl/mxv + .byte 37*mus_mt_chimney_mvl/mxv .byte W02 - .byte 31*bgm_tozan_mvl/mxv + .byte 31*mus_mt_chimney_mvl/mxv .byte W03 - .byte 27*bgm_tozan_mvl/mxv + .byte 27*mus_mt_chimney_mvl/mxv .byte W03 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W04 .byte PAN , c_v-23 - .byte VOL , 22*bgm_tozan_mvl/mxv + .byte VOL , 22*mus_mt_chimney_mvl/mxv .byte W02 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W03 - .byte 17*bgm_tozan_mvl/mxv + .byte 17*mus_mt_chimney_mvl/mxv .byte W03 - .byte 15*bgm_tozan_mvl/mxv + .byte 15*mus_mt_chimney_mvl/mxv .byte W04 .byte PEND -bgm_tozan_4_007: +mus_mt_chimney_4_007: .byte MOD , 3 .byte PAN , c_v+48 .byte W02 - .byte VOL , 22*bgm_tozan_mvl/mxv + .byte VOL , 22*mus_mt_chimney_mvl/mxv .byte W03 - .byte 23*bgm_tozan_mvl/mxv + .byte 23*mus_mt_chimney_mvl/mxv .byte W03 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W04 .byte PAN , c_v+63 - .byte VOL , 31*bgm_tozan_mvl/mxv + .byte VOL , 31*mus_mt_chimney_mvl/mxv .byte W02 - .byte 37*bgm_tozan_mvl/mxv + .byte 37*mus_mt_chimney_mvl/mxv .byte W03 - .byte 38*bgm_tozan_mvl/mxv + .byte 38*mus_mt_chimney_mvl/mxv .byte W03 - .byte 45*bgm_tozan_mvl/mxv + .byte 45*mus_mt_chimney_mvl/mxv .byte W04 - .byte 49*bgm_tozan_mvl/mxv + .byte 49*mus_mt_chimney_mvl/mxv .byte W02 - .byte 56*bgm_tozan_mvl/mxv + .byte 56*mus_mt_chimney_mvl/mxv .byte W03 - .byte 61*bgm_tozan_mvl/mxv + .byte 61*mus_mt_chimney_mvl/mxv .byte W03 - .byte 66*bgm_tozan_mvl/mxv + .byte 66*mus_mt_chimney_mvl/mxv .byte W04 - .byte 73*bgm_tozan_mvl/mxv + .byte 73*mus_mt_chimney_mvl/mxv .byte W12 .byte MOD , 7 .byte PAN , c_v+62 @@ -3052,7 +3052,7 @@ bgm_tozan_4_007: .byte N24 , Cs4 , v112 .byte W24 .byte VOICE , 60 - .byte VOL , 58*bgm_tozan_mvl/mxv + .byte VOL , 58*mus_mt_chimney_mvl/mxv .byte N60 , Ds4 .byte W12 .byte PAN , c_v+0 @@ -3210,7 +3210,7 @@ bgm_tozan_4_007: .byte As2 .byte W06 .byte VOICE , 56 - .byte VOL , 72*bgm_tozan_mvl/mxv + .byte VOL , 72*mus_mt_chimney_mvl/mxv .byte W06 .byte N03 , As3 , v112 .byte W03 @@ -3272,9 +3272,9 @@ bgm_tozan_4_007: .byte Cs4 .byte W12 .byte PATT - .word bgm_tozan_4_000 + .word mus_mt_chimney_4_000 .byte PATT - .word bgm_tozan_4_001 + .word mus_mt_chimney_4_001 .byte VOICE , 56 .byte N06 , Dn4 , v112 .byte W06 @@ -3297,33 +3297,33 @@ bgm_tozan_4_007: .byte c_v-48 .byte W21 .byte MOD , 7 - .byte VOL , 73*bgm_tozan_mvl/mxv + .byte VOL , 73*mus_mt_chimney_mvl/mxv .byte PAN , c_v-32 .byte W02 - .byte VOL , 71*bgm_tozan_mvl/mxv + .byte VOL , 71*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W02 - .byte VOL , 70*bgm_tozan_mvl/mxv + .byte VOL , 70*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v+16 .byte W02 - .byte VOL , 68*bgm_tozan_mvl/mxv + .byte VOL , 68*mus_mt_chimney_mvl/mxv .byte W01 .byte PAN , c_v+32 .byte W03 - .byte VOL , 65*bgm_tozan_mvl/mxv + .byte VOL , 65*mus_mt_chimney_mvl/mxv .byte PAN , c_v+48 .byte W02 - .byte VOL , 61*bgm_tozan_mvl/mxv + .byte VOL , 61*mus_mt_chimney_mvl/mxv .byte W03 - .byte 57*bgm_tozan_mvl/mxv + .byte 57*mus_mt_chimney_mvl/mxv .byte W03 - .byte 52*bgm_tozan_mvl/mxv + .byte 52*mus_mt_chimney_mvl/mxv .byte W04 .byte VOICE , 60 .byte MOD , 1 - .byte VOL , 73*bgm_tozan_mvl/mxv + .byte VOL , 73*mus_mt_chimney_mvl/mxv .byte PAN , c_v+0 .byte N06 , Ds4 .byte W06 @@ -3358,79 +3358,79 @@ bgm_tozan_4_007: .byte N09 , Ds3 , v020 .byte W12 .byte PATT - .word bgm_tozan_4_002 + .word mus_mt_chimney_4_002 .byte N96 , As3 , v112 .byte W03 - .byte VOL , 69*bgm_tozan_mvl/mxv + .byte VOL , 69*mus_mt_chimney_mvl/mxv .byte W03 - .byte 58*bgm_tozan_mvl/mxv + .byte 58*mus_mt_chimney_mvl/mxv .byte W02 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W04 - .byte 39*bgm_tozan_mvl/mxv + .byte 39*mus_mt_chimney_mvl/mxv .byte W02 - .byte 31*bgm_tozan_mvl/mxv + .byte 31*mus_mt_chimney_mvl/mxv .byte W04 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W02 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W04 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W02 - .byte 20*bgm_tozan_mvl/mxv + .byte 20*mus_mt_chimney_mvl/mxv .byte W04 - .byte 22*bgm_tozan_mvl/mxv + .byte 22*mus_mt_chimney_mvl/mxv .byte W02 - .byte 23*bgm_tozan_mvl/mxv + .byte 23*mus_mt_chimney_mvl/mxv .byte W04 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W02 - .byte 23*bgm_tozan_mvl/mxv + .byte 23*mus_mt_chimney_mvl/mxv .byte W06 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W06 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W04 - .byte 28*bgm_tozan_mvl/mxv + .byte 28*mus_mt_chimney_mvl/mxv .byte W02 - .byte 29*bgm_tozan_mvl/mxv + .byte 29*mus_mt_chimney_mvl/mxv .byte W04 - .byte 33*bgm_tozan_mvl/mxv + .byte 33*mus_mt_chimney_mvl/mxv .byte W02 - .byte 35*bgm_tozan_mvl/mxv + .byte 35*mus_mt_chimney_mvl/mxv .byte W04 - .byte 38*bgm_tozan_mvl/mxv + .byte 38*mus_mt_chimney_mvl/mxv .byte W02 - .byte 40*bgm_tozan_mvl/mxv + .byte 40*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 43*bgm_tozan_mvl/mxv + .byte VOL , 43*mus_mt_chimney_mvl/mxv .byte W02 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W04 - .byte 49*bgm_tozan_mvl/mxv + .byte 49*mus_mt_chimney_mvl/mxv .byte W02 - .byte 55*bgm_tozan_mvl/mxv + .byte 55*mus_mt_chimney_mvl/mxv .byte W04 - .byte 61*bgm_tozan_mvl/mxv + .byte 61*mus_mt_chimney_mvl/mxv .byte W02 - .byte 66*bgm_tozan_mvl/mxv + .byte 66*mus_mt_chimney_mvl/mxv .byte W04 - .byte 71*bgm_tozan_mvl/mxv + .byte 71*mus_mt_chimney_mvl/mxv .byte W02 - .byte 73*bgm_tozan_mvl/mxv + .byte 73*mus_mt_chimney_mvl/mxv .byte W01 - .byte 76*bgm_tozan_mvl/mxv + .byte 76*mus_mt_chimney_mvl/mxv .byte W03 .byte PATT - .word bgm_tozan_4_003 + .word mus_mt_chimney_4_003 .byte PATT - .word bgm_tozan_4_004 + .word mus_mt_chimney_4_004 .byte PATT - .word bgm_tozan_4_005 + .word mus_mt_chimney_4_005 .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 73*bgm_tozan_mvl/mxv + .byte VOL , 73*mus_mt_chimney_mvl/mxv .byte N03 , Gs3 , v112 .byte W03 .byte Gs3 , v020 @@ -3525,11 +3525,11 @@ bgm_tozan_4_007: .byte Ds3 , v020 .byte W12 .byte PATT - .word bgm_tozan_4_002 + .word mus_mt_chimney_4_002 .byte PATT - .word bgm_tozan_4_006 + .word mus_mt_chimney_4_006 .byte PATT - .word bgm_tozan_4_007 + .word mus_mt_chimney_4_007 .byte EOT , As3 .byte MOD , 1 .byte PAN , c_v+0 @@ -3649,20 +3649,20 @@ bgm_tozan_4_007: .byte W96 .byte W96 .byte GOTO - .word bgm_tozan_4_B1 + .word mus_mt_chimney_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_tozan_5: - .byte KEYSH , bgm_tozan_key+0 +mus_mt_chimney_5: + .byte KEYSH , mus_mt_chimney_key+0 .byte VOICE , 48 .byte PAN , c_v+0 - .byte VOL , 48*bgm_tozan_mvl/mxv + .byte VOL , 48*mus_mt_chimney_mvl/mxv .byte LFOS , 44 .byte W96 .byte W96 -bgm_tozan_5_B1: +mus_mt_chimney_5_B1: .byte W96 .byte W96 .byte W96 @@ -3679,7 +3679,7 @@ bgm_tozan_5_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 48*bgm_tozan_mvl/mxv + .byte VOL , 48*mus_mt_chimney_mvl/mxv .byte N04 , Bn2 , v112 .byte W04 .byte Ds3 , v084 @@ -3932,20 +3932,20 @@ bgm_tozan_5_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_tozan_5_B1 + .word mus_mt_chimney_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_tozan_6: - .byte KEYSH , bgm_tozan_key+0 +mus_mt_chimney_6: + .byte KEYSH , mus_mt_chimney_key+0 .byte VOICE , 87 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 12 .byte PAN , c_v+0 .byte BENDR , 12 - .byte VOL , 39*bgm_tozan_mvl/mxv + .byte VOL , 39*mus_mt_chimney_mvl/mxv .byte N12 , Ds2 , v112 .byte W48 .byte As1 @@ -3964,10 +3964,10 @@ bgm_tozan_6: .byte W06 .byte As1 .byte W06 -bgm_tozan_6_B1: +mus_mt_chimney_6_B1: .byte VOICE , 81 .byte PAN , c_v+0 - .byte VOL , 39*bgm_tozan_mvl/mxv + .byte VOL , 39*mus_mt_chimney_mvl/mxv .byte W06 .byte N03 , As2 , v088 .byte W03 @@ -3991,7 +3991,7 @@ bgm_tozan_6_B1: .byte W09 .byte N03 , Fn3 .byte W03 -bgm_tozan_6_000: +mus_mt_chimney_6_000: .byte PAN , c_v-64 .byte N03 , Fs3 , v112 .byte W06 @@ -4020,7 +4020,7 @@ bgm_tozan_6_000: .byte N03 , Fn3 .byte W06 .byte PEND -bgm_tozan_6_001: +mus_mt_chimney_6_001: .byte PAN , c_v+0 .byte W12 .byte N03 , Gs2 , v112 @@ -4048,39 +4048,39 @@ bgm_tozan_6_001: .byte W03 .byte N60 , Gs3 .byte W18 - .byte VOL , 32*bgm_tozan_mvl/mxv + .byte VOL , 32*mus_mt_chimney_mvl/mxv .byte W02 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W04 - .byte 20*bgm_tozan_mvl/mxv + .byte 20*mus_mt_chimney_mvl/mxv .byte W02 - .byte 15*bgm_tozan_mvl/mxv + .byte 15*mus_mt_chimney_mvl/mxv .byte W03 - .byte 14*bgm_tozan_mvl/mxv + .byte 14*mus_mt_chimney_mvl/mxv .byte W03 - .byte 19*bgm_tozan_mvl/mxv + .byte 19*mus_mt_chimney_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 23*bgm_tozan_mvl/mxv + .byte VOL , 23*mus_mt_chimney_mvl/mxv .byte W02 - .byte 33*bgm_tozan_mvl/mxv + .byte 33*mus_mt_chimney_mvl/mxv .byte W03 - .byte 36*bgm_tozan_mvl/mxv + .byte 36*mus_mt_chimney_mvl/mxv .byte W03 - .byte 43*bgm_tozan_mvl/mxv + .byte 43*mus_mt_chimney_mvl/mxv .byte W04 - .byte 47*bgm_tozan_mvl/mxv + .byte 47*mus_mt_chimney_mvl/mxv .byte W02 - .byte 47*bgm_tozan_mvl/mxv + .byte 47*mus_mt_chimney_mvl/mxv .byte W01 - .byte 55*bgm_tozan_mvl/mxv + .byte 55*mus_mt_chimney_mvl/mxv .byte W03 - .byte 57*bgm_tozan_mvl/mxv + .byte 57*mus_mt_chimney_mvl/mxv .byte W03 - .byte 60*bgm_tozan_mvl/mxv + .byte 60*mus_mt_chimney_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 38*bgm_tozan_mvl/mxv + .byte VOL , 38*mus_mt_chimney_mvl/mxv .byte N06 , Ds3 .byte W06 .byte As2 @@ -4104,7 +4104,7 @@ bgm_tozan_6_001: .byte W96 .byte W96 .byte W96 -bgm_tozan_6_002: +mus_mt_chimney_6_002: .byte W12 .byte N06 , Fs3 , v112 .byte W06 @@ -4128,8 +4128,8 @@ bgm_tozan_6_002: .byte W03 .byte PEND .byte PATT - .word bgm_tozan_6_000 -bgm_tozan_6_003: + .word mus_mt_chimney_6_000 +mus_mt_chimney_6_003: .byte PAN , c_v+0 .byte N03 , Gs2 , v112 .byte W06 @@ -4152,7 +4152,7 @@ bgm_tozan_6_003: .byte Cs3 .byte W12 .byte PEND -bgm_tozan_6_004: +mus_mt_chimney_6_004: .byte N06 , Dn3 , v112 .byte W06 .byte N03 , Ds3 @@ -4166,7 +4166,7 @@ bgm_tozan_6_004: .byte MOD , 8 .byte W24 .byte PEND -bgm_tozan_6_005: +mus_mt_chimney_6_005: .byte MOD , 0 .byte N06 , Ds3 , v112 .byte W06 @@ -4191,14 +4191,14 @@ bgm_tozan_6_005: .byte PEND .byte W96 .byte W96 -bgm_tozan_6_006: +mus_mt_chimney_6_006: .byte VOICE , 60 .byte W24 .byte N48 , As2 , v112 .byte W72 .byte PEND .byte VOICE , 81 - .byte VOL , 43*bgm_tozan_mvl/mxv + .byte VOL , 43*mus_mt_chimney_mvl/mxv .byte PAN , c_v-63 .byte N06 , As3 .byte W06 @@ -4282,7 +4282,7 @@ bgm_tozan_6_006: .byte Fn3 .byte W06 .byte PAN , c_v+0 - .byte VOL , 49*bgm_tozan_mvl/mxv + .byte VOL , 49*mus_mt_chimney_mvl/mxv .byte W06 .byte N03 , As2 , v088 .byte W03 @@ -4307,30 +4307,30 @@ bgm_tozan_6_006: .byte N03 , Fn3 .byte W03 .byte PATT - .word bgm_tozan_6_000 + .word mus_mt_chimney_6_000 .byte PATT - .word bgm_tozan_6_001 + .word mus_mt_chimney_6_001 .byte PATT - .word bgm_tozan_6_004 + .word mus_mt_chimney_6_004 .byte PATT - .word bgm_tozan_6_005 + .word mus_mt_chimney_6_005 .byte W96 .byte W96 .byte W96 .byte PATT - .word bgm_tozan_6_002 + .word mus_mt_chimney_6_002 .byte PATT - .word bgm_tozan_6_000 + .word mus_mt_chimney_6_000 .byte PATT - .word bgm_tozan_6_003 + .word mus_mt_chimney_6_003 .byte PATT - .word bgm_tozan_6_004 + .word mus_mt_chimney_6_004 .byte PATT - .word bgm_tozan_6_005 + .word mus_mt_chimney_6_005 .byte W96 .byte W96 .byte PATT - .word bgm_tozan_6_006 + .word mus_mt_chimney_6_006 .byte N03 , Gs2 , v112 .byte W06 .byte N03 @@ -4438,19 +4438,19 @@ bgm_tozan_6_006: .byte W96 .byte W96 .byte GOTO - .word bgm_tozan_6_B1 + .word mus_mt_chimney_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_tozan_7: - .byte KEYSH , bgm_tozan_key+0 +mus_mt_chimney_7: + .byte KEYSH , mus_mt_chimney_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 49*bgm_tozan_mvl/mxv + .byte VOL , 49*mus_mt_chimney_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+1 .byte N24 , Ds1 , v112 @@ -4476,54 +4476,54 @@ bgm_tozan_7: .byte W12 .byte VOICE , 83 .byte PAN , c_v+0 - .byte VOL , 14*bgm_tozan_mvl/mxv + .byte VOL , 14*mus_mt_chimney_mvl/mxv .byte MOD , 0 .byte N72 , Ds4 .byte W02 - .byte VOL , 18*bgm_tozan_mvl/mxv + .byte VOL , 18*mus_mt_chimney_mvl/mxv .byte W03 - .byte 21*bgm_tozan_mvl/mxv + .byte 21*mus_mt_chimney_mvl/mxv .byte W03 - .byte 24*bgm_tozan_mvl/mxv + .byte 24*mus_mt_chimney_mvl/mxv .byte W04 - .byte 26*bgm_tozan_mvl/mxv + .byte 26*mus_mt_chimney_mvl/mxv .byte W02 - .byte 29*bgm_tozan_mvl/mxv + .byte 29*mus_mt_chimney_mvl/mxv .byte W03 - .byte 33*bgm_tozan_mvl/mxv + .byte 33*mus_mt_chimney_mvl/mxv .byte W03 - .byte 36*bgm_tozan_mvl/mxv + .byte 36*mus_mt_chimney_mvl/mxv .byte W04 - .byte 38*bgm_tozan_mvl/mxv + .byte 38*mus_mt_chimney_mvl/mxv .byte MOD , 4 .byte W02 - .byte VOL , 41*bgm_tozan_mvl/mxv + .byte VOL , 41*mus_mt_chimney_mvl/mxv .byte W03 - .byte 46*bgm_tozan_mvl/mxv + .byte 46*mus_mt_chimney_mvl/mxv .byte W03 - .byte 47*bgm_tozan_mvl/mxv + .byte 47*mus_mt_chimney_mvl/mxv .byte W04 - .byte 50*bgm_tozan_mvl/mxv + .byte 50*mus_mt_chimney_mvl/mxv .byte W02 - .byte 54*bgm_tozan_mvl/mxv + .byte 54*mus_mt_chimney_mvl/mxv .byte W03 - .byte 56*bgm_tozan_mvl/mxv + .byte 56*mus_mt_chimney_mvl/mxv .byte W03 - .byte 61*bgm_tozan_mvl/mxv + .byte 61*mus_mt_chimney_mvl/mxv .byte W04 - .byte 65*bgm_tozan_mvl/mxv + .byte 65*mus_mt_chimney_mvl/mxv .byte MOD , 8 .byte W02 - .byte VOL , 71*bgm_tozan_mvl/mxv + .byte VOL , 71*mus_mt_chimney_mvl/mxv .byte W03 - .byte 71*bgm_tozan_mvl/mxv + .byte 71*mus_mt_chimney_mvl/mxv .byte W03 - .byte 61*bgm_tozan_mvl/mxv + .byte 61*mus_mt_chimney_mvl/mxv .byte W01 - .byte 74*bgm_tozan_mvl/mxv + .byte 74*mus_mt_chimney_mvl/mxv .byte W15 .byte MOD , 1 - .byte VOL , 63*bgm_tozan_mvl/mxv + .byte VOL , 63*mus_mt_chimney_mvl/mxv .byte N03 , Cs4 , v088 .byte W03 .byte As3 @@ -4540,10 +4540,10 @@ bgm_tozan_7: .byte W03 .byte Ds2 , v060 .byte W03 -bgm_tozan_7_B1: +mus_mt_chimney_7_B1: .byte VOICE , 88 .byte PAN , c_v-63 - .byte VOL , 58*bgm_tozan_mvl/mxv + .byte VOL , 58*mus_mt_chimney_mvl/mxv .byte N18 , Gs1 , v112 .byte W18 .byte N03 , Ds2 @@ -4572,7 +4572,7 @@ bgm_tozan_7_B1: .byte W06 .byte Cs2 , v036 .byte W06 -bgm_tozan_7_000: +mus_mt_chimney_7_000: .byte PAN , c_v-63 .byte N18 , Gs1 , v112 .byte W18 @@ -4605,7 +4605,7 @@ bgm_tozan_7_000: .byte N12 , Bn1 , v112 .byte W12 .byte PEND -bgm_tozan_7_001: +mus_mt_chimney_7_001: .byte PAN , c_v-63 .byte N18 , Gs1 , v112 .byte W18 @@ -4636,7 +4636,7 @@ bgm_tozan_7_001: .byte Cs2 , v036 .byte W06 .byte PEND -bgm_tozan_7_002: +mus_mt_chimney_7_002: .byte PAN , c_v-63 .byte N18 , Gs1 , v112 .byte W18 @@ -4675,7 +4675,7 @@ bgm_tozan_7_002: .byte Gn1 , v036 .byte W03 .byte PEND -bgm_tozan_7_003: +mus_mt_chimney_7_003: .byte PAN , c_v-63 .byte N18 , Ds1 , v112 .byte W18 @@ -4706,7 +4706,7 @@ bgm_tozan_7_003: .byte Gn1 , v036 .byte W06 .byte PEND -bgm_tozan_7_004: +mus_mt_chimney_7_004: .byte PAN , c_v-63 .byte N18 , Ds1 , v112 .byte W18 @@ -4740,8 +4740,8 @@ bgm_tozan_7_004: .byte W12 .byte PEND .byte PATT - .word bgm_tozan_7_003 -bgm_tozan_7_005: + .word mus_mt_chimney_7_003 +mus_mt_chimney_7_005: .byte PAN , c_v-63 .byte N18 , Ds1 , v112 .byte W18 @@ -4781,9 +4781,9 @@ bgm_tozan_7_005: .byte W03 .byte PEND .byte PATT - .word bgm_tozan_7_001 + .word mus_mt_chimney_7_001 .byte PATT - .word bgm_tozan_7_000 + .word mus_mt_chimney_7_000 .byte PAN , c_v-63 .byte N18 , Gs1 , v112 .byte W18 @@ -4814,14 +4814,14 @@ bgm_tozan_7_005: .byte Cs2 , v036 .byte W06 .byte PATT - .word bgm_tozan_7_002 + .word mus_mt_chimney_7_002 .byte PATT - .word bgm_tozan_7_003 + .word mus_mt_chimney_7_003 .byte PATT - .word bgm_tozan_7_004 + .word mus_mt_chimney_7_004 .byte PATT - .word bgm_tozan_7_003 -bgm_tozan_7_006: + .word mus_mt_chimney_7_003 +mus_mt_chimney_7_006: .byte PAN , c_v-63 .byte N18 , Ds1 , v112 .byte W18 @@ -5046,7 +5046,7 @@ bgm_tozan_7_006: .byte An1 , v036 .byte W03 .byte PAN , c_v-63 - .byte VOL , 58*bgm_tozan_mvl/mxv + .byte VOL , 58*mus_mt_chimney_mvl/mxv .byte N18 , Gs1 , v112 .byte W18 .byte N03 , Ds2 @@ -5076,27 +5076,27 @@ bgm_tozan_7_006: .byte Cs2 , v036 .byte W06 .byte PATT - .word bgm_tozan_7_000 + .word mus_mt_chimney_7_000 .byte PATT - .word bgm_tozan_7_001 + .word mus_mt_chimney_7_001 .byte PATT - .word bgm_tozan_7_002 + .word mus_mt_chimney_7_002 .byte PATT - .word bgm_tozan_7_003 + .word mus_mt_chimney_7_003 .byte PATT - .word bgm_tozan_7_004 + .word mus_mt_chimney_7_004 .byte PATT - .word bgm_tozan_7_003 + .word mus_mt_chimney_7_003 .byte PATT - .word bgm_tozan_7_005 + .word mus_mt_chimney_7_005 .byte PATT - .word bgm_tozan_7_001 + .word mus_mt_chimney_7_001 .byte PATT - .word bgm_tozan_7_000 + .word mus_mt_chimney_7_000 .byte PATT - .word bgm_tozan_7_001 + .word mus_mt_chimney_7_001 .byte PATT - .word bgm_tozan_7_002 + .word mus_mt_chimney_7_002 .byte PAN , c_v-63 .byte N18 , Ds1 , v112 .byte W18 @@ -5127,11 +5127,11 @@ bgm_tozan_7_006: .byte Gn1 , v036 .byte W06 .byte PATT - .word bgm_tozan_7_004 + .word mus_mt_chimney_7_004 .byte PATT - .word bgm_tozan_7_003 + .word mus_mt_chimney_7_003 .byte PATT - .word bgm_tozan_7_006 + .word mus_mt_chimney_7_006 .byte VOICE , 88 .byte PAN , c_v+0 .byte N12 , Gs2 , v112 @@ -5251,16 +5251,16 @@ bgm_tozan_7_006: .byte W96 .byte W96 .byte GOTO - .word bgm_tozan_7_B1 + .word mus_mt_chimney_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_tozan_8: - .byte KEYSH , bgm_tozan_key+0 +mus_mt_chimney_8: + .byte KEYSH , mus_mt_chimney_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 63*bgm_tozan_mvl/mxv + .byte VOL , 63*mus_mt_chimney_mvl/mxv .byte N06 , En1 , v112 .byte N72 , An2 .byte W12 @@ -5340,7 +5340,7 @@ bgm_tozan_8: .byte W03 .byte N03 .byte W03 -bgm_tozan_8_B1: +mus_mt_chimney_8_B1: .byte N48 , An2 , v112 .byte W48 .byte N03 , Fs1 @@ -5353,7 +5353,7 @@ bgm_tozan_8_B1: .byte W12 .byte N12 , As1 , v064 .byte W12 -bgm_tozan_8_000: +mus_mt_chimney_8_000: .byte N06 , Dn1 , v112 .byte W06 .byte Dn1 , v076 @@ -5377,7 +5377,7 @@ bgm_tozan_8_000: .byte En1 , v084 .byte W06 .byte PEND -bgm_tozan_8_001: +mus_mt_chimney_8_001: .byte N06 , Cn1 , v124 .byte W18 .byte Cn1 , v112 @@ -5413,7 +5413,7 @@ bgm_tozan_8_001: .byte W12 .byte Dn1 , v096 .byte W12 -bgm_tozan_8_002: +mus_mt_chimney_8_002: .byte N48 , An2 , v112 .byte W48 .byte N03 , Fs1 @@ -5429,7 +5429,7 @@ bgm_tozan_8_002: .byte N03 .byte W06 .byte PEND -bgm_tozan_8_003: +mus_mt_chimney_8_003: .byte N06 , Cn1 , v124 .byte W18 .byte Cn1 , v112 @@ -5445,7 +5445,7 @@ bgm_tozan_8_003: .byte Dn1 , v096 .byte W12 .byte PEND -bgm_tozan_8_004: +mus_mt_chimney_8_004: .byte N06 , Cn1 , v124 .byte W18 .byte Cn1 , v112 @@ -5479,7 +5479,7 @@ bgm_tozan_8_004: .byte W06 .byte En1 , v112 .byte W06 -bgm_tozan_8_005: +mus_mt_chimney_8_005: .byte N48 , An2 , v112 .byte W48 .byte N03 , Fs1 @@ -5492,9 +5492,9 @@ bgm_tozan_8_005: .byte W24 .byte PEND .byte PATT - .word bgm_tozan_8_000 + .word mus_mt_chimney_8_000 .byte PATT - .word bgm_tozan_8_001 + .word mus_mt_chimney_8_001 .byte N06 , En1 , v120 .byte W06 .byte En1 , v112 @@ -5516,11 +5516,11 @@ bgm_tozan_8_005: .byte Dn1 , v096 .byte W12 .byte PATT - .word bgm_tozan_8_002 + .word mus_mt_chimney_8_002 .byte PATT - .word bgm_tozan_8_001 + .word mus_mt_chimney_8_001 .byte PATT - .word bgm_tozan_8_004 + .word mus_mt_chimney_8_004 .byte W48 .byte N03 , Fs1 , v112 .byte W06 @@ -5538,7 +5538,7 @@ bgm_tozan_8_005: .byte W06 .byte En1 , v112 .byte W06 - .byte VOL , 70*bgm_tozan_mvl/mxv + .byte VOL , 70*mus_mt_chimney_mvl/mxv .byte N48 , An2 .byte W48 .byte N06 , Cn1 , v048 @@ -5701,7 +5701,7 @@ bgm_tozan_8_005: .byte W06 .byte En1 , v116 .byte W06 - .byte VOL , 39*bgm_tozan_mvl/mxv + .byte VOL , 39*mus_mt_chimney_mvl/mxv .byte W06 .byte N03 , Gs1 , v112 .byte W12 @@ -5713,7 +5713,7 @@ bgm_tozan_8_005: .byte W06 .byte N12 , As1 , v072 .byte W12 - .byte VOL , 70*bgm_tozan_mvl/mxv + .byte VOL , 70*mus_mt_chimney_mvl/mxv .byte N48 , An2 , v112 .byte W48 .byte N03 , Fs1 @@ -5727,9 +5727,9 @@ bgm_tozan_8_005: .byte N12 , As1 , v064 .byte W12 .byte PATT - .word bgm_tozan_8_000 + .word mus_mt_chimney_8_000 .byte PATT - .word bgm_tozan_8_001 + .word mus_mt_chimney_8_001 .byte N06 , En1 , v112 .byte W06 .byte N06 @@ -5751,11 +5751,11 @@ bgm_tozan_8_005: .byte Dn1 , v096 .byte W12 .byte PATT - .word bgm_tozan_8_002 + .word mus_mt_chimney_8_002 .byte PATT - .word bgm_tozan_8_003 + .word mus_mt_chimney_8_003 .byte PATT - .word bgm_tozan_8_004 + .word mus_mt_chimney_8_004 .byte N48 , An2 , v112 .byte W48 .byte N03 , Fs1 @@ -5775,7 +5775,7 @@ bgm_tozan_8_005: .byte En1 , v112 .byte W06 .byte PATT - .word bgm_tozan_8_005 + .word mus_mt_chimney_8_005 .byte N06 , Dn1 , v120 .byte W06 .byte Dn1 , v076 @@ -5799,7 +5799,7 @@ bgm_tozan_8_005: .byte En1 , v084 .byte W06 .byte PATT - .word bgm_tozan_8_001 + .word mus_mt_chimney_8_001 .byte N06 , En1 , v120 .byte W06 .byte En1 , v112 @@ -5821,11 +5821,11 @@ bgm_tozan_8_005: .byte Dn1 , v096 .byte W12 .byte PATT - .word bgm_tozan_8_002 + .word mus_mt_chimney_8_002 .byte PATT - .word bgm_tozan_8_001 + .word mus_mt_chimney_8_001 .byte PATT - .word bgm_tozan_8_004 + .word mus_mt_chimney_8_004 .byte W48 .byte N03 , Fs1 , v112 .byte W06 @@ -6102,32 +6102,32 @@ bgm_tozan_8_005: .byte N03 , En1 .byte W03 .byte GOTO - .word bgm_tozan_8_B1 + .word mus_mt_chimney_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_tozan_9: - .byte KEYSH , bgm_tozan_key+0 +mus_mt_chimney_9: + .byte KEYSH , mus_mt_chimney_key+0 .byte VOICE , 29 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 12 .byte BENDR , 12 - .byte VOL , 49*bgm_tozan_mvl/mxv + .byte VOL , 49*mus_mt_chimney_mvl/mxv .byte PAN , c_v+63 .byte BEND , c_v+0 .byte W96 .byte N96 , Ds2 , v112 .byte W96 -bgm_tozan_9_B1: -bgm_tozan_9_000: +mus_mt_chimney_9_B1: +mus_mt_chimney_9_000: .byte W92 .byte W01 .byte N03 , Dn3 , v112 .byte W03 .byte PEND -bgm_tozan_9_001: +mus_mt_chimney_9_001: .byte N03 , Ds3 , v112 .byte W06 .byte N03 @@ -6156,7 +6156,7 @@ bgm_tozan_9_001: .byte W06 .byte PEND .byte W96 -bgm_tozan_9_002: +mus_mt_chimney_9_002: .byte W36 .byte N03 , Ds3 , v112 .byte W06 @@ -6179,7 +6179,7 @@ bgm_tozan_9_002: .byte N06 .byte W06 .byte PEND -bgm_tozan_9_003: +mus_mt_chimney_9_003: .byte N06 , Ds4 , v112 .byte W06 .byte N03 , Dn4 , v064 @@ -6195,7 +6195,7 @@ bgm_tozan_9_003: .byte PEND .byte W96 .byte W96 -bgm_tozan_9_004: +mus_mt_chimney_9_004: .byte W06 .byte N03 , Gn2 , v112 .byte W12 @@ -6233,14 +6233,14 @@ bgm_tozan_9_004: .byte W06 .byte PEND .byte PATT - .word bgm_tozan_9_000 + .word mus_mt_chimney_9_000 .byte PATT - .word bgm_tozan_9_001 + .word mus_mt_chimney_9_001 .byte W96 .byte PATT - .word bgm_tozan_9_002 + .word mus_mt_chimney_9_002 .byte PATT - .word bgm_tozan_9_003 + .word mus_mt_chimney_9_003 .byte W96 .byte W96 .byte W96 @@ -6330,25 +6330,25 @@ bgm_tozan_9_004: .byte N03 , Dn3 .byte W03 .byte PATT - .word bgm_tozan_9_001 + .word mus_mt_chimney_9_001 .byte W96 .byte PATT - .word bgm_tozan_9_002 + .word mus_mt_chimney_9_002 .byte PATT - .word bgm_tozan_9_003 + .word mus_mt_chimney_9_003 .byte W96 .byte W96 .byte PATT - .word bgm_tozan_9_004 + .word mus_mt_chimney_9_004 .byte PATT - .word bgm_tozan_9_000 + .word mus_mt_chimney_9_000 .byte PATT - .word bgm_tozan_9_001 + .word mus_mt_chimney_9_001 .byte W96 .byte PATT - .word bgm_tozan_9_002 + .word mus_mt_chimney_9_002 .byte PATT - .word bgm_tozan_9_003 + .word mus_mt_chimney_9_003 .byte W96 .byte W96 .byte W96 @@ -6361,28 +6361,28 @@ bgm_tozan_9_004: .byte W96 .byte W96 .byte GOTO - .word bgm_tozan_9_B1 + .word mus_mt_chimney_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_tozan: +mus_mt_chimney: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_tozan_pri @ Priority - .byte bgm_tozan_rev @ Reverb. + .byte mus_mt_chimney_pri @ Priority + .byte mus_mt_chimney_rev @ Reverb. - .word bgm_tozan_grp + .word mus_mt_chimney_grp - .word bgm_tozan_1 - .word bgm_tozan_2 - .word bgm_tozan_3 - .word bgm_tozan_4 - .word bgm_tozan_5 - .word bgm_tozan_6 - .word bgm_tozan_7 - .word bgm_tozan_8 - .word bgm_tozan_9 + .word mus_mt_chimney_1 + .word mus_mt_chimney_2 + .word mus_mt_chimney_3 + .word mus_mt_chimney_4 + .word mus_mt_chimney_5 + .word mus_mt_chimney_6 + .word mus_mt_chimney_7 + .word mus_mt_chimney_8 + .word mus_mt_chimney_9 .end diff --git a/sound/songs/bgm_m_dungon.s b/sound/songs/mus_mt_pyre.s index dbd7ec229..c9ce0e71e 100644 --- a/sound/songs/bgm_m_dungon.s +++ b/sound/songs/mus_mt_pyre.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_m_dungon_grp, voicegroup075 - .equ bgm_m_dungon_pri, 0 - .equ bgm_m_dungon_rev, reverb_set+50 - .equ bgm_m_dungon_mvl, 127 - .equ bgm_m_dungon_key, 0 - .equ bgm_m_dungon_tbs, 1 - .equ bgm_m_dungon_exg, 0 - .equ bgm_m_dungon_cmp, 1 + .equ mus_mt_pyre_grp, voicegroup075 + .equ mus_mt_pyre_pri, 0 + .equ mus_mt_pyre_rev, reverb_set+50 + .equ mus_mt_pyre_mvl, 127 + .equ mus_mt_pyre_key, 0 + .equ mus_mt_pyre_tbs, 1 + .equ mus_mt_pyre_exg, 0 + .equ mus_mt_pyre_cmp, 1 .section .rodata - .global bgm_m_dungon + .global mus_mt_pyre .align 2 @********************** Track 1 **********************@ -bgm_m_dungon_1: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_1_B1: - .byte TEMPO , 90*bgm_m_dungon_tbs/2 +mus_mt_pyre_1: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_1_B1: + .byte TEMPO , 90*mus_mt_pyre_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 35*bgm_m_dungon_mvl/mxv + .byte VOL , 35*mus_mt_pyre_mvl/mxv .byte W24 .byte PAN , c_v-62 .byte N12 , Gn4 , v112 @@ -38,7 +38,7 @@ bgm_m_dungon_1_B1: .byte W12 .byte Gn4 , v084 .byte W12 -bgm_m_dungon_1_000: +mus_mt_pyre_1_000: .byte N12 , Gn4 , v068 .byte W12 .byte Gn4 , v036 @@ -59,10 +59,10 @@ bgm_m_dungon_1_000: .byte W12 .byte PEND .byte PATT - .word bgm_m_dungon_1_000 + .word mus_mt_pyre_1_000 .byte PATT - .word bgm_m_dungon_1_000 -bgm_m_dungon_1_001: + .word mus_mt_pyre_1_000 +mus_mt_pyre_1_001: .byte N12 , Gn4 , v068 .byte W12 .byte Gn4 , v036 @@ -95,7 +95,7 @@ bgm_m_dungon_1_001: .byte Gn4 , v036 .byte W06 .byte PEND -bgm_m_dungon_1_002: +mus_mt_pyre_1_002: .byte PAN , c_v+63 .byte N06 , Gn4 , v112 .byte W06 @@ -134,9 +134,9 @@ bgm_m_dungon_1_002: .byte W06 .byte PEND .byte PATT - .word bgm_m_dungon_1_002 + .word mus_mt_pyre_1_002 .byte PATT - .word bgm_m_dungon_1_002 + .word mus_mt_pyre_1_002 .byte PAN , c_v+63 .byte N06 , Gn4 , v112 .byte W06 @@ -161,36 +161,36 @@ bgm_m_dungon_1_002: .byte Gn4 , v084 .byte W12 .byte PATT - .word bgm_m_dungon_1_000 + .word mus_mt_pyre_1_000 .byte PATT - .word bgm_m_dungon_1_000 + .word mus_mt_pyre_1_000 .byte PATT - .word bgm_m_dungon_1_000 + .word mus_mt_pyre_1_000 .byte PATT - .word bgm_m_dungon_1_001 + .word mus_mt_pyre_1_001 .byte PATT - .word bgm_m_dungon_1_002 + .word mus_mt_pyre_1_002 .byte PATT - .word bgm_m_dungon_1_002 + .word mus_mt_pyre_1_002 .byte PATT - .word bgm_m_dungon_1_002 + .word mus_mt_pyre_1_002 .byte PAN , c_v+63 .byte W96 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_m_dungon_1_B1 + .word mus_mt_pyre_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_m_dungon_2: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_2_B1: +mus_mt_pyre_2: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_2_B1: .byte VOICE , 45 .byte LFOS , 44 - .byte VOL , 68*bgm_m_dungon_mvl/mxv + .byte VOL , 68*mus_mt_pyre_mvl/mxv .byte PAN , c_v+0 .byte W32 .byte W01 @@ -206,7 +206,7 @@ bgm_m_dungon_2_B1: .byte W03 .byte N12 , Dn2 , v112 .byte W12 -bgm_m_dungon_2_000: +mus_mt_pyre_2_000: .byte N12 , Gs2 , v112 .byte W12 .byte Dn2 @@ -225,17 +225,17 @@ bgm_m_dungon_2_000: .byte W12 .byte PEND .byte PATT - .word bgm_m_dungon_2_000 + .word mus_mt_pyre_2_000 .byte PATT - .word bgm_m_dungon_2_000 + .word mus_mt_pyre_2_000 .byte PATT - .word bgm_m_dungon_2_000 + .word mus_mt_pyre_2_000 .byte PATT - .word bgm_m_dungon_2_000 + .word mus_mt_pyre_2_000 .byte PATT - .word bgm_m_dungon_2_000 + .word mus_mt_pyre_2_000 .byte PATT - .word bgm_m_dungon_2_000 + .word mus_mt_pyre_2_000 .byte N12 , Gs2 , v112 .byte W12 .byte Dn2 @@ -252,7 +252,7 @@ bgm_m_dungon_2_000: .byte W03 .byte N12 , Fn2 , v112 .byte W12 -bgm_m_dungon_2_001: +mus_mt_pyre_2_001: .byte N12 , Bn2 , v112 .byte W12 .byte Fn2 @@ -271,24 +271,24 @@ bgm_m_dungon_2_001: .byte W12 .byte PEND .byte PATT - .word bgm_m_dungon_2_001 + .word mus_mt_pyre_2_001 .byte PATT - .word bgm_m_dungon_2_001 + .word mus_mt_pyre_2_001 .byte PATT - .word bgm_m_dungon_2_001 + .word mus_mt_pyre_2_001 .byte PATT - .word bgm_m_dungon_2_001 + .word mus_mt_pyre_2_001 .byte PATT - .word bgm_m_dungon_2_001 + .word mus_mt_pyre_2_001 .byte PATT - .word bgm_m_dungon_2_001 + .word mus_mt_pyre_2_001 .byte N12 , Bn2 , v112 .byte W12 .byte Fn2 .byte W12 .byte VOICE , 60 .byte W24 - .byte VOL , 49*bgm_m_dungon_mvl/mxv + .byte VOL , 49*mus_mt_pyre_mvl/mxv .byte W06 .byte N03 , Fs3 .byte W06 @@ -356,19 +356,19 @@ bgm_m_dungon_2_001: .byte N08 , Dn4 , v104 .byte W76 .byte GOTO - .word bgm_m_dungon_2_B1 + .word mus_mt_pyre_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_m_dungon_3: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_3_B1: +mus_mt_pyre_3: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_3_B1: .byte VOICE , 24 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 88*bgm_m_dungon_mvl/mxv + .byte VOL , 88*mus_mt_pyre_mvl/mxv .byte W18 .byte N03 , En1 , v124 .byte W03 @@ -382,7 +382,7 @@ bgm_m_dungon_3_B1: .byte W03 .byte N42 , Gn1 .byte W24 -bgm_m_dungon_3_000: +mus_mt_pyre_3_000: .byte W18 .byte N03 , En1 , v124 .byte W03 @@ -398,17 +398,17 @@ bgm_m_dungon_3_000: .byte W24 .byte PEND .byte PATT - .word bgm_m_dungon_3_000 + .word mus_mt_pyre_3_000 .byte PATT - .word bgm_m_dungon_3_000 + .word mus_mt_pyre_3_000 .byte PATT - .word bgm_m_dungon_3_000 + .word mus_mt_pyre_3_000 .byte PATT - .word bgm_m_dungon_3_000 + .word mus_mt_pyre_3_000 .byte PATT - .word bgm_m_dungon_3_000 + .word mus_mt_pyre_3_000 .byte PATT - .word bgm_m_dungon_3_000 + .word mus_mt_pyre_3_000 .byte W18 .byte N03 , En1 , v124 .byte W03 @@ -422,7 +422,7 @@ bgm_m_dungon_3_000: .byte W03 .byte N42 , As1 .byte W24 -bgm_m_dungon_3_001: +mus_mt_pyre_3_001: .byte W18 .byte N03 , Gn1 , v124 .byte W03 @@ -438,24 +438,24 @@ bgm_m_dungon_3_001: .byte W24 .byte PEND .byte PATT - .word bgm_m_dungon_3_001 + .word mus_mt_pyre_3_001 .byte PATT - .word bgm_m_dungon_3_001 + .word mus_mt_pyre_3_001 .byte PATT - .word bgm_m_dungon_3_001 + .word mus_mt_pyre_3_001 .byte PATT - .word bgm_m_dungon_3_001 + .word mus_mt_pyre_3_001 .byte PATT - .word bgm_m_dungon_3_001 + .word mus_mt_pyre_3_001 .byte PATT - .word bgm_m_dungon_3_001 + .word mus_mt_pyre_3_001 .byte W18 .byte N03 , Gn1 , v124 .byte W03 .byte An1 .byte W03 .byte VOICE , 48 - .byte VOL , 41*bgm_m_dungon_mvl/mxv + .byte VOL , 41*mus_mt_pyre_mvl/mxv .byte W72 .byte W48 .byte N06 , As2 , v112 @@ -520,17 +520,17 @@ bgm_m_dungon_3_001: .byte N24 , As0 .byte W24 .byte GOTO - .word bgm_m_dungon_3_B1 + .word mus_mt_pyre_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_m_dungon_4: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_4_B1: +mus_mt_pyre_4: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_4_B1: .byte VOICE , 24 .byte LFOS , 44 - .byte VOL , 55*bgm_m_dungon_mvl/mxv + .byte VOL , 55*mus_mt_pyre_mvl/mxv .byte BENDR , 12 .byte PAN , c_v-8 .byte W24 @@ -770,7 +770,7 @@ bgm_m_dungon_4_B1: .byte W03 .byte N03 .byte W03 - .byte VOL , 70*bgm_m_dungon_mvl/mxv + .byte VOL , 70*mus_mt_pyre_mvl/mxv .byte N06 , As1 , v120 .byte W12 .byte As0 , v124 @@ -805,21 +805,21 @@ bgm_m_dungon_4_B1: .byte N14 , As1 , v112 .byte W24 .byte GOTO - .word bgm_m_dungon_4_B1 + .word mus_mt_pyre_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_m_dungon_5: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_5_B1: +mus_mt_pyre_5: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_5_B1: .byte VOICE , 24 .byte LFOS , 44 .byte PAN , c_v+23 .byte BENDR , 12 - .byte VOL , 55*bgm_m_dungon_mvl/mxv + .byte VOL , 55*mus_mt_pyre_mvl/mxv .byte W24 - .byte 55*bgm_m_dungon_mvl/mxv + .byte 55*mus_mt_pyre_mvl/mxv .byte W12 .byte N12 , Gn3 , v072 .byte W24 @@ -1028,7 +1028,7 @@ bgm_m_dungon_5_B1: .byte Bn3 , v112 .byte W18 .byte VOICE , 35 - .byte VOL , 88*bgm_m_dungon_mvl/mxv + .byte VOL , 88*mus_mt_pyre_mvl/mxv .byte PAN , c_v+0 .byte N06 , As1 .byte W12 @@ -1083,19 +1083,19 @@ bgm_m_dungon_5_B1: .byte N06 , As0 .byte W24 .byte GOTO - .word bgm_m_dungon_5_B1 + .word mus_mt_pyre_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_m_dungon_6: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_6_B1: +mus_mt_pyre_6: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_6_B1: .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 - .byte VOL , 33*bgm_m_dungon_mvl/mxv + .byte VOL , 33*mus_mt_pyre_mvl/mxv .byte PAN , c_v-62 .byte BENDR , 12 .byte BEND , c_v-26 @@ -1374,7 +1374,7 @@ bgm_m_dungon_6_B1: .byte W24 .byte c_v+0 .byte W72 -bgm_m_dungon_6_000: +mus_mt_pyre_6_000: .byte BEND , c_v+5 .byte W24 .byte c_v+0 @@ -1404,7 +1404,7 @@ bgm_m_dungon_6_000: .byte c_v+0 .byte W72 .byte PATT - .word bgm_m_dungon_6_000 + .word mus_mt_pyre_6_000 .byte W24 .byte EOT , Fn3 .byte W30 @@ -1474,19 +1474,19 @@ bgm_m_dungon_6_000: .byte N08 , An3 , v112 .byte W76 .byte GOTO - .word bgm_m_dungon_6_B1 + .word mus_mt_pyre_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_m_dungon_7: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_7_B1: +mus_mt_pyre_7: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_7_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 - .byte VOL , 33*bgm_m_dungon_mvl/mxv + .byte VOL , 33*mus_mt_pyre_mvl/mxv .byte PAN , c_v+63 .byte BENDR , 12 .byte BEND , c_v-26 @@ -1765,7 +1765,7 @@ bgm_m_dungon_7_B1: .byte W24 .byte c_v+0 .byte W72 -bgm_m_dungon_7_000: +mus_mt_pyre_7_000: .byte BEND , c_v+5 .byte W24 .byte c_v+0 @@ -1795,7 +1795,7 @@ bgm_m_dungon_7_000: .byte c_v+0 .byte W72 .byte PATT - .word bgm_m_dungon_7_000 + .word mus_mt_pyre_7_000 .byte W24 .byte EOT , As3 .byte W30 @@ -1865,16 +1865,16 @@ bgm_m_dungon_7_000: .byte N08 , Fn4 , v112 .byte W76 .byte GOTO - .word bgm_m_dungon_7_B1 + .word mus_mt_pyre_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_m_dungon_8: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_8_B1: +mus_mt_pyre_8: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_8_B1: .byte VOICE , 0 - .byte VOL , 65*bgm_m_dungon_mvl/mxv + .byte VOL , 65*mus_mt_pyre_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -1899,20 +1899,20 @@ bgm_m_dungon_8_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_m_dungon_8_B1 + .word mus_mt_pyre_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_m_dungon_9: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_9_B1: +mus_mt_pyre_9: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_9_B1: .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte PAN , c_v+0 - .byte VOL , 43*bgm_m_dungon_mvl/mxv + .byte VOL , 43*mus_mt_pyre_mvl/mxv .byte BEND , c_v+2 .byte W18 .byte N03 , En1 , v112 @@ -1930,7 +1930,7 @@ bgm_m_dungon_9_B1: .byte W03 .byte N42 , Gn1 .byte W24 -bgm_m_dungon_9_000: +mus_mt_pyre_9_000: .byte MOD , 24 .byte W18 .byte 0 @@ -1951,10 +1951,10 @@ bgm_m_dungon_9_000: .byte W24 .byte PEND .byte PATT - .word bgm_m_dungon_9_000 + .word mus_mt_pyre_9_000 .byte PATT - .word bgm_m_dungon_9_000 -bgm_m_dungon_9_001: + .word mus_mt_pyre_9_000 +mus_mt_pyre_9_001: .byte W18 .byte N03 , En1 , v112 .byte W03 @@ -1970,11 +1970,11 @@ bgm_m_dungon_9_001: .byte W24 .byte PEND .byte PATT - .word bgm_m_dungon_9_001 + .word mus_mt_pyre_9_001 .byte PATT - .word bgm_m_dungon_9_001 + .word mus_mt_pyre_9_001 .byte PATT - .word bgm_m_dungon_9_001 + .word mus_mt_pyre_9_001 .byte W18 .byte N03 , En1 , v112 .byte W03 @@ -1988,7 +1988,7 @@ bgm_m_dungon_9_001: .byte W03 .byte N42 , As1 .byte W24 -bgm_m_dungon_9_002: +mus_mt_pyre_9_002: .byte W18 .byte N03 , Gn1 , v112 .byte W03 @@ -2004,17 +2004,17 @@ bgm_m_dungon_9_002: .byte W24 .byte PEND .byte PATT - .word bgm_m_dungon_9_002 + .word mus_mt_pyre_9_002 .byte PATT - .word bgm_m_dungon_9_002 + .word mus_mt_pyre_9_002 .byte PATT - .word bgm_m_dungon_9_002 + .word mus_mt_pyre_9_002 .byte PATT - .word bgm_m_dungon_9_002 + .word mus_mt_pyre_9_002 .byte PATT - .word bgm_m_dungon_9_002 + .word mus_mt_pyre_9_002 .byte PATT - .word bgm_m_dungon_9_002 + .word mus_mt_pyre_9_002 .byte W18 .byte N03 , Gn1 , v112 .byte W03 @@ -2025,17 +2025,17 @@ bgm_m_dungon_9_002: .byte W96 .byte W96 .byte GOTO - .word bgm_m_dungon_9_B1 + .word mus_mt_pyre_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_m_dungon_10: - .byte KEYSH , bgm_m_dungon_key+0 -bgm_m_dungon_10_B1: +mus_mt_pyre_10: + .byte KEYSH , mus_mt_pyre_key+0 +mus_mt_pyre_10_B1: .byte VOICE , 14 .byte PAN , c_v+0 - .byte VOL , 70*bgm_m_dungon_mvl/mxv + .byte VOL , 70*mus_mt_pyre_mvl/mxv .byte W24 .byte PAN , c_v-32 .byte BEND , c_v+0 @@ -2401,7 +2401,7 @@ bgm_m_dungon_10_B1: .byte W48 .byte N24 , Ds3 .byte W24 - .byte VOL , 61*bgm_m_dungon_mvl/mxv + .byte VOL , 61*mus_mt_pyre_mvl/mxv .byte N48 , As3 .byte W48 .byte BEND , c_v-4 @@ -2438,51 +2438,51 @@ bgm_m_dungon_10_B1: .byte W24 .byte N48 , As4 .byte W06 - .byte VOL , 61*bgm_m_dungon_mvl/mxv + .byte VOL , 61*mus_mt_pyre_mvl/mxv .byte W06 - .byte 58*bgm_m_dungon_mvl/mxv + .byte 58*mus_mt_pyre_mvl/mxv .byte W05 - .byte 51*bgm_m_dungon_mvl/mxv + .byte 51*mus_mt_pyre_mvl/mxv .byte W07 - .byte 47*bgm_m_dungon_mvl/mxv + .byte 47*mus_mt_pyre_mvl/mxv .byte W05 - .byte 39*bgm_m_dungon_mvl/mxv + .byte 39*mus_mt_pyre_mvl/mxv .byte W07 - .byte 27*bgm_m_dungon_mvl/mxv + .byte 27*mus_mt_pyre_mvl/mxv .byte W05 - .byte 15*bgm_m_dungon_mvl/mxv + .byte 15*mus_mt_pyre_mvl/mxv .byte W07 - .byte 2*bgm_m_dungon_mvl/mxv + .byte 2*mus_mt_pyre_mvl/mxv .byte W24 - .byte 63*bgm_m_dungon_mvl/mxv + .byte 63*mus_mt_pyre_mvl/mxv .byte W24 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_m_dungon_10_B1 + .word mus_mt_pyre_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_m_dungon: +mus_mt_pyre: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_m_dungon_pri @ Priority - .byte bgm_m_dungon_rev @ Reverb. + .byte mus_mt_pyre_pri @ Priority + .byte mus_mt_pyre_rev @ Reverb. - .word bgm_m_dungon_grp + .word mus_mt_pyre_grp - .word bgm_m_dungon_1 - .word bgm_m_dungon_2 - .word bgm_m_dungon_3 - .word bgm_m_dungon_4 - .word bgm_m_dungon_5 - .word bgm_m_dungon_6 - .word bgm_m_dungon_7 - .word bgm_m_dungon_8 - .word bgm_m_dungon_9 - .word bgm_m_dungon_10 + .word mus_mt_pyre_1 + .word mus_mt_pyre_2 + .word mus_mt_pyre_3 + .word mus_mt_pyre_4 + .word mus_mt_pyre_5 + .word mus_mt_pyre_6 + .word mus_mt_pyre_7 + .word mus_mt_pyre_8 + .word mus_mt_pyre_9 + .word mus_mt_pyre_10 .end diff --git a/sound/songs/bgm_machupi.s b/sound/songs/mus_mt_pyre_exterior.s index 15c3a1116..5fa7440f8 100644 --- a/sound/songs/bgm_machupi.s +++ b/sound/songs/mus_mt_pyre_exterior.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_machupi_grp, voicegroup077 - .equ bgm_machupi_pri, 0 - .equ bgm_machupi_rev, reverb_set+50 - .equ bgm_machupi_mvl, 127 - .equ bgm_machupi_key, 0 - .equ bgm_machupi_tbs, 1 - .equ bgm_machupi_exg, 0 - .equ bgm_machupi_cmp, 1 + .equ mus_mt_pyre_exterior_grp, voicegroup077 + .equ mus_mt_pyre_exterior_pri, 0 + .equ mus_mt_pyre_exterior_rev, reverb_set+50 + .equ mus_mt_pyre_exterior_mvl, 127 + .equ mus_mt_pyre_exterior_key, 0 + .equ mus_mt_pyre_exterior_tbs, 1 + .equ mus_mt_pyre_exterior_exg, 0 + .equ mus_mt_pyre_exterior_cmp, 1 .section .rodata - .global bgm_machupi + .global mus_mt_pyre_exterior .align 2 @********************** Track 1 **********************@ -bgm_machupi_1: - .byte KEYSH , bgm_machupi_key+0 - .byte TEMPO , 102*bgm_machupi_tbs/2 +mus_mt_pyre_exterior_1: + .byte KEYSH , mus_mt_pyre_exterior_key+0 + .byte TEMPO , 102*mus_mt_pyre_exterior_tbs/2 .byte VOICE , 73 .byte LFOS , 44 - .byte VOL , 57*bgm_machupi_mvl/mxv + .byte VOL , 57*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v-4 .byte W96 .byte W96 @@ -88,7 +88,7 @@ bgm_machupi_1: .byte W96 .byte W96 .byte W96 -bgm_machupi_1_B1: +mus_mt_pyre_exterior_1_B1: .byte W96 .byte W96 .byte W96 @@ -97,7 +97,7 @@ bgm_machupi_1_B1: .byte W96 .byte W96 .byte VOICE , 73 - .byte VOL , 69*bgm_machupi_mvl/mxv + .byte VOL , 69*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v+24 .byte W72 .byte N03 , Gn3 , v044 @@ -194,7 +194,7 @@ bgm_machupi_1_B1: .byte W24 .byte VOICE , 60 .byte MOD , 0 - .byte VOL , 42*bgm_machupi_mvl/mxv + .byte VOL , 42*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v+25 .byte N04 , As2 .byte W08 @@ -304,17 +304,17 @@ bgm_machupi_1_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_machupi_1_B1 + .word mus_mt_pyre_exterior_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_machupi_2: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_2: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 28*bgm_machupi_mvl/mxv + .byte VOL , 28*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v+0 .byte N03 , Fn4 , v084 .byte W06 @@ -360,7 +360,7 @@ bgm_machupi_2: .byte W03 .byte Fn4 , v076 .byte W03 -bgm_machupi_2_000: +mus_mt_pyre_exterior_2_000: .byte N03 , Fn4 , v084 .byte W06 .byte Fn4 , v064 @@ -446,7 +446,7 @@ bgm_machupi_2_000: .byte Fn4 , v076 .byte W03 .byte PATT - .word bgm_machupi_2_000 + .word mus_mt_pyre_exterior_2_000 .byte N03 , Fn4 , v084 .byte W06 .byte Fn4 , v064 @@ -491,7 +491,7 @@ bgm_machupi_2_000: .byte W03 .byte Fn4 , v076 .byte W03 -bgm_machupi_2_001: +mus_mt_pyre_exterior_2_001: .byte PAN , c_v-63 .byte N03 , Fn4 , v084 .byte W06 @@ -526,7 +526,7 @@ bgm_machupi_2_001: .byte Fn4 , v064 .byte W06 .byte PEND -bgm_machupi_2_002: +mus_mt_pyre_exterior_2_002: .byte N03 , Fn4 , v084 .byte W06 .byte Fn4 , v064 @@ -568,7 +568,7 @@ bgm_machupi_2_002: .byte Fn4 , v076 .byte W03 .byte PEND -bgm_machupi_2_003: +mus_mt_pyre_exterior_2_003: .byte N03 , Fn4 , v096 .byte W06 .byte Fn4 , v064 @@ -603,9 +603,9 @@ bgm_machupi_2_003: .byte W06 .byte PEND .byte PATT - .word bgm_machupi_2_002 -bgm_machupi_2_B1: -bgm_machupi_2_004: + .word mus_mt_pyre_exterior_2_002 +mus_mt_pyre_exterior_2_B1: +mus_mt_pyre_exterior_2_004: .byte N03 , Fn4 , v084 .byte W06 .byte Fn4 , v064 @@ -640,19 +640,19 @@ bgm_machupi_2_004: .byte W06 .byte PEND .byte PATT - .word bgm_machupi_2_002 + .word mus_mt_pyre_exterior_2_002 .byte PATT - .word bgm_machupi_2_003 + .word mus_mt_pyre_exterior_2_003 .byte PATT - .word bgm_machupi_2_002 + .word mus_mt_pyre_exterior_2_002 .byte PATT - .word bgm_machupi_2_004 + .word mus_mt_pyre_exterior_2_004 .byte PATT - .word bgm_machupi_2_002 + .word mus_mt_pyre_exterior_2_002 .byte PATT - .word bgm_machupi_2_003 + .word mus_mt_pyre_exterior_2_003 .byte PATT - .word bgm_machupi_2_002 + .word mus_mt_pyre_exterior_2_002 .byte PAN , c_v+0 .byte N01 , Fn4 , v112 .byte W08 @@ -666,7 +666,7 @@ bgm_machupi_2_004: .byte W08 .byte N01 .byte W56 -bgm_machupi_2_005: +mus_mt_pyre_exterior_2_005: .byte N01 , Fn4 , v112 .byte W08 .byte Fn4 , v080 @@ -681,9 +681,9 @@ bgm_machupi_2_005: .byte W56 .byte PEND .byte PATT - .word bgm_machupi_2_005 + .word mus_mt_pyre_exterior_2_005 .byte W96 - .byte VOL , 40*bgm_machupi_mvl/mxv + .byte VOL , 40*mus_mt_pyre_exterior_mvl/mxv .byte N03 , Fn4 , v060 .byte W06 .byte N03 @@ -716,7 +716,7 @@ bgm_machupi_2_005: .byte W06 .byte Fn4 , v076 .byte W06 -bgm_machupi_2_006: +mus_mt_pyre_exterior_2_006: .byte N03 , Fn4 , v060 .byte W06 .byte N03 @@ -787,37 +787,37 @@ bgm_machupi_2_006: .byte Fn4 , v076 .byte W06 .byte PATT - .word bgm_machupi_2_006 + .word mus_mt_pyre_exterior_2_006 .byte W96 .byte W96 .byte PATT - .word bgm_machupi_2_001 + .word mus_mt_pyre_exterior_2_001 .byte PATT - .word bgm_machupi_2_002 + .word mus_mt_pyre_exterior_2_002 .byte PATT - .word bgm_machupi_2_004 + .word mus_mt_pyre_exterior_2_004 .byte PATT - .word bgm_machupi_2_002 + .word mus_mt_pyre_exterior_2_002 .byte PATT - .word bgm_machupi_2_004 + .word mus_mt_pyre_exterior_2_004 .byte PATT - .word bgm_machupi_2_002 + .word mus_mt_pyre_exterior_2_002 .byte PATT - .word bgm_machupi_2_004 + .word mus_mt_pyre_exterior_2_004 .byte PATT - .word bgm_machupi_2_002 + .word mus_mt_pyre_exterior_2_002 .byte GOTO - .word bgm_machupi_2_B1 + .word mus_mt_pyre_exterior_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_machupi_3: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_3: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 38 .byte BENDR , 12 .byte LFOS , 44 - .byte VOL , 80*bgm_machupi_mvl/mxv + .byte VOL , 80*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v+19 .byte BEND , c_v+0 .byte W96 @@ -912,9 +912,9 @@ bgm_machupi_3: .byte W06 .byte c_v+0 .byte W06 -bgm_machupi_3_B1: +mus_mt_pyre_exterior_3_B1: .byte MOD , 0 - .byte VOL , 76*bgm_machupi_mvl/mxv + .byte VOL , 76*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte N12 , Ds1 , v120 .byte W18 @@ -953,7 +953,7 @@ bgm_machupi_3_B1: .byte W12 .byte En2 .byte W12 -bgm_machupi_3_000: +mus_mt_pyre_exterior_3_000: .byte N06 , Ds1 , v120 .byte W18 .byte As1 @@ -1032,7 +1032,7 @@ bgm_machupi_3_000: .byte N12 , En1 .byte W12 .byte PATT - .word bgm_machupi_3_000 + .word mus_mt_pyre_exterior_3_000 .byte N06 , Ds1 , v120 .byte W18 .byte As1 @@ -1195,7 +1195,7 @@ bgm_machupi_3_000: .byte W12 .byte W96 .byte W96 -bgm_machupi_3_001: +mus_mt_pyre_exterior_3_001: .byte BEND , c_v+0 .byte W12 .byte c_v+2 @@ -1204,7 +1204,7 @@ bgm_machupi_3_001: .byte W78 .byte PEND .byte PATT - .word bgm_machupi_3_001 + .word mus_mt_pyre_exterior_3_001 .byte W96 .byte W96 .byte W96 @@ -1212,21 +1212,21 @@ bgm_machupi_3_001: .byte W96 .byte W96 .byte GOTO - .word bgm_machupi_3_B1 + .word mus_mt_pyre_exterior_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_machupi_4: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_4: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 35*bgm_machupi_mvl/mxv + .byte VOL , 35*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v-32 .byte BEND , c_v+0 .byte W96 - .byte VOL , 25*bgm_machupi_mvl/mxv + .byte VOL , 25*mus_mt_pyre_exterior_mvl/mxv .byte N06 , Dn3 , v112 .byte W06 .byte N03 , Ds3 @@ -1262,7 +1262,7 @@ bgm_machupi_4: .byte W06 .byte Ds3 .byte W06 - .byte VOL , 33*bgm_machupi_mvl/mxv + .byte VOL , 33*mus_mt_pyre_exterior_mvl/mxv .byte N06 , Cn3 .byte W06 .byte N03 , Cs3 @@ -1298,7 +1298,7 @@ bgm_machupi_4: .byte W06 .byte Cs3 .byte W06 - .byte VOL , 44*bgm_machupi_mvl/mxv + .byte VOL , 44*mus_mt_pyre_exterior_mvl/mxv .byte N06 , As2 .byte W06 .byte N03 , Bn2 @@ -1334,7 +1334,7 @@ bgm_machupi_4: .byte W06 .byte N03 , Ds4 .byte W06 - .byte VOL , 48*bgm_machupi_mvl/mxv + .byte VOL , 48*mus_mt_pyre_exterior_mvl/mxv .byte N06 , Gs3 .byte W06 .byte N03 , Cn3 @@ -1343,7 +1343,7 @@ bgm_machupi_4: .byte W06 .byte N03 , Gs3 .byte W06 - .byte VOL , 53*bgm_machupi_mvl/mxv + .byte VOL , 53*mus_mt_pyre_exterior_mvl/mxv .byte N06 , Fn3 .byte W06 .byte N03 , As2 @@ -1352,7 +1352,7 @@ bgm_machupi_4: .byte W06 .byte N03 , Fn3 .byte W06 - .byte VOL , 57*bgm_machupi_mvl/mxv + .byte VOL , 57*mus_mt_pyre_exterior_mvl/mxv .byte N04 , Dn3 .byte W04 .byte N02 , As2 @@ -1365,7 +1365,7 @@ bgm_machupi_4: .byte W04 .byte N02 , As2 .byte W04 - .byte VOL , 60*bgm_machupi_mvl/mxv + .byte VOL , 60*mus_mt_pyre_exterior_mvl/mxv .byte N04 , Fn3 .byte W04 .byte N02 , Dn3 @@ -1374,7 +1374,7 @@ bgm_machupi_4: .byte W02 .byte N02 , As2 .byte W04 - .byte VOL , 60*bgm_machupi_mvl/mxv + .byte VOL , 60*mus_mt_pyre_exterior_mvl/mxv .byte N03 , Fn2 .byte W03 .byte As2 @@ -1383,7 +1383,7 @@ bgm_machupi_4: .byte W03 .byte Fn3 .byte W03 - .byte VOL , 53*bgm_machupi_mvl/mxv + .byte VOL , 53*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v+27 .byte N09 , As3 , v127 .byte W03 @@ -1474,7 +1474,7 @@ bgm_machupi_4: .byte W03 .byte N01 , Bn3 , v088 .byte W06 -bgm_machupi_4_000: +mus_mt_pyre_exterior_4_000: .byte N09 , As3 , v127 .byte W03 .byte BEND , c_v+3 @@ -1522,7 +1522,7 @@ bgm_machupi_4_000: .byte N03 .byte W03 .byte PEND -bgm_machupi_4_001: +mus_mt_pyre_exterior_4_001: .byte N09 , Ds3 , v127 .byte W03 .byte BEND , c_v+1 @@ -1568,8 +1568,8 @@ bgm_machupi_4_001: .byte An3 , v112 .byte W03 .byte PEND -bgm_machupi_4_B1: -bgm_machupi_4_002: +mus_mt_pyre_exterior_4_B1: +mus_mt_pyre_exterior_4_002: .byte N09 , As3 , v127 .byte W03 .byte BEND , c_v+2 @@ -1665,11 +1665,11 @@ bgm_machupi_4_002: .byte N01 , Bn3 .byte W06 .byte PATT - .word bgm_machupi_4_000 + .word mus_mt_pyre_exterior_4_000 .byte PATT - .word bgm_machupi_4_001 + .word mus_mt_pyre_exterior_4_001 .byte PATT - .word bgm_machupi_4_002 + .word mus_mt_pyre_exterior_4_002 .byte N09 , Bn3 , v127 .byte W03 .byte BEND , c_v+1 @@ -1757,7 +1757,7 @@ bgm_machupi_4_002: .byte N03 .byte W03 .byte PATT - .word bgm_machupi_4_001 + .word mus_mt_pyre_exterior_4_001 .byte N06 , Bn3 , v127 .byte W96 .byte W96 @@ -1878,7 +1878,7 @@ bgm_machupi_4_002: .byte N03 , Dn3 .byte N03 , As3 .byte W03 -bgm_machupi_4_003: +mus_mt_pyre_exterior_4_003: .byte N09 , Bn3 , v127 .byte W12 .byte N01 , En3 , v112 @@ -1963,7 +1963,7 @@ bgm_machupi_4_003: .byte N03 .byte W03 .byte PATT - .word bgm_machupi_4_001 + .word mus_mt_pyre_exterior_4_001 .byte N09 , As3 , v127 .byte W12 .byte N01 , Ds3 , v112 @@ -2004,7 +2004,7 @@ bgm_machupi_4_003: .byte N03 , As3 .byte W03 .byte PATT - .word bgm_machupi_4_003 + .word mus_mt_pyre_exterior_4_003 .byte N06 , Ds3 , v127 .byte N09 , As3 .byte W12 @@ -2081,16 +2081,16 @@ bgm_machupi_4_003: .byte An3 , v112 .byte W03 .byte GOTO - .word bgm_machupi_4_B1 + .word mus_mt_pyre_exterior_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_machupi_5: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_5: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 24 .byte LFOS , 44 - .byte VOL , 60*bgm_machupi_mvl/mxv + .byte VOL , 60*mus_mt_pyre_exterior_mvl/mxv .byte BENDR , 12 .byte PAN , c_v-25 .byte BEND , c_v+0 @@ -2104,7 +2104,7 @@ bgm_machupi_5: .byte Ds2 .byte W03 .byte PAN , c_v-16 - .byte VOL , 53*bgm_machupi_mvl/mxv + .byte VOL , 53*mus_mt_pyre_exterior_mvl/mxv .byte W03 .byte BEND , c_v+2 .byte W03 @@ -2172,7 +2172,7 @@ bgm_machupi_5: .byte W06 .byte Cs3 , v088 .byte W06 -bgm_machupi_5_000: +mus_mt_pyre_exterior_5_000: .byte N06 , Ds3 , v127 .byte W03 .byte BEND , c_v+3 @@ -2214,7 +2214,7 @@ bgm_machupi_5_000: .byte N03 .byte W03 .byte PEND -bgm_machupi_5_001: +mus_mt_pyre_exterior_5_001: .byte N06 , Fs2 , v127 .byte W03 .byte BEND , c_v+2 @@ -2254,8 +2254,8 @@ bgm_machupi_5_001: .byte N03 , Gs2 , v060 .byte W06 .byte PEND -bgm_machupi_5_B1: -bgm_machupi_5_002: +mus_mt_pyre_exterior_5_B1: +mus_mt_pyre_exterior_5_002: .byte N06 , Ds3 , v127 .byte W03 .byte BEND , c_v+2 @@ -2318,11 +2318,11 @@ bgm_machupi_5_002: .byte Gs2 , v088 .byte W30 .byte PATT - .word bgm_machupi_5_000 + .word mus_mt_pyre_exterior_5_000 .byte PATT - .word bgm_machupi_5_001 + .word mus_mt_pyre_exterior_5_001 .byte PATT - .word bgm_machupi_5_002 + .word mus_mt_pyre_exterior_5_002 .byte N06 , Ds3 , v127 .byte W03 .byte BEND , c_v+2 @@ -2398,7 +2398,7 @@ bgm_machupi_5_002: .byte N03 .byte W03 .byte PATT - .word bgm_machupi_5_001 + .word mus_mt_pyre_exterior_5_001 .byte W96 .byte W96 .byte W96 @@ -2472,7 +2472,7 @@ bgm_machupi_5_002: .byte W02 .byte Dn2 , v112 .byte W04 -bgm_machupi_5_003: +mus_mt_pyre_exterior_5_003: .byte N06 , Ds3 , v127 .byte W12 .byte N01 , Fs2 , v112 @@ -2500,7 +2500,7 @@ bgm_machupi_5_003: .byte N09 , Fs2 , v124 .byte W24 .byte PEND -bgm_machupi_5_004: +mus_mt_pyre_exterior_5_004: .byte N06 , Ds3 , v127 .byte W12 .byte N01 , Gs2 , v112 @@ -2571,11 +2571,11 @@ bgm_machupi_5_004: .byte N03 .byte W03 .byte PATT - .word bgm_machupi_5_001 + .word mus_mt_pyre_exterior_5_001 .byte PATT - .word bgm_machupi_5_003 + .word mus_mt_pyre_exterior_5_003 .byte PATT - .word bgm_machupi_5_004 + .word mus_mt_pyre_exterior_5_004 .byte W12 .byte N01 , Fs2 , v112 .byte W06 @@ -2638,21 +2638,21 @@ bgm_machupi_5_004: .byte N03 , Gs2 , v060 .byte W06 .byte GOTO - .word bgm_machupi_5_B1 + .word mus_mt_pyre_exterior_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_machupi_6: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_6: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+16 - .byte VOL , 40*bgm_machupi_mvl/mxv + .byte VOL , 40*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte W96 - .byte VOL , 25*bgm_machupi_mvl/mxv + .byte VOL , 25*mus_mt_pyre_exterior_mvl/mxv .byte N06 , Dn4 , v112 .byte W06 .byte N03 , Ds4 @@ -2715,7 +2715,7 @@ bgm_machupi_6: .byte W03 .byte Ds4 , v032 .byte W03 - .byte VOL , 33*bgm_machupi_mvl/mxv + .byte VOL , 33*mus_mt_pyre_exterior_mvl/mxv .byte N06 , Cn4 , v112 .byte W06 .byte N03 , Cs4 @@ -2776,7 +2776,7 @@ bgm_machupi_6: .byte W03 .byte Cs4 , v032 .byte W03 - .byte VOL , 44*bgm_machupi_mvl/mxv + .byte VOL , 44*mus_mt_pyre_exterior_mvl/mxv .byte N06 , As3 , v112 .byte W06 .byte N03 , Bn3 @@ -2823,7 +2823,7 @@ bgm_machupi_6: .byte W03 .byte Ds5 , v032 .byte W03 - .byte VOL , 48*bgm_machupi_mvl/mxv + .byte VOL , 48*mus_mt_pyre_exterior_mvl/mxv .byte N06 , Cn5 , v112 .byte W06 .byte N03 , Ds4 @@ -2836,7 +2836,7 @@ bgm_machupi_6: .byte W03 .byte Cn5 , v032 .byte W03 - .byte VOL , 53*bgm_machupi_mvl/mxv + .byte VOL , 53*mus_mt_pyre_exterior_mvl/mxv .byte N06 , As4 , v112 .byte W06 .byte N03 , Dn4 @@ -2849,7 +2849,7 @@ bgm_machupi_6: .byte W03 .byte As4 , v032 .byte W03 - .byte VOL , 57*bgm_machupi_mvl/mxv + .byte VOL , 57*mus_mt_pyre_exterior_mvl/mxv .byte N04 , Fn4 , v112 .byte W04 .byte N02 , Dn4 @@ -2862,7 +2862,7 @@ bgm_machupi_6: .byte W04 .byte N02 , Dn4 .byte W04 - .byte VOL , 60*bgm_machupi_mvl/mxv + .byte VOL , 60*mus_mt_pyre_exterior_mvl/mxv .byte N04 , As4 .byte W04 .byte N02 , Fn4 @@ -2875,13 +2875,13 @@ bgm_machupi_6: .byte W04 .byte Fn4 .byte W04 - .byte VOL , 70*bgm_machupi_mvl/mxv + .byte VOL , 70*mus_mt_pyre_exterior_mvl/mxv .byte N06 , As4 , v088 .byte W96 .byte W96 .byte W96 .byte W96 -bgm_machupi_6_B1: +mus_mt_pyre_exterior_6_B1: .byte W96 .byte W96 .byte W96 @@ -2892,7 +2892,7 @@ bgm_machupi_6_B1: .byte W96 .byte VOICE , 24 .byte PAN , c_v+0 - .byte VOL , 31*bgm_machupi_mvl/mxv + .byte VOL , 31*mus_mt_pyre_exterior_mvl/mxv .byte W06 .byte N03 , Bn2 , v112 .byte W03 @@ -3179,7 +3179,7 @@ bgm_machupi_6_B1: .byte W03 .byte VOICE , 48 .byte PAN , c_v+0 - .byte VOL , 57*bgm_machupi_mvl/mxv + .byte VOL , 57*mus_mt_pyre_exterior_mvl/mxv .byte N04 , Ds4 , v112 .byte W08 .byte En4 @@ -3276,7 +3276,7 @@ bgm_machupi_6_B1: .byte As2 .byte W06 .byte VOICE , 24 - .byte VOL , 78*bgm_machupi_mvl/mxv + .byte VOL , 78*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte N48 , As3 .byte W06 @@ -3530,20 +3530,20 @@ bgm_machupi_6_B1: .byte Dn2 , v036 .byte W06 .byte GOTO - .word bgm_machupi_6_B1 + .word mus_mt_pyre_exterior_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_machupi_7: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_7: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 80 .byte LFOS , 50 .byte XCMD , xIECV , 24 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-63 - .byte VOL , 15*bgm_machupi_mvl/mxv + .byte VOL , 15*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte W78 .byte N06 , Cn3 , v080 @@ -3552,90 +3552,90 @@ bgm_machupi_7: .byte W06 .byte Dn3 , v100 .byte W06 - .byte VOL , 15*bgm_machupi_mvl/mxv + .byte VOL , 15*mus_mt_pyre_exterior_mvl/mxv .byte N96 , Ds3 .byte W24 - .byte VOL , 16*bgm_machupi_mvl/mxv + .byte VOL , 16*mus_mt_pyre_exterior_mvl/mxv .byte W24 .byte MOD , 3 - .byte VOL , 17*bgm_machupi_mvl/mxv + .byte VOL , 17*mus_mt_pyre_exterior_mvl/mxv .byte W24 .byte MOD , 8 - .byte VOL , 20*bgm_machupi_mvl/mxv + .byte VOL , 20*mus_mt_pyre_exterior_mvl/mxv .byte W18 .byte BEND , c_v-5 .byte W06 .byte MOD , 0 - .byte VOL , 23*bgm_machupi_mvl/mxv + .byte VOL , 23*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte N96 , Cs3 , v112 .byte W24 - .byte VOL , 26*bgm_machupi_mvl/mxv + .byte VOL , 26*mus_mt_pyre_exterior_mvl/mxv .byte W24 .byte MOD , 3 - .byte VOL , 28*bgm_machupi_mvl/mxv + .byte VOL , 28*mus_mt_pyre_exterior_mvl/mxv .byte W24 .byte MOD , 8 - .byte VOL , 30*bgm_machupi_mvl/mxv + .byte VOL , 30*mus_mt_pyre_exterior_mvl/mxv .byte W18 .byte BEND , c_v-5 .byte W06 .byte MOD , 0 - .byte VOL , 33*bgm_machupi_mvl/mxv + .byte VOL , 33*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte N96 , Bn2 .byte W12 - .byte VOL , 34*bgm_machupi_mvl/mxv + .byte VOL , 34*mus_mt_pyre_exterior_mvl/mxv .byte W12 - .byte 36*bgm_machupi_mvl/mxv + .byte 36*mus_mt_pyre_exterior_mvl/mxv .byte W15 - .byte 38*bgm_machupi_mvl/mxv + .byte 38*mus_mt_pyre_exterior_mvl/mxv .byte W09 .byte MOD , 3 - .byte VOL , 39*bgm_machupi_mvl/mxv + .byte VOL , 39*mus_mt_pyre_exterior_mvl/mxv .byte W12 - .byte 40*bgm_machupi_mvl/mxv + .byte 40*mus_mt_pyre_exterior_mvl/mxv .byte W12 .byte MOD , 8 - .byte VOL , 44*bgm_machupi_mvl/mxv + .byte VOL , 44*mus_mt_pyre_exterior_mvl/mxv .byte W12 - .byte 45*bgm_machupi_mvl/mxv + .byte 45*mus_mt_pyre_exterior_mvl/mxv .byte W06 .byte BEND , c_v-21 .byte W06 - .byte VOL , 49*bgm_machupi_mvl/mxv + .byte VOL , 49*mus_mt_pyre_exterior_mvl/mxv .byte MOD , 0 - .byte VOL , 49*bgm_machupi_mvl/mxv + .byte VOL , 49*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte N24 , Fn2 .byte W24 - .byte VOL , 54*bgm_machupi_mvl/mxv + .byte VOL , 54*mus_mt_pyre_exterior_mvl/mxv .byte MOD , 6 .byte N24 .byte W24 - .byte VOL , 57*bgm_machupi_mvl/mxv + .byte VOL , 57*mus_mt_pyre_exterior_mvl/mxv .byte MOD , 1 .byte N24 , As1 .byte W24 - .byte VOL , 48*bgm_machupi_mvl/mxv + .byte VOL , 48*mus_mt_pyre_exterior_mvl/mxv .byte N24 , Dn2 .byte W02 - .byte VOL , 50*bgm_machupi_mvl/mxv + .byte VOL , 50*mus_mt_pyre_exterior_mvl/mxv .byte W03 - .byte 53*bgm_machupi_mvl/mxv + .byte 53*mus_mt_pyre_exterior_mvl/mxv .byte W03 - .byte 59*bgm_machupi_mvl/mxv + .byte 59*mus_mt_pyre_exterior_mvl/mxv .byte W04 - .byte 64*bgm_machupi_mvl/mxv + .byte 64*mus_mt_pyre_exterior_mvl/mxv .byte W02 - .byte 68*bgm_machupi_mvl/mxv + .byte 68*mus_mt_pyre_exterior_mvl/mxv .byte W03 - .byte 73*bgm_machupi_mvl/mxv + .byte 73*mus_mt_pyre_exterior_mvl/mxv .byte W03 - .byte 77*bgm_machupi_mvl/mxv + .byte 77*mus_mt_pyre_exterior_mvl/mxv .byte W04 .byte PAN , c_v+0 - .byte VOL , 40*bgm_machupi_mvl/mxv + .byte VOL , 40*mus_mt_pyre_exterior_mvl/mxv .byte W96 .byte W96 .byte PAN , c_v+63 @@ -3666,7 +3666,7 @@ bgm_machupi_7: .byte PAN , c_v+0 .byte BEND , c_v+2 .byte W72 - .byte VOL , 35*bgm_machupi_mvl/mxv + .byte VOL , 35*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v-63 .byte N06 , Dn4 , v112 .byte W06 @@ -3678,8 +3678,8 @@ bgm_machupi_7: .byte W03 .byte N06 , Dn4 .byte W06 -bgm_machupi_7_B1: - .byte VOL , 35*bgm_machupi_mvl/mxv +mus_mt_pyre_exterior_7_B1: + .byte VOL , 35*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v-63 .byte BEND , c_v+2 .byte N06 , Ds5 , v112 @@ -3740,7 +3740,7 @@ bgm_machupi_7_B1: .byte W06 .byte N03 , Gs4 .byte W06 -bgm_machupi_7_000: +mus_mt_pyre_exterior_7_000: .byte N06 , As4 , v112 .byte W48 .byte Gs4 @@ -3854,7 +3854,7 @@ bgm_machupi_7_000: .byte N03 , Gs4 .byte W06 .byte PATT - .word bgm_machupi_7_000 + .word mus_mt_pyre_exterior_7_000 .byte PAN , c_v+63 .byte BEND , c_v+0 .byte N06 , As4 , v112 @@ -3882,14 +3882,14 @@ bgm_machupi_7_000: .byte W21 .byte 1 .byte W03 - .byte VOL , 40*bgm_machupi_mvl/mxv + .byte VOL , 40*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v-62 .byte W96 .byte W96 .byte W96 .byte W96 .byte c_v-62 - .byte VOL , 23*bgm_machupi_mvl/mxv + .byte VOL , 23*mus_mt_pyre_exterior_mvl/mxv .byte N03 , Ds5 .byte W06 .byte Bn3 @@ -4186,20 +4186,20 @@ bgm_machupi_7_000: .byte PAN , c_v-61 .byte W96 .byte GOTO - .word bgm_machupi_7_B1 + .word mus_mt_pyre_exterior_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_machupi_8: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_8: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 81 .byte LFOS , 50 .byte XCMD , xIECV , 24 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 15*bgm_machupi_mvl/mxv + .byte VOL , 15*mus_mt_pyre_exterior_mvl/mxv .byte W78 .byte N06 , As3 , v080 .byte W06 @@ -4207,82 +4207,82 @@ bgm_machupi_8: .byte W06 .byte Gs3 , v100 .byte W06 - .byte VOL , 15*bgm_machupi_mvl/mxv + .byte VOL , 15*mus_mt_pyre_exterior_mvl/mxv .byte N96 , Gn3 .byte W24 - .byte VOL , 16*bgm_machupi_mvl/mxv + .byte VOL , 16*mus_mt_pyre_exterior_mvl/mxv .byte W24 - .byte 17*bgm_machupi_mvl/mxv + .byte 17*mus_mt_pyre_exterior_mvl/mxv .byte W24 - .byte 20*bgm_machupi_mvl/mxv + .byte 20*mus_mt_pyre_exterior_mvl/mxv .byte W18 .byte BEND , c_v-5 .byte W06 - .byte VOL , 23*bgm_machupi_mvl/mxv + .byte VOL , 23*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte N96 , Fn3 , v112 .byte W24 - .byte VOL , 26*bgm_machupi_mvl/mxv + .byte VOL , 26*mus_mt_pyre_exterior_mvl/mxv .byte W24 - .byte 28*bgm_machupi_mvl/mxv + .byte 28*mus_mt_pyre_exterior_mvl/mxv .byte W24 - .byte 30*bgm_machupi_mvl/mxv + .byte 30*mus_mt_pyre_exterior_mvl/mxv .byte W18 .byte BEND , c_v-5 .byte W06 - .byte VOL , 33*bgm_machupi_mvl/mxv + .byte VOL , 33*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte N96 , Ds3 .byte W12 - .byte VOL , 34*bgm_machupi_mvl/mxv + .byte VOL , 34*mus_mt_pyre_exterior_mvl/mxv .byte W12 - .byte 36*bgm_machupi_mvl/mxv + .byte 36*mus_mt_pyre_exterior_mvl/mxv .byte W15 - .byte 38*bgm_machupi_mvl/mxv + .byte 38*mus_mt_pyre_exterior_mvl/mxv .byte W09 - .byte 39*bgm_machupi_mvl/mxv + .byte 39*mus_mt_pyre_exterior_mvl/mxv .byte W12 - .byte 40*bgm_machupi_mvl/mxv + .byte 40*mus_mt_pyre_exterior_mvl/mxv .byte W12 - .byte 44*bgm_machupi_mvl/mxv + .byte 44*mus_mt_pyre_exterior_mvl/mxv .byte W12 - .byte 45*bgm_machupi_mvl/mxv + .byte 45*mus_mt_pyre_exterior_mvl/mxv .byte W06 .byte BEND , c_v-21 .byte W06 - .byte VOL , 49*bgm_machupi_mvl/mxv + .byte VOL , 49*mus_mt_pyre_exterior_mvl/mxv .byte BEND , c_v+0 .byte N24 , Gs2 .byte W24 - .byte VOL , 55*bgm_machupi_mvl/mxv + .byte VOL , 55*mus_mt_pyre_exterior_mvl/mxv .byte N24 , As2 .byte W24 - .byte VOL , 59*bgm_machupi_mvl/mxv + .byte VOL , 59*mus_mt_pyre_exterior_mvl/mxv .byte N24 , Fn2 .byte W24 - .byte VOL , 48*bgm_machupi_mvl/mxv + .byte VOL , 48*mus_mt_pyre_exterior_mvl/mxv .byte N24 , Gs2 .byte W02 - .byte VOL , 50*bgm_machupi_mvl/mxv + .byte VOL , 50*mus_mt_pyre_exterior_mvl/mxv .byte W03 - .byte 53*bgm_machupi_mvl/mxv + .byte 53*mus_mt_pyre_exterior_mvl/mxv .byte W03 - .byte 59*bgm_machupi_mvl/mxv + .byte 59*mus_mt_pyre_exterior_mvl/mxv .byte W04 - .byte 64*bgm_machupi_mvl/mxv + .byte 64*mus_mt_pyre_exterior_mvl/mxv .byte W02 - .byte 68*bgm_machupi_mvl/mxv + .byte 68*mus_mt_pyre_exterior_mvl/mxv .byte W03 - .byte 73*bgm_machupi_mvl/mxv + .byte 73*mus_mt_pyre_exterior_mvl/mxv .byte W03 - .byte 77*bgm_machupi_mvl/mxv + .byte 77*mus_mt_pyre_exterior_mvl/mxv .byte W04 .byte PAN , c_v+0 .byte W96 .byte W96 .byte W96 .byte W72 - .byte VOL , 39*bgm_machupi_mvl/mxv + .byte VOL , 39*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v+0 .byte N06 , Dn4 .byte W06 @@ -4294,9 +4294,9 @@ bgm_machupi_8: .byte W03 .byte N06 , Dn4 .byte W06 -bgm_machupi_8_B1: +mus_mt_pyre_exterior_8_B1: .byte VOICE , 81 - .byte VOL , 40*bgm_machupi_mvl/mxv + .byte VOL , 40*mus_mt_pyre_exterior_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N06 , Ds5 , v112 @@ -4357,7 +4357,7 @@ bgm_machupi_8_B1: .byte W06 .byte N03 , Gs4 .byte W06 -bgm_machupi_8_000: +mus_mt_pyre_exterior_8_000: .byte N06 , As4 , v112 .byte W48 .byte Gs4 @@ -4455,17 +4455,17 @@ bgm_machupi_8_000: .byte N03 , Gs4 .byte W06 .byte PATT - .word bgm_machupi_8_000 + .word mus_mt_pyre_exterior_8_000 .byte N06 , As4 , v112 .byte W96 .byte VOICE , 81 - .byte VOL , 40*bgm_machupi_mvl/mxv + .byte VOL , 40*mus_mt_pyre_exterior_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 .byte PAN , c_v+63 - .byte VOL , 26*bgm_machupi_mvl/mxv + .byte VOL , 26*mus_mt_pyre_exterior_mvl/mxv .byte N03 , Ds4 .byte W03 .byte Ds4 , v060 @@ -4957,16 +4957,16 @@ bgm_machupi_8_000: .byte Dn2 , v036 .byte W06 .byte GOTO - .word bgm_machupi_8_B1 + .word mus_mt_pyre_exterior_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_machupi_9: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_9: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 60*bgm_machupi_mvl/mxv + .byte VOL , 60*mus_mt_pyre_exterior_mvl/mxv .byte N06 , Cn1 , v112 .byte W48 .byte N06 @@ -5009,7 +5009,7 @@ bgm_machupi_9: .byte W06 .byte N06 .byte W06 -bgm_machupi_9_000: +mus_mt_pyre_exterior_9_000: .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -5034,7 +5034,7 @@ bgm_machupi_9_000: .byte W06 .byte PEND .byte PATT - .word bgm_machupi_9_000 + .word mus_mt_pyre_exterior_9_000 .byte N06 , Cn1 , v112 .byte W06 .byte En3 @@ -5169,8 +5169,8 @@ bgm_machupi_9_000: .byte W03 .byte Dn3 , v096 .byte W03 -bgm_machupi_9_B1: -bgm_machupi_9_001: +mus_mt_pyre_exterior_9_B1: +mus_mt_pyre_exterior_9_001: .byte N06 , Cn1 , v112 .byte W06 .byte En3 @@ -5258,7 +5258,7 @@ bgm_machupi_9_001: .byte W06 .byte N06 .byte W06 -bgm_machupi_9_002: +mus_mt_pyre_exterior_9_002: .byte N06 , Dn3 , v112 .byte W12 .byte En3 @@ -5316,7 +5316,7 @@ bgm_machupi_9_002: .byte W06 .byte Cn1 , v080 .byte W06 -bgm_machupi_9_003: +mus_mt_pyre_exterior_9_003: .byte N06 , Cn1 , v112 .byte W12 .byte Dn3 @@ -5375,7 +5375,7 @@ bgm_machupi_9_003: .byte Dn3 .byte W06 .byte PATT - .word bgm_machupi_9_002 + .word mus_mt_pyre_exterior_9_002 .byte N48 , An2 , v112 .byte W48 .byte N04 , En1 @@ -5511,9 +5511,9 @@ bgm_machupi_9_003: .byte N24 , An2 .byte W48 .byte PATT - .word bgm_machupi_9_001 + .word mus_mt_pyre_exterior_9_001 .byte PATT - .word bgm_machupi_9_003 + .word mus_mt_pyre_exterior_9_003 .byte N06 , Cn1 , v112 .byte W06 .byte En3 @@ -5573,7 +5573,7 @@ bgm_machupi_9_003: .byte Dn3 .byte W06 .byte PATT - .word bgm_machupi_9_001 + .word mus_mt_pyre_exterior_9_001 .byte N06 , Cn1 , v112 .byte W06 .byte En3 @@ -5601,7 +5601,7 @@ bgm_machupi_9_003: .byte Dn3 .byte W06 .byte PATT - .word bgm_machupi_9_001 + .word mus_mt_pyre_exterior_9_001 .byte N06 , Cn1 , v112 .byte W06 .byte Dn3 @@ -5629,19 +5629,19 @@ bgm_machupi_9_003: .byte Dn3 .byte W06 .byte GOTO - .word bgm_machupi_9_B1 + .word mus_mt_pyre_exterior_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_machupi_10: - .byte KEYSH , bgm_machupi_key+0 +mus_mt_pyre_exterior_10: + .byte KEYSH , mus_mt_pyre_exterior_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 24 .byte xIECV , 16 .byte PAN , c_v+0 - .byte VOL , 29*bgm_machupi_mvl/mxv + .byte VOL , 29*mus_mt_pyre_exterior_mvl/mxv .byte BENDR , 12 .byte W96 .byte W96 @@ -5675,7 +5675,7 @@ bgm_machupi_10: .byte Fs4 .byte W15 .byte W96 -bgm_machupi_10_B1: +mus_mt_pyre_exterior_10_B1: .byte W96 .byte W96 .byte W96 @@ -5921,29 +5921,29 @@ bgm_machupi_10_B1: .byte W15 .byte W96 .byte GOTO - .word bgm_machupi_10_B1 + .word mus_mt_pyre_exterior_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_machupi: +mus_mt_pyre_exterior: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_machupi_pri @ Priority - .byte bgm_machupi_rev @ Reverb. + .byte mus_mt_pyre_exterior_pri @ Priority + .byte mus_mt_pyre_exterior_rev @ Reverb. - .word bgm_machupi_grp + .word mus_mt_pyre_exterior_grp - .word bgm_machupi_1 - .word bgm_machupi_2 - .word bgm_machupi_3 - .word bgm_machupi_4 - .word bgm_machupi_5 - .word bgm_machupi_6 - .word bgm_machupi_7 - .word bgm_machupi_8 - .word bgm_machupi_9 - .word bgm_machupi_10 + .word mus_mt_pyre_exterior_1 + .word mus_mt_pyre_exterior_2 + .word mus_mt_pyre_exterior_3 + .word mus_mt_pyre_exterior_4 + .word mus_mt_pyre_exterior_5 + .word mus_mt_pyre_exterior_6 + .word mus_mt_pyre_exterior_7 + .word mus_mt_pyre_exterior_8 + .word mus_mt_pyre_exterior_9 + .word mus_mt_pyre_exterior_10 .end diff --git a/sound/songs/bgm_me_bachi.s b/sound/songs/mus_obtain_badge.s index 038c78577..bcf5549ef 100644 --- a/sound/songs/bgm_me_bachi.s +++ b/sound/songs/mus_obtain_badge.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_me_bachi_grp, voicegroup009 - .equ bgm_me_bachi_pri, 5 - .equ bgm_me_bachi_rev, reverb_set+50 - .equ bgm_me_bachi_mvl, 127 - .equ bgm_me_bachi_key, 0 - .equ bgm_me_bachi_tbs, 1 - .equ bgm_me_bachi_exg, 0 - .equ bgm_me_bachi_cmp, 1 + .equ mus_obtain_badge_grp, voicegroup009 + .equ mus_obtain_badge_pri, 5 + .equ mus_obtain_badge_rev, reverb_set+50 + .equ mus_obtain_badge_mvl, 127 + .equ mus_obtain_badge_key, 0 + .equ mus_obtain_badge_tbs, 1 + .equ mus_obtain_badge_exg, 0 + .equ mus_obtain_badge_cmp, 1 .section .rodata - .global bgm_me_bachi + .global mus_obtain_badge .align 2 @********************** Track 1 **********************@ -bgm_me_bachi_1: - .byte KEYSH , bgm_me_bachi_key+0 +mus_obtain_badge_1: + .byte KEYSH , mus_obtain_badge_key+0 .byte W12 - .byte TEMPO , 144*bgm_me_bachi_tbs/2 + .byte TEMPO , 144*mus_obtain_badge_tbs/2 .byte VOICE , 82 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 90*bgm_me_bachi_mvl/mxv + .byte VOL , 90*mus_obtain_badge_mvl/mxv .byte PAN , c_v+47 .byte N09 , Fn4 , v060 .byte W18 @@ -84,29 +84,29 @@ bgm_me_bachi_1: .byte PAN , c_v-47 .byte N48 , An4 .byte W05 - .byte VOL , 76*bgm_me_bachi_mvl/mxv + .byte VOL , 76*mus_obtain_badge_mvl/mxv .byte W04 - .byte 65*bgm_me_bachi_mvl/mxv + .byte 65*mus_obtain_badge_mvl/mxv .byte W05 - .byte 68*bgm_me_bachi_mvl/mxv + .byte 68*mus_obtain_badge_mvl/mxv .byte W01 .byte MOD , 6 .byte W04 - .byte VOL , 71*bgm_me_bachi_mvl/mxv + .byte VOL , 71*mus_obtain_badge_mvl/mxv .byte W05 - .byte 75*bgm_me_bachi_mvl/mxv + .byte 75*mus_obtain_badge_mvl/mxv .byte W05 - .byte 77*bgm_me_bachi_mvl/mxv + .byte 77*mus_obtain_badge_mvl/mxv .byte W04 .byte MOD , 8 .byte W01 - .byte VOL , 80*bgm_me_bachi_mvl/mxv + .byte VOL , 80*mus_obtain_badge_mvl/mxv .byte W05 - .byte 84*bgm_me_bachi_mvl/mxv + .byte 84*mus_obtain_badge_mvl/mxv .byte W05 - .byte 87*bgm_me_bachi_mvl/mxv + .byte 87*mus_obtain_badge_mvl/mxv .byte W04 - .byte 90*bgm_me_bachi_mvl/mxv + .byte 90*mus_obtain_badge_mvl/mxv .byte MOD , 0 .byte N09 .byte W48 @@ -114,11 +114,11 @@ bgm_me_bachi_1: @********************** Track 2 **********************@ -bgm_me_bachi_2: - .byte KEYSH , bgm_me_bachi_key+0 +mus_obtain_badge_2: + .byte KEYSH , mus_obtain_badge_key+0 .byte W12 .byte VOICE , 56 - .byte VOL , 90*bgm_me_bachi_mvl/mxv + .byte VOL , 90*mus_obtain_badge_mvl/mxv .byte PAN , c_v+11 .byte N09 , As4 , v116 .byte W18 @@ -128,17 +128,17 @@ bgm_me_bachi_2: .byte W09 .byte MOD , 6 .byte W15 - .byte VOL , 78*bgm_me_bachi_mvl/mxv + .byte VOL , 78*mus_obtain_badge_mvl/mxv .byte W05 - .byte 63*bgm_me_bachi_mvl/mxv + .byte 63*mus_obtain_badge_mvl/mxv .byte W05 - .byte 38*bgm_me_bachi_mvl/mxv + .byte 38*mus_obtain_badge_mvl/mxv .byte W05 - .byte 14*bgm_me_bachi_mvl/mxv + .byte 14*mus_obtain_badge_mvl/mxv .byte W03 - .byte 0*bgm_me_bachi_mvl/mxv + .byte 0*mus_obtain_badge_mvl/mxv .byte W03 - .byte 90*bgm_me_bachi_mvl/mxv + .byte 90*mus_obtain_badge_mvl/mxv .byte MOD , 0 .byte N03 , An4 , v100 .byte W03 @@ -154,17 +154,17 @@ bgm_me_bachi_2: .byte W12 .byte MOD , 6 .byte W12 - .byte VOL , 78*bgm_me_bachi_mvl/mxv + .byte VOL , 78*mus_obtain_badge_mvl/mxv .byte W05 - .byte 63*bgm_me_bachi_mvl/mxv + .byte 63*mus_obtain_badge_mvl/mxv .byte W05 - .byte 38*bgm_me_bachi_mvl/mxv + .byte 38*mus_obtain_badge_mvl/mxv .byte W05 - .byte 14*bgm_me_bachi_mvl/mxv + .byte 14*mus_obtain_badge_mvl/mxv .byte W03 - .byte 0*bgm_me_bachi_mvl/mxv + .byte 0*mus_obtain_badge_mvl/mxv .byte W03 - .byte 90*bgm_me_bachi_mvl/mxv + .byte 90*mus_obtain_badge_mvl/mxv .byte MOD , 0 .byte N03 , Bn4 , v100 .byte W03 @@ -175,29 +175,29 @@ bgm_me_bachi_2: .byte 0 .byte N48 , Dn5 .byte W05 - .byte VOL , 76*bgm_me_bachi_mvl/mxv + .byte VOL , 76*mus_obtain_badge_mvl/mxv .byte W04 - .byte 65*bgm_me_bachi_mvl/mxv + .byte 65*mus_obtain_badge_mvl/mxv .byte W05 - .byte 68*bgm_me_bachi_mvl/mxv + .byte 68*mus_obtain_badge_mvl/mxv .byte W01 .byte MOD , 6 .byte W04 - .byte VOL , 71*bgm_me_bachi_mvl/mxv + .byte VOL , 71*mus_obtain_badge_mvl/mxv .byte W05 - .byte 75*bgm_me_bachi_mvl/mxv + .byte 75*mus_obtain_badge_mvl/mxv .byte W05 - .byte 77*bgm_me_bachi_mvl/mxv + .byte 77*mus_obtain_badge_mvl/mxv .byte W04 .byte MOD , 8 .byte W01 - .byte VOL , 80*bgm_me_bachi_mvl/mxv + .byte VOL , 80*mus_obtain_badge_mvl/mxv .byte W05 - .byte 84*bgm_me_bachi_mvl/mxv + .byte 84*mus_obtain_badge_mvl/mxv .byte W05 - .byte 87*bgm_me_bachi_mvl/mxv + .byte 87*mus_obtain_badge_mvl/mxv .byte W04 - .byte 90*bgm_me_bachi_mvl/mxv + .byte 90*mus_obtain_badge_mvl/mxv .byte MOD , 0 .byte N09 .byte W48 @@ -205,11 +205,11 @@ bgm_me_bachi_2: @********************** Track 3 **********************@ -bgm_me_bachi_3: - .byte KEYSH , bgm_me_bachi_key+0 +mus_obtain_badge_3: + .byte KEYSH , mus_obtain_badge_key+0 .byte W12 .byte VOICE , 88 - .byte VOL , 90*bgm_me_bachi_mvl/mxv + .byte VOL , 90*mus_obtain_badge_mvl/mxv .byte N09 , As1 , v080 .byte W18 .byte N03 @@ -248,11 +248,11 @@ bgm_me_bachi_3: @********************** Track 4 **********************@ -bgm_me_bachi_4: - .byte KEYSH , bgm_me_bachi_key+0 +mus_obtain_badge_4: + .byte KEYSH , mus_obtain_badge_key+0 .byte W12 .byte VOICE , 47 - .byte VOL , 90*bgm_me_bachi_mvl/mxv + .byte VOL , 90*mus_obtain_badge_mvl/mxv .byte PAN , c_v-13 .byte N06 , As1 , v127 .byte W36 @@ -298,13 +298,13 @@ bgm_me_bachi_4: @********************** Track 5 **********************@ -bgm_me_bachi_5: - .byte KEYSH , bgm_me_bachi_key+0 +mus_obtain_badge_5: + .byte KEYSH , mus_obtain_badge_key+0 .byte W12 .byte VOICE , 83 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 90*bgm_me_bachi_mvl/mxv + .byte VOL , 90*mus_obtain_badge_mvl/mxv .byte PAN , c_v-48 .byte BEND , c_v+0 .byte N09 , Dn4 , v060 @@ -380,29 +380,29 @@ bgm_me_bachi_5: .byte BEND , c_v+0 .byte N48 , Fs4 , v060 .byte W05 - .byte VOL , 76*bgm_me_bachi_mvl/mxv + .byte VOL , 76*mus_obtain_badge_mvl/mxv .byte W04 - .byte 65*bgm_me_bachi_mvl/mxv + .byte 65*mus_obtain_badge_mvl/mxv .byte W05 - .byte 68*bgm_me_bachi_mvl/mxv + .byte 68*mus_obtain_badge_mvl/mxv .byte W01 .byte MOD , 6 .byte W04 - .byte VOL , 71*bgm_me_bachi_mvl/mxv + .byte VOL , 71*mus_obtain_badge_mvl/mxv .byte W05 - .byte 75*bgm_me_bachi_mvl/mxv + .byte 75*mus_obtain_badge_mvl/mxv .byte W05 - .byte 77*bgm_me_bachi_mvl/mxv + .byte 77*mus_obtain_badge_mvl/mxv .byte W04 .byte MOD , 8 .byte W01 - .byte VOL , 80*bgm_me_bachi_mvl/mxv + .byte VOL , 80*mus_obtain_badge_mvl/mxv .byte W05 - .byte 84*bgm_me_bachi_mvl/mxv + .byte 84*mus_obtain_badge_mvl/mxv .byte W05 - .byte 87*bgm_me_bachi_mvl/mxv + .byte 87*mus_obtain_badge_mvl/mxv .byte W04 - .byte 90*bgm_me_bachi_mvl/mxv + .byte 90*mus_obtain_badge_mvl/mxv .byte MOD , 0 .byte N09 .byte W48 @@ -410,11 +410,11 @@ bgm_me_bachi_5: @********************** Track 6 **********************@ -bgm_me_bachi_6: - .byte KEYSH , bgm_me_bachi_key+0 +mus_obtain_badge_6: + .byte KEYSH , mus_obtain_badge_key+0 .byte W12 .byte VOICE , 56 - .byte VOL , 90*bgm_me_bachi_mvl/mxv + .byte VOL , 90*mus_obtain_badge_mvl/mxv .byte PAN , c_v+0 .byte W68 .byte W01 @@ -435,11 +435,11 @@ bgm_me_bachi_6: @********************** Track 7 **********************@ -bgm_me_bachi_7: - .byte KEYSH , bgm_me_bachi_key+0 +mus_obtain_badge_7: + .byte KEYSH , mus_obtain_badge_key+0 .byte W12 .byte VOICE , 0 - .byte VOL , 90*bgm_me_bachi_mvl/mxv + .byte VOL , 90*mus_obtain_badge_mvl/mxv .byte N06 , En1 , v096 .byte N24 , Bn2 , v100 .byte W18 @@ -525,20 +525,20 @@ bgm_me_bachi_7: @******************************************************@ .align 2 -bgm_me_bachi: +mus_obtain_badge: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_bachi_pri @ Priority - .byte bgm_me_bachi_rev @ Reverb. + .byte mus_obtain_badge_pri @ Priority + .byte mus_obtain_badge_rev @ Reverb. - .word bgm_me_bachi_grp + .word mus_obtain_badge_grp - .word bgm_me_bachi_1 - .word bgm_me_bachi_2 - .word bgm_me_bachi_3 - .word bgm_me_bachi_4 - .word bgm_me_bachi_5 - .word bgm_me_bachi_6 - .word bgm_me_bachi_7 + .word mus_obtain_badge_1 + .word mus_obtain_badge_2 + .word mus_obtain_badge_3 + .word mus_obtain_badge_4 + .word mus_obtain_badge_5 + .word mus_obtain_badge_6 + .word mus_obtain_badge_7 .end diff --git a/sound/songs/bgm_me_kinomi.s b/sound/songs/mus_obtain_berry.s index 4a23339dc..6f71f456c 100644 --- a/sound/songs/bgm_me_kinomi.s +++ b/sound/songs/mus_obtain_berry.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_me_kinomi_grp, voicegroup009 - .equ bgm_me_kinomi_pri, 5 - .equ bgm_me_kinomi_rev, reverb_set+50 - .equ bgm_me_kinomi_mvl, 127 - .equ bgm_me_kinomi_key, 0 - .equ bgm_me_kinomi_tbs, 1 - .equ bgm_me_kinomi_exg, 0 - .equ bgm_me_kinomi_cmp, 1 + .equ mus_obtain_berry_grp, voicegroup009 + .equ mus_obtain_berry_pri, 5 + .equ mus_obtain_berry_rev, reverb_set+50 + .equ mus_obtain_berry_mvl, 127 + .equ mus_obtain_berry_key, 0 + .equ mus_obtain_berry_tbs, 1 + .equ mus_obtain_berry_exg, 0 + .equ mus_obtain_berry_cmp, 1 .section .rodata - .global bgm_me_kinomi + .global mus_obtain_berry .align 2 @********************** Track 1 **********************@ -bgm_me_kinomi_1: - .byte KEYSH , bgm_me_kinomi_key+0 +mus_obtain_berry_1: + .byte KEYSH , mus_obtain_berry_key+0 .byte W12 - .byte TEMPO , 140*bgm_me_kinomi_tbs/2 + .byte TEMPO , 140*mus_obtain_berry_tbs/2 .byte VOICE , 13 .byte PAN , c_v-10 - .byte VOL , 90*bgm_me_kinomi_mvl/mxv + .byte VOL , 90*mus_obtain_berry_mvl/mxv .byte N04 , Fn4 , v092 .byte W04 .byte Fn4 , v080 @@ -52,12 +52,12 @@ bgm_me_kinomi_1: @********************** Track 2 **********************@ -bgm_me_kinomi_2: - .byte KEYSH , bgm_me_kinomi_key+0 +mus_obtain_berry_2: + .byte KEYSH , mus_obtain_berry_key+0 .byte W12 .byte VOICE , 13 .byte PAN , c_v+31 - .byte VOL , 90*bgm_me_kinomi_mvl/mxv + .byte VOL , 90*mus_obtain_berry_mvl/mxv .byte W24 .byte N04 , Gn4 , v092 .byte W08 @@ -71,11 +71,11 @@ bgm_me_kinomi_2: @********************** Track 3 **********************@ -bgm_me_kinomi_3: - .byte KEYSH , bgm_me_kinomi_key+0 +mus_obtain_berry_3: + .byte KEYSH , mus_obtain_berry_key+0 .byte W12 .byte VOICE , 1 - .byte VOL , 90*bgm_me_kinomi_mvl/mxv + .byte VOL , 90*mus_obtain_berry_mvl/mxv .byte PAN , c_v-32 .byte N24 , Fn3 , v080 .byte W24 @@ -91,11 +91,11 @@ bgm_me_kinomi_3: @********************** Track 4 **********************@ -bgm_me_kinomi_4: - .byte KEYSH , bgm_me_kinomi_key+0 +mus_obtain_berry_4: + .byte KEYSH , mus_obtain_berry_key+0 .byte W12 .byte VOICE , 1 - .byte VOL , 90*bgm_me_kinomi_mvl/mxv + .byte VOL , 90*mus_obtain_berry_mvl/mxv .byte PAN , c_v+0 .byte N24 , An2 , v080 .byte W24 @@ -111,11 +111,11 @@ bgm_me_kinomi_4: @********************** Track 5 **********************@ -bgm_me_kinomi_5: - .byte KEYSH , bgm_me_kinomi_key+0 +mus_obtain_berry_5: + .byte KEYSH , mus_obtain_berry_key+0 .byte W12 .byte VOICE , 100 - .byte VOL , 90*bgm_me_kinomi_mvl/mxv + .byte VOL , 90*mus_obtain_berry_mvl/mxv .byte PAN , c_v+0 .byte N04 , Cn5 , v060 .byte W08 @@ -150,18 +150,18 @@ bgm_me_kinomi_5: @******************************************************@ .align 2 -bgm_me_kinomi: +mus_obtain_berry: .byte 5 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_kinomi_pri @ Priority - .byte bgm_me_kinomi_rev @ Reverb. + .byte mus_obtain_berry_pri @ Priority + .byte mus_obtain_berry_rev @ Reverb. - .word bgm_me_kinomi_grp + .word mus_obtain_berry_grp - .word bgm_me_kinomi_1 - .word bgm_me_kinomi_2 - .word bgm_me_kinomi_3 - .word bgm_me_kinomi_4 - .word bgm_me_kinomi_5 + .word mus_obtain_berry_1 + .word mus_obtain_berry_2 + .word mus_obtain_berry_3 + .word mus_obtain_berry_4 + .word mus_obtain_berry_5 .end diff --git a/sound/songs/bgm_fanfa4.s b/sound/songs/mus_obtain_item.s index c7a329e5f..8350ec81f 100644 --- a/sound/songs/bgm_fanfa4.s +++ b/sound/songs/mus_obtain_item.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_fanfa4_grp, voicegroup009 - .equ bgm_fanfa4_pri, 5 - .equ bgm_fanfa4_rev, reverb_set+50 - .equ bgm_fanfa4_mvl, 127 - .equ bgm_fanfa4_key, 0 - .equ bgm_fanfa4_tbs, 1 - .equ bgm_fanfa4_exg, 0 - .equ bgm_fanfa4_cmp, 1 + .equ mus_obtain_item_grp, voicegroup009 + .equ mus_obtain_item_pri, 5 + .equ mus_obtain_item_rev, reverb_set+50 + .equ mus_obtain_item_mvl, 127 + .equ mus_obtain_item_key, 0 + .equ mus_obtain_item_tbs, 1 + .equ mus_obtain_item_exg, 0 + .equ mus_obtain_item_cmp, 1 .section .rodata - .global bgm_fanfa4 + .global mus_obtain_item .align 2 @********************** Track 1 **********************@ -bgm_fanfa4_1: - .byte KEYSH , bgm_fanfa4_key+0 +mus_obtain_item_1: + .byte KEYSH , mus_obtain_item_key+0 .byte W12 - .byte TEMPO , 190*bgm_fanfa4_tbs/2 + .byte TEMPO , 190*mus_obtain_item_tbs/2 .byte VOICE , 46 - .byte VOL , 90*bgm_fanfa4_mvl/mxv + .byte VOL , 90*mus_obtain_item_mvl/mxv .byte PAN , c_v-24 .byte N16 , Gs4 , v080 .byte W08 @@ -44,13 +44,13 @@ bgm_fanfa4_1: .byte W16 .byte MOD , 5 .byte W08 - .byte VOL , 82*bgm_fanfa4_mvl/mxv + .byte VOL , 82*mus_obtain_item_mvl/mxv .byte W05 - .byte 72*bgm_fanfa4_mvl/mxv + .byte 72*mus_obtain_item_mvl/mxv .byte W07 - .byte 41*bgm_fanfa4_mvl/mxv + .byte 41*mus_obtain_item_mvl/mxv .byte W05 - .byte 14*bgm_fanfa4_mvl/mxv + .byte 14*mus_obtain_item_mvl/mxv .byte W07 .byte MOD , 0 .byte W24 @@ -58,11 +58,11 @@ bgm_fanfa4_1: @********************** Track 2 **********************@ -bgm_fanfa4_2: - .byte KEYSH , bgm_fanfa4_key+0 +mus_obtain_item_2: + .byte KEYSH , mus_obtain_item_key+0 .byte W12 .byte VOICE , 46 - .byte VOL , 90*bgm_fanfa4_mvl/mxv + .byte VOL , 90*mus_obtain_item_mvl/mxv .byte PAN , c_v+0 .byte N16 , Cn5 , v104 .byte W08 @@ -86,13 +86,13 @@ bgm_fanfa4_2: .byte W16 .byte MOD , 5 .byte W08 - .byte VOL , 82*bgm_fanfa4_mvl/mxv + .byte VOL , 82*mus_obtain_item_mvl/mxv .byte W05 - .byte 72*bgm_fanfa4_mvl/mxv + .byte 72*mus_obtain_item_mvl/mxv .byte W07 - .byte 41*bgm_fanfa4_mvl/mxv + .byte 41*mus_obtain_item_mvl/mxv .byte W05 - .byte 14*bgm_fanfa4_mvl/mxv + .byte 14*mus_obtain_item_mvl/mxv .byte W07 .byte MOD , 0 .byte W24 @@ -100,11 +100,11 @@ bgm_fanfa4_2: @********************** Track 3 **********************@ -bgm_fanfa4_3: - .byte KEYSH , bgm_fanfa4_key+0 +mus_obtain_item_3: + .byte KEYSH , mus_obtain_item_key+0 .byte W12 .byte VOICE , 58 - .byte VOL , 90*bgm_fanfa4_mvl/mxv + .byte VOL , 90*mus_obtain_item_mvl/mxv .byte N16 , Gs1 , v120 .byte W24 .byte N06 @@ -121,24 +121,24 @@ bgm_fanfa4_3: .byte W16 .byte N48 , Gs1 .byte W24 - .byte VOL , 82*bgm_fanfa4_mvl/mxv + .byte VOL , 82*mus_obtain_item_mvl/mxv .byte W05 - .byte 72*bgm_fanfa4_mvl/mxv + .byte 72*mus_obtain_item_mvl/mxv .byte W07 - .byte 41*bgm_fanfa4_mvl/mxv + .byte 41*mus_obtain_item_mvl/mxv .byte W05 - .byte 14*bgm_fanfa4_mvl/mxv + .byte 14*mus_obtain_item_mvl/mxv .byte W07 .byte W24 .byte FINE @********************** Track 4 **********************@ -bgm_fanfa4_4: - .byte KEYSH , bgm_fanfa4_key+0 +mus_obtain_item_4: + .byte KEYSH , mus_obtain_item_key+0 .byte W12 .byte VOICE , 82 - .byte VOL , 90*bgm_fanfa4_mvl/mxv + .byte VOL , 90*mus_obtain_item_mvl/mxv .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v-48 @@ -164,13 +164,13 @@ bgm_fanfa4_4: .byte W16 .byte MOD , 5 .byte W08 - .byte VOL , 82*bgm_fanfa4_mvl/mxv + .byte VOL , 82*mus_obtain_item_mvl/mxv .byte W05 - .byte 72*bgm_fanfa4_mvl/mxv + .byte 72*mus_obtain_item_mvl/mxv .byte W07 - .byte 41*bgm_fanfa4_mvl/mxv + .byte 41*mus_obtain_item_mvl/mxv .byte W05 - .byte 14*bgm_fanfa4_mvl/mxv + .byte 14*mus_obtain_item_mvl/mxv .byte W07 .byte MOD , 0 .byte W24 @@ -178,11 +178,11 @@ bgm_fanfa4_4: @********************** Track 5 **********************@ -bgm_fanfa4_5: - .byte KEYSH , bgm_fanfa4_key+0 +mus_obtain_item_5: + .byte KEYSH , mus_obtain_item_key+0 .byte W12 .byte VOICE , 83 - .byte VOL , 90*bgm_fanfa4_mvl/mxv + .byte VOL , 90*mus_obtain_item_mvl/mxv .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v+48 @@ -208,13 +208,13 @@ bgm_fanfa4_5: .byte W16 .byte MOD , 5 .byte W08 - .byte VOL , 82*bgm_fanfa4_mvl/mxv + .byte VOL , 82*mus_obtain_item_mvl/mxv .byte W05 - .byte 72*bgm_fanfa4_mvl/mxv + .byte 72*mus_obtain_item_mvl/mxv .byte W07 - .byte 41*bgm_fanfa4_mvl/mxv + .byte 41*mus_obtain_item_mvl/mxv .byte W05 - .byte 14*bgm_fanfa4_mvl/mxv + .byte 14*mus_obtain_item_mvl/mxv .byte W07 .byte MOD , 0 .byte W24 @@ -222,12 +222,12 @@ bgm_fanfa4_5: @********************** Track 6 **********************@ -bgm_fanfa4_6: - .byte KEYSH , bgm_fanfa4_key+0 +mus_obtain_item_6: + .byte KEYSH , mus_obtain_item_key+0 .byte W12 .byte VOICE , 46 .byte PAN , c_v+24 - .byte VOL , 90*bgm_fanfa4_mvl/mxv + .byte VOL , 90*mus_obtain_item_mvl/mxv .byte N16 , Ds4 , v080 .byte W08 .byte MOD , 5 @@ -250,13 +250,13 @@ bgm_fanfa4_6: .byte W16 .byte MOD , 5 .byte W08 - .byte VOL , 82*bgm_fanfa4_mvl/mxv + .byte VOL , 82*mus_obtain_item_mvl/mxv .byte W05 - .byte 72*bgm_fanfa4_mvl/mxv + .byte 72*mus_obtain_item_mvl/mxv .byte W07 - .byte 41*bgm_fanfa4_mvl/mxv + .byte 41*mus_obtain_item_mvl/mxv .byte W05 - .byte 14*bgm_fanfa4_mvl/mxv + .byte 14*mus_obtain_item_mvl/mxv .byte W07 .byte MOD , 0 .byte W24 @@ -265,19 +265,19 @@ bgm_fanfa4_6: @******************************************************@ .align 2 -bgm_fanfa4: +mus_obtain_item: .byte 6 @ NumTrks .byte 0 @ NumBlks - .byte bgm_fanfa4_pri @ Priority - .byte bgm_fanfa4_rev @ Reverb. + .byte mus_obtain_item_pri @ Priority + .byte mus_obtain_item_rev @ Reverb. - .word bgm_fanfa4_grp + .word mus_obtain_item_grp - .word bgm_fanfa4_1 - .word bgm_fanfa4_2 - .word bgm_fanfa4_3 - .word bgm_fanfa4_4 - .word bgm_fanfa4_5 - .word bgm_fanfa4_6 + .word mus_obtain_item_1 + .word mus_obtain_item_2 + .word mus_obtain_item_3 + .word mus_obtain_item_4 + .word mus_obtain_item_5 + .word mus_obtain_item_6 .end diff --git a/sound/songs/bgm_me_waza.s b/sound/songs/mus_obtain_tmhm.s index 1ed3d6c0b..e98258267 100644 --- a/sound/songs/bgm_me_waza.s +++ b/sound/songs/mus_obtain_tmhm.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_me_waza_grp, voicegroup009 - .equ bgm_me_waza_pri, 5 - .equ bgm_me_waza_rev, reverb_set+50 - .equ bgm_me_waza_mvl, 127 - .equ bgm_me_waza_key, 0 - .equ bgm_me_waza_tbs, 1 - .equ bgm_me_waza_exg, 0 - .equ bgm_me_waza_cmp, 1 + .equ mus_obtain_tmhm_grp, voicegroup009 + .equ mus_obtain_tmhm_pri, 5 + .equ mus_obtain_tmhm_rev, reverb_set+50 + .equ mus_obtain_tmhm_mvl, 127 + .equ mus_obtain_tmhm_key, 0 + .equ mus_obtain_tmhm_tbs, 1 + .equ mus_obtain_tmhm_exg, 0 + .equ mus_obtain_tmhm_cmp, 1 .section .rodata - .global bgm_me_waza + .global mus_obtain_tmhm .align 2 @********************** Track 1 **********************@ -bgm_me_waza_1: - .byte KEYSH , bgm_me_waza_key+0 +mus_obtain_tmhm_1: + .byte KEYSH , mus_obtain_tmhm_key+0 .byte W12 - .byte TEMPO , 140*bgm_me_waza_tbs/2 + .byte TEMPO , 140*mus_obtain_tmhm_tbs/2 .byte VOICE , 73 .byte PAN , c_v-47 - .byte VOL , 90*bgm_me_waza_mvl/mxv + .byte VOL , 90*mus_obtain_tmhm_mvl/mxv .byte N06 , Dn4 , v096 .byte W12 .byte Gn3 @@ -50,12 +50,12 @@ bgm_me_waza_1: @********************** Track 2 **********************@ -bgm_me_waza_2: - .byte KEYSH , bgm_me_waza_key+0 +mus_obtain_tmhm_2: + .byte KEYSH , mus_obtain_tmhm_key+0 .byte W12 .byte VOICE , 73 .byte PAN , c_v+0 - .byte VOL , 90*bgm_me_waza_mvl/mxv + .byte VOL , 90*mus_obtain_tmhm_mvl/mxv .byte N06 , Gn4 , v116 .byte W12 .byte Dn4 @@ -84,11 +84,11 @@ bgm_me_waza_2: @********************** Track 3 **********************@ -bgm_me_waza_3: - .byte KEYSH , bgm_me_waza_key+0 +mus_obtain_tmhm_3: + .byte KEYSH , mus_obtain_tmhm_key+0 .byte W12 .byte VOICE , 58 - .byte VOL , 90*bgm_me_waza_mvl/mxv + .byte VOL , 90*mus_obtain_tmhm_mvl/mxv .byte N12 , Gn1 , v120 .byte W24 .byte N12 @@ -105,14 +105,14 @@ bgm_me_waza_3: @********************** Track 4 **********************@ -bgm_me_waza_4: - .byte KEYSH , bgm_me_waza_key+0 +mus_obtain_tmhm_4: + .byte KEYSH , mus_obtain_tmhm_key+0 .byte W12 .byte VOICE , 82 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v+0 - .byte VOL , 90*bgm_me_waza_mvl/mxv + .byte VOL , 90*mus_obtain_tmhm_mvl/mxv .byte N12 , Dn3 , v056 .byte W24 .byte N12 @@ -125,19 +125,19 @@ bgm_me_waza_4: .byte W24 .byte N24 .byte W03 - .byte VOL , 79*bgm_me_waza_mvl/mxv + .byte VOL , 79*mus_obtain_tmhm_mvl/mxv .byte W03 - .byte 76*bgm_me_waza_mvl/mxv + .byte 76*mus_obtain_tmhm_mvl/mxv .byte W02 - .byte 79*bgm_me_waza_mvl/mxv + .byte 79*mus_obtain_tmhm_mvl/mxv .byte W04 - .byte 80*bgm_me_waza_mvl/mxv + .byte 80*mus_obtain_tmhm_mvl/mxv .byte W02 - .byte 83*bgm_me_waza_mvl/mxv + .byte 83*mus_obtain_tmhm_mvl/mxv .byte W03 - .byte 86*bgm_me_waza_mvl/mxv + .byte 86*mus_obtain_tmhm_mvl/mxv .byte W03 - .byte 90*bgm_me_waza_mvl/mxv + .byte 90*mus_obtain_tmhm_mvl/mxv .byte W04 .byte N06 , An2 , v048 .byte W06 @@ -159,14 +159,14 @@ bgm_me_waza_4: @********************** Track 5 **********************@ -bgm_me_waza_5: - .byte KEYSH , bgm_me_waza_key+0 +mus_obtain_tmhm_5: + .byte KEYSH , mus_obtain_tmhm_key+0 .byte W12 .byte VOICE , 83 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v+48 - .byte VOL , 90*bgm_me_waza_mvl/mxv + .byte VOL , 90*mus_obtain_tmhm_mvl/mxv .byte N12 , Bn2 , v048 .byte W24 .byte N12 @@ -179,19 +179,19 @@ bgm_me_waza_5: .byte W24 .byte N24 .byte W03 - .byte VOL , 79*bgm_me_waza_mvl/mxv + .byte VOL , 79*mus_obtain_tmhm_mvl/mxv .byte W03 - .byte 76*bgm_me_waza_mvl/mxv + .byte 76*mus_obtain_tmhm_mvl/mxv .byte W02 - .byte 79*bgm_me_waza_mvl/mxv + .byte 79*mus_obtain_tmhm_mvl/mxv .byte W04 - .byte 80*bgm_me_waza_mvl/mxv + .byte 80*mus_obtain_tmhm_mvl/mxv .byte W02 - .byte 83*bgm_me_waza_mvl/mxv + .byte 83*mus_obtain_tmhm_mvl/mxv .byte W03 - .byte 86*bgm_me_waza_mvl/mxv + .byte 86*mus_obtain_tmhm_mvl/mxv .byte W03 - .byte 90*bgm_me_waza_mvl/mxv + .byte 90*mus_obtain_tmhm_mvl/mxv .byte W04 .byte BEND , c_v-2 .byte W02 @@ -217,11 +217,11 @@ bgm_me_waza_5: @********************** Track 6 **********************@ -bgm_me_waza_6: - .byte KEYSH , bgm_me_waza_key+0 +mus_obtain_tmhm_6: + .byte KEYSH , mus_obtain_tmhm_key+0 .byte W12 .byte VOICE , 87 - .byte VOL , 90*bgm_me_waza_mvl/mxv + .byte VOL , 90*mus_obtain_tmhm_mvl/mxv .byte PAN , c_v+48 .byte N12 , Gn2 , v048 .byte W24 @@ -241,11 +241,11 @@ bgm_me_waza_6: @********************** Track 7 **********************@ -bgm_me_waza_7: - .byte KEYSH , bgm_me_waza_key+0 +mus_obtain_tmhm_7: + .byte KEYSH , mus_obtain_tmhm_key+0 .byte W12 .byte VOICE , 0 - .byte VOL , 90*bgm_me_waza_mvl/mxv + .byte VOL , 90*mus_obtain_tmhm_mvl/mxv .byte N04 , En1 , v100 .byte W12 .byte N04 @@ -308,20 +308,20 @@ bgm_me_waza_7: @******************************************************@ .align 2 -bgm_me_waza: +mus_obtain_tmhm: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_waza_pri @ Priority - .byte bgm_me_waza_rev @ Reverb. + .byte mus_obtain_tmhm_pri @ Priority + .byte mus_obtain_tmhm_rev @ Reverb. - .word bgm_me_waza_grp + .word mus_obtain_tmhm_grp - .word bgm_me_waza_1 - .word bgm_me_waza_2 - .word bgm_me_waza_3 - .word bgm_me_waza_4 - .word bgm_me_waza_5 - .word bgm_me_waza_6 - .word bgm_me_waza_7 + .word mus_obtain_tmhm_1 + .word mus_obtain_tmhm_2 + .word mus_obtain_tmhm_3 + .word mus_obtain_tmhm_4 + .word mus_obtain_tmhm_5 + .word mus_obtain_tmhm_6 + .word mus_obtain_tmhm_7 .end diff --git a/sound/songs/bgm_fune_kan.s b/sound/songs/mus_oceanic_museum.s index 87977b0ec..0446a8ccc 100644 --- a/sound/songs/bgm_fune_kan.s +++ b/sound/songs/mus_oceanic_museum.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_fune_kan_grp, voicegroup020 - .equ bgm_fune_kan_pri, 0 - .equ bgm_fune_kan_rev, reverb_set+50 - .equ bgm_fune_kan_mvl, 127 - .equ bgm_fune_kan_key, 0 - .equ bgm_fune_kan_tbs, 1 - .equ bgm_fune_kan_exg, 0 - .equ bgm_fune_kan_cmp, 1 + .equ mus_oceanic_museum_grp, voicegroup020 + .equ mus_oceanic_museum_pri, 0 + .equ mus_oceanic_museum_rev, reverb_set+50 + .equ mus_oceanic_museum_mvl, 127 + .equ mus_oceanic_museum_key, 0 + .equ mus_oceanic_museum_tbs, 1 + .equ mus_oceanic_museum_exg, 0 + .equ mus_oceanic_museum_cmp, 1 .section .rodata - .global bgm_fune_kan + .global mus_oceanic_museum .align 2 @********************** Track 1 **********************@ -bgm_fune_kan_1: - .byte KEYSH , bgm_fune_kan_key+0 - .byte TEMPO , 120*bgm_fune_kan_tbs/2 +mus_oceanic_museum_1: + .byte KEYSH , mus_oceanic_museum_key+0 + .byte TEMPO , 120*mus_oceanic_museum_tbs/2 .byte VOICE , 0 .byte LFOS , 35 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte PAN , c_v+0 .byte N16 , Dn3 , v100 .byte W16 @@ -40,10 +40,10 @@ bgm_fune_kan_1: .byte W16 .byte Fs4 .byte W16 - .byte TEMPO , 70*bgm_fune_kan_tbs/2 + .byte TEMPO , 70*mus_oceanic_museum_tbs/2 .byte N48 , An3 .byte W32 - .byte TEMPO , 120*bgm_fune_kan_tbs/2 + .byte TEMPO , 120*mus_oceanic_museum_tbs/2 .byte W16 .byte N16 , Dn3 .byte W16 @@ -63,10 +63,10 @@ bgm_fune_kan_1: .byte W16 .byte An4 .byte W16 - .byte TEMPO , 70*bgm_fune_kan_tbs/2 + .byte TEMPO , 70*mus_oceanic_museum_tbs/2 .byte N32 , En4 .byte W32 - .byte TEMPO , 120*bgm_fune_kan_tbs/2 + .byte TEMPO , 120*mus_oceanic_museum_tbs/2 .byte N08 , Cs4 .byte W08 .byte Dn4 @@ -75,14 +75,14 @@ bgm_fune_kan_1: .byte W96 .byte W24 .byte EOT - .byte TEMPO , 90*bgm_fune_kan_tbs/2 + .byte TEMPO , 90*mus_oceanic_museum_tbs/2 .byte N24 , An3 .byte W24 .byte Dn4 .byte W24 .byte Cs4 .byte W24 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte N12 , Dn4 .byte W12 .byte An3 @@ -93,8 +93,8 @@ bgm_fune_kan_1: .byte W24 .byte Gn4 .byte W24 -bgm_fune_kan_1_B1: -bgm_fune_kan_1_000: +mus_oceanic_museum_1_B1: +mus_oceanic_museum_1_000: .byte N08 , Fs4 , v100 .byte W08 .byte Gn4 @@ -110,7 +110,7 @@ bgm_fune_kan_1_000: .byte Cs4 .byte W24 .byte PEND -bgm_fune_kan_1_001: +mus_oceanic_museum_1_001: .byte N12 , Dn4 , v100 .byte W12 .byte En4 @@ -147,9 +147,9 @@ bgm_fune_kan_1_001: .byte Gn4 .byte W24 .byte PATT - .word bgm_fune_kan_1_000 + .word mus_oceanic_museum_1_000 .byte PATT - .word bgm_fune_kan_1_001 + .word mus_oceanic_museum_1_001 .byte N24 , An4 , v100 .byte W24 .byte N12 , Gn4 @@ -170,11 +170,11 @@ bgm_fune_kan_1_001: .byte W12 .byte N09 , Fs4 , v100 .byte W04 - .byte VOL , 68*bgm_fune_kan_mvl/mxv + .byte VOL , 68*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 49*bgm_fune_kan_mvl/mxv + .byte 49*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-8 .byte N12 , Fs4 , v112 .byte W03 @@ -213,18 +213,18 @@ bgm_fune_kan_1_001: .byte W12 .byte N15 , En4 , v112 .byte W04 - .byte VOL , 68*bgm_fune_kan_mvl/mxv + .byte VOL , 68*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 49*bgm_fune_kan_mvl/mxv + .byte 49*mus_oceanic_museum_mvl/mxv .byte W01 .byte BEND , c_v-12 .byte W03 - .byte VOL , 36*bgm_fune_kan_mvl/mxv + .byte VOL , 36*mus_oceanic_museum_mvl/mxv .byte BEND , c_v+12 .byte W03 .byte c_v+0 .byte W09 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-18 .byte N12 , Dn4 .byte W04 @@ -234,11 +234,11 @@ bgm_fune_kan_1_001: .byte W12 .byte N09 , Dn4 , v112 .byte W04 - .byte VOL , 68*bgm_fune_kan_mvl/mxv + .byte VOL , 68*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 49*bgm_fune_kan_mvl/mxv + .byte 49*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-7 .byte N12 .byte W03 @@ -277,18 +277,18 @@ bgm_fune_kan_1_001: .byte W12 .byte N15 , En4 , v112 .byte W04 - .byte VOL , 68*bgm_fune_kan_mvl/mxv + .byte VOL , 68*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 49*bgm_fune_kan_mvl/mxv + .byte 49*mus_oceanic_museum_mvl/mxv .byte W01 .byte BEND , c_v-12 .byte W03 - .byte VOL , 36*bgm_fune_kan_mvl/mxv + .byte VOL , 36*mus_oceanic_museum_mvl/mxv .byte BEND , c_v+12 .byte W03 .byte c_v+0 .byte W09 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-18 .byte N12 , Bn3 .byte W04 @@ -298,11 +298,11 @@ bgm_fune_kan_1_001: .byte W12 .byte N09 , Bn3 , v112 .byte W04 - .byte VOL , 68*bgm_fune_kan_mvl/mxv + .byte VOL , 68*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 49*bgm_fune_kan_mvl/mxv + .byte 49*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-7 .byte N12 .byte W03 @@ -341,18 +341,18 @@ bgm_fune_kan_1_001: .byte W12 .byte N15 , An3 , v112 .byte W04 - .byte VOL , 68*bgm_fune_kan_mvl/mxv + .byte VOL , 68*mus_oceanic_museum_mvl/mxv .byte W04 - .byte 49*bgm_fune_kan_mvl/mxv + .byte 49*mus_oceanic_museum_mvl/mxv .byte W01 .byte BEND , c_v-12 .byte W03 - .byte VOL , 36*bgm_fune_kan_mvl/mxv + .byte VOL , 36*mus_oceanic_museum_mvl/mxv .byte BEND , c_v+12 .byte W03 .byte c_v+0 .byte W09 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-8 .byte N12 , Bn3 .byte W04 @@ -399,22 +399,22 @@ bgm_fune_kan_1_001: .byte W18 .byte MOD , 5 .byte W06 - .byte VOL , 75*bgm_fune_kan_mvl/mxv + .byte VOL , 75*mus_oceanic_museum_mvl/mxv .byte W06 - .byte 62*bgm_fune_kan_mvl/mxv + .byte 62*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 45*bgm_fune_kan_mvl/mxv + .byte 45*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 33*bgm_fune_kan_mvl/mxv + .byte 33*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 13*bgm_fune_kan_mvl/mxv + .byte 13*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 3*bgm_fune_kan_mvl/mxv + .byte 3*mus_oceanic_museum_mvl/mxv .byte W03 .byte MOD , 0 .byte BEND , c_v+0 .byte W03 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-8 .byte N08 , Gn4 .byte W03 @@ -450,21 +450,21 @@ bgm_fune_kan_1_001: .byte W18 .byte MOD , 5 .byte W06 - .byte VOL , 75*bgm_fune_kan_mvl/mxv + .byte VOL , 75*mus_oceanic_museum_mvl/mxv .byte W06 - .byte 62*bgm_fune_kan_mvl/mxv + .byte 62*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 45*bgm_fune_kan_mvl/mxv + .byte 45*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 33*bgm_fune_kan_mvl/mxv + .byte 33*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 13*bgm_fune_kan_mvl/mxv + .byte 13*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 3*bgm_fune_kan_mvl/mxv + .byte 3*mus_oceanic_museum_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-10 .byte N44 , Bn3 .byte W03 @@ -472,21 +472,21 @@ bgm_fune_kan_1_001: .byte W15 .byte MOD , 5 .byte W06 - .byte VOL , 75*bgm_fune_kan_mvl/mxv + .byte VOL , 75*mus_oceanic_museum_mvl/mxv .byte W06 - .byte 62*bgm_fune_kan_mvl/mxv + .byte 62*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 45*bgm_fune_kan_mvl/mxv + .byte 45*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 33*bgm_fune_kan_mvl/mxv + .byte 33*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 13*bgm_fune_kan_mvl/mxv + .byte 13*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 3*bgm_fune_kan_mvl/mxv + .byte 3*mus_oceanic_museum_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte N08 .byte W08 .byte Cs4 , v096 @@ -505,14 +505,14 @@ bgm_fune_kan_1_001: .byte W03 .byte 5 .byte W06 - .byte VOL , 65*bgm_fune_kan_mvl/mxv + .byte VOL , 65*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 47*bgm_fune_kan_mvl/mxv + .byte 47*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 17*bgm_fune_kan_mvl/mxv + .byte 17*mus_oceanic_museum_mvl/mxv .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v-7 .byte N12 , En4 .byte W03 @@ -524,15 +524,15 @@ bgm_fune_kan_1_001: .byte W09 .byte MOD , 7 .byte W03 - .byte VOL , 65*bgm_fune_kan_mvl/mxv + .byte VOL , 65*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 46*bgm_fune_kan_mvl/mxv + .byte 46*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 17*bgm_fune_kan_mvl/mxv + .byte 17*mus_oceanic_museum_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte N12 , Bn3 .byte W12 .byte Cs4 @@ -572,16 +572,16 @@ bgm_fune_kan_1_001: .byte W04 .byte MOD , 5 .byte W05 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 49*bgm_fune_kan_mvl/mxv + .byte 49*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 29*bgm_fune_kan_mvl/mxv + .byte 29*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 10*bgm_fune_kan_mvl/mxv + .byte 10*mus_oceanic_museum_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte N08 .byte W08 .byte Gn4 @@ -632,18 +632,18 @@ bgm_fune_kan_1_001: .byte W16 .byte MOD , 5 .byte W05 - .byte VOL , 69*bgm_fune_kan_mvl/mxv + .byte VOL , 69*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 45*bgm_fune_kan_mvl/mxv + .byte 45*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 21*bgm_fune_kan_mvl/mxv + .byte 21*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 11*bgm_fune_kan_mvl/mxv + .byte 11*mus_oceanic_museum_mvl/mxv .byte W02 .byte MOD , 0 .byte N08 , En4 , v104 .byte W01 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte W07 .byte BEND , c_v-5 .byte N08 , Bn4 , v112 @@ -654,22 +654,22 @@ bgm_fune_kan_1_001: .byte W16 .byte MOD , 5 .byte W08 - .byte VOL , 75*bgm_fune_kan_mvl/mxv + .byte VOL , 75*mus_oceanic_museum_mvl/mxv .byte W06 - .byte 62*bgm_fune_kan_mvl/mxv + .byte 62*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 45*bgm_fune_kan_mvl/mxv + .byte 45*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 33*bgm_fune_kan_mvl/mxv + .byte 33*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 13*bgm_fune_kan_mvl/mxv + .byte 13*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 3*bgm_fune_kan_mvl/mxv + .byte 3*mus_oceanic_museum_mvl/mxv .byte W02 .byte MOD , 0 .byte W04 .byte VOICE , 0 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte N12 , Dn4 , v100 .byte W12 .byte An3 @@ -681,15 +681,15 @@ bgm_fune_kan_1_001: .byte Gn4 .byte W24 .byte GOTO - .word bgm_fune_kan_1_B1 + .word mus_oceanic_museum_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_fune_kan_2: - .byte KEYSH , bgm_fune_kan_key+0 +mus_oceanic_museum_2: + .byte KEYSH , mus_oceanic_museum_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte PAN , c_v+8 .byte N48 , An2 , v092 .byte W48 @@ -755,8 +755,8 @@ bgm_fune_kan_2: .byte W48 .byte N24 , En4 .byte W24 -bgm_fune_kan_2_B1: -bgm_fune_kan_2_000: +mus_oceanic_museum_2_B1: +mus_oceanic_museum_2_000: .byte N36 , Dn4 , v092 .byte W48 .byte N24 , Cs4 @@ -764,7 +764,7 @@ bgm_fune_kan_2_000: .byte An3 .byte W24 .byte PEND -bgm_fune_kan_2_001: +mus_oceanic_museum_2_001: .byte W24 .byte N24 , An3 , v092 .byte W24 @@ -783,9 +783,9 @@ bgm_fune_kan_2_001: .byte N24 , En4 .byte W24 .byte PATT - .word bgm_fune_kan_2_000 + .word mus_oceanic_museum_2_000 .byte PATT - .word bgm_fune_kan_2_001 + .word mus_oceanic_museum_2_001 .byte N48 , Dn4 , v092 .byte W48 .byte Cs4 @@ -914,15 +914,15 @@ bgm_fune_kan_2_001: .byte N24 , En4 .byte W24 .byte GOTO - .word bgm_fune_kan_2_B1 + .word mus_oceanic_museum_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_fune_kan_3: - .byte KEYSH , bgm_fune_kan_key+0 +mus_oceanic_museum_3: + .byte KEYSH , mus_oceanic_museum_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte PAN , c_v-8 .byte N44 , Dn2 , v104 .byte W80 @@ -1001,24 +1001,24 @@ bgm_fune_kan_3: .byte An5 , v024 .byte W08 .byte VOICE , 35 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte PAN , c_v-6 .byte N44 , Dn1 , v120 .byte W48 .byte An1 .byte W48 -bgm_fune_kan_3_B1: +mus_oceanic_museum_3_B1: .byte N44 , Bn1 , v120 .byte W48 .byte An1 .byte W48 -bgm_fune_kan_3_000: +mus_oceanic_museum_3_000: .byte N44 , Dn1 , v120 .byte W48 .byte En1 .byte W48 .byte PEND -bgm_fune_kan_3_001: +mus_oceanic_museum_3_001: .byte N44 , An1 , v120 .byte W48 .byte N21 @@ -1035,9 +1035,9 @@ bgm_fune_kan_3_001: .byte Cs1 .byte W48 .byte PATT - .word bgm_fune_kan_3_000 + .word mus_oceanic_museum_3_000 .byte PATT - .word bgm_fune_kan_3_001 + .word mus_oceanic_museum_3_001 .byte N10 , Bn1 , v120 .byte W24 .byte N10 @@ -1248,15 +1248,15 @@ bgm_fune_kan_3_001: .byte An1 .byte W48 .byte GOTO - .word bgm_fune_kan_3_B1 + .word mus_oceanic_museum_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_fune_kan_4: - .byte KEYSH , bgm_fune_kan_key+0 +mus_oceanic_museum_4: + .byte KEYSH , mus_oceanic_museum_key+0 .byte LFOS , 35 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 @@ -1314,7 +1314,7 @@ bgm_fune_kan_4: .byte Bn5 , v020 .byte W05 .byte W96 -bgm_fune_kan_4_B1: +mus_oceanic_museum_4_B1: .byte W96 .byte W96 .byte W96 @@ -1608,17 +1608,17 @@ bgm_fune_kan_4_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_fune_kan_4_B1 + .word mus_oceanic_museum_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_fune_kan_5: - .byte KEYSH , bgm_fune_kan_key+0 +mus_oceanic_museum_5: + .byte KEYSH , mus_oceanic_museum_key+0 .byte LFOS , 35 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1626,14 +1626,14 @@ bgm_fune_kan_5: .byte W96 .byte W96 .byte W96 -bgm_fune_kan_5_B1: +mus_oceanic_museum_5_B1: .byte W96 .byte W96 .byte W96 .byte W96 .byte W72 .byte VOICE , 85 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte PAN , c_v-49 .byte N24 , Cs3 , v032 .byte W24 @@ -1778,63 +1778,63 @@ bgm_fune_kan_5_B1: .byte W06 .byte N21 , En3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N24 , Cs3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N24 , Bn2 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W09 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N06 , Fs3 .byte W12 .byte Dn3 .byte W06 .byte N24 , En3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N24 , An3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N48 , Gn3 .byte W18 .byte MOD , 4 @@ -1871,24 +1871,24 @@ bgm_fune_kan_5_B1: .byte VOICE , 85 .byte N24 , An2 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N18 , Dn3 .byte W09 - .byte VOL , 52*bgm_fune_kan_mvl/mxv + .byte VOL , 52*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 36*bgm_fune_kan_mvl/mxv + .byte 36*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 15*bgm_fune_kan_mvl/mxv + .byte 15*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N06 , Dn4 .byte W06 .byte N12 , En4 @@ -1899,15 +1899,15 @@ bgm_fune_kan_5_B1: .byte W12 .byte N17 , Fs3 .byte W09 - .byte VOL , 52*bgm_fune_kan_mvl/mxv + .byte VOL , 52*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 36*bgm_fune_kan_mvl/mxv + .byte 36*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 15*bgm_fune_kan_mvl/mxv + .byte 15*mus_oceanic_museum_mvl/mxv .byte W01 .byte N08 , Dn3 .byte W02 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte W06 .byte N08 , An2 .byte W08 @@ -1917,52 +1917,52 @@ bgm_fune_kan_5_B1: .byte W08 .byte N24 , As3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N24 , Cs4 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N12 , Dn4 .byte W12 .byte En4 .byte W12 .byte N21 , Fs4 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N21 , Gn4 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N12 , Fs4 .byte W12 .byte En4 @@ -1974,34 +1974,34 @@ bgm_fune_kan_5_B1: .byte 0 .byte N48 , Cs4 .byte W06 - .byte VOL , 69*bgm_fune_kan_mvl/mxv + .byte VOL , 69*mus_oceanic_museum_mvl/mxv .byte W09 - .byte 61*bgm_fune_kan_mvl/mxv + .byte 61*mus_oceanic_museum_mvl/mxv .byte W03 .byte MOD , 4 .byte W06 - .byte VOL , 54*bgm_fune_kan_mvl/mxv + .byte VOL , 54*mus_oceanic_museum_mvl/mxv .byte W06 - .byte 44*bgm_fune_kan_mvl/mxv + .byte 44*mus_oceanic_museum_mvl/mxv .byte W06 - .byte 32*bgm_fune_kan_mvl/mxv + .byte 32*mus_oceanic_museum_mvl/mxv .byte W06 - .byte 20*bgm_fune_kan_mvl/mxv + .byte 20*mus_oceanic_museum_mvl/mxv .byte W06 .byte MOD , 0 .byte W96 .byte GOTO - .word bgm_fune_kan_5_B1 + .word mus_oceanic_museum_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_fune_kan_6: - .byte KEYSH , bgm_fune_kan_key+0 +mus_oceanic_museum_6: + .byte KEYSH , mus_oceanic_museum_key+0 .byte LFOS , 35 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 @@ -2010,14 +2010,14 @@ bgm_fune_kan_6: .byte W96 .byte W96 .byte W96 -bgm_fune_kan_6_B1: +mus_oceanic_museum_6_B1: .byte W96 .byte W96 .byte W96 .byte W96 .byte W72 .byte VOICE , 86 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte PAN , c_v+48 .byte N24 , An2 , v032 .byte W24 @@ -2224,64 +2224,64 @@ bgm_fune_kan_6_B1: .byte W06 .byte N21 , Cs3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N24 , An2 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N24 , Fs2 , v052 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W09 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N06 , Dn3 , v048 .byte W12 .byte Bn2 .byte W06 .byte N24 , Cs3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N24 , En3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 .byte VOICE , 86 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte N12 , Dn3 , v052 .byte W12 .byte VOICE , 88 @@ -2336,24 +2336,24 @@ bgm_fune_kan_6_B1: .byte VOICE , 86 .byte N24 , Fs2 , v052 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N18 , An2 .byte W09 - .byte VOL , 52*bgm_fune_kan_mvl/mxv + .byte VOL , 52*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 36*bgm_fune_kan_mvl/mxv + .byte 36*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 15*bgm_fune_kan_mvl/mxv + .byte 15*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N06 , An3 .byte W06 .byte N12 , As3 @@ -2364,15 +2364,15 @@ bgm_fune_kan_6_B1: .byte W12 .byte N17 , Dn3 .byte W09 - .byte VOL , 52*bgm_fune_kan_mvl/mxv + .byte VOL , 52*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 36*bgm_fune_kan_mvl/mxv + .byte 36*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 15*bgm_fune_kan_mvl/mxv + .byte 15*mus_oceanic_museum_mvl/mxv .byte W01 .byte N08 , An2 .byte W02 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte W06 .byte N08 , Fs2 .byte W08 @@ -2382,52 +2382,52 @@ bgm_fune_kan_6_B1: .byte W08 .byte N24 , Fs3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N24 , As3 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N12 , Bn3 .byte W12 .byte Cs4 .byte W12 .byte N21 , Dn4 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N21 , En4 .byte W12 - .byte VOL , 71*bgm_fune_kan_mvl/mxv + .byte VOL , 71*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 54*bgm_fune_kan_mvl/mxv + .byte 54*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 30*bgm_fune_kan_mvl/mxv + .byte 30*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 8*bgm_fune_kan_mvl/mxv + .byte 8*mus_oceanic_museum_mvl/mxv .byte W03 - .byte 80*bgm_fune_kan_mvl/mxv + .byte 80*mus_oceanic_museum_mvl/mxv .byte N12 , Dn4 .byte W12 .byte Cs4 @@ -2448,37 +2448,37 @@ bgm_fune_kan_6_B1: .byte MOD , 0 .byte N12 .byte W06 - .byte VOL , 69*bgm_fune_kan_mvl/mxv + .byte VOL , 69*mus_oceanic_museum_mvl/mxv .byte W06 .byte VOICE , 88 .byte N12 .byte W03 - .byte VOL , 61*bgm_fune_kan_mvl/mxv + .byte VOL , 61*mus_oceanic_museum_mvl/mxv .byte W03 .byte MOD , 4 .byte W06 - .byte VOL , 54*bgm_fune_kan_mvl/mxv + .byte VOL , 54*mus_oceanic_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 44*bgm_fune_kan_mvl/mxv + .byte VOL , 44*mus_oceanic_museum_mvl/mxv .byte W06 - .byte 32*bgm_fune_kan_mvl/mxv + .byte 32*mus_oceanic_museum_mvl/mxv .byte N12 .byte W06 - .byte VOL , 20*bgm_fune_kan_mvl/mxv + .byte VOL , 20*mus_oceanic_museum_mvl/mxv .byte W06 .byte MOD , 0 .byte W96 .byte GOTO - .word bgm_fune_kan_6_B1 + .word mus_oceanic_museum_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_fune_kan_7: - .byte KEYSH , bgm_fune_kan_key+0 +mus_oceanic_museum_7: + .byte KEYSH , mus_oceanic_museum_key+0 .byte VOICE , 1 - .byte VOL , 80*bgm_fune_kan_mvl/mxv + .byte VOL , 80*mus_oceanic_museum_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -2486,7 +2486,7 @@ bgm_fune_kan_7: .byte W96 .byte W96 .byte W96 -bgm_fune_kan_7_B1: +mus_oceanic_museum_7_B1: .byte W96 .byte W96 .byte W96 @@ -2498,7 +2498,7 @@ bgm_fune_kan_7_B1: .byte W96 .byte W96 .byte W96 -bgm_fune_kan_7_000: +mus_oceanic_museum_7_000: .byte W24 .byte N06 , Fs2 , v064 .byte W06 @@ -2518,7 +2518,7 @@ bgm_fune_kan_7_000: .byte W06 .byte PEND .byte PATT - .word bgm_fune_kan_7_000 + .word mus_oceanic_museum_7_000 .byte N06 , Fs2 , v064 .byte W06 .byte Fs2 , v044 @@ -2739,26 +2739,26 @@ bgm_fune_kan_7_000: .byte W24 .byte W96 .byte GOTO - .word bgm_fune_kan_7_B1 + .word mus_oceanic_museum_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_fune_kan: +mus_oceanic_museum: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_fune_kan_pri @ Priority - .byte bgm_fune_kan_rev @ Reverb. + .byte mus_oceanic_museum_pri @ Priority + .byte mus_oceanic_museum_rev @ Reverb. - .word bgm_fune_kan_grp + .word mus_oceanic_museum_grp - .word bgm_fune_kan_1 - .word bgm_fune_kan_2 - .word bgm_fune_kan_3 - .word bgm_fune_kan_4 - .word bgm_fune_kan_5 - .word bgm_fune_kan_6 - .word bgm_fune_kan_7 + .word mus_oceanic_museum_1 + .word mus_oceanic_museum_2 + .word mus_oceanic_museum_3 + .word mus_oceanic_museum_4 + .word mus_oceanic_museum_5 + .word mus_oceanic_museum_6 + .word mus_oceanic_museum_7 .end diff --git a/sound/songs/bgm_machi_s4.s b/sound/songs/mus_oldale.s index 258c4220b..ac4b05481 100644 --- a/sound/songs/bgm_machi_s4.s +++ b/sound/songs/mus_oldale.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_machi_s4_grp, voicegroup016 - .equ bgm_machi_s4_pri, 0 - .equ bgm_machi_s4_rev, reverb_set+50 - .equ bgm_machi_s4_mvl, 127 - .equ bgm_machi_s4_key, 0 - .equ bgm_machi_s4_tbs, 1 - .equ bgm_machi_s4_exg, 1 - .equ bgm_machi_s4_cmp, 1 + .equ mus_oldale_grp, voicegroup016 + .equ mus_oldale_pri, 0 + .equ mus_oldale_rev, reverb_set+50 + .equ mus_oldale_mvl, 127 + .equ mus_oldale_key, 0 + .equ mus_oldale_tbs, 1 + .equ mus_oldale_exg, 1 + .equ mus_oldale_cmp, 1 .section .rodata - .global bgm_machi_s4 + .global mus_oldale .align 2 @********************** Track 1 **********************@ -bgm_machi_s4_1: - .byte KEYSH , bgm_machi_s4_key+0 -bgm_machi_s4_1_B1: - .byte TEMPO , 100*bgm_machi_s4_tbs/2 +mus_oldale_1: + .byte KEYSH , mus_oldale_key+0 +mus_oldale_1_B1: + .byte TEMPO , 100*mus_oldale_tbs/2 .byte VOICE , 73 .byte LFOS , 44 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte PAN , c_v+0 .byte N36 , As4 , v108 .byte W15 @@ -42,15 +42,15 @@ bgm_machi_s4_1_B1: .byte W15 .byte MOD , 6 .byte W03 - .byte VOL , 76*bgm_machi_s4_mvl/mxv + .byte VOL , 76*mus_oldale_mvl/mxv .byte W06 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W05 - .byte 42*bgm_machi_s4_mvl/mxv + .byte 42*mus_oldale_mvl/mxv .byte W04 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte N06 , Gn3 .byte W06 .byte An3 @@ -65,33 +65,33 @@ bgm_machi_s4_1_B1: .byte W12 .byte N96 , Cn4 .byte W24 - .byte VOL , 77*bgm_machi_s4_mvl/mxv + .byte VOL , 77*mus_oldale_mvl/mxv .byte MOD , 6 .byte W05 - .byte VOL , 69*bgm_machi_s4_mvl/mxv + .byte VOL , 69*mus_oldale_mvl/mxv .byte W07 - .byte 65*bgm_machi_s4_mvl/mxv + .byte 65*mus_oldale_mvl/mxv .byte W05 - .byte 58*bgm_machi_s4_mvl/mxv + .byte 58*mus_oldale_mvl/mxv .byte W07 - .byte 53*bgm_machi_s4_mvl/mxv + .byte 53*mus_oldale_mvl/mxv .byte W05 - .byte 47*bgm_machi_s4_mvl/mxv + .byte 47*mus_oldale_mvl/mxv .byte W07 - .byte 39*bgm_machi_s4_mvl/mxv + .byte 39*mus_oldale_mvl/mxv .byte W05 - .byte 32*bgm_machi_s4_mvl/mxv + .byte 32*mus_oldale_mvl/mxv .byte W07 - .byte 26*bgm_machi_s4_mvl/mxv + .byte 26*mus_oldale_mvl/mxv .byte W05 - .byte 19*bgm_machi_s4_mvl/mxv + .byte 19*mus_oldale_mvl/mxv .byte W07 - .byte 14*bgm_machi_s4_mvl/mxv + .byte 14*mus_oldale_mvl/mxv .byte W05 - .byte 3*bgm_machi_s4_mvl/mxv + .byte 3*mus_oldale_mvl/mxv .byte W07 .byte VOICE , 45 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte MOD , 0 .byte N06 , An4 , v072 .byte W36 @@ -125,15 +125,15 @@ bgm_machi_s4_1_B1: .byte W15 .byte MOD , 6 .byte W03 - .byte VOL , 76*bgm_machi_s4_mvl/mxv + .byte VOL , 76*mus_oldale_mvl/mxv .byte W06 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W05 - .byte 42*bgm_machi_s4_mvl/mxv + .byte 42*mus_oldale_mvl/mxv .byte W04 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte N06 , Gn4 .byte W06 .byte As4 @@ -148,34 +148,34 @@ bgm_machi_s4_1_B1: .byte W12 .byte N96 , Dn5 .byte W24 - .byte VOL , 77*bgm_machi_s4_mvl/mxv + .byte VOL , 77*mus_oldale_mvl/mxv .byte MOD , 6 .byte W05 - .byte VOL , 69*bgm_machi_s4_mvl/mxv + .byte VOL , 69*mus_oldale_mvl/mxv .byte W07 - .byte 65*bgm_machi_s4_mvl/mxv + .byte 65*mus_oldale_mvl/mxv .byte W05 - .byte 58*bgm_machi_s4_mvl/mxv + .byte 58*mus_oldale_mvl/mxv .byte W07 - .byte 53*bgm_machi_s4_mvl/mxv + .byte 53*mus_oldale_mvl/mxv .byte W05 - .byte 47*bgm_machi_s4_mvl/mxv + .byte 47*mus_oldale_mvl/mxv .byte W07 - .byte 39*bgm_machi_s4_mvl/mxv + .byte 39*mus_oldale_mvl/mxv .byte W05 - .byte 32*bgm_machi_s4_mvl/mxv + .byte 32*mus_oldale_mvl/mxv .byte W07 - .byte 26*bgm_machi_s4_mvl/mxv + .byte 26*mus_oldale_mvl/mxv .byte W05 - .byte 19*bgm_machi_s4_mvl/mxv + .byte 19*mus_oldale_mvl/mxv .byte W07 - .byte 14*bgm_machi_s4_mvl/mxv + .byte 14*mus_oldale_mvl/mxv .byte W05 - .byte 3*bgm_machi_s4_mvl/mxv + .byte 3*mus_oldale_mvl/mxv .byte W07 .byte VOICE , 45 .byte MOD , 0 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte N06 , Gn4 , v072 .byte W36 .byte Ds4 @@ -227,17 +227,17 @@ bgm_machi_s4_1_B1: .byte W15 .byte MOD , 6 .byte W03 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte W06 - .byte 70*bgm_machi_s4_mvl/mxv + .byte 70*mus_oldale_mvl/mxv .byte W05 - .byte 50*bgm_machi_s4_mvl/mxv + .byte 50*mus_oldale_mvl/mxv .byte W07 - .byte 34*bgm_machi_s4_mvl/mxv + .byte 34*mus_oldale_mvl/mxv .byte W05 - .byte 17*bgm_machi_s4_mvl/mxv + .byte 17*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte MOD , 0 .byte N32 , Ds5 , v108, gtp1 .byte W12 @@ -269,15 +269,15 @@ bgm_machi_s4_1_B1: .byte W15 .byte MOD , 6 .byte W09 - .byte VOL , 74*bgm_machi_s4_mvl/mxv + .byte VOL , 74*mus_oldale_mvl/mxv .byte W05 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte W07 - .byte 51*bgm_machi_s4_mvl/mxv + .byte 51*mus_oldale_mvl/mxv .byte W05 - .byte 34*bgm_machi_s4_mvl/mxv + .byte 34*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte MOD , 0 .byte N32 , As4 , v108, gtp1 .byte W15 @@ -337,61 +337,61 @@ bgm_machi_s4_1_B1: .byte W18 .byte MOD , 6 .byte W06 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte W05 - .byte 78*bgm_machi_s4_mvl/mxv + .byte 78*mus_oldale_mvl/mxv .byte W07 - .byte 75*bgm_machi_s4_mvl/mxv + .byte 75*mus_oldale_mvl/mxv .byte W05 - .byte 70*bgm_machi_s4_mvl/mxv + .byte 70*mus_oldale_mvl/mxv .byte W07 - .byte 68*bgm_machi_s4_mvl/mxv + .byte 68*mus_oldale_mvl/mxv .byte W05 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte W07 - .byte 56*bgm_machi_s4_mvl/mxv + .byte 56*mus_oldale_mvl/mxv .byte W05 - .byte 50*bgm_machi_s4_mvl/mxv + .byte 50*mus_oldale_mvl/mxv .byte W07 - .byte 43*bgm_machi_s4_mvl/mxv + .byte 43*mus_oldale_mvl/mxv .byte W05 - .byte 36*bgm_machi_s4_mvl/mxv + .byte 36*mus_oldale_mvl/mxv .byte W07 - .byte 26*bgm_machi_s4_mvl/mxv + .byte 26*mus_oldale_mvl/mxv .byte W05 - .byte 15*bgm_machi_s4_mvl/mxv + .byte 15*mus_oldale_mvl/mxv .byte W01 .byte MOD , 0 .byte W06 .byte GOTO - .word bgm_machi_s4_1_B1 + .word mus_oldale_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_machi_s4_2: - .byte KEYSH , bgm_machi_s4_key+0 -bgm_machi_s4_2_B1: +mus_oldale_2: + .byte KEYSH , mus_oldale_key+0 +mus_oldale_2_B1: .byte VOICE , 60 .byte PAN , c_v-12 .byte W96 .byte W48 - .byte VOL , 37*bgm_machi_s4_mvl/mxv + .byte VOL , 37*mus_oldale_mvl/mxv .byte N48 , Fn2 , v076 .byte W05 - .byte VOL , 43*bgm_machi_s4_mvl/mxv + .byte VOL , 43*mus_oldale_mvl/mxv .byte W07 - .byte 49*bgm_machi_s4_mvl/mxv + .byte 49*mus_oldale_mvl/mxv .byte W05 - .byte 57*bgm_machi_s4_mvl/mxv + .byte 57*mus_oldale_mvl/mxv .byte W07 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte W05 - .byte 70*bgm_machi_s4_mvl/mxv + .byte 70*mus_oldale_mvl/mxv .byte W07 - .byte 78*bgm_machi_s4_mvl/mxv + .byte 78*mus_oldale_mvl/mxv .byte W05 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W07 .byte N36 , Fn3 .byte W36 @@ -407,48 +407,48 @@ bgm_machi_s4_2_B1: .byte W12 .byte N96 , Cn3 .byte W24 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte W05 - .byte 78*bgm_machi_s4_mvl/mxv + .byte 78*mus_oldale_mvl/mxv .byte W07 - .byte 76*bgm_machi_s4_mvl/mxv + .byte 76*mus_oldale_mvl/mxv .byte W05 - .byte 71*bgm_machi_s4_mvl/mxv + .byte 71*mus_oldale_mvl/mxv .byte W07 - .byte 68*bgm_machi_s4_mvl/mxv + .byte 68*mus_oldale_mvl/mxv .byte W05 - .byte 59*bgm_machi_s4_mvl/mxv + .byte 59*mus_oldale_mvl/mxv .byte W07 - .byte 52*bgm_machi_s4_mvl/mxv + .byte 52*mus_oldale_mvl/mxv .byte W05 - .byte 43*bgm_machi_s4_mvl/mxv + .byte 43*mus_oldale_mvl/mxv .byte W07 - .byte 32*bgm_machi_s4_mvl/mxv + .byte 32*mus_oldale_mvl/mxv .byte W05 - .byte 22*bgm_machi_s4_mvl/mxv + .byte 22*mus_oldale_mvl/mxv .byte W07 - .byte 9*bgm_machi_s4_mvl/mxv + .byte 9*mus_oldale_mvl/mxv .byte W05 - .byte 1*bgm_machi_s4_mvl/mxv + .byte 1*mus_oldale_mvl/mxv .byte W07 .byte W96 .byte W48 - .byte 37*bgm_machi_s4_mvl/mxv + .byte 37*mus_oldale_mvl/mxv .byte N48 , Cn3 , v076 .byte W05 - .byte VOL , 43*bgm_machi_s4_mvl/mxv + .byte VOL , 43*mus_oldale_mvl/mxv .byte W07 - .byte 49*bgm_machi_s4_mvl/mxv + .byte 49*mus_oldale_mvl/mxv .byte W05 - .byte 57*bgm_machi_s4_mvl/mxv + .byte 57*mus_oldale_mvl/mxv .byte W07 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte W05 - .byte 70*bgm_machi_s4_mvl/mxv + .byte 70*mus_oldale_mvl/mxv .byte W07 - .byte 78*bgm_machi_s4_mvl/mxv + .byte 78*mus_oldale_mvl/mxv .byte W05 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W07 .byte N36 , Dn3 , v084 .byte W36 @@ -464,75 +464,75 @@ bgm_machi_s4_2_B1: .byte W12 .byte N44 , Cn3 , v084, gtp1 .byte W18 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W06 - .byte 60*bgm_machi_s4_mvl/mxv + .byte 60*mus_oldale_mvl/mxv .byte W05 - .byte 38*bgm_machi_s4_mvl/mxv + .byte 38*mus_oldale_mvl/mxv .byte W07 - .byte 23*bgm_machi_s4_mvl/mxv + .byte 23*mus_oldale_mvl/mxv .byte W12 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N48 , Ds3 .byte W12 - .byte VOL , 74*bgm_machi_s4_mvl/mxv + .byte VOL , 74*mus_oldale_mvl/mxv .byte W02 - .byte 64*bgm_machi_s4_mvl/mxv + .byte 64*mus_oldale_mvl/mxv .byte W03 - .byte 53*bgm_machi_s4_mvl/mxv + .byte 53*mus_oldale_mvl/mxv .byte W03 - .byte 46*bgm_machi_s4_mvl/mxv + .byte 46*mus_oldale_mvl/mxv .byte W04 - .byte 47*bgm_machi_s4_mvl/mxv + .byte 47*mus_oldale_mvl/mxv .byte W02 - .byte 49*bgm_machi_s4_mvl/mxv + .byte 49*mus_oldale_mvl/mxv .byte W03 - .byte 53*bgm_machi_s4_mvl/mxv + .byte 53*mus_oldale_mvl/mxv .byte W03 - .byte 59*bgm_machi_s4_mvl/mxv + .byte 59*mus_oldale_mvl/mxv .byte W04 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte W02 - .byte 76*bgm_machi_s4_mvl/mxv + .byte 76*mus_oldale_mvl/mxv .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W07 .byte VOICE , 60 .byte N48 , Fn2 , v076 .byte W06 - .byte VOL , 76*bgm_machi_s4_mvl/mxv + .byte VOL , 76*mus_oldale_mvl/mxv .byte W06 - .byte 69*bgm_machi_s4_mvl/mxv + .byte 69*mus_oldale_mvl/mxv .byte W05 - .byte 60*bgm_machi_s4_mvl/mxv + .byte 60*mus_oldale_mvl/mxv .byte W07 - .byte 59*bgm_machi_s4_mvl/mxv + .byte 59*mus_oldale_mvl/mxv .byte W06 - .byte 68*bgm_machi_s4_mvl/mxv + .byte 68*mus_oldale_mvl/mxv .byte W06 - .byte 76*bgm_machi_s4_mvl/mxv + .byte 76*mus_oldale_mvl/mxv .byte W05 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W07 .byte N48 , Gn2 .byte W06 - .byte VOL , 76*bgm_machi_s4_mvl/mxv + .byte VOL , 76*mus_oldale_mvl/mxv .byte W06 - .byte 68*bgm_machi_s4_mvl/mxv + .byte 68*mus_oldale_mvl/mxv .byte W05 - .byte 64*bgm_machi_s4_mvl/mxv + .byte 64*mus_oldale_mvl/mxv .byte W13 - .byte 74*bgm_machi_s4_mvl/mxv + .byte 74*mus_oldale_mvl/mxv .byte W06 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W12 .byte N36 , An2 .byte W06 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W06 - .byte 71*bgm_machi_s4_mvl/mxv + .byte 71*mus_oldale_mvl/mxv .byte W05 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W19 .byte N12 , Gn2 .byte W12 @@ -542,28 +542,28 @@ bgm_machi_s4_2_B1: .byte W24 .byte Gn2 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W15 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 , Ds2 .byte W12 .byte N21 , Gn2 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 .byte W12 .byte Fn2 @@ -576,53 +576,53 @@ bgm_machi_s4_2_B1: .byte W12 .byte N44 , Cn3 , v076, gtp1 .byte W12 - .byte VOL , 76*bgm_machi_s4_mvl/mxv + .byte VOL , 76*mus_oldale_mvl/mxv .byte W05 - .byte 65*bgm_machi_s4_mvl/mxv + .byte 65*mus_oldale_mvl/mxv .byte W07 - .byte 52*bgm_machi_s4_mvl/mxv + .byte 52*mus_oldale_mvl/mxv .byte W05 - .byte 39*bgm_machi_s4_mvl/mxv + .byte 39*mus_oldale_mvl/mxv .byte W07 - .byte 30*bgm_machi_s4_mvl/mxv + .byte 30*mus_oldale_mvl/mxv .byte W05 - .byte 18*bgm_machi_s4_mvl/mxv + .byte 18*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N32 , As2 , v088, gtp1 .byte W36 .byte N12 .byte W12 .byte N44 , Ds3 , v088, gtp1 .byte W18 - .byte VOL , 69*bgm_machi_s4_mvl/mxv + .byte VOL , 69*mus_oldale_mvl/mxv .byte W06 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W05 - .byte 50*bgm_machi_s4_mvl/mxv + .byte 50*mus_oldale_mvl/mxv .byte W07 - .byte 34*bgm_machi_s4_mvl/mxv + .byte 34*mus_oldale_mvl/mxv .byte W05 - .byte 18*bgm_machi_s4_mvl/mxv + .byte 18*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N32 , As2 , v088, gtp1 .byte W36 .byte N12 .byte W12 .byte N48 , Fs3 .byte W18 - .byte VOL , 69*bgm_machi_s4_mvl/mxv + .byte VOL , 69*mus_oldale_mvl/mxv .byte W06 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W05 - .byte 50*bgm_machi_s4_mvl/mxv + .byte 50*mus_oldale_mvl/mxv .byte W07 - .byte 34*bgm_machi_s4_mvl/mxv + .byte 34*mus_oldale_mvl/mxv .byte W05 - .byte 18*bgm_machi_s4_mvl/mxv + .byte 18*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N48 , Cn3 .byte W48 .byte As2 @@ -633,248 +633,248 @@ bgm_machi_s4_2_B1: .byte W12 .byte N44 , Cn3 .byte W24 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W05 - .byte 58*bgm_machi_s4_mvl/mxv + .byte 58*mus_oldale_mvl/mxv .byte W07 - .byte 37*bgm_machi_s4_mvl/mxv + .byte 37*mus_oldale_mvl/mxv .byte W05 - .byte 24*bgm_machi_s4_mvl/mxv + .byte 24*mus_oldale_mvl/mxv .byte W07 .byte GOTO - .word bgm_machi_s4_2_B1 + .word mus_oldale_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_machi_s4_3: - .byte KEYSH , bgm_machi_s4_key+0 -bgm_machi_s4_3_B1: +mus_oldale_3: + .byte KEYSH , mus_oldale_key+0 +mus_oldale_3_B1: .byte VOICE , 58 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte N24 , As1 , v127 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 , An1 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 -bgm_machi_s4_3_000: - .byte VOL , 80*bgm_machi_s4_mvl/mxv +mus_oldale_3_000: + .byte VOL , 80*mus_oldale_mvl/mxv .byte N24 , Gn1 , v127 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 , Fn1 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 .byte PEND - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 , Cn2 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W15 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 .byte W12 .byte N24 , Fn1 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 , As1 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 , An1 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 .byte PATT - .word bgm_machi_s4_3_000 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .word mus_oldale_3_000 + .byte VOL , 80*mus_oldale_mvl/mxv .byte N24 , As1 , v127 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 , Bn1 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W24 .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 , Cn2 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W15 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 .byte W12 .byte N48 , Fn1 .byte W12 - .byte VOL , 74*bgm_machi_s4_mvl/mxv + .byte VOL , 74*mus_oldale_mvl/mxv .byte W02 - .byte 64*bgm_machi_s4_mvl/mxv + .byte 64*mus_oldale_mvl/mxv .byte W03 - .byte 53*bgm_machi_s4_mvl/mxv + .byte 53*mus_oldale_mvl/mxv .byte W03 - .byte 46*bgm_machi_s4_mvl/mxv + .byte 46*mus_oldale_mvl/mxv .byte W04 - .byte 47*bgm_machi_s4_mvl/mxv + .byte 47*mus_oldale_mvl/mxv .byte W02 - .byte 49*bgm_machi_s4_mvl/mxv + .byte 49*mus_oldale_mvl/mxv .byte W03 - .byte 53*bgm_machi_s4_mvl/mxv + .byte 53*mus_oldale_mvl/mxv .byte W03 - .byte 59*bgm_machi_s4_mvl/mxv + .byte 59*mus_oldale_mvl/mxv .byte W04 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte W02 - .byte 76*bgm_machi_s4_mvl/mxv + .byte 76*mus_oldale_mvl/mxv .byte W03 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W07 .byte N24 , As1 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W15 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 , Fn1 .byte W12 .byte N44 , Gn1 , v127, gtp1 .byte W18 - .byte VOL , 69*bgm_machi_s4_mvl/mxv + .byte VOL , 69*mus_oldale_mvl/mxv .byte W06 - .byte 54*bgm_machi_s4_mvl/mxv + .byte 54*mus_oldale_mvl/mxv .byte W05 - .byte 37*bgm_machi_s4_mvl/mxv + .byte 37*mus_oldale_mvl/mxv .byte W07 - .byte 19*bgm_machi_s4_mvl/mxv + .byte 19*mus_oldale_mvl/mxv .byte W05 - .byte 7*bgm_machi_s4_mvl/mxv + .byte 7*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N24 , Fn1 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W15 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 , Cn1 .byte W12 .byte N24 , As1 @@ -883,45 +883,45 @@ bgm_machi_s4_3_000: .byte W24 .byte Cn2 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W15 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 , Gn1 .byte W12 .byte N24 , Ds2 .byte W12 - .byte VOL , 68*bgm_machi_s4_mvl/mxv + .byte VOL , 68*mus_oldale_mvl/mxv .byte W03 - .byte 45*bgm_machi_s4_mvl/mxv + .byte 45*mus_oldale_mvl/mxv .byte W03 - .byte 28*bgm_machi_s4_mvl/mxv + .byte 28*mus_oldale_mvl/mxv .byte W03 - .byte 13*bgm_machi_s4_mvl/mxv + .byte 13*mus_oldale_mvl/mxv .byte W15 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 , Gn1 .byte W12 .byte N32 , As1 , v127, gtp1 .byte W12 - .byte VOL , 71*bgm_machi_s4_mvl/mxv + .byte VOL , 71*mus_oldale_mvl/mxv .byte W02 - .byte 65*bgm_machi_s4_mvl/mxv + .byte 65*mus_oldale_mvl/mxv .byte W03 - .byte 58*bgm_machi_s4_mvl/mxv + .byte 58*mus_oldale_mvl/mxv .byte W03 - .byte 55*bgm_machi_s4_mvl/mxv + .byte 55*mus_oldale_mvl/mxv .byte W01 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W03 - .byte 66*bgm_machi_s4_mvl/mxv + .byte 66*mus_oldale_mvl/mxv .byte W02 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W10 .byte N12 , Cn2 .byte W12 @@ -937,99 +937,99 @@ bgm_machi_s4_3_000: .byte W12 .byte N44 , As1 , v127, gtp1 .byte W18 - .byte VOL , 69*bgm_machi_s4_mvl/mxv + .byte VOL , 69*mus_oldale_mvl/mxv .byte W06 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W05 - .byte 50*bgm_machi_s4_mvl/mxv + .byte 50*mus_oldale_mvl/mxv .byte W07 - .byte 34*bgm_machi_s4_mvl/mxv + .byte 34*mus_oldale_mvl/mxv .byte W05 - .byte 18*bgm_machi_s4_mvl/mxv + .byte 18*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N32 , Fs1 , v127, gtp1 .byte W36 .byte N12 .byte W12 .byte N44 , Cs1 , v127, gtp1 .byte W18 - .byte VOL , 69*bgm_machi_s4_mvl/mxv + .byte VOL , 69*mus_oldale_mvl/mxv .byte W06 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W05 - .byte 50*bgm_machi_s4_mvl/mxv + .byte 50*mus_oldale_mvl/mxv .byte W07 - .byte 34*bgm_machi_s4_mvl/mxv + .byte 34*mus_oldale_mvl/mxv .byte W05 - .byte 18*bgm_machi_s4_mvl/mxv + .byte 18*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N48 , Fn1 .byte W24 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W05 - .byte 58*bgm_machi_s4_mvl/mxv + .byte 58*mus_oldale_mvl/mxv .byte W07 - .byte 37*bgm_machi_s4_mvl/mxv + .byte 37*mus_oldale_mvl/mxv .byte W05 - .byte 24*bgm_machi_s4_mvl/mxv + .byte 24*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N48 , As1 .byte W24 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W05 - .byte 58*bgm_machi_s4_mvl/mxv + .byte 58*mus_oldale_mvl/mxv .byte W07 - .byte 37*bgm_machi_s4_mvl/mxv + .byte 37*mus_oldale_mvl/mxv .byte W05 - .byte 24*bgm_machi_s4_mvl/mxv + .byte 24*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N30 , Fn1 .byte W15 - .byte VOL , 69*bgm_machi_s4_mvl/mxv + .byte VOL , 69*mus_oldale_mvl/mxv .byte W02 - .byte 56*bgm_machi_s4_mvl/mxv + .byte 56*mus_oldale_mvl/mxv .byte W03 - .byte 36*bgm_machi_s4_mvl/mxv + .byte 36*mus_oldale_mvl/mxv .byte W04 - .byte 25*bgm_machi_s4_mvl/mxv + .byte 25*mus_oldale_mvl/mxv .byte W12 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 .byte W12 .byte N44 , An1 , v127, gtp1 .byte W24 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W05 - .byte 58*bgm_machi_s4_mvl/mxv + .byte 58*mus_oldale_mvl/mxv .byte W07 - .byte 37*bgm_machi_s4_mvl/mxv + .byte 37*mus_oldale_mvl/mxv .byte W05 - .byte 24*bgm_machi_s4_mvl/mxv + .byte 24*mus_oldale_mvl/mxv .byte W07 .byte GOTO - .word bgm_machi_s4_3_B1 + .word mus_oldale_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_machi_s4_4: - .byte KEYSH , bgm_machi_s4_key+0 -bgm_machi_s4_4_B1: +mus_oldale_4: + .byte KEYSH , mus_oldale_key+0 +mus_oldale_4_B1: .byte PAN , c_v+0 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte W24 .byte VOICE , 4 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte N06 , As3 , v048 .byte W48 .byte An3 .byte W24 -bgm_machi_s4_4_000: +mus_oldale_4_000: .byte W24 .byte N06 , Gn3 , v048 .byte W48 @@ -1052,7 +1052,7 @@ bgm_machi_s4_4_000: .byte An3 .byte W24 .byte PATT - .word bgm_machi_s4_4_000 + .word mus_oldale_4_000 .byte W24 .byte N06 , As3 , v048 .byte W48 @@ -1065,17 +1065,17 @@ bgm_machi_s4_4_000: .byte PAN , c_v-48 .byte N48 , An3 .byte W06 - .byte VOL , 74*bgm_machi_s4_mvl/mxv + .byte VOL , 74*mus_oldale_mvl/mxv .byte W06 - .byte 60*bgm_machi_s4_mvl/mxv + .byte 60*mus_oldale_mvl/mxv .byte W06 - .byte 53*bgm_machi_s4_mvl/mxv + .byte 53*mus_oldale_mvl/mxv .byte W06 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte W05 - .byte 75*bgm_machi_s4_mvl/mxv + .byte 75*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W12 .byte N06 , As3 , v044 .byte W12 @@ -1095,15 +1095,15 @@ bgm_machi_s4_4_000: .byte W12 .byte N48 , An3 .byte W24 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W06 - .byte 65*bgm_machi_s4_mvl/mxv + .byte 65*mus_oldale_mvl/mxv .byte W06 - .byte 51*bgm_machi_s4_mvl/mxv + .byte 51*mus_oldale_mvl/mxv .byte W06 - .byte 29*bgm_machi_s4_mvl/mxv + .byte 29*mus_oldale_mvl/mxv .byte W06 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N06 , Fn3 .byte W06 .byte As3 @@ -1138,15 +1138,15 @@ bgm_machi_s4_4_000: .byte W12 .byte N48 , As3 .byte W24 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W06 - .byte 65*bgm_machi_s4_mvl/mxv + .byte 65*mus_oldale_mvl/mxv .byte W06 - .byte 51*bgm_machi_s4_mvl/mxv + .byte 51*mus_oldale_mvl/mxv .byte W06 - .byte 29*bgm_machi_s4_mvl/mxv + .byte 29*mus_oldale_mvl/mxv .byte W06 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 , An3 , v048 .byte W18 .byte Gn3 , v044 @@ -1245,48 +1245,48 @@ bgm_machi_s4_4_000: .byte W12 .byte N48 , An4 .byte W06 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte W06 - .byte 71*bgm_machi_s4_mvl/mxv + .byte 71*mus_oldale_mvl/mxv .byte W05 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W07 - .byte 55*bgm_machi_s4_mvl/mxv + .byte 55*mus_oldale_mvl/mxv .byte W05 - .byte 43*bgm_machi_s4_mvl/mxv + .byte 43*mus_oldale_mvl/mxv .byte W07 - .byte 30*bgm_machi_s4_mvl/mxv + .byte 30*mus_oldale_mvl/mxv .byte W05 - .byte 15*bgm_machi_s4_mvl/mxv + .byte 15*mus_oldale_mvl/mxv .byte W07 .byte GOTO - .word bgm_machi_s4_4_B1 + .word mus_oldale_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_machi_s4_5: - .byte KEYSH , bgm_machi_s4_key+0 -bgm_machi_s4_5_B1: +mus_oldale_5: + .byte KEYSH , mus_oldale_key+0 +mus_oldale_5_B1: .byte PAN , c_v+0 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte BEND , c_v+0 .byte W24 .byte VOICE , 5 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte N06 , Fn3 , v048 .byte W48 .byte N06 .byte W24 -bgm_machi_s4_5_000: +mus_oldale_5_000: .byte W24 .byte N06 , Dn3 , v048 .byte W48 .byte Cn3 .byte W24 .byte PEND -bgm_machi_s4_5_001: +mus_oldale_5_001: .byte W24 .byte N06 , Fn3 , v048 .byte W48 @@ -1294,13 +1294,13 @@ bgm_machi_s4_5_001: .byte W24 .byte PEND .byte PATT - .word bgm_machi_s4_5_001 + .word mus_oldale_5_001 .byte PATT - .word bgm_machi_s4_5_001 + .word mus_oldale_5_001 .byte PATT - .word bgm_machi_s4_5_000 + .word mus_oldale_5_000 .byte PATT - .word bgm_machi_s4_5_001 + .word mus_oldale_5_001 .byte W24 .byte N06 , Gn3 , v048 .byte W24 @@ -1308,20 +1308,20 @@ bgm_machi_s4_5_001: .byte PAN , c_v+50 .byte N12 , Fn3 .byte W06 - .byte VOL , 74*bgm_machi_s4_mvl/mxv + .byte VOL , 74*mus_oldale_mvl/mxv .byte W06 .byte VOICE , 83 - .byte VOL , 60*bgm_machi_s4_mvl/mxv + .byte VOL , 60*mus_oldale_mvl/mxv .byte N12 .byte W06 - .byte VOL , 53*bgm_machi_s4_mvl/mxv + .byte VOL , 53*mus_oldale_mvl/mxv .byte W06 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte N12 .byte W05 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte N12 .byte W12 .byte VOICE , 82 @@ -1346,17 +1346,17 @@ bgm_machi_s4_5_001: .byte VOICE , 83 .byte N12 , Fn3 , v048 .byte W12 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte N12 .byte W06 - .byte VOL , 65*bgm_machi_s4_mvl/mxv + .byte VOL , 65*mus_oldale_mvl/mxv .byte W06 - .byte 51*bgm_machi_s4_mvl/mxv + .byte 51*mus_oldale_mvl/mxv .byte N12 .byte W06 - .byte VOL , 29*bgm_machi_s4_mvl/mxv + .byte VOL , 29*mus_oldale_mvl/mxv .byte W06 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte BEND , c_v-5 .byte W03 .byte VOICE , 82 @@ -1398,18 +1398,18 @@ bgm_machi_s4_5_001: .byte VOICE , 83 .byte N12 , Gn3 , v048 .byte W12 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte N12 .byte W06 - .byte VOL , 65*bgm_machi_s4_mvl/mxv + .byte VOL , 65*mus_oldale_mvl/mxv .byte W06 - .byte 51*bgm_machi_s4_mvl/mxv + .byte 51*mus_oldale_mvl/mxv .byte N12 .byte W06 - .byte VOL , 29*bgm_machi_s4_mvl/mxv + .byte VOL , 29*mus_oldale_mvl/mxv .byte W06 .byte VOICE , 82 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte N12 , Fn3 , v044 .byte W18 .byte Ds3 @@ -1512,35 +1512,35 @@ bgm_machi_s4_5_001: .byte W12 .byte N12 , Fn4 .byte W06 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte W06 .byte VOICE , 84 - .byte VOL , 71*bgm_machi_s4_mvl/mxv + .byte VOL , 71*mus_oldale_mvl/mxv .byte N12 .byte W05 - .byte VOL , 62*bgm_machi_s4_mvl/mxv + .byte VOL , 62*mus_oldale_mvl/mxv .byte W07 - .byte 55*bgm_machi_s4_mvl/mxv + .byte 55*mus_oldale_mvl/mxv .byte N12 .byte W05 - .byte VOL , 43*bgm_machi_s4_mvl/mxv + .byte VOL , 43*mus_oldale_mvl/mxv .byte W07 - .byte 30*bgm_machi_s4_mvl/mxv + .byte 30*mus_oldale_mvl/mxv .byte N12 .byte W05 - .byte VOL , 15*bgm_machi_s4_mvl/mxv + .byte VOL , 15*mus_oldale_mvl/mxv .byte W07 .byte GOTO - .word bgm_machi_s4_5_B1 + .word mus_oldale_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_machi_s4_6: - .byte KEYSH , bgm_machi_s4_key+0 -bgm_machi_s4_6_B1: +mus_oldale_6: + .byte KEYSH , mus_oldale_key+0 +mus_oldale_6_B1: .byte VOICE , 48 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte PAN , c_v+10 .byte N06 , As3 , v072 .byte W12 @@ -1728,32 +1728,32 @@ bgm_machi_s4_6_B1: .byte W12 .byte N44 , Fn4 , v072, gtp1 .byte W24 - .byte VOL , 74*bgm_machi_s4_mvl/mxv + .byte VOL , 74*mus_oldale_mvl/mxv .byte W05 - .byte 63*bgm_machi_s4_mvl/mxv + .byte 63*mus_oldale_mvl/mxv .byte W07 - .byte 51*bgm_machi_s4_mvl/mxv + .byte 51*mus_oldale_mvl/mxv .byte W05 - .byte 34*bgm_machi_s4_mvl/mxv + .byte 34*mus_oldale_mvl/mxv .byte W07 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W96 .byte W48 .byte N48 , As3 , v096 .byte W06 - .byte VOL , 61*bgm_machi_s4_mvl/mxv + .byte VOL , 61*mus_oldale_mvl/mxv .byte W06 - .byte 51*bgm_machi_s4_mvl/mxv + .byte 51*mus_oldale_mvl/mxv .byte W05 - .byte 56*bgm_machi_s4_mvl/mxv + .byte 56*mus_oldale_mvl/mxv .byte W07 - .byte 62*bgm_machi_s4_mvl/mxv + .byte 62*mus_oldale_mvl/mxv .byte W05 - .byte 66*bgm_machi_s4_mvl/mxv + .byte 66*mus_oldale_mvl/mxv .byte W07 - .byte 75*bgm_machi_s4_mvl/mxv + .byte 75*mus_oldale_mvl/mxv .byte W05 - .byte 80*bgm_machi_s4_mvl/mxv + .byte 80*mus_oldale_mvl/mxv .byte W07 .byte N48 , Cn4 .byte W48 @@ -1765,25 +1765,25 @@ bgm_machi_s4_6_B1: .byte W12 .byte N44 , Cn4 .byte W24 - .byte VOL , 75*bgm_machi_s4_mvl/mxv + .byte VOL , 75*mus_oldale_mvl/mxv .byte W05 - .byte 58*bgm_machi_s4_mvl/mxv + .byte 58*mus_oldale_mvl/mxv .byte W07 - .byte 37*bgm_machi_s4_mvl/mxv + .byte 37*mus_oldale_mvl/mxv .byte W05 - .byte 24*bgm_machi_s4_mvl/mxv + .byte 24*mus_oldale_mvl/mxv .byte W07 .byte GOTO - .word bgm_machi_s4_6_B1 + .word mus_oldale_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_machi_s4_7: - .byte KEYSH , bgm_machi_s4_key+0 -bgm_machi_s4_7_B1: +mus_oldale_7: + .byte KEYSH , mus_oldale_key+0 +mus_oldale_7_B1: .byte VOICE , 81 - .byte VOL , 80*bgm_machi_s4_mvl/mxv + .byte VOL , 80*mus_oldale_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W96 @@ -1833,26 +1833,26 @@ bgm_machi_s4_7_B1: .byte N36 , An3 .byte W48 .byte GOTO - .word bgm_machi_s4_7_B1 + .word mus_oldale_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_machi_s4: +mus_oldale: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_machi_s4_pri @ Priority - .byte bgm_machi_s4_rev @ Reverb. + .byte mus_oldale_pri @ Priority + .byte mus_oldale_rev @ Reverb. - .word bgm_machi_s4_grp + .word mus_oldale_grp - .word bgm_machi_s4_1 - .word bgm_machi_s4_2 - .word bgm_machi_s4_3 - .word bgm_machi_s4_4 - .word bgm_machi_s4_5 - .word bgm_machi_s4_6 - .word bgm_machi_s4_7 + .word mus_oldale_1 + .word mus_oldale_2 + .word mus_oldale_3 + .word mus_oldale_4 + .word mus_oldale_5 + .word mus_oldale_6 + .word mus_oldale_7 .end diff --git a/sound/songs/bgm_machi_s2.s b/sound/songs/mus_petalburg.s index 8aa35c18f..b08764400 100644 --- a/sound/songs/bgm_machi_s2.s +++ b/sound/songs/mus_petalburg.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_machi_s2_grp, voicegroup012 - .equ bgm_machi_s2_pri, 0 - .equ bgm_machi_s2_rev, reverb_set+50 - .equ bgm_machi_s2_mvl, 127 - .equ bgm_machi_s2_key, 0 - .equ bgm_machi_s2_tbs, 1 - .equ bgm_machi_s2_exg, 0 - .equ bgm_machi_s2_cmp, 1 + .equ mus_petalburg_grp, voicegroup012 + .equ mus_petalburg_pri, 0 + .equ mus_petalburg_rev, reverb_set+50 + .equ mus_petalburg_mvl, 127 + .equ mus_petalburg_key, 0 + .equ mus_petalburg_tbs, 1 + .equ mus_petalburg_exg, 0 + .equ mus_petalburg_cmp, 1 .section .rodata - .global bgm_machi_s2 + .global mus_petalburg .align 2 @********************** Track 1 **********************@ -bgm_machi_s2_1: - .byte KEYSH , bgm_machi_s2_key+0 - .byte TEMPO , 126*bgm_machi_s2_tbs/2 +mus_petalburg_1: + .byte KEYSH , mus_petalburg_key+0 + .byte TEMPO , 126*mus_petalburg_tbs/2 .byte VOICE , 56 .byte XCMD , xIECV , 13 .byte xIECL , 10 .byte LFOS , 40 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N12 , Ds4 , v088 @@ -35,9 +35,9 @@ bgm_machi_s2_1: .byte W18 .byte N12 , As4 .byte W12 -bgm_machi_s2_1_B1: +mus_petalburg_1_B1: .byte VOICE , 56 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte N12 , Gs4 , v088 .byte W24 .byte N06 @@ -58,17 +58,17 @@ bgm_machi_s2_1_B1: .byte W15 .byte MOD , 5 .byte W09 - .byte VOL , 70*bgm_machi_s2_mvl/mxv + .byte VOL , 70*mus_petalburg_mvl/mxv .byte W05 - .byte 55*bgm_machi_s2_mvl/mxv + .byte 55*mus_petalburg_mvl/mxv .byte W06 - .byte 30*bgm_machi_s2_mvl/mxv + .byte 30*mus_petalburg_mvl/mxv .byte W05 - .byte 6*bgm_machi_s2_mvl/mxv + .byte 6*mus_petalburg_mvl/mxv .byte W02 .byte MOD , 0 .byte W18 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte N12 , Gs4 .byte W12 .byte Cs5 @@ -95,32 +95,32 @@ bgm_machi_s2_1_B1: .byte W12 .byte MOD , 5 .byte W12 - .byte VOL , 70*bgm_machi_s2_mvl/mxv + .byte VOL , 70*mus_petalburg_mvl/mxv .byte W06 - .byte 60*bgm_machi_s2_mvl/mxv + .byte 60*mus_petalburg_mvl/mxv .byte W03 - .byte 42*bgm_machi_s2_mvl/mxv + .byte 42*mus_petalburg_mvl/mxv .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte N06 , Fn4 .byte W12 .byte N36 , Ds4 .byte W12 .byte MOD , 5 .byte W06 - .byte VOL , 70*bgm_machi_s2_mvl/mxv + .byte VOL , 70*mus_petalburg_mvl/mxv .byte W06 - .byte 59*bgm_machi_s2_mvl/mxv + .byte 59*mus_petalburg_mvl/mxv .byte W06 - .byte 50*bgm_machi_s2_mvl/mxv + .byte 50*mus_petalburg_mvl/mxv .byte W03 - .byte 34*bgm_machi_s2_mvl/mxv + .byte 34*mus_petalburg_mvl/mxv .byte W03 - .byte 11*bgm_machi_s2_mvl/mxv + .byte 11*mus_petalburg_mvl/mxv .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte N12 , Cn5 .byte W24 .byte N06 @@ -141,17 +141,17 @@ bgm_machi_s2_1_B1: .byte W15 .byte MOD , 5 .byte W09 - .byte VOL , 70*bgm_machi_s2_mvl/mxv + .byte VOL , 70*mus_petalburg_mvl/mxv .byte W05 - .byte 55*bgm_machi_s2_mvl/mxv + .byte 55*mus_petalburg_mvl/mxv .byte W06 - .byte 30*bgm_machi_s2_mvl/mxv + .byte 30*mus_petalburg_mvl/mxv .byte W05 - .byte 6*bgm_machi_s2_mvl/mxv + .byte 6*mus_petalburg_mvl/mxv .byte W02 .byte MOD , 0 .byte W18 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte N12 , Fn4 .byte W12 .byte Cn5 @@ -178,13 +178,13 @@ bgm_machi_s2_1_B1: .byte W12 .byte MOD , 4 .byte W12 - .byte VOL , 70*bgm_machi_s2_mvl/mxv + .byte VOL , 70*mus_petalburg_mvl/mxv .byte W06 - .byte 60*bgm_machi_s2_mvl/mxv + .byte 60*mus_petalburg_mvl/mxv .byte W03 - .byte 42*bgm_machi_s2_mvl/mxv + .byte 42*mus_petalburg_mvl/mxv .byte W03 - .byte 80*bgm_machi_s2_mvl/mxv + .byte 80*mus_petalburg_mvl/mxv .byte MOD , 0 .byte N06 , Cn5 .byte W12 @@ -192,19 +192,19 @@ bgm_machi_s2_1_B1: .byte W15 .byte MOD , 4 .byte W03 - .byte VOL , 71*bgm_machi_s2_mvl/mxv + .byte VOL , 71*mus_petalburg_mvl/mxv .byte W06 - .byte 59*bgm_machi_s2_mvl/mxv + .byte 59*mus_petalburg_mvl/mxv .byte W06 - .byte 48*bgm_machi_s2_mvl/mxv + .byte 48*mus_petalburg_mvl/mxv .byte W03 - .byte 42*bgm_machi_s2_mvl/mxv + .byte 42*mus_petalburg_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 31*bgm_machi_s2_mvl/mxv + .byte VOL , 31*mus_petalburg_mvl/mxv .byte W12 .byte VOICE , 1 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte PAN , c_v-7 .byte N18 , Gs3 , v092 .byte W18 @@ -308,15 +308,15 @@ bgm_machi_s2_1_B1: .byte N12 , As4 .byte W12 .byte GOTO - .word bgm_machi_s2_1_B1 + .word mus_petalburg_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_machi_s2_2: - .byte KEYSH , bgm_machi_s2_key+0 +mus_petalburg_2: + .byte KEYSH , mus_petalburg_key+0 .byte VOICE , 35 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte PAN , c_v+15 .byte BEND , c_v+0 .byte N18 , Gn1 , v127 @@ -329,8 +329,8 @@ bgm_machi_s2_2: .byte W18 .byte N12 , Gn1 .byte W12 -bgm_machi_s2_2_B1: -bgm_machi_s2_2_000: +mus_petalburg_2_B1: +mus_petalburg_2_000: .byte N12 , Gs1 , v127 .byte W24 .byte N24 , Ds1 @@ -340,7 +340,7 @@ bgm_machi_s2_2_000: .byte N24 , Ds1 .byte W24 .byte PEND -bgm_machi_s2_2_001: +mus_petalburg_2_001: .byte N24 , Fn1 , v127 .byte W24 .byte Gs1 @@ -375,9 +375,9 @@ bgm_machi_s2_2_001: .byte Gn1 .byte W12 .byte PATT - .word bgm_machi_s2_2_000 + .word mus_petalburg_2_000 .byte PATT - .word bgm_machi_s2_2_001 + .word mus_petalburg_2_001 .byte N12 , As1 , v127 .byte W24 .byte N24 , Fn1 @@ -389,17 +389,17 @@ bgm_machi_s2_2_001: .byte N92 , Ds1 .byte W72 .byte W03 - .byte VOL , 73*bgm_machi_s2_mvl/mxv + .byte VOL , 73*mus_petalburg_mvl/mxv .byte W06 - .byte 66*bgm_machi_s2_mvl/mxv + .byte 66*mus_petalburg_mvl/mxv .byte W03 - .byte 56*bgm_machi_s2_mvl/mxv + .byte 56*mus_petalburg_mvl/mxv .byte W03 - .byte 47*bgm_machi_s2_mvl/mxv + .byte 47*mus_petalburg_mvl/mxv .byte W03 - .byte 27*bgm_machi_s2_mvl/mxv + .byte 27*mus_petalburg_mvl/mxv .byte W06 - .byte 80*bgm_machi_s2_mvl/mxv + .byte 80*mus_petalburg_mvl/mxv .byte N12 , Gs1 .byte W18 .byte Cn2 @@ -434,7 +434,7 @@ bgm_machi_s2_2_001: .byte W24 .byte N12 , Gn1 .byte W12 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte N12 , Gs1 .byte W18 .byte N06 @@ -498,16 +498,16 @@ bgm_machi_s2_2_001: .byte N12 , Gn1 .byte W12 .byte GOTO - .word bgm_machi_s2_2_B1 + .word mus_petalburg_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_machi_s2_3: - .byte KEYSH , bgm_machi_s2_key+0 +mus_petalburg_3: + .byte KEYSH , mus_petalburg_key+0 .byte VOICE , 1 .byte PAN , c_v-17 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte W48 .byte N18 , Ds2 , v084 .byte W18 @@ -515,7 +515,7 @@ bgm_machi_s2_3: .byte W18 .byte N12 , Gn2 , v100 .byte W12 -bgm_machi_s2_3_B1: +mus_petalburg_3_B1: .byte N48 , Gs2 , v100 .byte W48 .byte Gn2 @@ -652,15 +652,15 @@ bgm_machi_s2_3_B1: .byte W24 .byte N48 , Gs2 , v100 .byte W24 - .byte VOL , 77*bgm_machi_s2_mvl/mxv + .byte VOL , 77*mus_petalburg_mvl/mxv .byte W05 - .byte 69*bgm_machi_s2_mvl/mxv + .byte 69*mus_petalburg_mvl/mxv .byte W07 - .byte 63*bgm_machi_s2_mvl/mxv + .byte 63*mus_petalburg_mvl/mxv .byte W05 - .byte 56*bgm_machi_s2_mvl/mxv + .byte 56*mus_petalburg_mvl/mxv .byte W07 - .byte 80*bgm_machi_s2_mvl/mxv + .byte 80*mus_petalburg_mvl/mxv .byte N18 , As2 .byte W18 .byte Gs2 @@ -668,17 +668,17 @@ bgm_machi_s2_3_B1: .byte N12 , Gn2 .byte W12 .byte GOTO - .word bgm_machi_s2_3_B1 + .word mus_petalburg_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_machi_s2_4: - .byte KEYSH , bgm_machi_s2_key+0 +mus_petalburg_4: + .byte KEYSH , mus_petalburg_key+0 .byte LFOS , 40 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 68*bgm_machi_s2_mvl/mxv + .byte VOL , 68*mus_petalburg_mvl/mxv .byte W48 .byte VOICE , 25 .byte PAN , c_v+0 @@ -701,7 +701,7 @@ bgm_machi_s2_4: .byte W06 .byte N06 , Ds3 .byte W06 -bgm_machi_s2_4_B1: +mus_petalburg_4_B1: .byte VOICE , 27 .byte N42 , Ds2 , v060 .byte W42 @@ -714,7 +714,7 @@ bgm_machi_s2_4_B1: .byte VOICE , 25 .byte N03 , Ds3 .byte W06 -bgm_machi_s2_4_000: +mus_petalburg_4_000: .byte VOICE , 27 .byte N24 , Fn2 , v060 .byte W24 @@ -769,7 +769,7 @@ bgm_machi_s2_4_000: .byte N03 , Ds3 .byte W06 .byte PATT - .word bgm_machi_s2_4_000 + .word mus_petalburg_4_000 .byte N42 , Fn2 , v060 .byte W42 .byte VOICE , 25 @@ -919,18 +919,18 @@ bgm_machi_s2_4_000: .byte N12 , Ds3 .byte W12 .byte GOTO - .word bgm_machi_s2_4_B1 + .word mus_petalburg_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_machi_s2_5: - .byte KEYSH , bgm_machi_s2_key+0 +mus_petalburg_5: + .byte KEYSH , mus_petalburg_key+0 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte W48 .byte VOICE , 24 - .byte VOL , 72*bgm_machi_s2_mvl/mxv + .byte VOL , 72*mus_petalburg_mvl/mxv .byte PAN , c_v+48 .byte BEND , c_v+0 .byte N06 , As2 , v048 @@ -951,7 +951,7 @@ bgm_machi_s2_5: .byte W06 .byte N06 , Gn3 .byte W06 -bgm_machi_s2_5_B1: +mus_petalburg_5_B1: .byte VOICE , 26 .byte N12 , Gs2 , v064 .byte W09 @@ -1340,18 +1340,18 @@ bgm_machi_s2_5_B1: .byte N12 , Gn3 .byte W12 .byte GOTO - .word bgm_machi_s2_5_B1 + .word mus_petalburg_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_machi_s2_6: - .byte KEYSH , bgm_machi_s2_key+0 +mus_petalburg_6: + .byte KEYSH , mus_petalburg_key+0 .byte LFOS , 40 .byte PAN , c_v+0 .byte W96 -bgm_machi_s2_6_B1: - .byte VOL , 80*bgm_machi_s2_mvl/mxv +mus_petalburg_6_B1: + .byte VOL , 80*mus_petalburg_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1414,17 +1414,17 @@ bgm_machi_s2_6_B1: .byte W12 .byte N36 , Gn4 .byte W18 - .byte VOL , 71*bgm_machi_s2_mvl/mxv + .byte VOL , 71*mus_petalburg_mvl/mxv .byte W06 - .byte 59*bgm_machi_s2_mvl/mxv + .byte 59*mus_petalburg_mvl/mxv .byte W06 - .byte 48*bgm_machi_s2_mvl/mxv + .byte 48*mus_petalburg_mvl/mxv .byte W03 - .byte 42*bgm_machi_s2_mvl/mxv + .byte 42*mus_petalburg_mvl/mxv .byte W03 - .byte 31*bgm_machi_s2_mvl/mxv + .byte 31*mus_petalburg_mvl/mxv .byte W12 - .byte 80*bgm_machi_s2_mvl/mxv + .byte 80*mus_petalburg_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1482,18 +1482,18 @@ bgm_machi_s2_6_B1: .byte N12 , Ds4 .byte W12 .byte GOTO - .word bgm_machi_s2_6_B1 + .word mus_petalburg_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_machi_s2_7: - .byte KEYSH , bgm_machi_s2_key+0 +mus_petalburg_7: + .byte KEYSH , mus_petalburg_key+0 .byte PAN , c_v-48 .byte W96 -bgm_machi_s2_7_B1: +mus_petalburg_7_B1: .byte VOICE , 127 - .byte VOL , 75*bgm_machi_s2_mvl/mxv + .byte VOL , 75*mus_petalburg_mvl/mxv .byte N06 , Gs4 , v040 .byte W12 .byte N06 @@ -1514,7 +1514,7 @@ bgm_machi_s2_7_B1: .byte W06 .byte N06 .byte W06 -bgm_machi_s2_7_000: +mus_petalburg_7_000: .byte N06 , Gs4 , v040 .byte W12 .byte N06 @@ -1537,16 +1537,16 @@ bgm_machi_s2_7_000: .byte W06 .byte PEND .byte PATT - .word bgm_machi_s2_7_000 + .word mus_petalburg_7_000 .byte PATT - .word bgm_machi_s2_7_000 + .word mus_petalburg_7_000 .byte PATT - .word bgm_machi_s2_7_000 + .word mus_petalburg_7_000 .byte PATT - .word bgm_machi_s2_7_000 + .word mus_petalburg_7_000 .byte PATT - .word bgm_machi_s2_7_000 -bgm_machi_s2_7_001: + .word mus_petalburg_7_000 +mus_petalburg_7_001: .byte VOICE , 126 .byte N06 , Gn4 , v052 .byte W96 @@ -1584,7 +1584,7 @@ bgm_machi_s2_7_001: .byte W06 .byte N06 .byte W06 -bgm_machi_s2_7_002: +mus_petalburg_7_002: .byte N06 , Gs4 , v040 .byte W06 .byte N06 @@ -1618,7 +1618,7 @@ bgm_machi_s2_7_002: .byte N06 .byte W06 .byte PEND -bgm_machi_s2_7_003: +mus_petalburg_7_003: .byte N06 , Gs4 , v040 .byte W06 .byte N06 @@ -1653,25 +1653,25 @@ bgm_machi_s2_7_003: .byte W06 .byte PEND .byte PATT - .word bgm_machi_s2_7_002 + .word mus_petalburg_7_002 .byte PATT - .word bgm_machi_s2_7_003 + .word mus_petalburg_7_003 .byte PATT - .word bgm_machi_s2_7_002 + .word mus_petalburg_7_002 .byte PATT - .word bgm_machi_s2_7_003 + .word mus_petalburg_7_003 .byte PATT - .word bgm_machi_s2_7_001 + .word mus_petalburg_7_001 .byte GOTO - .word bgm_machi_s2_7_B1 + .word mus_petalburg_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_machi_s2_8: - .byte KEYSH , bgm_machi_s2_key+0 +mus_petalburg_8: + .byte KEYSH , mus_petalburg_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_machi_s2_mvl/mxv + .byte VOL , 80*mus_petalburg_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cn1 , v112 .byte W24 @@ -1689,8 +1689,8 @@ bgm_machi_s2_8: .byte W06 .byte Dn1 , v116 .byte W06 -bgm_machi_s2_8_B1: -bgm_machi_s2_8_000: +mus_petalburg_8_B1: +mus_petalburg_8_000: .byte N06 , Cn1 , v112 .byte W12 .byte Dn3 , v056 @@ -1712,7 +1712,7 @@ bgm_machi_s2_8_000: .byte En3 .byte W06 .byte PEND -bgm_machi_s2_8_001: +mus_petalburg_8_001: .byte N06 , Cn1 , v112 .byte W12 .byte Dn3 , v056 @@ -1737,13 +1737,13 @@ bgm_machi_s2_8_001: .byte W06 .byte PEND .byte PATT - .word bgm_machi_s2_8_000 + .word mus_petalburg_8_000 .byte PATT - .word bgm_machi_s2_8_001 + .word mus_petalburg_8_001 .byte PATT - .word bgm_machi_s2_8_000 + .word mus_petalburg_8_000 .byte PATT - .word bgm_machi_s2_8_001 + .word mus_petalburg_8_001 .byte N06 , Cn1 , v112 .byte W12 .byte Dn3 , v056 @@ -1820,7 +1820,7 @@ bgm_machi_s2_8_001: .byte W06 .byte N06 .byte W06 -bgm_machi_s2_8_002: +mus_petalburg_8_002: .byte N06 , Cn1 , v112 .byte W12 .byte Dn3 , v056 @@ -1847,7 +1847,7 @@ bgm_machi_s2_8_002: .byte W06 .byte PEND .byte PATT - .word bgm_machi_s2_8_002 + .word mus_petalburg_8_002 .byte N06 , Cn1 , v112 .byte W12 .byte Dn3 , v056 @@ -1887,27 +1887,27 @@ bgm_machi_s2_8_002: .byte Dn1 , v116 .byte W06 .byte GOTO - .word bgm_machi_s2_8_B1 + .word mus_petalburg_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_machi_s2: +mus_petalburg: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_machi_s2_pri @ Priority - .byte bgm_machi_s2_rev @ Reverb. + .byte mus_petalburg_pri @ Priority + .byte mus_petalburg_rev @ Reverb. - .word bgm_machi_s2_grp + .word mus_petalburg_grp - .word bgm_machi_s2_1 - .word bgm_machi_s2_2 - .word bgm_machi_s2_3 - .word bgm_machi_s2_4 - .word bgm_machi_s2_5 - .word bgm_machi_s2_6 - .word bgm_machi_s2_7 - .word bgm_machi_s2_8 + .word mus_petalburg_1 + .word mus_petalburg_2 + .word mus_petalburg_3 + .word mus_petalburg_4 + .word mus_petalburg_5 + .word mus_petalburg_6 + .word mus_petalburg_7 + .word mus_petalburg_8 .end diff --git a/sound/songs/bgm_dan01.s b/sound/songs/mus_petalburg_woods.s index a7fcb1659..d38342c3e 100644 --- a/sound/songs/bgm_dan01.s +++ b/sound/songs/mus_petalburg_woods.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_dan01_grp, voicegroup015 - .equ bgm_dan01_pri, 0 - .equ bgm_dan01_rev, reverb_set+50 - .equ bgm_dan01_mvl, 127 - .equ bgm_dan01_key, 0 - .equ bgm_dan01_tbs, 1 - .equ bgm_dan01_exg, 1 - .equ bgm_dan01_cmp, 1 + .equ mus_petalburg_woods_grp, voicegroup015 + .equ mus_petalburg_woods_pri, 0 + .equ mus_petalburg_woods_rev, reverb_set+50 + .equ mus_petalburg_woods_mvl, 127 + .equ mus_petalburg_woods_key, 0 + .equ mus_petalburg_woods_tbs, 1 + .equ mus_petalburg_woods_exg, 1 + .equ mus_petalburg_woods_cmp, 1 .section .rodata - .global bgm_dan01 + .global mus_petalburg_woods .align 2 @********************** Track 1 **********************@ -bgm_dan01_1: - .byte KEYSH , bgm_dan01_key+0 - .byte TEMPO , 130*bgm_dan01_tbs/2 +mus_petalburg_woods_1: + .byte KEYSH , mus_petalburg_woods_key+0 + .byte TEMPO , 130*mus_petalburg_woods_tbs/2 .byte VOICE , 45 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte PAN , c_v-9 .byte N06 , Dn4 , v080 .byte W12 @@ -27,7 +27,7 @@ bgm_dan01_1: .byte W12 .byte Fs4 .byte W12 -bgm_dan01_1_000: +mus_petalburg_woods_1_000: .byte N06 , Dn5 , v080 .byte W60 .byte Cs5 @@ -35,8 +35,8 @@ bgm_dan01_1_000: .byte PEND .byte As4 .byte W72 -bgm_dan01_1_B1: -bgm_dan01_1_001: +mus_petalburg_woods_1_B1: +mus_petalburg_woods_1_001: .byte N06 , Dn3 , v080 .byte W12 .byte As3 @@ -48,12 +48,12 @@ bgm_dan01_1_001: .byte PEND .byte W72 .byte PATT - .word bgm_dan01_1_001 + .word mus_petalburg_woods_1_001 .byte W72 .byte PATT - .word bgm_dan01_1_001 + .word mus_petalburg_woods_1_001 .byte W72 -bgm_dan01_1_002: +mus_petalburg_woods_1_002: .byte N06 , Ds3 , v080 .byte W12 .byte Gn3 @@ -65,15 +65,15 @@ bgm_dan01_1_002: .byte PEND .byte W72 .byte PATT - .word bgm_dan01_1_002 + .word mus_petalburg_woods_1_002 .byte W72 .byte PATT - .word bgm_dan01_1_002 + .word mus_petalburg_woods_1_002 .byte W72 .byte PATT - .word bgm_dan01_1_002 + .word mus_petalburg_woods_1_002 .byte W72 -bgm_dan01_1_003: +mus_petalburg_woods_1_003: .byte N06 , Dn3 , v080 .byte W12 .byte Fs3 @@ -85,13 +85,13 @@ bgm_dan01_1_003: .byte PEND .byte W72 .byte PATT - .word bgm_dan01_1_003 + .word mus_petalburg_woods_1_003 .byte W72 .byte PATT - .word bgm_dan01_1_003 + .word mus_petalburg_woods_1_003 .byte W72 .byte PATT - .word bgm_dan01_1_003 + .word mus_petalburg_woods_1_003 .byte W72 .byte W72 .byte W72 @@ -104,22 +104,22 @@ bgm_dan01_1_003: .byte Fs4 .byte W12 .byte PATT - .word bgm_dan01_1_000 + .word mus_petalburg_woods_1_000 .byte N06 , As4 , v080 .byte W72 .byte GOTO - .word bgm_dan01_1_B1 + .word mus_petalburg_woods_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_dan01_2: - .byte KEYSH , bgm_dan01_key+0 +mus_petalburg_woods_2: + .byte KEYSH , mus_petalburg_woods_key+0 .byte W36 .byte VOICE , 1 .byte W72 -bgm_dan01_2_000: - .byte VOL , 80*bgm_dan01_mvl/mxv +mus_petalburg_woods_2_000: + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W12 .byte N06 , Dn2 , v056 .byte W12 @@ -132,7 +132,7 @@ bgm_dan01_2_000: .byte Dn2 , v096 .byte W12 .byte PEND -bgm_dan01_2_B1: +mus_petalburg_woods_2_B1: .byte N36 , Dn2 , v116 .byte W36 .byte N06 , Dn2 , v112 @@ -190,7 +190,7 @@ bgm_dan01_2_B1: .byte W72 .byte W72 .byte EOT -bgm_dan01_2_001: +mus_petalburg_woods_2_001: .byte W12 .byte N06 , Dn2 , v112 .byte W24 @@ -202,7 +202,7 @@ bgm_dan01_2_001: .byte N06 .byte W72 .byte PATT - .word bgm_dan01_2_001 + .word mus_petalburg_woods_2_001 .byte TIE , Dn1 , v124 .byte W72 .byte W72 @@ -216,80 +216,80 @@ bgm_dan01_2_001: .byte EOT .byte W72 .byte VOICE , 48 - .byte VOL , 36*bgm_dan01_mvl/mxv + .byte VOL , 36*mus_petalburg_woods_mvl/mxv .byte MOD , 9 .byte TIE , Fs1 , v096 .byte W05 - .byte VOL , 40*bgm_dan01_mvl/mxv + .byte VOL , 40*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 42*bgm_dan01_mvl/mxv + .byte 42*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 46*bgm_dan01_mvl/mxv + .byte 46*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 48*bgm_dan01_mvl/mxv + .byte 48*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 53*bgm_dan01_mvl/mxv + .byte 53*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 57*bgm_dan01_mvl/mxv + .byte 57*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 60*bgm_dan01_mvl/mxv + .byte 60*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 64*bgm_dan01_mvl/mxv + .byte 64*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 68*bgm_dan01_mvl/mxv + .byte 68*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 74*bgm_dan01_mvl/mxv + .byte 74*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 77*bgm_dan01_mvl/mxv + .byte 77*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 78*bgm_dan01_mvl/mxv + .byte 78*mus_petalburg_woods_mvl/mxv .byte W36 - .byte 80*bgm_dan01_mvl/mxv + .byte 80*mus_petalburg_woods_mvl/mxv .byte W24 - .byte 77*bgm_dan01_mvl/mxv + .byte 77*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 76*bgm_dan01_mvl/mxv + .byte 76*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 75*bgm_dan01_mvl/mxv + .byte 75*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 69*bgm_dan01_mvl/mxv + .byte 69*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 66*bgm_dan01_mvl/mxv + .byte 66*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 61*bgm_dan01_mvl/mxv + .byte 61*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 57*bgm_dan01_mvl/mxv + .byte 57*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 53*bgm_dan01_mvl/mxv + .byte 53*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 46*bgm_dan01_mvl/mxv + .byte 46*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 38*bgm_dan01_mvl/mxv + .byte 38*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 32*bgm_dan01_mvl/mxv + .byte 32*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 21*bgm_dan01_mvl/mxv + .byte 21*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 10*bgm_dan01_mvl/mxv + .byte 10*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 1*bgm_dan01_mvl/mxv + .byte 1*mus_petalburg_woods_mvl/mxv .byte W07 .byte EOT .byte VOICE , 1 .byte MOD , 0 .byte W72 .byte PATT - .word bgm_dan01_2_000 + .word mus_petalburg_woods_2_000 .byte GOTO - .word bgm_dan01_2_B1 + .word mus_petalburg_woods_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_dan01_3: - .byte KEYSH , bgm_dan01_key+0 +mus_petalburg_woods_3: + .byte KEYSH , mus_petalburg_woods_key+0 .byte VOICE , 73 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte PAN , c_v+9 .byte N06 , Dn4 , v100 .byte W12 @@ -297,22 +297,22 @@ bgm_dan01_3: .byte W12 .byte Fs4 .byte W12 -bgm_dan01_3_000: +mus_petalburg_woods_3_000: .byte N44 , Dn5 , v100, gtp1 .byte W15 .byte MOD , 8 .byte W03 - .byte VOL , 70*bgm_dan01_mvl/mxv + .byte VOL , 70*mus_petalburg_woods_mvl/mxv .byte W06 - .byte 54*bgm_dan01_mvl/mxv + .byte 54*mus_petalburg_woods_mvl/mxv .byte W06 - .byte 40*bgm_dan01_mvl/mxv + .byte 40*mus_petalburg_woods_mvl/mxv .byte W06 - .byte 27*bgm_dan01_mvl/mxv + .byte 27*mus_petalburg_woods_mvl/mxv .byte W09 .byte MOD , 0 .byte W03 - .byte VOL , 78*bgm_dan01_mvl/mxv + .byte VOL , 78*mus_petalburg_woods_mvl/mxv .byte W12 .byte N06 , Cs5 .byte W06 @@ -321,100 +321,100 @@ bgm_dan01_3_000: .byte Bn4 .byte W03 .byte PEND -bgm_dan01_3_001: +mus_petalburg_woods_3_001: .byte N68 , As4 , v100, gtp1 .byte W24 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte MOD , 8 .byte W05 - .byte VOL , 65*bgm_dan01_mvl/mxv + .byte VOL , 65*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 61*bgm_dan01_mvl/mxv + .byte 61*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 51*bgm_dan01_mvl/mxv + .byte 51*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 44*bgm_dan01_mvl/mxv + .byte 44*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 34*bgm_dan01_mvl/mxv + .byte 34*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 23*bgm_dan01_mvl/mxv + .byte 23*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 3*bgm_dan01_mvl/mxv + .byte 3*mus_petalburg_woods_mvl/mxv .byte W04 .byte MOD , 0 .byte W03 .byte PEND -bgm_dan01_3_B1: -bgm_dan01_3_002: +mus_petalburg_woods_3_B1: +mus_petalburg_woods_3_002: .byte VOICE , 48 - .byte VOL , 35*bgm_dan01_mvl/mxv + .byte VOL , 35*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 41*bgm_dan01_mvl/mxv + .byte VOL , 41*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 42*bgm_dan01_mvl/mxv + .byte VOL , 42*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 47*bgm_dan01_mvl/mxv + .byte VOL , 47*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 49*bgm_dan01_mvl/mxv + .byte VOL , 49*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 55*bgm_dan01_mvl/mxv + .byte VOL , 55*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 58*bgm_dan01_mvl/mxv + .byte VOL , 58*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 63*bgm_dan01_mvl/mxv + .byte VOL , 63*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 68*bgm_dan01_mvl/mxv + .byte VOL , 68*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 74*bgm_dan01_mvl/mxv + .byte VOL , 74*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 78*bgm_dan01_mvl/mxv + .byte VOL , 78*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 .byte PEND -bgm_dan01_3_003: +mus_petalburg_woods_3_003: .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 @@ -435,202 +435,202 @@ bgm_dan01_3_003: .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 71*bgm_dan01_mvl/mxv + .byte VOL , 71*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 69*bgm_dan01_mvl/mxv + .byte VOL , 69*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 66*bgm_dan01_mvl/mxv + .byte VOL , 66*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 64*bgm_dan01_mvl/mxv + .byte VOL , 64*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 61*bgm_dan01_mvl/mxv + .byte VOL , 61*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 59*bgm_dan01_mvl/mxv + .byte VOL , 59*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 .byte PEND -bgm_dan01_3_004: - .byte VOL , 56*bgm_dan01_mvl/mxv +mus_petalburg_woods_3_004: + .byte VOL , 56*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 54*bgm_dan01_mvl/mxv + .byte VOL , 54*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 48*bgm_dan01_mvl/mxv + .byte VOL , 48*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 45*bgm_dan01_mvl/mxv + .byte VOL , 45*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 40*bgm_dan01_mvl/mxv + .byte VOL , 40*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 38*bgm_dan01_mvl/mxv + .byte VOL , 38*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 35*bgm_dan01_mvl/mxv + .byte VOL , 35*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 32*bgm_dan01_mvl/mxv + .byte VOL , 32*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 30*bgm_dan01_mvl/mxv + .byte VOL , 30*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 26*bgm_dan01_mvl/mxv + .byte VOL , 26*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 24*bgm_dan01_mvl/mxv + .byte VOL , 24*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 20*bgm_dan01_mvl/mxv + .byte VOL , 20*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 .byte PEND -bgm_dan01_3_005: - .byte VOL , 16*bgm_dan01_mvl/mxv +mus_petalburg_woods_3_005: + .byte VOL , 16*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 12*bgm_dan01_mvl/mxv + .byte VOL , 12*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 7*bgm_dan01_mvl/mxv + .byte VOL , 7*mus_petalburg_woods_mvl/mxv .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W02 - .byte VOL , 3*bgm_dan01_mvl/mxv + .byte VOL , 3*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Dn6 , v048 .byte W03 .byte As5 , v040 .byte W03 - .byte VOL , 1*bgm_dan01_mvl/mxv + .byte VOL , 1*mus_petalburg_woods_mvl/mxv .byte W48 .byte PEND .byte W72 .byte W72 - .byte 35*bgm_dan01_mvl/mxv + .byte 35*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 41*bgm_dan01_mvl/mxv + .byte VOL , 41*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 42*bgm_dan01_mvl/mxv + .byte VOL , 42*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 47*bgm_dan01_mvl/mxv + .byte VOL , 47*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 49*bgm_dan01_mvl/mxv + .byte VOL , 49*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 55*bgm_dan01_mvl/mxv + .byte VOL , 55*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 58*bgm_dan01_mvl/mxv + .byte VOL , 58*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 63*bgm_dan01_mvl/mxv + .byte VOL , 63*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 68*bgm_dan01_mvl/mxv + .byte VOL , 68*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 74*bgm_dan01_mvl/mxv + .byte VOL , 74*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 78*bgm_dan01_mvl/mxv + .byte VOL , 78*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 @@ -656,136 +656,136 @@ bgm_dan01_3_005: .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 71*bgm_dan01_mvl/mxv + .byte VOL , 71*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 69*bgm_dan01_mvl/mxv + .byte VOL , 69*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 66*bgm_dan01_mvl/mxv + .byte VOL , 66*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 64*bgm_dan01_mvl/mxv + .byte VOL , 64*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 61*bgm_dan01_mvl/mxv + .byte VOL , 61*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 59*bgm_dan01_mvl/mxv + .byte VOL , 59*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 56*bgm_dan01_mvl/mxv + .byte VOL , 56*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 54*bgm_dan01_mvl/mxv + .byte VOL , 54*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 48*bgm_dan01_mvl/mxv + .byte VOL , 48*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 45*bgm_dan01_mvl/mxv + .byte VOL , 45*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 40*bgm_dan01_mvl/mxv + .byte VOL , 40*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 38*bgm_dan01_mvl/mxv + .byte VOL , 38*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 35*bgm_dan01_mvl/mxv + .byte VOL , 35*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 32*bgm_dan01_mvl/mxv + .byte VOL , 32*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 30*bgm_dan01_mvl/mxv + .byte VOL , 30*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 26*bgm_dan01_mvl/mxv + .byte VOL , 26*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 24*bgm_dan01_mvl/mxv + .byte VOL , 24*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 20*bgm_dan01_mvl/mxv + .byte VOL , 20*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 16*bgm_dan01_mvl/mxv + .byte VOL , 16*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 12*bgm_dan01_mvl/mxv + .byte VOL , 12*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 7*bgm_dan01_mvl/mxv + .byte VOL , 7*mus_petalburg_woods_mvl/mxv .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W02 - .byte VOL , 3*bgm_dan01_mvl/mxv + .byte VOL , 3*mus_petalburg_woods_mvl/mxv .byte W01 .byte N03 , Ds6 , v048 .byte W03 .byte Gn5 , v040 .byte W03 - .byte VOL , 1*bgm_dan01_mvl/mxv + .byte VOL , 1*mus_petalburg_woods_mvl/mxv .byte W48 .byte VOICE , 73 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte N06 , Dn6 , v056 .byte W06 .byte Ds6 @@ -825,16 +825,16 @@ bgm_dan01_3_005: .byte W72 .byte W72 .byte PATT - .word bgm_dan01_3_002 + .word mus_petalburg_woods_3_002 .byte PATT - .word bgm_dan01_3_003 + .word mus_petalburg_woods_3_003 .byte PATT - .word bgm_dan01_3_004 + .word mus_petalburg_woods_3_004 .byte PATT - .word bgm_dan01_3_005 + .word mus_petalburg_woods_3_005 .byte W36 .byte VOICE , 73 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte N06 , Dn4 , v100 .byte W12 .byte As4 @@ -842,25 +842,25 @@ bgm_dan01_3_005: .byte Fs4 .byte W12 .byte PATT - .word bgm_dan01_3_000 + .word mus_petalburg_woods_3_000 .byte PATT - .word bgm_dan01_3_001 + .word mus_petalburg_woods_3_001 .byte GOTO - .word bgm_dan01_3_B1 + .word mus_petalburg_woods_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_dan01_4: - .byte KEYSH , bgm_dan01_key+0 +mus_petalburg_woods_4: + .byte KEYSH , mus_petalburg_woods_key+0 .byte W36 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte PAN , c_v-47 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W72 .byte W72 -bgm_dan01_4_B1: +mus_petalburg_woods_4_B1: .byte VOICE , 80 .byte W72 .byte W72 @@ -870,70 +870,70 @@ bgm_dan01_4_B1: .byte 4 .byte N72 , Dn4 , v060 .byte W06 - .byte VOL , 65*bgm_dan01_mvl/mxv + .byte VOL , 65*mus_petalburg_woods_mvl/mxv .byte W06 - .byte 51*bgm_dan01_mvl/mxv + .byte 51*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 56*bgm_dan01_mvl/mxv + .byte 56*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 58*bgm_dan01_mvl/mxv + .byte 58*mus_petalburg_woods_mvl/mxv .byte MOD , 12 .byte W05 - .byte VOL , 62*bgm_dan01_mvl/mxv + .byte VOL , 62*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 65*bgm_dan01_mvl/mxv + .byte 65*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 70*bgm_dan01_mvl/mxv + .byte 70*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 76*bgm_dan01_mvl/mxv + .byte 76*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 80*bgm_dan01_mvl/mxv + .byte 80*mus_petalburg_woods_mvl/mxv .byte W19 .byte MOD , 0 .byte TIE , Ds4 , v056 .byte W40 .byte W01 - .byte VOL , 76*bgm_dan01_mvl/mxv + .byte VOL , 76*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 75*bgm_dan01_mvl/mxv + .byte 75*mus_petalburg_woods_mvl/mxv .byte MOD , 12 .byte W05 - .byte VOL , 70*bgm_dan01_mvl/mxv + .byte VOL , 70*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 69*bgm_dan01_mvl/mxv + .byte 69*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 66*bgm_dan01_mvl/mxv + .byte 66*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 61*bgm_dan01_mvl/mxv + .byte 61*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 58*bgm_dan01_mvl/mxv + .byte 58*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 54*bgm_dan01_mvl/mxv + .byte 54*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 49*bgm_dan01_mvl/mxv + .byte 49*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 47*bgm_dan01_mvl/mxv + .byte 47*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 42*bgm_dan01_mvl/mxv + .byte 42*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 37*bgm_dan01_mvl/mxv + .byte 37*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 32*bgm_dan01_mvl/mxv + .byte 32*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 26*bgm_dan01_mvl/mxv + .byte 26*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 17*bgm_dan01_mvl/mxv + .byte 17*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 8*bgm_dan01_mvl/mxv + .byte 8*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 1*bgm_dan01_mvl/mxv + .byte 1*mus_petalburg_woods_mvl/mxv .byte W07 .byte EOT .byte MOD , 0 .byte W72 .byte W72 .byte VOICE , 80 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W12 .byte N06 , Bn4 .byte W24 @@ -951,7 +951,7 @@ bgm_dan01_4_B1: .byte W12 .byte N06 .byte W72 -bgm_dan01_4_000: +mus_petalburg_woods_4_000: .byte W12 .byte N06 , As3 , v056 .byte W24 @@ -963,10 +963,10 @@ bgm_dan01_4_000: .byte N06 .byte W72 .byte PATT - .word bgm_dan01_4_000 + .word mus_petalburg_woods_4_000 .byte N06 , As3 , v056 .byte W72 -bgm_dan01_4_001: +mus_petalburg_woods_4_001: .byte W36 .byte N06 , Dn3 , v060 .byte W12 @@ -975,7 +975,7 @@ bgm_dan01_4_001: .byte Dn4 .byte W12 .byte PEND -bgm_dan01_4_002: +mus_petalburg_woods_4_002: .byte N06 , As4 , v060 .byte W12 .byte Dn4 , v040 @@ -989,9 +989,9 @@ bgm_dan01_4_002: .byte PEND .byte W72 .byte PATT - .word bgm_dan01_4_001 + .word mus_petalburg_woods_4_001 .byte PATT - .word bgm_dan01_4_002 + .word mus_petalburg_woods_4_002 .byte W72 .byte W36 .byte VOICE , 4 @@ -1014,21 +1014,21 @@ bgm_dan01_4_002: .byte W72 .byte W72 .byte GOTO - .word bgm_dan01_4_B1 + .word mus_petalburg_woods_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_dan01_5: - .byte KEYSH , bgm_dan01_key+0 +mus_petalburg_woods_5: + .byte KEYSH , mus_petalburg_woods_key+0 .byte W36 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte PAN , c_v+48 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W72 .byte W72 -bgm_dan01_5_B1: +mus_petalburg_woods_5_B1: .byte VOICE , 82 .byte W72 .byte W72 @@ -1038,29 +1038,29 @@ bgm_dan01_5_B1: .byte 5 .byte N12 , As3 , v060 .byte W06 - .byte VOL , 65*bgm_dan01_mvl/mxv + .byte VOL , 65*mus_petalburg_woods_mvl/mxv .byte W06 .byte VOICE , 6 - .byte VOL , 51*bgm_dan01_mvl/mxv + .byte VOL , 51*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 56*bgm_dan01_mvl/mxv + .byte VOL , 56*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 58*bgm_dan01_mvl/mxv + .byte 58*mus_petalburg_woods_mvl/mxv .byte MOD , 12 .byte N12 .byte W05 - .byte VOL , 62*bgm_dan01_mvl/mxv + .byte VOL , 62*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 65*bgm_dan01_mvl/mxv + .byte 65*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 70*bgm_dan01_mvl/mxv + .byte VOL , 70*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 76*bgm_dan01_mvl/mxv + .byte 76*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W07 .byte N12 .byte W12 @@ -1075,54 +1075,54 @@ bgm_dan01_5_B1: .byte W12 .byte N12 .byte W05 - .byte VOL , 76*bgm_dan01_mvl/mxv + .byte VOL , 76*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 75*bgm_dan01_mvl/mxv + .byte 75*mus_petalburg_woods_mvl/mxv .byte MOD , 12 .byte N12 .byte W05 - .byte VOL , 70*bgm_dan01_mvl/mxv + .byte VOL , 70*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 69*bgm_dan01_mvl/mxv + .byte 69*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 66*bgm_dan01_mvl/mxv + .byte VOL , 66*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 61*bgm_dan01_mvl/mxv + .byte 61*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 58*bgm_dan01_mvl/mxv + .byte VOL , 58*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 54*bgm_dan01_mvl/mxv + .byte 54*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 49*bgm_dan01_mvl/mxv + .byte VOL , 49*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 47*bgm_dan01_mvl/mxv + .byte 47*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 42*bgm_dan01_mvl/mxv + .byte VOL , 42*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 37*bgm_dan01_mvl/mxv + .byte 37*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 32*bgm_dan01_mvl/mxv + .byte VOL , 32*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 26*bgm_dan01_mvl/mxv + .byte 26*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 17*bgm_dan01_mvl/mxv + .byte VOL , 17*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 8*bgm_dan01_mvl/mxv + .byte 8*mus_petalburg_woods_mvl/mxv .byte N12 .byte W05 - .byte VOL , 1*bgm_dan01_mvl/mxv + .byte VOL , 1*mus_petalburg_woods_mvl/mxv .byte W07 .byte MOD , 0 .byte W72 .byte W72 .byte VOICE , 82 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W12 .byte N06 , Gn4 , v056 .byte W24 @@ -1140,7 +1140,7 @@ bgm_dan01_5_B1: .byte W12 .byte N06 .byte W72 -bgm_dan01_5_000: +mus_petalburg_woods_5_000: .byte W12 .byte N06 , Fs3 , v056 .byte W24 @@ -1152,10 +1152,10 @@ bgm_dan01_5_000: .byte N06 .byte W72 .byte PATT - .word bgm_dan01_5_000 + .word mus_petalburg_woods_5_000 .byte N06 , Fs3 , v056 .byte W72 -bgm_dan01_5_001: +mus_petalburg_woods_5_001: .byte W42 .byte N06 , Dn3 , v060 .byte W12 @@ -1164,7 +1164,7 @@ bgm_dan01_5_001: .byte Dn4 .byte W06 .byte PEND -bgm_dan01_5_002: +mus_petalburg_woods_5_002: .byte W06 .byte N06 , As4 , v060 .byte W12 @@ -1179,9 +1179,9 @@ bgm_dan01_5_002: .byte PEND .byte W72 .byte PATT - .word bgm_dan01_5_001 + .word mus_petalburg_woods_5_001 .byte PATT - .word bgm_dan01_5_002 + .word mus_petalburg_woods_5_002 .byte W72 .byte W36 .byte VOICE , 5 @@ -1206,14 +1206,14 @@ bgm_dan01_5_002: .byte W72 .byte W72 .byte GOTO - .word bgm_dan01_5_B1 + .word mus_petalburg_woods_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_dan01_6: - .byte VOL , 80*bgm_dan01_mvl/mxv - .byte KEYSH , bgm_dan01_key+0 +mus_petalburg_woods_6: + .byte VOL , 80*mus_petalburg_woods_mvl/mxv + .byte KEYSH , mus_petalburg_woods_key+0 .byte W36 .byte VOICE , 81 .byte PAN , c_v+0 @@ -1226,8 +1226,8 @@ bgm_dan01_6: .byte W12 .byte N06 .byte W72 -bgm_dan01_6_B1: -bgm_dan01_6_000: +mus_petalburg_woods_6_B1: +mus_petalburg_woods_6_000: .byte W12 .byte N06 , Dn3 , v064 .byte W24 @@ -1238,7 +1238,7 @@ bgm_dan01_6_000: .byte PEND .byte N06 .byte W72 -bgm_dan01_6_001: +mus_petalburg_woods_6_001: .byte W12 .byte N06 , Dn2 , v064 .byte W24 @@ -1250,10 +1250,10 @@ bgm_dan01_6_001: .byte N06 .byte W72 .byte PATT - .word bgm_dan01_6_001 + .word mus_petalburg_woods_6_001 .byte N06 , Dn2 , v064 .byte W72 -bgm_dan01_6_002: +mus_petalburg_woods_6_002: .byte W12 .byte N06 , Ds2 , v064 .byte W24 @@ -1265,11 +1265,11 @@ bgm_dan01_6_002: .byte N06 .byte W72 .byte PATT - .word bgm_dan01_6_002 + .word mus_petalburg_woods_6_002 .byte N06 , Ds2 , v064 .byte W72 .byte PATT - .word bgm_dan01_6_002 + .word mus_petalburg_woods_6_002 .byte N06 , Ds2 , v064 .byte W72 .byte W12 @@ -1282,27 +1282,27 @@ bgm_dan01_6_002: .byte N06 .byte W72 .byte PATT - .word bgm_dan01_6_000 + .word mus_petalburg_woods_6_000 .byte N06 , Dn3 , v064 .byte W72 .byte PATT - .word bgm_dan01_6_000 + .word mus_petalburg_woods_6_000 .byte N06 , Dn3 , v064 .byte W72 .byte PATT - .word bgm_dan01_6_001 + .word mus_petalburg_woods_6_001 .byte N06 , Dn2 , v064 .byte W72 .byte PATT - .word bgm_dan01_6_001 + .word mus_petalburg_woods_6_001 .byte N06 , Dn2 , v064 .byte W72 .byte PATT - .word bgm_dan01_6_001 + .word mus_petalburg_woods_6_001 .byte N06 , Dn2 , v064 .byte W72 .byte PATT - .word bgm_dan01_6_001 + .word mus_petalburg_woods_6_001 .byte N06 , Dn2 , v064 .byte W72 .byte VOICE , 81 @@ -1316,18 +1316,18 @@ bgm_dan01_6_002: .byte N06 .byte W72 .byte GOTO - .word bgm_dan01_6_B1 + .word mus_petalburg_woods_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_dan01_7: - .byte KEYSH , bgm_dan01_key+0 +mus_petalburg_woods_7: + .byte KEYSH , mus_petalburg_woods_key+0 .byte W36 .byte PAN , c_v+10 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W72 -bgm_dan01_7_000: +mus_petalburg_woods_7_000: .byte W12 .byte N06 , As2 , v036 .byte W12 @@ -1340,7 +1340,7 @@ bgm_dan01_7_000: .byte As2 , v060 .byte W12 .byte PEND -bgm_dan01_7_B1: +mus_petalburg_woods_7_B1: .byte N36 , As2 , v064 .byte W36 .byte N06 @@ -1367,35 +1367,35 @@ bgm_dan01_7_B1: .byte W03 .byte TIE , As2 .byte W42 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte W06 - .byte 77*bgm_dan01_mvl/mxv + .byte 77*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 74*bgm_dan01_mvl/mxv + .byte 74*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 70*bgm_dan01_mvl/mxv + .byte 70*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 66*bgm_dan01_mvl/mxv + .byte 66*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 62*bgm_dan01_mvl/mxv + .byte 62*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 55*bgm_dan01_mvl/mxv + .byte 55*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 50*bgm_dan01_mvl/mxv + .byte 50*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 44*bgm_dan01_mvl/mxv + .byte 44*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 38*bgm_dan01_mvl/mxv + .byte 38*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 30*bgm_dan01_mvl/mxv + .byte 30*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 23*bgm_dan01_mvl/mxv + .byte 23*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 12*bgm_dan01_mvl/mxv + .byte 12*mus_petalburg_woods_mvl/mxv .byte W07 - .byte 5*bgm_dan01_mvl/mxv + .byte 5*mus_petalburg_woods_mvl/mxv .byte W05 - .byte 1*bgm_dan01_mvl/mxv + .byte 1*mus_petalburg_woods_mvl/mxv .byte W16 .byte EOT .byte W03 @@ -1407,7 +1407,7 @@ bgm_dan01_7_B1: .byte W24 .byte N06 .byte W12 - .byte VOL , 80*bgm_dan01_mvl/mxv + .byte VOL , 80*mus_petalburg_woods_mvl/mxv .byte TIE , Gn1 .byte W72 .byte W36 @@ -1431,7 +1431,7 @@ bgm_dan01_7_B1: .byte W72 .byte W72 .byte W72 -bgm_dan01_7_001: +mus_petalburg_woods_7_001: .byte W12 .byte N06 , As2 , v112 .byte W24 @@ -1443,7 +1443,7 @@ bgm_dan01_7_001: .byte N06 .byte W72 .byte PATT - .word bgm_dan01_7_001 + .word mus_petalburg_woods_7_001 .byte TIE , As1 , v120 .byte W72 .byte W72 @@ -1461,18 +1461,18 @@ bgm_dan01_7_001: .byte W72 .byte W72 .byte PATT - .word bgm_dan01_7_000 + .word mus_petalburg_woods_7_000 .byte GOTO - .word bgm_dan01_7_B1 + .word mus_petalburg_woods_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_dan01_8: - .byte KEYSH , bgm_dan01_key+0 +mus_petalburg_woods_8: + .byte KEYSH , mus_petalburg_woods_key+0 .byte W36 .byte VOICE , 127 - .byte VOL , 75*bgm_dan01_mvl/mxv + .byte VOL , 75*mus_petalburg_woods_mvl/mxv .byte PAN , c_v+0 .byte N11 , Gs4 , v040 .byte W60 @@ -1480,8 +1480,8 @@ bgm_dan01_8: .byte W12 .byte N11 .byte W72 -bgm_dan01_8_B1: -bgm_dan01_8_000: +mus_petalburg_woods_8_B1: +mus_petalburg_woods_8_000: .byte N11 , Gs4 , v040 .byte W60 .byte N11 @@ -1490,71 +1490,71 @@ bgm_dan01_8_000: .byte N11 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte PATT - .word bgm_dan01_8_000 + .word mus_petalburg_woods_8_000 .byte N11 , Gs4 , v040 .byte W72 .byte GOTO - .word bgm_dan01_8_B1 + .word mus_petalburg_woods_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_dan01_9: - .byte VOL , 80*bgm_dan01_mvl/mxv - .byte KEYSH , bgm_dan01_key+0 +mus_petalburg_woods_9: + .byte VOL , 80*mus_petalburg_woods_mvl/mxv + .byte KEYSH , mus_petalburg_woods_key+0 .byte W36 .byte VOICE , 0 .byte W72 .byte W72 -bgm_dan01_9_B1: +mus_petalburg_woods_9_B1: .byte W72 .byte W72 .byte W72 @@ -1608,28 +1608,28 @@ bgm_dan01_9_B1: .byte W72 .byte W72 .byte GOTO - .word bgm_dan01_9_B1 + .word mus_petalburg_woods_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_dan01: +mus_petalburg_woods: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_dan01_pri @ Priority - .byte bgm_dan01_rev @ Reverb. + .byte mus_petalburg_woods_pri @ Priority + .byte mus_petalburg_woods_rev @ Reverb. - .word bgm_dan01_grp + .word mus_petalburg_woods_grp - .word bgm_dan01_1 - .word bgm_dan01_2 - .word bgm_dan01_3 - .word bgm_dan01_4 - .word bgm_dan01_5 - .word bgm_dan01_6 - .word bgm_dan01_7 - .word bgm_dan01_8 - .word bgm_dan01_9 + .word mus_petalburg_woods_1 + .word mus_petalburg_woods_2 + .word mus_petalburg_woods_3 + .word mus_petalburg_woods_4 + .word mus_petalburg_woods_5 + .word mus_petalburg_woods_6 + .word mus_petalburg_woods_7 + .word mus_petalburg_woods_8 + .word mus_petalburg_woods_9 .end diff --git a/sound/songs/bgm_pokecen.s b/sound/songs/mus_poke_center.s index 36a91db9c..dcb22bbae 100644 --- a/sound/songs/bgm_pokecen.s +++ b/sound/songs/mus_poke_center.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_pokecen_grp, voicegroup043 - .equ bgm_pokecen_pri, 0 - .equ bgm_pokecen_rev, reverb_set+50 - .equ bgm_pokecen_mvl, 127 - .equ bgm_pokecen_key, 0 - .equ bgm_pokecen_tbs, 1 - .equ bgm_pokecen_exg, 0 - .equ bgm_pokecen_cmp, 1 + .equ mus_poke_center_grp, voicegroup043 + .equ mus_poke_center_pri, 0 + .equ mus_poke_center_rev, reverb_set+50 + .equ mus_poke_center_mvl, 127 + .equ mus_poke_center_key, 0 + .equ mus_poke_center_tbs, 1 + .equ mus_poke_center_exg, 0 + .equ mus_poke_center_cmp, 1 .section .rodata - .global bgm_pokecen + .global mus_poke_center .align 2 @********************** Track 1 **********************@ -bgm_pokecen_1: - .byte KEYSH , bgm_pokecen_key+0 - .byte TEMPO , 104*bgm_pokecen_tbs/2 +mus_poke_center_1: + .byte KEYSH , mus_poke_center_key+0 + .byte TEMPO , 104*mus_poke_center_tbs/2 .byte VOICE , 2 .byte PAN , c_v+0 - .byte VOL , 29*bgm_pokecen_mvl/mxv + .byte VOL , 29*mus_poke_center_mvl/mxv .byte W96 -bgm_pokecen_1_B1: +mus_poke_center_1_B1: .byte W96 .byte W96 .byte W96 @@ -77,73 +77,73 @@ bgm_pokecen_1_B1: .byte Gs2 .byte W12 .byte GOTO - .word bgm_pokecen_1_B1 + .word mus_poke_center_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_pokecen_2: - .byte KEYSH , bgm_pokecen_key+0 +mus_poke_center_2: + .byte KEYSH , mus_poke_center_key+0 .byte VOICE , 73 - .byte VOL , 3*bgm_pokecen_mvl/mxv + .byte VOL , 3*mus_poke_center_mvl/mxv .byte LFOS , 44 .byte MOD , 1 .byte PAN , c_v-7 .byte N72 , En3 , v120 .byte W03 - .byte VOL , 8*bgm_pokecen_mvl/mxv + .byte VOL , 8*mus_poke_center_mvl/mxv .byte W02 - .byte 9*bgm_pokecen_mvl/mxv + .byte 9*mus_poke_center_mvl/mxv .byte W07 - .byte 10*bgm_pokecen_mvl/mxv + .byte 10*mus_poke_center_mvl/mxv .byte W02 - .byte 10*bgm_pokecen_mvl/mxv + .byte 10*mus_poke_center_mvl/mxv .byte W03 - .byte 11*bgm_pokecen_mvl/mxv + .byte 11*mus_poke_center_mvl/mxv .byte W03 - .byte 14*bgm_pokecen_mvl/mxv + .byte 14*mus_poke_center_mvl/mxv .byte W04 - .byte 15*bgm_pokecen_mvl/mxv + .byte 15*mus_poke_center_mvl/mxv .byte W02 - .byte 16*bgm_pokecen_mvl/mxv + .byte 16*mus_poke_center_mvl/mxv .byte W03 - .byte 17*bgm_pokecen_mvl/mxv + .byte 17*mus_poke_center_mvl/mxv .byte W03 - .byte 19*bgm_pokecen_mvl/mxv + .byte 19*mus_poke_center_mvl/mxv .byte W04 - .byte 21*bgm_pokecen_mvl/mxv + .byte 21*mus_poke_center_mvl/mxv .byte W02 - .byte 22*bgm_pokecen_mvl/mxv + .byte 22*mus_poke_center_mvl/mxv .byte W03 - .byte 23*bgm_pokecen_mvl/mxv + .byte 23*mus_poke_center_mvl/mxv .byte W03 - .byte 26*bgm_pokecen_mvl/mxv + .byte 26*mus_poke_center_mvl/mxv .byte W04 - .byte 28*bgm_pokecen_mvl/mxv + .byte 28*mus_poke_center_mvl/mxv .byte W02 - .byte 34*bgm_pokecen_mvl/mxv + .byte 34*mus_poke_center_mvl/mxv .byte W03 - .byte 41*bgm_pokecen_mvl/mxv + .byte 41*mus_poke_center_mvl/mxv .byte W03 - .byte 44*bgm_pokecen_mvl/mxv + .byte 44*mus_poke_center_mvl/mxv .byte W01 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte W03 - .byte 60*bgm_pokecen_mvl/mxv + .byte 60*mus_poke_center_mvl/mxv .byte W02 - .byte 62*bgm_pokecen_mvl/mxv + .byte 62*mus_poke_center_mvl/mxv .byte W01 - .byte 73*bgm_pokecen_mvl/mxv + .byte 73*mus_poke_center_mvl/mxv .byte W02 - .byte 70*bgm_pokecen_mvl/mxv + .byte 70*mus_poke_center_mvl/mxv .byte W01 - .byte 80*bgm_pokecen_mvl/mxv + .byte 80*mus_poke_center_mvl/mxv .byte W02 - .byte 76*bgm_pokecen_mvl/mxv + .byte 76*mus_poke_center_mvl/mxv .byte W01 - .byte 86*bgm_pokecen_mvl/mxv + .byte 86*mus_poke_center_mvl/mxv .byte W03 - .byte 78*bgm_pokecen_mvl/mxv + .byte 78*mus_poke_center_mvl/mxv .byte N02 , Gs3 , v112 .byte W02 .byte An3 @@ -154,8 +154,8 @@ bgm_pokecen_2: .byte W05 .byte Gs3 .byte W06 -bgm_pokecen_2_B1: - .byte VOL , 92*bgm_pokecen_mvl/mxv +mus_poke_center_2_B1: + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W32 .byte W01 .byte N03 , Ds4 , v072 @@ -226,7 +226,7 @@ bgm_pokecen_2_B1: .byte W06 .byte Gs3 .byte W06 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W32 .byte W01 .byte N03 , Ds5 , v072 @@ -316,7 +316,7 @@ bgm_pokecen_2_B1: .byte Cn5 , v092 .byte W03 .byte MOD , 1 - .byte VOL , 69*bgm_pokecen_mvl/mxv + .byte VOL , 69*mus_poke_center_mvl/mxv .byte PAN , c_v-2 .byte N48 , Cs5 , v112 .byte W36 @@ -404,7 +404,7 @@ bgm_pokecen_2_B1: .byte W05 .byte Bn4 .byte W06 - .byte VOL , 69*bgm_pokecen_mvl/mxv + .byte VOL , 69*mus_poke_center_mvl/mxv .byte W06 .byte N06 , En4 .byte W06 @@ -436,7 +436,7 @@ bgm_pokecen_2_B1: .byte W06 .byte Gs5 .byte W06 - .byte VOL , 60*bgm_pokecen_mvl/mxv + .byte VOL , 60*mus_poke_center_mvl/mxv .byte N06 , An5 .byte W06 .byte Gs5 @@ -469,7 +469,7 @@ bgm_pokecen_2_B1: .byte W06 .byte Fs5 .byte W06 - .byte VOL , 81*bgm_pokecen_mvl/mxv + .byte VOL , 81*mus_poke_center_mvl/mxv .byte N03 , Ds5 , v096 .byte W03 .byte N21 , En5 @@ -494,23 +494,23 @@ bgm_pokecen_2_B1: .byte W12 .byte Bn4 .byte W12 - .byte VOL , 23*bgm_pokecen_mvl/mxv + .byte VOL , 23*mus_poke_center_mvl/mxv .byte N24 , An4 .byte W03 - .byte VOL , 28*bgm_pokecen_mvl/mxv + .byte VOL , 28*mus_poke_center_mvl/mxv .byte W03 - .byte 32*bgm_pokecen_mvl/mxv + .byte 32*mus_poke_center_mvl/mxv .byte W03 - .byte 40*bgm_pokecen_mvl/mxv + .byte 40*mus_poke_center_mvl/mxv .byte W03 - .byte 47*bgm_pokecen_mvl/mxv + .byte 47*mus_poke_center_mvl/mxv .byte MOD , 6 .byte W03 - .byte VOL , 57*bgm_pokecen_mvl/mxv + .byte VOL , 57*mus_poke_center_mvl/mxv .byte W03 - .byte 69*bgm_pokecen_mvl/mxv + .byte 69*mus_poke_center_mvl/mxv .byte W03 - .byte 77*bgm_pokecen_mvl/mxv + .byte 77*mus_poke_center_mvl/mxv .byte W03 .byte MOD , 1 .byte N02 , Gs4 @@ -524,21 +524,21 @@ bgm_pokecen_2_B1: .byte Gs4 .byte W06 .byte GOTO - .word bgm_pokecen_2_B1 + .word mus_poke_center_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_pokecen_3: - .byte KEYSH , bgm_pokecen_key+0 +mus_poke_center_3: + .byte KEYSH , mus_poke_center_key+0 .byte VOICE , 45 .byte PAN , c_v-32 - .byte VOL , 79*bgm_pokecen_mvl/mxv + .byte VOL , 79*mus_poke_center_mvl/mxv .byte XCMD , xIECV , 12 .byte xIECL , 8 .byte LFOS , 44 .byte W96 -bgm_pokecen_3_B1: +mus_poke_center_3_B1: .byte N06 , An3 , v092 .byte W06 .byte En3 @@ -576,7 +576,7 @@ bgm_pokecen_3_B1: .byte W12 .byte Gs3 , v016 .byte W60 - .byte VOL , 75*bgm_pokecen_mvl/mxv + .byte VOL , 75*mus_poke_center_mvl/mxv .byte W12 .byte N06 , En4 , v112 .byte W12 @@ -594,7 +594,7 @@ bgm_pokecen_3_B1: .byte W12 .byte Gs4 .byte W12 - .byte VOL , 67*bgm_pokecen_mvl/mxv + .byte VOL , 67*mus_poke_center_mvl/mxv .byte N06 , An3 , v092 .byte W06 .byte En3 , v112 @@ -667,19 +667,19 @@ bgm_pokecen_3_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_pokecen_3_B1 + .word mus_poke_center_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_pokecen_4: - .byte KEYSH , bgm_pokecen_key+0 +mus_poke_center_4: + .byte KEYSH , mus_poke_center_key+0 .byte VOICE , 48 .byte LFOS , 44 - .byte VOL , 82*bgm_pokecen_mvl/mxv + .byte VOL , 82*mus_poke_center_mvl/mxv .byte PAN , c_v-32 .byte W96 -bgm_pokecen_4_B1: +mus_poke_center_4_B1: .byte W96 .byte W96 .byte W96 @@ -696,15 +696,15 @@ bgm_pokecen_4_B1: .byte W03 .byte N32 , Cs3 , v056 .byte W21 - .byte VOL , 78*bgm_pokecen_mvl/mxv + .byte VOL , 78*mus_poke_center_mvl/mxv .byte W02 - .byte 70*bgm_pokecen_mvl/mxv + .byte 70*mus_poke_center_mvl/mxv .byte W03 - .byte 62*bgm_pokecen_mvl/mxv + .byte 62*mus_poke_center_mvl/mxv .byte W03 - .byte 60*bgm_pokecen_mvl/mxv + .byte 60*mus_poke_center_mvl/mxv .byte W04 - .byte 82*bgm_pokecen_mvl/mxv + .byte 82*mus_poke_center_mvl/mxv .byte N12 , En2 .byte W12 .byte An2 @@ -717,15 +717,15 @@ bgm_pokecen_4_B1: .byte W12 .byte N36 , Dn3 .byte W24 - .byte VOL , 78*bgm_pokecen_mvl/mxv + .byte VOL , 78*mus_poke_center_mvl/mxv .byte W02 - .byte 70*bgm_pokecen_mvl/mxv + .byte 70*mus_poke_center_mvl/mxv .byte W03 - .byte 62*bgm_pokecen_mvl/mxv + .byte 62*mus_poke_center_mvl/mxv .byte W03 - .byte 60*bgm_pokecen_mvl/mxv + .byte 60*mus_poke_center_mvl/mxv .byte W04 - .byte 82*bgm_pokecen_mvl/mxv + .byte 82*mus_poke_center_mvl/mxv .byte N12 , Bn2 .byte W12 .byte N02 , Gs2 @@ -746,15 +746,15 @@ bgm_pokecen_4_B1: .byte W03 .byte N32 , Bn2 , v056 .byte W21 - .byte VOL , 78*bgm_pokecen_mvl/mxv + .byte VOL , 78*mus_poke_center_mvl/mxv .byte W02 - .byte 70*bgm_pokecen_mvl/mxv + .byte 70*mus_poke_center_mvl/mxv .byte W03 - .byte 62*bgm_pokecen_mvl/mxv + .byte 62*mus_poke_center_mvl/mxv .byte W03 - .byte 60*bgm_pokecen_mvl/mxv + .byte 60*mus_poke_center_mvl/mxv .byte W04 - .byte 82*bgm_pokecen_mvl/mxv + .byte 82*mus_poke_center_mvl/mxv .byte N12 , Gs2 .byte W12 .byte Dn3 @@ -766,7 +766,7 @@ bgm_pokecen_4_B1: .byte Gs3 , v068 .byte W12 .byte PAN , c_v-44 - .byte VOL , 57*bgm_pokecen_mvl/mxv + .byte VOL , 57*mus_poke_center_mvl/mxv .byte N06 , Dn4 , v064 .byte W06 .byte Dn3 @@ -799,7 +799,7 @@ bgm_pokecen_4_B1: .byte W06 .byte Bn3 .byte W06 - .byte VOL , 49*bgm_pokecen_mvl/mxv + .byte VOL , 49*mus_poke_center_mvl/mxv .byte N06 , Cs4 , v096 .byte W06 .byte En3 , v064 @@ -1048,7 +1048,7 @@ bgm_pokecen_4_B1: .byte W06 .byte Gs3 .byte W06 - .byte VOL , 81*bgm_pokecen_mvl/mxv + .byte VOL , 81*mus_poke_center_mvl/mxv .byte N06 , An3 .byte W06 .byte Gs3 @@ -1058,17 +1058,17 @@ bgm_pokecen_4_B1: .byte Bn3 .byte W06 .byte GOTO - .word bgm_pokecen_4_B1 + .word mus_poke_center_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_pokecen_5: - .byte KEYSH , bgm_pokecen_key+0 +mus_poke_center_5: + .byte KEYSH , mus_poke_center_key+0 .byte VOICE , 0 .byte PAN , c_v+0 .byte LFOS , 44 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte MOD , 2 .byte XCMD , xIECV , 12 .byte xIECL , 8 @@ -1104,7 +1104,7 @@ bgm_pokecen_5: .byte W06 .byte Bn4 , v016 .byte W06 -bgm_pokecen_5_B1: +mus_poke_center_5_B1: .byte W96 .byte VOICE , 4 .byte W96 @@ -1113,7 +1113,7 @@ bgm_pokecen_5_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 46*bgm_pokecen_mvl/mxv + .byte VOL , 46*mus_poke_center_mvl/mxv .byte N48 , En3 , v076 .byte W48 .byte N24 , An3 , v088 @@ -1274,7 +1274,7 @@ bgm_pokecen_5_B1: .byte W12 .byte En4 .byte W12 - .byte VOL , 34*bgm_pokecen_mvl/mxv + .byte VOL , 34*mus_poke_center_mvl/mxv .byte N24 , An4 .byte W12 .byte MOD , 9 @@ -1300,16 +1300,16 @@ bgm_pokecen_5_B1: .byte 2 .byte W24 .byte GOTO - .word bgm_pokecen_5_B1 + .word mus_poke_center_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_pokecen_6: - .byte KEYSH , bgm_pokecen_key+0 +mus_poke_center_6: + .byte KEYSH , mus_poke_center_key+0 .byte VOICE , 3 .byte PAN , c_v-63 - .byte VOL , 69*bgm_pokecen_mvl/mxv + .byte VOL , 69*mus_poke_center_mvl/mxv .byte N03 , En4 , v096 .byte W06 .byte En4 , v016 @@ -1342,8 +1342,8 @@ bgm_pokecen_6: .byte W06 .byte En4 , v016 .byte W06 -bgm_pokecen_6_B1: - .byte VOL , 69*bgm_pokecen_mvl/mxv +mus_poke_center_6_B1: + .byte VOL , 69*mus_poke_center_mvl/mxv .byte N06 , An4 , v068 .byte W06 .byte En4 @@ -1432,7 +1432,7 @@ bgm_pokecen_6_B1: .byte PAN , c_v+0 .byte N24 , Cs5 .byte W36 - .byte VOL , 57*bgm_pokecen_mvl/mxv + .byte VOL , 57*mus_poke_center_mvl/mxv .byte W21 .byte N03 , As4 , v096 .byte W03 @@ -1444,7 +1444,7 @@ bgm_pokecen_6_B1: .byte W06 .byte Gs4 .byte W06 - .byte VOL , 44*bgm_pokecen_mvl/mxv + .byte VOL , 44*mus_poke_center_mvl/mxv .byte N06 , An3 .byte W06 .byte En3 @@ -1538,22 +1538,22 @@ bgm_pokecen_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_pokecen_6_B1 + .word mus_poke_center_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_pokecen_7: - .byte KEYSH , bgm_pokecen_key+0 +mus_poke_center_7: + .byte KEYSH , mus_poke_center_key+0 .byte VOICE , 5 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte XCMD , xIECV , 9 .byte xIECL , 8 .byte LFOS , 44 .byte PAN , c_v+0 .byte W96 -bgm_pokecen_7_B1: -bgm_pokecen_7_000: +mus_poke_center_7_B1: +mus_poke_center_7_000: .byte N06 , An1 , v127 .byte W06 .byte An1 , v036 @@ -1571,7 +1571,7 @@ bgm_pokecen_7_000: .byte An1 , v036 .byte W06 .byte PEND -bgm_pokecen_7_001: +mus_poke_center_7_001: .byte N06 , Bn1 , v127 .byte W06 .byte Bn1 , v036 @@ -1626,9 +1626,9 @@ bgm_pokecen_7_001: .byte Cs2 , v036 .byte W06 .byte PATT - .word bgm_pokecen_7_000 + .word mus_poke_center_7_000 .byte PATT - .word bgm_pokecen_7_001 + .word mus_poke_center_7_001 .byte N06 , Bn1 , v127 .byte W06 .byte Bn1 , v036 @@ -1667,24 +1667,24 @@ bgm_pokecen_7_001: .byte W06 .byte N24 , An1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , An1 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N03 , En1 , v127 .byte W06 @@ -1692,47 +1692,47 @@ bgm_pokecen_7_001: .byte W06 .byte N24 , Cs2 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , Cs2 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N06 , An1 , v127 .byte W12 .byte N24 , Dn2 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , Dn2 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N03 , An1 , v127 .byte W06 @@ -1754,24 +1754,24 @@ bgm_pokecen_7_001: .byte W06 .byte N24 , Gs1 , v127 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , Gs1 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N03 , En1 , v127 .byte W06 @@ -1779,58 +1779,58 @@ bgm_pokecen_7_001: .byte W06 .byte N24 , Bn1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 92*bgm_pokecen_mvl/mxv + .byte 92*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N24 , Gs1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 92*bgm_pokecen_mvl/mxv + .byte 92*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N24 , An1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , An1 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N03 , An1 , v127 .byte W06 @@ -1852,24 +1852,24 @@ bgm_pokecen_7_001: .byte W06 .byte N24 , An1 , v127 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , An1 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N03 , En1 , v127 .byte W06 @@ -1877,24 +1877,24 @@ bgm_pokecen_7_001: .byte W06 .byte N24 , Cs2 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , Cs2 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N03 , An1 , v127 .byte W06 @@ -1902,24 +1902,24 @@ bgm_pokecen_7_001: .byte W06 .byte N24 , Bn1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , Bn1 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N06 , En1 , v127 .byte W12 @@ -1935,79 +1935,79 @@ bgm_pokecen_7_001: .byte W12 .byte N24 , Gs1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N06 , Gs1 , v036 .byte W09 - .byte VOL , 92*bgm_pokecen_mvl/mxv + .byte VOL , 92*mus_poke_center_mvl/mxv .byte W03 .byte N06 , En1 , v127 .byte W12 .byte N24 , Bn1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 92*bgm_pokecen_mvl/mxv + .byte 92*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N24 , Gs1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte MOD , 8 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 92*bgm_pokecen_mvl/mxv + .byte 92*mus_poke_center_mvl/mxv .byte MOD , 0 .byte N12 , An1 .byte W06 - .byte VOL , 87*bgm_pokecen_mvl/mxv + .byte VOL , 87*mus_poke_center_mvl/mxv .byte W03 - .byte 81*bgm_pokecen_mvl/mxv + .byte 81*mus_poke_center_mvl/mxv .byte W03 - .byte 75*bgm_pokecen_mvl/mxv + .byte 75*mus_poke_center_mvl/mxv .byte N06 , An1 , v036 .byte W03 - .byte VOL , 68*bgm_pokecen_mvl/mxv + .byte VOL , 68*mus_poke_center_mvl/mxv .byte W03 - .byte 63*bgm_pokecen_mvl/mxv + .byte 63*mus_poke_center_mvl/mxv .byte W03 - .byte 57*bgm_pokecen_mvl/mxv + .byte 57*mus_poke_center_mvl/mxv .byte W03 - .byte 52*bgm_pokecen_mvl/mxv + .byte 52*mus_poke_center_mvl/mxv .byte W09 - .byte 92*bgm_pokecen_mvl/mxv + .byte 92*mus_poke_center_mvl/mxv .byte W03 .byte N03 , An1 , v127 .byte W06 @@ -2028,17 +2028,17 @@ bgm_pokecen_7_001: .byte Gs1 , v036 .byte W06 .byte GOTO - .word bgm_pokecen_7_B1 + .word mus_poke_center_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_pokecen_8: - .byte KEYSH , bgm_pokecen_key+0 +mus_poke_center_8: + .byte KEYSH , mus_poke_center_key+0 .byte VOICE , 45 - .byte VOL , 75*bgm_pokecen_mvl/mxv + .byte VOL , 75*mus_poke_center_mvl/mxv .byte W96 -bgm_pokecen_8_B1: +mus_poke_center_8_B1: .byte W96 .byte W96 .byte W96 @@ -2072,16 +2072,16 @@ bgm_pokecen_8_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_pokecen_8_B1 + .word mus_poke_center_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_pokecen_9: - .byte KEYSH , bgm_pokecen_key+0 +mus_poke_center_9: + .byte KEYSH , mus_poke_center_key+0 .byte VOICE , 127 .byte PAN , c_v+0 - .byte VOL , 37*bgm_pokecen_mvl/mxv + .byte VOL , 37*mus_poke_center_mvl/mxv .byte N12 , Gs4 , v112 .byte W12 .byte N01 , Gn4 , v080 @@ -2112,8 +2112,8 @@ bgm_pokecen_9: .byte W06 .byte Gs4 , v112 .byte W06 -bgm_pokecen_9_B1: -bgm_pokecen_9_000: +mus_poke_center_9_B1: +mus_poke_center_9_000: .byte N01 , Gn4 , v112 .byte W06 .byte Gn4 , v072 @@ -2142,9 +2142,9 @@ bgm_pokecen_9_000: .byte W06 .byte PEND .byte PATT - .word bgm_pokecen_9_000 + .word mus_poke_center_9_000 .byte PATT - .word bgm_pokecen_9_000 + .word mus_poke_center_9_000 .byte N01 , Gn4 , v112 .byte W06 .byte Gn4 , v072 @@ -2174,7 +2174,7 @@ bgm_pokecen_9_000: .byte N12 , Gs4 , v112 .byte W12 .byte PATT - .word bgm_pokecen_9_000 + .word mus_poke_center_9_000 .byte N01 , Gn4 , v112 .byte W06 .byte Gn4 , v072 @@ -2204,7 +2204,7 @@ bgm_pokecen_9_000: .byte Gn4 , v064 .byte W06 .byte PATT - .word bgm_pokecen_9_000 + .word mus_poke_center_9_000 .byte N01 , Gn4 , v112 .byte W06 .byte Gn4 , v072 @@ -2233,7 +2233,7 @@ bgm_pokecen_9_000: .byte W06 .byte N06 .byte W06 -bgm_pokecen_9_001: +mus_poke_center_9_001: .byte N01 , Gn4 , v112 .byte W06 .byte Gn4 , v072 @@ -2262,15 +2262,15 @@ bgm_pokecen_9_001: .byte W12 .byte PEND .byte PATT - .word bgm_pokecen_9_001 + .word mus_poke_center_9_001 .byte PATT - .word bgm_pokecen_9_001 + .word mus_poke_center_9_001 .byte PATT - .word bgm_pokecen_9_001 + .word mus_poke_center_9_001 .byte PATT - .word bgm_pokecen_9_001 + .word mus_poke_center_9_001 .byte PATT - .word bgm_pokecen_9_001 + .word mus_poke_center_9_001 .byte N12 , Gs4 , v112 .byte W36 .byte N01 , Gn4 , v088 @@ -2304,28 +2304,28 @@ bgm_pokecen_9_001: .byte Gn4 , v064 .byte W06 .byte GOTO - .word bgm_pokecen_9_B1 + .word mus_poke_center_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_pokecen: +mus_poke_center: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_pokecen_pri @ Priority - .byte bgm_pokecen_rev @ Reverb. + .byte mus_poke_center_pri @ Priority + .byte mus_poke_center_rev @ Reverb. - .word bgm_pokecen_grp + .word mus_poke_center_grp - .word bgm_pokecen_1 - .word bgm_pokecen_2 - .word bgm_pokecen_3 - .word bgm_pokecen_4 - .word bgm_pokecen_5 - .word bgm_pokecen_6 - .word bgm_pokecen_7 - .word bgm_pokecen_8 - .word bgm_pokecen_9 + .word mus_poke_center_1 + .word mus_poke_center_2 + .word mus_poke_center_3 + .word mus_poke_center_4 + .word mus_poke_center_5 + .word mus_poke_center_6 + .word mus_poke_center_7 + .word mus_poke_center_8 + .word mus_poke_center_9 .end diff --git a/sound/songs/bgm_friendly.s b/sound/songs/mus_poke_mart.s index 959cfd79a..c888da69e 100644 --- a/sound/songs/bgm_friendly.s +++ b/sound/songs/mus_poke_mart.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_friendly_grp, voicegroup047 - .equ bgm_friendly_pri, 0 - .equ bgm_friendly_rev, reverb_set+50 - .equ bgm_friendly_mvl, 127 - .equ bgm_friendly_key, 0 - .equ bgm_friendly_tbs, 1 - .equ bgm_friendly_exg, 0 - .equ bgm_friendly_cmp, 1 + .equ mus_poke_mart_grp, voicegroup047 + .equ mus_poke_mart_pri, 0 + .equ mus_poke_mart_rev, reverb_set+50 + .equ mus_poke_mart_mvl, 127 + .equ mus_poke_mart_key, 0 + .equ mus_poke_mart_tbs, 1 + .equ mus_poke_mart_exg, 0 + .equ mus_poke_mart_cmp, 1 .section .rodata - .global bgm_friendly + .global mus_poke_mart .align 2 @********************** Track 1 **********************@ -bgm_friendly_1: - .byte KEYSH , bgm_friendly_key+0 - .byte TEMPO , 172*bgm_friendly_tbs/2 +mus_poke_mart_1: + .byte KEYSH , mus_poke_mart_key+0 + .byte TEMPO , 172*mus_poke_mart_tbs/2 .byte VOICE , 1 .byte LFOS , 44 - .byte VOL , 53*bgm_friendly_mvl/mxv + .byte VOL , 53*mus_poke_mart_mvl/mxv .byte LFOS , 44 .byte PAN , c_v+0 .byte W96 @@ -62,7 +62,7 @@ bgm_friendly_1: .byte W03 .byte Fn3 .byte W04 - .byte VOL , 79*bgm_friendly_mvl/mxv + .byte VOL , 79*mus_poke_mart_mvl/mxv .byte W08 .byte VOICE , 17 .byte N04 , Fs3 , v112 @@ -71,9 +71,9 @@ bgm_friendly_1: .byte W08 .byte As3 .byte W08 -bgm_friendly_1_B1: +mus_poke_mart_1_B1: .byte VOICE , 17 - .byte VOL , 83*bgm_friendly_mvl/mxv + .byte VOL , 83*mus_poke_mart_mvl/mxv .byte N08 , Cs4 , v120 .byte W08 .byte Cs4 , v032 @@ -234,7 +234,7 @@ bgm_friendly_1_B1: .byte W02 .byte En3 .byte W04 - .byte VOL , 83*bgm_friendly_mvl/mxv + .byte VOL , 83*mus_poke_mart_mvl/mxv .byte N02 , Cs3 , v076 .byte W02 .byte Ds3 @@ -376,7 +376,7 @@ bgm_friendly_1_B1: .byte Cs4 .byte W72 .byte VOICE , 17 - .byte VOL , 79*bgm_friendly_mvl/mxv + .byte VOL , 79*mus_poke_mart_mvl/mxv .byte N08 , Bn3 .byte W08 .byte Bn3 , v032 @@ -415,7 +415,7 @@ bgm_friendly_1_B1: .byte Cs4 , v032 .byte W16 .byte VOICE , 1 - .byte VOL , 78*bgm_friendly_mvl/mxv + .byte VOL , 78*mus_poke_mart_mvl/mxv .byte N20 , Cs4 , v112 .byte W20 .byte N04 , Dn4 @@ -450,7 +450,7 @@ bgm_friendly_1_B1: .byte Cs4 , v112 .byte W08 .byte VOICE , 17 - .byte VOL , 79*bgm_friendly_mvl/mxv + .byte VOL , 79*mus_poke_mart_mvl/mxv .byte N08 , Ds4 .byte W08 .byte Ds4 , v032 @@ -490,7 +490,7 @@ bgm_friendly_1_B1: .byte N04 , As4 .byte W08 .byte VOICE , 1 - .byte VOL , 80*bgm_friendly_mvl/mxv + .byte VOL , 80*mus_poke_mart_mvl/mxv .byte N24 .byte W24 .byte N08 , Bn4 @@ -525,38 +525,38 @@ bgm_friendly_1_B1: .byte As4 , v112 .byte W08 .byte VOICE , 17 - .byte VOL , 43*bgm_friendly_mvl/mxv + .byte VOL , 43*mus_poke_mart_mvl/mxv .byte N92 , Bn5 .byte W04 - .byte VOL , 42*bgm_friendly_mvl/mxv + .byte VOL , 42*mus_poke_mart_mvl/mxv .byte W03 - .byte 38*bgm_friendly_mvl/mxv + .byte 38*mus_poke_mart_mvl/mxv .byte W04 - .byte 27*bgm_friendly_mvl/mxv + .byte 27*mus_poke_mart_mvl/mxv .byte W04 - .byte 17*bgm_friendly_mvl/mxv + .byte 17*mus_poke_mart_mvl/mxv .byte W04 - .byte 14*bgm_friendly_mvl/mxv + .byte 14*mus_poke_mart_mvl/mxv .byte W04 - .byte 12*bgm_friendly_mvl/mxv + .byte 12*mus_poke_mart_mvl/mxv .byte W04 - .byte 10*bgm_friendly_mvl/mxv + .byte 10*mus_poke_mart_mvl/mxv .byte W12 - .byte 12*bgm_friendly_mvl/mxv + .byte 12*mus_poke_mart_mvl/mxv .byte W04 - .byte 16*bgm_friendly_mvl/mxv + .byte 16*mus_poke_mart_mvl/mxv .byte W04 - .byte 18*bgm_friendly_mvl/mxv + .byte 18*mus_poke_mart_mvl/mxv .byte W04 - .byte 24*bgm_friendly_mvl/mxv + .byte 24*mus_poke_mart_mvl/mxv .byte W04 - .byte 29*bgm_friendly_mvl/mxv + .byte 29*mus_poke_mart_mvl/mxv .byte W04 - .byte 37*bgm_friendly_mvl/mxv + .byte 37*mus_poke_mart_mvl/mxv .byte W04 - .byte 43*bgm_friendly_mvl/mxv + .byte 43*mus_poke_mart_mvl/mxv .byte W01 - .byte 43*bgm_friendly_mvl/mxv + .byte 43*mus_poke_mart_mvl/mxv .byte W08 .byte MOD , 4 .byte W20 @@ -565,35 +565,35 @@ bgm_friendly_1_B1: .byte MOD , 0 .byte N72 , Bn5 .byte W04 - .byte VOL , 42*bgm_friendly_mvl/mxv + .byte VOL , 42*mus_poke_mart_mvl/mxv .byte W03 - .byte 38*bgm_friendly_mvl/mxv + .byte 38*mus_poke_mart_mvl/mxv .byte W04 - .byte 27*bgm_friendly_mvl/mxv + .byte 27*mus_poke_mart_mvl/mxv .byte W04 - .byte 17*bgm_friendly_mvl/mxv + .byte 17*mus_poke_mart_mvl/mxv .byte W04 - .byte 14*bgm_friendly_mvl/mxv + .byte 14*mus_poke_mart_mvl/mxv .byte W04 - .byte 12*bgm_friendly_mvl/mxv + .byte 12*mus_poke_mart_mvl/mxv .byte W04 - .byte 10*bgm_friendly_mvl/mxv + .byte 10*mus_poke_mart_mvl/mxv .byte W12 - .byte 12*bgm_friendly_mvl/mxv + .byte 12*mus_poke_mart_mvl/mxv .byte W04 - .byte 16*bgm_friendly_mvl/mxv + .byte 16*mus_poke_mart_mvl/mxv .byte W04 - .byte 18*bgm_friendly_mvl/mxv + .byte 18*mus_poke_mart_mvl/mxv .byte W04 - .byte 24*bgm_friendly_mvl/mxv + .byte 24*mus_poke_mart_mvl/mxv .byte W04 - .byte 29*bgm_friendly_mvl/mxv + .byte 29*mus_poke_mart_mvl/mxv .byte W04 - .byte 37*bgm_friendly_mvl/mxv + .byte 37*mus_poke_mart_mvl/mxv .byte W04 - .byte 43*bgm_friendly_mvl/mxv + .byte 43*mus_poke_mart_mvl/mxv .byte W01 - .byte 43*bgm_friendly_mvl/mxv + .byte 43*mus_poke_mart_mvl/mxv .byte W08 .byte MOD , 4 .byte N08 , Gs5 @@ -605,35 +605,35 @@ bgm_friendly_1_B1: .byte MOD , 0 .byte N72 , As5 .byte W04 - .byte VOL , 42*bgm_friendly_mvl/mxv + .byte VOL , 42*mus_poke_mart_mvl/mxv .byte W03 - .byte 38*bgm_friendly_mvl/mxv + .byte 38*mus_poke_mart_mvl/mxv .byte W04 - .byte 27*bgm_friendly_mvl/mxv + .byte 27*mus_poke_mart_mvl/mxv .byte W04 - .byte 17*bgm_friendly_mvl/mxv + .byte 17*mus_poke_mart_mvl/mxv .byte W04 - .byte 14*bgm_friendly_mvl/mxv + .byte 14*mus_poke_mart_mvl/mxv .byte W04 - .byte 12*bgm_friendly_mvl/mxv + .byte 12*mus_poke_mart_mvl/mxv .byte W04 - .byte 10*bgm_friendly_mvl/mxv + .byte 10*mus_poke_mart_mvl/mxv .byte W12 - .byte 12*bgm_friendly_mvl/mxv + .byte 12*mus_poke_mart_mvl/mxv .byte W04 - .byte 16*bgm_friendly_mvl/mxv + .byte 16*mus_poke_mart_mvl/mxv .byte W04 - .byte 18*bgm_friendly_mvl/mxv + .byte 18*mus_poke_mart_mvl/mxv .byte W04 - .byte 24*bgm_friendly_mvl/mxv + .byte 24*mus_poke_mart_mvl/mxv .byte W04 - .byte 29*bgm_friendly_mvl/mxv + .byte 29*mus_poke_mart_mvl/mxv .byte W04 - .byte 37*bgm_friendly_mvl/mxv + .byte 37*mus_poke_mart_mvl/mxv .byte W04 - .byte 43*bgm_friendly_mvl/mxv + .byte 43*mus_poke_mart_mvl/mxv .byte W01 - .byte 43*bgm_friendly_mvl/mxv + .byte 43*mus_poke_mart_mvl/mxv .byte W08 .byte MOD , 4 .byte N08 , Gs5 @@ -646,7 +646,7 @@ bgm_friendly_1_B1: .byte N24 , Fs5 .byte W24 .byte VOICE , 1 - .byte VOL , 75*bgm_friendly_mvl/mxv + .byte VOL , 75*mus_poke_mart_mvl/mxv .byte N08 , En5 , v084 .byte W08 .byte Cs5 @@ -666,19 +666,19 @@ bgm_friendly_1_B1: .byte As3 , v096 .byte W08 .byte GOTO - .word bgm_friendly_1_B1 + .word mus_poke_mart_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_friendly_2: - .byte KEYSH , bgm_friendly_key+0 +mus_poke_mart_2: + .byte KEYSH , mus_poke_mart_key+0 .byte VOICE , 87 .byte PAN , c_v+0 .byte XCMD , xIECV , 12 .byte xIECL , 8 .byte BENDR , 12 - .byte VOL , 29*bgm_friendly_mvl/mxv + .byte VOL , 29*mus_poke_mart_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 @@ -690,7 +690,7 @@ bgm_friendly_2: .byte W08 .byte As3 .byte W08 -bgm_friendly_2_B1: +mus_poke_mart_2_B1: .byte N08 , Cs4 , v120 .byte W08 .byte Cs4 , v032 @@ -810,7 +810,7 @@ bgm_friendly_2_B1: .byte W24 .byte Bn3 .byte W24 -bgm_friendly_2_000: +mus_poke_mart_2_000: .byte N40 , Ds4 , v112 .byte W40 .byte N04 , En4 @@ -965,7 +965,7 @@ bgm_friendly_2_000: .byte N04 , Bn3 .byte W08 .byte PATT - .word bgm_friendly_2_000 + .word mus_poke_mart_2_000 .byte N08 , Cs4 , v112 .byte W72 .byte Bn3 @@ -1151,15 +1151,15 @@ bgm_friendly_2_000: .byte As4 .byte W08 .byte GOTO - .word bgm_friendly_2_B1 + .word mus_poke_mart_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_friendly_3: - .byte KEYSH , bgm_friendly_key+0 +mus_poke_mart_3: + .byte KEYSH , mus_poke_mart_key+0 .byte VOICE , 35 - .byte VOL , 85*bgm_friendly_mvl/mxv + .byte VOL , 85*mus_poke_mart_mvl/mxv .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 @@ -1167,8 +1167,8 @@ bgm_friendly_3: .byte W96 .byte W96 .byte W96 -bgm_friendly_3_B1: -bgm_friendly_3_000: +mus_poke_mart_3_B1: +mus_poke_mart_3_000: .byte PAN , c_v+0 .byte N08 , Bn0 , v127 .byte W08 @@ -1334,7 +1334,7 @@ bgm_friendly_3_000: .byte W04 .byte N08 , En3 , v016 .byte W20 -bgm_friendly_3_001: +mus_poke_mart_3_001: .byte PAN , c_v+0 .byte N08 , Fs1 , v127 .byte W08 @@ -1399,7 +1399,7 @@ bgm_friendly_3_001: .byte Cs4 , v032 .byte W04 .byte PATT - .word bgm_friendly_3_000 + .word mus_poke_mart_3_000 .byte PAN , c_v+0 .byte N08 , Bn0 , v127 .byte W08 @@ -1429,7 +1429,7 @@ bgm_friendly_3_001: .byte N08 , Ds3 , v016 .byte W20 .byte PATT - .word bgm_friendly_3_000 + .word mus_poke_mart_3_000 .byte PAN , c_v+0 .byte N08 , Bn0 , v127 .byte W08 @@ -1519,7 +1519,7 @@ bgm_friendly_3_001: .byte N08 , En3 , v016 .byte W20 .byte PATT - .word bgm_friendly_3_001 + .word mus_poke_mart_3_001 .byte PAN , c_v+0 .byte N08 , Fs1 , v127 .byte W08 @@ -1822,21 +1822,21 @@ bgm_friendly_3_001: .byte As0 , v112 .byte W08 .byte GOTO - .word bgm_friendly_3_B1 + .word mus_poke_mart_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_friendly_4: - .byte KEYSH , bgm_friendly_key+0 +mus_poke_mart_4: + .byte KEYSH , mus_poke_mart_key+0 .byte VOICE , 46 .byte PAN , c_v+0 - .byte VOL , 43*bgm_friendly_mvl/mxv + .byte VOL , 43*mus_poke_mart_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 -bgm_friendly_4_B1: +mus_poke_mart_4_B1: .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W96 @@ -1957,18 +1957,18 @@ bgm_friendly_4_B1: .byte As4 .byte W08 .byte GOTO - .word bgm_friendly_4_B1 + .word mus_poke_mart_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_friendly_5: - .byte KEYSH , bgm_friendly_key+0 +mus_poke_mart_5: + .byte KEYSH , mus_poke_mart_key+0 .byte VOICE , 80 .byte PAN , c_v-64 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 54*bgm_friendly_mvl/mxv + .byte VOL , 54*mus_poke_mart_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 @@ -1977,7 +1977,7 @@ bgm_friendly_5: .byte xIECL , 12 .byte W56 .byte W96 -bgm_friendly_5_B1: +mus_poke_mart_5_B1: .byte W24 .byte N08 , Fs3 , v112 .byte W08 @@ -1991,7 +1991,7 @@ bgm_friendly_5_B1: .byte W04 .byte N08 , Fs3 , v032 .byte W20 -bgm_friendly_5_000: +mus_poke_mart_5_000: .byte W24 .byte N08 , Gn3 , v112 .byte W08 @@ -2006,7 +2006,7 @@ bgm_friendly_5_000: .byte Gn3 , v032 .byte W20 .byte PEND -bgm_friendly_5_001: +mus_poke_mart_5_001: .byte W24 .byte N08 , Gs3 , v112 .byte W08 @@ -2021,7 +2021,7 @@ bgm_friendly_5_001: .byte Gs3 , v032 .byte W20 .byte PEND -bgm_friendly_5_002: +mus_poke_mart_5_002: .byte W24 .byte N08 , An3 , v112 .byte W08 @@ -2036,7 +2036,7 @@ bgm_friendly_5_002: .byte An3 , v032 .byte W20 .byte PEND -bgm_friendly_5_003: +mus_poke_mart_5_003: .byte W24 .byte N08 , Bn3 , v112 .byte W08 @@ -2085,7 +2085,7 @@ bgm_friendly_5_003: .byte W04 .byte As3 , v032 .byte W20 - .byte VOL , 54*bgm_friendly_mvl/mxv + .byte VOL , 54*mus_poke_mart_mvl/mxv .byte W24 .byte N04 , Cs4 , v112 .byte W04 @@ -2111,7 +2111,7 @@ bgm_friendly_5_003: .byte W04 .byte Fs4 , v032 .byte W04 - .byte VOL , 54*bgm_friendly_mvl/mxv + .byte VOL , 54*mus_poke_mart_mvl/mxv .byte W24 .byte N08 , Fs3 , v112 .byte W08 @@ -2126,13 +2126,13 @@ bgm_friendly_5_003: .byte N08 , Fs3 , v032 .byte W20 .byte PATT - .word bgm_friendly_5_000 + .word mus_poke_mart_5_000 .byte PATT - .word bgm_friendly_5_001 + .word mus_poke_mart_5_001 .byte PATT - .word bgm_friendly_5_002 + .word mus_poke_mart_5_002 .byte PATT - .word bgm_friendly_5_003 + .word mus_poke_mart_5_003 .byte W24 .byte N08 , Gs3 , v112 .byte W08 @@ -2451,27 +2451,27 @@ bgm_friendly_5_003: .byte As4 .byte W08 .byte GOTO - .word bgm_friendly_5_B1 + .word mus_poke_mart_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_friendly_6: - .byte KEYSH , bgm_friendly_key+0 +mus_poke_mart_6: + .byte KEYSH , mus_poke_mart_key+0 .byte VOICE , 83 .byte PAN , c_v+63 .byte XCMD , xIECV , 12 .byte xIECL , 8 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 32*bgm_friendly_mvl/mxv + .byte VOL , 32*mus_poke_mart_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 .byte W96 .byte W96 -bgm_friendly_6_B1: -bgm_friendly_6_000: +mus_poke_mart_6_B1: +mus_poke_mart_6_000: .byte W48 .byte N08 , Ds5 , v112 .byte W16 @@ -2486,7 +2486,7 @@ bgm_friendly_6_000: .byte PEND .byte W96 .byte PATT - .word bgm_friendly_6_000 + .word mus_poke_mart_6_000 .byte W96 .byte W48 .byte N08 , En5 , v112 @@ -2534,7 +2534,7 @@ bgm_friendly_6_000: .byte W08 .byte Fs5 .byte W56 -bgm_friendly_6_001: +mus_poke_mart_6_001: .byte W48 .byte N08 , Bn5 , v112 .byte W16 @@ -2549,7 +2549,7 @@ bgm_friendly_6_001: .byte PEND .byte W96 .byte PATT - .word bgm_friendly_6_001 + .word mus_poke_mart_6_001 .byte W96 .byte W48 .byte N08 , En6 , v112 @@ -2642,16 +2642,16 @@ bgm_friendly_6_001: .byte W96 .byte W96 .byte GOTO - .word bgm_friendly_6_B1 + .word mus_poke_mart_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_friendly_7: - .byte KEYSH , bgm_friendly_key+0 +mus_poke_mart_7: + .byte KEYSH , mus_poke_mart_key+0 .byte VOICE , 1 .byte PAN , c_v+63 - .byte VOL , 45*bgm_friendly_mvl/mxv + .byte VOL , 45*mus_poke_mart_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -2727,7 +2727,7 @@ bgm_friendly_7: .byte W03 .byte Bn2 .byte W21 -bgm_friendly_7_B1: +mus_poke_mart_7_B1: .byte W96 .byte W96 .byte W96 @@ -2757,16 +2757,16 @@ bgm_friendly_7_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_friendly_7_B1 + .word mus_poke_mart_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_friendly_8: - .byte KEYSH , bgm_friendly_key+0 +mus_poke_mart_8: + .byte KEYSH , mus_poke_mart_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 81*bgm_friendly_mvl/mxv + .byte VOL , 81*mus_poke_mart_mvl/mxv .byte N04 , Cn1 , v112 .byte N04 , Fs1 .byte W08 @@ -2878,8 +2878,8 @@ bgm_friendly_8: .byte En1 , v112 .byte N04 , Fs1 .byte W08 -bgm_friendly_8_B1: - .byte VOL , 73*bgm_friendly_mvl/mxv +mus_poke_mart_8_B1: + .byte VOL , 73*mus_poke_mart_mvl/mxv .byte N04 , Cn1 , v112 .byte N48 , An2 .byte W24 @@ -2898,7 +2898,7 @@ bgm_friendly_8_B1: .byte Cn1 , v112 .byte N04 , Fs2 , v080 .byte W08 -bgm_friendly_8_000: +mus_poke_mart_8_000: .byte N04 , Cn1 , v112 .byte N04 , Fs1 .byte W08 @@ -2926,7 +2926,7 @@ bgm_friendly_8_000: .byte N04 , Fs1 .byte W08 .byte PEND -bgm_friendly_8_001: +mus_poke_mart_8_001: .byte N04 , Cn1 , v112 .byte N04 , Fs1 .byte W08 @@ -2954,10 +2954,10 @@ bgm_friendly_8_001: .byte W08 .byte PEND .byte PATT - .word bgm_friendly_8_000 + .word mus_poke_mart_8_000 .byte PATT - .word bgm_friendly_8_001 -bgm_friendly_8_002: + .word mus_poke_mart_8_001 +mus_poke_mart_8_002: .byte N04 , Cn1 , v112 .byte N04 , Fs1 .byte W08 @@ -2986,7 +2986,7 @@ bgm_friendly_8_002: .byte N04 , Fs1 .byte W08 .byte PEND -bgm_friendly_8_003: +mus_poke_mart_8_003: .byte N04 , Cn1 , v112 .byte N04 , Fs1 .byte W08 @@ -3043,17 +3043,17 @@ bgm_friendly_8_003: .byte N04 , Fs2 , v080 .byte W08 .byte PATT - .word bgm_friendly_8_002 + .word mus_poke_mart_8_002 .byte PATT - .word bgm_friendly_8_001 + .word mus_poke_mart_8_001 .byte PATT - .word bgm_friendly_8_002 + .word mus_poke_mart_8_002 .byte PATT - .word bgm_friendly_8_001 + .word mus_poke_mart_8_001 .byte PATT - .word bgm_friendly_8_002 + .word mus_poke_mart_8_002 .byte PATT - .word bgm_friendly_8_003 + .word mus_poke_mart_8_003 .byte N04 , Cn1 , v112 .byte W16 .byte N04 @@ -3230,7 +3230,7 @@ bgm_friendly_8_003: .byte W16 .byte N04 .byte W08 -bgm_friendly_8_004: +mus_poke_mart_8_004: .byte N04 , Fs2 , v068 .byte W16 .byte Fs2 , v112 @@ -3249,9 +3249,9 @@ bgm_friendly_8_004: .byte W08 .byte PEND .byte PATT - .word bgm_friendly_8_004 + .word mus_poke_mart_8_004 .byte PATT - .word bgm_friendly_8_004 + .word mus_poke_mart_8_004 .byte N04 , Cn1 , v112 .byte W08 .byte Fs2 @@ -3279,27 +3279,27 @@ bgm_friendly_8_004: .byte En1 , v112 .byte W08 .byte GOTO - .word bgm_friendly_8_B1 + .word mus_poke_mart_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_friendly: +mus_poke_mart: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_friendly_pri @ Priority - .byte bgm_friendly_rev @ Reverb. + .byte mus_poke_mart_pri @ Priority + .byte mus_poke_mart_rev @ Reverb. - .word bgm_friendly_grp + .word mus_poke_mart_grp - .word bgm_friendly_1 - .word bgm_friendly_2 - .word bgm_friendly_3 - .word bgm_friendly_4 - .word bgm_friendly_5 - .word bgm_friendly_6 - .word bgm_friendly_7 - .word bgm_friendly_8 + .word mus_poke_mart_1 + .word mus_poke_mart_2 + .word mus_poke_mart_3 + .word mus_poke_mart_4 + .word mus_poke_mart_5 + .word mus_poke_mart_6 + .word mus_poke_mart_7 + .word mus_poke_mart_8 .end diff --git a/sound/songs/bgm_radio_tower_occupied.s b/sound/songs/mus_radio_tower_takeover.s index 748170bd4..9beb335c6 100644 --- a/sound/songs/bgm_radio_tower_occupied.s +++ b/sound/songs/mus_radio_tower_takeover.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_radio_tower_occupied_grp, voicegroup113 - .equ bgm_radio_tower_occupied_pri, 0 - .equ bgm_radio_tower_occupied_rev, reverb_set+50 - .equ bgm_radio_tower_occupied_mvl, 127 - .equ bgm_radio_tower_occupied_key, 0 - .equ bgm_radio_tower_occupied_tbs, 1 - .equ bgm_radio_tower_occupied_exg, 0 - .equ bgm_radio_tower_occupied_cmp, 1 + .equ mus_radio_tower_takeover_grp, voicegroup113 + .equ mus_radio_tower_takeover_pri, 0 + .equ mus_radio_tower_takeover_rev, reverb_set+50 + .equ mus_radio_tower_takeover_mvl, 127 + .equ mus_radio_tower_takeover_key, 0 + .equ mus_radio_tower_takeover_tbs, 1 + .equ mus_radio_tower_takeover_exg, 0 + .equ mus_radio_tower_takeover_cmp, 1 .section .rodata - .global bgm_radio_tower_occupied + .global mus_radio_tower_takeover .align 2 @********************** Track 1 **********************@ -bgm_radio_tower_occupied_1: - .byte KEYSH , bgm_radio_tower_occupied_key+0 - .byte TEMPO , 152*bgm_radio_tower_occupied_tbs/2 +mus_radio_tower_takeover_1: + .byte KEYSH , mus_radio_tower_takeover_key+0 + .byte TEMPO , 152*mus_radio_tower_takeover_tbs/2 .byte VOICE , 21 - .byte VOL , 79*bgm_radio_tower_occupied_mvl/mxv + .byte VOL , 79*mus_radio_tower_takeover_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cn4 , v112 .byte W06 .byte Dn4 .byte W06 -bgm_radio_tower_occupied_1_B1: +mus_radio_tower_takeover_1_B1: .byte N06 , Ds4 , v112 .byte W12 .byte Dn4 @@ -82,7 +82,7 @@ bgm_radio_tower_occupied_1_B1: .byte W12 .byte Fs4 .byte W12 -bgm_radio_tower_occupied_1_000: +mus_radio_tower_takeover_1_000: .byte W12 .byte N06 , Bn2 , v112 .byte W48 @@ -90,11 +90,11 @@ bgm_radio_tower_occupied_1_000: .byte W36 .byte PEND .byte PATT - .word bgm_radio_tower_occupied_1_000 + .word mus_radio_tower_takeover_1_000 .byte PATT - .word bgm_radio_tower_occupied_1_000 + .word mus_radio_tower_takeover_1_000 .byte W96 -bgm_radio_tower_occupied_1_001: +mus_radio_tower_takeover_1_001: .byte W21 .byte N03 , Bn3 , v112 .byte W03 @@ -107,7 +107,7 @@ bgm_radio_tower_occupied_1_001: .byte N36 , Ds4 .byte W12 .byte PEND -bgm_radio_tower_occupied_1_002: +mus_radio_tower_takeover_1_002: .byte W24 .byte N24 , Dn4 , v112 .byte W24 @@ -153,9 +153,9 @@ bgm_radio_tower_occupied_1_002: .byte Fs4 .byte W06 .byte PATT - .word bgm_radio_tower_occupied_1_001 + .word mus_radio_tower_takeover_1_001 .byte PATT - .word bgm_radio_tower_occupied_1_002 + .word mus_radio_tower_takeover_1_002 .byte N06 , As3 , v112 .byte W36 .byte N03 , Fs3 @@ -194,7 +194,7 @@ bgm_radio_tower_occupied_1_002: .byte W06 .byte Dn3 .byte W06 -bgm_radio_tower_occupied_1_003: +mus_radio_tower_takeover_1_003: .byte W12 .byte N06 , Fn3 , v112 .byte W48 @@ -202,9 +202,9 @@ bgm_radio_tower_occupied_1_003: .byte W36 .byte PEND .byte PATT - .word bgm_radio_tower_occupied_1_003 + .word mus_radio_tower_takeover_1_003 .byte PATT - .word bgm_radio_tower_occupied_1_003 + .word mus_radio_tower_takeover_1_003 .byte W12 .byte N06 , Fn3 , v112 .byte W48 @@ -289,21 +289,21 @@ bgm_radio_tower_occupied_1_003: .byte Dn4 .byte W06 .byte GOTO - .word bgm_radio_tower_occupied_1_B1 + .word mus_radio_tower_takeover_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_radio_tower_occupied_2: - .byte KEYSH , bgm_radio_tower_occupied_key+0 +mus_radio_tower_takeover_2: + .byte KEYSH , mus_radio_tower_takeover_key+0 .byte VOICE , 21 - .byte VOL , 79*bgm_radio_tower_occupied_mvl/mxv + .byte VOL , 79*mus_radio_tower_takeover_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cn5 , v112 .byte W06 .byte Dn5 .byte W06 -bgm_radio_tower_occupied_2_B1: +mus_radio_tower_takeover_2_B1: .byte N06 , Ds5 , v112 .byte W12 .byte Dn5 @@ -352,7 +352,7 @@ bgm_radio_tower_occupied_2_B1: .byte W12 .byte Ds5 .byte W12 -bgm_radio_tower_occupied_2_000: +mus_radio_tower_takeover_2_000: .byte W12 .byte N06 , Fn3 , v112 .byte W48 @@ -360,9 +360,9 @@ bgm_radio_tower_occupied_2_000: .byte W36 .byte PEND .byte PATT - .word bgm_radio_tower_occupied_2_000 + .word mus_radio_tower_takeover_2_000 .byte PATT - .word bgm_radio_tower_occupied_2_000 + .word mus_radio_tower_takeover_2_000 .byte N06 , Gs3 , v112 .byte W06 .byte Fn3 @@ -395,7 +395,7 @@ bgm_radio_tower_occupied_2_000: .byte W06 .byte Dn3 .byte W06 -bgm_radio_tower_occupied_2_001: +mus_radio_tower_takeover_2_001: .byte W21 .byte N03 , Dn4 , v112 .byte W03 @@ -408,7 +408,7 @@ bgm_radio_tower_occupied_2_001: .byte N36 , Fs4 .byte W12 .byte PEND -bgm_radio_tower_occupied_2_002: +mus_radio_tower_takeover_2_002: .byte W24 .byte N24 , Fn4 , v112 .byte W24 @@ -438,9 +438,9 @@ bgm_radio_tower_occupied_2_002: .byte Dn5 .byte W06 .byte PATT - .word bgm_radio_tower_occupied_2_001 + .word mus_radio_tower_takeover_2_001 .byte PATT - .word bgm_radio_tower_occupied_2_002 + .word mus_radio_tower_takeover_2_002 .byte N06 , Ds4 , v112 .byte W12 .byte Ds3 @@ -591,18 +591,18 @@ bgm_radio_tower_occupied_2_002: .byte Dn5 .byte W06 .byte GOTO - .word bgm_radio_tower_occupied_2_B1 + .word mus_radio_tower_takeover_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_radio_tower_occupied_3: - .byte KEYSH , bgm_radio_tower_occupied_key+0 +mus_radio_tower_takeover_3: + .byte KEYSH , mus_radio_tower_takeover_key+0 .byte VOICE , 21 - .byte VOL , 79*bgm_radio_tower_occupied_mvl/mxv + .byte VOL , 79*mus_radio_tower_takeover_mvl/mxv .byte PAN , c_v+0 .byte W12 -bgm_radio_tower_occupied_3_B1: +mus_radio_tower_takeover_3_B1: .byte N06 , Fn2 , v112 .byte W12 .byte Gs2 @@ -613,7 +613,7 @@ bgm_radio_tower_occupied_3_B1: .byte W24 .byte N36 , Dn2 .byte W36 -bgm_radio_tower_occupied_3_000: +mus_radio_tower_takeover_3_000: .byte N06 , Cn2 , v112 .byte W12 .byte Cn3 @@ -631,7 +631,7 @@ bgm_radio_tower_occupied_3_000: .byte Gn2 .byte W12 .byte PEND -bgm_radio_tower_occupied_3_001: +mus_radio_tower_takeover_3_001: .byte N06 , Cn2 , v112 .byte W12 .byte N06 @@ -650,10 +650,10 @@ bgm_radio_tower_occupied_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_radio_tower_occupied_3_000 + .word mus_radio_tower_takeover_3_000 .byte PATT - .word bgm_radio_tower_occupied_3_001 -bgm_radio_tower_occupied_3_002: + .word mus_radio_tower_takeover_3_001 +mus_radio_tower_takeover_3_002: .byte N06 , Gs1 , v112 .byte W12 .byte Gs2 @@ -675,7 +675,7 @@ bgm_radio_tower_occupied_3_002: .byte Cn2 .byte W06 .byte PEND -bgm_radio_tower_occupied_3_003: +mus_radio_tower_takeover_3_003: .byte N06 , Gs1 , v112 .byte W12 .byte Gs2 @@ -694,7 +694,7 @@ bgm_radio_tower_occupied_3_003: .byte W12 .byte PEND .byte PATT - .word bgm_radio_tower_occupied_3_002 + .word mus_radio_tower_takeover_3_002 .byte N06 , Gs1 , v112 .byte W12 .byte Fn2 @@ -712,19 +712,19 @@ bgm_radio_tower_occupied_3_003: .byte Gs2 .byte W12 .byte PATT - .word bgm_radio_tower_occupied_3_000 + .word mus_radio_tower_takeover_3_000 .byte PATT - .word bgm_radio_tower_occupied_3_001 + .word mus_radio_tower_takeover_3_001 .byte PATT - .word bgm_radio_tower_occupied_3_000 + .word mus_radio_tower_takeover_3_000 .byte PATT - .word bgm_radio_tower_occupied_3_001 + .word mus_radio_tower_takeover_3_001 .byte PATT - .word bgm_radio_tower_occupied_3_000 + .word mus_radio_tower_takeover_3_000 .byte PATT - .word bgm_radio_tower_occupied_3_001 + .word mus_radio_tower_takeover_3_001 .byte PATT - .word bgm_radio_tower_occupied_3_000 + .word mus_radio_tower_takeover_3_000 .byte N06 , Cn2 , v112 .byte W12 .byte N06 @@ -746,13 +746,13 @@ bgm_radio_tower_occupied_3_003: .byte Fn2 .byte W06 .byte PATT - .word bgm_radio_tower_occupied_3_002 + .word mus_radio_tower_takeover_3_002 .byte PATT - .word bgm_radio_tower_occupied_3_003 + .word mus_radio_tower_takeover_3_003 .byte PATT - .word bgm_radio_tower_occupied_3_002 + .word mus_radio_tower_takeover_3_002 .byte PATT - .word bgm_radio_tower_occupied_3_003 + .word mus_radio_tower_takeover_3_003 .byte N06 , Cn2 , v112 .byte W12 .byte Cn3 @@ -826,20 +826,20 @@ bgm_radio_tower_occupied_3_003: .byte N06 , Gs3 .byte W12 .byte GOTO - .word bgm_radio_tower_occupied_3_B1 + .word mus_radio_tower_takeover_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_radio_tower_occupied_4: - .byte KEYSH , bgm_radio_tower_occupied_key+0 +mus_radio_tower_takeover_4: + .byte KEYSH , mus_radio_tower_takeover_key+0 .byte VOICE , 126 .byte PAN , c_v+0 - .byte VOL , 41*bgm_radio_tower_occupied_mvl/mxv + .byte VOL , 41*mus_radio_tower_takeover_mvl/mxv .byte W12 -bgm_radio_tower_occupied_4_B1: +mus_radio_tower_takeover_4_B1: .byte W96 -bgm_radio_tower_occupied_4_000: +mus_radio_tower_takeover_4_000: .byte W12 .byte N12 , Gn5 , v032 .byte W24 @@ -851,40 +851,40 @@ bgm_radio_tower_occupied_4_000: .byte W12 .byte PEND .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte W96 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte W12 .byte N12 , Gn5 , v032 .byte W24 @@ -893,24 +893,24 @@ bgm_radio_tower_occupied_4_000: .byte Gn5 , v036 .byte W36 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte PATT - .word bgm_radio_tower_occupied_4_000 + .word mus_radio_tower_takeover_4_000 .byte W96 .byte W96 .byte GOTO - .word bgm_radio_tower_occupied_4_B1 + .word mus_radio_tower_takeover_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_radio_tower_occupied_5: - .byte KEYSH , bgm_radio_tower_occupied_key+0 +mus_radio_tower_takeover_5: + .byte KEYSH , mus_radio_tower_takeover_key+0 .byte VOICE , 0 - .byte VOL , 79*bgm_radio_tower_occupied_mvl/mxv + .byte VOL , 79*mus_radio_tower_takeover_mvl/mxv .byte PAN , c_v+4 .byte W12 -bgm_radio_tower_occupied_5_B1: +mus_radio_tower_takeover_5_B1: .byte N48 , An2 , v112 .byte W48 .byte N12 , En1 @@ -925,7 +925,7 @@ bgm_radio_tower_occupied_5_B1: .byte W06 .byte N06 .byte W06 -bgm_radio_tower_occupied_5_000: +mus_radio_tower_takeover_5_000: .byte N12 , Cn1 , v112 .byte W24 .byte En1 @@ -936,17 +936,17 @@ bgm_radio_tower_occupied_5_000: .byte W24 .byte PEND .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte N48 , An2 , v112 .byte W48 .byte N12 , En1 @@ -962,27 +962,27 @@ bgm_radio_tower_occupied_5_000: .byte N06 .byte W06 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte N12 , Cn1 , v112 .byte W24 .byte En1 @@ -996,9 +996,9 @@ bgm_radio_tower_occupied_5_000: .byte N06 .byte W06 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte PATT - .word bgm_radio_tower_occupied_5_000 + .word mus_radio_tower_takeover_5_000 .byte N48 , An2 , v112 .byte W48 .byte N12 , En1 @@ -1026,24 +1026,24 @@ bgm_radio_tower_occupied_5_000: .byte N06 .byte W06 .byte GOTO - .word bgm_radio_tower_occupied_5_B1 + .word mus_radio_tower_takeover_5_B1 .byte FINE @******************************************************@ .align 2 -bgm_radio_tower_occupied: +mus_radio_tower_takeover: .byte 5 @ NumTrks .byte 0 @ NumBlks - .byte bgm_radio_tower_occupied_pri @ Priority - .byte bgm_radio_tower_occupied_rev @ Reverb. + .byte mus_radio_tower_takeover_pri @ Priority + .byte mus_radio_tower_takeover_rev @ Reverb. - .word bgm_radio_tower_occupied_grp + .word mus_radio_tower_takeover_grp - .word bgm_radio_tower_occupied_1 - .word bgm_radio_tower_occupied_2 - .word bgm_radio_tower_occupied_3 - .word bgm_radio_tower_occupied_4 - .word bgm_radio_tower_occupied_5 + .word mus_radio_tower_takeover_1 + .word mus_radio_tower_takeover_2 + .word mus_radio_tower_takeover_3 + .word mus_radio_tower_takeover_4 + .word mus_radio_tower_takeover_5 .end diff --git a/sound/songs/bgm_bd_time.s b/sound/songs/mus_roulette.s index dd1cf0a63..fc86da47a 100644 --- a/sound/songs/bgm_bd_time.s +++ b/sound/songs/mus_roulette.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_bd_time_grp, voicegroup035 - .equ bgm_bd_time_pri, 0 - .equ bgm_bd_time_rev, reverb_set+50 - .equ bgm_bd_time_mvl, 127 - .equ bgm_bd_time_key, 0 - .equ bgm_bd_time_tbs, 1 - .equ bgm_bd_time_exg, 0 - .equ bgm_bd_time_cmp, 1 + .equ mus_roulette_grp, voicegroup035 + .equ mus_roulette_pri, 0 + .equ mus_roulette_rev, reverb_set+50 + .equ mus_roulette_mvl, 127 + .equ mus_roulette_key, 0 + .equ mus_roulette_tbs, 1 + .equ mus_roulette_exg, 0 + .equ mus_roulette_cmp, 1 .section .rodata - .global bgm_bd_time + .global mus_roulette .align 2 @********************** Track 1 **********************@ -bgm_bd_time_1: - .byte KEYSH , bgm_bd_time_key+0 - .byte TEMPO , 180*bgm_bd_time_tbs/2 +mus_roulette_1: + .byte KEYSH , mus_roulette_key+0 + .byte TEMPO , 180*mus_roulette_tbs/2 .byte W48 .byte VOICE , 38 - .byte VOL , 80*bgm_bd_time_mvl/mxv + .byte VOL , 80*mus_roulette_mvl/mxv .byte PAN , c_v-6 .byte N06 , Dn1 , v127 .byte W12 @@ -54,7 +54,7 @@ bgm_bd_time_1: .byte W12 .byte En1 .byte W12 - .byte TEMPO , 170*bgm_bd_time_tbs/2 + .byte TEMPO , 170*mus_roulette_tbs/2 .byte Fn1 .byte W12 .byte Cn2 @@ -63,32 +63,32 @@ bgm_bd_time_1: .byte W12 .byte Cn2 .byte W12 - .byte TEMPO , 160*bgm_bd_time_tbs/2 + .byte TEMPO , 160*mus_roulette_tbs/2 .byte Fn1 .byte W12 .byte Cn2 .byte W12 - .byte TEMPO , 150*bgm_bd_time_tbs/2 + .byte TEMPO , 150*mus_roulette_tbs/2 .byte Fn1 .byte W12 .byte Cn2 .byte W12 - .byte TEMPO , 140*bgm_bd_time_tbs/2 + .byte TEMPO , 140*mus_roulette_tbs/2 .byte Fn1 .byte W12 .byte Cn2 .byte W12 - .byte TEMPO , 130*bgm_bd_time_tbs/2 + .byte TEMPO , 130*mus_roulette_tbs/2 .byte Fn1 .byte W12 .byte Cn2 .byte W12 - .byte TEMPO , 120*bgm_bd_time_tbs/2 + .byte TEMPO , 120*mus_roulette_tbs/2 .byte Cn1 .byte W12 .byte Fn1 .byte W12 - .byte TEMPO , 110*bgm_bd_time_tbs/2 + .byte TEMPO , 110*mus_roulette_tbs/2 .byte Dn1 .byte W12 .byte Fs1 @@ -125,7 +125,7 @@ bgm_bd_time_1: .byte W12 .byte Gs1 .byte W12 -bgm_bd_time_1_000: +mus_roulette_1_000: .byte N06 , An1 , v127 .byte W12 .byte En2 @@ -144,23 +144,23 @@ bgm_bd_time_1_000: .byte W12 .byte PEND .byte PATT - .word bgm_bd_time_1_000 -bgm_bd_time_1_B1: + .word mus_roulette_1_000 +mus_roulette_1_B1: .byte PATT - .word bgm_bd_time_1_000 + .word mus_roulette_1_000 .byte PATT - .word bgm_bd_time_1_000 + .word mus_roulette_1_000 .byte GOTO - .word bgm_bd_time_1_B1 + .word mus_roulette_1_B1 .byte W96 .byte FINE @********************** Track 2 **********************@ -bgm_bd_time_2: - .byte KEYSH , bgm_bd_time_key+0 +mus_roulette_2: + .byte KEYSH , mus_roulette_key+0 .byte VOICE , 17 - .byte VOL , 80*bgm_bd_time_mvl/mxv + .byte VOL , 80*mus_roulette_mvl/mxv .byte PAN , c_v+0 .byte N06 , Dn3 , v092 .byte W06 @@ -266,7 +266,7 @@ bgm_bd_time_2: .byte W12 .byte N12 , Dn4 .byte W12 -bgm_bd_time_2_000: +mus_roulette_2_000: .byte N06 , An4 , v080 .byte W12 .byte N06 @@ -276,7 +276,7 @@ bgm_bd_time_2_000: .byte Gn4 .byte W24 .byte PEND -bgm_bd_time_2_001: +mus_roulette_2_001: .byte N06 , An4 , v080 .byte W12 .byte N06 @@ -290,22 +290,22 @@ bgm_bd_time_2_001: .byte Gn4 .byte W06 .byte PEND -bgm_bd_time_2_B1: +mus_roulette_2_B1: .byte PATT - .word bgm_bd_time_2_000 + .word mus_roulette_2_000 .byte PATT - .word bgm_bd_time_2_001 + .word mus_roulette_2_001 .byte GOTO - .word bgm_bd_time_2_B1 + .word mus_roulette_2_B1 .byte W96 .byte FINE @********************** Track 3 **********************@ -bgm_bd_time_3: - .byte KEYSH , bgm_bd_time_key+0 +mus_roulette_3: + .byte KEYSH , mus_roulette_key+0 .byte VOICE , 17 - .byte VOL , 80*bgm_bd_time_mvl/mxv + .byte VOL , 80*mus_roulette_mvl/mxv .byte PAN , c_v-10 .byte W03 .byte N06 , En3 , v080 @@ -412,7 +412,7 @@ bgm_bd_time_3: .byte W12 .byte N12 , Gn3 .byte W12 -bgm_bd_time_3_000: +mus_roulette_3_000: .byte N06 , En4 , v080 .byte W12 .byte N06 @@ -422,7 +422,7 @@ bgm_bd_time_3_000: .byte Cs4 .byte W24 .byte PEND -bgm_bd_time_3_001: +mus_roulette_3_001: .byte N06 , En4 , v080 .byte W12 .byte N06 @@ -436,23 +436,23 @@ bgm_bd_time_3_001: .byte Dn4 .byte W06 .byte PEND -bgm_bd_time_3_B1: +mus_roulette_3_B1: .byte PATT - .word bgm_bd_time_3_000 + .word mus_roulette_3_000 .byte PATT - .word bgm_bd_time_3_001 + .word mus_roulette_3_001 .byte GOTO - .word bgm_bd_time_3_B1 + .word mus_roulette_3_B1 .byte W96 .byte FINE @********************** Track 4 **********************@ -bgm_bd_time_4: - .byte KEYSH , bgm_bd_time_key+0 +mus_roulette_4: + .byte KEYSH , mus_roulette_key+0 .byte W48 .byte VOICE , 4 - .byte VOL , 80*bgm_bd_time_mvl/mxv + .byte VOL , 80*mus_roulette_mvl/mxv .byte PAN , c_v+0 .byte N06 , Dn5 , v052 .byte W06 @@ -518,7 +518,7 @@ bgm_bd_time_4: .byte W06 .byte Dn4 .byte W06 -bgm_bd_time_4_000: +mus_roulette_4_000: .byte N06 , Fn5 , v052 .byte W06 .byte Dn5 @@ -553,8 +553,8 @@ bgm_bd_time_4_000: .byte W06 .byte PEND .byte PATT - .word bgm_bd_time_4_000 -bgm_bd_time_4_001: + .word mus_roulette_4_000 +mus_roulette_4_001: .byte N06 , Gn5 , v052 .byte W06 .byte En5 @@ -589,8 +589,8 @@ bgm_bd_time_4_001: .byte W06 .byte PEND .byte PATT - .word bgm_bd_time_4_001 -bgm_bd_time_4_002: + .word mus_roulette_4_001 +mus_roulette_4_002: .byte N06 , An5 , v052 .byte W06 .byte Fs5 @@ -625,24 +625,24 @@ bgm_bd_time_4_002: .byte W06 .byte PEND .byte PATT - .word bgm_bd_time_4_002 -bgm_bd_time_4_B1: + .word mus_roulette_4_002 +mus_roulette_4_B1: .byte PATT - .word bgm_bd_time_4_002 + .word mus_roulette_4_002 .byte PATT - .word bgm_bd_time_4_002 + .word mus_roulette_4_002 .byte GOTO - .word bgm_bd_time_4_B1 + .word mus_roulette_4_B1 .byte W96 .byte FINE @********************** Track 5 **********************@ -bgm_bd_time_5: - .byte KEYSH , bgm_bd_time_key+0 +mus_roulette_5: + .byte KEYSH , mus_roulette_key+0 .byte W48 .byte VOICE , 5 - .byte VOL , 80*bgm_bd_time_mvl/mxv + .byte VOL , 80*mus_roulette_mvl/mxv .byte PAN , c_v+48 .byte W12 .byte N06 , Dn5 , v032 @@ -865,7 +865,7 @@ bgm_bd_time_5: .byte W06 .byte An5 .byte W06 -bgm_bd_time_5_000: +mus_roulette_5_000: .byte N06 , En5 , v032 .byte W06 .byte An4 @@ -899,7 +899,7 @@ bgm_bd_time_5_000: .byte An5 .byte W06 .byte PEND -bgm_bd_time_5_B1: +mus_roulette_5_B1: .byte N06 , En5 , v032 .byte W06 .byte Bn4 @@ -933,19 +933,19 @@ bgm_bd_time_5_B1: .byte An5 .byte W06 .byte PATT - .word bgm_bd_time_5_000 + .word mus_roulette_5_000 .byte GOTO - .word bgm_bd_time_5_B1 + .word mus_roulette_5_B1 .byte W96 .byte FINE @********************** Track 6 **********************@ -bgm_bd_time_6: - .byte KEYSH , bgm_bd_time_key+0 +mus_roulette_6: + .byte KEYSH , mus_roulette_key+0 .byte W48 .byte VOICE , 81 - .byte VOL , 80*bgm_bd_time_mvl/mxv + .byte VOL , 80*mus_roulette_mvl/mxv .byte N03 , Dn2 , v064 .byte W06 .byte N03 @@ -1138,7 +1138,7 @@ bgm_bd_time_6: .byte W06 .byte Gn4 .byte W06 -bgm_bd_time_6_000: +mus_roulette_6_000: .byte N03 , An2 , v064 .byte W06 .byte N03 @@ -1172,7 +1172,7 @@ bgm_bd_time_6_000: .byte Fs3 .byte W06 .byte PEND -bgm_bd_time_6_001: +mus_roulette_6_001: .byte N03 , An2 , v064 .byte W06 .byte N03 @@ -1206,23 +1206,23 @@ bgm_bd_time_6_001: .byte An4 .byte W06 .byte PEND -bgm_bd_time_6_B1: +mus_roulette_6_B1: .byte PATT - .word bgm_bd_time_6_000 + .word mus_roulette_6_000 .byte PATT - .word bgm_bd_time_6_001 + .word mus_roulette_6_001 .byte GOTO - .word bgm_bd_time_6_B1 + .word mus_roulette_6_B1 .byte W96 .byte FINE @********************** Track 7 **********************@ -bgm_bd_time_7: - .byte KEYSH , bgm_bd_time_key+0 +mus_roulette_7: + .byte KEYSH , mus_roulette_key+0 .byte W48 .byte VOICE , 0 - .byte VOL , 80*bgm_bd_time_mvl/mxv + .byte VOL , 80*mus_roulette_mvl/mxv .byte N06 , Cn1 , v120 .byte W12 .byte Fs1 , v072 @@ -1243,7 +1243,7 @@ bgm_bd_time_7: .byte W06 .byte Cn1 , v120 .byte W06 -bgm_bd_time_7_000: +mus_roulette_7_000: .byte N06 , Cn1 , v120 .byte W12 .byte Fs1 , v072 @@ -1263,7 +1263,7 @@ bgm_bd_time_7_000: .byte Cn1 , v120 .byte W06 .byte PEND -bgm_bd_time_7_001: +mus_roulette_7_001: .byte N06 , Cn1 , v120 .byte W12 .byte Fs1 , v072 @@ -1286,42 +1286,42 @@ bgm_bd_time_7_001: .byte W06 .byte PEND .byte PATT - .word bgm_bd_time_7_000 + .word mus_roulette_7_000 .byte PATT - .word bgm_bd_time_7_001 + .word mus_roulette_7_001 .byte PATT - .word bgm_bd_time_7_000 + .word mus_roulette_7_000 .byte PATT - .word bgm_bd_time_7_001 + .word mus_roulette_7_001 .byte PATT - .word bgm_bd_time_7_000 -bgm_bd_time_7_B1: + .word mus_roulette_7_000 +mus_roulette_7_B1: .byte PATT - .word bgm_bd_time_7_001 + .word mus_roulette_7_001 .byte PATT - .word bgm_bd_time_7_000 + .word mus_roulette_7_000 .byte GOTO - .word bgm_bd_time_7_B1 + .word mus_roulette_7_B1 .byte W96 .byte FINE @******************************************************@ .align 2 -bgm_bd_time: +mus_roulette: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_bd_time_pri @ Priority - .byte bgm_bd_time_rev @ Reverb. + .byte mus_roulette_pri @ Priority + .byte mus_roulette_rev @ Reverb. - .word bgm_bd_time_grp + .word mus_roulette_grp - .word bgm_bd_time_1 - .word bgm_bd_time_2 - .word bgm_bd_time_3 - .word bgm_bd_time_4 - .word bgm_bd_time_5 - .word bgm_bd_time_6 - .word bgm_bd_time_7 + .word mus_roulette_1 + .word mus_roulette_2 + .word mus_roulette_3 + .word mus_roulette_4 + .word mus_roulette_5 + .word mus_roulette_6 + .word mus_roulette_7 .end diff --git a/sound/songs/bgm_dooro1.s b/sound/songs/mus_route101.s index c316e7eb4..6965ec0fa 100644 --- a/sound/songs/bgm_dooro1.s +++ b/sound/songs/mus_route101.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_dooro1_grp, voicegroup008 - .equ bgm_dooro1_pri, 0 - .equ bgm_dooro1_rev, reverb_set+50 - .equ bgm_dooro1_mvl, 127 - .equ bgm_dooro1_key, 0 - .equ bgm_dooro1_tbs, 1 - .equ bgm_dooro1_exg, 0 - .equ bgm_dooro1_cmp, 1 + .equ mus_route101_grp, voicegroup008 + .equ mus_route101_pri, 0 + .equ mus_route101_rev, reverb_set+50 + .equ mus_route101_mvl, 127 + .equ mus_route101_key, 0 + .equ mus_route101_tbs, 1 + .equ mus_route101_exg, 0 + .equ mus_route101_cmp, 1 .section .rodata - .global bgm_dooro1 + .global mus_route101 .align 2 @********************** Track 1 **********************@ -bgm_dooro1_1: - .byte KEYSH , bgm_dooro1_key+0 - .byte TEMPO , 114*bgm_dooro1_tbs/2 +mus_route101_1: + .byte KEYSH , mus_route101_key+0 + .byte TEMPO , 114*mus_route101_tbs/2 .byte VOICE , 73 .byte LFOS , 32 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte N06 , An4 , v100 .byte W06 .byte Bn4 .byte W06 -bgm_dooro1_1_B1: +mus_route101_1_B1: .byte PAN , c_v+8 .byte N06 , An4 , v100 .byte W12 @@ -41,7 +41,7 @@ bgm_dooro1_1_B1: .byte W12 .byte An4 .byte W12 -bgm_dooro1_1_000: +mus_route101_1_000: .byte N06 , Gn4 , v100 .byte W24 .byte Fs4 @@ -51,20 +51,20 @@ bgm_dooro1_1_000: .byte Bn4 .byte W24 .byte PEND -bgm_dooro1_1_001: +mus_route101_1_001: .byte N72 , An4 , v100 .byte W24 .byte MOD , 7 .byte W36 - .byte VOL , 71*bgm_dooro1_mvl/mxv + .byte VOL , 71*mus_route101_mvl/mxv .byte W06 - .byte 63*bgm_dooro1_mvl/mxv + .byte 63*mus_route101_mvl/mxv .byte W03 - .byte 49*bgm_dooro1_mvl/mxv + .byte 49*mus_route101_mvl/mxv .byte W03 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte N06 , Fs4 .byte W06 .byte Gn4 @@ -105,9 +105,9 @@ bgm_dooro1_1_001: .byte An4 .byte W12 .byte PATT - .word bgm_dooro1_1_000 + .word mus_route101_1_000 .byte PATT - .word bgm_dooro1_1_001 + .word mus_route101_1_001 .byte N06 , An4 , v100 .byte W06 .byte Gn4 @@ -147,7 +147,7 @@ bgm_dooro1_1_001: .byte W12 .byte MOD , 4 .byte W12 -bgm_dooro1_1_002: +mus_route101_1_002: .byte MOD , 0 .byte N06 , An4 , v100 .byte W12 @@ -186,7 +186,7 @@ bgm_dooro1_1_002: .byte MOD , 4 .byte W12 .byte PATT - .word bgm_dooro1_1_002 + .word mus_route101_1_002 .byte N06 , Bn4 , v100 .byte W12 .byte N06 @@ -243,40 +243,40 @@ bgm_dooro1_1_002: .byte W24 .byte MOD , 7 .byte W24 - .byte VOL , 78*bgm_dooro1_mvl/mxv + .byte VOL , 78*mus_route101_mvl/mxv .byte W06 - .byte 67*bgm_dooro1_mvl/mxv + .byte 67*mus_route101_mvl/mxv .byte W06 - .byte 56*bgm_dooro1_mvl/mxv + .byte 56*mus_route101_mvl/mxv .byte W07 - .byte 45*bgm_dooro1_mvl/mxv + .byte 45*mus_route101_mvl/mxv .byte W06 - .byte 34*bgm_dooro1_mvl/mxv + .byte 34*mus_route101_mvl/mxv .byte W05 .byte MOD , 0 .byte W01 - .byte VOL , 23*bgm_dooro1_mvl/mxv + .byte VOL , 23*mus_route101_mvl/mxv .byte W04 - .byte 78*bgm_dooro1_mvl/mxv + .byte 78*mus_route101_mvl/mxv .byte W01 .byte N06 , An4 .byte W06 .byte Bn4 .byte W06 .byte GOTO - .word bgm_dooro1_1_B1 + .word mus_route101_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_dooro1_2: - .byte KEYSH , bgm_dooro1_key+0 - .byte VOL , 80*bgm_dooro1_mvl/mxv +mus_route101_2: + .byte KEYSH , mus_route101_key+0 + .byte VOL , 80*mus_route101_mvl/mxv .byte BEND , c_v+0 .byte W12 -bgm_dooro1_2_B1: +mus_route101_2_B1: .byte VOICE , 35 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte PAN , c_v-8 .byte N12 , Dn1 , v120 .byte W42 @@ -286,7 +286,7 @@ bgm_dooro1_2_B1: .byte W36 .byte An1 .byte W12 -bgm_dooro1_2_000: +mus_route101_2_000: .byte N12 , En1 , v120 .byte W18 .byte N06 @@ -305,7 +305,7 @@ bgm_dooro1_2_000: .byte N12 .byte W12 .byte PEND -bgm_dooro1_2_001: +mus_route101_2_001: .byte N12 , An1 , v120 .byte W42 .byte N06 , En1 @@ -317,7 +317,7 @@ bgm_dooro1_2_001: .byte N06 .byte W06 .byte PEND -bgm_dooro1_2_002: +mus_route101_2_002: .byte N12 , An1 , v120 .byte W24 .byte N06 @@ -343,12 +343,12 @@ bgm_dooro1_2_002: .byte An1 .byte W12 .byte PATT - .word bgm_dooro1_2_000 + .word mus_route101_2_000 .byte PATT - .word bgm_dooro1_2_001 + .word mus_route101_2_001 .byte PATT - .word bgm_dooro1_2_002 -bgm_dooro1_2_003: + .word mus_route101_2_002 +mus_route101_2_003: .byte N12 , Gn1 , v120 .byte W24 .byte N06 @@ -362,7 +362,7 @@ bgm_dooro1_2_003: .byte N06 .byte W06 .byte PEND -bgm_dooro1_2_004: +mus_route101_2_004: .byte N12 , Fs1 , v120 .byte W18 .byte N06 , An1 @@ -429,9 +429,9 @@ bgm_dooro1_2_004: .byte An1 .byte W12 .byte PATT - .word bgm_dooro1_2_003 + .word mus_route101_2_003 .byte PATT - .word bgm_dooro1_2_004 + .word mus_route101_2_004 .byte N15 , Fn1 , v120 .byte W18 .byte N06 @@ -457,43 +457,43 @@ bgm_dooro1_2_004: .byte W03 .byte BEND , c_v+0 .byte W18 - .byte VOL , 79*bgm_dooro1_mvl/mxv + .byte VOL , 79*mus_route101_mvl/mxv .byte W03 .byte BEND , c_v-32 .byte W03 - .byte VOL , 74*bgm_dooro1_mvl/mxv + .byte VOL , 74*mus_route101_mvl/mxv .byte BEND , c_v+0 .byte W06 - .byte VOL , 63*bgm_dooro1_mvl/mxv + .byte VOL , 63*mus_route101_mvl/mxv .byte W07 - .byte 54*bgm_dooro1_mvl/mxv + .byte 54*mus_route101_mvl/mxv .byte W06 - .byte 44*bgm_dooro1_mvl/mxv + .byte 44*mus_route101_mvl/mxv .byte W06 - .byte 34*bgm_dooro1_mvl/mxv + .byte 34*mus_route101_mvl/mxv .byte W07 - .byte 18*bgm_dooro1_mvl/mxv + .byte 18*mus_route101_mvl/mxv .byte W06 - .byte 10*bgm_dooro1_mvl/mxv + .byte 10*mus_route101_mvl/mxv .byte W06 - .byte 1*bgm_dooro1_mvl/mxv + .byte 1*mus_route101_mvl/mxv .byte W01 .byte GOTO - .word bgm_dooro1_2_B1 + .word mus_route101_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_dooro1_3: - .byte KEYSH , bgm_dooro1_key+0 +mus_route101_3: + .byte KEYSH , mus_route101_key+0 .byte LFOS , 28 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte XCMD , xIECV , 9 .byte xIECL , 8 .byte W12 -bgm_dooro1_3_B1: +mus_route101_3_B1: .byte VOICE , 4 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+4 .byte N06 , Fs3 , v052 @@ -513,19 +513,19 @@ bgm_dooro1_3_B1: .byte W06 .byte N06 .byte W24 -bgm_dooro1_3_000: +mus_route101_3_000: .byte W48 .byte N24 , En3 , v052 .byte W12 - .byte VOL , 59*bgm_dooro1_mvl/mxv + .byte VOL , 59*mus_route101_mvl/mxv .byte W05 - .byte 23*bgm_dooro1_mvl/mxv + .byte 23*mus_route101_mvl/mxv .byte W07 - .byte 0*bgm_dooro1_mvl/mxv + .byte 0*mus_route101_mvl/mxv .byte W24 .byte PEND -bgm_dooro1_3_001: - .byte VOL , 80*bgm_dooro1_mvl/mxv +mus_route101_3_001: + .byte VOL , 80*mus_route101_mvl/mxv .byte N03 , An3 , v052 .byte W06 .byte Gn3 @@ -559,9 +559,9 @@ bgm_dooro1_3_001: .byte N06 .byte W24 .byte PATT - .word bgm_dooro1_3_000 + .word mus_route101_3_000 .byte PATT - .word bgm_dooro1_3_001 + .word mus_route101_3_001 .byte VOICE , 5 .byte PAN , c_v-49 .byte N06 , Bn3 , v052 @@ -663,39 +663,39 @@ bgm_dooro1_3_001: .byte W12 .byte N12 .byte W12 - .byte VOL , 79*bgm_dooro1_mvl/mxv + .byte VOL , 79*mus_route101_mvl/mxv .byte N12 .byte W06 - .byte VOL , 69*bgm_dooro1_mvl/mxv + .byte VOL , 69*mus_route101_mvl/mxv .byte W06 - .byte 58*bgm_dooro1_mvl/mxv + .byte 58*mus_route101_mvl/mxv .byte N18 .byte W07 - .byte VOL , 47*bgm_dooro1_mvl/mxv + .byte VOL , 47*mus_route101_mvl/mxv .byte W06 - .byte 37*bgm_dooro1_mvl/mxv + .byte 37*mus_route101_mvl/mxv .byte W05 .byte MOD , 0 .byte W01 - .byte VOL , 27*bgm_dooro1_mvl/mxv + .byte VOL , 27*mus_route101_mvl/mxv .byte W07 - .byte 16*bgm_dooro1_mvl/mxv + .byte 16*mus_route101_mvl/mxv .byte W06 - .byte 6*bgm_dooro1_mvl/mxv + .byte 6*mus_route101_mvl/mxv .byte W04 .byte GOTO - .word bgm_dooro1_3_B1 + .word mus_route101_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_dooro1_4: - .byte KEYSH , bgm_dooro1_key+0 - .byte VOL , 80*bgm_dooro1_mvl/mxv +mus_route101_4: + .byte KEYSH , mus_route101_key+0 + .byte VOL , 80*mus_route101_mvl/mxv .byte XCMD , xIECV , 9 .byte xIECL , 8 .byte W12 -bgm_dooro1_4_B1: +mus_route101_4_B1: .byte VOICE , 5 .byte PAN , c_v-48 .byte N06 , An3 , v052 @@ -719,7 +719,7 @@ bgm_dooro1_4_B1: .byte W06 .byte Bn2 .byte W06 -bgm_dooro1_4_000: +mus_route101_4_000: .byte N06 , Cs3 , v052 .byte W12 .byte N06 @@ -736,15 +736,15 @@ bgm_dooro1_4_000: .byte W06 .byte N24 , An3 .byte W12 - .byte VOL , 59*bgm_dooro1_mvl/mxv + .byte VOL , 59*mus_route101_mvl/mxv .byte W05 - .byte 23*bgm_dooro1_mvl/mxv + .byte 23*mus_route101_mvl/mxv .byte W07 - .byte 0*bgm_dooro1_mvl/mxv + .byte 0*mus_route101_mvl/mxv .byte W24 .byte PEND -bgm_dooro1_4_001: - .byte VOL , 80*bgm_dooro1_mvl/mxv +mus_route101_4_001: + .byte VOL , 80*mus_route101_mvl/mxv .byte N03 , Cs4 , v052 .byte W06 .byte Bn3 @@ -782,9 +782,9 @@ bgm_dooro1_4_001: .byte Bn2 .byte W06 .byte PATT - .word bgm_dooro1_4_000 + .word mus_route101_4_000 .byte PATT - .word bgm_dooro1_4_001 + .word mus_route101_4_001 .byte VOICE , 8 .byte PAN , c_v+0 .byte N06 , Gn3 , v052 @@ -822,7 +822,7 @@ bgm_dooro1_4_001: .byte W06 .byte Gn4 .byte W06 -bgm_dooro1_4_002: +mus_route101_4_002: .byte VOICE , 8 .byte N06 , Fs3 , v052 .byte W06 @@ -955,7 +955,7 @@ bgm_dooro1_4_002: .byte Gn4 .byte W06 .byte PATT - .word bgm_dooro1_4_002 + .word mus_route101_4_002 .byte VOICE , 5 .byte PAN , c_v-48 .byte N06 , As3 , v060 @@ -968,15 +968,15 @@ bgm_dooro1_4_002: .byte W06 .byte N24 , Dn4 .byte W15 - .byte VOL , 68*bgm_dooro1_mvl/mxv + .byte VOL , 68*mus_route101_mvl/mxv .byte W03 - .byte 52*bgm_dooro1_mvl/mxv + .byte 52*mus_route101_mvl/mxv .byte W03 - .byte 40*bgm_dooro1_mvl/mxv + .byte 40*mus_route101_mvl/mxv .byte W03 .byte VOICE , 7 .byte PAN , c_v+48 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte N12 , Fn5 , v072 .byte W12 .byte PAN , c_v+0 @@ -1000,15 +1000,15 @@ bgm_dooro1_4_002: .byte W06 .byte N24 , An3 .byte W15 - .byte VOL , 68*bgm_dooro1_mvl/mxv + .byte VOL , 68*mus_route101_mvl/mxv .byte W03 - .byte 52*bgm_dooro1_mvl/mxv + .byte 52*mus_route101_mvl/mxv .byte W03 - .byte 40*bgm_dooro1_mvl/mxv + .byte 40*mus_route101_mvl/mxv .byte W03 .byte VOICE , 7 .byte PAN , c_v+48 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte N12 , En5 .byte W12 .byte PAN , c_v+0 @@ -1021,18 +1021,18 @@ bgm_dooro1_4_002: .byte N12 , An5 , v044 .byte W12 .byte GOTO - .word bgm_dooro1_4_B1 + .word mus_route101_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_dooro1_5: - .byte KEYSH , bgm_dooro1_key+0 - .byte VOL , 80*bgm_dooro1_mvl/mxv +mus_route101_5: + .byte KEYSH , mus_route101_key+0 + .byte VOL , 80*mus_route101_mvl/mxv .byte W12 -bgm_dooro1_5_B1: +mus_route101_5_B1: .byte VOICE , 24 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte PAN , c_v+32 .byte N06 , Dn3 , v048 .byte W12 @@ -1046,7 +1046,7 @@ bgm_dooro1_5_B1: .byte W24 .byte N24 , Dn3 , v060 .byte W24 -bgm_dooro1_5_000: +mus_route101_5_000: .byte N06 , En3 , v048 .byte W12 .byte Bn2 @@ -1060,7 +1060,7 @@ bgm_dooro1_5_000: .byte N24 , En3 , v060 .byte W24 .byte PEND -bgm_dooro1_5_001: +mus_route101_5_001: .byte N03 , An2 , v056 .byte W03 .byte Cs3 @@ -1076,7 +1076,7 @@ bgm_dooro1_5_001: .byte W44 .byte W01 .byte PEND -bgm_dooro1_5_002: +mus_route101_5_002: .byte N03 , An3 , v056 .byte W03 .byte N44 , Cs4 @@ -1102,11 +1102,11 @@ bgm_dooro1_5_002: .byte N24 , Dn3 , v060 .byte W24 .byte PATT - .word bgm_dooro1_5_000 + .word mus_route101_5_000 .byte PATT - .word bgm_dooro1_5_001 + .word mus_route101_5_001 .byte PATT - .word bgm_dooro1_5_002 + .word mus_route101_5_002 .byte W48 .byte VOICE , 24 .byte N03 , Dn4 , v044 @@ -1127,39 +1127,39 @@ bgm_dooro1_5_002: .byte N21 , Fs3 , v052 .byte W21 .byte VOICE , 48 - .byte VOL , 79*bgm_dooro1_mvl/mxv + .byte VOL , 79*mus_route101_mvl/mxv .byte PAN , c_v+0 .byte N96 , Bn2 , v108 .byte W06 - .byte VOL , 64*bgm_dooro1_mvl/mxv + .byte VOL , 64*mus_route101_mvl/mxv .byte W06 - .byte 49*bgm_dooro1_mvl/mxv + .byte 49*mus_route101_mvl/mxv .byte W06 - .byte 32*bgm_dooro1_mvl/mxv + .byte 32*mus_route101_mvl/mxv .byte W06 - .byte 35*bgm_dooro1_mvl/mxv + .byte 35*mus_route101_mvl/mxv .byte W06 - .byte 39*bgm_dooro1_mvl/mxv + .byte 39*mus_route101_mvl/mxv .byte W07 - .byte 43*bgm_dooro1_mvl/mxv + .byte 43*mus_route101_mvl/mxv .byte W06 - .byte 47*bgm_dooro1_mvl/mxv + .byte 47*mus_route101_mvl/mxv .byte W07 - .byte 51*bgm_dooro1_mvl/mxv + .byte 51*mus_route101_mvl/mxv .byte W06 - .byte 55*bgm_dooro1_mvl/mxv + .byte 55*mus_route101_mvl/mxv .byte W06 - .byte 59*bgm_dooro1_mvl/mxv + .byte 59*mus_route101_mvl/mxv .byte W07 - .byte 62*bgm_dooro1_mvl/mxv + .byte 62*mus_route101_mvl/mxv .byte W06 - .byte 67*bgm_dooro1_mvl/mxv + .byte 67*mus_route101_mvl/mxv .byte W07 - .byte 71*bgm_dooro1_mvl/mxv + .byte 71*mus_route101_mvl/mxv .byte W06 - .byte 74*bgm_dooro1_mvl/mxv + .byte 74*mus_route101_mvl/mxv .byte W06 - .byte 78*bgm_dooro1_mvl/mxv + .byte 78*mus_route101_mvl/mxv .byte W02 .byte N06 , Dn3 .byte W12 @@ -1171,18 +1171,18 @@ bgm_dooro1_5_002: .byte W12 .byte N48 , Cs3 .byte W24 - .byte VOL , 73*bgm_dooro1_mvl/mxv + .byte VOL , 73*mus_route101_mvl/mxv .byte W06 - .byte 66*bgm_dooro1_mvl/mxv + .byte 66*mus_route101_mvl/mxv .byte W06 - .byte 60*bgm_dooro1_mvl/mxv + .byte 60*mus_route101_mvl/mxv .byte W06 - .byte 43*bgm_dooro1_mvl/mxv + .byte 43*mus_route101_mvl/mxv .byte W06 .byte W48 .byte VOICE , 24 .byte PAN , c_v+32 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte N03 , Dn4 , v044 .byte W03 .byte N21 , Bn4 , v052 @@ -1201,108 +1201,108 @@ bgm_dooro1_5_002: .byte N21 , An4 , v052 .byte W21 .byte VOICE , 48 - .byte VOL , 79*bgm_dooro1_mvl/mxv + .byte VOL , 79*mus_route101_mvl/mxv .byte PAN , c_v+0 .byte N96 , As2 , v108 .byte W06 - .byte VOL , 74*bgm_dooro1_mvl/mxv + .byte VOL , 74*mus_route101_mvl/mxv .byte W06 - .byte 69*bgm_dooro1_mvl/mxv + .byte 69*mus_route101_mvl/mxv .byte W07 - .byte 63*bgm_dooro1_mvl/mxv + .byte 63*mus_route101_mvl/mxv .byte W05 - .byte 53*bgm_dooro1_mvl/mxv + .byte 53*mus_route101_mvl/mxv .byte W06 - .byte 55*bgm_dooro1_mvl/mxv + .byte 55*mus_route101_mvl/mxv .byte W06 - .byte 57*bgm_dooro1_mvl/mxv + .byte 57*mus_route101_mvl/mxv .byte W07 - .byte 60*bgm_dooro1_mvl/mxv + .byte 60*mus_route101_mvl/mxv .byte W06 - .byte 62*bgm_dooro1_mvl/mxv + .byte 62*mus_route101_mvl/mxv .byte W06 - .byte 64*bgm_dooro1_mvl/mxv + .byte 64*mus_route101_mvl/mxv .byte W07 - .byte 67*bgm_dooro1_mvl/mxv + .byte 67*mus_route101_mvl/mxv .byte W06 - .byte 69*bgm_dooro1_mvl/mxv + .byte 69*mus_route101_mvl/mxv .byte W06 - .byte 71*bgm_dooro1_mvl/mxv + .byte 71*mus_route101_mvl/mxv .byte W07 - .byte 74*bgm_dooro1_mvl/mxv + .byte 74*mus_route101_mvl/mxv .byte W06 - .byte 76*bgm_dooro1_mvl/mxv + .byte 76*mus_route101_mvl/mxv .byte W06 - .byte 78*bgm_dooro1_mvl/mxv + .byte 78*mus_route101_mvl/mxv .byte W03 - .byte 72*bgm_dooro1_mvl/mxv + .byte 72*mus_route101_mvl/mxv .byte N96 , An2 .byte W06 - .byte VOL , 63*bgm_dooro1_mvl/mxv + .byte VOL , 63*mus_route101_mvl/mxv .byte W06 - .byte 54*bgm_dooro1_mvl/mxv + .byte 54*mus_route101_mvl/mxv .byte W06 - .byte 42*bgm_dooro1_mvl/mxv + .byte 42*mus_route101_mvl/mxv .byte W06 - .byte 39*bgm_dooro1_mvl/mxv + .byte 39*mus_route101_mvl/mxv .byte W03 - .byte 42*bgm_dooro1_mvl/mxv + .byte 42*mus_route101_mvl/mxv .byte W06 - .byte 48*bgm_dooro1_mvl/mxv + .byte 48*mus_route101_mvl/mxv .byte W06 - .byte 55*bgm_dooro1_mvl/mxv + .byte 55*mus_route101_mvl/mxv .byte W07 - .byte 61*bgm_dooro1_mvl/mxv + .byte 61*mus_route101_mvl/mxv .byte W06 - .byte 68*bgm_dooro1_mvl/mxv + .byte 68*mus_route101_mvl/mxv .byte W06 - .byte 74*bgm_dooro1_mvl/mxv + .byte 74*mus_route101_mvl/mxv .byte W05 - .byte 74*bgm_dooro1_mvl/mxv + .byte 74*mus_route101_mvl/mxv .byte W06 - .byte 59*bgm_dooro1_mvl/mxv + .byte 59*mus_route101_mvl/mxv .byte W06 - .byte 44*bgm_dooro1_mvl/mxv + .byte 44*mus_route101_mvl/mxv .byte W07 - .byte 28*bgm_dooro1_mvl/mxv + .byte 28*mus_route101_mvl/mxv .byte W06 - .byte 13*bgm_dooro1_mvl/mxv + .byte 13*mus_route101_mvl/mxv .byte W08 .byte GOTO - .word bgm_dooro1_5_B1 + .word mus_route101_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_dooro1_6: - .byte KEYSH , bgm_dooro1_key+0 +mus_route101_6: + .byte KEYSH , mus_route101_key+0 .byte LFOS , 28 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte W12 -bgm_dooro1_6_B1: +mus_route101_6_B1: .byte VOICE , 74 .byte PAN , c_v+0 .byte W96 .byte W96 -bgm_dooro1_6_000: +mus_route101_6_000: .byte N48 , Cs5 , v032 .byte W24 .byte MOD , 5 .byte W12 - .byte VOL , 70*bgm_dooro1_mvl/mxv + .byte VOL , 70*mus_route101_mvl/mxv .byte W12 .byte MOD , 0 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte N48 , Dn5 .byte W24 .byte MOD , 5 .byte W12 - .byte VOL , 70*bgm_dooro1_mvl/mxv + .byte VOL , 70*mus_route101_mvl/mxv .byte W12 .byte PEND -bgm_dooro1_6_001: +mus_route101_6_001: .byte MOD , 0 - .byte VOL , 80*bgm_dooro1_mvl/mxv + .byte VOL , 80*mus_route101_mvl/mxv .byte N03 , Cs5 , v032 .byte W06 .byte Bn4 @@ -1319,9 +1319,9 @@ bgm_dooro1_6_001: .byte W96 .byte W96 .byte PATT - .word bgm_dooro1_6_000 + .word mus_route101_6_000 .byte PATT - .word bgm_dooro1_6_001 + .word mus_route101_6_001 .byte W96 .byte W48 .byte N06 , Dn5 , v032 @@ -1385,16 +1385,16 @@ bgm_dooro1_6_001: .byte 0 .byte W18 .byte GOTO - .word bgm_dooro1_6_B1 + .word mus_route101_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_dooro1_7: - .byte KEYSH , bgm_dooro1_key+0 - .byte VOL , 68*bgm_dooro1_mvl/mxv +mus_route101_7: + .byte KEYSH , mus_route101_key+0 + .byte VOL , 68*mus_route101_mvl/mxv .byte W12 -bgm_dooro1_7_B1: +mus_route101_7_B1: .byte VOICE , 127 .byte PAN , c_v+0 .byte W96 @@ -1405,7 +1405,7 @@ bgm_dooro1_7_B1: .byte W96 .byte W96 .byte W96 -bgm_dooro1_7_000: +mus_route101_7_000: .byte N06 , Gs4 , v040 .byte W06 .byte Gs4 , v032 @@ -1440,9 +1440,9 @@ bgm_dooro1_7_000: .byte W06 .byte PEND .byte PATT - .word bgm_dooro1_7_000 + .word mus_route101_7_000 .byte PATT - .word bgm_dooro1_7_000 + .word mus_route101_7_000 .byte N06 , Gs4 , v040 .byte W12 .byte Gs4 , v032 @@ -1462,9 +1462,9 @@ bgm_dooro1_7_000: .byte N06 .byte W06 .byte PATT - .word bgm_dooro1_7_000 + .word mus_route101_7_000 .byte PATT - .word bgm_dooro1_7_000 + .word mus_route101_7_000 .byte N06 , Gs4 , v040 .byte W06 .byte Gs4 , v032 @@ -1504,16 +1504,16 @@ bgm_dooro1_7_000: .byte Gs4 , v040 .byte W24 .byte GOTO - .word bgm_dooro1_7_B1 + .word mus_route101_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_dooro1_8: - .byte KEYSH , bgm_dooro1_key+0 - .byte VOL , 80*bgm_dooro1_mvl/mxv +mus_route101_8: + .byte KEYSH , mus_route101_key+0 + .byte VOL , 80*mus_route101_mvl/mxv .byte W12 -bgm_dooro1_8_B1: +mus_route101_8_B1: .byte VOICE , 0 .byte PAN , c_v+0 .byte N06 , En3 , v060 @@ -1530,7 +1530,7 @@ bgm_dooro1_8_B1: .byte W06 .byte N06 .byte W06 -bgm_dooro1_8_000: +mus_route101_8_000: .byte N06 , En3 , v060 .byte W24 .byte Fs2 , v064 @@ -1548,7 +1548,7 @@ bgm_dooro1_8_000: .byte N06 .byte W06 .byte PEND -bgm_dooro1_8_001: +mus_route101_8_001: .byte N06 , En3 , v060 .byte W24 .byte Fs2 , v064 @@ -1565,13 +1565,13 @@ bgm_dooro1_8_001: .byte W06 .byte PEND .byte PATT - .word bgm_dooro1_8_000 + .word mus_route101_8_000 .byte PATT - .word bgm_dooro1_8_001 + .word mus_route101_8_001 .byte PATT - .word bgm_dooro1_8_000 + .word mus_route101_8_000 .byte PATT - .word bgm_dooro1_8_001 + .word mus_route101_8_001 .byte N06 , En3 , v060 .byte W24 .byte Fs2 , v064 @@ -1588,7 +1588,7 @@ bgm_dooro1_8_001: .byte W06 .byte N06 .byte W06 -bgm_dooro1_8_002: +mus_route101_8_002: .byte N06 , Cn1 , v112 .byte W24 .byte N12 , Dn1 @@ -1621,8 +1621,8 @@ bgm_dooro1_8_002: .byte N06 , Cn1 .byte W12 .byte PATT - .word bgm_dooro1_8_002 -bgm_dooro1_8_003: + .word mus_route101_8_002 +mus_route101_8_003: .byte N06 , Cn1 , v112 .byte W24 .byte N12 , Dn1 @@ -1639,9 +1639,9 @@ bgm_dooro1_8_003: .byte W12 .byte PEND .byte PATT - .word bgm_dooro1_8_002 + .word mus_route101_8_002 .byte PATT - .word bgm_dooro1_8_003 + .word mus_route101_8_003 .byte N06 , Cn1 , v112 .byte W18 .byte N06 @@ -1687,27 +1687,27 @@ bgm_dooro1_8_003: .byte N12 , Dn1 .byte W24 .byte GOTO - .word bgm_dooro1_8_B1 + .word mus_route101_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_dooro1: +mus_route101: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_dooro1_pri @ Priority - .byte bgm_dooro1_rev @ Reverb. + .byte mus_route101_pri @ Priority + .byte mus_route101_rev @ Reverb. - .word bgm_dooro1_grp + .word mus_route101_grp - .word bgm_dooro1_1 - .word bgm_dooro1_2 - .word bgm_dooro1_3 - .word bgm_dooro1_4 - .word bgm_dooro1_5 - .word bgm_dooro1_6 - .word bgm_dooro1_7 - .word bgm_dooro1_8 + .word mus_route101_1 + .word mus_route101_2 + .word mus_route101_3 + .word mus_route101_4 + .word mus_route101_5 + .word mus_route101_6 + .word mus_route101_7 + .word mus_route101_8 .end diff --git a/sound/songs/bgm_nextroad.s b/sound/songs/mus_route104.s index db51b999c..19de3f364 100644 --- a/sound/songs/bgm_nextroad.s +++ b/sound/songs/mus_route104.s @@ -1,35 +1,35 @@ .include "MPlayDef.s" - .equ bgm_nextroad_grp, voicegroup044 - .equ bgm_nextroad_pri, 0 - .equ bgm_nextroad_rev, reverb_set+50 - .equ bgm_nextroad_mvl, 127 - .equ bgm_nextroad_key, 0 - .equ bgm_nextroad_tbs, 1 - .equ bgm_nextroad_exg, 0 - .equ bgm_nextroad_cmp, 1 + .equ mus_route104_grp, voicegroup044 + .equ mus_route104_pri, 0 + .equ mus_route104_rev, reverb_set+50 + .equ mus_route104_mvl, 127 + .equ mus_route104_key, 0 + .equ mus_route104_tbs, 1 + .equ mus_route104_exg, 0 + .equ mus_route104_cmp, 1 .section .rodata - .global bgm_nextroad + .global mus_route104 .align 2 @********************** Track 1 **********************@ -bgm_nextroad_1: - .byte KEYSH , bgm_nextroad_key+0 - .byte TEMPO , 128*bgm_nextroad_tbs/2 +mus_route104_1: + .byte KEYSH , mus_route104_key+0 + .byte TEMPO , 128*mus_route104_tbs/2 .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 62*bgm_nextroad_mvl/mxv + .byte VOL , 62*mus_route104_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte W96 .byte W96 -bgm_nextroad_1_B1: - .byte TEMPO , 128*bgm_nextroad_tbs/2 - .byte VOL , 32*bgm_nextroad_mvl/mxv +mus_route104_1_B1: + .byte TEMPO , 128*mus_route104_tbs/2 + .byte VOL , 32*mus_route104_mvl/mxv .byte PAN , c_v+30 .byte BEND , c_v+0 .byte W24 @@ -81,25 +81,25 @@ bgm_nextroad_1_B1: .byte N48 , Cn4 , v112 .byte W24 .byte MOD , 8 - .byte VOL , 30*bgm_nextroad_mvl/mxv + .byte VOL , 30*mus_route104_mvl/mxv .byte W04 - .byte 28*bgm_nextroad_mvl/mxv + .byte 28*mus_route104_mvl/mxv .byte W04 - .byte 27*bgm_nextroad_mvl/mxv + .byte 27*mus_route104_mvl/mxv .byte W04 - .byte 22*bgm_nextroad_mvl/mxv + .byte 22*mus_route104_mvl/mxv .byte W04 - .byte 17*bgm_nextroad_mvl/mxv + .byte 17*mus_route104_mvl/mxv .byte W04 - .byte 12*bgm_nextroad_mvl/mxv + .byte 12*mus_route104_mvl/mxv .byte W04 .byte MOD , 0 .byte N08 , Cn4 , v032 .byte W12 - .byte VOL , 33*bgm_nextroad_mvl/mxv + .byte VOL , 33*mus_route104_mvl/mxv .byte W36 .byte VOICE , 56 - .byte VOL , 61*bgm_nextroad_mvl/mxv + .byte VOL , 61*mus_route104_mvl/mxv .byte W48 .byte PAN , c_v+42 .byte W08 @@ -160,20 +160,20 @@ bgm_nextroad_1_B1: .byte N48 , Fs4 , v112 .byte W24 .byte MOD , 8 - .byte VOL , 58*bgm_nextroad_mvl/mxv + .byte VOL , 58*mus_route104_mvl/mxv .byte W04 - .byte 54*bgm_nextroad_mvl/mxv + .byte 54*mus_route104_mvl/mxv .byte W04 - .byte 49*bgm_nextroad_mvl/mxv + .byte 49*mus_route104_mvl/mxv .byte W04 - .byte 46*bgm_nextroad_mvl/mxv + .byte 46*mus_route104_mvl/mxv .byte W04 - .byte 42*bgm_nextroad_mvl/mxv + .byte 42*mus_route104_mvl/mxv .byte W04 - .byte 40*bgm_nextroad_mvl/mxv + .byte 40*mus_route104_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 61*bgm_nextroad_mvl/mxv + .byte VOL , 61*mus_route104_mvl/mxv .byte N08 , Fs4 , v032 .byte W24 .byte N04 , Fn4 , v112 @@ -187,37 +187,37 @@ bgm_nextroad_1_B1: .byte N48 , Gs4 , v112 .byte W24 .byte MOD , 8 - .byte VOL , 58*bgm_nextroad_mvl/mxv + .byte VOL , 58*mus_route104_mvl/mxv .byte W04 - .byte 51*bgm_nextroad_mvl/mxv + .byte 51*mus_route104_mvl/mxv .byte W04 - .byte 46*bgm_nextroad_mvl/mxv + .byte 46*mus_route104_mvl/mxv .byte W04 - .byte 42*bgm_nextroad_mvl/mxv + .byte 42*mus_route104_mvl/mxv .byte W04 - .byte 38*bgm_nextroad_mvl/mxv + .byte 38*mus_route104_mvl/mxv .byte W04 - .byte 36*bgm_nextroad_mvl/mxv + .byte 36*mus_route104_mvl/mxv .byte W04 .byte MOD , 0 .byte N48 , As4 .byte W04 - .byte VOL , 25*bgm_nextroad_mvl/mxv + .byte VOL , 25*mus_route104_mvl/mxv .byte W04 - .byte 40*bgm_nextroad_mvl/mxv + .byte 40*mus_route104_mvl/mxv .byte W04 - .byte 45*bgm_nextroad_mvl/mxv + .byte 45*mus_route104_mvl/mxv .byte W04 - .byte 52*bgm_nextroad_mvl/mxv + .byte 52*mus_route104_mvl/mxv .byte W04 - .byte 56*bgm_nextroad_mvl/mxv + .byte 56*mus_route104_mvl/mxv .byte W04 - .byte 61*bgm_nextroad_mvl/mxv + .byte 61*mus_route104_mvl/mxv .byte MOD , 8 .byte W04 - .byte VOL , 65*bgm_nextroad_mvl/mxv + .byte VOL , 65*mus_route104_mvl/mxv .byte W04 - .byte 61*bgm_nextroad_mvl/mxv + .byte 61*mus_route104_mvl/mxv .byte W16 .byte MOD , 0 .byte N08 , As4 , v032 @@ -231,7 +231,7 @@ bgm_nextroad_1_B1: .byte W96 .byte VOICE , 85 .byte W96 - .byte VOL , 35*bgm_nextroad_mvl/mxv + .byte VOL , 35*mus_route104_mvl/mxv .byte PAN , c_v-58 .byte BEND , c_v+1 .byte W02 @@ -323,7 +323,7 @@ bgm_nextroad_1_B1: .byte W04 .byte Gs6 .byte W02 - .byte VOL , 24*bgm_nextroad_mvl/mxv + .byte VOL , 24*mus_route104_mvl/mxv .byte PAN , c_v+58 .byte W02 .byte N04 , As6 @@ -451,8 +451,8 @@ bgm_nextroad_1_B1: .byte W04 .byte An2 .byte W02 - .byte TEMPO , 122*bgm_nextroad_tbs/2 - .byte VOL , 18*bgm_nextroad_mvl/mxv + .byte TEMPO , 122*mus_route104_tbs/2 + .byte VOL , 18*mus_route104_mvl/mxv .byte W02 .byte N04 , Fn2 .byte W04 @@ -490,8 +490,8 @@ bgm_nextroad_1_B1: .byte W04 .byte An2 .byte W02 - .byte TEMPO , 120*bgm_nextroad_tbs/2 - .byte VOL , 11*bgm_nextroad_mvl/mxv + .byte TEMPO , 120*mus_route104_tbs/2 + .byte VOL , 11*mus_route104_mvl/mxv .byte W02 .byte N04 , Fn2 .byte W04 @@ -566,32 +566,32 @@ bgm_nextroad_1_B1: .byte As4 .byte W06 .byte GOTO - .word bgm_nextroad_1_B1 + .word mus_route104_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_nextroad_2: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_2: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 56 .byte PAN , c_v-48 .byte LFOS , 44 - .byte VOL , 73*bgm_nextroad_mvl/mxv + .byte VOL , 73*mus_route104_mvl/mxv .byte XCMD , xIECV , 20 .byte xIECL , 14 .byte W96 .byte W72 - .byte VOL , 44*bgm_nextroad_mvl/mxv + .byte VOL , 44*mus_route104_mvl/mxv .byte W16 .byte N04 , Gs3 , v080 .byte W04 .byte As3 .byte W04 -bgm_nextroad_2_B1: +mus_route104_2_B1: .byte VOICE , 83 .byte PAN , c_v-48 .byte MOD , 3 - .byte VOL , 44*bgm_nextroad_mvl/mxv + .byte VOL , 44*mus_route104_mvl/mxv .byte N04 , Cn4 , v080 .byte W24 .byte N04 @@ -687,7 +687,7 @@ bgm_nextroad_2_B1: .byte VOICE , 56 .byte W96 .byte MOD , 2 - .byte VOL , 73*bgm_nextroad_mvl/mxv + .byte VOL , 73*mus_route104_mvl/mxv .byte W72 .byte N08 , Fn5 , v112 .byte W08 @@ -716,7 +716,7 @@ bgm_nextroad_2_B1: .byte N02 , Ds4 , v032 .byte W02 .byte W96 -bgm_nextroad_2_000: +mus_route104_2_000: .byte W72 .byte VOICE , 56 .byte N08 , Gn5 , v112 @@ -749,11 +749,11 @@ bgm_nextroad_2_000: .byte W96 .byte W96 .byte PATT - .word bgm_nextroad_2_000 + .word mus_route104_2_000 .byte W96 .byte W96 .byte VOICE , 60 - .byte VOL , 30*bgm_nextroad_mvl/mxv + .byte VOL , 30*mus_route104_mvl/mxv .byte PAN , c_v+47 .byte W96 .byte W72 @@ -772,16 +772,16 @@ bgm_nextroad_2_000: .byte N48 , Ds3 .byte W48 .byte GOTO - .word bgm_nextroad_2_B1 + .word mus_route104_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_nextroad_3: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_3: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 58 .byte PAN , c_v+0 - .byte VOL , 85*bgm_nextroad_mvl/mxv + .byte VOL , 85*mus_route104_mvl/mxv .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 @@ -798,10 +798,10 @@ bgm_nextroad_3: .byte W04 .byte c_v+41 .byte W04 -bgm_nextroad_3_B1: +mus_route104_3_B1: .byte VOICE , 80 .byte PAN , c_v+0 - .byte VOL , 78*bgm_nextroad_mvl/mxv + .byte VOL , 78*mus_route104_mvl/mxv .byte BEND , c_v+0 .byte N08 , Gs1 , v112 .byte W48 @@ -815,7 +815,7 @@ bgm_nextroad_3_B1: .byte W04 .byte N04 .byte W04 -bgm_nextroad_3_000: +mus_route104_3_000: .byte N08 , Gs1 , v112 .byte W48 .byte Ds1 @@ -836,47 +836,47 @@ bgm_nextroad_3_000: .byte Gn1 .byte W08 .byte PATT - .word bgm_nextroad_3_000 + .word mus_route104_3_000 .byte N08 , Fs1 , v112 .byte W48 .byte Cs1 .byte W48 .byte Fn1 .byte W48 - .byte VOL , 44*bgm_nextroad_mvl/mxv + .byte VOL , 44*mus_route104_mvl/mxv .byte N48 , Cs1 .byte W02 - .byte VOL , 46*bgm_nextroad_mvl/mxv + .byte VOL , 46*mus_route104_mvl/mxv .byte W03 - .byte 51*bgm_nextroad_mvl/mxv + .byte 51*mus_route104_mvl/mxv .byte W03 - .byte 54*bgm_nextroad_mvl/mxv + .byte 54*mus_route104_mvl/mxv .byte W04 - .byte 55*bgm_nextroad_mvl/mxv + .byte 55*mus_route104_mvl/mxv .byte W02 - .byte 58*bgm_nextroad_mvl/mxv + .byte 58*mus_route104_mvl/mxv .byte W03 - .byte 61*bgm_nextroad_mvl/mxv + .byte 61*mus_route104_mvl/mxv .byte W03 - .byte 64*bgm_nextroad_mvl/mxv + .byte 64*mus_route104_mvl/mxv .byte W04 - .byte 66*bgm_nextroad_mvl/mxv + .byte 66*mus_route104_mvl/mxv .byte W02 - .byte 68*bgm_nextroad_mvl/mxv + .byte 68*mus_route104_mvl/mxv .byte W03 - .byte 73*bgm_nextroad_mvl/mxv + .byte 73*mus_route104_mvl/mxv .byte W03 - .byte 78*bgm_nextroad_mvl/mxv + .byte 78*mus_route104_mvl/mxv .byte W04 - .byte 81*bgm_nextroad_mvl/mxv + .byte 81*mus_route104_mvl/mxv .byte W02 - .byte 85*bgm_nextroad_mvl/mxv + .byte 85*mus_route104_mvl/mxv .byte W03 - .byte 88*bgm_nextroad_mvl/mxv + .byte 88*mus_route104_mvl/mxv .byte W03 - .byte 91*bgm_nextroad_mvl/mxv + .byte 91*mus_route104_mvl/mxv .byte W04 - .byte 61*bgm_nextroad_mvl/mxv + .byte 61*mus_route104_mvl/mxv .byte N08 , Fs1 .byte W24 .byte Cs1 @@ -888,7 +888,7 @@ bgm_nextroad_3_000: .byte N24 , Gn1 .byte W24 .byte VOICE , 38 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte N08 , Cs1 .byte W16 .byte N04 @@ -903,12 +903,12 @@ bgm_nextroad_3_000: .byte W16 .byte VOICE , 56 .byte W08 - .byte VOL , 74*bgm_nextroad_mvl/mxv + .byte VOL , 74*mus_route104_mvl/mxv .byte N08 , Cn5 .byte W10 .byte VOICE , 38 .byte W06 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte N08 , Cn2 .byte W08 .byte PAN , c_v+0 @@ -937,12 +937,12 @@ bgm_nextroad_3_000: .byte N08 , Cn1 .byte W24 .byte VOICE , 56 - .byte VOL , 74*bgm_nextroad_mvl/mxv + .byte VOL , 74*mus_route104_mvl/mxv .byte N08 , Ds5 .byte W10 .byte VOICE , 38 .byte W06 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte N08 , Cn2 .byte W08 .byte Fn1 @@ -985,12 +985,12 @@ bgm_nextroad_3_000: .byte W04 .byte VOICE , 56 .byte W04 - .byte VOL , 73*bgm_nextroad_mvl/mxv + .byte VOL , 73*mus_route104_mvl/mxv .byte N08 , Ds5 .byte W10 .byte VOICE , 38 .byte W02 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte W04 .byte N08 , As1 .byte W08 @@ -1032,17 +1032,17 @@ bgm_nextroad_3_000: .byte N24 , Ds1 .byte W24 .byte GOTO - .word bgm_nextroad_3_B1 + .word mus_route104_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_nextroad_4: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_4: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte MOD , 1 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte PAN , c_v+8 .byte BEND , c_v+0 .byte W96 @@ -1051,7 +1051,7 @@ bgm_nextroad_4: .byte W04 .byte Cs3 .byte W04 -bgm_nextroad_4_B1: +mus_route104_4_B1: .byte PAN , c_v+3 .byte N08 , Ds3 , v124 .byte W03 @@ -1086,23 +1086,23 @@ bgm_nextroad_4_B1: .byte N48 , Cs3 , v124 .byte W24 .byte MOD , 8 - .byte VOL , 95*bgm_nextroad_mvl/mxv + .byte VOL , 95*mus_route104_mvl/mxv .byte W04 - .byte 84*bgm_nextroad_mvl/mxv + .byte 84*mus_route104_mvl/mxv .byte W04 - .byte 73*bgm_nextroad_mvl/mxv + .byte 73*mus_route104_mvl/mxv .byte W04 - .byte 63*bgm_nextroad_mvl/mxv + .byte 63*mus_route104_mvl/mxv .byte W04 - .byte 51*bgm_nextroad_mvl/mxv + .byte 51*mus_route104_mvl/mxv .byte W04 - .byte 45*bgm_nextroad_mvl/mxv + .byte 45*mus_route104_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_nextroad_mvl/mxv + .byte VOL , 45*mus_route104_mvl/mxv .byte N08 , Cs3 , v032 .byte W12 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte W12 .byte N04 , Cn3 , v124 .byte W04 @@ -1115,26 +1115,26 @@ bgm_nextroad_4_B1: .byte N48 , Ds3 , v124 .byte W24 .byte MOD , 8 - .byte VOL , 95*bgm_nextroad_mvl/mxv + .byte VOL , 95*mus_route104_mvl/mxv .byte W04 - .byte 84*bgm_nextroad_mvl/mxv + .byte 84*mus_route104_mvl/mxv .byte W04 - .byte 73*bgm_nextroad_mvl/mxv + .byte 73*mus_route104_mvl/mxv .byte W04 - .byte 63*bgm_nextroad_mvl/mxv + .byte 63*mus_route104_mvl/mxv .byte W04 - .byte 51*bgm_nextroad_mvl/mxv + .byte 51*mus_route104_mvl/mxv .byte W04 - .byte 45*bgm_nextroad_mvl/mxv + .byte 45*mus_route104_mvl/mxv .byte W04 .byte VOICE , 60 .byte MOD , 0 - .byte VOL , 38*bgm_nextroad_mvl/mxv + .byte VOL , 38*mus_route104_mvl/mxv .byte N08 , Ds3 , v032 .byte W04 - .byte VOL , 36*bgm_nextroad_mvl/mxv + .byte VOL , 36*mus_route104_mvl/mxv .byte W08 - .byte 97*bgm_nextroad_mvl/mxv + .byte 97*mus_route104_mvl/mxv .byte W04 .byte N04 , Cn4 , v124 .byte W04 @@ -1151,24 +1151,24 @@ bgm_nextroad_4_B1: .byte N52 , Ds4 .byte W24 .byte MOD , 8 - .byte VOL , 95*bgm_nextroad_mvl/mxv + .byte VOL , 95*mus_route104_mvl/mxv .byte W04 - .byte 84*bgm_nextroad_mvl/mxv + .byte 84*mus_route104_mvl/mxv .byte W04 - .byte 73*bgm_nextroad_mvl/mxv + .byte 73*mus_route104_mvl/mxv .byte W04 - .byte 63*bgm_nextroad_mvl/mxv + .byte 63*mus_route104_mvl/mxv .byte W04 - .byte 51*bgm_nextroad_mvl/mxv + .byte 51*mus_route104_mvl/mxv .byte W04 - .byte 45*bgm_nextroad_mvl/mxv + .byte 45*mus_route104_mvl/mxv .byte W04 .byte MOD , 1 - .byte VOL , 38*bgm_nextroad_mvl/mxv + .byte VOL , 38*mus_route104_mvl/mxv .byte W04 .byte N04 , Ds4 , v032 .byte W04 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte N04 , Fs3 , v124 .byte W04 .byte Fs3 , v032 @@ -1221,22 +1221,22 @@ bgm_nextroad_4_B1: .byte N48 , Fs3 , v124 .byte W24 .byte MOD , 8 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte W04 - .byte 89*bgm_nextroad_mvl/mxv + .byte 89*mus_route104_mvl/mxv .byte W04 - .byte 82*bgm_nextroad_mvl/mxv + .byte 82*mus_route104_mvl/mxv .byte W04 - .byte 75*bgm_nextroad_mvl/mxv + .byte 75*mus_route104_mvl/mxv .byte W04 - .byte 70*bgm_nextroad_mvl/mxv + .byte 70*mus_route104_mvl/mxv .byte W04 - .byte 63*bgm_nextroad_mvl/mxv + .byte 63*mus_route104_mvl/mxv .byte W04 .byte MOD , 1 .byte N08 , Fs3 , v032 .byte W08 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte W16 .byte N04 , Fn3 , v124 .byte W04 @@ -1248,46 +1248,46 @@ bgm_nextroad_4_B1: .byte W04 .byte N72 , Gs3 , v124 .byte W08 - .byte VOL , 80*bgm_nextroad_mvl/mxv + .byte VOL , 80*mus_route104_mvl/mxv .byte W04 - .byte 72*bgm_nextroad_mvl/mxv + .byte 72*mus_route104_mvl/mxv .byte W04 - .byte 64*bgm_nextroad_mvl/mxv + .byte 64*mus_route104_mvl/mxv .byte W04 - .byte 54*bgm_nextroad_mvl/mxv + .byte 54*mus_route104_mvl/mxv .byte W04 - .byte 44*bgm_nextroad_mvl/mxv + .byte 44*mus_route104_mvl/mxv .byte W04 - .byte 38*bgm_nextroad_mvl/mxv + .byte 38*mus_route104_mvl/mxv .byte W04 - .byte 35*bgm_nextroad_mvl/mxv + .byte 35*mus_route104_mvl/mxv .byte W04 - .byte 38*bgm_nextroad_mvl/mxv + .byte 38*mus_route104_mvl/mxv .byte W04 - .byte 42*bgm_nextroad_mvl/mxv + .byte 42*mus_route104_mvl/mxv .byte W04 - .byte 48*bgm_nextroad_mvl/mxv + .byte 48*mus_route104_mvl/mxv .byte W04 - .byte 53*bgm_nextroad_mvl/mxv + .byte 53*mus_route104_mvl/mxv .byte W04 - .byte 64*bgm_nextroad_mvl/mxv + .byte 64*mus_route104_mvl/mxv .byte W04 - .byte 71*bgm_nextroad_mvl/mxv + .byte 71*mus_route104_mvl/mxv .byte W04 - .byte 76*bgm_nextroad_mvl/mxv + .byte 76*mus_route104_mvl/mxv .byte W04 - .byte 84*bgm_nextroad_mvl/mxv + .byte 84*mus_route104_mvl/mxv .byte W04 - .byte 88*bgm_nextroad_mvl/mxv + .byte 88*mus_route104_mvl/mxv .byte W04 - .byte 95*bgm_nextroad_mvl/mxv + .byte 95*mus_route104_mvl/mxv .byte MOD , 8 .byte N04 , Cs4 .byte W04 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte N08 , Cs4 , v032 .byte W04 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte W08 .byte N04 , Ds4 , v124 .byte W04 @@ -1296,82 +1296,82 @@ bgm_nextroad_4_B1: .byte MOD , 1 .byte N32 , En4 , v124 .byte W04 - .byte VOL , 93*bgm_nextroad_mvl/mxv + .byte VOL , 93*mus_route104_mvl/mxv .byte W04 - .byte 89*bgm_nextroad_mvl/mxv + .byte 89*mus_route104_mvl/mxv .byte W04 - .byte 80*bgm_nextroad_mvl/mxv + .byte 80*mus_route104_mvl/mxv .byte W04 .byte MOD , 9 .byte W04 - .byte VOL , 74*bgm_nextroad_mvl/mxv + .byte VOL , 74*mus_route104_mvl/mxv .byte W04 - .byte 70*bgm_nextroad_mvl/mxv + .byte 70*mus_route104_mvl/mxv .byte W04 - .byte 67*bgm_nextroad_mvl/mxv + .byte 67*mus_route104_mvl/mxv .byte W04 - .byte 62*bgm_nextroad_mvl/mxv + .byte 62*mus_route104_mvl/mxv .byte MOD , 0 .byte N04 , Fs4 , v112 .byte W04 - .byte VOL , 56*bgm_nextroad_mvl/mxv + .byte VOL , 56*mus_route104_mvl/mxv .byte W04 - .byte 51*bgm_nextroad_mvl/mxv + .byte 51*mus_route104_mvl/mxv .byte N04 , En4 .byte W04 - .byte VOL , 34*bgm_nextroad_mvl/mxv + .byte VOL , 34*mus_route104_mvl/mxv .byte W04 .byte VOICE , 56 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte PAN , c_v+0 .byte N24 , Ds4 .byte W04 - .byte VOL , 76*bgm_nextroad_mvl/mxv + .byte VOL , 76*mus_route104_mvl/mxv .byte W01 - .byte 70*bgm_nextroad_mvl/mxv + .byte 70*mus_route104_mvl/mxv .byte W03 - .byte 61*bgm_nextroad_mvl/mxv + .byte 61*mus_route104_mvl/mxv .byte W01 - .byte 56*bgm_nextroad_mvl/mxv + .byte 56*mus_route104_mvl/mxv .byte W03 - .byte 50*bgm_nextroad_mvl/mxv + .byte 50*mus_route104_mvl/mxv .byte W01 - .byte 45*bgm_nextroad_mvl/mxv + .byte 45*mus_route104_mvl/mxv .byte W03 - .byte 41*bgm_nextroad_mvl/mxv + .byte 41*mus_route104_mvl/mxv .byte MOD , 8 .byte W01 - .byte VOL , 36*bgm_nextroad_mvl/mxv + .byte VOL , 36*mus_route104_mvl/mxv .byte W03 - .byte 35*bgm_nextroad_mvl/mxv + .byte 35*mus_route104_mvl/mxv .byte W01 - .byte 38*bgm_nextroad_mvl/mxv + .byte 38*mus_route104_mvl/mxv .byte W03 - .byte 42*bgm_nextroad_mvl/mxv + .byte 42*mus_route104_mvl/mxv .byte MOD , 0 .byte N24 , Ds5 , v124 .byte W01 - .byte VOL , 45*bgm_nextroad_mvl/mxv + .byte VOL , 45*mus_route104_mvl/mxv .byte W03 - .byte 54*bgm_nextroad_mvl/mxv + .byte 54*mus_route104_mvl/mxv .byte W01 - .byte 58*bgm_nextroad_mvl/mxv + .byte 58*mus_route104_mvl/mxv .byte W03 - .byte 62*bgm_nextroad_mvl/mxv + .byte 62*mus_route104_mvl/mxv .byte W01 - .byte 66*bgm_nextroad_mvl/mxv + .byte 66*mus_route104_mvl/mxv .byte W03 - .byte 72*bgm_nextroad_mvl/mxv + .byte 72*mus_route104_mvl/mxv .byte W01 - .byte 76*bgm_nextroad_mvl/mxv + .byte 76*mus_route104_mvl/mxv .byte W03 .byte MOD , 10 - .byte VOL , 87*bgm_nextroad_mvl/mxv + .byte VOL , 87*mus_route104_mvl/mxv .byte W01 - .byte 97*bgm_nextroad_mvl/mxv + .byte 97*mus_route104_mvl/mxv .byte W07 .byte MOD , 1 - .byte VOL , 90*bgm_nextroad_mvl/mxv + .byte VOL , 90*mus_route104_mvl/mxv .byte PAN , c_v+0 .byte N16 , Cn5 .byte W16 @@ -1567,57 +1567,57 @@ bgm_nextroad_4_B1: .byte 1 .byte N04 , Ds4 .byte W04 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte N04 , Fn4 .byte W04 - .byte VOL , 83*bgm_nextroad_mvl/mxv + .byte VOL , 83*mus_route104_mvl/mxv .byte N04 , Ds4 .byte W04 - .byte VOL , 69*bgm_nextroad_mvl/mxv + .byte VOL , 69*mus_route104_mvl/mxv .byte N04 , Fn4 .byte W04 - .byte VOL , 63*bgm_nextroad_mvl/mxv + .byte VOL , 63*mus_route104_mvl/mxv .byte N04 , Ds4 .byte W04 - .byte VOL , 53*bgm_nextroad_mvl/mxv + .byte VOL , 53*mus_route104_mvl/mxv .byte N04 , Fn4 .byte W04 - .byte VOL , 47*bgm_nextroad_mvl/mxv + .byte VOL , 47*mus_route104_mvl/mxv .byte N04 , Ds4 .byte W04 - .byte VOL , 38*bgm_nextroad_mvl/mxv + .byte VOL , 38*mus_route104_mvl/mxv .byte N04 , Fn4 .byte W04 - .byte VOL , 29*bgm_nextroad_mvl/mxv + .byte VOL , 29*mus_route104_mvl/mxv .byte N04 , Ds4 .byte W04 .byte Fn4 .byte W04 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte N04 , Cn2 .byte W04 .byte Cs3 .byte W04 .byte GOTO - .word bgm_nextroad_4_B1 + .word mus_route104_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_nextroad_5: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_5: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 47 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte PAN , c_v-23 .byte W96 -bgm_nextroad_5_000: +mus_route104_5_000: .byte W88 .byte N04 , Cn2 , v112 .byte W04 .byte N04 .byte W04 .byte PEND -bgm_nextroad_5_B1: +mus_route104_5_B1: .byte N08 , Ds2 , v112 .byte W48 .byte N16 , Gs1 @@ -1745,22 +1745,22 @@ bgm_nextroad_5_B1: .byte N16 , Fn2 , v112 .byte W96 .byte PATT - .word bgm_nextroad_5_000 + .word mus_route104_5_000 .byte GOTO - .word bgm_nextroad_5_B1 + .word mus_route104_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_nextroad_6: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_6: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 48 .byte PAN , c_v-39 - .byte VOL , 48*bgm_nextroad_mvl/mxv + .byte VOL , 48*mus_route104_mvl/mxv .byte LFOS , 44 .byte W96 .byte W96 -bgm_nextroad_6_B1: +mus_route104_6_B1: .byte W96 .byte W96 .byte W96 @@ -2034,29 +2034,29 @@ bgm_nextroad_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_nextroad_6_B1 + .word mus_route104_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_nextroad_7: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_7: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte PAN , c_v-63 - .byte VOL , 61*bgm_nextroad_mvl/mxv + .byte VOL , 61*mus_route104_mvl/mxv .byte XCMD , xIECV , 14 .byte xIECL , 12 .byte BENDR , 12 .byte W96 .byte MOD , 0 .byte W72 - .byte VOL , 36*bgm_nextroad_mvl/mxv + .byte VOL , 36*mus_route104_mvl/mxv .byte W24 -bgm_nextroad_7_B1: +mus_route104_7_B1: .byte VOICE , 85 .byte PAN , c_v-63 - .byte VOL , 36*bgm_nextroad_mvl/mxv + .byte VOL , 36*mus_route104_mvl/mxv .byte N04 , Ds3 , v112 .byte W24 .byte Ds3 , v096 @@ -2149,7 +2149,7 @@ bgm_nextroad_7_B1: .byte W08 .byte N04 .byte W08 - .byte VOL , 65*bgm_nextroad_mvl/mxv + .byte VOL , 65*mus_route104_mvl/mxv .byte N32 , En4 .byte W24 .byte MOD , 12 @@ -2170,7 +2170,7 @@ bgm_nextroad_7_B1: .byte W12 .byte VOICE , 84 .byte MOD , 0 - .byte VOL , 40*bgm_nextroad_mvl/mxv + .byte VOL , 40*mus_route104_mvl/mxv .byte N64 , Gs2 .byte W24 .byte MOD , 8 @@ -2304,7 +2304,7 @@ bgm_nextroad_7_B1: .byte W24 .byte VOICE , 87 .byte MOD , 3 - .byte VOL , 36*bgm_nextroad_mvl/mxv + .byte VOL , 36*mus_route104_mvl/mxv .byte PAN , c_v-58 .byte N04 , Gs3 .byte W04 @@ -2375,7 +2375,7 @@ bgm_nextroad_7_B1: .byte Gs6 .byte W04 .byte PAN , c_v+58 - .byte VOL , 28*bgm_nextroad_mvl/mxv + .byte VOL , 28*mus_route104_mvl/mxv .byte N04 , As6 .byte W04 .byte PAN , c_v+40 @@ -2474,7 +2474,7 @@ bgm_nextroad_7_B1: .byte W04 .byte An2 .byte W04 - .byte VOL , 21*bgm_nextroad_mvl/mxv + .byte VOL , 21*mus_route104_mvl/mxv .byte N04 , Fn2 .byte W04 .byte An2 @@ -2505,7 +2505,7 @@ bgm_nextroad_7_B1: .byte W04 .byte An2 .byte W04 - .byte VOL , 15*bgm_nextroad_mvl/mxv + .byte VOL , 15*mus_route104_mvl/mxv .byte N04 , Fn2 .byte W04 .byte An2 @@ -2568,15 +2568,15 @@ bgm_nextroad_7_B1: .byte Cs5 .byte W04 .byte GOTO - .word bgm_nextroad_7_B1 + .word mus_route104_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_nextroad_8: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_8: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 81 - .byte VOL , 48*bgm_nextroad_mvl/mxv + .byte VOL , 48*mus_route104_mvl/mxv .byte PAN , c_v-64 .byte LFOS , 44 .byte XCMD , xIECV , 18 @@ -2584,7 +2584,7 @@ bgm_nextroad_8: .byte BENDR , 12 .byte W96 .byte W96 -bgm_nextroad_8_B1: +mus_route104_8_B1: .byte VOICE , 81 .byte W96 .byte W96 @@ -2641,7 +2641,7 @@ bgm_nextroad_8_B1: .byte W16 .byte N04 , Cs2 .byte W08 -bgm_nextroad_8_000: +mus_route104_8_000: .byte N16 , Fn3 , v112 .byte W16 .byte N04 , Ds2 @@ -2660,7 +2660,7 @@ bgm_nextroad_8_000: .byte W08 .byte PEND .byte PATT - .word bgm_nextroad_8_000 + .word mus_route104_8_000 .byte N16 , As3 , v112 .byte W16 .byte N04 , Gs2 @@ -2694,9 +2694,9 @@ bgm_nextroad_8_000: .byte N04 , Cs2 .byte W08 .byte PATT - .word bgm_nextroad_8_000 + .word mus_route104_8_000 .byte PATT - .word bgm_nextroad_8_000 + .word mus_route104_8_000 .byte N36 , An3 , v112 .byte W24 .byte MOD , 8 @@ -2781,7 +2781,7 @@ bgm_nextroad_8_000: .byte W04 .byte Gs5 .byte W04 - .byte VOL , 38*bgm_nextroad_mvl/mxv + .byte VOL , 38*mus_route104_mvl/mxv .byte N04 , As5 .byte W04 .byte Gn5 @@ -2854,7 +2854,7 @@ bgm_nextroad_8_000: .byte W04 .byte An2 .byte W04 - .byte VOL , 30*bgm_nextroad_mvl/mxv + .byte VOL , 30*mus_route104_mvl/mxv .byte N04 , Fn2 .byte W04 .byte An2 @@ -2879,7 +2879,7 @@ bgm_nextroad_8_000: .byte W04 .byte An2 .byte W04 - .byte VOL , 22*bgm_nextroad_mvl/mxv + .byte VOL , 22*mus_route104_mvl/mxv .byte N04 , Fn2 .byte W04 .byte An2 @@ -2929,16 +2929,16 @@ bgm_nextroad_8_000: .byte Cs5 .byte W04 .byte GOTO - .word bgm_nextroad_8_B1 + .word mus_route104_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_nextroad_9: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_9: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 61*bgm_nextroad_mvl/mxv + .byte VOL , 61*mus_route104_mvl/mxv .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -2988,8 +2988,8 @@ bgm_nextroad_9: .byte W04 .byte N04 .byte W04 -bgm_nextroad_9_B1: -bgm_nextroad_9_000: +mus_route104_9_B1: +mus_route104_9_000: .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -3016,17 +3016,17 @@ bgm_nextroad_9_000: .byte W04 .byte PEND .byte PATT - .word bgm_nextroad_9_000 + .word mus_route104_9_000 .byte PATT - .word bgm_nextroad_9_000 + .word mus_route104_9_000 .byte PATT - .word bgm_nextroad_9_000 + .word mus_route104_9_000 .byte PATT - .word bgm_nextroad_9_000 + .word mus_route104_9_000 .byte PATT - .word bgm_nextroad_9_000 + .word mus_route104_9_000 .byte PATT - .word bgm_nextroad_9_000 + .word mus_route104_9_000 .byte W48 .byte N04 , En1 , v112 .byte W16 @@ -3044,7 +3044,7 @@ bgm_nextroad_9_000: .byte W04 .byte N04 .byte W04 - .byte VOL , 97*bgm_nextroad_mvl/mxv + .byte VOL , 97*mus_route104_mvl/mxv .byte N04 , Cn1 , v076 .byte N48 , An2 , v108 .byte W08 @@ -3066,7 +3066,7 @@ bgm_nextroad_9_000: .byte W16 .byte Cn1 , v112 .byte W08 -bgm_nextroad_9_001: +mus_route104_9_001: .byte N04 , Cn1 , v127 .byte W08 .byte N08 , Fs1 , v112 @@ -3088,7 +3088,7 @@ bgm_nextroad_9_001: .byte Dn1 , v112 .byte W08 .byte PEND -bgm_nextroad_9_002: +mus_route104_9_002: .byte N04 , Cn1 , v127 .byte W08 .byte N08 , Fs1 , v112 @@ -3156,9 +3156,9 @@ bgm_nextroad_9_002: .byte Cn1 , v112 .byte W08 .byte PATT - .word bgm_nextroad_9_001 + .word mus_route104_9_001 .byte PATT - .word bgm_nextroad_9_002 + .word mus_route104_9_002 .byte N04 , Cn1 , v127 .byte W08 .byte N08 , Fs1 , v112 @@ -3184,7 +3184,7 @@ bgm_nextroad_9_002: .byte W08 .byte N04 .byte W08 - .byte VOL , 62*bgm_nextroad_mvl/mxv + .byte VOL , 62*mus_route104_mvl/mxv .byte N04 , En1 .byte N48 , An2 .byte W16 @@ -3292,16 +3292,16 @@ bgm_nextroad_9_002: .byte N04 .byte W04 .byte GOTO - .word bgm_nextroad_9_B1 + .word mus_route104_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_nextroad_10: - .byte KEYSH , bgm_nextroad_key+0 +mus_route104_10: + .byte KEYSH , mus_route104_key+0 .byte VOICE , 127 .byte PAN , c_v-64 - .byte VOL , 32*bgm_nextroad_mvl/mxv + .byte VOL , 32*mus_route104_mvl/mxv .byte N01 , An3 , v112 .byte W16 .byte N01 @@ -3353,10 +3353,10 @@ bgm_nextroad_10: .byte W04 .byte N01 .byte W04 -bgm_nextroad_10_B1: +mus_route104_10_B1: .byte VOICE , 127 .byte PAN , c_v-63 - .byte VOL , 32*bgm_nextroad_mvl/mxv + .byte VOL , 32*mus_route104_mvl/mxv .byte N01 , An3 , v112 .byte W16 .byte N01 @@ -3382,7 +3382,7 @@ bgm_nextroad_10_B1: .byte W04 .byte N01 .byte W04 -bgm_nextroad_10_000: +mus_route104_10_000: .byte PAN , c_v+63 .byte N01 , An3 , v112 .byte W16 @@ -3410,7 +3410,7 @@ bgm_nextroad_10_000: .byte N01 .byte W04 .byte PEND -bgm_nextroad_10_001: +mus_route104_10_001: .byte PAN , c_v-63 .byte N01 , An3 , v112 .byte W16 @@ -3439,15 +3439,15 @@ bgm_nextroad_10_001: .byte W04 .byte PEND .byte PATT - .word bgm_nextroad_10_000 + .word mus_route104_10_000 .byte PATT - .word bgm_nextroad_10_001 + .word mus_route104_10_001 .byte PATT - .word bgm_nextroad_10_000 + .word mus_route104_10_000 .byte PATT - .word bgm_nextroad_10_001 + .word mus_route104_10_001 .byte PAN , c_v+63 - .byte VOL , 41*bgm_nextroad_mvl/mxv + .byte VOL , 41*mus_route104_mvl/mxv .byte N01 , An3 , v112 .byte W16 .byte N01 @@ -3474,7 +3474,7 @@ bgm_nextroad_10_001: .byte N01 .byte W04 .byte PAN , c_v-64 - .byte VOL , 48*bgm_nextroad_mvl/mxv + .byte VOL , 48*mus_route104_mvl/mxv .byte N01 , An5 , v124 .byte W08 .byte An5 , v080 @@ -3499,7 +3499,7 @@ bgm_nextroad_10_001: .byte W08 .byte N01 .byte W08 -bgm_nextroad_10_002: +mus_route104_10_002: .byte N01 , An5 , v124 .byte W08 .byte An5 , v080 @@ -3526,19 +3526,19 @@ bgm_nextroad_10_002: .byte W08 .byte PEND .byte PATT - .word bgm_nextroad_10_002 + .word mus_route104_10_002 .byte PATT - .word bgm_nextroad_10_002 + .word mus_route104_10_002 .byte PATT - .word bgm_nextroad_10_002 + .word mus_route104_10_002 .byte PATT - .word bgm_nextroad_10_002 + .word mus_route104_10_002 .byte PATT - .word bgm_nextroad_10_002 + .word mus_route104_10_002 .byte PATT - .word bgm_nextroad_10_002 + .word mus_route104_10_002 .byte PAN , c_v-63 - .byte VOL , 36*bgm_nextroad_mvl/mxv + .byte VOL , 36*mus_route104_mvl/mxv .byte N01 , An3 , v112 .byte W16 .byte N01 @@ -3651,29 +3651,29 @@ bgm_nextroad_10_002: .byte N01 .byte W04 .byte GOTO - .word bgm_nextroad_10_B1 + .word mus_route104_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_nextroad: +mus_route104: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_nextroad_pri @ Priority - .byte bgm_nextroad_rev @ Reverb. + .byte mus_route104_pri @ Priority + .byte mus_route104_rev @ Reverb. - .word bgm_nextroad_grp + .word mus_route104_grp - .word bgm_nextroad_1 - .word bgm_nextroad_2 - .word bgm_nextroad_3 - .word bgm_nextroad_4 - .word bgm_nextroad_5 - .word bgm_nextroad_6 - .word bgm_nextroad_7 - .word bgm_nextroad_8 - .word bgm_nextroad_9 - .word bgm_nextroad_10 + .word mus_route104_1 + .word mus_route104_2 + .word mus_route104_3 + .word mus_route104_4 + .word mus_route104_5 + .word mus_route104_6 + .word mus_route104_7 + .word mus_route104_8 + .word mus_route104_9 + .word mus_route104_10 .end diff --git a/sound/songs/bgm_dooro_x1.s b/sound/songs/mus_route110.s index 9e7ca8a27..a23f7c23c 100644 --- a/sound/songs/bgm_dooro_x1.s +++ b/sound/songs/mus_route110.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_dooro_x1_grp, voicegroup007 - .equ bgm_dooro_x1_pri, 0 - .equ bgm_dooro_x1_rev, reverb_set+50 - .equ bgm_dooro_x1_mvl, 127 - .equ bgm_dooro_x1_key, 0 - .equ bgm_dooro_x1_tbs, 1 - .equ bgm_dooro_x1_exg, 0 - .equ bgm_dooro_x1_cmp, 1 + .equ mus_route110_grp, voicegroup007 + .equ mus_route110_pri, 0 + .equ mus_route110_rev, reverb_set+50 + .equ mus_route110_mvl, 127 + .equ mus_route110_key, 0 + .equ mus_route110_tbs, 1 + .equ mus_route110_exg, 0 + .equ mus_route110_cmp, 1 .section .rodata - .global bgm_dooro_x1 + .global mus_route110 .align 2 @********************** Track 1 **********************@ -bgm_dooro_x1_1: - .byte KEYSH , bgm_dooro_x1_key+0 - .byte TEMPO , 132*bgm_dooro_x1_tbs/2 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv +mus_route110_1: + .byte KEYSH , mus_route110_key+0 + .byte TEMPO , 132*mus_route110_tbs/2 + .byte VOL , 80*mus_route110_mvl/mxv .byte W12 -bgm_dooro_x1_1_B1: +mus_route110_1_B1: .byte VOICE , 60 .byte PAN , c_v-24 .byte N12 , Fs2 , v072 @@ -95,16 +95,16 @@ bgm_dooro_x1_1_B1: .byte W06 .byte N44 , Fn3 .byte W24 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W06 - .byte 62*bgm_dooro_x1_mvl/mxv + .byte 62*mus_route110_mvl/mxv .byte W06 - .byte 46*bgm_dooro_x1_mvl/mxv + .byte 46*mus_route110_mvl/mxv .byte W06 .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv + .byte VOL , 80*mus_route110_mvl/mxv .byte N12 , Ds3 , v076 .byte W18 .byte N03 , Fn3 @@ -126,16 +126,16 @@ bgm_dooro_x1_1_B1: .byte W06 .byte N42 , Fn4 .byte W30 - .byte VOL , 75*bgm_dooro_x1_mvl/mxv + .byte VOL , 75*mus_route110_mvl/mxv .byte W03 - .byte 63*bgm_dooro_x1_mvl/mxv + .byte 63*mus_route110_mvl/mxv .byte W03 - .byte 45*bgm_dooro_x1_mvl/mxv + .byte 45*mus_route110_mvl/mxv .byte W03 - .byte 25*bgm_dooro_x1_mvl/mxv + .byte 25*mus_route110_mvl/mxv .byte W09 .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv + .byte VOL , 80*mus_route110_mvl/mxv .byte N12 , As3 , v076 .byte W18 .byte N03 , Fs3 @@ -151,40 +151,40 @@ bgm_dooro_x1_1_B1: .byte W24 .byte N21 , Fn3 .byte W12 - .byte VOL , 73*bgm_dooro_x1_mvl/mxv + .byte VOL , 73*mus_route110_mvl/mxv .byte W03 - .byte 65*bgm_dooro_x1_mvl/mxv + .byte 65*mus_route110_mvl/mxv .byte W03 - .byte 42*bgm_dooro_x1_mvl/mxv + .byte 42*mus_route110_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N21 , Fs3 .byte W12 - .byte VOL , 73*bgm_dooro_x1_mvl/mxv + .byte VOL , 73*mus_route110_mvl/mxv .byte W03 - .byte 65*bgm_dooro_x1_mvl/mxv + .byte 65*mus_route110_mvl/mxv .byte W03 - .byte 42*bgm_dooro_x1_mvl/mxv + .byte 42*mus_route110_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N21 , Gs3 .byte W12 - .byte VOL , 73*bgm_dooro_x1_mvl/mxv + .byte VOL , 73*mus_route110_mvl/mxv .byte W03 - .byte 65*bgm_dooro_x1_mvl/mxv + .byte 65*mus_route110_mvl/mxv .byte W03 - .byte 42*bgm_dooro_x1_mvl/mxv + .byte 42*mus_route110_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N21 , Fn3 .byte W12 - .byte VOL , 73*bgm_dooro_x1_mvl/mxv + .byte VOL , 73*mus_route110_mvl/mxv .byte W03 - .byte 65*bgm_dooro_x1_mvl/mxv + .byte 65*mus_route110_mvl/mxv .byte W03 - .byte 42*bgm_dooro_x1_mvl/mxv + .byte 42*mus_route110_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte PAN , c_v-24 .byte N12 , Fs3 .byte W18 @@ -359,17 +359,17 @@ bgm_dooro_x1_1_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_dooro_x1_1_B1 + .word mus_route110_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_dooro_x1_2: - .byte KEYSH , bgm_dooro_x1_key+0 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv +mus_route110_2: + .byte KEYSH , mus_route110_key+0 + .byte VOL , 80*mus_route110_mvl/mxv .byte LFOS , 28 .byte W12 -bgm_dooro_x1_2_B1: +mus_route110_2_B1: .byte VOICE , 60 .byte N24 , Fs3 , v108 .byte W30 @@ -385,34 +385,34 @@ bgm_dooro_x1_2_B1: .byte W12 .byte Cs4 .byte W12 - .byte VOL , 77*bgm_dooro_x1_mvl/mxv + .byte VOL , 77*mus_route110_mvl/mxv .byte N90 , Gs3 .byte W05 - .byte VOL , 70*bgm_dooro_x1_mvl/mxv + .byte VOL , 70*mus_route110_mvl/mxv .byte W07 - .byte 63*bgm_dooro_x1_mvl/mxv + .byte 63*mus_route110_mvl/mxv .byte W06 - .byte 59*bgm_dooro_x1_mvl/mxv + .byte 59*mus_route110_mvl/mxv .byte W06 - .byte 62*bgm_dooro_x1_mvl/mxv + .byte 62*mus_route110_mvl/mxv .byte W05 - .byte 64*bgm_dooro_x1_mvl/mxv + .byte 64*mus_route110_mvl/mxv .byte W01 .byte MOD , 4 .byte W06 - .byte VOL , 68*bgm_dooro_x1_mvl/mxv + .byte VOL , 68*mus_route110_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W07 - .byte 71*bgm_dooro_x1_mvl/mxv + .byte 71*mus_route110_mvl/mxv .byte W05 - .byte 73*bgm_dooro_x1_mvl/mxv + .byte 73*mus_route110_mvl/mxv .byte W07 - .byte 77*bgm_dooro_x1_mvl/mxv + .byte 77*mus_route110_mvl/mxv .byte W05 - .byte 78*bgm_dooro_x1_mvl/mxv + .byte 78*mus_route110_mvl/mxv .byte W07 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte W18 .byte MOD , 0 .byte W06 @@ -430,34 +430,34 @@ bgm_dooro_x1_2_B1: .byte W12 .byte Cs4 .byte W12 - .byte VOL , 77*bgm_dooro_x1_mvl/mxv + .byte VOL , 77*mus_route110_mvl/mxv .byte N90 , Gs4 .byte W05 - .byte VOL , 70*bgm_dooro_x1_mvl/mxv + .byte VOL , 70*mus_route110_mvl/mxv .byte W07 - .byte 63*bgm_dooro_x1_mvl/mxv + .byte 63*mus_route110_mvl/mxv .byte W06 - .byte 59*bgm_dooro_x1_mvl/mxv + .byte 59*mus_route110_mvl/mxv .byte W06 - .byte 62*bgm_dooro_x1_mvl/mxv + .byte 62*mus_route110_mvl/mxv .byte W05 - .byte 64*bgm_dooro_x1_mvl/mxv + .byte 64*mus_route110_mvl/mxv .byte W01 .byte MOD , 4 .byte W06 - .byte VOL , 68*bgm_dooro_x1_mvl/mxv + .byte VOL , 68*mus_route110_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W07 - .byte 71*bgm_dooro_x1_mvl/mxv + .byte 71*mus_route110_mvl/mxv .byte W05 - .byte 73*bgm_dooro_x1_mvl/mxv + .byte 73*mus_route110_mvl/mxv .byte W07 - .byte 77*bgm_dooro_x1_mvl/mxv + .byte 77*mus_route110_mvl/mxv .byte W05 - .byte 78*bgm_dooro_x1_mvl/mxv + .byte 78*mus_route110_mvl/mxv .byte W07 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte W18 .byte MOD , 0 .byte W06 @@ -708,16 +708,16 @@ bgm_dooro_x1_2_B1: .byte 0 .byte W03 .byte GOTO - .word bgm_dooro_x1_2_B1 + .word mus_route110_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_dooro_x1_3: - .byte KEYSH , bgm_dooro_x1_key+0 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv +mus_route110_3: + .byte KEYSH , mus_route110_key+0 + .byte VOL , 80*mus_route110_mvl/mxv .byte W12 -bgm_dooro_x1_3_B1: +mus_route110_3_B1: .byte W96 .byte VOICE , 14 .byte PAN , c_v+8 @@ -756,15 +756,15 @@ bgm_dooro_x1_3_B1: .byte VOICE , 60 .byte N24 , Cs3 , v064 .byte W03 - .byte VOL , 64*bgm_dooro_x1_mvl/mxv + .byte VOL , 64*mus_route110_mvl/mxv .byte W03 - .byte 67*bgm_dooro_x1_mvl/mxv + .byte 67*mus_route110_mvl/mxv .byte W03 - .byte 70*bgm_dooro_x1_mvl/mxv + .byte 70*mus_route110_mvl/mxv .byte W03 - .byte 73*bgm_dooro_x1_mvl/mxv + .byte 73*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte W09 .byte N12 , Bn2 .byte W18 @@ -850,18 +850,18 @@ bgm_dooro_x1_3_B1: .byte N44 , Fn4 .byte W24 .byte W03 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W06 - .byte 59*bgm_dooro_x1_mvl/mxv + .byte 59*mus_route110_mvl/mxv .byte W03 - .byte 43*bgm_dooro_x1_mvl/mxv + .byte 43*mus_route110_mvl/mxv .byte W06 .byte W96 .byte W48 .byte VOICE , 14 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv + .byte VOL , 80*mus_route110_mvl/mxv .byte PAN , c_v+8 .byte N18 , Gs3 , v072 .byte W18 @@ -913,19 +913,19 @@ bgm_dooro_x1_3_B1: .byte N68 , Bn3 .byte W72 .byte GOTO - .word bgm_dooro_x1_3_B1 + .word mus_route110_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_dooro_x1_4: - .byte KEYSH , bgm_dooro_x1_key+0 +mus_route110_4: + .byte KEYSH , mus_route110_key+0 .byte LFOS , 28 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv + .byte VOL , 80*mus_route110_mvl/mxv .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte W12 -bgm_dooro_x1_4_B1: +mus_route110_4_B1: .byte VOICE , 80 .byte PAN , c_v+48 .byte N12 , Cs3 , v052 @@ -974,22 +974,22 @@ bgm_dooro_x1_4_B1: .byte W24 .byte N12 , Fn4 .byte W12 -bgm_dooro_x1_4_000: +mus_route110_4_000: .byte N12 , Fs4 , v052 .byte W18 .byte N03 , Cs4 .byte W06 .byte N30 .byte W18 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 67*bgm_dooro_x1_mvl/mxv + .byte 67*mus_route110_mvl/mxv .byte W06 - .byte 55*bgm_dooro_x1_mvl/mxv + .byte 55*mus_route110_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x1_mvl/mxv + .byte 35*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N09 , Cs3 .byte W12 .byte Ds3 @@ -1033,15 +1033,15 @@ bgm_dooro_x1_4_000: .byte W06 .byte N30 , Ds4 .byte W18 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 67*bgm_dooro_x1_mvl/mxv + .byte 67*mus_route110_mvl/mxv .byte W06 - .byte 55*bgm_dooro_x1_mvl/mxv + .byte 55*mus_route110_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x1_mvl/mxv + .byte 35*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N09 , Ds3 .byte W12 .byte Fn3 @@ -1067,7 +1067,7 @@ bgm_dooro_x1_4_000: .byte N24 , Fn3 .byte W24 .byte PATT - .word bgm_dooro_x1_4_000 + .word mus_route110_4_000 .byte N03 , Gs2 , v052 .byte W06 .byte N03 @@ -1090,15 +1090,15 @@ bgm_dooro_x1_4_000: .byte W06 .byte N30 , Bn3 .byte W18 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 67*bgm_dooro_x1_mvl/mxv + .byte 67*mus_route110_mvl/mxv .byte W06 - .byte 55*bgm_dooro_x1_mvl/mxv + .byte 55*mus_route110_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x1_mvl/mxv + .byte 35*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N09 , Bn2 .byte W12 .byte Cs3 @@ -1117,18 +1117,18 @@ bgm_dooro_x1_4_000: .byte W06 .byte Ds3 .byte W06 - .byte VOL , 61*bgm_dooro_x1_mvl/mxv + .byte VOL , 61*mus_route110_mvl/mxv .byte N48 , Fn3 , v060 .byte W09 - .byte VOL , 63*bgm_dooro_x1_mvl/mxv + .byte VOL , 63*mus_route110_mvl/mxv .byte W09 - .byte 66*bgm_dooro_x1_mvl/mxv + .byte 66*mus_route110_mvl/mxv .byte W06 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W06 - .byte 74*bgm_dooro_x1_mvl/mxv + .byte 74*mus_route110_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte W12 .byte N12 , Fs3 , v052 .byte W24 @@ -1239,30 +1239,30 @@ bgm_dooro_x1_4_000: .byte W06 .byte N06 .byte W12 - .byte VOL , 63*bgm_dooro_x1_mvl/mxv + .byte VOL , 63*mus_route110_mvl/mxv .byte N36 , Cs3 , v060 .byte W09 - .byte VOL , 66*bgm_dooro_x1_mvl/mxv + .byte VOL , 66*mus_route110_mvl/mxv .byte W06 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W06 - .byte 74*bgm_dooro_x1_mvl/mxv + .byte 74*mus_route110_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte W09 .byte GOTO - .word bgm_dooro_x1_4_B1 + .word mus_route110_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_dooro_x1_5: - .byte KEYSH , bgm_dooro_x1_key+0 +mus_route110_5: + .byte KEYSH , mus_route110_key+0 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv + .byte VOL , 80*mus_route110_mvl/mxv .byte W12 -bgm_dooro_x1_5_B1: +mus_route110_5_B1: .byte VOICE , 82 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -1312,22 +1312,22 @@ bgm_dooro_x1_5_B1: .byte W24 .byte N12 , Bn3 .byte W12 -bgm_dooro_x1_5_000: +mus_route110_5_000: .byte N12 , Cs4 , v052 .byte W18 .byte N03 , As3 .byte W06 .byte N30 .byte W18 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 67*bgm_dooro_x1_mvl/mxv + .byte 67*mus_route110_mvl/mxv .byte W06 - .byte 55*bgm_dooro_x1_mvl/mxv + .byte 55*mus_route110_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x1_mvl/mxv + .byte 35*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N09 , As2 .byte W12 .byte Bn2 @@ -1371,15 +1371,15 @@ bgm_dooro_x1_5_000: .byte W06 .byte N30 , Bn3 .byte W18 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 67*bgm_dooro_x1_mvl/mxv + .byte 67*mus_route110_mvl/mxv .byte W06 - .byte 55*bgm_dooro_x1_mvl/mxv + .byte 55*mus_route110_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x1_mvl/mxv + .byte 35*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N09 , Fs2 .byte W12 .byte As2 @@ -1405,7 +1405,7 @@ bgm_dooro_x1_5_000: .byte N24 , Cs3 .byte W24 .byte PATT - .word bgm_dooro_x1_5_000 + .word mus_route110_5_000 .byte N03 , Fn2 , v052 .byte W06 .byte N03 @@ -1428,15 +1428,15 @@ bgm_dooro_x1_5_000: .byte W06 .byte N30 , Fs3 .byte W18 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 67*bgm_dooro_x1_mvl/mxv + .byte 67*mus_route110_mvl/mxv .byte W06 - .byte 55*bgm_dooro_x1_mvl/mxv + .byte 55*mus_route110_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x1_mvl/mxv + .byte 35*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N09 , Fs2 .byte W12 .byte As2 @@ -1455,22 +1455,22 @@ bgm_dooro_x1_5_000: .byte W06 .byte Bn2 .byte W06 - .byte VOL , 61*bgm_dooro_x1_mvl/mxv + .byte VOL , 61*mus_route110_mvl/mxv .byte N12 , Cs3 , v060 .byte W09 - .byte VOL , 63*bgm_dooro_x1_mvl/mxv + .byte VOL , 63*mus_route110_mvl/mxv .byte W03 .byte VOICE , 83 .byte N12 .byte W06 - .byte VOL , 66*bgm_dooro_x1_mvl/mxv + .byte VOL , 66*mus_route110_mvl/mxv .byte W06 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte N12 .byte W06 - .byte VOL , 74*bgm_dooro_x1_mvl/mxv + .byte VOL , 74*mus_route110_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte N12 .byte W12 .byte VOICE , 82 @@ -1596,30 +1596,30 @@ bgm_dooro_x1_5_000: .byte W06 .byte N06 .byte W12 - .byte VOL , 63*bgm_dooro_x1_mvl/mxv + .byte VOL , 63*mus_route110_mvl/mxv .byte N36 , Bn2 , v060 .byte W09 - .byte VOL , 66*bgm_dooro_x1_mvl/mxv + .byte VOL , 66*mus_route110_mvl/mxv .byte W06 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W06 - .byte 74*bgm_dooro_x1_mvl/mxv + .byte 74*mus_route110_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte W09 .byte GOTO - .word bgm_dooro_x1_5_B1 + .word mus_route110_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_dooro_x1_6: - .byte KEYSH , bgm_dooro_x1_key+0 +mus_route110_6: + .byte KEYSH , mus_route110_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv + .byte VOL , 80*mus_route110_mvl/mxv .byte W12 -bgm_dooro_x1_6_B1: -bgm_dooro_x1_6_000: +mus_route110_6_B1: +mus_route110_6_000: .byte N12 , Fs1 , v080 .byte W24 .byte N06 , Cs1 @@ -1646,7 +1646,7 @@ bgm_dooro_x1_6_000: .byte N12 , Cs1 .byte W12 .byte PATT - .word bgm_dooro_x1_6_000 + .word mus_route110_6_000 .byte N12 , Cs1 , v080 .byte W24 .byte N06 , Gs1 @@ -1657,7 +1657,7 @@ bgm_dooro_x1_6_000: .byte W24 .byte N12 , Fn1 .byte W12 -bgm_dooro_x1_6_001: +mus_route110_6_001: .byte N03 , Fs1 , v080 .byte W06 .byte N03 @@ -1689,7 +1689,7 @@ bgm_dooro_x1_6_001: .byte W18 .byte N12 , Cs1 .byte W12 -bgm_dooro_x1_6_002: +mus_route110_6_002: .byte N03 , Ds1 , v080 .byte W06 .byte N03 @@ -1722,7 +1722,7 @@ bgm_dooro_x1_6_002: .byte N24 , Cs1 .byte W24 .byte PATT - .word bgm_dooro_x1_6_001 + .word mus_route110_6_001 .byte N03 , Fn1 , v080 .byte W06 .byte N03 @@ -1738,7 +1738,7 @@ bgm_dooro_x1_6_002: .byte N12 , Cs1 .byte W12 .byte PATT - .word bgm_dooro_x1_6_002 + .word mus_route110_6_002 .byte N03 , Cs1 , v080 .byte W06 .byte N03 @@ -1750,7 +1750,7 @@ bgm_dooro_x1_6_002: .byte N06 .byte W48 .byte PATT - .word bgm_dooro_x1_6_000 + .word mus_route110_6_000 .byte N12 , Fn1 , v080 .byte W24 .byte N06 , Cs1 @@ -1840,20 +1840,20 @@ bgm_dooro_x1_6_002: .byte N36 , Gs1 .byte W36 .byte GOTO - .word bgm_dooro_x1_6_B1 + .word mus_route110_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_dooro_x1_7: - .byte VOL , 80*bgm_dooro_x1_mvl/mxv - .byte KEYSH , bgm_dooro_x1_key+0 +mus_route110_7: + .byte VOL , 80*mus_route110_mvl/mxv + .byte KEYSH , mus_route110_key+0 .byte VOICE , 47 .byte PAN , c_v-8 .byte N06 , Bn1 , v108 .byte W12 -bgm_dooro_x1_7_B1: - .byte VOL , 80*bgm_dooro_x1_mvl/mxv +mus_route110_7_B1: + .byte VOL , 80*mus_route110_mvl/mxv .byte N12 , Fs2 , v124 .byte W36 .byte N12 @@ -1862,7 +1862,7 @@ bgm_dooro_x1_7_B1: .byte W24 .byte N12 .byte W12 -bgm_dooro_x1_7_000: +mus_route110_7_000: .byte N12 , Cs2 , v124 .byte W36 .byte N12 @@ -1881,7 +1881,7 @@ bgm_dooro_x1_7_000: .byte N12 .byte W12 .byte PATT - .word bgm_dooro_x1_7_000 + .word mus_route110_7_000 .byte W96 .byte W96 .byte W96 @@ -1996,18 +1996,18 @@ bgm_dooro_x1_7_000: .byte Cs2 , v104 .byte W03 .byte GOTO - .word bgm_dooro_x1_7_B1 + .word mus_route110_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_dooro_x1_8: - .byte KEYSH , bgm_dooro_x1_key+0 +mus_route110_8: + .byte KEYSH , mus_route110_key+0 .byte W12 -bgm_dooro_x1_8_B1: +mus_route110_8_B1: .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv + .byte VOL , 80*mus_route110_mvl/mxv .byte N48 , Bn2 , v092 .byte W96 .byte W96 @@ -2024,24 +2024,24 @@ bgm_dooro_x1_8_B1: .byte W96 .byte W96 .byte W60 - .byte VOL , 40*bgm_dooro_x1_mvl/mxv + .byte VOL , 40*mus_route110_mvl/mxv .byte N36 , An2 , v064 .byte W06 - .byte VOL , 47*bgm_dooro_x1_mvl/mxv + .byte VOL , 47*mus_route110_mvl/mxv .byte W06 - .byte 52*bgm_dooro_x1_mvl/mxv + .byte 52*mus_route110_mvl/mxv .byte W03 - .byte 59*bgm_dooro_x1_mvl/mxv + .byte 59*mus_route110_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x1_mvl/mxv + .byte 66*mus_route110_mvl/mxv .byte W03 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W03 - .byte 73*bgm_dooro_x1_mvl/mxv + .byte 73*mus_route110_mvl/mxv .byte W03 - .byte 76*bgm_dooro_x1_mvl/mxv + .byte 76*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte W06 .byte N96 , Bn2 , v092 .byte W96 @@ -2056,38 +2056,38 @@ bgm_dooro_x1_8_B1: .byte W96 .byte N60 .byte W60 - .byte VOL , 40*bgm_dooro_x1_mvl/mxv + .byte VOL , 40*mus_route110_mvl/mxv .byte N36 , An2 , v064 .byte W06 - .byte VOL , 47*bgm_dooro_x1_mvl/mxv + .byte VOL , 47*mus_route110_mvl/mxv .byte W06 - .byte 52*bgm_dooro_x1_mvl/mxv + .byte 52*mus_route110_mvl/mxv .byte W03 - .byte 59*bgm_dooro_x1_mvl/mxv + .byte 59*mus_route110_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x1_mvl/mxv + .byte 66*mus_route110_mvl/mxv .byte W03 - .byte 69*bgm_dooro_x1_mvl/mxv + .byte 69*mus_route110_mvl/mxv .byte W03 - .byte 73*bgm_dooro_x1_mvl/mxv + .byte 73*mus_route110_mvl/mxv .byte W03 - .byte 76*bgm_dooro_x1_mvl/mxv + .byte 76*mus_route110_mvl/mxv .byte W03 - .byte 80*bgm_dooro_x1_mvl/mxv + .byte 80*mus_route110_mvl/mxv .byte W06 .byte GOTO - .word bgm_dooro_x1_8_B1 + .word mus_route110_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_dooro_x1_9: - .byte KEYSH , bgm_dooro_x1_key+0 +mus_route110_9: + .byte KEYSH , mus_route110_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_dooro_x1_mvl/mxv + .byte VOL , 80*mus_route110_mvl/mxv .byte W12 -bgm_dooro_x1_9_B1: -bgm_dooro_x1_9_000: +mus_route110_9_B1: +mus_route110_9_000: .byte W18 .byte N03 , En1 , v064 .byte W03 @@ -2099,12 +2099,12 @@ bgm_dooro_x1_9_000: .byte W24 .byte PEND .byte PATT - .word bgm_dooro_x1_9_000 + .word mus_route110_9_000 .byte PATT - .word bgm_dooro_x1_9_000 + .word mus_route110_9_000 .byte PATT - .word bgm_dooro_x1_9_000 -bgm_dooro_x1_9_001: + .word mus_route110_9_000 +mus_route110_9_001: .byte N06 , En1 , v080 .byte W18 .byte En1 , v056 @@ -2126,7 +2126,7 @@ bgm_dooro_x1_9_001: .byte N06 .byte W06 .byte PEND -bgm_dooro_x1_9_002: +mus_route110_9_002: .byte N06 , En1 , v080 .byte W18 .byte En1 , v056 @@ -2149,15 +2149,15 @@ bgm_dooro_x1_9_002: .byte W06 .byte PEND .byte PATT - .word bgm_dooro_x1_9_001 + .word mus_route110_9_001 .byte PATT - .word bgm_dooro_x1_9_002 + .word mus_route110_9_002 .byte PATT - .word bgm_dooro_x1_9_001 + .word mus_route110_9_001 .byte PATT - .word bgm_dooro_x1_9_002 + .word mus_route110_9_002 .byte PATT - .word bgm_dooro_x1_9_001 + .word mus_route110_9_001 .byte N06 , En1 , v080 .byte W18 .byte En1 , v056 @@ -2179,28 +2179,28 @@ bgm_dooro_x1_9_002: .byte W96 .byte W96 .byte GOTO - .word bgm_dooro_x1_9_B1 + .word mus_route110_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_dooro_x1: +mus_route110: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_dooro_x1_pri @ Priority - .byte bgm_dooro_x1_rev @ Reverb. + .byte mus_route110_pri @ Priority + .byte mus_route110_rev @ Reverb. - .word bgm_dooro_x1_grp + .word mus_route110_grp - .word bgm_dooro_x1_1 - .word bgm_dooro_x1_2 - .word bgm_dooro_x1_3 - .word bgm_dooro_x1_4 - .word bgm_dooro_x1_5 - .word bgm_dooro_x1_6 - .word bgm_dooro_x1_7 - .word bgm_dooro_x1_8 - .word bgm_dooro_x1_9 + .word mus_route110_1 + .word mus_route110_2 + .word mus_route110_3 + .word mus_route110_4 + .word mus_route110_5 + .word mus_route110_6 + .word mus_route110_7 + .word mus_route110_8 + .word mus_route110_9 .end diff --git a/sound/songs/bgm_ashroad.s b/sound/songs/mus_route111.s index eab28f8da..08d90b7fd 100644 --- a/sound/songs/bgm_ashroad.s +++ b/sound/songs/mus_route111.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_ashroad_grp, voicegroup052 - .equ bgm_ashroad_pri, 0 - .equ bgm_ashroad_rev, reverb_set+50 - .equ bgm_ashroad_mvl, 127 - .equ bgm_ashroad_key, 0 - .equ bgm_ashroad_tbs, 1 - .equ bgm_ashroad_exg, 0 - .equ bgm_ashroad_cmp, 1 + .equ mus_route111_grp, voicegroup052 + .equ mus_route111_pri, 0 + .equ mus_route111_rev, reverb_set+50 + .equ mus_route111_mvl, 127 + .equ mus_route111_key, 0 + .equ mus_route111_tbs, 1 + .equ mus_route111_exg, 0 + .equ mus_route111_cmp, 1 .section .rodata - .global bgm_ashroad + .global mus_route111 .align 2 @********************** Track 1 **********************@ -bgm_ashroad_1: - .byte KEYSH , bgm_ashroad_key+0 - .byte TEMPO , 120*bgm_ashroad_tbs/2 +mus_route111_1: + .byte KEYSH , mus_route111_key+0 + .byte TEMPO , 120*mus_route111_tbs/2 .byte VOICE , 56 .byte LFOS , 44 - .byte VOL , 51*bgm_ashroad_mvl/mxv + .byte VOL , 51*mus_route111_mvl/mxv .byte PAN , c_v-49 .byte N06 , Dn2 , v084 .byte W06 @@ -33,29 +33,29 @@ bgm_ashroad_1: .byte N48 , Dn3 .byte W24 .byte MOD , 8 - .byte VOL , 49*bgm_ashroad_mvl/mxv + .byte VOL , 49*mus_route111_mvl/mxv .byte W02 - .byte 46*bgm_ashroad_mvl/mxv + .byte 46*mus_route111_mvl/mxv .byte W03 - .byte 43*bgm_ashroad_mvl/mxv + .byte 43*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 35*bgm_ashroad_mvl/mxv + .byte 35*mus_route111_mvl/mxv .byte W02 - .byte 30*bgm_ashroad_mvl/mxv + .byte 30*mus_route111_mvl/mxv .byte W03 - .byte 23*bgm_ashroad_mvl/mxv + .byte 23*mus_route111_mvl/mxv .byte W03 - .byte 21*bgm_ashroad_mvl/mxv + .byte 21*mus_route111_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 51*bgm_ashroad_mvl/mxv + .byte VOL , 51*mus_route111_mvl/mxv .byte N24 , Bn2 , v088 .byte W12 .byte MOD , 7 .byte W12 -bgm_ashroad_1_B1: +mus_route111_1_B1: .byte VOICE , 80 .byte MOD , 0 .byte PAN , c_v+0 @@ -224,7 +224,7 @@ bgm_ashroad_1_B1: .byte 0 .byte N12 , Cs5 , v036 .byte W96 -bgm_ashroad_1_000: +mus_route111_1_000: .byte MOD , 0 .byte N24 , Fs4 , v112 .byte W12 @@ -246,7 +246,7 @@ bgm_ashroad_1_000: .byte Fs4 , v036 .byte W06 .byte PEND -bgm_ashroad_1_001: +mus_route111_1_001: .byte MOD , 0 .byte N24 , Gs4 , v112 .byte W12 @@ -319,9 +319,9 @@ bgm_ashroad_1_001: .byte N12 , As3 .byte W12 .byte PATT - .word bgm_ashroad_1_000 + .word mus_route111_1_000 .byte PATT - .word bgm_ashroad_1_001 + .word mus_route111_1_001 .byte MOD , 0 .byte N24 , An4 , v112 .byte W12 @@ -378,17 +378,17 @@ bgm_ashroad_1_001: .byte N12 , En5 , v036 .byte W24 .byte GOTO - .word bgm_ashroad_1_B1 + .word mus_route111_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_ashroad_2: - .byte KEYSH , bgm_ashroad_key+0 +mus_route111_2: + .byte KEYSH , mus_route111_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 67*bgm_ashroad_mvl/mxv + .byte VOL , 67*mus_route111_mvl/mxv .byte N06 , Fn2 , v096 .byte W06 .byte An2 , v104 @@ -400,28 +400,28 @@ bgm_ashroad_2: .byte N44 , Fn3 , v120 .byte W24 .byte MOD , 4 - .byte VOL , 63*bgm_ashroad_mvl/mxv + .byte VOL , 63*mus_route111_mvl/mxv .byte W02 - .byte 55*bgm_ashroad_mvl/mxv + .byte 55*mus_route111_mvl/mxv .byte W03 - .byte 52*bgm_ashroad_mvl/mxv + .byte 52*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte W04 - .byte 43*bgm_ashroad_mvl/mxv + .byte 43*mus_route111_mvl/mxv .byte W02 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W03 - .byte 33*bgm_ashroad_mvl/mxv + .byte 33*mus_route111_mvl/mxv .byte W03 - .byte 31*bgm_ashroad_mvl/mxv + .byte 31*mus_route111_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 67*bgm_ashroad_mvl/mxv + .byte VOL , 67*mus_route111_mvl/mxv .byte N24 , Dn3 , v112 .byte W24 -bgm_ashroad_2_B1: - .byte VOL , 47*bgm_ashroad_mvl/mxv +mus_route111_2_B1: + .byte VOL , 47*mus_route111_mvl/mxv .byte PAN , c_v-52 .byte N06 , En3 , v112 .byte W21 @@ -439,27 +439,27 @@ bgm_ashroad_2_B1: .byte W06 .byte Gn3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Fn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Gn3 .byte W12 -bgm_ashroad_2_000: +mus_route111_2_000: .byte N06 , En3 , v112 .byte W12 .byte N03 @@ -478,28 +478,28 @@ bgm_ashroad_2_000: .byte W06 .byte Gn3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Fn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Gn3 .byte W12 .byte PEND -bgm_ashroad_2_001: +mus_route111_2_001: .byte N06 , En3 , v112 .byte W21 .byte N03 , Fn3 @@ -516,41 +516,41 @@ bgm_ashroad_2_001: .byte W06 .byte Gn3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Fn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Gn3 .byte W12 .byte PEND .byte PATT - .word bgm_ashroad_2_000 + .word mus_route111_2_000 .byte PATT - .word bgm_ashroad_2_001 + .word mus_route111_2_001 .byte PATT - .word bgm_ashroad_2_000 + .word mus_route111_2_000 .byte PATT - .word bgm_ashroad_2_001 + .word mus_route111_2_001 .byte PATT - .word bgm_ashroad_2_000 + .word mus_route111_2_000 .byte PATT - .word bgm_ashroad_2_001 -bgm_ashroad_2_002: - .byte VOL , 47*bgm_ashroad_mvl/mxv + .word mus_route111_2_001 +mus_route111_2_002: + .byte VOL , 47*mus_route111_mvl/mxv .byte N06 , En3 , v112 .byte W12 .byte N03 @@ -569,24 +569,24 @@ bgm_ashroad_2_002: .byte W06 .byte Gn3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Fn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Gn3 .byte W12 .byte PEND @@ -606,27 +606,27 @@ bgm_ashroad_2_002: .byte W06 .byte Fs3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Gs3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , An3 .byte W12 -bgm_ashroad_2_003: +mus_route111_2_003: .byte N06 , Gs3 , v112 .byte W21 .byte N03 , An3 @@ -643,24 +643,24 @@ bgm_ashroad_2_003: .byte W06 .byte Gs3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , An3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Bn3 .byte W12 .byte PEND @@ -680,24 +680,24 @@ bgm_ashroad_2_003: .byte W06 .byte En3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Dn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , En3 .byte W12 .byte Cs3 @@ -716,27 +716,27 @@ bgm_ashroad_2_003: .byte W06 .byte Cs3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , As2 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Cs3 .byte W12 - .byte VOL , 47*bgm_ashroad_mvl/mxv + .byte VOL , 47*mus_route111_mvl/mxv .byte N06 , Fs3 .byte W21 .byte N03 , Gn3 @@ -753,28 +753,28 @@ bgm_ashroad_2_003: .byte W06 .byte Fs3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Gs3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , An3 .byte W12 .byte PATT - .word bgm_ashroad_2_003 + .word mus_route111_2_003 .byte N06 , An3 , v112 .byte W21 .byte N03 , As3 @@ -791,24 +791,24 @@ bgm_ashroad_2_003: .byte W06 .byte An3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Bn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Cn4 .byte W12 .byte Bn3 @@ -827,40 +827,40 @@ bgm_ashroad_2_003: .byte W06 .byte Bn3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Cn4 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Dn4 .byte W12 .byte PATT - .word bgm_ashroad_2_001 + .word mus_route111_2_001 .byte PATT - .word bgm_ashroad_2_002 + .word mus_route111_2_002 .byte GOTO - .word bgm_ashroad_2_B1 + .word mus_route111_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_ashroad_3: - .byte KEYSH , bgm_ashroad_key+0 +mus_route111_3: + .byte KEYSH , mus_route111_key+0 .byte VOICE , 58 - .byte VOL , 76*bgm_ashroad_mvl/mxv + .byte VOL , 76*mus_route111_mvl/mxv .byte LFOS , 44 .byte PAN , c_v+0 .byte N06 , Dn2 , v112 @@ -874,27 +874,27 @@ bgm_ashroad_3: .byte N48 , Fn1 , v120 .byte W24 .byte MOD , 7 - .byte VOL , 76*bgm_ashroad_mvl/mxv + .byte VOL , 76*mus_route111_mvl/mxv .byte W02 - .byte 73*bgm_ashroad_mvl/mxv + .byte 73*mus_route111_mvl/mxv .byte W03 - .byte 67*bgm_ashroad_mvl/mxv + .byte 67*mus_route111_mvl/mxv .byte W03 - .byte 62*bgm_ashroad_mvl/mxv + .byte 62*mus_route111_mvl/mxv .byte W04 - .byte 59*bgm_ashroad_mvl/mxv + .byte 59*mus_route111_mvl/mxv .byte W02 - .byte 56*bgm_ashroad_mvl/mxv + .byte 56*mus_route111_mvl/mxv .byte W03 - .byte 52*bgm_ashroad_mvl/mxv + .byte 52*mus_route111_mvl/mxv .byte W03 - .byte 49*bgm_ashroad_mvl/mxv + .byte 49*mus_route111_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 76*bgm_ashroad_mvl/mxv + .byte VOL , 76*mus_route111_mvl/mxv .byte N24 , Gs1 , v112 .byte W24 -bgm_ashroad_3_B1: +mus_route111_3_B1: .byte VOICE , 38 .byte N06 , An1 , v127 .byte W06 @@ -912,7 +912,7 @@ bgm_ashroad_3_B1: .byte W06 .byte N12 , En1 , v040 .byte W18 -bgm_ashroad_3_000: +mus_route111_3_000: .byte N06 , An1 , v127 .byte W06 .byte N12 , An1 , v040 @@ -931,11 +931,11 @@ bgm_ashroad_3_000: .byte W18 .byte PEND .byte PATT - .word bgm_ashroad_3_000 + .word mus_route111_3_000 .byte PATT - .word bgm_ashroad_3_000 + .word mus_route111_3_000 .byte PATT - .word bgm_ashroad_3_000 + .word mus_route111_3_000 .byte N06 , An1 , v127 .byte W06 .byte N12 , An1 , v040 @@ -974,7 +974,7 @@ bgm_ashroad_3_000: .byte W12 .byte Gs1 .byte W12 -bgm_ashroad_3_001: +mus_route111_3_001: .byte N06 , An1 , v127 .byte W06 .byte N12 , An1 , v040 @@ -997,7 +997,7 @@ bgm_ashroad_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_ashroad_3_001 + .word mus_route111_3_001 .byte N06 , An1 , v127 .byte W06 .byte N12 , An1 , v040 @@ -1153,7 +1153,7 @@ bgm_ashroad_3_001: .byte N12 , Dn1 .byte W12 .byte PATT - .word bgm_ashroad_3_000 + .word mus_route111_3_000 .byte N06 , An1 , v127 .byte W06 .byte N12 , An1 , v040 @@ -1175,20 +1175,20 @@ bgm_ashroad_3_001: .byte N12 , As1 .byte W12 .byte GOTO - .word bgm_ashroad_3_B1 + .word mus_route111_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_ashroad_4: - .byte KEYSH , bgm_ashroad_key+0 +mus_route111_4: + .byte KEYSH , mus_route111_key+0 .byte VOICE , 81 - .byte VOL , 47*bgm_ashroad_mvl/mxv + .byte VOL , 47*mus_route111_mvl/mxv .byte PAN , c_v-63 .byte LFOS , 44 .byte W96 -bgm_ashroad_4_B1: -bgm_ashroad_4_000: +mus_route111_4_B1: +mus_route111_4_000: .byte N06 , Cs3 , v112 .byte W21 .byte N03 , Dn3 , v056 @@ -1205,28 +1205,28 @@ bgm_ashroad_4_000: .byte W06 .byte En3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Dn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , En3 .byte W12 .byte PEND -bgm_ashroad_4_001: +mus_route111_4_001: .byte N06 , Cs3 , v112 .byte W12 .byte N03 @@ -1245,44 +1245,44 @@ bgm_ashroad_4_001: .byte W06 .byte En3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Dn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , En3 .byte W12 .byte PEND .byte PATT - .word bgm_ashroad_4_000 + .word mus_route111_4_000 .byte PATT - .word bgm_ashroad_4_001 + .word mus_route111_4_001 .byte PATT - .word bgm_ashroad_4_000 + .word mus_route111_4_000 .byte PATT - .word bgm_ashroad_4_001 + .word mus_route111_4_001 .byte PATT - .word bgm_ashroad_4_000 + .word mus_route111_4_000 .byte PATT - .word bgm_ashroad_4_001 + .word mus_route111_4_001 .byte PATT - .word bgm_ashroad_4_000 + .word mus_route111_4_000 .byte PATT - .word bgm_ashroad_4_001 -bgm_ashroad_4_002: + .word mus_route111_4_001 +mus_route111_4_002: .byte N06 , An2 , v112 .byte W21 .byte N03 , As2 , v064 @@ -1299,28 +1299,28 @@ bgm_ashroad_4_002: .byte W06 .byte An2 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Bn2 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Cs3 .byte W12 .byte PEND -bgm_ashroad_4_003: +mus_route111_4_003: .byte N06 , Bn2 , v112 .byte W21 .byte N03 , Cn3 , v064 @@ -1337,24 +1337,24 @@ bgm_ashroad_4_003: .byte W06 .byte Bn2 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Cs3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Dn3 .byte W12 .byte PEND @@ -1374,24 +1374,24 @@ bgm_ashroad_4_003: .byte W06 .byte Gs2 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Fs2 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Gs2 .byte W12 .byte Fs2 @@ -1410,30 +1410,30 @@ bgm_ashroad_4_003: .byte W06 .byte Fs2 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Cs2 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Fs2 .byte W12 .byte PATT - .word bgm_ashroad_4_002 + .word mus_route111_4_002 .byte PATT - .word bgm_ashroad_4_003 + .word mus_route111_4_003 .byte N06 , Cn3 , v112 .byte W21 .byte N03 , Cs3 , v064 @@ -1450,24 +1450,24 @@ bgm_ashroad_4_003: .byte W06 .byte Cn3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Dn3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , En3 .byte W12 .byte Dn3 @@ -1486,24 +1486,24 @@ bgm_ashroad_4_003: .byte W06 .byte Dn3 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , En3 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , Fn3 .byte W12 .byte Cs2 @@ -1522,24 +1522,24 @@ bgm_ashroad_4_003: .byte W06 .byte En2 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Dn2 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , En2 .byte W12 .byte Cs2 @@ -1560,37 +1560,37 @@ bgm_ashroad_4_003: .byte W06 .byte En2 , v112 .byte W12 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte N24 , Dn2 .byte W02 - .byte VOL , 27*bgm_ashroad_mvl/mxv + .byte VOL , 27*mus_route111_mvl/mxv .byte W03 - .byte 32*bgm_ashroad_mvl/mxv + .byte 32*mus_route111_mvl/mxv .byte W03 - .byte 38*bgm_ashroad_mvl/mxv + .byte 38*mus_route111_mvl/mxv .byte W04 - .byte 41*bgm_ashroad_mvl/mxv + .byte 41*mus_route111_mvl/mxv .byte W02 - .byte 45*bgm_ashroad_mvl/mxv + .byte 45*mus_route111_mvl/mxv .byte W04 - .byte 54*bgm_ashroad_mvl/mxv + .byte 54*mus_route111_mvl/mxv .byte W03 - .byte 57*bgm_ashroad_mvl/mxv + .byte 57*mus_route111_mvl/mxv .byte W03 - .byte 47*bgm_ashroad_mvl/mxv + .byte 47*mus_route111_mvl/mxv .byte N06 , En2 .byte W12 .byte GOTO - .word bgm_ashroad_4_B1 + .word mus_route111_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_ashroad_5: - .byte KEYSH , bgm_ashroad_key+0 +mus_route111_5: + .byte KEYSH , mus_route111_key+0 .byte VOICE , 38 .byte PAN , c_v+51 - .byte VOL , 28*bgm_ashroad_mvl/mxv + .byte VOL , 28*mus_route111_mvl/mxv .byte N06 , Fn3 , v112 .byte W06 .byte An3 @@ -1601,33 +1601,33 @@ bgm_ashroad_5: .byte W06 .byte N48 , Fn4 , v120 .byte W24 - .byte VOL , 28*bgm_ashroad_mvl/mxv + .byte VOL , 28*mus_route111_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 25*bgm_ashroad_mvl/mxv + .byte VOL , 25*mus_route111_mvl/mxv .byte W03 - .byte 23*bgm_ashroad_mvl/mxv + .byte 23*mus_route111_mvl/mxv .byte W03 - .byte 21*bgm_ashroad_mvl/mxv + .byte 21*mus_route111_mvl/mxv .byte W04 - .byte 19*bgm_ashroad_mvl/mxv + .byte 19*mus_route111_mvl/mxv .byte W02 - .byte 16*bgm_ashroad_mvl/mxv + .byte 16*mus_route111_mvl/mxv .byte W03 - .byte 14*bgm_ashroad_mvl/mxv + .byte 14*mus_route111_mvl/mxv .byte W03 - .byte 13*bgm_ashroad_mvl/mxv + .byte 13*mus_route111_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 28*bgm_ashroad_mvl/mxv + .byte VOL , 28*mus_route111_mvl/mxv .byte N24 , Dn4 , v088 .byte W12 .byte MOD , 7 .byte W12 -bgm_ashroad_5_B1: +mus_route111_5_B1: .byte VOICE , 38 .byte MOD , 0 - .byte VOL , 31*bgm_ashroad_mvl/mxv + .byte VOL , 31*mus_route111_mvl/mxv .byte PAN , c_v+51 .byte N06 , En3 , v072 .byte W96 @@ -1856,7 +1856,7 @@ bgm_ashroad_5_B1: .byte W06 .byte VOICE , 48 .byte MOD , 0 - .byte VOL , 29*bgm_ashroad_mvl/mxv + .byte VOL , 29*mus_route111_mvl/mxv .byte N21 , Cs4 .byte W12 .byte MOD , 7 @@ -1888,7 +1888,7 @@ bgm_ashroad_5_B1: .byte W06 .byte An3 .byte W06 -bgm_ashroad_5_000: +mus_route111_5_000: .byte MOD , 0 .byte N21 , En4 , v112 .byte W12 @@ -2023,7 +2023,7 @@ bgm_ashroad_5_000: .byte An3 .byte W06 .byte PATT - .word bgm_ashroad_5_000 + .word mus_route111_5_000 .byte MOD , 0 .byte N21 , Fn4 , v112 .byte W12 @@ -2097,19 +2097,19 @@ bgm_ashroad_5_000: .byte MOD , 0 .byte W24 .byte GOTO - .word bgm_ashroad_5_B1 + .word mus_route111_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_ashroad_6: - .byte KEYSH , bgm_ashroad_key+0 +mus_route111_6: + .byte KEYSH , mus_route111_key+0 .byte VOICE , 82 - .byte VOL , 38*bgm_ashroad_mvl/mxv + .byte VOL , 38*mus_route111_mvl/mxv .byte LFOS , 44 .byte BEND , c_v-3 .byte W96 -bgm_ashroad_6_B1: +mus_route111_6_B1: .byte MOD , 0 .byte W96 .byte W72 @@ -2241,7 +2241,7 @@ bgm_ashroad_6_B1: .byte 0 .byte N12 , Cs5 , v040 .byte W96 -bgm_ashroad_6_000: +mus_route111_6_000: .byte N24 , Fs4 , v112 .byte W12 .byte MOD , 7 @@ -2262,7 +2262,7 @@ bgm_ashroad_6_000: .byte Fs4 , v040 .byte W06 .byte PEND -bgm_ashroad_6_001: +mus_route111_6_001: .byte N24 , Gs4 , v112 .byte W12 .byte MOD , 7 @@ -2333,9 +2333,9 @@ bgm_ashroad_6_001: .byte N12 , As3 .byte W12 .byte PATT - .word bgm_ashroad_6_000 + .word mus_route111_6_000 .byte PATT - .word bgm_ashroad_6_001 + .word mus_route111_6_001 .byte N24 , An4 , v112 .byte W12 .byte MOD , 7 @@ -2389,19 +2389,19 @@ bgm_ashroad_6_001: .byte 0 .byte W24 .byte GOTO - .word bgm_ashroad_6_B1 + .word mus_route111_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_ashroad_7: - .byte KEYSH , bgm_ashroad_key+0 +mus_route111_7: + .byte KEYSH , mus_route111_key+0 .byte VOICE , 127 .byte PAN , c_v-63 - .byte VOL , 51*bgm_ashroad_mvl/mxv + .byte VOL , 51*mus_route111_mvl/mxv .byte W96 -bgm_ashroad_7_B1: -bgm_ashroad_7_000: +mus_route111_7_B1: +mus_route111_7_000: .byte N01 , Gn4 , v112 .byte W24 .byte N01 @@ -2425,7 +2425,7 @@ bgm_ashroad_7_000: .byte N01 .byte W03 .byte PEND -bgm_ashroad_7_001: +mus_route111_7_001: .byte N01 , Gn4 , v112 .byte W12 .byte Gn4 , v096 @@ -2452,54 +2452,54 @@ bgm_ashroad_7_001: .byte W03 .byte PEND .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_001 + .word mus_route111_7_001 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_001 + .word mus_route111_7_001 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_001 + .word mus_route111_7_001 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_001 + .word mus_route111_7_001 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_000 + .word mus_route111_7_000 .byte PATT - .word bgm_ashroad_7_001 + .word mus_route111_7_001 .byte GOTO - .word bgm_ashroad_7_B1 + .word mus_route111_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_ashroad_8: - .byte KEYSH , bgm_ashroad_key+0 +mus_route111_8: + .byte KEYSH , mus_route111_key+0 .byte VOICE , 0 - .byte VOL , 76*bgm_ashroad_mvl/mxv + .byte VOL , 76*mus_route111_mvl/mxv .byte W96 -bgm_ashroad_8_B1: -bgm_ashroad_8_000: +mus_route111_8_B1: +mus_route111_8_000: .byte N06 , Cn1 , v124 .byte W12 .byte En3 , v096 @@ -2548,12 +2548,12 @@ bgm_ashroad_8_000: .byte N03 .byte W06 .byte PATT - .word bgm_ashroad_8_000 + .word mus_route111_8_000 .byte PATT - .word bgm_ashroad_8_000 + .word mus_route111_8_000 .byte PATT - .word bgm_ashroad_8_000 -bgm_ashroad_8_001: + .word mus_route111_8_000 +mus_route111_8_001: .byte N06 , Cn1 , v124 .byte W12 .byte En3 , v096 @@ -2582,13 +2582,13 @@ bgm_ashroad_8_001: .byte W06 .byte PEND .byte PATT - .word bgm_ashroad_8_000 + .word mus_route111_8_000 .byte PATT - .word bgm_ashroad_8_000 + .word mus_route111_8_000 .byte PATT - .word bgm_ashroad_8_000 + .word mus_route111_8_000 .byte PATT - .word bgm_ashroad_8_001 + .word mus_route111_8_001 .byte N06 , Cn1 , v124 .byte W12 .byte N12 , As1 , v088 @@ -2803,27 +2803,27 @@ bgm_ashroad_8_001: .byte Dn3 , v096 .byte W12 .byte GOTO - .word bgm_ashroad_8_B1 + .word mus_route111_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_ashroad: +mus_route111: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_ashroad_pri @ Priority - .byte bgm_ashroad_rev @ Reverb. + .byte mus_route111_pri @ Priority + .byte mus_route111_rev @ Reverb. - .word bgm_ashroad_grp + .word mus_route111_grp - .word bgm_ashroad_1 - .word bgm_ashroad_2 - .word bgm_ashroad_3 - .word bgm_ashroad_4 - .word bgm_ashroad_5 - .word bgm_ashroad_6 - .word bgm_ashroad_7 - .word bgm_ashroad_8 + .word mus_route111_1 + .word mus_route111_2 + .word mus_route111_3 + .word mus_route111_4 + .word mus_route111_5 + .word mus_route111_6 + .word mus_route111_7 + .word mus_route111_8 .end diff --git a/sound/songs/bgm_kazanbai.s b/sound/songs/mus_route113.s index 250805a6e..6913966a9 100644 --- a/sound/songs/bgm_kazanbai.s +++ b/sound/songs/mus_route113.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_kazanbai_grp, voicegroup061 - .equ bgm_kazanbai_pri, 0 - .equ bgm_kazanbai_rev, reverb_set+50 - .equ bgm_kazanbai_mvl, 127 - .equ bgm_kazanbai_key, 0 - .equ bgm_kazanbai_tbs, 1 - .equ bgm_kazanbai_exg, 0 - .equ bgm_kazanbai_cmp, 1 + .equ mus_route113_grp, voicegroup061 + .equ mus_route113_pri, 0 + .equ mus_route113_rev, reverb_set+50 + .equ mus_route113_mvl, 127 + .equ mus_route113_key, 0 + .equ mus_route113_tbs, 1 + .equ mus_route113_exg, 0 + .equ mus_route113_cmp, 1 .section .rodata - .global bgm_kazanbai + .global mus_route113 .align 2 @********************** Track 1 **********************@ -bgm_kazanbai_1: - .byte KEYSH , bgm_kazanbai_key+0 - .byte TEMPO , 128*bgm_kazanbai_tbs/2 +mus_route113_1: + .byte KEYSH , mus_route113_key+0 + .byte TEMPO , 128*mus_route113_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 44*bgm_kazanbai_mvl/mxv + .byte VOL , 44*mus_route113_mvl/mxv .byte PAN , c_v+63 .byte W12 -bgm_kazanbai_1_B1: -bgm_kazanbai_1_000: +mus_route113_1_B1: +mus_route113_1_000: .byte N03 , En5 , v112 .byte W06 .byte En5 , v056 @@ -52,118 +52,118 @@ bgm_kazanbai_1_000: .byte W06 .byte PEND .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte PATT - .word bgm_kazanbai_1_000 + .word mus_route113_1_000 .byte GOTO - .word bgm_kazanbai_1_B1 + .word mus_route113_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_kazanbai_2: - .byte KEYSH , bgm_kazanbai_key+0 +mus_route113_2: + .byte KEYSH , mus_route113_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+3 - .byte VOL , 75*bgm_kazanbai_mvl/mxv + .byte VOL , 75*mus_route113_mvl/mxv .byte N06 , Fs3 , v112 .byte W06 .byte Bn3 .byte W06 -bgm_kazanbai_2_B1: -bgm_kazanbai_2_000: +mus_route113_2_B1: +mus_route113_2_000: .byte VOICE , 24 .byte N36 , Dn4 , v112 .byte W12 @@ -176,7 +176,7 @@ bgm_kazanbai_2_000: .byte N12 , An3 .byte W12 .byte PEND -bgm_kazanbai_2_001: +mus_route113_2_001: .byte N24 , Bn3 , v112 .byte W24 .byte N12 , Dn3 @@ -197,7 +197,7 @@ bgm_kazanbai_2_001: .byte W24 .byte N12 , Dn3 .byte W12 -bgm_kazanbai_2_002: +mus_route113_2_002: .byte N60 , Gn3 , v112 .byte W24 .byte MOD , 7 @@ -208,13 +208,13 @@ bgm_kazanbai_2_002: .byte Cs4 .byte W06 .byte PEND -bgm_kazanbai_2_003: +mus_route113_2_003: .byte N72 , An3 , v112 .byte W24 .byte MOD , 7 .byte W48 .byte PEND -bgm_kazanbai_2_004: +mus_route113_2_004: .byte MOD , 0 .byte W48 .byte VOICE , 60 @@ -225,83 +225,83 @@ bgm_kazanbai_2_004: .byte VOICE , 60 .byte TIE , An3 .byte W24 - .byte VOL , 71*bgm_kazanbai_mvl/mxv + .byte VOL , 71*mus_route113_mvl/mxv .byte W02 - .byte 70*bgm_kazanbai_mvl/mxv + .byte 70*mus_route113_mvl/mxv .byte W03 - .byte 66*bgm_kazanbai_mvl/mxv + .byte 66*mus_route113_mvl/mxv .byte W03 - .byte 63*bgm_kazanbai_mvl/mxv + .byte 63*mus_route113_mvl/mxv .byte W04 - .byte 62*bgm_kazanbai_mvl/mxv + .byte 62*mus_route113_mvl/mxv .byte W02 - .byte 59*bgm_kazanbai_mvl/mxv + .byte 59*mus_route113_mvl/mxv .byte W03 - .byte 58*bgm_kazanbai_mvl/mxv + .byte 58*mus_route113_mvl/mxv .byte W03 - .byte 55*bgm_kazanbai_mvl/mxv + .byte 55*mus_route113_mvl/mxv .byte W04 - .byte 52*bgm_kazanbai_mvl/mxv + .byte 52*mus_route113_mvl/mxv .byte MOD , 3 .byte W02 - .byte VOL , 50*bgm_kazanbai_mvl/mxv + .byte VOL , 50*mus_route113_mvl/mxv .byte W03 - .byte 48*bgm_kazanbai_mvl/mxv + .byte 48*mus_route113_mvl/mxv .byte W03 - .byte 46*bgm_kazanbai_mvl/mxv + .byte 46*mus_route113_mvl/mxv .byte W04 - .byte 44*bgm_kazanbai_mvl/mxv + .byte 44*mus_route113_mvl/mxv .byte W02 - .byte 40*bgm_kazanbai_mvl/mxv + .byte 40*mus_route113_mvl/mxv .byte W03 - .byte 37*bgm_kazanbai_mvl/mxv + .byte 37*mus_route113_mvl/mxv .byte W03 - .byte 35*bgm_kazanbai_mvl/mxv + .byte 35*mus_route113_mvl/mxv .byte W04 .byte MOD , 6 .byte W02 - .byte VOL , 31*bgm_kazanbai_mvl/mxv + .byte VOL , 31*mus_route113_mvl/mxv .byte W03 - .byte 29*bgm_kazanbai_mvl/mxv + .byte 29*mus_route113_mvl/mxv .byte W03 - .byte 26*bgm_kazanbai_mvl/mxv + .byte 26*mus_route113_mvl/mxv .byte W04 - .byte 25*bgm_kazanbai_mvl/mxv + .byte 25*mus_route113_mvl/mxv .byte W02 - .byte 22*bgm_kazanbai_mvl/mxv + .byte 22*mus_route113_mvl/mxv .byte W03 - .byte 19*bgm_kazanbai_mvl/mxv + .byte 19*mus_route113_mvl/mxv .byte W03 - .byte 17*bgm_kazanbai_mvl/mxv + .byte 17*mus_route113_mvl/mxv .byte W04 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W02 - .byte 11*bgm_kazanbai_mvl/mxv + .byte 11*mus_route113_mvl/mxv .byte W03 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W03 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W04 - .byte 7*bgm_kazanbai_mvl/mxv + .byte 7*mus_route113_mvl/mxv .byte W02 - .byte 5*bgm_kazanbai_mvl/mxv + .byte 5*mus_route113_mvl/mxv .byte W03 - .byte 3*bgm_kazanbai_mvl/mxv + .byte 3*mus_route113_mvl/mxv .byte W03 - .byte 1*bgm_kazanbai_mvl/mxv + .byte 1*mus_route113_mvl/mxv .byte W04 .byte EOT - .byte VOL , 1*bgm_kazanbai_mvl/mxv + .byte VOL , 1*mus_route113_mvl/mxv .byte MOD , 0 .byte W12 .byte VOICE , 24 - .byte VOL , 74*bgm_kazanbai_mvl/mxv + .byte VOL , 74*mus_route113_mvl/mxv .byte N06 , En4 .byte W06 .byte Ds4 .byte W06 .byte PATT - .word bgm_kazanbai_2_000 + .word mus_route113_2_000 .byte N24 , Gn4 , v112 .byte W24 .byte N12 , Dn3 @@ -337,82 +337,82 @@ bgm_kazanbai_2_004: .byte Cs4 .byte W06 .byte PATT - .word bgm_kazanbai_2_003 + .word mus_route113_2_003 .byte PATT - .word bgm_kazanbai_2_004 + .word mus_route113_2_004 .byte VOICE , 60 .byte TIE , An3 , v112 .byte W24 - .byte VOL , 71*bgm_kazanbai_mvl/mxv + .byte VOL , 71*mus_route113_mvl/mxv .byte W02 - .byte 70*bgm_kazanbai_mvl/mxv + .byte 70*mus_route113_mvl/mxv .byte W03 - .byte 66*bgm_kazanbai_mvl/mxv + .byte 66*mus_route113_mvl/mxv .byte W03 - .byte 63*bgm_kazanbai_mvl/mxv + .byte 63*mus_route113_mvl/mxv .byte W04 - .byte 62*bgm_kazanbai_mvl/mxv + .byte 62*mus_route113_mvl/mxv .byte W02 - .byte 59*bgm_kazanbai_mvl/mxv + .byte 59*mus_route113_mvl/mxv .byte W03 - .byte 58*bgm_kazanbai_mvl/mxv + .byte 58*mus_route113_mvl/mxv .byte W03 - .byte 55*bgm_kazanbai_mvl/mxv + .byte 55*mus_route113_mvl/mxv .byte W04 - .byte 52*bgm_kazanbai_mvl/mxv + .byte 52*mus_route113_mvl/mxv .byte W02 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte W03 - .byte 48*bgm_kazanbai_mvl/mxv + .byte 48*mus_route113_mvl/mxv .byte W03 - .byte 46*bgm_kazanbai_mvl/mxv + .byte 46*mus_route113_mvl/mxv .byte W04 - .byte 44*bgm_kazanbai_mvl/mxv + .byte 44*mus_route113_mvl/mxv .byte W02 - .byte 40*bgm_kazanbai_mvl/mxv + .byte 40*mus_route113_mvl/mxv .byte W03 - .byte 37*bgm_kazanbai_mvl/mxv + .byte 37*mus_route113_mvl/mxv .byte W03 - .byte 35*bgm_kazanbai_mvl/mxv + .byte 35*mus_route113_mvl/mxv .byte W04 .byte MOD , 7 .byte W02 - .byte VOL , 31*bgm_kazanbai_mvl/mxv + .byte VOL , 31*mus_route113_mvl/mxv .byte W03 - .byte 29*bgm_kazanbai_mvl/mxv + .byte 29*mus_route113_mvl/mxv .byte W03 - .byte 26*bgm_kazanbai_mvl/mxv + .byte 26*mus_route113_mvl/mxv .byte W04 - .byte 25*bgm_kazanbai_mvl/mxv + .byte 25*mus_route113_mvl/mxv .byte W02 - .byte 22*bgm_kazanbai_mvl/mxv + .byte 22*mus_route113_mvl/mxv .byte W03 - .byte 19*bgm_kazanbai_mvl/mxv + .byte 19*mus_route113_mvl/mxv .byte W03 - .byte 17*bgm_kazanbai_mvl/mxv + .byte 17*mus_route113_mvl/mxv .byte W04 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W02 - .byte 11*bgm_kazanbai_mvl/mxv + .byte 11*mus_route113_mvl/mxv .byte W03 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W03 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W04 - .byte 7*bgm_kazanbai_mvl/mxv + .byte 7*mus_route113_mvl/mxv .byte W02 - .byte 5*bgm_kazanbai_mvl/mxv + .byte 5*mus_route113_mvl/mxv .byte W03 - .byte 3*bgm_kazanbai_mvl/mxv + .byte 3*mus_route113_mvl/mxv .byte W03 - .byte 1*bgm_kazanbai_mvl/mxv + .byte 1*mus_route113_mvl/mxv .byte W04 .byte EOT - .byte VOL , 1*bgm_kazanbai_mvl/mxv + .byte VOL , 1*mus_route113_mvl/mxv .byte MOD , 0 .byte W12 .byte VOICE , 24 - .byte VOL , 74*bgm_kazanbai_mvl/mxv + .byte VOL , 74*mus_route113_mvl/mxv .byte N06 .byte W06 .byte As3 @@ -507,14 +507,14 @@ bgm_kazanbai_2_004: .byte Fs4 .byte W12 .byte VOICE , 60 - .byte VOL , 48*bgm_kazanbai_mvl/mxv + .byte VOL , 48*mus_route113_mvl/mxv .byte N12 , Dn4 .byte W12 .byte N06 , Cs4 .byte W06 .byte Cn4 .byte W06 - .byte VOL , 48*bgm_kazanbai_mvl/mxv + .byte VOL , 48*mus_route113_mvl/mxv .byte N24 , Bn3 .byte W24 .byte N06 , Cs4 @@ -628,7 +628,7 @@ bgm_kazanbai_2_004: .byte N12 , An3 .byte W12 .byte PATT - .word bgm_kazanbai_2_001 + .word mus_route113_2_001 .byte MOD , 0 .byte N03 , Ds4 , v096 .byte W03 @@ -643,88 +643,88 @@ bgm_kazanbai_2_004: .byte N12 , Dn3 .byte W12 .byte PATT - .word bgm_kazanbai_2_002 + .word mus_route113_2_002 .byte N72 , An3 , v112 .byte W24 .byte MOD , 6 .byte W48 .byte PATT - .word bgm_kazanbai_2_004 + .word mus_route113_2_004 .byte VOICE , 60 .byte N12 , An3 , v112 .byte W12 .byte N06 , Dn3 .byte W12 - .byte VOL , 71*bgm_kazanbai_mvl/mxv + .byte VOL , 71*mus_route113_mvl/mxv .byte N96 , An3 .byte W02 - .byte VOL , 70*bgm_kazanbai_mvl/mxv + .byte VOL , 70*mus_route113_mvl/mxv .byte W03 - .byte 66*bgm_kazanbai_mvl/mxv + .byte 66*mus_route113_mvl/mxv .byte W03 - .byte 63*bgm_kazanbai_mvl/mxv + .byte 63*mus_route113_mvl/mxv .byte W04 - .byte 62*bgm_kazanbai_mvl/mxv + .byte 62*mus_route113_mvl/mxv .byte W02 - .byte 59*bgm_kazanbai_mvl/mxv + .byte 59*mus_route113_mvl/mxv .byte W03 - .byte 58*bgm_kazanbai_mvl/mxv + .byte 58*mus_route113_mvl/mxv .byte W03 - .byte 55*bgm_kazanbai_mvl/mxv + .byte 55*mus_route113_mvl/mxv .byte W04 - .byte 52*bgm_kazanbai_mvl/mxv + .byte 52*mus_route113_mvl/mxv .byte W02 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte W03 - .byte 48*bgm_kazanbai_mvl/mxv + .byte 48*mus_route113_mvl/mxv .byte W03 - .byte 46*bgm_kazanbai_mvl/mxv + .byte 46*mus_route113_mvl/mxv .byte W04 - .byte 44*bgm_kazanbai_mvl/mxv + .byte 44*mus_route113_mvl/mxv .byte W02 - .byte 40*bgm_kazanbai_mvl/mxv + .byte 40*mus_route113_mvl/mxv .byte W03 - .byte 37*bgm_kazanbai_mvl/mxv + .byte 37*mus_route113_mvl/mxv .byte W03 - .byte 35*bgm_kazanbai_mvl/mxv + .byte 35*mus_route113_mvl/mxv .byte W04 .byte MOD , 7 .byte W02 - .byte VOL , 31*bgm_kazanbai_mvl/mxv + .byte VOL , 31*mus_route113_mvl/mxv .byte W03 - .byte 29*bgm_kazanbai_mvl/mxv + .byte 29*mus_route113_mvl/mxv .byte W03 - .byte 26*bgm_kazanbai_mvl/mxv + .byte 26*mus_route113_mvl/mxv .byte W04 - .byte 25*bgm_kazanbai_mvl/mxv + .byte 25*mus_route113_mvl/mxv .byte W02 - .byte 22*bgm_kazanbai_mvl/mxv + .byte 22*mus_route113_mvl/mxv .byte W03 - .byte 19*bgm_kazanbai_mvl/mxv + .byte 19*mus_route113_mvl/mxv .byte W03 - .byte 17*bgm_kazanbai_mvl/mxv + .byte 17*mus_route113_mvl/mxv .byte W04 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W02 - .byte 11*bgm_kazanbai_mvl/mxv + .byte 11*mus_route113_mvl/mxv .byte W03 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W03 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W04 - .byte 7*bgm_kazanbai_mvl/mxv + .byte 7*mus_route113_mvl/mxv .byte W02 - .byte 5*bgm_kazanbai_mvl/mxv + .byte 5*mus_route113_mvl/mxv .byte W03 - .byte 3*bgm_kazanbai_mvl/mxv + .byte 3*mus_route113_mvl/mxv .byte W03 - .byte 1*bgm_kazanbai_mvl/mxv + .byte 1*mus_route113_mvl/mxv .byte W04 - .byte 1*bgm_kazanbai_mvl/mxv + .byte 1*mus_route113_mvl/mxv .byte MOD , 0 .byte W12 .byte VOICE , 73 - .byte VOL , 74*bgm_kazanbai_mvl/mxv + .byte VOL , 74*mus_route113_mvl/mxv .byte N06 , En4 .byte W06 .byte Ds4 @@ -788,93 +788,93 @@ bgm_kazanbai_2_004: .byte MOD , 7 .byte W48 .byte PATT - .word bgm_kazanbai_2_004 + .word mus_route113_2_004 .byte VOICE , 60 .byte N60 , An3 , v112 .byte W24 - .byte VOL , 71*bgm_kazanbai_mvl/mxv + .byte VOL , 71*mus_route113_mvl/mxv .byte MOD , 5 .byte W02 - .byte VOL , 70*bgm_kazanbai_mvl/mxv + .byte VOL , 70*mus_route113_mvl/mxv .byte W03 - .byte 66*bgm_kazanbai_mvl/mxv + .byte 66*mus_route113_mvl/mxv .byte W03 - .byte 63*bgm_kazanbai_mvl/mxv + .byte 63*mus_route113_mvl/mxv .byte W04 - .byte 62*bgm_kazanbai_mvl/mxv + .byte 62*mus_route113_mvl/mxv .byte W02 - .byte 59*bgm_kazanbai_mvl/mxv + .byte 59*mus_route113_mvl/mxv .byte W03 - .byte 58*bgm_kazanbai_mvl/mxv + .byte 58*mus_route113_mvl/mxv .byte W03 - .byte 55*bgm_kazanbai_mvl/mxv + .byte 55*mus_route113_mvl/mxv .byte W04 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte W02 - .byte 46*bgm_kazanbai_mvl/mxv + .byte 46*mus_route113_mvl/mxv .byte W03 - .byte 42*bgm_kazanbai_mvl/mxv + .byte 42*mus_route113_mvl/mxv .byte W03 - .byte 36*bgm_kazanbai_mvl/mxv + .byte 36*mus_route113_mvl/mxv .byte W04 - .byte 74*bgm_kazanbai_mvl/mxv + .byte 74*mus_route113_mvl/mxv .byte MOD , 0 .byte N06 , Dn3 .byte W12 .byte N48 , An3 .byte W24 - .byte VOL , 74*bgm_kazanbai_mvl/mxv + .byte VOL , 74*mus_route113_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 70*bgm_kazanbai_mvl/mxv + .byte VOL , 70*mus_route113_mvl/mxv .byte W03 - .byte 63*bgm_kazanbai_mvl/mxv + .byte 63*mus_route113_mvl/mxv .byte W03 - .byte 59*bgm_kazanbai_mvl/mxv + .byte 59*mus_route113_mvl/mxv .byte W04 - .byte 52*bgm_kazanbai_mvl/mxv + .byte 52*mus_route113_mvl/mxv .byte W02 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte W03 - .byte 46*bgm_kazanbai_mvl/mxv + .byte 46*mus_route113_mvl/mxv .byte W03 - .byte 42*bgm_kazanbai_mvl/mxv + .byte 42*mus_route113_mvl/mxv .byte W04 - .byte 40*bgm_kazanbai_mvl/mxv + .byte 40*mus_route113_mvl/mxv .byte MOD , 0 .byte W02 - .byte VOL , 31*bgm_kazanbai_mvl/mxv + .byte VOL , 31*mus_route113_mvl/mxv .byte W03 - .byte 29*bgm_kazanbai_mvl/mxv + .byte 29*mus_route113_mvl/mxv .byte W03 - .byte 25*bgm_kazanbai_mvl/mxv + .byte 25*mus_route113_mvl/mxv .byte W04 .byte VOICE , 24 - .byte VOL , 74*bgm_kazanbai_mvl/mxv + .byte VOL , 74*mus_route113_mvl/mxv .byte N06 , Fs3 .byte W06 .byte Bn3 .byte W06 .byte GOTO - .word bgm_kazanbai_2_B1 + .word mus_route113_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_kazanbai_3: - .byte KEYSH , bgm_kazanbai_key+0 +mus_route113_3: + .byte KEYSH , mus_route113_key+0 .byte VOICE , 24 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+28 - .byte VOL , 58*bgm_kazanbai_mvl/mxv + .byte VOL , 58*mus_route113_mvl/mxv .byte W12 -bgm_kazanbai_3_B1: -bgm_kazanbai_3_000: +mus_route113_3_B1: +mus_route113_3_000: .byte PAN , c_v+0 - .byte VOL , 74*bgm_kazanbai_mvl/mxv + .byte VOL , 74*mus_route113_mvl/mxv .byte N06 , Gn1 , v112 .byte W06 .byte Gn1 , v040 @@ -900,9 +900,9 @@ bgm_kazanbai_3_000: .byte Fs3 , v040 .byte W06 .byte PEND -bgm_kazanbai_3_001: +mus_route113_3_001: .byte PAN , c_v+27 - .byte VOL , 59*bgm_kazanbai_mvl/mxv + .byte VOL , 59*mus_route113_mvl/mxv .byte N04 , An3 , v112 .byte W04 .byte Bn3 @@ -942,10 +942,10 @@ bgm_kazanbai_3_001: .byte W04 .byte PEND .byte PATT - .word bgm_kazanbai_3_000 -bgm_kazanbai_3_002: + .word mus_route113_3_000 +mus_route113_3_002: .byte PAN , c_v+27 - .byte VOL , 59*bgm_kazanbai_mvl/mxv + .byte VOL , 59*mus_route113_mvl/mxv .byte N04 , An3 , v112 .byte W04 .byte Bn3 @@ -984,9 +984,9 @@ bgm_kazanbai_3_002: .byte Bn1 .byte W04 .byte PEND -bgm_kazanbai_3_003: +mus_route113_3_003: .byte PAN , c_v+0 - .byte VOL , 74*bgm_kazanbai_mvl/mxv + .byte VOL , 74*mus_route113_mvl/mxv .byte N06 , Dn1 , v112 .byte W06 .byte Dn1 , v040 @@ -1012,9 +1012,9 @@ bgm_kazanbai_3_003: .byte Cs3 , v040 .byte W06 .byte PEND -bgm_kazanbai_3_004: +mus_route113_3_004: .byte PAN , c_v+28 - .byte VOL , 59*bgm_kazanbai_mvl/mxv + .byte VOL , 59*mus_route113_mvl/mxv .byte N04 , En3 , v112 .byte W04 .byte Fs3 @@ -1050,8 +1050,8 @@ bgm_kazanbai_3_004: .byte PAN , c_v+0 .byte W72 .byte W72 -bgm_kazanbai_3_005: - .byte VOL , 74*bgm_kazanbai_mvl/mxv +mus_route113_3_005: + .byte VOL , 74*mus_route113_mvl/mxv .byte N06 , Gn1 , v112 .byte W06 .byte Gn1 , v040 @@ -1077,9 +1077,9 @@ bgm_kazanbai_3_005: .byte Fs3 , v040 .byte W06 .byte PEND -bgm_kazanbai_3_006: +mus_route113_3_006: .byte PAN , c_v+29 - .byte VOL , 59*bgm_kazanbai_mvl/mxv + .byte VOL , 59*mus_route113_mvl/mxv .byte N04 , An3 , v112 .byte W04 .byte Bn3 @@ -1119,10 +1119,10 @@ bgm_kazanbai_3_006: .byte W04 .byte PEND .byte PATT - .word bgm_kazanbai_3_000 -bgm_kazanbai_3_007: + .word mus_route113_3_000 +mus_route113_3_007: .byte PAN , c_v+28 - .byte VOL , 59*bgm_kazanbai_mvl/mxv + .byte VOL , 59*mus_route113_mvl/mxv .byte N04 , An3 , v112 .byte W04 .byte Bn3 @@ -1162,10 +1162,10 @@ bgm_kazanbai_3_007: .byte W04 .byte PEND .byte PATT - .word bgm_kazanbai_3_003 -bgm_kazanbai_3_008: + .word mus_route113_3_003 +mus_route113_3_008: .byte PAN , c_v+28 - .byte VOL , 59*bgm_kazanbai_mvl/mxv + .byte VOL , 59*mus_route113_mvl/mxv .byte N04 , En3 , v112 .byte W04 .byte Fs3 @@ -1201,7 +1201,7 @@ bgm_kazanbai_3_008: .byte PAN , c_v+0 .byte W72 .byte W72 - .byte VOL , 78*bgm_kazanbai_mvl/mxv + .byte VOL , 78*mus_route113_mvl/mxv .byte N06 , Bn1 .byte W06 .byte N03 , Dn2 @@ -1226,7 +1226,7 @@ bgm_kazanbai_3_008: .byte W06 .byte N03 , Bn2 .byte W06 -bgm_kazanbai_3_009: +mus_route113_3_009: .byte N06 , Dn3 , v112 .byte W06 .byte N03 , As2 @@ -1252,7 +1252,7 @@ bgm_kazanbai_3_009: .byte N03 , Dn2 .byte W06 .byte PEND -bgm_kazanbai_3_010: +mus_route113_3_010: .byte N06 , An1 , v112 .byte W06 .byte N03 , Dn2 @@ -1278,7 +1278,7 @@ bgm_kazanbai_3_010: .byte N03 , An2 .byte W06 .byte PEND -bgm_kazanbai_3_011: +mus_route113_3_011: .byte N06 , Dn3 , v112 .byte W06 .byte N03 , Gs2 @@ -1425,11 +1425,11 @@ bgm_kazanbai_3_011: .byte N03 , Bn2 .byte W06 .byte PATT - .word bgm_kazanbai_3_009 + .word mus_route113_3_009 .byte PATT - .word bgm_kazanbai_3_010 + .word mus_route113_3_010 .byte PATT - .word bgm_kazanbai_3_011 + .word mus_route113_3_011 .byte N06 , Gn1 , v112 .byte W06 .byte N03 , Dn2 @@ -1478,7 +1478,7 @@ bgm_kazanbai_3_011: .byte W06 .byte N03 , Dn2 .byte W06 -bgm_kazanbai_3_012: +mus_route113_3_012: .byte N06 , An1 , v112 .byte W06 .byte N03 , En2 @@ -1505,58 +1505,58 @@ bgm_kazanbai_3_012: .byte W06 .byte PEND .byte PATT - .word bgm_kazanbai_3_012 + .word mus_route113_3_012 .byte PATT - .word bgm_kazanbai_3_005 + .word mus_route113_3_005 .byte PATT - .word bgm_kazanbai_3_001 + .word mus_route113_3_001 .byte PATT - .word bgm_kazanbai_3_000 + .word mus_route113_3_000 .byte PATT - .word bgm_kazanbai_3_002 + .word mus_route113_3_002 .byte PATT - .word bgm_kazanbai_3_003 + .word mus_route113_3_003 .byte PATT - .word bgm_kazanbai_3_004 + .word mus_route113_3_004 .byte PAN , c_v+0 .byte W72 .byte W72 .byte PATT - .word bgm_kazanbai_3_005 + .word mus_route113_3_005 .byte PATT - .word bgm_kazanbai_3_006 + .word mus_route113_3_006 .byte PATT - .word bgm_kazanbai_3_000 + .word mus_route113_3_000 .byte PATT - .word bgm_kazanbai_3_007 + .word mus_route113_3_007 .byte PATT - .word bgm_kazanbai_3_003 + .word mus_route113_3_003 .byte PATT - .word bgm_kazanbai_3_008 + .word mus_route113_3_008 .byte PAN , c_v+0 .byte W72 .byte W72 .byte GOTO - .word bgm_kazanbai_3_B1 + .word mus_route113_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_kazanbai_4: - .byte KEYSH , bgm_kazanbai_key+0 +mus_route113_4: + .byte KEYSH , mus_route113_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 82*bgm_kazanbai_mvl/mxv + .byte VOL , 82*mus_route113_mvl/mxv .byte PAN , c_v+15 .byte W12 -bgm_kazanbai_4_B1: +mus_route113_4_B1: .byte W72 .byte W72 .byte W72 .byte W72 .byte W72 -bgm_kazanbai_4_000: +mus_route113_4_000: .byte W60 .byte N03 , An2 , v120 .byte W06 @@ -1571,7 +1571,7 @@ bgm_kazanbai_4_000: .byte W72 .byte W72 .byte W72 -bgm_kazanbai_4_001: +mus_route113_4_001: .byte W60 .byte N03 , An1 , v120 .byte W06 @@ -1603,7 +1603,7 @@ bgm_kazanbai_4_001: .byte W72 .byte W72 .byte PATT - .word bgm_kazanbai_4_000 + .word mus_route113_4_000 .byte N12 , Dn2 , v120 .byte W12 .byte N06 , An2 @@ -1617,7 +1617,7 @@ bgm_kazanbai_4_001: .byte W72 .byte W72 .byte PATT - .word bgm_kazanbai_4_001 + .word mus_route113_4_001 .byte N15 , Dn2 , v120 .byte W60 .byte N03 , An1 @@ -1627,23 +1627,23 @@ bgm_kazanbai_4_001: .byte N12 , Dn2 .byte W72 .byte GOTO - .word bgm_kazanbai_4_B1 + .word mus_route113_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_kazanbai_5: - .byte KEYSH , bgm_kazanbai_key+0 +mus_route113_5: + .byte KEYSH , mus_route113_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 42*bgm_kazanbai_mvl/mxv + .byte VOL , 42*mus_route113_mvl/mxv .byte PAN , c_v-53 .byte W12 -bgm_kazanbai_5_B1: -bgm_kazanbai_5_000: +mus_route113_5_B1: +mus_route113_5_000: .byte N12 , Fs3 , v084 .byte W12 .byte N03 , Fs3 , v112 @@ -1661,7 +1661,7 @@ bgm_kazanbai_5_000: .byte N12 .byte W12 .byte PEND -bgm_kazanbai_5_001: +mus_route113_5_001: .byte N12 , Fs3 , v084 .byte W12 .byte N03 , Fs3 , v112 @@ -1682,10 +1682,10 @@ bgm_kazanbai_5_001: .byte W12 .byte PEND .byte PATT - .word bgm_kazanbai_5_000 + .word mus_route113_5_000 .byte PATT - .word bgm_kazanbai_5_001 -bgm_kazanbai_5_002: + .word mus_route113_5_001 +mus_route113_5_002: .byte N12 , Cs3 , v084 .byte W12 .byte N03 , Cs3 , v112 @@ -1703,7 +1703,7 @@ bgm_kazanbai_5_002: .byte N12 .byte W12 .byte PEND -bgm_kazanbai_5_003: +mus_route113_5_003: .byte N12 , Cs3 , v084 .byte W12 .byte N03 , Cs3 , v112 @@ -1724,26 +1724,26 @@ bgm_kazanbai_5_003: .byte W12 .byte PEND .byte PATT - .word bgm_kazanbai_5_002 + .word mus_route113_5_002 .byte PATT - .word bgm_kazanbai_5_003 + .word mus_route113_5_003 .byte PATT - .word bgm_kazanbai_5_000 + .word mus_route113_5_000 .byte PATT - .word bgm_kazanbai_5_001 + .word mus_route113_5_001 .byte PATT - .word bgm_kazanbai_5_000 + .word mus_route113_5_000 .byte PATT - .word bgm_kazanbai_5_001 + .word mus_route113_5_001 .byte PATT - .word bgm_kazanbai_5_002 + .word mus_route113_5_002 .byte PATT - .word bgm_kazanbai_5_003 + .word mus_route113_5_003 .byte PATT - .word bgm_kazanbai_5_002 + .word mus_route113_5_002 .byte PATT - .word bgm_kazanbai_5_003 -bgm_kazanbai_5_004: + .word mus_route113_5_003 +mus_route113_5_004: .byte N12 , Dn3 , v084 .byte W12 .byte N03 , Dn3 , v112 @@ -1761,7 +1761,7 @@ bgm_kazanbai_5_004: .byte N12 .byte W12 .byte PEND -bgm_kazanbai_5_005: +mus_route113_5_005: .byte N12 , Dn3 , v084 .byte W12 .byte N03 , Dn3 , v112 @@ -1782,10 +1782,10 @@ bgm_kazanbai_5_005: .byte W12 .byte PEND .byte PATT - .word bgm_kazanbai_5_004 + .word mus_route113_5_004 .byte PATT - .word bgm_kazanbai_5_005 -bgm_kazanbai_5_006: + .word mus_route113_5_005 +mus_route113_5_006: .byte N12 , Bn3 , v084 .byte W12 .byte N03 , Bn3 , v112 @@ -1855,7 +1855,7 @@ bgm_kazanbai_5_006: .byte W06 .byte N12 .byte W12 -bgm_kazanbai_5_007: +mus_route113_5_007: .byte N12 , Dn4 , v084 .byte W12 .byte N03 , Dn4 , v112 @@ -1873,7 +1873,7 @@ bgm_kazanbai_5_007: .byte N12 .byte W12 .byte PEND -bgm_kazanbai_5_008: +mus_route113_5_008: .byte N12 , Dn4 , v084 .byte W12 .byte N03 , Dn4 , v112 @@ -1894,11 +1894,11 @@ bgm_kazanbai_5_008: .byte W12 .byte PEND .byte PATT - .word bgm_kazanbai_5_007 + .word mus_route113_5_007 .byte PATT - .word bgm_kazanbai_5_008 + .word mus_route113_5_008 .byte PATT - .word bgm_kazanbai_5_006 + .word mus_route113_5_006 .byte N12 , Gs3 , v084 .byte W12 .byte N03 , Gs3 , v112 @@ -1952,55 +1952,55 @@ bgm_kazanbai_5_008: .byte N12 .byte W12 .byte PATT - .word bgm_kazanbai_5_000 + .word mus_route113_5_000 .byte PATT - .word bgm_kazanbai_5_001 + .word mus_route113_5_001 .byte PATT - .word bgm_kazanbai_5_000 + .word mus_route113_5_000 .byte PATT - .word bgm_kazanbai_5_001 + .word mus_route113_5_001 .byte PATT - .word bgm_kazanbai_5_002 + .word mus_route113_5_002 .byte PATT - .word bgm_kazanbai_5_003 + .word mus_route113_5_003 .byte PATT - .word bgm_kazanbai_5_002 + .word mus_route113_5_002 .byte PATT - .word bgm_kazanbai_5_003 + .word mus_route113_5_003 .byte PATT - .word bgm_kazanbai_5_000 + .word mus_route113_5_000 .byte PATT - .word bgm_kazanbai_5_001 + .word mus_route113_5_001 .byte PATT - .word bgm_kazanbai_5_000 + .word mus_route113_5_000 .byte PATT - .word bgm_kazanbai_5_001 + .word mus_route113_5_001 .byte PATT - .word bgm_kazanbai_5_002 + .word mus_route113_5_002 .byte PATT - .word bgm_kazanbai_5_003 + .word mus_route113_5_003 .byte PATT - .word bgm_kazanbai_5_002 + .word mus_route113_5_002 .byte PATT - .word bgm_kazanbai_5_003 + .word mus_route113_5_003 .byte GOTO - .word bgm_kazanbai_5_B1 + .word mus_route113_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_kazanbai_6: - .byte KEYSH , bgm_kazanbai_key+0 +mus_route113_6: + .byte KEYSH , mus_route113_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 42*bgm_kazanbai_mvl/mxv + .byte VOL , 42*mus_route113_mvl/mxv .byte PAN , c_v+63 .byte W12 -bgm_kazanbai_6_B1: -bgm_kazanbai_6_000: +mus_route113_6_B1: +mus_route113_6_000: .byte N12 , Bn3 , v084 .byte W12 .byte N03 , Bn3 , v112 @@ -2018,7 +2018,7 @@ bgm_kazanbai_6_000: .byte N12 .byte W12 .byte PEND -bgm_kazanbai_6_001: +mus_route113_6_001: .byte N12 , Bn3 , v084 .byte W12 .byte N03 , Bn3 , v112 @@ -2039,10 +2039,10 @@ bgm_kazanbai_6_001: .byte W12 .byte PEND .byte PATT - .word bgm_kazanbai_6_000 + .word mus_route113_6_000 .byte PATT - .word bgm_kazanbai_6_001 -bgm_kazanbai_6_002: + .word mus_route113_6_001 +mus_route113_6_002: .byte N12 , Fs3 , v084 .byte W12 .byte N03 , Fs3 , v112 @@ -2060,7 +2060,7 @@ bgm_kazanbai_6_002: .byte N12 .byte W12 .byte PEND -bgm_kazanbai_6_003: +mus_route113_6_003: .byte N12 , Fs3 , v084 .byte W12 .byte N03 , Fs3 , v112 @@ -2081,25 +2081,25 @@ bgm_kazanbai_6_003: .byte W12 .byte PEND .byte PATT - .word bgm_kazanbai_6_002 + .word mus_route113_6_002 .byte PATT - .word bgm_kazanbai_6_003 + .word mus_route113_6_003 .byte PATT - .word bgm_kazanbai_6_000 + .word mus_route113_6_000 .byte PATT - .word bgm_kazanbai_6_001 + .word mus_route113_6_001 .byte PATT - .word bgm_kazanbai_6_000 + .word mus_route113_6_000 .byte PATT - .word bgm_kazanbai_6_001 + .word mus_route113_6_001 .byte PATT - .word bgm_kazanbai_6_002 + .word mus_route113_6_002 .byte PATT - .word bgm_kazanbai_6_003 + .word mus_route113_6_003 .byte PATT - .word bgm_kazanbai_6_002 + .word mus_route113_6_002 .byte PATT - .word bgm_kazanbai_6_003 + .word mus_route113_6_003 .byte N12 , An3 , v084 .byte W12 .byte N03 , An3 , v112 @@ -2135,7 +2135,7 @@ bgm_kazanbai_6_003: .byte N12 .byte W12 .byte PATT - .word bgm_kazanbai_6_000 + .word mus_route113_6_000 .byte N12 , Cs4 , v084 .byte W12 .byte N03 , Cs4 , v112 @@ -2154,7 +2154,7 @@ bgm_kazanbai_6_003: .byte W06 .byte N12 .byte W12 -bgm_kazanbai_6_004: +mus_route113_6_004: .byte N12 , Fs4 , v084 .byte W12 .byte N03 , Fs4 , v112 @@ -2293,7 +2293,7 @@ bgm_kazanbai_6_004: .byte N12 .byte W12 .byte PATT - .word bgm_kazanbai_6_004 + .word mus_route113_6_004 .byte N12 , Dn4 , v084 .byte W12 .byte N03 , Dn4 , v112 @@ -2347,51 +2347,51 @@ bgm_kazanbai_6_004: .byte N12 .byte W12 .byte PATT - .word bgm_kazanbai_6_000 + .word mus_route113_6_000 .byte PATT - .word bgm_kazanbai_6_001 + .word mus_route113_6_001 .byte PATT - .word bgm_kazanbai_6_000 + .word mus_route113_6_000 .byte PATT - .word bgm_kazanbai_6_001 + .word mus_route113_6_001 .byte PATT - .word bgm_kazanbai_6_002 + .word mus_route113_6_002 .byte PATT - .word bgm_kazanbai_6_003 + .word mus_route113_6_003 .byte PATT - .word bgm_kazanbai_6_002 + .word mus_route113_6_002 .byte PATT - .word bgm_kazanbai_6_003 + .word mus_route113_6_003 .byte PATT - .word bgm_kazanbai_6_000 + .word mus_route113_6_000 .byte PATT - .word bgm_kazanbai_6_001 + .word mus_route113_6_001 .byte PATT - .word bgm_kazanbai_6_000 + .word mus_route113_6_000 .byte PATT - .word bgm_kazanbai_6_001 + .word mus_route113_6_001 .byte PATT - .word bgm_kazanbai_6_002 + .word mus_route113_6_002 .byte PATT - .word bgm_kazanbai_6_003 + .word mus_route113_6_003 .byte PATT - .word bgm_kazanbai_6_002 + .word mus_route113_6_002 .byte PATT - .word bgm_kazanbai_6_003 + .word mus_route113_6_003 .byte GOTO - .word bgm_kazanbai_6_B1 + .word mus_route113_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_kazanbai_7: - .byte KEYSH , bgm_kazanbai_key+0 +mus_route113_7: + .byte KEYSH , mus_route113_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 84*bgm_kazanbai_mvl/mxv + .byte VOL , 84*mus_route113_mvl/mxv .byte W12 -bgm_kazanbai_7_B1: -bgm_kazanbai_7_000: +mus_route113_7_B1: +mus_route113_7_000: .byte N06 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -2455,7 +2455,7 @@ bgm_kazanbai_7_000: .byte W06 .byte Dn1 , v016 .byte W06 -bgm_kazanbai_7_001: +mus_route113_7_001: .byte N06 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -2521,7 +2521,7 @@ bgm_kazanbai_7_001: .byte W06 .byte Dn1 , v064 .byte W06 -bgm_kazanbai_7_002: +mus_route113_7_002: .byte N06 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -2537,7 +2537,7 @@ bgm_kazanbai_7_002: .byte Cn1 , v112 .byte W12 .byte PEND -bgm_kazanbai_7_003: +mus_route113_7_003: .byte N06 , Cn1 , v127 .byte W18 .byte Cn1 , v096 @@ -2557,7 +2557,7 @@ bgm_kazanbai_7_003: .byte Dn1 , v024 .byte W06 .byte PEND -bgm_kazanbai_7_004: +mus_route113_7_004: .byte N06 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -2574,9 +2574,9 @@ bgm_kazanbai_7_004: .byte W12 .byte PEND .byte PATT - .word bgm_kazanbai_7_003 + .word mus_route113_7_003 .byte PATT - .word bgm_kazanbai_7_002 + .word mus_route113_7_002 .byte N06 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -2655,7 +2655,7 @@ bgm_kazanbai_7_004: .byte W06 .byte Dn1 , v020 .byte W06 -bgm_kazanbai_7_005: +mus_route113_7_005: .byte N06 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -2672,8 +2672,8 @@ bgm_kazanbai_7_005: .byte W12 .byte PEND .byte PATT - .word bgm_kazanbai_7_003 -bgm_kazanbai_7_006: + .word mus_route113_7_003 +mus_route113_7_006: .byte N06 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -2707,7 +2707,7 @@ bgm_kazanbai_7_006: .byte W06 .byte Dn1 , v024 .byte W06 -bgm_kazanbai_7_007: +mus_route113_7_007: .byte N06 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -2742,7 +2742,7 @@ bgm_kazanbai_7_007: .byte Dn1 , v020 .byte W06 .byte PATT - .word bgm_kazanbai_7_000 + .word mus_route113_7_000 .byte N06 , Cn1 , v127 .byte W18 .byte Cn1 , v092 @@ -2819,7 +2819,7 @@ bgm_kazanbai_7_007: .byte Dn1 , v024 .byte W06 .byte PATT - .word bgm_kazanbai_7_004 + .word mus_route113_7_004 .byte N06 , Cn1 , v127 .byte W18 .byte Cn1 , v092 @@ -2839,7 +2839,7 @@ bgm_kazanbai_7_007: .byte Dn1 , v024 .byte W06 .byte PATT - .word bgm_kazanbai_7_005 + .word mus_route113_7_005 .byte N06 , Cn1 , v127 .byte W18 .byte Cn1 , v096 @@ -2913,7 +2913,7 @@ bgm_kazanbai_7_007: .byte Dn1 , v032 .byte W06 .byte PATT - .word bgm_kazanbai_7_005 + .word mus_route113_7_005 .byte N06 , Cn1 , v127 .byte W18 .byte Cn1 , v064 @@ -2973,7 +2973,7 @@ bgm_kazanbai_7_007: .byte Dn1 , v060 .byte W06 .byte PATT - .word bgm_kazanbai_7_007 + .word mus_route113_7_007 .byte N06 , Cn1 , v127 .byte W18 .byte Cn1 , v096 @@ -3031,7 +3031,7 @@ bgm_kazanbai_7_007: .byte N06 .byte W06 .byte PATT - .word bgm_kazanbai_7_006 + .word mus_route113_7_006 .byte N06 , Cn1 , v127 .byte W12 .byte Dn1 , v112 @@ -3053,7 +3053,7 @@ bgm_kazanbai_7_007: .byte Dn1 , v028 .byte W06 .byte PATT - .word bgm_kazanbai_7_001 + .word mus_route113_7_001 .byte N06 , Cn1 , v127 .byte W18 .byte Cn1 , v096 @@ -3073,20 +3073,20 @@ bgm_kazanbai_7_007: .byte Dn1 , v056 .byte W06 .byte GOTO - .word bgm_kazanbai_7_B1 + .word mus_route113_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_kazanbai_8: - .byte KEYSH , bgm_kazanbai_key+0 +mus_route113_8: + .byte KEYSH , mus_route113_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 36*bgm_kazanbai_mvl/mxv + .byte VOL , 36*mus_route113_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fs3 , v112 .byte W02 @@ -3094,8 +3094,8 @@ bgm_kazanbai_8: .byte W04 .byte N06 , Bn3 .byte W06 -bgm_kazanbai_8_B1: -bgm_kazanbai_8_000: +mus_route113_8_B1: +mus_route113_8_000: .byte N36 , Dn4 , v112 .byte W12 .byte MOD , 7 @@ -3107,7 +3107,7 @@ bgm_kazanbai_8_000: .byte N12 , An3 .byte W12 .byte PEND -bgm_kazanbai_8_001: +mus_route113_8_001: .byte N24 , Bn3 , v112 .byte W24 .byte N12 , Dn3 @@ -3128,7 +3128,7 @@ bgm_kazanbai_8_001: .byte W24 .byte N12 , Dn3 .byte W12 -bgm_kazanbai_8_002: +mus_route113_8_002: .byte N60 , Gn3 , v112 .byte W24 .byte MOD , 7 @@ -3145,7 +3145,7 @@ bgm_kazanbai_8_002: .byte 0 .byte W72 .byte W24 - .byte VOL , 11*bgm_kazanbai_mvl/mxv + .byte VOL , 11*mus_route113_mvl/mxv .byte W24 .byte MOD , 3 .byte W24 @@ -3153,13 +3153,13 @@ bgm_kazanbai_8_002: .byte W48 .byte 0 .byte W12 - .byte VOL , 36*bgm_kazanbai_mvl/mxv + .byte VOL , 36*mus_route113_mvl/mxv .byte N06 , En4 .byte W06 .byte Ds4 .byte W06 .byte PATT - .word bgm_kazanbai_8_000 + .word mus_route113_8_000 .byte N24 , Gn4 , v112 .byte W24 .byte N12 , Dn3 @@ -3200,13 +3200,13 @@ bgm_kazanbai_8_002: .byte 0 .byte W72 .byte W24 - .byte VOL , 13*bgm_kazanbai_mvl/mxv + .byte VOL , 13*mus_route113_mvl/mxv .byte W48 .byte MOD , 7 .byte W48 .byte 0 .byte W12 - .byte VOL , 36*bgm_kazanbai_mvl/mxv + .byte VOL , 36*mus_route113_mvl/mxv .byte N06 , An3 .byte W06 .byte As3 @@ -3418,7 +3418,7 @@ bgm_kazanbai_8_002: .byte N12 , An3 .byte W12 .byte PATT - .word bgm_kazanbai_8_001 + .word mus_route113_8_001 .byte MOD , 0 .byte N03 , Ds4 , v096 .byte W03 @@ -3433,7 +3433,7 @@ bgm_kazanbai_8_002: .byte N12 , Dn3 .byte W12 .byte PATT - .word bgm_kazanbai_8_002 + .word mus_route113_8_002 .byte N72 , An3 , v112 .byte W24 .byte MOD , 6 @@ -3441,13 +3441,13 @@ bgm_kazanbai_8_002: .byte 0 .byte W72 .byte W24 - .byte VOL , 9*bgm_kazanbai_mvl/mxv + .byte VOL , 9*mus_route113_mvl/mxv .byte W48 .byte MOD , 7 .byte W48 .byte 0 .byte W12 - .byte VOL , 36*bgm_kazanbai_mvl/mxv + .byte VOL , 36*mus_route113_mvl/mxv .byte N06 , En4 .byte W06 .byte Ds4 @@ -3513,42 +3513,42 @@ bgm_kazanbai_8_002: .byte 0 .byte W72 .byte W24 - .byte VOL , 13*bgm_kazanbai_mvl/mxv + .byte VOL , 13*mus_route113_mvl/mxv .byte MOD , 5 .byte W36 - .byte VOL , 42*bgm_kazanbai_mvl/mxv + .byte VOL , 42*mus_route113_mvl/mxv .byte MOD , 0 .byte W12 .byte W24 - .byte VOL , 13*bgm_kazanbai_mvl/mxv + .byte VOL , 13*mus_route113_mvl/mxv .byte MOD , 6 .byte W24 .byte 0 .byte W12 - .byte VOL , 36*bgm_kazanbai_mvl/mxv + .byte VOL , 36*mus_route113_mvl/mxv .byte N06 , Fs3 .byte W06 .byte Bn3 .byte W06 .byte GOTO - .word bgm_kazanbai_8_B1 + .word mus_route113_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_kazanbai_9: - .byte KEYSH , bgm_kazanbai_key+0 +mus_route113_9: + .byte KEYSH , mus_route113_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 44*bgm_kazanbai_mvl/mxv + .byte VOL , 44*mus_route113_mvl/mxv .byte PAN , c_v-19 .byte N06 , Bn2 , v112 .byte W06 .byte Dn3 .byte W06 -bgm_kazanbai_9_B1: - .byte VOL , 46*bgm_kazanbai_mvl/mxv +mus_route113_9_B1: + .byte VOL , 46*mus_route113_mvl/mxv .byte N36 , Gn3 , v112 .byte W12 .byte MOD , 7 @@ -3559,7 +3559,7 @@ bgm_kazanbai_9_B1: .byte W24 .byte N09 , Dn3 .byte W09 -bgm_kazanbai_9_000: +mus_route113_9_000: .byte N24 , Gn3 , v112 .byte W24 .byte W03 @@ -3570,7 +3570,7 @@ bgm_kazanbai_9_000: .byte MOD , 7 .byte W24 .byte PEND -bgm_kazanbai_9_001: +mus_route113_9_001: .byte VOICE , 24 .byte MOD , 0 .byte N12 , Gn3 , v112 @@ -3585,7 +3585,7 @@ bgm_kazanbai_9_001: .byte N09 , Gn2 .byte W09 .byte PEND -bgm_kazanbai_9_002: +mus_route113_9_002: .byte N60 , Bn2 , v112 .byte W24 .byte MOD , 7 @@ -3596,91 +3596,91 @@ bgm_kazanbai_9_002: .byte An3 .byte W06 .byte PEND -bgm_kazanbai_9_003: +mus_route113_9_003: .byte W03 .byte N68 , Dn3 , v112 .byte W21 .byte MOD , 7 .byte W48 .byte PEND -bgm_kazanbai_9_004: +mus_route113_9_004: .byte MOD , 0 .byte W48 .byte VOICE , 60 - .byte VOL , 57*bgm_kazanbai_mvl/mxv + .byte VOL , 57*mus_route113_mvl/mxv .byte W12 .byte N06 , Gn2 , v112 .byte W12 .byte PEND .byte TIE , En3 .byte W24 - .byte VOL , 54*bgm_kazanbai_mvl/mxv + .byte VOL , 54*mus_route113_mvl/mxv .byte W02 - .byte 51*bgm_kazanbai_mvl/mxv + .byte 51*mus_route113_mvl/mxv .byte W03 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte W03 - .byte 48*bgm_kazanbai_mvl/mxv + .byte 48*mus_route113_mvl/mxv .byte W04 - .byte 44*bgm_kazanbai_mvl/mxv + .byte 44*mus_route113_mvl/mxv .byte W05 - .byte 42*bgm_kazanbai_mvl/mxv + .byte 42*mus_route113_mvl/mxv .byte W03 - .byte 40*bgm_kazanbai_mvl/mxv + .byte 40*mus_route113_mvl/mxv .byte W04 .byte MOD , 3 .byte W02 - .byte VOL , 37*bgm_kazanbai_mvl/mxv + .byte VOL , 37*mus_route113_mvl/mxv .byte W03 - .byte 35*bgm_kazanbai_mvl/mxv + .byte 35*mus_route113_mvl/mxv .byte W07 - .byte 31*bgm_kazanbai_mvl/mxv + .byte 31*mus_route113_mvl/mxv .byte W02 - .byte 31*bgm_kazanbai_mvl/mxv + .byte 31*mus_route113_mvl/mxv .byte W03 - .byte 27*bgm_kazanbai_mvl/mxv + .byte 27*mus_route113_mvl/mxv .byte W03 - .byte 26*bgm_kazanbai_mvl/mxv + .byte 26*mus_route113_mvl/mxv .byte W04 - .byte 24*bgm_kazanbai_mvl/mxv + .byte 24*mus_route113_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 22*bgm_kazanbai_mvl/mxv + .byte VOL , 22*mus_route113_mvl/mxv .byte W03 - .byte 21*bgm_kazanbai_mvl/mxv + .byte 21*mus_route113_mvl/mxv .byte W03 - .byte 19*bgm_kazanbai_mvl/mxv + .byte 19*mus_route113_mvl/mxv .byte W04 - .byte 18*bgm_kazanbai_mvl/mxv + .byte 18*mus_route113_mvl/mxv .byte W02 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W03 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W03 - .byte 11*bgm_kazanbai_mvl/mxv + .byte 11*mus_route113_mvl/mxv .byte W04 - .byte 10*bgm_kazanbai_mvl/mxv + .byte 10*mus_route113_mvl/mxv .byte W02 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W03 - .byte 7*bgm_kazanbai_mvl/mxv + .byte 7*mus_route113_mvl/mxv .byte W03 - .byte 5*bgm_kazanbai_mvl/mxv + .byte 5*mus_route113_mvl/mxv .byte W06 - .byte 3*bgm_kazanbai_mvl/mxv + .byte 3*mus_route113_mvl/mxv .byte W06 - .byte 1*bgm_kazanbai_mvl/mxv + .byte 1*mus_route113_mvl/mxv .byte W04 .byte EOT .byte MOD , 0 .byte W12 .byte VOICE , 24 - .byte VOL , 45*bgm_kazanbai_mvl/mxv + .byte VOL , 45*mus_route113_mvl/mxv .byte N06 , An3 .byte W06 .byte Gs3 .byte W06 -bgm_kazanbai_9_005: +mus_route113_9_005: .byte N36 , Gn3 , v112 .byte W12 .byte MOD , 7 @@ -3692,7 +3692,7 @@ bgm_kazanbai_9_005: .byte N09 , Dn3 .byte W09 .byte PEND -bgm_kazanbai_9_006: +mus_route113_9_006: .byte N24 , Dn4 , v112 .byte W24 .byte W03 @@ -3705,7 +3705,7 @@ bgm_kazanbai_9_006: .byte Cs4 .byte W06 .byte PEND -bgm_kazanbai_9_007: +mus_route113_9_007: .byte N12 , Gn3 , v112 .byte W15 .byte N06 , Fs3 @@ -3718,7 +3718,7 @@ bgm_kazanbai_9_007: .byte N09 , Gn2 .byte W09 .byte PEND -bgm_kazanbai_9_008: +mus_route113_9_008: .byte N12 , Dn4 , v112 .byte W15 .byte N09 , Gn3 @@ -3735,70 +3735,70 @@ bgm_kazanbai_9_008: .byte W06 .byte PEND .byte PATT - .word bgm_kazanbai_9_003 + .word mus_route113_9_003 .byte PATT - .word bgm_kazanbai_9_004 + .word mus_route113_9_004 .byte TIE , En3 , v112 .byte W24 - .byte VOL , 54*bgm_kazanbai_mvl/mxv + .byte VOL , 54*mus_route113_mvl/mxv .byte W02 - .byte 51*bgm_kazanbai_mvl/mxv + .byte 51*mus_route113_mvl/mxv .byte W03 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte W03 - .byte 48*bgm_kazanbai_mvl/mxv + .byte 48*mus_route113_mvl/mxv .byte W04 - .byte 44*bgm_kazanbai_mvl/mxv + .byte 44*mus_route113_mvl/mxv .byte W05 - .byte 42*bgm_kazanbai_mvl/mxv + .byte 42*mus_route113_mvl/mxv .byte W03 - .byte 40*bgm_kazanbai_mvl/mxv + .byte 40*mus_route113_mvl/mxv .byte W06 - .byte 37*bgm_kazanbai_mvl/mxv + .byte 37*mus_route113_mvl/mxv .byte W03 - .byte 35*bgm_kazanbai_mvl/mxv + .byte 35*mus_route113_mvl/mxv .byte W07 - .byte 31*bgm_kazanbai_mvl/mxv + .byte 31*mus_route113_mvl/mxv .byte W02 - .byte 31*bgm_kazanbai_mvl/mxv + .byte 31*mus_route113_mvl/mxv .byte W03 - .byte 27*bgm_kazanbai_mvl/mxv + .byte 27*mus_route113_mvl/mxv .byte W03 - .byte 26*bgm_kazanbai_mvl/mxv + .byte 26*mus_route113_mvl/mxv .byte W04 - .byte 24*bgm_kazanbai_mvl/mxv + .byte 24*mus_route113_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 22*bgm_kazanbai_mvl/mxv + .byte VOL , 22*mus_route113_mvl/mxv .byte W03 - .byte 21*bgm_kazanbai_mvl/mxv + .byte 21*mus_route113_mvl/mxv .byte W03 - .byte 19*bgm_kazanbai_mvl/mxv + .byte 19*mus_route113_mvl/mxv .byte W04 - .byte 18*bgm_kazanbai_mvl/mxv + .byte 18*mus_route113_mvl/mxv .byte W02 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W03 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W03 - .byte 11*bgm_kazanbai_mvl/mxv + .byte 11*mus_route113_mvl/mxv .byte W04 - .byte 10*bgm_kazanbai_mvl/mxv + .byte 10*mus_route113_mvl/mxv .byte W02 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W03 - .byte 7*bgm_kazanbai_mvl/mxv + .byte 7*mus_route113_mvl/mxv .byte W03 - .byte 5*bgm_kazanbai_mvl/mxv + .byte 5*mus_route113_mvl/mxv .byte W06 - .byte 3*bgm_kazanbai_mvl/mxv + .byte 3*mus_route113_mvl/mxv .byte W06 - .byte 1*bgm_kazanbai_mvl/mxv + .byte 1*mus_route113_mvl/mxv .byte W04 .byte EOT .byte MOD , 0 .byte W12 - .byte VOL , 68*bgm_kazanbai_mvl/mxv + .byte VOL , 68*mus_route113_mvl/mxv .byte W12 .byte W72 .byte W72 @@ -3816,7 +3816,7 @@ bgm_kazanbai_9_008: .byte W72 .byte W72 .byte W54 - .byte 36*bgm_kazanbai_mvl/mxv + .byte 36*mus_route113_mvl/mxv .byte W06 .byte VOICE , 60 .byte N06 , Bn2 @@ -3824,96 +3824,96 @@ bgm_kazanbai_9_008: .byte Dn3 .byte W06 .byte PATT - .word bgm_kazanbai_9_005 + .word mus_route113_9_005 .byte PATT - .word bgm_kazanbai_9_000 + .word mus_route113_9_000 .byte PATT - .word bgm_kazanbai_9_001 + .word mus_route113_9_001 .byte PATT - .word bgm_kazanbai_9_002 + .word mus_route113_9_002 .byte W03 .byte N68 , Dn3 , v112 .byte W21 .byte MOD , 6 .byte W48 .byte PATT - .word bgm_kazanbai_9_004 + .word mus_route113_9_004 .byte N12 , En3 , v112 .byte W12 .byte N06 , Gn2 .byte W12 - .byte VOL , 54*bgm_kazanbai_mvl/mxv + .byte VOL , 54*mus_route113_mvl/mxv .byte N96 , En3 .byte W02 - .byte VOL , 51*bgm_kazanbai_mvl/mxv + .byte VOL , 51*mus_route113_mvl/mxv .byte W03 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte W03 - .byte 48*bgm_kazanbai_mvl/mxv + .byte 48*mus_route113_mvl/mxv .byte W04 - .byte 44*bgm_kazanbai_mvl/mxv + .byte 44*mus_route113_mvl/mxv .byte W05 - .byte 42*bgm_kazanbai_mvl/mxv + .byte 42*mus_route113_mvl/mxv .byte W03 - .byte 40*bgm_kazanbai_mvl/mxv + .byte 40*mus_route113_mvl/mxv .byte W06 - .byte 37*bgm_kazanbai_mvl/mxv + .byte 37*mus_route113_mvl/mxv .byte W03 - .byte 35*bgm_kazanbai_mvl/mxv + .byte 35*mus_route113_mvl/mxv .byte W07 - .byte 31*bgm_kazanbai_mvl/mxv + .byte 31*mus_route113_mvl/mxv .byte W02 - .byte 31*bgm_kazanbai_mvl/mxv + .byte 31*mus_route113_mvl/mxv .byte W03 - .byte 27*bgm_kazanbai_mvl/mxv + .byte 27*mus_route113_mvl/mxv .byte W03 - .byte 26*bgm_kazanbai_mvl/mxv + .byte 26*mus_route113_mvl/mxv .byte W04 - .byte 24*bgm_kazanbai_mvl/mxv + .byte 24*mus_route113_mvl/mxv .byte MOD , 7 .byte W02 - .byte VOL , 22*bgm_kazanbai_mvl/mxv + .byte VOL , 22*mus_route113_mvl/mxv .byte W03 - .byte 21*bgm_kazanbai_mvl/mxv + .byte 21*mus_route113_mvl/mxv .byte W03 - .byte 19*bgm_kazanbai_mvl/mxv + .byte 19*mus_route113_mvl/mxv .byte W04 - .byte 18*bgm_kazanbai_mvl/mxv + .byte 18*mus_route113_mvl/mxv .byte W02 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W03 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte W03 - .byte 11*bgm_kazanbai_mvl/mxv + .byte 11*mus_route113_mvl/mxv .byte W04 - .byte 10*bgm_kazanbai_mvl/mxv + .byte 10*mus_route113_mvl/mxv .byte W02 - .byte 9*bgm_kazanbai_mvl/mxv + .byte 9*mus_route113_mvl/mxv .byte W03 - .byte 7*bgm_kazanbai_mvl/mxv + .byte 7*mus_route113_mvl/mxv .byte W03 - .byte 5*bgm_kazanbai_mvl/mxv + .byte 5*mus_route113_mvl/mxv .byte W06 - .byte 3*bgm_kazanbai_mvl/mxv + .byte 3*mus_route113_mvl/mxv .byte W06 - .byte 1*bgm_kazanbai_mvl/mxv + .byte 1*mus_route113_mvl/mxv .byte W04 .byte MOD , 0 .byte W12 .byte VOICE , 60 - .byte VOL , 38*bgm_kazanbai_mvl/mxv + .byte VOL , 38*mus_route113_mvl/mxv .byte N06 , An3 .byte W06 .byte Gs3 .byte W06 .byte PATT - .word bgm_kazanbai_9_005 + .word mus_route113_9_005 .byte PATT - .word bgm_kazanbai_9_006 + .word mus_route113_9_006 .byte PATT - .word bgm_kazanbai_9_007 + .word mus_route113_9_007 .byte PATT - .word bgm_kazanbai_9_008 + .word mus_route113_9_008 .byte N03 , Ds3 , v112 .byte W03 .byte N68 , Dn3 @@ -3921,87 +3921,87 @@ bgm_kazanbai_9_008: .byte MOD , 7 .byte W48 .byte PATT - .word bgm_kazanbai_9_004 + .word mus_route113_9_004 .byte N60 , En3 , v112 .byte W24 - .byte VOL , 54*bgm_kazanbai_mvl/mxv + .byte VOL , 54*mus_route113_mvl/mxv .byte MOD , 5 .byte W02 - .byte VOL , 51*bgm_kazanbai_mvl/mxv + .byte VOL , 51*mus_route113_mvl/mxv .byte W03 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte W03 - .byte 48*bgm_kazanbai_mvl/mxv + .byte 48*mus_route113_mvl/mxv .byte W04 - .byte 44*bgm_kazanbai_mvl/mxv + .byte 44*mus_route113_mvl/mxv .byte W05 - .byte 42*bgm_kazanbai_mvl/mxv + .byte 42*mus_route113_mvl/mxv .byte W03 - .byte 40*bgm_kazanbai_mvl/mxv + .byte 40*mus_route113_mvl/mxv .byte W06 - .byte 37*bgm_kazanbai_mvl/mxv + .byte 37*mus_route113_mvl/mxv .byte W03 - .byte 35*bgm_kazanbai_mvl/mxv + .byte 35*mus_route113_mvl/mxv .byte W07 - .byte 63*bgm_kazanbai_mvl/mxv + .byte 63*mus_route113_mvl/mxv .byte MOD , 0 .byte N06 , Gn2 .byte W12 .byte N48 , En3 .byte W21 - .byte VOL , 59*bgm_kazanbai_mvl/mxv + .byte VOL , 59*mus_route113_mvl/mxv .byte W03 - .byte 50*bgm_kazanbai_mvl/mxv + .byte 50*mus_route113_mvl/mxv .byte MOD , 6 .byte W02 - .byte VOL , 46*bgm_kazanbai_mvl/mxv + .byte VOL , 46*mus_route113_mvl/mxv .byte W03 - .byte 36*bgm_kazanbai_mvl/mxv + .byte 36*mus_route113_mvl/mxv .byte W03 - .byte 34*bgm_kazanbai_mvl/mxv + .byte 34*mus_route113_mvl/mxv .byte W04 - .byte 27*bgm_kazanbai_mvl/mxv + .byte 27*mus_route113_mvl/mxv .byte W02 - .byte 23*bgm_kazanbai_mvl/mxv + .byte 23*mus_route113_mvl/mxv .byte W03 - .byte 19*bgm_kazanbai_mvl/mxv + .byte 19*mus_route113_mvl/mxv .byte W03 - .byte 17*bgm_kazanbai_mvl/mxv + .byte 17*mus_route113_mvl/mxv .byte W04 - .byte 15*bgm_kazanbai_mvl/mxv + .byte 15*mus_route113_mvl/mxv .byte MOD , 0 .byte W05 - .byte VOL , 13*bgm_kazanbai_mvl/mxv + .byte VOL , 13*mus_route113_mvl/mxv .byte W07 .byte VOICE , 24 - .byte VOL , 68*bgm_kazanbai_mvl/mxv + .byte VOL , 68*mus_route113_mvl/mxv .byte N06 , Bn2 .byte W06 .byte Dn3 .byte W06 .byte GOTO - .word bgm_kazanbai_9_B1 + .word mus_route113_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_kazanbai: +mus_route113: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_kazanbai_pri @ Priority - .byte bgm_kazanbai_rev @ Reverb. + .byte mus_route113_pri @ Priority + .byte mus_route113_rev @ Reverb. - .word bgm_kazanbai_grp + .word mus_route113_grp - .word bgm_kazanbai_1 - .word bgm_kazanbai_2 - .word bgm_kazanbai_3 - .word bgm_kazanbai_4 - .word bgm_kazanbai_5 - .word bgm_kazanbai_6 - .word bgm_kazanbai_7 - .word bgm_kazanbai_8 - .word bgm_kazanbai_9 + .word mus_route113_1 + .word mus_route113_2 + .word mus_route113_3 + .word mus_route113_4 + .word mus_route113_5 + .word mus_route113_6 + .word mus_route113_7 + .word mus_route113_8 + .word mus_route113_9 .end diff --git a/sound/songs/bgm_granroad.s b/sound/songs/mus_route119.s index d51e08206..10371630a 100644 --- a/sound/songs/bgm_granroad.s +++ b/sound/songs/mus_route119.s @@ -1,36 +1,36 @@ .include "MPlayDef.s" - .equ bgm_granroad_grp, voicegroup045 - .equ bgm_granroad_pri, 0 - .equ bgm_granroad_rev, reverb_set+50 - .equ bgm_granroad_mvl, 127 - .equ bgm_granroad_key, 0 - .equ bgm_granroad_tbs, 1 - .equ bgm_granroad_exg, 0 - .equ bgm_granroad_cmp, 1 + .equ mus_route119_grp, voicegroup045 + .equ mus_route119_pri, 0 + .equ mus_route119_rev, reverb_set+50 + .equ mus_route119_mvl, 127 + .equ mus_route119_key, 0 + .equ mus_route119_tbs, 1 + .equ mus_route119_exg, 0 + .equ mus_route119_cmp, 1 .section .rodata - .global bgm_granroad + .global mus_route119 .align 2 @********************** Track 1 **********************@ -bgm_granroad_1: - .byte KEYSH , bgm_granroad_key+0 - .byte TEMPO , 136*bgm_granroad_tbs/2 +mus_route119_1: + .byte KEYSH , mus_route119_key+0 + .byte TEMPO , 136*mus_route119_tbs/2 .byte VOICE , 58 .byte LFOS , 44 - .byte VOL , 83*bgm_granroad_mvl/mxv + .byte VOL , 83*mus_route119_mvl/mxv .byte PAN , c_v+4 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 92*bgm_granroad_mvl/mxv + .byte VOL , 92*mus_route119_mvl/mxv .byte PAN , c_v+0 - .byte VOL , 80*bgm_granroad_mvl/mxv + .byte VOL , 80*mus_route119_mvl/mxv .byte XCMD , xIECV , 12 .byte xIECL , 8 .byte PAN , c_v+0 - .byte VOL , 74*bgm_granroad_mvl/mxv + .byte VOL , 74*mus_route119_mvl/mxv .byte W24 .byte N24 , En1 , v127 .byte W24 @@ -45,99 +45,99 @@ bgm_granroad_1: .byte PAN , c_v+32 .byte N72 , An4 .byte W03 - .byte VOL , 84*bgm_granroad_mvl/mxv + .byte VOL , 84*mus_route119_mvl/mxv .byte W02 - .byte 75*bgm_granroad_mvl/mxv + .byte 75*mus_route119_mvl/mxv .byte W03 - .byte 72*bgm_granroad_mvl/mxv + .byte 72*mus_route119_mvl/mxv .byte W07 - .byte 60*bgm_granroad_mvl/mxv + .byte 60*mus_route119_mvl/mxv .byte W02 - .byte 65*bgm_granroad_mvl/mxv + .byte 65*mus_route119_mvl/mxv .byte W03 - .byte 69*bgm_granroad_mvl/mxv + .byte 69*mus_route119_mvl/mxv .byte W04 - .byte 72*bgm_granroad_mvl/mxv + .byte 72*mus_route119_mvl/mxv .byte MOD , 10 .byte W02 - .byte VOL , 80*bgm_granroad_mvl/mxv + .byte VOL , 80*mus_route119_mvl/mxv .byte W03 - .byte 84*bgm_granroad_mvl/mxv + .byte 84*mus_route119_mvl/mxv .byte W03 - .byte 90*bgm_granroad_mvl/mxv + .byte 90*mus_route119_mvl/mxv .byte W04 - .byte 96*bgm_granroad_mvl/mxv + .byte 96*mus_route119_mvl/mxv .byte W12 - .byte 94*bgm_granroad_mvl/mxv + .byte 94*mus_route119_mvl/mxv .byte W04 - .byte 91*bgm_granroad_mvl/mxv + .byte 91*mus_route119_mvl/mxv .byte W04 - .byte 86*bgm_granroad_mvl/mxv + .byte 86*mus_route119_mvl/mxv .byte W04 - .byte 83*bgm_granroad_mvl/mxv + .byte 83*mus_route119_mvl/mxv .byte W04 - .byte 78*bgm_granroad_mvl/mxv + .byte 78*mus_route119_mvl/mxv .byte W04 - .byte 74*bgm_granroad_mvl/mxv + .byte 74*mus_route119_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 69*bgm_granroad_mvl/mxv + .byte VOL , 69*mus_route119_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W12 .byte VOICE , 56 .byte W04 - .byte VOL , 84*bgm_granroad_mvl/mxv + .byte VOL , 84*mus_route119_mvl/mxv .byte N04 , Fs4 .byte W08 .byte N72 , An4 .byte W03 - .byte VOL , 84*bgm_granroad_mvl/mxv + .byte VOL , 84*mus_route119_mvl/mxv .byte W02 - .byte 75*bgm_granroad_mvl/mxv + .byte 75*mus_route119_mvl/mxv .byte W03 - .byte 72*bgm_granroad_mvl/mxv + .byte 72*mus_route119_mvl/mxv .byte W07 - .byte 60*bgm_granroad_mvl/mxv + .byte 60*mus_route119_mvl/mxv .byte W02 - .byte 65*bgm_granroad_mvl/mxv + .byte 65*mus_route119_mvl/mxv .byte W03 - .byte 69*bgm_granroad_mvl/mxv + .byte 69*mus_route119_mvl/mxv .byte W04 - .byte 72*bgm_granroad_mvl/mxv + .byte 72*mus_route119_mvl/mxv .byte MOD , 10 .byte W02 - .byte VOL , 80*bgm_granroad_mvl/mxv + .byte VOL , 80*mus_route119_mvl/mxv .byte W03 - .byte 84*bgm_granroad_mvl/mxv + .byte 84*mus_route119_mvl/mxv .byte W03 - .byte 90*bgm_granroad_mvl/mxv + .byte 90*mus_route119_mvl/mxv .byte W04 - .byte 96*bgm_granroad_mvl/mxv + .byte 96*mus_route119_mvl/mxv .byte W12 - .byte 94*bgm_granroad_mvl/mxv + .byte 94*mus_route119_mvl/mxv .byte W04 - .byte 91*bgm_granroad_mvl/mxv + .byte 91*mus_route119_mvl/mxv .byte W04 - .byte 86*bgm_granroad_mvl/mxv + .byte 86*mus_route119_mvl/mxv .byte W04 - .byte 83*bgm_granroad_mvl/mxv + .byte 83*mus_route119_mvl/mxv .byte W04 - .byte 78*bgm_granroad_mvl/mxv + .byte 78*mus_route119_mvl/mxv .byte W04 - .byte 74*bgm_granroad_mvl/mxv + .byte 74*mus_route119_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 48*bgm_granroad_mvl/mxv + .byte VOL , 48*mus_route119_mvl/mxv .byte W96 .byte W96 -bgm_granroad_1_B1: +mus_route119_1_B1: .byte W96 .byte W96 .byte VOICE , 46 .byte PAN , c_v-63 - .byte VOL , 65*bgm_granroad_mvl/mxv + .byte VOL , 65*mus_route119_mvl/mxv .byte N04 , En3 , v092 .byte W04 .byte En3 , v032 @@ -194,7 +194,7 @@ bgm_granroad_1_B1: .byte Dn4 , v032 .byte W04 .byte PAN , c_v+0 - .byte VOL , 48*bgm_granroad_mvl/mxv + .byte VOL , 48*mus_route119_mvl/mxv .byte N04 , Cs4 , v084 .byte W04 .byte N20 , Cs4 , v032 @@ -204,7 +204,7 @@ bgm_granroad_1_B1: .byte W96 .byte VOICE , 9 .byte PAN , c_v+0 - .byte VOL , 33*bgm_granroad_mvl/mxv + .byte VOL , 33*mus_route119_mvl/mxv .byte N48 , En5 , v112 .byte W24 .byte PAN , c_v+63 @@ -241,47 +241,47 @@ bgm_granroad_1_B1: .byte c_v+0 .byte N24 , An4 .byte W24 - .byte VOL , 33*bgm_granroad_mvl/mxv + .byte VOL , 33*mus_route119_mvl/mxv .byte N72 , Bn4 .byte W24 .byte PAN , c_v-64 - .byte VOL , 30*bgm_granroad_mvl/mxv + .byte VOL , 30*mus_route119_mvl/mxv .byte W04 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W04 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W04 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W04 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W04 - .byte 21*bgm_granroad_mvl/mxv + .byte 21*mus_route119_mvl/mxv .byte W04 .byte PAN , c_v+63 - .byte VOL , 20*bgm_granroad_mvl/mxv + .byte VOL , 20*mus_route119_mvl/mxv .byte W04 - .byte 19*bgm_granroad_mvl/mxv + .byte 19*mus_route119_mvl/mxv .byte W04 - .byte 17*bgm_granroad_mvl/mxv + .byte 17*mus_route119_mvl/mxv .byte W04 - .byte 16*bgm_granroad_mvl/mxv + .byte 16*mus_route119_mvl/mxv .byte W04 - .byte 15*bgm_granroad_mvl/mxv + .byte 15*mus_route119_mvl/mxv .byte W04 - .byte 14*bgm_granroad_mvl/mxv + .byte 14*mus_route119_mvl/mxv .byte W04 .byte PAN , c_v+0 - .byte VOL , 12*bgm_granroad_mvl/mxv + .byte VOL , 12*mus_route119_mvl/mxv .byte W08 - .byte 9*bgm_granroad_mvl/mxv + .byte 9*mus_route119_mvl/mxv .byte W04 - .byte 8*bgm_granroad_mvl/mxv + .byte 8*mus_route119_mvl/mxv .byte W04 - .byte 7*bgm_granroad_mvl/mxv + .byte 7*mus_route119_mvl/mxv .byte W04 - .byte 6*bgm_granroad_mvl/mxv + .byte 6*mus_route119_mvl/mxv .byte W04 - .byte 42*bgm_granroad_mvl/mxv + .byte 42*mus_route119_mvl/mxv .byte W24 .byte W96 .byte W96 @@ -351,7 +351,7 @@ bgm_granroad_1_B1: .byte W96 .byte W96 .byte VOICE , 56 - .byte VOL , 83*bgm_granroad_mvl/mxv + .byte VOL , 83*mus_route119_mvl/mxv .byte N08 , En3 , v112 .byte W08 .byte N04 , An3 @@ -396,28 +396,28 @@ bgm_granroad_1_B1: .byte W08 .byte N72 , An4 .byte W03 - .byte VOL , 84*bgm_granroad_mvl/mxv + .byte VOL , 84*mus_route119_mvl/mxv .byte W02 - .byte 75*bgm_granroad_mvl/mxv + .byte 75*mus_route119_mvl/mxv .byte W03 - .byte 72*bgm_granroad_mvl/mxv + .byte 72*mus_route119_mvl/mxv .byte W07 - .byte 60*bgm_granroad_mvl/mxv + .byte 60*mus_route119_mvl/mxv .byte W02 - .byte 65*bgm_granroad_mvl/mxv + .byte 65*mus_route119_mvl/mxv .byte W03 - .byte 69*bgm_granroad_mvl/mxv + .byte 69*mus_route119_mvl/mxv .byte W04 - .byte 72*bgm_granroad_mvl/mxv + .byte 72*mus_route119_mvl/mxv .byte W02 - .byte 80*bgm_granroad_mvl/mxv + .byte 80*mus_route119_mvl/mxv .byte W03 - .byte 84*bgm_granroad_mvl/mxv + .byte 84*mus_route119_mvl/mxv .byte W03 .byte MOD , 9 - .byte VOL , 90*bgm_granroad_mvl/mxv + .byte VOL , 90*mus_route119_mvl/mxv .byte W04 - .byte 96*bgm_granroad_mvl/mxv + .byte 96*mus_route119_mvl/mxv .byte W36 .byte MOD , 0 .byte W96 @@ -427,20 +427,20 @@ bgm_granroad_1_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_granroad_1_B1 + .word mus_route119_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_granroad_2: - .byte KEYSH , bgm_granroad_key+0 +mus_route119_2: + .byte KEYSH , mus_route119_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte MOD , 2 .byte PAN , c_v+0 - .byte VOL , 89*bgm_granroad_mvl/mxv + .byte VOL , 89*mus_route119_mvl/mxv .byte N04 , Ds3 , v068 .byte W04 .byte En3 , v072 @@ -483,7 +483,7 @@ bgm_granroad_2: .byte W24 .byte N08 , Cs4 , v032 .byte W08 -bgm_granroad_2_000: +mus_route119_2_000: .byte N24 , En4 , v112 .byte W24 .byte Dn4 @@ -596,41 +596,41 @@ bgm_granroad_2_000: .byte W04 .byte An3 , v032 .byte W04 - .byte VOL , 18*bgm_granroad_mvl/mxv + .byte VOL , 18*mus_route119_mvl/mxv .byte N88 , Bn3 , v072 .byte W02 - .byte VOL , 19*bgm_granroad_mvl/mxv + .byte VOL , 19*mus_route119_mvl/mxv .byte W03 - .byte 20*bgm_granroad_mvl/mxv + .byte 20*mus_route119_mvl/mxv .byte W09 - .byte 21*bgm_granroad_mvl/mxv + .byte 21*mus_route119_mvl/mxv .byte W03 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W07 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W02 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W03 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W03 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W06 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W03 - .byte 29*bgm_granroad_mvl/mxv + .byte 29*mus_route119_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 30*bgm_granroad_mvl/mxv + .byte VOL , 30*mus_route119_mvl/mxv .byte W05 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W09 - .byte 33*bgm_granroad_mvl/mxv + .byte 33*mus_route119_mvl/mxv .byte W03 - .byte 34*bgm_granroad_mvl/mxv + .byte 34*mus_route119_mvl/mxv .byte W03 - .byte 35*bgm_granroad_mvl/mxv + .byte 35*mus_route119_mvl/mxv .byte W20 .byte N04 , An3 .byte W04 @@ -645,25 +645,25 @@ bgm_granroad_2_000: .byte W04 .byte An3 , v032 .byte W04 -bgm_granroad_2_B1: - .byte VOL , 22*bgm_granroad_mvl/mxv +mus_route119_2_B1: + .byte VOL , 22*mus_route119_mvl/mxv .byte N48 , An3 , v072 .byte W02 - .byte VOL , 24*bgm_granroad_mvl/mxv + .byte VOL , 24*mus_route119_mvl/mxv .byte W03 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W04 - .byte 29*bgm_granroad_mvl/mxv + .byte 29*mus_route119_mvl/mxv .byte W02 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W03 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte W03 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W04 - .byte 33*bgm_granroad_mvl/mxv + .byte 33*mus_route119_mvl/mxv .byte W24 .byte N24 , Fs3 .byte W24 @@ -673,33 +673,33 @@ bgm_granroad_2_B1: .byte W08 .byte Fs3 .byte W08 - .byte VOL , 16*bgm_granroad_mvl/mxv + .byte VOL , 16*mus_route119_mvl/mxv .byte N64 , An3 .byte W02 - .byte VOL , 17*bgm_granroad_mvl/mxv + .byte VOL , 17*mus_route119_mvl/mxv .byte W03 - .byte 19*bgm_granroad_mvl/mxv + .byte 19*mus_route119_mvl/mxv .byte W03 - .byte 21*bgm_granroad_mvl/mxv + .byte 21*mus_route119_mvl/mxv .byte W06 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W03 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W07 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W02 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W04 .byte MOD , 6 - .byte VOL , 30*bgm_granroad_mvl/mxv + .byte VOL , 30*mus_route119_mvl/mxv .byte W02 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W03 - .byte 34*bgm_granroad_mvl/mxv + .byte 34*mus_route119_mvl/mxv .byte W23 .byte MOD , 0 .byte N04 , Fs3 @@ -714,33 +714,33 @@ bgm_granroad_2_B1: .byte W04 .byte An3 , v032 .byte W04 - .byte VOL , 19*bgm_granroad_mvl/mxv + .byte VOL , 19*mus_route119_mvl/mxv .byte N48 , Gs3 , v072 .byte W02 - .byte VOL , 22*bgm_granroad_mvl/mxv + .byte VOL , 22*mus_route119_mvl/mxv .byte W03 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W03 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W04 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W02 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W04 .byte MOD , 6 - .byte VOL , 29*bgm_granroad_mvl/mxv + .byte VOL , 29*mus_route119_mvl/mxv .byte W02 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W03 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte W03 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W06 - .byte 33*bgm_granroad_mvl/mxv + .byte 33*mus_route119_mvl/mxv .byte W10 .byte MOD , 0 .byte N48 @@ -748,31 +748,31 @@ bgm_granroad_2_B1: .byte MOD , 6 .byte W24 .byte 0 - .byte VOL , 18*bgm_granroad_mvl/mxv + .byte VOL , 18*mus_route119_mvl/mxv .byte N64 , An3 .byte W02 - .byte VOL , 19*bgm_granroad_mvl/mxv + .byte VOL , 19*mus_route119_mvl/mxv .byte W03 - .byte 20*bgm_granroad_mvl/mxv + .byte 20*mus_route119_mvl/mxv .byte W03 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W04 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W02 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W04 .byte MOD , 6 - .byte VOL , 29*bgm_granroad_mvl/mxv + .byte VOL , 29*mus_route119_mvl/mxv .byte W08 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte W04 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W02 - .byte 33*bgm_granroad_mvl/mxv + .byte 33*mus_route119_mvl/mxv .byte W24 .byte W02 .byte MOD , 0 @@ -788,22 +788,22 @@ bgm_granroad_2_B1: .byte W04 .byte An3 , v032 .byte W04 - .byte VOL , 21*bgm_granroad_mvl/mxv + .byte VOL , 21*mus_route119_mvl/mxv .byte N48 , Fs3 , v072 .byte W02 - .byte VOL , 23*bgm_granroad_mvl/mxv + .byte VOL , 23*mus_route119_mvl/mxv .byte W03 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W03 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W04 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W02 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte W03 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W03 - .byte 35*bgm_granroad_mvl/mxv + .byte 35*mus_route119_mvl/mxv .byte W04 .byte MOD , 6 .byte W24 @@ -909,7 +909,7 @@ bgm_granroad_2_B1: .byte Bn3 .byte W04 .byte VOICE , 60 - .byte VOL , 46*bgm_granroad_mvl/mxv + .byte VOL , 46*mus_route119_mvl/mxv .byte N32 , Cn4 .byte W24 .byte MOD , 6 @@ -1023,7 +1023,7 @@ bgm_granroad_2_B1: .byte N08 , Cs4 , v032 .byte W08 .byte PATT - .word bgm_granroad_2_000 + .word mus_route119_2_000 .byte N32 , Dn4 , v112 .byte W24 .byte MOD , 6 @@ -1074,7 +1074,7 @@ bgm_granroad_2_B1: .byte W24 .byte An3 .byte W24 - .byte VOL , 51*bgm_granroad_mvl/mxv + .byte VOL , 51*mus_route119_mvl/mxv .byte N04 , Fs3 .byte W04 .byte N08 , Fs3 , v032 @@ -1113,38 +1113,38 @@ bgm_granroad_2_B1: .byte W04 .byte An3 , v032 .byte W04 - .byte VOL , 16*bgm_granroad_mvl/mxv + .byte VOL , 16*mus_route119_mvl/mxv .byte N88 , Bn3 , v112 .byte W02 - .byte VOL , 17*bgm_granroad_mvl/mxv + .byte VOL , 17*mus_route119_mvl/mxv .byte W03 - .byte 18*bgm_granroad_mvl/mxv + .byte 18*mus_route119_mvl/mxv .byte W03 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W04 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W02 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W04 - .byte 29*bgm_granroad_mvl/mxv + .byte 29*mus_route119_mvl/mxv .byte W02 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W03 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W07 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W02 - .byte 33*bgm_granroad_mvl/mxv + .byte 33*mus_route119_mvl/mxv .byte W03 - .byte 34*bgm_granroad_mvl/mxv + .byte 34*mus_route119_mvl/mxv .byte W03 - .byte 35*bgm_granroad_mvl/mxv + .byte 35*mus_route119_mvl/mxv .byte W04 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte W40 .byte N04 , An3 , v088 .byte W04 @@ -1163,18 +1163,18 @@ bgm_granroad_2_B1: .byte An3 , v032 .byte W04 .byte GOTO - .word bgm_granroad_2_B1 + .word mus_route119_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_granroad_3: - .byte KEYSH , bgm_granroad_key+0 +mus_route119_3: + .byte KEYSH , mus_route119_key+0 .byte VOICE , 58 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 80*bgm_granroad_mvl/mxv + .byte VOL , 80*mus_route119_mvl/mxv .byte LFOS , 44 .byte MOD , 2 .byte W48 @@ -1186,35 +1186,35 @@ bgm_granroad_3: .byte W96 .byte W96 .byte W72 - .byte VOL , 30*bgm_granroad_mvl/mxv + .byte VOL , 30*mus_route119_mvl/mxv .byte N16 , Gn4 , v120 .byte W16 .byte N04 , Fs4 .byte W04 .byte Fn4 .byte W04 - .byte VOL , 11*bgm_granroad_mvl/mxv + .byte VOL , 11*mus_route119_mvl/mxv .byte N64 , En4 , v124 .byte W05 - .byte VOL , 12*bgm_granroad_mvl/mxv + .byte VOL , 12*mus_route119_mvl/mxv .byte W03 - .byte 14*bgm_granroad_mvl/mxv + .byte 14*mus_route119_mvl/mxv .byte W04 - .byte 16*bgm_granroad_mvl/mxv + .byte 16*mus_route119_mvl/mxv .byte W02 - .byte 18*bgm_granroad_mvl/mxv + .byte 18*mus_route119_mvl/mxv .byte W03 - .byte 20*bgm_granroad_mvl/mxv + .byte 20*mus_route119_mvl/mxv .byte W03 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W04 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W02 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W03 - .byte 29*bgm_granroad_mvl/mxv + .byte 29*mus_route119_mvl/mxv .byte W16 .byte MOD , 9 .byte W16 @@ -1231,23 +1231,23 @@ bgm_granroad_3: .byte W04 .byte En4 , v032 .byte W04 -bgm_granroad_3_B1: - .byte VOL , 12*bgm_granroad_mvl/mxv +mus_route119_3_B1: + .byte VOL , 12*mus_route119_mvl/mxv .byte N48 , Dn4 , v124 .byte W02 - .byte VOL , 14*bgm_granroad_mvl/mxv + .byte VOL , 14*mus_route119_mvl/mxv .byte W03 - .byte 18*bgm_granroad_mvl/mxv + .byte 18*mus_route119_mvl/mxv .byte W03 - .byte 21*bgm_granroad_mvl/mxv + .byte 21*mus_route119_mvl/mxv .byte W04 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W02 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W12 .byte MOD , 8 .byte W16 @@ -1260,26 +1260,26 @@ bgm_granroad_3_B1: .byte W08 .byte Bn3 .byte W08 - .byte VOL , 12*bgm_granroad_mvl/mxv + .byte VOL , 12*mus_route119_mvl/mxv .byte N64 , Dn4 , v124 .byte W02 - .byte VOL , 13*bgm_granroad_mvl/mxv + .byte VOL , 13*mus_route119_mvl/mxv .byte W03 - .byte 15*bgm_granroad_mvl/mxv + .byte 15*mus_route119_mvl/mxv .byte W03 - .byte 18*bgm_granroad_mvl/mxv + .byte 18*mus_route119_mvl/mxv .byte W04 - .byte 20*bgm_granroad_mvl/mxv + .byte 20*mus_route119_mvl/mxv .byte W02 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W03 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W03 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W06 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W11 .byte MOD , 9 .byte W24 @@ -1292,29 +1292,29 @@ bgm_granroad_3_B1: .byte W08 .byte N04 , Bn3 .byte W08 - .byte VOL , 12*bgm_granroad_mvl/mxv + .byte VOL , 12*mus_route119_mvl/mxv .byte N48 , Cs4 , v124 .byte W02 - .byte VOL , 16*bgm_granroad_mvl/mxv + .byte VOL , 16*mus_route119_mvl/mxv .byte W03 - .byte 18*bgm_granroad_mvl/mxv + .byte 18*mus_route119_mvl/mxv .byte W03 - .byte 19*bgm_granroad_mvl/mxv + .byte 19*mus_route119_mvl/mxv .byte W04 - .byte 20*bgm_granroad_mvl/mxv + .byte 20*mus_route119_mvl/mxv .byte W02 - .byte 21*bgm_granroad_mvl/mxv + .byte 21*mus_route119_mvl/mxv .byte W03 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W03 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W06 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W03 .byte MOD , 8 - .byte VOL , 29*bgm_granroad_mvl/mxv + .byte VOL , 29*mus_route119_mvl/mxv .byte W16 .byte MOD , 2 .byte N16 , En4 , v120 @@ -1327,30 +1327,30 @@ bgm_granroad_3_B1: .byte W08 .byte Cn4 .byte W08 - .byte VOL , 11*bgm_granroad_mvl/mxv + .byte VOL , 11*mus_route119_mvl/mxv .byte N64 , Cs4 , v124 .byte W02 - .byte VOL , 12*bgm_granroad_mvl/mxv + .byte VOL , 12*mus_route119_mvl/mxv .byte W03 - .byte 15*bgm_granroad_mvl/mxv + .byte 15*mus_route119_mvl/mxv .byte W03 - .byte 16*bgm_granroad_mvl/mxv + .byte 16*mus_route119_mvl/mxv .byte W06 - .byte 18*bgm_granroad_mvl/mxv + .byte 18*mus_route119_mvl/mxv .byte W06 - .byte 19*bgm_granroad_mvl/mxv + .byte 19*mus_route119_mvl/mxv .byte W04 - .byte 20*bgm_granroad_mvl/mxv + .byte 20*mus_route119_mvl/mxv .byte W02 - .byte 21*bgm_granroad_mvl/mxv + .byte 21*mus_route119_mvl/mxv .byte W03 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W03 - .byte 25*bgm_granroad_mvl/mxv + .byte 25*mus_route119_mvl/mxv .byte W04 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W02 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W10 .byte MOD , 9 .byte W16 @@ -1367,36 +1367,36 @@ bgm_granroad_3_B1: .byte W04 .byte Cs4 , v032 .byte W04 - .byte VOL , 11*bgm_granroad_mvl/mxv + .byte VOL , 11*mus_route119_mvl/mxv .byte N48 , Bn3 , v120 .byte W02 - .byte VOL , 15*bgm_granroad_mvl/mxv + .byte VOL , 15*mus_route119_mvl/mxv .byte W03 - .byte 19*bgm_granroad_mvl/mxv + .byte 19*mus_route119_mvl/mxv .byte W03 - .byte 20*bgm_granroad_mvl/mxv + .byte 20*mus_route119_mvl/mxv .byte W06 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W03 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W03 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W04 .byte MOD , 9 - .byte VOL , 25*bgm_granroad_mvl/mxv + .byte VOL , 25*mus_route119_mvl/mxv .byte W02 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W07 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W12 .byte MOD , 2 .byte N24 , Fs3 .byte W24 .byte Gs3 .byte W24 - .byte VOL , 34*bgm_granroad_mvl/mxv + .byte VOL , 34*mus_route119_mvl/mxv .byte N04 , Gs3 , v124 .byte W08 .byte An3 , v127 @@ -1423,26 +1423,26 @@ bgm_granroad_3_B1: .byte W04 .byte An3 , v032 .byte W04 - .byte VOL , 37*bgm_granroad_mvl/mxv + .byte VOL , 37*mus_route119_mvl/mxv .byte N72 , En4 , v120 .byte W44 - .byte VOL , 37*bgm_granroad_mvl/mxv + .byte VOL , 37*mus_route119_mvl/mxv .byte W04 .byte MOD , 9 - .byte VOL , 40*bgm_granroad_mvl/mxv + .byte VOL , 40*mus_route119_mvl/mxv .byte W04 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte W04 - .byte 43*bgm_granroad_mvl/mxv + .byte 43*mus_route119_mvl/mxv .byte W04 - .byte 47*bgm_granroad_mvl/mxv + .byte 47*mus_route119_mvl/mxv .byte W04 - .byte 53*bgm_granroad_mvl/mxv + .byte 53*mus_route119_mvl/mxv .byte W04 - .byte 58*bgm_granroad_mvl/mxv + .byte 58*mus_route119_mvl/mxv .byte W04 .byte VOICE , 56 - .byte VOL , 96*bgm_granroad_mvl/mxv + .byte VOL , 96*mus_route119_mvl/mxv .byte MOD , 2 .byte N08 .byte W08 @@ -1632,27 +1632,27 @@ bgm_granroad_3_B1: .byte W08 .byte N72 , Gs4 .byte W03 - .byte VOL , 84*bgm_granroad_mvl/mxv + .byte VOL , 84*mus_route119_mvl/mxv .byte W02 - .byte 75*bgm_granroad_mvl/mxv + .byte 75*mus_route119_mvl/mxv .byte W03 - .byte 72*bgm_granroad_mvl/mxv + .byte 72*mus_route119_mvl/mxv .byte W07 - .byte 60*bgm_granroad_mvl/mxv + .byte 60*mus_route119_mvl/mxv .byte W02 - .byte 65*bgm_granroad_mvl/mxv + .byte 65*mus_route119_mvl/mxv .byte W03 - .byte 69*bgm_granroad_mvl/mxv + .byte 69*mus_route119_mvl/mxv .byte W04 - .byte 72*bgm_granroad_mvl/mxv + .byte 72*mus_route119_mvl/mxv .byte W02 - .byte 80*bgm_granroad_mvl/mxv + .byte 80*mus_route119_mvl/mxv .byte W03 - .byte 84*bgm_granroad_mvl/mxv + .byte 84*mus_route119_mvl/mxv .byte W03 - .byte 90*bgm_granroad_mvl/mxv + .byte 90*mus_route119_mvl/mxv .byte W04 - .byte 96*bgm_granroad_mvl/mxv + .byte 96*mus_route119_mvl/mxv .byte W12 .byte MOD , 8 .byte W24 @@ -1667,7 +1667,7 @@ bgm_granroad_3_B1: .byte W96 .byte W96 .byte VOICE , 58 - .byte VOL , 48*bgm_granroad_mvl/mxv + .byte VOL , 48*mus_route119_mvl/mxv .byte W48 .byte N04 , Bn3 .byte W16 @@ -1675,56 +1675,56 @@ bgm_granroad_3_B1: .byte W08 .byte TIE , Gn4 .byte W08 - .byte VOL , 46*bgm_granroad_mvl/mxv + .byte VOL , 46*mus_route119_mvl/mxv .byte W04 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte W04 - .byte 38*bgm_granroad_mvl/mxv + .byte 38*mus_route119_mvl/mxv .byte W04 - .byte 34*bgm_granroad_mvl/mxv + .byte 34*mus_route119_mvl/mxv .byte W04 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W04 - .byte 26*bgm_granroad_mvl/mxv + .byte 26*mus_route119_mvl/mxv .byte W04 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W04 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W04 - .byte 21*bgm_granroad_mvl/mxv + .byte 21*mus_route119_mvl/mxv .byte W04 - .byte 18*bgm_granroad_mvl/mxv + .byte 18*mus_route119_mvl/mxv .byte W08 - .byte 17*bgm_granroad_mvl/mxv + .byte 17*mus_route119_mvl/mxv .byte W12 - .byte 13*bgm_granroad_mvl/mxv + .byte 13*mus_route119_mvl/mxv .byte W16 - .byte 15*bgm_granroad_mvl/mxv + .byte 15*mus_route119_mvl/mxv .byte W40 - .byte 13*bgm_granroad_mvl/mxv + .byte 13*mus_route119_mvl/mxv .byte W12 - .byte 15*bgm_granroad_mvl/mxv + .byte 15*mus_route119_mvl/mxv .byte W04 - .byte 17*bgm_granroad_mvl/mxv + .byte 17*mus_route119_mvl/mxv .byte W04 - .byte 18*bgm_granroad_mvl/mxv + .byte 18*mus_route119_mvl/mxv .byte W04 - .byte 21*bgm_granroad_mvl/mxv + .byte 21*mus_route119_mvl/mxv .byte W04 - .byte 22*bgm_granroad_mvl/mxv + .byte 22*mus_route119_mvl/mxv .byte W04 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W04 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W04 - .byte 34*bgm_granroad_mvl/mxv + .byte 34*mus_route119_mvl/mxv .byte W04 - .byte 44*bgm_granroad_mvl/mxv + .byte 44*mus_route119_mvl/mxv .byte W04 - .byte 52*bgm_granroad_mvl/mxv + .byte 52*mus_route119_mvl/mxv .byte W16 .byte EOT - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte N04 , Fs4 .byte W04 .byte Fn4 @@ -1736,19 +1736,19 @@ bgm_granroad_3_B1: .byte N04 , Cs4 .byte W08 .byte GOTO - .word bgm_granroad_3_B1 + .word mus_route119_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_granroad_4: - .byte KEYSH , bgm_granroad_key+0 +mus_route119_4: + .byte KEYSH , mus_route119_key+0 .byte VOICE , 48 .byte PAN , c_v-8 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-32 - .byte VOL , 60*bgm_granroad_mvl/mxv + .byte VOL , 60*mus_route119_mvl/mxv .byte N04 , Fs2 , v068 .byte W04 .byte Gs2 , v072 @@ -1804,7 +1804,7 @@ bgm_granroad_4: .byte W08 .byte An4 , v127 .byte W08 - .byte VOL , 48*bgm_granroad_mvl/mxv + .byte VOL , 48*mus_route119_mvl/mxv .byte N08 , Dn4 , v100 .byte W08 .byte N04 , Cs4 , v080 @@ -1815,7 +1815,7 @@ bgm_granroad_4: .byte W04 .byte Cs4 , v032 .byte W04 - .byte VOL , 60*bgm_granroad_mvl/mxv + .byte VOL , 60*mus_route119_mvl/mxv .byte N08 , Dn4 , v112 .byte W08 .byte N04 , Cs4 , v080 @@ -1826,7 +1826,7 @@ bgm_granroad_4: .byte W04 .byte Cs4 , v032 .byte W04 - .byte VOL , 72*bgm_granroad_mvl/mxv + .byte VOL , 72*mus_route119_mvl/mxv .byte N08 , Dn4 , v112 .byte W08 .byte N04 , Cs4 @@ -1837,7 +1837,7 @@ bgm_granroad_4: .byte W04 .byte Cs4 , v032 .byte W04 - .byte VOL , 92*bgm_granroad_mvl/mxv + .byte VOL , 92*mus_route119_mvl/mxv .byte N08 , Dn4 , v112 .byte W08 .byte N04 , Cs4 @@ -1848,7 +1848,7 @@ bgm_granroad_4: .byte W04 .byte Cs4 , v032 .byte W04 - .byte VOL , 60*bgm_granroad_mvl/mxv + .byte VOL , 60*mus_route119_mvl/mxv .byte N04 , An2 , v092 .byte W04 .byte N08 , An2 , v032 @@ -1911,21 +1911,21 @@ bgm_granroad_4: .byte W08 .byte An4 .byte W08 - .byte VOL , 48*bgm_granroad_mvl/mxv + .byte VOL , 48*mus_route119_mvl/mxv .byte N08 , Dn5 , v112 .byte W08 .byte N04 , Cs5 , v080 .byte W08 .byte N04 .byte W08 - .byte VOL , 60*bgm_granroad_mvl/mxv + .byte VOL , 60*mus_route119_mvl/mxv .byte N08 , Dn5 , v112 .byte W08 .byte N04 , Cs5 , v080 .byte W08 .byte N04 .byte W08 - .byte VOL , 77*bgm_granroad_mvl/mxv + .byte VOL , 77*mus_route119_mvl/mxv .byte N04 , Dn5 , v112 .byte W04 .byte Cs5 , v080 @@ -1938,7 +1938,7 @@ bgm_granroad_4: .byte W04 .byte Fn4 .byte W04 - .byte VOL , 86*bgm_granroad_mvl/mxv + .byte VOL , 86*mus_route119_mvl/mxv .byte N04 , En4 , v100 .byte W04 .byte Dn4 , v096 @@ -1951,7 +1951,7 @@ bgm_granroad_4: .byte W04 .byte Gn3 , v088 .byte W04 - .byte VOL , 48*bgm_granroad_mvl/mxv + .byte VOL , 48*mus_route119_mvl/mxv .byte N04 , An2 , v092 .byte W04 .byte An2 , v032 @@ -1978,164 +1978,164 @@ bgm_granroad_4: .byte W04 .byte Dn3 , v032 .byte W04 - .byte VOL , 24*bgm_granroad_mvl/mxv + .byte VOL , 24*mus_route119_mvl/mxv .byte N88 , Gn3 , v072 .byte W02 - .byte VOL , 26*bgm_granroad_mvl/mxv + .byte VOL , 26*mus_route119_mvl/mxv .byte W03 - .byte 29*bgm_granroad_mvl/mxv + .byte 29*mus_route119_mvl/mxv .byte W03 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte W04 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W02 - .byte 35*bgm_granroad_mvl/mxv + .byte 35*mus_route119_mvl/mxv .byte W03 - .byte 37*bgm_granroad_mvl/mxv + .byte 37*mus_route119_mvl/mxv .byte W03 - .byte 38*bgm_granroad_mvl/mxv + .byte 38*mus_route119_mvl/mxv .byte W04 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte W02 - .byte 42*bgm_granroad_mvl/mxv + .byte 42*mus_route119_mvl/mxv .byte W03 - .byte 43*bgm_granroad_mvl/mxv + .byte 43*mus_route119_mvl/mxv .byte W03 - .byte 44*bgm_granroad_mvl/mxv + .byte 44*mus_route119_mvl/mxv .byte W04 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W02 - .byte 47*bgm_granroad_mvl/mxv + .byte 47*mus_route119_mvl/mxv .byte W48 .byte W02 .byte N08 , Gn3 , v032 .byte W32 -bgm_granroad_4_B1: - .byte VOL , 24*bgm_granroad_mvl/mxv +mus_route119_4_B1: + .byte VOL , 24*mus_route119_mvl/mxv .byte N48 , Fs3 , v064 .byte W02 - .byte VOL , 26*bgm_granroad_mvl/mxv + .byte VOL , 26*mus_route119_mvl/mxv .byte W03 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W03 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W04 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte W02 - .byte 32*bgm_granroad_mvl/mxv + .byte 32*mus_route119_mvl/mxv .byte W03 - .byte 34*bgm_granroad_mvl/mxv + .byte 34*mus_route119_mvl/mxv .byte W03 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte W04 - .byte 38*bgm_granroad_mvl/mxv + .byte 38*mus_route119_mvl/mxv .byte W02 - .byte 39*bgm_granroad_mvl/mxv + .byte 39*mus_route119_mvl/mxv .byte W03 - .byte 41*bgm_granroad_mvl/mxv + .byte 41*mus_route119_mvl/mxv .byte W03 - .byte 45*bgm_granroad_mvl/mxv + .byte 45*mus_route119_mvl/mxv .byte W06 - .byte 47*bgm_granroad_mvl/mxv + .byte 47*mus_route119_mvl/mxv .byte W10 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte N48 , Dn3 .byte W02 - .byte VOL , 31*bgm_granroad_mvl/mxv + .byte VOL , 31*mus_route119_mvl/mxv .byte W03 - .byte 35*bgm_granroad_mvl/mxv + .byte 35*mus_route119_mvl/mxv .byte W03 - .byte 38*bgm_granroad_mvl/mxv + .byte 38*mus_route119_mvl/mxv .byte W04 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte W02 - .byte 43*bgm_granroad_mvl/mxv + .byte 43*mus_route119_mvl/mxv .byte W03 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W30 .byte W01 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte N64 , Fs3 .byte W02 - .byte VOL , 32*bgm_granroad_mvl/mxv + .byte VOL , 32*mus_route119_mvl/mxv .byte W03 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte W03 - .byte 37*bgm_granroad_mvl/mxv + .byte 37*mus_route119_mvl/mxv .byte W04 - .byte 38*bgm_granroad_mvl/mxv + .byte 38*mus_route119_mvl/mxv .byte W02 - .byte 39*bgm_granroad_mvl/mxv + .byte 39*mus_route119_mvl/mxv .byte W03 - .byte 41*bgm_granroad_mvl/mxv + .byte 41*mus_route119_mvl/mxv .byte W03 - .byte 42*bgm_granroad_mvl/mxv + .byte 42*mus_route119_mvl/mxv .byte W04 - .byte 43*bgm_granroad_mvl/mxv + .byte 43*mus_route119_mvl/mxv .byte W02 - .byte 44*bgm_granroad_mvl/mxv + .byte 44*mus_route119_mvl/mxv .byte W03 - .byte 45*bgm_granroad_mvl/mxv + .byte 45*mus_route119_mvl/mxv .byte W03 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W32 .byte N08 , Fs3 , v032 .byte W32 - .byte VOL , 33*bgm_granroad_mvl/mxv + .byte VOL , 33*mus_route119_mvl/mxv .byte N48 , Cs3 , v064 .byte W02 - .byte VOL , 35*bgm_granroad_mvl/mxv + .byte VOL , 35*mus_route119_mvl/mxv .byte W03 - .byte 37*bgm_granroad_mvl/mxv + .byte 37*mus_route119_mvl/mxv .byte W03 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte W04 - .byte 43*bgm_granroad_mvl/mxv + .byte 43*mus_route119_mvl/mxv .byte W02 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W03 - .byte 47*bgm_granroad_mvl/mxv + .byte 47*mus_route119_mvl/mxv .byte W30 .byte W01 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte N48 , En3 , v072 .byte W02 - .byte VOL , 34*bgm_granroad_mvl/mxv + .byte VOL , 34*mus_route119_mvl/mxv .byte W06 - .byte 35*bgm_granroad_mvl/mxv + .byte 35*mus_route119_mvl/mxv .byte W04 - .byte 37*bgm_granroad_mvl/mxv + .byte 37*mus_route119_mvl/mxv .byte W05 - .byte 38*bgm_granroad_mvl/mxv + .byte 38*mus_route119_mvl/mxv .byte W07 - .byte 39*bgm_granroad_mvl/mxv + .byte 39*mus_route119_mvl/mxv .byte W02 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte W03 - .byte 41*bgm_granroad_mvl/mxv + .byte 41*mus_route119_mvl/mxv .byte W03 - .byte 43*bgm_granroad_mvl/mxv + .byte 43*mus_route119_mvl/mxv .byte W04 - .byte 45*bgm_granroad_mvl/mxv + .byte 45*mus_route119_mvl/mxv .byte W02 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W01 - .byte 48*bgm_granroad_mvl/mxv + .byte 48*mus_route119_mvl/mxv .byte W09 .byte N68 .byte W96 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte N48 , Dn3 .byte W02 - .byte VOL , 40*bgm_granroad_mvl/mxv + .byte VOL , 40*mus_route119_mvl/mxv .byte W03 - .byte 42*bgm_granroad_mvl/mxv + .byte 42*mus_route119_mvl/mxv .byte W03 - .byte 45*bgm_granroad_mvl/mxv + .byte 45*mus_route119_mvl/mxv .byte W04 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W02 - .byte 47*bgm_granroad_mvl/mxv + .byte 47*mus_route119_mvl/mxv .byte W32 .byte W02 .byte N24 , An2 , v064 @@ -2166,7 +2166,7 @@ bgm_granroad_4_B1: .byte W16 .byte N04 , Fs3 , v080 .byte W08 - .byte VOL , 39*bgm_granroad_mvl/mxv + .byte VOL , 39*mus_route119_mvl/mxv .byte N08 , Gs3 , v112 .byte W08 .byte Bn3 @@ -2487,7 +2487,7 @@ bgm_granroad_4_B1: .byte W04 .byte Gn4 .byte W04 - .byte VOL , 47*bgm_granroad_mvl/mxv + .byte VOL , 47*mus_route119_mvl/mxv .byte W96 .byte N32 , Ds3 .byte W32 @@ -2694,45 +2694,45 @@ bgm_granroad_4_B1: .byte W08 .byte Dn3 .byte W08 - .byte VOL , 25*bgm_granroad_mvl/mxv + .byte VOL , 25*mus_route119_mvl/mxv .byte N88 , Gn3 .byte W02 - .byte VOL , 27*bgm_granroad_mvl/mxv + .byte VOL , 27*mus_route119_mvl/mxv .byte W03 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W03 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W06 - .byte 33*bgm_granroad_mvl/mxv + .byte 33*mus_route119_mvl/mxv .byte W03 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte W07 - .byte 37*bgm_granroad_mvl/mxv + .byte 37*mus_route119_mvl/mxv .byte W02 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte W03 - .byte 43*bgm_granroad_mvl/mxv + .byte 43*mus_route119_mvl/mxv .byte W09 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W03 - .byte 47*bgm_granroad_mvl/mxv + .byte 47*mus_route119_mvl/mxv .byte W03 - .byte 48*bgm_granroad_mvl/mxv + .byte 48*mus_route119_mvl/mxv .byte W06 - .byte 51*bgm_granroad_mvl/mxv + .byte 51*mus_route119_mvl/mxv .byte W03 - .byte 53*bgm_granroad_mvl/mxv + .byte 53*mus_route119_mvl/mxv .byte W03 - .byte 55*bgm_granroad_mvl/mxv + .byte 55*mus_route119_mvl/mxv .byte W64 .byte GOTO - .word bgm_granroad_4_B1 + .word mus_route119_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_granroad_5: - .byte KEYSH , bgm_granroad_key+0 +mus_route119_5: + .byte KEYSH , mus_route119_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 12 @@ -2742,7 +2742,7 @@ bgm_granroad_5: .byte MOD , 2 .byte XCMD , xIECV , 8 .byte PAN , c_v-61 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte BEND , c_v+0 .byte N04 , Fs1 , v068 .byte W04 @@ -2929,7 +2929,7 @@ bgm_granroad_5: .byte W04 .byte An2 .byte W04 - .byte VOL , 40*bgm_granroad_mvl/mxv + .byte VOL , 40*mus_route119_mvl/mxv .byte N08 , An2 , v084 .byte W08 .byte Cs3 @@ -2954,9 +2954,9 @@ bgm_granroad_5: .byte W08 .byte Gs2 , v080 .byte W08 -bgm_granroad_5_B1: +mus_route119_5_B1: .byte VOICE , 83 - .byte VOL , 40*bgm_granroad_mvl/mxv + .byte VOL , 40*mus_route119_mvl/mxv .byte PAN , c_v-64 .byte N08 , Fs2 , v084 .byte W08 @@ -3009,7 +3009,7 @@ bgm_granroad_5_B1: .byte VOICE , 5 .byte MOD , 0 .byte PAN , c_v+0 - .byte VOL , 45*bgm_granroad_mvl/mxv + .byte VOL , 45*mus_route119_mvl/mxv .byte BEND , c_v+1 .byte N04 , En3 , v048 .byte W04 @@ -3060,7 +3060,7 @@ bgm_granroad_5_B1: .byte Dn4 , v028 .byte W04 .byte VOICE , 83 - .byte VOL , 41*bgm_granroad_mvl/mxv + .byte VOL , 41*mus_route119_mvl/mxv .byte PAN , c_v-62 .byte BEND , c_v+0 .byte N08 , Cs2 , v084 @@ -3161,7 +3161,7 @@ bgm_granroad_5_B1: .byte W08 .byte VOICE , 4 .byte PAN , c_v+0 - .byte VOL , 21*bgm_granroad_mvl/mxv + .byte VOL , 21*mus_route119_mvl/mxv .byte MOD , 4 .byte BEND , c_v+1 .byte N48 , En6 , v112 @@ -3187,7 +3187,7 @@ bgm_granroad_5_B1: .byte VOICE , 81 .byte MOD , 0 .byte PAN , c_v-61 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte N16 , An2 .byte W16 .byte N02 , Gs2 @@ -3273,7 +3273,7 @@ bgm_granroad_5_B1: .byte W08 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 44*bgm_granroad_mvl/mxv + .byte VOL , 44*mus_route119_mvl/mxv .byte N04 , An3 , v064 .byte W04 .byte Dn4 @@ -3324,7 +3324,7 @@ bgm_granroad_5_B1: .byte W04 .byte VOICE , 81 .byte PAN , c_v+0 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte N32 , Cn3 , v112 .byte W32 .byte N02 , Ds2 @@ -3361,7 +3361,7 @@ bgm_granroad_5_B1: .byte VOICE , 5 .byte MOD , 0 .byte PAN , c_v+0 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte N04 , Ds5 .byte W08 .byte Fn5 @@ -3411,7 +3411,7 @@ bgm_granroad_5_B1: .byte VOICE , 81 .byte MOD , 2 .byte PAN , c_v-62 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte N48 , Fs3 .byte W48 .byte Gn3 @@ -3440,7 +3440,7 @@ bgm_granroad_5_B1: .byte W24 .byte W96 .byte VOICE , 81 - .byte VOL , 40*bgm_granroad_mvl/mxv + .byte VOL , 40*mus_route119_mvl/mxv .byte PAN , c_v-64 .byte N08 , Fs2 , v084 .byte W08 @@ -3491,20 +3491,20 @@ bgm_granroad_5_B1: .byte Gs2 , v080 .byte W08 .byte GOTO - .word bgm_granroad_5_B1 + .word mus_route119_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_granroad_6: - .byte KEYSH , bgm_granroad_key+0 +mus_route119_6: + .byte KEYSH , mus_route119_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 12 .byte xIECV , 8 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte BEND , c_v+0 .byte N04 , Ds2 , v068 .byte W04 @@ -3688,7 +3688,7 @@ bgm_granroad_6: .byte W04 .byte Fn3 .byte W04 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte PAN , c_v+63 .byte N08 , Cs3 , v084 .byte W08 @@ -3714,9 +3714,9 @@ bgm_granroad_6: .byte W08 .byte Bn2 , v080 .byte W08 -bgm_granroad_6_B1: +mus_route119_6_B1: .byte VOICE , 80 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte PAN , c_v+63 .byte N08 , An2 , v084 .byte W08 @@ -3887,44 +3887,44 @@ bgm_granroad_6_B1: .byte En3 , v080 .byte W08 .byte VOICE , 87 - .byte VOL , 24*bgm_granroad_mvl/mxv + .byte VOL , 24*mus_route119_mvl/mxv .byte PAN , c_v-63 .byte N72 , Dn4 , v120 .byte W08 - .byte VOL , 27*bgm_granroad_mvl/mxv + .byte VOL , 27*mus_route119_mvl/mxv .byte W04 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W04 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte W04 - .byte 34*bgm_granroad_mvl/mxv + .byte 34*mus_route119_mvl/mxv .byte W04 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte MOD , 8 .byte W04 - .byte VOL , 37*bgm_granroad_mvl/mxv + .byte VOL , 37*mus_route119_mvl/mxv .byte W04 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte W04 - .byte 43*bgm_granroad_mvl/mxv + .byte 43*mus_route119_mvl/mxv .byte W04 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W04 - .byte 48*bgm_granroad_mvl/mxv + .byte 48*mus_route119_mvl/mxv .byte W04 - .byte 51*bgm_granroad_mvl/mxv + .byte 51*mus_route119_mvl/mxv .byte W04 - .byte 55*bgm_granroad_mvl/mxv + .byte 55*mus_route119_mvl/mxv .byte W04 - .byte 56*bgm_granroad_mvl/mxv + .byte 56*mus_route119_mvl/mxv .byte W04 - .byte 58*bgm_granroad_mvl/mxv + .byte 58*mus_route119_mvl/mxv .byte W04 - .byte 60*bgm_granroad_mvl/mxv + .byte 60*mus_route119_mvl/mxv .byte W04 - .byte 64*bgm_granroad_mvl/mxv + .byte 64*mus_route119_mvl/mxv .byte W04 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte PAN , c_v+63 .byte MOD , 0 .byte N08 , En4 @@ -3933,33 +3933,33 @@ bgm_granroad_6_B1: .byte W08 .byte Bn3 .byte W08 - .byte VOL , 13*bgm_granroad_mvl/mxv + .byte VOL , 13*mus_route119_mvl/mxv .byte N48 , Dn4 .byte W04 - .byte VOL , 16*bgm_granroad_mvl/mxv + .byte VOL , 16*mus_route119_mvl/mxv .byte W04 - .byte 20*bgm_granroad_mvl/mxv + .byte 20*mus_route119_mvl/mxv .byte W04 - .byte 23*bgm_granroad_mvl/mxv + .byte 23*mus_route119_mvl/mxv .byte W04 - .byte 24*bgm_granroad_mvl/mxv + .byte 24*mus_route119_mvl/mxv .byte W04 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W04 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte MOD , 6 .byte W04 - .byte VOL , 34*bgm_granroad_mvl/mxv + .byte VOL , 34*mus_route119_mvl/mxv .byte W04 - .byte 39*bgm_granroad_mvl/mxv + .byte 39*mus_route119_mvl/mxv .byte W04 - .byte 46*bgm_granroad_mvl/mxv + .byte 46*mus_route119_mvl/mxv .byte W04 - .byte 49*bgm_granroad_mvl/mxv + .byte 49*mus_route119_mvl/mxv .byte W04 - .byte 55*bgm_granroad_mvl/mxv + .byte 55*mus_route119_mvl/mxv .byte W04 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte MOD , 0 .byte N24 , Fs4 .byte W12 @@ -3970,47 +3970,47 @@ bgm_granroad_6_B1: .byte W12 .byte MOD , 6 .byte W12 - .byte VOL , 24*bgm_granroad_mvl/mxv + .byte VOL , 24*mus_route119_mvl/mxv .byte PAN , c_v+63 .byte MOD , 0 .byte N72 , Dn4 .byte W04 - .byte VOL , 25*bgm_granroad_mvl/mxv + .byte VOL , 25*mus_route119_mvl/mxv .byte W04 - .byte 27*bgm_granroad_mvl/mxv + .byte 27*mus_route119_mvl/mxv .byte W04 - .byte 28*bgm_granroad_mvl/mxv + .byte 28*mus_route119_mvl/mxv .byte W04 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W04 - .byte 31*bgm_granroad_mvl/mxv + .byte 31*mus_route119_mvl/mxv .byte W04 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte MOD , 8 .byte W04 - .byte VOL , 37*bgm_granroad_mvl/mxv + .byte VOL , 37*mus_route119_mvl/mxv .byte W04 - .byte 41*bgm_granroad_mvl/mxv + .byte 41*mus_route119_mvl/mxv .byte W04 - .byte 45*bgm_granroad_mvl/mxv + .byte 45*mus_route119_mvl/mxv .byte W04 - .byte 48*bgm_granroad_mvl/mxv + .byte 48*mus_route119_mvl/mxv .byte W04 - .byte 49*bgm_granroad_mvl/mxv + .byte 49*mus_route119_mvl/mxv .byte W04 - .byte 52*bgm_granroad_mvl/mxv + .byte 52*mus_route119_mvl/mxv .byte W04 - .byte 55*bgm_granroad_mvl/mxv + .byte 55*mus_route119_mvl/mxv .byte W04 - .byte 58*bgm_granroad_mvl/mxv + .byte 58*mus_route119_mvl/mxv .byte W04 - .byte 60*bgm_granroad_mvl/mxv + .byte 60*mus_route119_mvl/mxv .byte W04 - .byte 61*bgm_granroad_mvl/mxv + .byte 61*mus_route119_mvl/mxv .byte W04 - .byte 64*bgm_granroad_mvl/mxv + .byte 64*mus_route119_mvl/mxv .byte W04 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte PAN , c_v-63 .byte MOD , 0 .byte N08 , En4 @@ -4019,33 +4019,33 @@ bgm_granroad_6_B1: .byte W08 .byte Bn3 .byte W08 - .byte VOL , 24*bgm_granroad_mvl/mxv + .byte VOL , 24*mus_route119_mvl/mxv .byte N48 , Cs4 .byte W04 - .byte VOL , 27*bgm_granroad_mvl/mxv + .byte VOL , 27*mus_route119_mvl/mxv .byte W04 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W04 - .byte 30*bgm_granroad_mvl/mxv + .byte 30*mus_route119_mvl/mxv .byte W04 - .byte 33*bgm_granroad_mvl/mxv + .byte 33*mus_route119_mvl/mxv .byte W04 - .byte 37*bgm_granroad_mvl/mxv + .byte 37*mus_route119_mvl/mxv .byte W04 - .byte 40*bgm_granroad_mvl/mxv + .byte 40*mus_route119_mvl/mxv .byte MOD , 6 .byte W04 - .byte VOL , 45*bgm_granroad_mvl/mxv + .byte VOL , 45*mus_route119_mvl/mxv .byte W04 - .byte 48*bgm_granroad_mvl/mxv + .byte 48*mus_route119_mvl/mxv .byte W04 - .byte 51*bgm_granroad_mvl/mxv + .byte 51*mus_route119_mvl/mxv .byte W04 - .byte 57*bgm_granroad_mvl/mxv + .byte 57*mus_route119_mvl/mxv .byte W04 - .byte 61*bgm_granroad_mvl/mxv + .byte 61*mus_route119_mvl/mxv .byte W04 - .byte 36*bgm_granroad_mvl/mxv + .byte 36*mus_route119_mvl/mxv .byte MOD , 0 .byte N24 , En4 .byte W12 @@ -4059,7 +4059,7 @@ bgm_granroad_6_B1: .byte VOICE , 80 .byte PAN , c_v+63 .byte MOD , 0 - .byte VOL , 32*bgm_granroad_mvl/mxv + .byte VOL , 32*mus_route119_mvl/mxv .byte N16 , Cs3 , v112 .byte W16 .byte N02 , Cn3 @@ -4144,14 +4144,14 @@ bgm_granroad_6_B1: .byte W08 .byte VOICE , 85 .byte PAN , c_v+0 - .byte VOL , 71*bgm_granroad_mvl/mxv + .byte VOL , 71*mus_route119_mvl/mxv .byte N96 , En1 .byte W24 .byte MOD , 8 .byte W72 .byte 0 .byte PAN , c_v+63 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte N32 , Gs3 .byte W32 .byte N02 , Cn3 @@ -4183,7 +4183,7 @@ bgm_granroad_6_B1: .byte N20 .byte W48 .byte PAN , c_v+0 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -4241,7 +4241,7 @@ bgm_granroad_6_B1: .byte En3 .byte W24 .byte W96 - .byte VOL , 36*bgm_granroad_mvl/mxv + .byte VOL , 36*mus_route119_mvl/mxv .byte PAN , c_v+63 .byte N08 , An2 , v084 .byte W08 @@ -4292,17 +4292,17 @@ bgm_granroad_6_B1: .byte Bn2 , v080 .byte W08 .byte GOTO - .word bgm_granroad_6_B1 + .word mus_route119_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_granroad_7: - .byte KEYSH , bgm_granroad_key+0 +mus_route119_7: + .byte KEYSH , mus_route119_key+0 .byte VOICE , 0 - .byte VOL , 84*bgm_granroad_mvl/mxv + .byte VOL , 84*mus_route119_mvl/mxv .byte PAN , c_v+0 - .byte VOL , 71*bgm_granroad_mvl/mxv + .byte VOL , 71*mus_route119_mvl/mxv .byte W48 .byte N24 , An2 , v092 .byte W24 @@ -4332,7 +4332,7 @@ bgm_granroad_7: .byte W04 .byte N04 .byte W04 -bgm_granroad_7_000: +mus_route119_7_000: .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -4394,7 +4394,7 @@ bgm_granroad_7_000: .byte W28 .byte N04 , En1 , v044 .byte W04 -bgm_granroad_7_001: +mus_route119_7_001: .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -4415,13 +4415,13 @@ bgm_granroad_7_001: .byte N24 , An2 , v080 .byte W48 .byte W96 -bgm_granroad_7_B1: +mus_route119_7_B1: .byte W96 .byte W96 .byte W96 .byte W96 .byte W96 -bgm_granroad_7_002: +mus_route119_7_002: .byte N04 , En1 , v112 .byte W08 .byte N04 @@ -4468,8 +4468,8 @@ bgm_granroad_7_002: .byte N04 .byte W04 .byte PATT - .word bgm_granroad_7_002 -bgm_granroad_7_003: + .word mus_route119_7_002 +mus_route119_7_003: .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -4486,9 +4486,9 @@ bgm_granroad_7_003: .byte W04 .byte PEND .byte PATT - .word bgm_granroad_7_002 + .word mus_route119_7_002 .byte PATT - .word bgm_granroad_7_003 + .word mus_route119_7_003 .byte N04 , En1 , v112 .byte W16 .byte N04 @@ -4548,7 +4548,7 @@ bgm_granroad_7_003: .byte N04 .byte W04 .byte PATT - .word bgm_granroad_7_002 + .word mus_route119_7_002 .byte W96 .byte W96 .byte W96 @@ -4579,7 +4579,7 @@ bgm_granroad_7_003: .byte N04 .byte W04 .byte PATT - .word bgm_granroad_7_000 + .word mus_route119_7_000 .byte N04 , En1 , v112 .byte W16 .byte En1 , v127 @@ -4682,19 +4682,19 @@ bgm_granroad_7_003: .byte N04 , En1 , v044 .byte W04 .byte PATT - .word bgm_granroad_7_001 + .word mus_route119_7_001 .byte N40 , An2 , v088 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_granroad_7_B1 + .word mus_route119_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_granroad_8: - .byte KEYSH , bgm_granroad_key+0 +mus_route119_8: + .byte KEYSH , mus_route119_key+0 .byte VOICE , 84 .byte LFOS , 44 .byte XCMD , xIECV , 21 @@ -4703,19 +4703,19 @@ bgm_granroad_8: .byte PAN , c_v+0 .byte XCMD , xIECV , 12 .byte xIECL , 8 - .byte VOL , 60*bgm_granroad_mvl/mxv + .byte VOL , 60*mus_route119_mvl/mxv .byte W24 .byte N16 , En1 , v112 .byte W16 .byte N08 , Gs1 .byte W08 -bgm_granroad_8_000: +mus_route119_8_000: .byte N24 , An1 , v112 .byte W64 .byte N32 .byte W32 .byte PEND -bgm_granroad_8_001: +mus_route119_8_001: .byte N24 , Gn1 , v112 .byte W64 .byte N32 @@ -4738,14 +4738,14 @@ bgm_granroad_8_001: .byte Gs1 .byte W08 .byte PATT - .word bgm_granroad_8_000 + .word mus_route119_8_000 .byte PATT - .word bgm_granroad_8_001 + .word mus_route119_8_001 .byte N24 , Fs1 , v112 .byte W64 .byte N32 .byte W32 -bgm_granroad_8_002: +mus_route119_8_002: .byte N04 , Fn1 , v112 .byte W08 .byte N04 @@ -4761,7 +4761,7 @@ bgm_granroad_8_002: .byte N08 .byte W16 .byte PEND -bgm_granroad_8_003: +mus_route119_8_003: .byte N08 , Dn2 , v112 .byte W16 .byte N04 @@ -4779,9 +4779,9 @@ bgm_granroad_8_003: .byte N16 , Dn2 .byte W16 .byte PEND -bgm_granroad_8_B1: +mus_route119_8_B1: .byte VOICE , 84 - .byte VOL , 60*bgm_granroad_mvl/mxv + .byte VOL , 60*mus_route119_mvl/mxv .byte N08 , Dn2 , v112 .byte W16 .byte N04 @@ -4999,7 +4999,7 @@ bgm_granroad_8_B1: .byte N16 , En1 .byte W16 .byte PATT - .word bgm_granroad_8_003 + .word mus_route119_8_003 .byte N08 , En2 , v112 .byte W08 .byte N04 , En3 @@ -5091,21 +5091,21 @@ bgm_granroad_8_B1: .byte N24 .byte W96 .byte PATT - .word bgm_granroad_8_002 + .word mus_route119_8_002 .byte PATT - .word bgm_granroad_8_003 + .word mus_route119_8_003 .byte GOTO - .word bgm_granroad_8_B1 + .word mus_route119_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_granroad_9: - .byte KEYSH , bgm_granroad_key+0 +mus_route119_9: + .byte KEYSH , mus_route119_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 90*bgm_granroad_mvl/mxv + .byte VOL , 90*mus_route119_mvl/mxv .byte PAN , c_v+0 .byte W40 .byte N04 , En1 , v127 @@ -5123,7 +5123,7 @@ bgm_granroad_9: .byte W16 .byte N24 , An1 .byte W32 -bgm_granroad_9_000: +mus_route119_9_000: .byte N16 , Gn1 , v127 .byte W32 .byte N08 , En2 @@ -5184,7 +5184,7 @@ bgm_granroad_9_000: .byte N32 , An1 .byte W32 .byte PATT - .word bgm_granroad_9_000 + .word mus_route119_9_000 .byte N16 , Fs1 , v127 .byte W40 .byte N04 , Fs2 @@ -5205,7 +5205,7 @@ bgm_granroad_9_000: .byte W04 .byte N04 .byte W04 -bgm_granroad_9_001: +mus_route119_9_001: .byte N04 , Fn2 , v127 .byte W08 .byte N04 @@ -5229,7 +5229,7 @@ bgm_granroad_9_001: .byte PEND .byte N64 , Dn1 , v064 .byte W96 -bgm_granroad_9_B1: +mus_route119_9_B1: .byte W96 .byte W96 .byte W96 @@ -5248,7 +5248,7 @@ bgm_granroad_9_B1: .byte W08 .byte N24 , An1 .byte W48 -bgm_granroad_9_002: +mus_route119_9_002: .byte W24 .byte N16 , An2 , v088 .byte W48 @@ -5267,7 +5267,7 @@ bgm_granroad_9_002: .byte N24 , Bn1 .byte W48 .byte PATT - .word bgm_granroad_9_002 + .word mus_route119_9_002 .byte W96 .byte W96 .byte W96 @@ -5406,32 +5406,32 @@ bgm_granroad_9_002: .byte N04 .byte W04 .byte PATT - .word bgm_granroad_9_001 + .word mus_route119_9_001 .byte N64 , Dn1 , v064 .byte W96 .byte GOTO - .word bgm_granroad_9_B1 + .word mus_route119_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_granroad: +mus_route119: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_granroad_pri @ Priority - .byte bgm_granroad_rev @ Reverb. + .byte mus_route119_pri @ Priority + .byte mus_route119_rev @ Reverb. - .word bgm_granroad_grp + .word mus_route119_grp - .word bgm_granroad_1 - .word bgm_granroad_2 - .word bgm_granroad_3 - .word bgm_granroad_4 - .word bgm_granroad_5 - .word bgm_granroad_6 - .word bgm_granroad_7 - .word bgm_granroad_8 - .word bgm_granroad_9 + .word mus_route119_1 + .word mus_route119_2 + .word mus_route119_3 + .word mus_route119_4 + .word mus_route119_5 + .word mus_route119_6 + .word mus_route119_7 + .word mus_route119_8 + .word mus_route119_9 .end diff --git a/sound/songs/bgm_dooro_x3.s b/sound/songs/mus_route120.s index 3586016a6..638045be9 100644 --- a/sound/songs/bgm_dooro_x3.s +++ b/sound/songs/mus_route120.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_dooro_x3_grp, voicegroup011 - .equ bgm_dooro_x3_pri, 0 - .equ bgm_dooro_x3_rev, reverb_set+50 - .equ bgm_dooro_x3_mvl, 127 - .equ bgm_dooro_x3_key, 0 - .equ bgm_dooro_x3_tbs, 1 - .equ bgm_dooro_x3_exg, 0 - .equ bgm_dooro_x3_cmp, 1 + .equ mus_route120_grp, voicegroup011 + .equ mus_route120_pri, 0 + .equ mus_route120_rev, reverb_set+50 + .equ mus_route120_mvl, 127 + .equ mus_route120_key, 0 + .equ mus_route120_tbs, 1 + .equ mus_route120_exg, 0 + .equ mus_route120_cmp, 1 .section .rodata - .global bgm_dooro_x3 + .global mus_route120 .align 2 @********************** Track 1 **********************@ -bgm_dooro_x3_1: - .byte KEYSH , bgm_dooro_x3_key+0 -bgm_dooro_x3_1_B1: - .byte TEMPO , 134*bgm_dooro_x3_tbs/2 +mus_route120_1: + .byte KEYSH , mus_route120_key+0 +mus_route120_1_B1: + .byte TEMPO , 134*mus_route120_tbs/2 .byte VOICE , 81 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N88 , An1 , v080 .byte W96 .byte N96 @@ -43,7 +43,7 @@ bgm_dooro_x3_1_B1: .byte W96 .byte N96 .byte W96 -bgm_dooro_x3_1_000: +mus_route120_1_000: .byte N12 , An1 , v080 .byte W24 .byte N12 @@ -54,8 +54,8 @@ bgm_dooro_x3_1_000: .byte W24 .byte PEND .byte PATT - .word bgm_dooro_x3_1_000 -bgm_dooro_x3_1_001: + .word mus_route120_1_000 +mus_route120_1_001: .byte N12 , Gn1 , v080 .byte W24 .byte N12 @@ -66,8 +66,8 @@ bgm_dooro_x3_1_001: .byte W24 .byte PEND .byte PATT - .word bgm_dooro_x3_1_001 -bgm_dooro_x3_1_002: + .word mus_route120_1_001 +mus_route120_1_002: .byte N12 , Fn1 , v080 .byte W24 .byte N12 @@ -78,7 +78,7 @@ bgm_dooro_x3_1_002: .byte W24 .byte PEND .byte PATT - .word bgm_dooro_x3_1_002 + .word mus_route120_1_002 .byte N12 , En1 , v080 .byte W24 .byte N12 @@ -97,7 +97,7 @@ bgm_dooro_x3_1_002: .byte W16 .byte Gs1 .byte W16 -bgm_dooro_x3_1_003: +mus_route120_1_003: .byte VOICE , 83 .byte N36 , An1 , v080 .byte W40 @@ -110,7 +110,7 @@ bgm_dooro_x3_1_003: .byte N04 .byte W08 .byte PEND -bgm_dooro_x3_1_004: +mus_route120_1_004: .byte N36 , Gs1 , v080 .byte W40 .byte N04 @@ -123,7 +123,7 @@ bgm_dooro_x3_1_004: .byte N16 , Cs2 .byte W16 .byte PEND -bgm_dooro_x3_1_005: +mus_route120_1_005: .byte VOICE , 83 .byte N36 , Gn1 , v080 .byte W40 @@ -136,7 +136,7 @@ bgm_dooro_x3_1_005: .byte N04 .byte W08 .byte PEND -bgm_dooro_x3_1_006: +mus_route120_1_006: .byte N36 , Fs1 , v080 .byte W40 .byte N04 @@ -149,7 +149,7 @@ bgm_dooro_x3_1_006: .byte N16 , Bn1 .byte W16 .byte PEND -bgm_dooro_x3_1_007: +mus_route120_1_007: .byte VOICE , 83 .byte N36 , Fn1 , v080 .byte W40 @@ -162,7 +162,7 @@ bgm_dooro_x3_1_007: .byte N04 .byte W08 .byte PEND -bgm_dooro_x3_1_008: +mus_route120_1_008: .byte N36 , En1 , v080 .byte W40 .byte N04 @@ -200,17 +200,17 @@ bgm_dooro_x3_1_008: .byte N16 , Gs1 .byte W16 .byte PATT - .word bgm_dooro_x3_1_003 + .word mus_route120_1_003 .byte PATT - .word bgm_dooro_x3_1_004 + .word mus_route120_1_004 .byte PATT - .word bgm_dooro_x3_1_005 + .word mus_route120_1_005 .byte PATT - .word bgm_dooro_x3_1_006 + .word mus_route120_1_006 .byte PATT - .word bgm_dooro_x3_1_007 + .word mus_route120_1_007 .byte PATT - .word bgm_dooro_x3_1_008 + .word mus_route120_1_008 .byte VOICE , 83 .byte N28 , En2 , v080 .byte W32 @@ -234,16 +234,16 @@ bgm_dooro_x3_1_008: .byte N16 , Gs1 .byte W16 .byte GOTO - .word bgm_dooro_x3_1_B1 + .word mus_route120_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_dooro_x3_2: - .byte KEYSH , bgm_dooro_x3_key+0 -bgm_dooro_x3_2_B1: +mus_route120_2: + .byte KEYSH , mus_route120_key+0 +mus_route120_2_B1: .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v-9 .byte W24 .byte N24 , En4 , v096 @@ -264,17 +264,17 @@ bgm_dooro_x3_2_B1: .byte W18 .byte MOD , 5 .byte W12 - .byte VOL , 73*bgm_dooro_x3_mvl/mxv + .byte VOL , 73*mus_route120_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W03 - .byte 54*bgm_dooro_x3_mvl/mxv + .byte 54*mus_route120_mvl/mxv .byte W03 - .byte 42*bgm_dooro_x3_mvl/mxv + .byte 42*mus_route120_mvl/mxv .byte W03 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte MOD , 0 .byte N12 , Bn3 .byte W16 @@ -284,58 +284,58 @@ bgm_dooro_x3_2_B1: .byte W16 .byte N32 , Bn3 .byte W18 - .byte VOL , 73*bgm_dooro_x3_mvl/mxv + .byte VOL , 73*mus_route120_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W03 - .byte 54*bgm_dooro_x3_mvl/mxv + .byte 54*mus_route120_mvl/mxv .byte W03 - .byte 42*bgm_dooro_x3_mvl/mxv + .byte 42*mus_route120_mvl/mxv .byte W03 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N36 , An3 .byte W36 .byte N24 , Gn3 .byte W24 .byte N80 , An3 .byte W24 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte W05 - .byte 74*bgm_dooro_x3_mvl/mxv + .byte 74*mus_route120_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x3_mvl/mxv + .byte 69*mus_route120_mvl/mxv .byte W02 .byte MOD , 5 .byte W03 - .byte VOL , 63*bgm_dooro_x3_mvl/mxv + .byte VOL , 63*mus_route120_mvl/mxv .byte W05 - .byte 57*bgm_dooro_x3_mvl/mxv + .byte 57*mus_route120_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x3_mvl/mxv + .byte 52*mus_route120_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x3_mvl/mxv + .byte 47*mus_route120_mvl/mxv .byte W05 - .byte 41*bgm_dooro_x3_mvl/mxv + .byte 41*mus_route120_mvl/mxv .byte W05 - .byte 35*bgm_dooro_x3_mvl/mxv + .byte 35*mus_route120_mvl/mxv .byte W05 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W05 - .byte 24*bgm_dooro_x3_mvl/mxv + .byte 24*mus_route120_mvl/mxv .byte W05 - .byte 18*bgm_dooro_x3_mvl/mxv + .byte 18*mus_route120_mvl/mxv .byte W02 .byte MOD , 0 .byte W03 - .byte VOL , 13*bgm_dooro_x3_mvl/mxv + .byte VOL , 13*mus_route120_mvl/mxv .byte W05 - .byte 8*bgm_dooro_x3_mvl/mxv + .byte 8*mus_route120_mvl/mxv .byte W05 - .byte 2*bgm_dooro_x3_mvl/mxv + .byte 2*mus_route120_mvl/mxv .byte W02 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N12 , Fn3 .byte W16 .byte Gn3 @@ -352,17 +352,17 @@ bgm_dooro_x3_2_B1: .byte W18 .byte MOD , 5 .byte W12 - .byte VOL , 73*bgm_dooro_x3_mvl/mxv + .byte VOL , 73*mus_route120_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W03 - .byte 54*bgm_dooro_x3_mvl/mxv + .byte 54*mus_route120_mvl/mxv .byte W03 - .byte 42*bgm_dooro_x3_mvl/mxv + .byte 42*mus_route120_mvl/mxv .byte W03 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte MOD , 0 .byte N12 .byte W16 @@ -372,37 +372,37 @@ bgm_dooro_x3_2_B1: .byte W16 .byte N92 , Bn3 .byte W24 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte W05 - .byte 74*bgm_dooro_x3_mvl/mxv + .byte 74*mus_route120_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x3_mvl/mxv + .byte 69*mus_route120_mvl/mxv .byte W02 .byte MOD , 5 .byte W03 - .byte VOL , 63*bgm_dooro_x3_mvl/mxv + .byte VOL , 63*mus_route120_mvl/mxv .byte W05 - .byte 57*bgm_dooro_x3_mvl/mxv + .byte 57*mus_route120_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x3_mvl/mxv + .byte 52*mus_route120_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x3_mvl/mxv + .byte 47*mus_route120_mvl/mxv .byte W05 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W05 - .byte 58*bgm_dooro_x3_mvl/mxv + .byte 58*mus_route120_mvl/mxv .byte W05 - .byte 65*bgm_dooro_x3_mvl/mxv + .byte 65*mus_route120_mvl/mxv .byte W05 - .byte 71*bgm_dooro_x3_mvl/mxv + .byte 71*mus_route120_mvl/mxv .byte W05 - .byte 75*bgm_dooro_x3_mvl/mxv + .byte 75*mus_route120_mvl/mxv .byte W02 .byte MOD , 0 .byte W03 - .byte VOL , 77*bgm_dooro_x3_mvl/mxv + .byte VOL , 77*mus_route120_mvl/mxv .byte W05 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte W07 .byte VOICE , 56 .byte W24 @@ -438,44 +438,44 @@ bgm_dooro_x3_2_B1: .byte W48 .byte MOD , 6 .byte W24 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte W05 - .byte 74*bgm_dooro_x3_mvl/mxv + .byte 74*mus_route120_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x3_mvl/mxv + .byte 69*mus_route120_mvl/mxv .byte W05 - .byte 63*bgm_dooro_x3_mvl/mxv + .byte 63*mus_route120_mvl/mxv .byte W05 - .byte 57*bgm_dooro_x3_mvl/mxv + .byte 57*mus_route120_mvl/mxv .byte W04 -bgm_dooro_x3_2_000: +mus_route120_2_000: .byte W01 - .byte VOL , 52*bgm_dooro_x3_mvl/mxv + .byte VOL , 52*mus_route120_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x3_mvl/mxv + .byte 47*mus_route120_mvl/mxv .byte W05 - .byte 41*bgm_dooro_x3_mvl/mxv + .byte 41*mus_route120_mvl/mxv .byte W05 - .byte 35*bgm_dooro_x3_mvl/mxv + .byte 35*mus_route120_mvl/mxv .byte W05 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W05 - .byte 24*bgm_dooro_x3_mvl/mxv + .byte 24*mus_route120_mvl/mxv .byte W05 - .byte 18*bgm_dooro_x3_mvl/mxv + .byte 18*mus_route120_mvl/mxv .byte W05 - .byte 13*bgm_dooro_x3_mvl/mxv + .byte 13*mus_route120_mvl/mxv .byte W05 - .byte 8*bgm_dooro_x3_mvl/mxv + .byte 8*mus_route120_mvl/mxv .byte W05 - .byte 2*bgm_dooro_x3_mvl/mxv + .byte 2*mus_route120_mvl/mxv .byte W02 .byte PEND .byte EOT , Bn3 .byte MOD , 0 .byte W08 .byte VOICE , 46 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v-23 .byte N04 , Gn3 , v044 .byte W04 @@ -533,23 +533,23 @@ bgm_dooro_x3_2_000: .byte W48 .byte MOD , 5 .byte W24 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte W05 - .byte 74*bgm_dooro_x3_mvl/mxv + .byte 74*mus_route120_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x3_mvl/mxv + .byte 69*mus_route120_mvl/mxv .byte W05 - .byte 63*bgm_dooro_x3_mvl/mxv + .byte 63*mus_route120_mvl/mxv .byte W05 - .byte 57*bgm_dooro_x3_mvl/mxv + .byte 57*mus_route120_mvl/mxv .byte W04 .byte PATT - .word bgm_dooro_x3_2_000 + .word mus_route120_2_000 .byte EOT , En4 .byte MOD , 0 .byte W08 .byte VOICE , 46 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v-24 .byte N04 , Bn3 , v044 .byte W04 @@ -593,25 +593,25 @@ bgm_dooro_x3_2_000: .byte W36 .byte MOD , 5 .byte W06 - .byte VOL , 71*bgm_dooro_x3_mvl/mxv + .byte VOL , 71*mus_route120_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x3_mvl/mxv + .byte 68*mus_route120_mvl/mxv .byte W05 - .byte 62*bgm_dooro_x3_mvl/mxv + .byte 62*mus_route120_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x3_mvl/mxv + .byte 52*mus_route120_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x3_mvl/mxv + .byte 47*mus_route120_mvl/mxv .byte W05 - .byte 29*bgm_dooro_x3_mvl/mxv + .byte 29*mus_route120_mvl/mxv .byte W05 - .byte 13*bgm_dooro_x3_mvl/mxv + .byte 13*mus_route120_mvl/mxv .byte W06 - .byte 6*bgm_dooro_x3_mvl/mxv + .byte 6*mus_route120_mvl/mxv .byte W06 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N28 .byte W15 .byte MOD , 5 @@ -632,25 +632,25 @@ bgm_dooro_x3_2_000: .byte W36 .byte MOD , 5 .byte W06 - .byte VOL , 71*bgm_dooro_x3_mvl/mxv + .byte VOL , 71*mus_route120_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x3_mvl/mxv + .byte 68*mus_route120_mvl/mxv .byte W05 - .byte 62*bgm_dooro_x3_mvl/mxv + .byte 62*mus_route120_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x3_mvl/mxv + .byte 52*mus_route120_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x3_mvl/mxv + .byte 47*mus_route120_mvl/mxv .byte W05 - .byte 29*bgm_dooro_x3_mvl/mxv + .byte 29*mus_route120_mvl/mxv .byte W05 - .byte 13*bgm_dooro_x3_mvl/mxv + .byte 13*mus_route120_mvl/mxv .byte W06 - .byte 6*bgm_dooro_x3_mvl/mxv + .byte 6*mus_route120_mvl/mxv .byte W06 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N28 , Fn4 .byte W15 .byte MOD , 5 @@ -681,21 +681,21 @@ bgm_dooro_x3_2_000: .byte W15 .byte MOD , 5 .byte W03 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W06 - .byte 68*bgm_dooro_x3_mvl/mxv + .byte 68*mus_route120_mvl/mxv .byte W06 - .byte 58*bgm_dooro_x3_mvl/mxv + .byte 58*mus_route120_mvl/mxv .byte W03 - .byte 43*bgm_dooro_x3_mvl/mxv + .byte 43*mus_route120_mvl/mxv .byte W03 - .byte 34*bgm_dooro_x3_mvl/mxv + .byte 34*mus_route120_mvl/mxv .byte W03 - .byte 13*bgm_dooro_x3_mvl/mxv + .byte 13*mus_route120_mvl/mxv .byte W06 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N28 , Fs4 .byte W15 .byte MOD , 5 @@ -728,22 +728,22 @@ bgm_dooro_x3_2_000: .byte W15 .byte MOD , 5 .byte W03 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W06 - .byte 68*bgm_dooro_x3_mvl/mxv + .byte 68*mus_route120_mvl/mxv .byte W06 - .byte 58*bgm_dooro_x3_mvl/mxv + .byte 58*mus_route120_mvl/mxv .byte W03 - .byte 43*bgm_dooro_x3_mvl/mxv + .byte 43*mus_route120_mvl/mxv .byte W03 - .byte 34*bgm_dooro_x3_mvl/mxv + .byte 34*mus_route120_mvl/mxv .byte W03 - .byte 13*bgm_dooro_x3_mvl/mxv + .byte 13*mus_route120_mvl/mxv .byte W06 .byte MOD , 0 .byte W03 .byte VOICE , 48 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N28 , An3 , v096 .byte W15 .byte MOD , 3 @@ -765,21 +765,21 @@ bgm_dooro_x3_2_000: .byte MOD , 3 .byte W24 .byte W03 - .byte VOL , 78*bgm_dooro_x3_mvl/mxv + .byte VOL , 78*mus_route120_mvl/mxv .byte W06 - .byte 71*bgm_dooro_x3_mvl/mxv + .byte 71*mus_route120_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W03 - .byte 60*bgm_dooro_x3_mvl/mxv + .byte 60*mus_route120_mvl/mxv .byte W03 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W03 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W03 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N28 .byte W15 .byte MOD , 3 @@ -801,21 +801,21 @@ bgm_dooro_x3_2_000: .byte MOD , 3 .byte W24 .byte W03 - .byte VOL , 78*bgm_dooro_x3_mvl/mxv + .byte VOL , 78*mus_route120_mvl/mxv .byte W06 - .byte 71*bgm_dooro_x3_mvl/mxv + .byte 71*mus_route120_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W03 - .byte 60*bgm_dooro_x3_mvl/mxv + .byte 60*mus_route120_mvl/mxv .byte W03 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W03 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W03 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N28 , Fn4 .byte W15 .byte MOD , 3 @@ -846,21 +846,21 @@ bgm_dooro_x3_2_000: .byte W15 .byte MOD , 3 .byte W09 - .byte VOL , 78*bgm_dooro_x3_mvl/mxv + .byte VOL , 78*mus_route120_mvl/mxv .byte W06 - .byte 71*bgm_dooro_x3_mvl/mxv + .byte 71*mus_route120_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W03 - .byte 60*bgm_dooro_x3_mvl/mxv + .byte 60*mus_route120_mvl/mxv .byte W03 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W03 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N32 , Bn4 .byte W32 .byte N08 , Fs4 @@ -879,38 +879,38 @@ bgm_dooro_x3_2_000: .byte W08 .byte Cs5 .byte W08 - .byte VOL , 77*bgm_dooro_x3_mvl/mxv + .byte VOL , 77*mus_route120_mvl/mxv .byte N44 , Dn5 .byte W06 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W03 - .byte 69*bgm_dooro_x3_mvl/mxv + .byte 69*mus_route120_mvl/mxv .byte W06 .byte MOD , 3 - .byte VOL , 72*bgm_dooro_x3_mvl/mxv + .byte VOL , 72*mus_route120_mvl/mxv .byte W06 - .byte 75*bgm_dooro_x3_mvl/mxv + .byte 75*mus_route120_mvl/mxv .byte W06 - .byte 78*bgm_dooro_x3_mvl/mxv + .byte 78*mus_route120_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte W12 .byte MOD , 0 .byte W03 .byte GOTO - .word bgm_dooro_x3_2_B1 + .word mus_route120_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_dooro_x3_3: - .byte KEYSH , bgm_dooro_x3_key+0 -bgm_dooro_x3_3_B1: +mus_route120_3: + .byte KEYSH , mus_route120_key+0 +mus_route120_3_B1: .byte VOICE , 82 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v+48 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte BEND , c_v+0 .byte N12 , Cs3 , v052 .byte W12 @@ -1243,13 +1243,13 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , En3 .byte W08 .byte Dn3 @@ -1269,16 +1269,16 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 .byte W04 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W04 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W04 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W08 .byte PAN , c_v+0 .byte W08 .byte VOICE , 5 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte BEND , c_v-4 .byte N08 , Gs4 , v032 .byte W08 @@ -1303,13 +1303,13 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 .byte W08 .byte Bn2 @@ -1326,16 +1326,16 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 , An2 .byte W04 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W04 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W04 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W08 .byte VOICE , 5 .byte PAN , c_v+0 .byte W08 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte BEND , c_v-4 .byte N08 , Fs4 , v032 .byte W08 @@ -1360,13 +1360,13 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , Dn3 .byte W08 .byte Cs3 @@ -1386,16 +1386,16 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 , An2 , v056 .byte W04 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W04 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W04 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W08 .byte VOICE , 5 .byte PAN , c_v+0 .byte W08 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte BEND , c_v-4 .byte N08 , En4 , v032 .byte W08 @@ -1412,13 +1412,13 @@ bgm_dooro_x3_3_B1: .byte VOICE , 84 .byte N16 .byte W08 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N04 , En3 .byte W04 .byte VOICE , 82 @@ -1436,14 +1436,14 @@ bgm_dooro_x3_3_B1: .byte VOICE , 84 .byte N16 .byte W08 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 .byte VOICE , 82 - .byte VOL , 36*bgm_dooro_x3_mvl/mxv + .byte VOL , 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N04 .byte W08 .byte N04 @@ -1467,13 +1467,13 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , En3 .byte W08 .byte Dn3 @@ -1510,13 +1510,13 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 .byte W08 .byte Bn2 @@ -1550,13 +1550,13 @@ bgm_dooro_x3_3_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , Dn3 .byte W08 .byte Cs3 @@ -1616,19 +1616,19 @@ bgm_dooro_x3_3_B1: .byte N16 , Bn2 .byte W16 .byte GOTO - .word bgm_dooro_x3_3_B1 + .word mus_route120_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_dooro_x3_4: - .byte KEYSH , bgm_dooro_x3_key+0 -bgm_dooro_x3_4_B1: +mus_route120_4: + .byte KEYSH , mus_route120_key+0 +mus_route120_4_B1: .byte VOICE , 80 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v-48 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N88 , En3 , v052 .byte W96 .byte N72 @@ -1869,13 +1869,13 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , An3 .byte W08 .byte Gs3 @@ -1888,16 +1888,16 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 .byte W04 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W04 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W04 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W04 .byte PAN , c_v+0 .byte W08 .byte VOICE , 4 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N08 , Gs4 , v056 .byte W08 .byte Cs5 @@ -1912,13 +1912,13 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , Gn3 .byte W08 .byte Fs3 @@ -1935,16 +1935,16 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 , Dn3 , v056 .byte W04 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W04 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W04 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W04 .byte VOICE , 4 .byte PAN , c_v+1 .byte W08 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N08 , Fs4 .byte W08 .byte An4 @@ -1959,13 +1959,13 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , Fn3 .byte W08 .byte En3 @@ -1978,16 +1978,16 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 , Cs3 , v056 .byte W04 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W04 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W04 - .byte 45*bgm_dooro_x3_mvl/mxv + .byte 45*mus_route120_mvl/mxv .byte W04 .byte VOICE , 4 .byte PAN , c_v+0 .byte W08 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N08 , En4 .byte W08 .byte An4 @@ -1998,13 +1998,13 @@ bgm_dooro_x3_4_B1: .byte PAN , c_v-48 .byte N28 , An3 , v064 .byte W20 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N04 , Gs3 .byte W08 .byte An3 @@ -2017,13 +2017,13 @@ bgm_dooro_x3_4_B1: .byte W16 .byte N28 , Bn3 .byte W20 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N04 .byte W08 .byte N04 @@ -2040,13 +2040,13 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , An3 .byte W08 .byte Gs3 @@ -2069,13 +2069,13 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , Gn3 .byte W08 .byte Fs3 @@ -2102,13 +2102,13 @@ bgm_dooro_x3_4_B1: .byte W08 .byte N24 .byte W12 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W04 - .byte 36*bgm_dooro_x3_mvl/mxv + .byte 36*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N08 , An3 .byte W08 .byte Gs3 @@ -2146,16 +2146,16 @@ bgm_dooro_x3_4_B1: .byte N16 , Dn3 .byte W16 .byte GOTO - .word bgm_dooro_x3_4_B1 + .word mus_route120_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_dooro_x3_5: - .byte KEYSH , bgm_dooro_x3_key+0 -bgm_dooro_x3_5_B1: +mus_route120_5: + .byte KEYSH , mus_route120_key+0 +mus_route120_5_B1: .byte VOICE , 0 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N96 , An2 , v092 .byte W96 .byte W96 @@ -2195,16 +2195,16 @@ bgm_dooro_x3_5_B1: .byte N48 .byte W96 .byte GOTO - .word bgm_dooro_x3_5_B1 + .word mus_route120_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_dooro_x3_6: - .byte KEYSH , bgm_dooro_x3_key+0 -bgm_dooro_x3_6_B1: +mus_route120_6: + .byte KEYSH , mus_route120_key+0 +mus_route120_6_B1: .byte VOICE , 46 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v+0 .byte N04 , An4 , v064 .byte W04 @@ -2254,7 +2254,7 @@ bgm_dooro_x3_6_B1: .byte W04 .byte Bn4 , v052 .byte W04 -bgm_dooro_x3_6_000: +mus_route120_6_000: .byte N04 , An4 , v064 .byte W04 .byte An4 , v052 @@ -2305,10 +2305,10 @@ bgm_dooro_x3_6_000: .byte W04 .byte PEND .byte PATT - .word bgm_dooro_x3_6_000 + .word mus_route120_6_000 .byte PATT - .word bgm_dooro_x3_6_000 -bgm_dooro_x3_6_001: + .word mus_route120_6_000 +mus_route120_6_001: .byte N04 , An4 , v064 .byte W04 .byte An4 , v052 @@ -2359,7 +2359,7 @@ bgm_dooro_x3_6_001: .byte W04 .byte PEND .byte PATT - .word bgm_dooro_x3_6_001 + .word mus_route120_6_001 .byte N04 , An4 , v064 .byte W04 .byte An4 , v052 @@ -2477,26 +2477,26 @@ bgm_dooro_x3_6_001: .byte W28 .byte MOD , 6 .byte W05 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x3_mvl/mxv + .byte 68*mus_route120_mvl/mxv .byte W05 - .byte 56*bgm_dooro_x3_mvl/mxv + .byte 56*mus_route120_mvl/mxv .byte W05 - .byte 44*bgm_dooro_x3_mvl/mxv + .byte 44*mus_route120_mvl/mxv .byte W05 - .byte 32*bgm_dooro_x3_mvl/mxv + .byte 32*mus_route120_mvl/mxv .byte W05 - .byte 19*bgm_dooro_x3_mvl/mxv + .byte 19*mus_route120_mvl/mxv .byte W05 - .byte 6*bgm_dooro_x3_mvl/mxv + .byte 6*mus_route120_mvl/mxv .byte W03 - .byte 0*bgm_dooro_x3_mvl/mxv + .byte 0*mus_route120_mvl/mxv .byte W02 .byte MOD , 0 .byte W04 .byte VOICE , 47 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v+0 .byte N08 , Dn2 , v124 .byte W08 @@ -2528,18 +2528,18 @@ bgm_dooro_x3_6_001: .byte W18 .byte MOD , 6 .byte W06 - .byte VOL , 73*bgm_dooro_x3_mvl/mxv + .byte VOL , 73*mus_route120_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x3_mvl/mxv + .byte 68*mus_route120_mvl/mxv .byte W05 - .byte 56*bgm_dooro_x3_mvl/mxv + .byte 56*mus_route120_mvl/mxv .byte W05 - .byte 44*bgm_dooro_x3_mvl/mxv + .byte 44*mus_route120_mvl/mxv .byte W05 - .byte 32*bgm_dooro_x3_mvl/mxv + .byte 32*mus_route120_mvl/mxv .byte W04 .byte VOICE , 47 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte MOD , 0 .byte N08 , Bn1 , v092 .byte W16 @@ -2702,16 +2702,16 @@ bgm_dooro_x3_6_001: .byte Bn1 , v124 .byte W08 .byte GOTO - .word bgm_dooro_x3_6_B1 + .word mus_route120_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_dooro_x3_7: - .byte KEYSH , bgm_dooro_x3_key+0 -bgm_dooro_x3_7_B1: +mus_route120_7: + .byte KEYSH , mus_route120_key+0 +mus_route120_7_B1: .byte VOICE , 47 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v+0 .byte N12 , En2 , v124 .byte W96 @@ -2726,34 +2726,34 @@ bgm_dooro_x3_7_B1: .byte W16 .byte N84 , Dn4 .byte W24 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte MOD , 6 .byte W05 - .byte VOL , 76*bgm_dooro_x3_mvl/mxv + .byte VOL , 76*mus_route120_mvl/mxv .byte W05 - .byte 71*bgm_dooro_x3_mvl/mxv + .byte 71*mus_route120_mvl/mxv .byte W06 - .byte 61*bgm_dooro_x3_mvl/mxv + .byte 61*mus_route120_mvl/mxv .byte W05 - .byte 56*bgm_dooro_x3_mvl/mxv + .byte 56*mus_route120_mvl/mxv .byte W03 .byte W02 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W05 - .byte 44*bgm_dooro_x3_mvl/mxv + .byte 44*mus_route120_mvl/mxv .byte W05 - .byte 35*bgm_dooro_x3_mvl/mxv + .byte 35*mus_route120_mvl/mxv .byte W05 - .byte 22*bgm_dooro_x3_mvl/mxv + .byte 22*mus_route120_mvl/mxv .byte W07 - .byte 15*bgm_dooro_x3_mvl/mxv + .byte 15*mus_route120_mvl/mxv .byte W04 - .byte 6*bgm_dooro_x3_mvl/mxv + .byte 6*mus_route120_mvl/mxv .byte W08 - .byte 0*bgm_dooro_x3_mvl/mxv + .byte 0*mus_route120_mvl/mxv .byte W12 .byte VOICE , 47 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v+1 .byte MOD , 0 .byte N12 , Bn1 , v120 @@ -2780,20 +2780,20 @@ bgm_dooro_x3_7_B1: .byte W32 .byte MOD , 6 .byte W08 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x3_mvl/mxv + .byte 61*mus_route120_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x3_mvl/mxv + .byte 47*mus_route120_mvl/mxv .byte W05 - .byte 34*bgm_dooro_x3_mvl/mxv + .byte 34*mus_route120_mvl/mxv .byte W05 - .byte 21*bgm_dooro_x3_mvl/mxv + .byte 21*mus_route120_mvl/mxv .byte W05 - .byte 8*bgm_dooro_x3_mvl/mxv + .byte 8*mus_route120_mvl/mxv .byte W19 .byte VOICE , 47 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte MOD , 0 .byte W04 .byte PAN , c_v+0 @@ -2813,23 +2813,23 @@ bgm_dooro_x3_7_B1: .byte W16 .byte N72 , Gs4 .byte W36 - .byte VOL , 77*bgm_dooro_x3_mvl/mxv + .byte VOL , 77*mus_route120_mvl/mxv .byte MOD , 6 .byte W05 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W05 - .byte 54*bgm_dooro_x3_mvl/mxv + .byte 54*mus_route120_mvl/mxv .byte W05 - .byte 42*bgm_dooro_x3_mvl/mxv + .byte 42*mus_route120_mvl/mxv .byte W05 - .byte 30*bgm_dooro_x3_mvl/mxv + .byte 30*mus_route120_mvl/mxv .byte W05 - .byte 18*bgm_dooro_x3_mvl/mxv + .byte 18*mus_route120_mvl/mxv .byte W05 - .byte 6*bgm_dooro_x3_mvl/mxv + .byte 6*mus_route120_mvl/mxv .byte W06 .byte VOICE , 47 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v+0 .byte MOD , 0 .byte N08 , Bn1 , v124 @@ -2848,48 +2848,48 @@ bgm_dooro_x3_7_B1: .byte W08 .byte N04 .byte W08 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N96 .byte W05 - .byte VOL , 71*bgm_dooro_x3_mvl/mxv + .byte VOL , 71*mus_route120_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x3_mvl/mxv + .byte 61*mus_route120_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x3_mvl/mxv + .byte 52*mus_route120_mvl/mxv .byte W01 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x3_mvl/mxv + .byte 52*mus_route120_mvl/mxv .byte W05 - .byte 54*bgm_dooro_x3_mvl/mxv + .byte 54*mus_route120_mvl/mxv .byte W05 - .byte 56*bgm_dooro_x3_mvl/mxv + .byte 56*mus_route120_mvl/mxv .byte W05 - .byte 58*bgm_dooro_x3_mvl/mxv + .byte 58*mus_route120_mvl/mxv .byte W05 - .byte 60*bgm_dooro_x3_mvl/mxv + .byte 60*mus_route120_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x3_mvl/mxv + .byte 61*mus_route120_mvl/mxv .byte W05 - .byte 63*bgm_dooro_x3_mvl/mxv + .byte 63*mus_route120_mvl/mxv .byte W05 - .byte 65*bgm_dooro_x3_mvl/mxv + .byte 65*mus_route120_mvl/mxv .byte W05 - .byte 67*bgm_dooro_x3_mvl/mxv + .byte 67*mus_route120_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x3_mvl/mxv + .byte 69*mus_route120_mvl/mxv .byte W05 - .byte 70*bgm_dooro_x3_mvl/mxv + .byte 70*mus_route120_mvl/mxv .byte W05 - .byte 72*bgm_dooro_x3_mvl/mxv + .byte 72*mus_route120_mvl/mxv .byte W05 - .byte 74*bgm_dooro_x3_mvl/mxv + .byte 74*mus_route120_mvl/mxv .byte W05 - .byte 76*bgm_dooro_x3_mvl/mxv + .byte 76*mus_route120_mvl/mxv .byte W05 - .byte 78*bgm_dooro_x3_mvl/mxv + .byte 78*mus_route120_mvl/mxv .byte W05 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N24 , Gn2 .byte W24 .byte Dn3 @@ -2908,63 +2908,63 @@ bgm_dooro_x3_7_B1: .byte W24 .byte N96 , Cn3 .byte W42 - .byte VOL , 78*bgm_dooro_x3_mvl/mxv + .byte VOL , 78*mus_route120_mvl/mxv .byte W05 - .byte 75*bgm_dooro_x3_mvl/mxv + .byte 75*mus_route120_mvl/mxv .byte W05 - .byte 71*bgm_dooro_x3_mvl/mxv + .byte 71*mus_route120_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x3_mvl/mxv + .byte 68*mus_route120_mvl/mxv .byte W05 - .byte 64*bgm_dooro_x3_mvl/mxv + .byte 64*mus_route120_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x3_mvl/mxv + .byte 61*mus_route120_mvl/mxv .byte W05 - .byte 57*bgm_dooro_x3_mvl/mxv + .byte 57*mus_route120_mvl/mxv .byte W05 - .byte 54*bgm_dooro_x3_mvl/mxv + .byte 54*mus_route120_mvl/mxv .byte W05 - .byte 50*bgm_dooro_x3_mvl/mxv + .byte 50*mus_route120_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x3_mvl/mxv + .byte 47*mus_route120_mvl/mxv .byte W09 .byte N96 , An2 .byte W15 - .byte VOL , 52*bgm_dooro_x3_mvl/mxv + .byte VOL , 52*mus_route120_mvl/mxv .byte W01 - .byte 51*bgm_dooro_x3_mvl/mxv + .byte 51*mus_route120_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x3_mvl/mxv + .byte 52*mus_route120_mvl/mxv .byte W05 - .byte 54*bgm_dooro_x3_mvl/mxv + .byte 54*mus_route120_mvl/mxv .byte W05 - .byte 56*bgm_dooro_x3_mvl/mxv + .byte 56*mus_route120_mvl/mxv .byte W05 - .byte 58*bgm_dooro_x3_mvl/mxv + .byte 58*mus_route120_mvl/mxv .byte W05 - .byte 60*bgm_dooro_x3_mvl/mxv + .byte 60*mus_route120_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x3_mvl/mxv + .byte 61*mus_route120_mvl/mxv .byte W05 - .byte 63*bgm_dooro_x3_mvl/mxv + .byte 63*mus_route120_mvl/mxv .byte W05 - .byte 65*bgm_dooro_x3_mvl/mxv + .byte 65*mus_route120_mvl/mxv .byte W05 - .byte 67*bgm_dooro_x3_mvl/mxv + .byte 67*mus_route120_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x3_mvl/mxv + .byte 69*mus_route120_mvl/mxv .byte W05 - .byte 70*bgm_dooro_x3_mvl/mxv + .byte 70*mus_route120_mvl/mxv .byte W05 - .byte 72*bgm_dooro_x3_mvl/mxv + .byte 72*mus_route120_mvl/mxv .byte W05 - .byte 74*bgm_dooro_x3_mvl/mxv + .byte 74*mus_route120_mvl/mxv .byte W05 - .byte 76*bgm_dooro_x3_mvl/mxv + .byte 76*mus_route120_mvl/mxv .byte W05 - .byte 78*bgm_dooro_x3_mvl/mxv + .byte 78*mus_route120_mvl/mxv .byte W05 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte N24 , En2 .byte W24 .byte An2 @@ -2982,31 +2982,31 @@ bgm_dooro_x3_7_B1: .byte N48 , Gs3 .byte W48 .byte W72 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N24 , An3 , v068 .byte W24 - .byte VOL , 50*bgm_dooro_x3_mvl/mxv + .byte VOL , 50*mus_route120_mvl/mxv .byte N44 , Gs3 .byte W03 - .byte VOL , 52*bgm_dooro_x3_mvl/mxv + .byte VOL , 52*mus_route120_mvl/mxv .byte W04 - .byte 54*bgm_dooro_x3_mvl/mxv + .byte 54*mus_route120_mvl/mxv .byte W04 - .byte 55*bgm_dooro_x3_mvl/mxv + .byte 55*mus_route120_mvl/mxv .byte W04 - .byte 58*bgm_dooro_x3_mvl/mxv + .byte 58*mus_route120_mvl/mxv .byte W04 - .byte 60*bgm_dooro_x3_mvl/mxv + .byte 60*mus_route120_mvl/mxv .byte W04 - .byte 63*bgm_dooro_x3_mvl/mxv + .byte 63*mus_route120_mvl/mxv .byte W04 - .byte 66*bgm_dooro_x3_mvl/mxv + .byte 66*mus_route120_mvl/mxv .byte W04 - .byte 69*bgm_dooro_x3_mvl/mxv + .byte 69*mus_route120_mvl/mxv .byte W04 - .byte 77*bgm_dooro_x3_mvl/mxv + .byte 77*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte W09 .byte N12 , An3 .byte W16 @@ -3014,41 +3014,41 @@ bgm_dooro_x3_7_B1: .byte W16 .byte N16 , An3 .byte W16 - .byte VOL , 42*bgm_dooro_x3_mvl/mxv + .byte VOL , 42*mus_route120_mvl/mxv .byte N68 , Gn3 .byte W05 - .byte VOL , 47*bgm_dooro_x3_mvl/mxv + .byte VOL , 47*mus_route120_mvl/mxv .byte W05 - .byte 53*bgm_dooro_x3_mvl/mxv + .byte 53*mus_route120_mvl/mxv .byte W05 - .byte 59*bgm_dooro_x3_mvl/mxv + .byte 59*mus_route120_mvl/mxv .byte W05 - .byte 65*bgm_dooro_x3_mvl/mxv + .byte 65*mus_route120_mvl/mxv .byte W05 - .byte 71*bgm_dooro_x3_mvl/mxv + .byte 71*mus_route120_mvl/mxv .byte W05 - .byte 77*bgm_dooro_x3_mvl/mxv + .byte 77*mus_route120_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte W08 - .byte 75*bgm_dooro_x3_mvl/mxv + .byte 75*mus_route120_mvl/mxv .byte W04 - .byte 71*bgm_dooro_x3_mvl/mxv + .byte 71*mus_route120_mvl/mxv .byte W05 - .byte 64*bgm_dooro_x3_mvl/mxv + .byte 64*mus_route120_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x3_mvl/mxv + .byte 52*mus_route120_mvl/mxv .byte W05 - .byte 37*bgm_dooro_x3_mvl/mxv + .byte 37*mus_route120_mvl/mxv .byte W09 - .byte 56*bgm_dooro_x3_mvl/mxv + .byte 56*mus_route120_mvl/mxv .byte N24 , En3 .byte W04 - .byte VOL , 66*bgm_dooro_x3_mvl/mxv + .byte VOL , 66*mus_route120_mvl/mxv .byte W04 - .byte 73*bgm_dooro_x3_mvl/mxv + .byte 73*mus_route120_mvl/mxv .byte W04 - .byte 80*bgm_dooro_x3_mvl/mxv + .byte 80*mus_route120_mvl/mxv .byte W12 .byte N12 , An3 .byte W16 @@ -3058,20 +3058,20 @@ bgm_dooro_x3_7_B1: .byte W16 .byte N44 , An3 .byte W24 - .byte VOL , 68*bgm_dooro_x3_mvl/mxv + .byte VOL , 68*mus_route120_mvl/mxv .byte W04 - .byte 60*bgm_dooro_x3_mvl/mxv + .byte 60*mus_route120_mvl/mxv .byte W04 - .byte 55*bgm_dooro_x3_mvl/mxv + .byte 55*mus_route120_mvl/mxv .byte W04 - .byte 44*bgm_dooro_x3_mvl/mxv + .byte 44*mus_route120_mvl/mxv .byte W04 - .byte 31*bgm_dooro_x3_mvl/mxv + .byte 31*mus_route120_mvl/mxv .byte W04 - .byte 19*bgm_dooro_x3_mvl/mxv + .byte 19*mus_route120_mvl/mxv .byte W04 .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v+0 .byte N28 .byte W32 @@ -3093,20 +3093,20 @@ bgm_dooro_x3_7_B1: .byte W08 .byte N44 , An3 .byte W18 - .byte VOL , 74*bgm_dooro_x3_mvl/mxv + .byte VOL , 74*mus_route120_mvl/mxv .byte W06 - .byte 68*bgm_dooro_x3_mvl/mxv + .byte 68*mus_route120_mvl/mxv .byte W06 - .byte 58*bgm_dooro_x3_mvl/mxv + .byte 58*mus_route120_mvl/mxv .byte W03 - .byte 43*bgm_dooro_x3_mvl/mxv + .byte 43*mus_route120_mvl/mxv .byte W03 - .byte 34*bgm_dooro_x3_mvl/mxv + .byte 34*mus_route120_mvl/mxv .byte W03 - .byte 13*bgm_dooro_x3_mvl/mxv + .byte 13*mus_route120_mvl/mxv .byte W09 .byte VOICE , 48 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte PAN , c_v-10 .byte N28 , Dn3 , v076 .byte W32 @@ -3310,16 +3310,16 @@ bgm_dooro_x3_7_B1: .byte N44 , Bn3 .byte W48 .byte GOTO - .word bgm_dooro_x3_7_B1 + .word mus_route120_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_dooro_x3_8: - .byte KEYSH , bgm_dooro_x3_key+0 -bgm_dooro_x3_8_B1: +mus_route120_8: + .byte KEYSH , mus_route120_key+0 +mus_route120_8_B1: .byte VOICE , 0 - .byte VOL , 80*bgm_dooro_x3_mvl/mxv + .byte VOL , 80*mus_route120_mvl/mxv .byte N04 , En1 , v096 .byte W24 .byte En1 , v112 @@ -3340,7 +3340,7 @@ bgm_dooro_x3_8_B1: .byte W04 .byte N04 .byte W04 -bgm_dooro_x3_8_000: +mus_route120_8_000: .byte N04 , En1 , v096 .byte W24 .byte En1 , v112 @@ -3364,7 +3364,7 @@ bgm_dooro_x3_8_000: .byte N04 .byte W04 .byte PEND -bgm_dooro_x3_8_001: +mus_route120_8_001: .byte N04 , En1 , v096 .byte W24 .byte En1 , v112 @@ -3387,27 +3387,27 @@ bgm_dooro_x3_8_001: .byte W04 .byte PEND .byte PATT - .word bgm_dooro_x3_8_000 + .word mus_route120_8_000 .byte PATT - .word bgm_dooro_x3_8_001 + .word mus_route120_8_001 .byte PATT - .word bgm_dooro_x3_8_000 + .word mus_route120_8_000 .byte PATT - .word bgm_dooro_x3_8_001 + .word mus_route120_8_001 .byte PATT - .word bgm_dooro_x3_8_000 + .word mus_route120_8_000 .byte PATT - .word bgm_dooro_x3_8_001 + .word mus_route120_8_001 .byte PATT - .word bgm_dooro_x3_8_000 + .word mus_route120_8_000 .byte PATT - .word bgm_dooro_x3_8_001 + .word mus_route120_8_001 .byte PATT - .word bgm_dooro_x3_8_000 + .word mus_route120_8_000 .byte PATT - .word bgm_dooro_x3_8_001 + .word mus_route120_8_001 .byte PATT - .word bgm_dooro_x3_8_000 + .word mus_route120_8_000 .byte N04 , En1 , v096 .byte W08 .byte En1 , v068 @@ -3466,7 +3466,7 @@ bgm_dooro_x3_8_001: .byte W08 .byte En1 , v112 .byte W08 -bgm_dooro_x3_8_002: +mus_route120_8_002: .byte N04 , En1 , v068 .byte W16 .byte N04 @@ -3489,17 +3489,17 @@ bgm_dooro_x3_8_002: .byte W08 .byte PEND .byte PATT - .word bgm_dooro_x3_8_002 + .word mus_route120_8_002 .byte PATT - .word bgm_dooro_x3_8_002 + .word mus_route120_8_002 .byte PATT - .word bgm_dooro_x3_8_002 + .word mus_route120_8_002 .byte PATT - .word bgm_dooro_x3_8_002 + .word mus_route120_8_002 .byte PATT - .word bgm_dooro_x3_8_002 + .word mus_route120_8_002 .byte PATT - .word bgm_dooro_x3_8_002 + .word mus_route120_8_002 .byte N04 , En1 , v112 .byte W48 .byte En1 , v100 @@ -3526,7 +3526,7 @@ bgm_dooro_x3_8_002: .byte W04 .byte N04 .byte W04 -bgm_dooro_x3_8_003: +mus_route120_8_003: .byte N04 , En1 , v068 .byte W16 .byte N04 @@ -3550,7 +3550,7 @@ bgm_dooro_x3_8_003: .byte N04 .byte W08 .byte PEND -bgm_dooro_x3_8_004: +mus_route120_8_004: .byte N04 , En1 , v068 .byte W04 .byte N04 @@ -3573,11 +3573,11 @@ bgm_dooro_x3_8_004: .byte W08 .byte PEND .byte PATT - .word bgm_dooro_x3_8_003 + .word mus_route120_8_003 .byte PATT - .word bgm_dooro_x3_8_004 + .word mus_route120_8_004 .byte PATT - .word bgm_dooro_x3_8_003 + .word mus_route120_8_003 .byte N04 , En1 , v068 .byte W04 .byte N04 @@ -3604,7 +3604,7 @@ bgm_dooro_x3_8_004: .byte W08 .byte N04 .byte W08 -bgm_dooro_x3_8_005: +mus_route120_8_005: .byte W48 .byte N04 , En1 , v072 .byte W04 @@ -3622,29 +3622,29 @@ bgm_dooro_x3_8_005: .byte W08 .byte PEND .byte PATT - .word bgm_dooro_x3_8_005 + .word mus_route120_8_005 .byte GOTO - .word bgm_dooro_x3_8_B1 + .word mus_route120_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_dooro_x3: +mus_route120: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_dooro_x3_pri @ Priority - .byte bgm_dooro_x3_rev @ Reverb. + .byte mus_route120_pri @ Priority + .byte mus_route120_rev @ Reverb. - .word bgm_dooro_x3_grp + .word mus_route120_grp - .word bgm_dooro_x3_1 - .word bgm_dooro_x3_2 - .word bgm_dooro_x3_3 - .word bgm_dooro_x3_4 - .word bgm_dooro_x3_5 - .word bgm_dooro_x3_6 - .word bgm_dooro_x3_7 - .word bgm_dooro_x3_8 + .word mus_route120_1 + .word mus_route120_2 + .word mus_route120_3 + .word mus_route120_4 + .word mus_route120_5 + .word mus_route120_6 + .word mus_route120_7 + .word mus_route120_8 .end diff --git a/sound/songs/bgm_dooro_x4.s b/sound/songs/mus_route122.s index 4d18c9295..40a6dc04b 100644 --- a/sound/songs/bgm_dooro_x4.s +++ b/sound/songs/mus_route122.s @@ -1,29 +1,29 @@ .include "MPlayDef.s" - .equ bgm_dooro_x4_grp, voicegroup018 - .equ bgm_dooro_x4_pri, 0 - .equ bgm_dooro_x4_rev, reverb_set+50 - .equ bgm_dooro_x4_mvl, 127 - .equ bgm_dooro_x4_key, 0 - .equ bgm_dooro_x4_tbs, 1 - .equ bgm_dooro_x4_exg, 0 - .equ bgm_dooro_x4_cmp, 1 + .equ mus_route122_grp, voicegroup018 + .equ mus_route122_pri, 0 + .equ mus_route122_rev, reverb_set+50 + .equ mus_route122_mvl, 127 + .equ mus_route122_key, 0 + .equ mus_route122_tbs, 1 + .equ mus_route122_exg, 0 + .equ mus_route122_cmp, 1 .section .rodata - .global bgm_dooro_x4 + .global mus_route122 .align 2 @********************** Track 1 **********************@ -bgm_dooro_x4_1: - .byte KEYSH , bgm_dooro_x4_key+0 - .byte TEMPO , 124*bgm_dooro_x4_tbs/2 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv +mus_route122_1: + .byte KEYSH , mus_route122_key+0 + .byte TEMPO , 124*mus_route122_tbs/2 + .byte VOL , 80*mus_route122_mvl/mxv .byte W96 .byte W96 -bgm_dooro_x4_1_B1: +mus_route122_1_B1: .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N12 , Gs3 , v116 .byte W18 @@ -61,7 +61,7 @@ bgm_dooro_x4_1_B1: .byte W06 .byte N48 , Gn3 .byte W72 -bgm_dooro_x4_1_000: +mus_route122_1_000: .byte N30 , Gs3 , v116 .byte W36 .byte N06 , Gn3 @@ -76,7 +76,7 @@ bgm_dooro_x4_1_000: .byte W12 .byte PEND .byte PATT - .word bgm_dooro_x4_1_000 + .word mus_route122_1_000 .byte N30 , Gs3 , v116 .byte W36 .byte N06 , Ds3 @@ -128,78 +128,78 @@ bgm_dooro_x4_1_000: .byte W12 .byte N92 .byte W30 - .byte VOL , 75*bgm_dooro_x4_mvl/mxv + .byte VOL , 75*mus_route122_mvl/mxv .byte W09 .byte MOD , 5 .byte W02 - .byte VOL , 70*bgm_dooro_x4_mvl/mxv + .byte VOL , 70*mus_route122_mvl/mxv .byte W07 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x4_mvl/mxv + .byte 61*mus_route122_mvl/mxv .byte W07 - .byte 57*bgm_dooro_x4_mvl/mxv + .byte 57*mus_route122_mvl/mxv .byte W05 - .byte 48*bgm_dooro_x4_mvl/mxv + .byte 48*mus_route122_mvl/mxv .byte W07 - .byte 37*bgm_dooro_x4_mvl/mxv + .byte 37*mus_route122_mvl/mxv .byte W05 - .byte 21*bgm_dooro_x4_mvl/mxv + .byte 21*mus_route122_mvl/mxv .byte W07 - .byte 11*bgm_dooro_x4_mvl/mxv + .byte 11*mus_route122_mvl/mxv .byte W09 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N92 , Fn4 .byte W30 - .byte VOL , 75*bgm_dooro_x4_mvl/mxv + .byte VOL , 75*mus_route122_mvl/mxv .byte W09 .byte MOD , 5 .byte W02 - .byte VOL , 70*bgm_dooro_x4_mvl/mxv + .byte VOL , 70*mus_route122_mvl/mxv .byte W07 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x4_mvl/mxv + .byte 61*mus_route122_mvl/mxv .byte W07 - .byte 57*bgm_dooro_x4_mvl/mxv + .byte 57*mus_route122_mvl/mxv .byte W05 - .byte 48*bgm_dooro_x4_mvl/mxv + .byte 48*mus_route122_mvl/mxv .byte W07 - .byte 37*bgm_dooro_x4_mvl/mxv + .byte 37*mus_route122_mvl/mxv .byte W05 - .byte 21*bgm_dooro_x4_mvl/mxv + .byte 21*mus_route122_mvl/mxv .byte W07 - .byte 11*bgm_dooro_x4_mvl/mxv + .byte 11*mus_route122_mvl/mxv .byte W09 .byte MOD , 0 .byte W03 .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 , Gs3 .byte W18 .byte N06 , Ds3 .byte W06 .byte N66 , Ds4 .byte W24 - .byte VOL , 73*bgm_dooro_x4_mvl/mxv + .byte VOL , 73*mus_route122_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W07 - .byte 60*bgm_dooro_x4_mvl/mxv + .byte 60*mus_route122_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x4_mvl/mxv + .byte 47*mus_route122_mvl/mxv .byte W07 - .byte 39*bgm_dooro_x4_mvl/mxv + .byte 39*mus_route122_mvl/mxv .byte W05 - .byte 25*bgm_dooro_x4_mvl/mxv + .byte 25*mus_route122_mvl/mxv .byte W07 - .byte 7*bgm_dooro_x4_mvl/mxv + .byte 7*mus_route122_mvl/mxv .byte W12 -bgm_dooro_x4_1_001: +mus_route122_1_001: .byte VOICE , 56 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+16 .byte N12 , Gs3 , v116 .byte W18 @@ -207,27 +207,27 @@ bgm_dooro_x4_1_001: .byte W06 .byte N66 , Ds4 .byte W24 - .byte VOL , 73*bgm_dooro_x4_mvl/mxv + .byte VOL , 73*mus_route122_mvl/mxv .byte MOD , 5 .byte W05 - .byte VOL , 68*bgm_dooro_x4_mvl/mxv + .byte VOL , 68*mus_route122_mvl/mxv .byte W07 - .byte 60*bgm_dooro_x4_mvl/mxv + .byte 60*mus_route122_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x4_mvl/mxv + .byte 47*mus_route122_mvl/mxv .byte W07 - .byte 39*bgm_dooro_x4_mvl/mxv + .byte 39*mus_route122_mvl/mxv .byte W05 - .byte 25*bgm_dooro_x4_mvl/mxv + .byte 25*mus_route122_mvl/mxv .byte W07 - .byte 7*bgm_dooro_x4_mvl/mxv + .byte 7*mus_route122_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 .byte PEND -bgm_dooro_x4_1_002: +mus_route122_1_002: .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N12 , Gs3 , v116 .byte W18 @@ -235,24 +235,24 @@ bgm_dooro_x4_1_002: .byte W06 .byte N66 , Bn3 .byte W24 - .byte VOL , 73*bgm_dooro_x4_mvl/mxv + .byte VOL , 73*mus_route122_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W07 - .byte 60*bgm_dooro_x4_mvl/mxv + .byte 60*mus_route122_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x4_mvl/mxv + .byte 47*mus_route122_mvl/mxv .byte W07 - .byte 39*bgm_dooro_x4_mvl/mxv + .byte 39*mus_route122_mvl/mxv .byte W05 - .byte 25*bgm_dooro_x4_mvl/mxv + .byte 25*mus_route122_mvl/mxv .byte W07 - .byte 7*bgm_dooro_x4_mvl/mxv + .byte 7*mus_route122_mvl/mxv .byte W12 .byte PEND -bgm_dooro_x4_1_003: +mus_route122_1_003: .byte VOICE , 56 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+16 .byte N12 , Gs3 , v116 .byte W18 @@ -260,26 +260,26 @@ bgm_dooro_x4_1_003: .byte W06 .byte N66 , Bn3 .byte W24 - .byte VOL , 73*bgm_dooro_x4_mvl/mxv + .byte VOL , 73*mus_route122_mvl/mxv .byte MOD , 5 .byte W05 - .byte VOL , 68*bgm_dooro_x4_mvl/mxv + .byte VOL , 68*mus_route122_mvl/mxv .byte W07 - .byte 60*bgm_dooro_x4_mvl/mxv + .byte 60*mus_route122_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x4_mvl/mxv + .byte 47*mus_route122_mvl/mxv .byte W07 - .byte 39*bgm_dooro_x4_mvl/mxv + .byte 39*mus_route122_mvl/mxv .byte W05 - .byte 25*bgm_dooro_x4_mvl/mxv + .byte 25*mus_route122_mvl/mxv .byte W07 - .byte 7*bgm_dooro_x4_mvl/mxv + .byte 7*mus_route122_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 .byte PEND .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N12 , Gs3 .byte W18 @@ -287,28 +287,28 @@ bgm_dooro_x4_1_003: .byte W06 .byte N66 , Ds4 .byte W24 - .byte VOL , 73*bgm_dooro_x4_mvl/mxv + .byte VOL , 73*mus_route122_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W07 - .byte 60*bgm_dooro_x4_mvl/mxv + .byte 60*mus_route122_mvl/mxv .byte W05 - .byte 47*bgm_dooro_x4_mvl/mxv + .byte 47*mus_route122_mvl/mxv .byte W07 - .byte 39*bgm_dooro_x4_mvl/mxv + .byte 39*mus_route122_mvl/mxv .byte W05 - .byte 25*bgm_dooro_x4_mvl/mxv + .byte 25*mus_route122_mvl/mxv .byte W07 - .byte 7*bgm_dooro_x4_mvl/mxv + .byte 7*mus_route122_mvl/mxv .byte W12 .byte PATT - .word bgm_dooro_x4_1_001 + .word mus_route122_1_001 .byte PATT - .word bgm_dooro_x4_1_002 + .word mus_route122_1_002 .byte PATT - .word bgm_dooro_x4_1_003 + .word mus_route122_1_003 .byte VOICE , 60 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N12 , As3 , v116 .byte W18 @@ -328,19 +328,19 @@ bgm_dooro_x4_1_003: .byte W06 .byte N30 , Ds3 .byte W12 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W06 - .byte 70*bgm_dooro_x4_mvl/mxv + .byte 70*mus_route122_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x4_mvl/mxv + .byte 66*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 17*bgm_dooro_x4_mvl/mxv + .byte 17*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N09 .byte W12 .byte Gs3 @@ -349,142 +349,142 @@ bgm_dooro_x4_1_003: .byte W12 .byte N92 .byte W09 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W09 - .byte 70*bgm_dooro_x4_mvl/mxv + .byte 70*mus_route122_mvl/mxv .byte W09 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W06 - .byte 62*bgm_dooro_x4_mvl/mxv + .byte 62*mus_route122_mvl/mxv .byte W24 - .byte 65*bgm_dooro_x4_mvl/mxv + .byte 65*mus_route122_mvl/mxv .byte W06 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W06 - .byte 71*bgm_dooro_x4_mvl/mxv + .byte 71*mus_route122_mvl/mxv .byte W06 - .byte 76*bgm_dooro_x4_mvl/mxv + .byte 76*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W15 .byte N90 , As3 .byte W44 .byte W01 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W09 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W09 - .byte 64*bgm_dooro_x4_mvl/mxv + .byte 64*mus_route122_mvl/mxv .byte W06 - .byte 54*bgm_dooro_x4_mvl/mxv + .byte 54*mus_route122_mvl/mxv .byte W06 - .byte 45*bgm_dooro_x4_mvl/mxv + .byte 45*mus_route122_mvl/mxv .byte W06 - .byte 36*bgm_dooro_x4_mvl/mxv + .byte 36*mus_route122_mvl/mxv .byte W06 - .byte 24*bgm_dooro_x4_mvl/mxv + .byte 24*mus_route122_mvl/mxv .byte W03 - .byte 9*bgm_dooro_x4_mvl/mxv + .byte 9*mus_route122_mvl/mxv .byte W06 .byte GOTO - .word bgm_dooro_x4_1_B1 + .word mus_route122_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_dooro_x4_2: - .byte KEYSH , bgm_dooro_x4_key+0 +mus_route122_2: + .byte KEYSH , mus_route122_key+0 .byte VOICE , 58 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N96 , Cs1 , v127 .byte W05 - .byte VOL , 58*bgm_dooro_x4_mvl/mxv + .byte VOL , 58*mus_route122_mvl/mxv .byte W07 - .byte 55*bgm_dooro_x4_mvl/mxv + .byte 55*mus_route122_mvl/mxv .byte W05 - .byte 53*bgm_dooro_x4_mvl/mxv + .byte 53*mus_route122_mvl/mxv .byte W07 - .byte 52*bgm_dooro_x4_mvl/mxv + .byte 52*mus_route122_mvl/mxv .byte W12 - .byte 53*bgm_dooro_x4_mvl/mxv + .byte 53*mus_route122_mvl/mxv .byte W05 - .byte 56*bgm_dooro_x4_mvl/mxv + .byte 56*mus_route122_mvl/mxv .byte W07 - .byte 59*bgm_dooro_x4_mvl/mxv + .byte 59*mus_route122_mvl/mxv .byte W05 - .byte 62*bgm_dooro_x4_mvl/mxv + .byte 62*mus_route122_mvl/mxv .byte W07 - .byte 66*bgm_dooro_x4_mvl/mxv + .byte 66*mus_route122_mvl/mxv .byte W05 - .byte 78*bgm_dooro_x4_mvl/mxv + .byte 78*mus_route122_mvl/mxv .byte W07 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W24 .byte PAN , c_v+0 .byte N56 , Ds1 .byte W18 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte W06 - .byte 78*bgm_dooro_x4_mvl/mxv + .byte 78*mus_route122_mvl/mxv .byte W05 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W07 - .byte 62*bgm_dooro_x4_mvl/mxv + .byte 62*mus_route122_mvl/mxv .byte W05 - .byte 52*bgm_dooro_x4_mvl/mxv + .byte 52*mus_route122_mvl/mxv .byte W07 - .byte 41*bgm_dooro_x4_mvl/mxv + .byte 41*mus_route122_mvl/mxv .byte W05 - .byte 23*bgm_dooro_x4_mvl/mxv + .byte 23*mus_route122_mvl/mxv .byte W07 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 .byte W12 .byte Fn1 .byte W12 .byte Gn1 .byte W12 -bgm_dooro_x4_2_B1: +mus_route122_2_B1: .byte VOICE , 58 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 , Gs1 , v127 .byte W24 .byte N32 , Ds1 .byte W18 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W03 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W03 - .byte 55*bgm_dooro_x4_mvl/mxv + .byte 55*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 1*bgm_dooro_x4_mvl/mxv + .byte 1*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , Gs1 .byte W12 .byte N21 , Ds1 .byte W24 -bgm_dooro_x4_2_000: +mus_route122_2_000: .byte N12 , Ds1 , v127 .byte W18 .byte N06 .byte W06 .byte N32 , As1 .byte W18 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W03 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W03 - .byte 55*bgm_dooro_x4_mvl/mxv + .byte 55*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 1*bgm_dooro_x4_mvl/mxv + .byte 1*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , Ds1 .byte W12 .byte As1 @@ -496,46 +496,46 @@ bgm_dooro_x4_2_000: .byte W24 .byte N32 , Ds1 .byte W18 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W03 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W03 - .byte 55*bgm_dooro_x4_mvl/mxv + .byte 55*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 1*bgm_dooro_x4_mvl/mxv + .byte 1*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , Gs1 .byte W12 .byte N21 , Ds1 .byte W24 .byte PATT - .word bgm_dooro_x4_2_000 -bgm_dooro_x4_2_001: + .word mus_route122_2_000 +mus_route122_2_001: .byte N12 , Cs2 , v127 .byte W24 .byte N32 , Gs1 .byte W18 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W03 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W03 - .byte 55*bgm_dooro_x4_mvl/mxv + .byte 55*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 1*bgm_dooro_x4_mvl/mxv + .byte 1*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N24 , Cs2 .byte W24 .byte N12 , Gs1 .byte W12 .byte PEND .byte PATT - .word bgm_dooro_x4_2_001 + .word mus_route122_2_001 .byte N12 , Gs1 , v127 .byte W24 .byte N30 , Ds1 @@ -552,18 +552,18 @@ bgm_dooro_x4_2_001: .byte W12 .byte N42 , Fn1 .byte W30 - .byte VOL , 69*bgm_dooro_x4_mvl/mxv + .byte VOL , 69*mus_route122_mvl/mxv .byte W03 - .byte 62*bgm_dooro_x4_mvl/mxv + .byte 62*mus_route122_mvl/mxv .byte W03 - .byte 47*bgm_dooro_x4_mvl/mxv + .byte 47*mus_route122_mvl/mxv .byte W03 - .byte 30*bgm_dooro_x4_mvl/mxv + .byte 30*mus_route122_mvl/mxv .byte W03 - .byte 20*bgm_dooro_x4_mvl/mxv + .byte 20*mus_route122_mvl/mxv .byte W06 .byte VOICE , 56 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte W48 .byte N12 , Ds3 , v108 .byte W18 @@ -582,47 +582,47 @@ bgm_dooro_x4_2_001: .byte VOICE , 56 .byte N44 , Cs4 , v092 .byte W18 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte W03 .byte MOD , 5 .byte W03 - .byte VOL , 75*bgm_dooro_x4_mvl/mxv + .byte VOL , 75*mus_route122_mvl/mxv .byte W05 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W07 - .byte 46*bgm_dooro_x4_mvl/mxv + .byte 46*mus_route122_mvl/mxv .byte W05 - .byte 39*bgm_dooro_x4_mvl/mxv + .byte 39*mus_route122_mvl/mxv .byte W04 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N92 .byte W30 - .byte VOL , 75*bgm_dooro_x4_mvl/mxv + .byte VOL , 75*mus_route122_mvl/mxv .byte W09 .byte MOD , 5 .byte W02 - .byte VOL , 70*bgm_dooro_x4_mvl/mxv + .byte VOL , 70*mus_route122_mvl/mxv .byte W07 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x4_mvl/mxv + .byte 61*mus_route122_mvl/mxv .byte W07 - .byte 57*bgm_dooro_x4_mvl/mxv + .byte 57*mus_route122_mvl/mxv .byte W05 - .byte 48*bgm_dooro_x4_mvl/mxv + .byte 48*mus_route122_mvl/mxv .byte W07 - .byte 37*bgm_dooro_x4_mvl/mxv + .byte 37*mus_route122_mvl/mxv .byte W05 - .byte 21*bgm_dooro_x4_mvl/mxv + .byte 21*mus_route122_mvl/mxv .byte W07 - .byte 11*bgm_dooro_x4_mvl/mxv + .byte 11*mus_route122_mvl/mxv .byte W09 .byte MOD , 0 .byte W03 .byte VOICE , 56 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -636,35 +636,35 @@ bgm_dooro_x4_2_001: .byte W06 .byte N72 , Gs4 .byte W24 -bgm_dooro_x4_2_002: +mus_route122_2_002: .byte MOD , 5 .byte W18 - .byte VOL , 73*bgm_dooro_x4_mvl/mxv + .byte VOL , 73*mus_route122_mvl/mxv .byte W03 - .byte 66*bgm_dooro_x4_mvl/mxv + .byte 66*mus_route122_mvl/mxv .byte W03 - .byte 62*bgm_dooro_x4_mvl/mxv + .byte 62*mus_route122_mvl/mxv .byte W02 - .byte 57*bgm_dooro_x4_mvl/mxv + .byte 57*mus_route122_mvl/mxv .byte W03 - .byte 53*bgm_dooro_x4_mvl/mxv + .byte 53*mus_route122_mvl/mxv .byte W03 - .byte 44*bgm_dooro_x4_mvl/mxv + .byte 44*mus_route122_mvl/mxv .byte W04 - .byte 34*bgm_dooro_x4_mvl/mxv + .byte 34*mus_route122_mvl/mxv .byte W02 - .byte 28*bgm_dooro_x4_mvl/mxv + .byte 28*mus_route122_mvl/mxv .byte W03 - .byte 17*bgm_dooro_x4_mvl/mxv + .byte 17*mus_route122_mvl/mxv .byte W03 - .byte 11*bgm_dooro_x4_mvl/mxv + .byte 11*mus_route122_mvl/mxv .byte W04 - .byte 3*bgm_dooro_x4_mvl/mxv + .byte 3*mus_route122_mvl/mxv .byte MOD , 0 .byte W48 .byte PEND .byte W48 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 , En4 , v088 .byte W18 .byte N06 , Bn3 @@ -672,27 +672,27 @@ bgm_dooro_x4_2_002: .byte N72 , Gs4 .byte W24 .byte PATT - .word bgm_dooro_x4_2_002 + .word mus_route122_2_002 .byte W96 .byte W48 .byte VOICE , 58 - .byte VOL , 58*bgm_dooro_x4_mvl/mxv + .byte VOL , 58*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N48 , Ds1 , v127 .byte W03 - .byte VOL , 48*bgm_dooro_x4_mvl/mxv + .byte VOL , 48*mus_route122_mvl/mxv .byte W03 - .byte 54*bgm_dooro_x4_mvl/mxv + .byte 54*mus_route122_mvl/mxv .byte W06 - .byte 60*bgm_dooro_x4_mvl/mxv + .byte 60*mus_route122_mvl/mxv .byte W06 - .byte 66*bgm_dooro_x4_mvl/mxv + .byte 66*mus_route122_mvl/mxv .byte W09 - .byte 70*bgm_dooro_x4_mvl/mxv + .byte 70*mus_route122_mvl/mxv .byte W06 - .byte 75*bgm_dooro_x4_mvl/mxv + .byte 75*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W09 .byte N09 .byte W12 @@ -727,15 +727,15 @@ bgm_dooro_x4_2_002: .byte Gn1 .byte W12 .byte GOTO - .word bgm_dooro_x4_2_B1 + .word mus_route122_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_dooro_x4_3: - .byte KEYSH , bgm_dooro_x4_key+0 +mus_route122_3: + .byte KEYSH , mus_route122_key+0 .byte VOICE , 47 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N06 , Cs2 , v092 .byte W36 .byte N06 @@ -765,26 +765,26 @@ bgm_dooro_x4_3: .byte W12 .byte Gn2 .byte W12 -bgm_dooro_x4_3_B1: +mus_route122_3_B1: .byte VOICE , 56 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte W96 - .byte 65*bgm_dooro_x4_mvl/mxv + .byte 65*mus_route122_mvl/mxv .byte PAN , c_v+16 .byte N32 , Ds4 , v076 .byte W03 - .byte VOL , 60*bgm_dooro_x4_mvl/mxv + .byte VOL , 60*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 58*bgm_dooro_x4_mvl/mxv + .byte 58*mus_route122_mvl/mxv .byte W03 - .byte 65*bgm_dooro_x4_mvl/mxv + .byte 65*mus_route122_mvl/mxv .byte W03 - .byte 71*bgm_dooro_x4_mvl/mxv + .byte 71*mus_route122_mvl/mxv .byte MOD , 5 .byte W03 - .byte VOL , 78*bgm_dooro_x4_mvl/mxv + .byte VOL , 78*mus_route122_mvl/mxv .byte W15 .byte MOD , 0 .byte W03 @@ -799,21 +799,21 @@ bgm_dooro_x4_3_B1: .byte N06 , Gn4 .byte W12 .byte W96 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte N32 , Ds4 , v076 .byte W03 - .byte VOL , 60*bgm_dooro_x4_mvl/mxv + .byte VOL , 60*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 58*bgm_dooro_x4_mvl/mxv + .byte 58*mus_route122_mvl/mxv .byte W03 - .byte 65*bgm_dooro_x4_mvl/mxv + .byte 65*mus_route122_mvl/mxv .byte W03 - .byte 71*bgm_dooro_x4_mvl/mxv + .byte 71*mus_route122_mvl/mxv .byte MOD , 5 .byte W03 - .byte VOL , 78*bgm_dooro_x4_mvl/mxv + .byte VOL , 78*mus_route122_mvl/mxv .byte W15 .byte MOD , 0 .byte W03 @@ -864,29 +864,29 @@ bgm_dooro_x4_3_B1: .byte W18 .byte N12 .byte W12 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N92 .byte W30 - .byte VOL , 75*bgm_dooro_x4_mvl/mxv + .byte VOL , 75*mus_route122_mvl/mxv .byte W11 - .byte 70*bgm_dooro_x4_mvl/mxv + .byte 70*mus_route122_mvl/mxv .byte W07 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W05 - .byte 61*bgm_dooro_x4_mvl/mxv + .byte 61*mus_route122_mvl/mxv .byte W07 - .byte 57*bgm_dooro_x4_mvl/mxv + .byte 57*mus_route122_mvl/mxv .byte W05 - .byte 48*bgm_dooro_x4_mvl/mxv + .byte 48*mus_route122_mvl/mxv .byte W07 - .byte 37*bgm_dooro_x4_mvl/mxv + .byte 37*mus_route122_mvl/mxv .byte W05 - .byte 21*bgm_dooro_x4_mvl/mxv + .byte 21*mus_route122_mvl/mxv .byte W07 - .byte 11*bgm_dooro_x4_mvl/mxv + .byte 11*mus_route122_mvl/mxv .byte W12 .byte VOICE , 47 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 , Ds2 , v104 .byte W36 .byte N12 @@ -897,7 +897,7 @@ bgm_dooro_x4_3_B1: .byte W06 .byte N06 .byte W06 -bgm_dooro_x4_3_000: +mus_route122_3_000: .byte N06 , Ds2 , v127 .byte W06 .byte Ds2 , v104 @@ -911,7 +911,7 @@ bgm_dooro_x4_3_000: .byte Ds2 , v127 .byte W12 .byte PEND -bgm_dooro_x4_3_001: +mus_route122_3_001: .byte N12 , Fs2 , v104 .byte W36 .byte N12 @@ -923,7 +923,7 @@ bgm_dooro_x4_3_001: .byte N06 .byte W06 .byte PEND -bgm_dooro_x4_3_002: +mus_route122_3_002: .byte N06 , Fs2 , v127 .byte W06 .byte Fs2 , v104 @@ -937,7 +937,7 @@ bgm_dooro_x4_3_002: .byte Fs2 , v127 .byte W12 .byte PEND - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 , Ds2 , v104 .byte W36 .byte N12 @@ -949,11 +949,11 @@ bgm_dooro_x4_3_002: .byte N06 .byte W06 .byte PATT - .word bgm_dooro_x4_3_000 + .word mus_route122_3_000 .byte PATT - .word bgm_dooro_x4_3_001 + .word mus_route122_3_001 .byte PATT - .word bgm_dooro_x4_3_002 + .word mus_route122_3_002 .byte N12 , Ds2 , v127 .byte W96 .byte W96 @@ -991,17 +991,17 @@ bgm_dooro_x4_3_002: .byte N12 .byte W12 .byte GOTO - .word bgm_dooro_x4_3_B1 + .word mus_route122_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_dooro_x4_4: - .byte KEYSH , bgm_dooro_x4_key+0 +mus_route122_4: + .byte KEYSH , mus_route122_key+0 .byte VOICE , 2 .byte XCMD , xIECV , 9 .byte xIECL , 8 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Fn4 , v036 .byte W06 @@ -1074,9 +1074,9 @@ bgm_dooro_x4_4: .byte W06 .byte Cs5 , v044 .byte W06 -bgm_dooro_x4_4_B1: +mus_route122_4_B1: .byte VOICE , 2 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Ds5 , v036 .byte W06 @@ -1113,7 +1113,7 @@ bgm_dooro_x4_4_B1: .byte W06 .byte Ds4 .byte W06 -bgm_dooro_x4_4_000: +mus_route122_4_000: .byte PAN , c_v+0 .byte N03 , Ds5 , v036 .byte W06 @@ -1188,7 +1188,7 @@ bgm_dooro_x4_4_000: .byte Ds4 .byte W06 .byte PATT - .word bgm_dooro_x4_4_000 + .word mus_route122_4_000 .byte VOICE , 4 .byte PAN , c_v-48 .byte N12 , Fn4 , v048 @@ -1199,17 +1199,17 @@ bgm_dooro_x4_4_000: .byte W12 .byte N44 , Fn4 .byte W21 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 54*bgm_dooro_x4_mvl/mxv + .byte 54*mus_route122_mvl/mxv .byte W06 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W06 - .byte 15*bgm_dooro_x4_mvl/mxv + .byte 15*mus_route122_mvl/mxv .byte W03 - .byte 6*bgm_dooro_x4_mvl/mxv + .byte 6*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , En4 .byte W18 .byte Ds4 @@ -1218,17 +1218,17 @@ bgm_dooro_x4_4_000: .byte W12 .byte N44 , En4 .byte W21 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 54*bgm_dooro_x4_mvl/mxv + .byte 54*mus_route122_mvl/mxv .byte W06 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W06 - .byte 15*bgm_dooro_x4_mvl/mxv + .byte 15*mus_route122_mvl/mxv .byte W03 - .byte 6*bgm_dooro_x4_mvl/mxv + .byte 6*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , Ds4 .byte W18 .byte Cs4 @@ -1237,19 +1237,19 @@ bgm_dooro_x4_4_000: .byte W12 .byte N44 , Ds4 .byte W21 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 54*bgm_dooro_x4_mvl/mxv + .byte 54*mus_route122_mvl/mxv .byte W06 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W06 - .byte 15*bgm_dooro_x4_mvl/mxv + .byte 15*mus_route122_mvl/mxv .byte W03 - .byte 6*bgm_dooro_x4_mvl/mxv + .byte 6*mus_route122_mvl/mxv .byte W06 .byte VOICE , 4 .byte PAN , c_v+0 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N06 , As2 , v044 .byte W06 .byte Cs3 , v048 @@ -1285,13 +1285,13 @@ bgm_dooro_x4_4_000: .byte PAN , c_v-48 .byte N30 , Gn4 , v052 .byte W12 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 49*bgm_dooro_x4_mvl/mxv + .byte 49*mus_route122_mvl/mxv .byte W06 - .byte 26*bgm_dooro_x4_mvl/mxv + .byte 26*mus_route122_mvl/mxv .byte W24 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , As2 .byte W18 .byte N12 @@ -1300,13 +1300,13 @@ bgm_dooro_x4_4_000: .byte W12 .byte N32 , Cs4 .byte W12 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 49*bgm_dooro_x4_mvl/mxv + .byte 49*mus_route122_mvl/mxv .byte W06 - .byte 26*bgm_dooro_x4_mvl/mxv + .byte 26*mus_route122_mvl/mxv .byte W24 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , As2 .byte W18 .byte N12 @@ -1397,27 +1397,27 @@ bgm_dooro_x4_4_000: .byte W06 .byte N24 , Cn3 , v080 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W30 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W48 .byte N24 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W18 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Gs4 , v052 .byte W06 @@ -1434,27 +1434,27 @@ bgm_dooro_x4_4_000: .byte PAN , c_v-48 .byte N24 , Bn2 , v080 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W30 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W48 .byte N24 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W18 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Gs4 , v052 .byte W06 @@ -1471,15 +1471,15 @@ bgm_dooro_x4_4_000: .byte PAN , c_v-48 .byte N24 , Cn3 , v080 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W18 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Gs3 , v072 .byte W06 @@ -1493,19 +1493,19 @@ bgm_dooro_x4_4_000: .byte W06 .byte N03 .byte W06 - .byte VOL , 48*bgm_dooro_x4_mvl/mxv + .byte VOL , 48*mus_route122_mvl/mxv .byte PAN , c_v-48 .byte N48 , Ds3 , v084 .byte W06 - .byte VOL , 54*bgm_dooro_x4_mvl/mxv + .byte VOL , 54*mus_route122_mvl/mxv .byte W06 - .byte 58*bgm_dooro_x4_mvl/mxv + .byte 58*mus_route122_mvl/mxv .byte W06 - .byte 66*bgm_dooro_x4_mvl/mxv + .byte 66*mus_route122_mvl/mxv .byte W06 - .byte 74*bgm_dooro_x4_mvl/mxv + .byte 74*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W18 .byte PAN , c_v+0 .byte N06 , Cn4 , v072 @@ -1520,15 +1520,15 @@ bgm_dooro_x4_4_000: .byte MOD , 0 .byte N24 , Bn2 , v080 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W18 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Gs3 , v072 .byte W06 @@ -1542,19 +1542,19 @@ bgm_dooro_x4_4_000: .byte W06 .byte N03 .byte W06 - .byte VOL , 48*bgm_dooro_x4_mvl/mxv + .byte VOL , 48*mus_route122_mvl/mxv .byte PAN , c_v-48 .byte N48 , En3 , v084 .byte W06 - .byte VOL , 54*bgm_dooro_x4_mvl/mxv + .byte VOL , 54*mus_route122_mvl/mxv .byte W06 - .byte 58*bgm_dooro_x4_mvl/mxv + .byte 58*mus_route122_mvl/mxv .byte W06 - .byte 66*bgm_dooro_x4_mvl/mxv + .byte 66*mus_route122_mvl/mxv .byte W06 - .byte 74*bgm_dooro_x4_mvl/mxv + .byte 74*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W18 .byte PAN , c_v+0 .byte N06 , Gs3 , v072 @@ -1568,38 +1568,38 @@ bgm_dooro_x4_4_000: .byte 0 .byte N48 , Ds3 , v052 .byte W24 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W06 - .byte 60*bgm_dooro_x4_mvl/mxv + .byte 60*mus_route122_mvl/mxv .byte W06 - .byte 42*bgm_dooro_x4_mvl/mxv + .byte 42*mus_route122_mvl/mxv .byte W03 - .byte 29*bgm_dooro_x4_mvl/mxv + .byte 29*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W03 - .byte 10*bgm_dooro_x4_mvl/mxv + .byte 10*mus_route122_mvl/mxv .byte W03 - .byte 4*bgm_dooro_x4_mvl/mxv + .byte 4*mus_route122_mvl/mxv .byte W48 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N48 , Cn3 .byte W24 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W06 - .byte 60*bgm_dooro_x4_mvl/mxv + .byte 60*mus_route122_mvl/mxv .byte W06 - .byte 42*bgm_dooro_x4_mvl/mxv + .byte 42*mus_route122_mvl/mxv .byte W03 - .byte 29*bgm_dooro_x4_mvl/mxv + .byte 29*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W03 - .byte 10*bgm_dooro_x4_mvl/mxv + .byte 10*mus_route122_mvl/mxv .byte W03 - .byte 4*bgm_dooro_x4_mvl/mxv + .byte 4*mus_route122_mvl/mxv .byte W12 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N09 , Gs2 , v064 .byte W12 .byte Ds3 @@ -1608,56 +1608,56 @@ bgm_dooro_x4_4_000: .byte W12 .byte N92 .byte W09 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W09 - .byte 70*bgm_dooro_x4_mvl/mxv + .byte 70*mus_route122_mvl/mxv .byte W09 - .byte 68*bgm_dooro_x4_mvl/mxv + .byte 68*mus_route122_mvl/mxv .byte W06 - .byte 62*bgm_dooro_x4_mvl/mxv + .byte 62*mus_route122_mvl/mxv .byte W24 - .byte 65*bgm_dooro_x4_mvl/mxv + .byte 65*mus_route122_mvl/mxv .byte W06 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W06 - .byte 71*bgm_dooro_x4_mvl/mxv + .byte 71*mus_route122_mvl/mxv .byte W06 - .byte 76*bgm_dooro_x4_mvl/mxv + .byte 76*mus_route122_mvl/mxv .byte W06 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W15 .byte N90 , Gn3 .byte W44 .byte W01 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte W09 - .byte 69*bgm_dooro_x4_mvl/mxv + .byte 69*mus_route122_mvl/mxv .byte W09 - .byte 64*bgm_dooro_x4_mvl/mxv + .byte 64*mus_route122_mvl/mxv .byte W06 - .byte 54*bgm_dooro_x4_mvl/mxv + .byte 54*mus_route122_mvl/mxv .byte W06 - .byte 45*bgm_dooro_x4_mvl/mxv + .byte 45*mus_route122_mvl/mxv .byte W06 - .byte 36*bgm_dooro_x4_mvl/mxv + .byte 36*mus_route122_mvl/mxv .byte W06 - .byte 24*bgm_dooro_x4_mvl/mxv + .byte 24*mus_route122_mvl/mxv .byte W03 - .byte 9*bgm_dooro_x4_mvl/mxv + .byte 9*mus_route122_mvl/mxv .byte W06 .byte GOTO - .word bgm_dooro_x4_4_B1 + .word mus_route122_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_dooro_x4_5: - .byte KEYSH , bgm_dooro_x4_key+0 +mus_route122_5: + .byte KEYSH , mus_route122_key+0 .byte VOICE , 5 .byte XCMD , xIECV , 9 .byte xIECL , 8 .byte PAN , c_v+0 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N03 , Gs2 , v060 .byte W36 .byte N03 @@ -1686,8 +1686,8 @@ bgm_dooro_x4_5: .byte W12 .byte Cs3 .byte W12 -bgm_dooro_x4_5_B1: - .byte VOL , 80*bgm_dooro_x4_mvl/mxv +mus_route122_5_B1: + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W24 @@ -1695,7 +1695,7 @@ bgm_dooro_x4_5_B1: .byte W48 .byte N06 .byte W24 -bgm_dooro_x4_5_000: +mus_route122_5_000: .byte W24 .byte N06 , Gs3 , v060 .byte W48 @@ -1708,7 +1708,7 @@ bgm_dooro_x4_5_000: .byte N06 .byte W24 .byte PATT - .word bgm_dooro_x4_5_000 + .word mus_route122_5_000 .byte VOICE , 82 .byte PAN , c_v+48 .byte N12 , Cs4 , v048 @@ -1722,22 +1722,22 @@ bgm_dooro_x4_5_000: .byte VOICE , 86 .byte N12 .byte W09 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W03 .byte N12 .byte W03 - .byte VOL , 54*bgm_dooro_x4_mvl/mxv + .byte VOL , 54*mus_route122_mvl/mxv .byte W06 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 .byte N09 .byte W03 - .byte VOL , 15*bgm_dooro_x4_mvl/mxv + .byte VOL , 15*mus_route122_mvl/mxv .byte W03 - .byte 6*bgm_dooro_x4_mvl/mxv + .byte 6*mus_route122_mvl/mxv .byte W06 .byte VOICE , 82 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 .byte W18 .byte Cn4 @@ -1749,22 +1749,22 @@ bgm_dooro_x4_5_000: .byte VOICE , 86 .byte N12 .byte W09 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W03 .byte N12 .byte W03 - .byte VOL , 54*bgm_dooro_x4_mvl/mxv + .byte VOL , 54*mus_route122_mvl/mxv .byte W06 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 .byte N09 .byte W03 - .byte VOL , 15*bgm_dooro_x4_mvl/mxv + .byte VOL , 15*mus_route122_mvl/mxv .byte W03 - .byte 6*bgm_dooro_x4_mvl/mxv + .byte 6*mus_route122_mvl/mxv .byte W06 .byte VOICE , 82 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 , Cn4 .byte W18 .byte As3 @@ -1776,23 +1776,23 @@ bgm_dooro_x4_5_000: .byte VOICE , 86 .byte N12 .byte W09 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W03 .byte N12 .byte W03 - .byte VOL , 54*bgm_dooro_x4_mvl/mxv + .byte VOL , 54*mus_route122_mvl/mxv .byte W06 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 .byte N09 .byte W03 - .byte VOL , 15*bgm_dooro_x4_mvl/mxv + .byte VOL , 15*mus_route122_mvl/mxv .byte W03 - .byte 6*bgm_dooro_x4_mvl/mxv + .byte 6*mus_route122_mvl/mxv .byte W06 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte W06 .byte N06 , As2 , v028 .byte W06 @@ -1827,13 +1827,13 @@ bgm_dooro_x4_5_000: .byte PAN , c_v+48 .byte N30 , Ds4 , v052 .byte W12 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 49*bgm_dooro_x4_mvl/mxv + .byte 49*mus_route122_mvl/mxv .byte W06 - .byte 26*bgm_dooro_x4_mvl/mxv + .byte 26*mus_route122_mvl/mxv .byte W24 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , Gn2 .byte W18 .byte N12 @@ -1842,13 +1842,13 @@ bgm_dooro_x4_5_000: .byte W12 .byte N32 , As3 , v040 .byte W12 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 49*bgm_dooro_x4_mvl/mxv + .byte 49*mus_route122_mvl/mxv .byte W06 - .byte 26*bgm_dooro_x4_mvl/mxv + .byte 26*mus_route122_mvl/mxv .byte W24 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte N12 , Fs2 , v052 .byte W18 .byte N12 @@ -1913,32 +1913,32 @@ bgm_dooro_x4_5_000: .byte W06 .byte Cs5 , v008 .byte W24 -bgm_dooro_x4_5_001: +mus_route122_5_001: .byte PAN , c_v+48 .byte N24 , Gs2 , v080 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W30 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte W48 .byte PEND .byte N24 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W18 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Ds4 , v052 .byte W06 @@ -1953,18 +1953,18 @@ bgm_dooro_x4_5_001: .byte N03 .byte W06 .byte PATT - .word bgm_dooro_x4_5_001 + .word mus_route122_5_001 .byte N24 , Gs2 , v080 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W18 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , En4 , v052 .byte W06 @@ -1981,15 +1981,15 @@ bgm_dooro_x4_5_001: .byte PAN , c_v+48 .byte N24 , Gs2 , v080 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W18 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Ds3 , v072 .byte W06 @@ -2003,22 +2003,22 @@ bgm_dooro_x4_5_001: .byte W06 .byte N03 .byte W06 - .byte VOL , 48*bgm_dooro_x4_mvl/mxv + .byte VOL , 48*mus_route122_mvl/mxv .byte PAN , c_v+48 .byte N12 , Cn3 , v084 .byte W06 - .byte VOL , 54*bgm_dooro_x4_mvl/mxv + .byte VOL , 54*mus_route122_mvl/mxv .byte W06 .byte VOICE , 6 - .byte VOL , 58*bgm_dooro_x4_mvl/mxv + .byte VOL , 58*mus_route122_mvl/mxv .byte N12 .byte W06 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 74*bgm_dooro_x4_mvl/mxv + .byte 74*mus_route122_mvl/mxv .byte N12 .byte W06 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte W06 .byte N12 .byte W12 @@ -2036,15 +2036,15 @@ bgm_dooro_x4_5_001: .byte MOD , 0 .byte N24 , Gs2 , v080 .byte W09 - .byte VOL , 65*bgm_dooro_x4_mvl/mxv + .byte VOL , 65*mus_route122_mvl/mxv .byte W03 - .byte 51*bgm_dooro_x4_mvl/mxv + .byte 51*mus_route122_mvl/mxv .byte W03 - .byte 35*bgm_dooro_x4_mvl/mxv + .byte 35*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W18 - .byte 80*bgm_dooro_x4_mvl/mxv + .byte 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , En3 , v072 .byte W06 @@ -2058,22 +2058,22 @@ bgm_dooro_x4_5_001: .byte W06 .byte N03 .byte W06 - .byte VOL , 48*bgm_dooro_x4_mvl/mxv + .byte VOL , 48*mus_route122_mvl/mxv .byte PAN , c_v+48 .byte N12 , Bn2 , v084 .byte W06 - .byte VOL , 54*bgm_dooro_x4_mvl/mxv + .byte VOL , 54*mus_route122_mvl/mxv .byte W06 .byte VOICE , 6 - .byte VOL , 58*bgm_dooro_x4_mvl/mxv + .byte VOL , 58*mus_route122_mvl/mxv .byte N12 .byte W06 - .byte VOL , 66*bgm_dooro_x4_mvl/mxv + .byte VOL , 66*mus_route122_mvl/mxv .byte W06 - .byte 74*bgm_dooro_x4_mvl/mxv + .byte 74*mus_route122_mvl/mxv .byte N12 .byte W06 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte W06 .byte N12 .byte W12 @@ -2093,47 +2093,47 @@ bgm_dooro_x4_5_001: .byte VOICE , 6 .byte N12 .byte W12 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte N12 .byte W06 - .byte VOL , 60*bgm_dooro_x4_mvl/mxv + .byte VOL , 60*mus_route122_mvl/mxv .byte W06 - .byte 42*bgm_dooro_x4_mvl/mxv + .byte 42*mus_route122_mvl/mxv .byte N12 .byte W03 - .byte VOL , 29*bgm_dooro_x4_mvl/mxv + .byte VOL , 29*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W03 - .byte 10*bgm_dooro_x4_mvl/mxv + .byte 10*mus_route122_mvl/mxv .byte W03 - .byte 4*bgm_dooro_x4_mvl/mxv + .byte 4*mus_route122_mvl/mxv .byte W48 .byte VOICE , 5 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 , Gs2 .byte W12 .byte VOICE , 6 .byte N12 .byte W12 - .byte VOL , 74*bgm_dooro_x4_mvl/mxv + .byte VOL , 74*mus_route122_mvl/mxv .byte N12 .byte W06 - .byte VOL , 60*bgm_dooro_x4_mvl/mxv + .byte VOL , 60*mus_route122_mvl/mxv .byte W06 - .byte 42*bgm_dooro_x4_mvl/mxv + .byte 42*mus_route122_mvl/mxv .byte N12 .byte W03 - .byte VOL , 29*bgm_dooro_x4_mvl/mxv + .byte VOL , 29*mus_route122_mvl/mxv .byte W03 - .byte 18*bgm_dooro_x4_mvl/mxv + .byte 18*mus_route122_mvl/mxv .byte W03 - .byte 10*bgm_dooro_x4_mvl/mxv + .byte 10*mus_route122_mvl/mxv .byte W03 - .byte 4*bgm_dooro_x4_mvl/mxv + .byte 4*mus_route122_mvl/mxv .byte W48 .byte VOICE , 5 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N03 , Gs2 , v072 .byte W12 .byte N03 @@ -2167,15 +2167,15 @@ bgm_dooro_x4_5_001: .byte As2 .byte W12 .byte GOTO - .word bgm_dooro_x4_5_B1 + .word mus_route122_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_dooro_x4_6: - .byte KEYSH , bgm_dooro_x4_key+0 +mus_route122_6: + .byte KEYSH , mus_route122_key+0 .byte VOICE , 85 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N03 , Cs3 , v064 .byte W36 .byte VOICE , 84 @@ -2208,9 +2208,9 @@ bgm_dooro_x4_6: .byte W12 .byte Gn3 .byte W12 -bgm_dooro_x4_6_B1: +mus_route122_6_B1: .byte VOICE , 81 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N12 , Gs2 , v064 .byte W18 .byte N06 , Ds2 @@ -2337,7 +2337,7 @@ bgm_dooro_x4_6_B1: .byte W12 .byte Cs1 , v032 .byte W36 -bgm_dooro_x4_6_000: +mus_route122_6_000: .byte N12 , Gs1 , v080 .byte W36 .byte N09 @@ -2348,8 +2348,8 @@ bgm_dooro_x4_6_000: .byte W12 .byte PEND .byte PATT - .word bgm_dooro_x4_6_000 -bgm_dooro_x4_6_001: + .word mus_route122_6_000 +mus_route122_6_001: .byte N12 , Bn1 , v080 .byte W36 .byte N09 @@ -2360,15 +2360,15 @@ bgm_dooro_x4_6_001: .byte W12 .byte PEND .byte PATT - .word bgm_dooro_x4_6_001 + .word mus_route122_6_001 .byte PATT - .word bgm_dooro_x4_6_000 + .word mus_route122_6_000 .byte PATT - .word bgm_dooro_x4_6_000 + .word mus_route122_6_000 .byte PATT - .word bgm_dooro_x4_6_001 + .word mus_route122_6_001 .byte PATT - .word bgm_dooro_x4_6_001 + .word mus_route122_6_001 .byte N48 , Ds1 , v080 .byte W48 .byte N12 , Ds1 , v032 @@ -2412,15 +2412,15 @@ bgm_dooro_x4_6_001: .byte Cs3 .byte W12 .byte GOTO - .word bgm_dooro_x4_6_B1 + .word mus_route122_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_dooro_x4_7: - .byte KEYSH , bgm_dooro_x4_key+0 +mus_route122_7: + .byte KEYSH , mus_route122_key+0 .byte VOICE , 56 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte N03 , Cs3 , v088 .byte W36 @@ -2450,16 +2450,16 @@ bgm_dooro_x4_7: .byte W12 .byte Gn3 .byte W12 -bgm_dooro_x4_7_B1: +mus_route122_7_B1: .byte VOICE , 56 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte PAN , c_v+0 .byte W24 .byte N06 , Cn4 , v088 .byte W48 .byte N06 .byte W24 -bgm_dooro_x4_7_000: +mus_route122_7_000: .byte W24 .byte N06 , As3 , v088 .byte W48 @@ -2472,7 +2472,7 @@ bgm_dooro_x4_7_000: .byte N06 .byte W24 .byte PATT - .word bgm_dooro_x4_7_000 + .word mus_route122_7_000 .byte W96 .byte W96 .byte W96 @@ -2494,15 +2494,15 @@ bgm_dooro_x4_7_000: .byte W96 .byte W96 .byte GOTO - .word bgm_dooro_x4_7_B1 + .word mus_route122_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_dooro_x4_8: - .byte KEYSH , bgm_dooro_x4_key+0 +mus_route122_8: + .byte KEYSH , mus_route122_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_dooro_x4_mvl/mxv + .byte VOL , 80*mus_route122_mvl/mxv .byte N06 , En1 , v104 .byte W36 .byte N06 @@ -2515,7 +2515,7 @@ bgm_dooro_x4_8: .byte W24 .byte N06 .byte W12 -bgm_dooro_x4_8_000: +mus_route122_8_000: .byte N06 , En1 , v104 .byte W12 .byte N06 @@ -2545,8 +2545,8 @@ bgm_dooro_x4_8_000: .byte En1 , v108 .byte W03 .byte PEND -bgm_dooro_x4_8_B1: -bgm_dooro_x4_8_001: +mus_route122_8_B1: +mus_route122_8_001: .byte N06 , En1 , v104 .byte N48 , Bn2 , v084 .byte W36 @@ -2578,7 +2578,7 @@ bgm_dooro_x4_8_001: .byte En1 , v084 .byte W06 .byte PATT - .word bgm_dooro_x4_8_001 + .word mus_route122_8_001 .byte N06 , En1 , v104 .byte W12 .byte N06 @@ -2622,7 +2622,7 @@ bgm_dooro_x4_8_001: .byte W06 .byte En1 , v064 .byte W06 -bgm_dooro_x4_8_002: +mus_route122_8_002: .byte N06 , En1 , v104 .byte W18 .byte En1 , v076 @@ -2679,8 +2679,8 @@ bgm_dooro_x4_8_002: .byte En1 , v064 .byte W06 .byte PATT - .word bgm_dooro_x4_8_002 -bgm_dooro_x4_8_003: + .word mus_route122_8_002 +mus_route122_8_003: .byte N06 , En1 , v104 .byte N48 , Bn2 , v084 .byte W48 @@ -2694,7 +2694,7 @@ bgm_dooro_x4_8_003: .byte W06 .byte PEND .byte PATT - .word bgm_dooro_x4_8_003 + .word mus_route122_8_003 .byte N06 , En1 , v104 .byte N48 , Bn2 , v084 .byte W18 @@ -2777,8 +2777,8 @@ bgm_dooro_x4_8_003: .byte En1 , v104 .byte W03 .byte PATT - .word bgm_dooro_x4_8_001 -bgm_dooro_x4_8_004: + .word mus_route122_8_001 +mus_route122_8_004: .byte N06 , En1 , v104 .byte W36 .byte N06 @@ -2795,8 +2795,8 @@ bgm_dooro_x4_8_004: .byte W06 .byte PEND .byte PATT - .word bgm_dooro_x4_8_001 -bgm_dooro_x4_8_005: + .word mus_route122_8_001 +mus_route122_8_005: .byte N06 , En1 , v104 .byte W36 .byte N06 @@ -2817,13 +2817,13 @@ bgm_dooro_x4_8_005: .byte W06 .byte PEND .byte PATT - .word bgm_dooro_x4_8_001 + .word mus_route122_8_001 .byte PATT - .word bgm_dooro_x4_8_004 + .word mus_route122_8_004 .byte PATT - .word bgm_dooro_x4_8_001 + .word mus_route122_8_001 .byte PATT - .word bgm_dooro_x4_8_005 + .word mus_route122_8_005 .byte N06 , En1 , v104 .byte N48 , Bn2 , v096 .byte W96 @@ -2877,29 +2877,29 @@ bgm_dooro_x4_8_005: .byte En1 , v072 .byte W06 .byte PATT - .word bgm_dooro_x4_8_000 + .word mus_route122_8_000 .byte GOTO - .word bgm_dooro_x4_8_B1 + .word mus_route122_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_dooro_x4: +mus_route122: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_dooro_x4_pri @ Priority - .byte bgm_dooro_x4_rev @ Reverb. + .byte mus_route122_pri @ Priority + .byte mus_route122_rev @ Reverb. - .word bgm_dooro_x4_grp + .word mus_route122_grp - .word bgm_dooro_x4_1 - .word bgm_dooro_x4_2 - .word bgm_dooro_x4_3 - .word bgm_dooro_x4_4 - .word bgm_dooro_x4_5 - .word bgm_dooro_x4_6 - .word bgm_dooro_x4_7 - .word bgm_dooro_x4_8 + .word mus_route122_1 + .word mus_route122_2 + .word mus_route122_3 + .word mus_route122_4 + .word mus_route122_5 + .word mus_route122_6 + .word mus_route122_7 + .word mus_route122_8 .end diff --git a/sound/songs/bgm_gotown.s b/sound/songs/mus_rustboro.s index c06102a91..8155aca7b 100644 --- a/sound/songs/bgm_gotown.s +++ b/sound/songs/mus_rustboro.s @@ -1,32 +1,32 @@ .include "MPlayDef.s" - .equ bgm_gotown_grp, voicegroup042 - .equ bgm_gotown_pri, 0 - .equ bgm_gotown_rev, reverb_set+50 - .equ bgm_gotown_mvl, 127 - .equ bgm_gotown_key, 0 - .equ bgm_gotown_tbs, 1 - .equ bgm_gotown_exg, 0 - .equ bgm_gotown_cmp, 1 + .equ mus_rustboro_grp, voicegroup042 + .equ mus_rustboro_pri, 0 + .equ mus_rustboro_rev, reverb_set+50 + .equ mus_rustboro_mvl, 127 + .equ mus_rustboro_key, 0 + .equ mus_rustboro_tbs, 1 + .equ mus_rustboro_exg, 0 + .equ mus_rustboro_cmp, 1 .section .rodata - .global bgm_gotown + .global mus_rustboro .align 2 @********************** Track 1 **********************@ -bgm_gotown_1: - .byte KEYSH , bgm_gotown_key+0 - .byte TEMPO , 128*bgm_gotown_tbs/2 +mus_rustboro_1: + .byte KEYSH , mus_rustboro_key+0 + .byte TEMPO , 128*mus_rustboro_tbs/2 .byte VOICE , 6 .byte PAN , c_v-64 .byte XCMD , xIECV , 12 .byte xIECL , 8 .byte LFOS , 44 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte W12 .byte W72 -bgm_gotown_1_B1: +mus_rustboro_1_B1: .byte VOICE , 6 .byte W18 .byte N03 , As3 , v068 @@ -45,7 +45,7 @@ bgm_gotown_1_B1: .byte W12 .byte N06 , An3 , v112 .byte W12 -bgm_gotown_1_000: +mus_rustboro_1_000: .byte N01 , An3 , v080 .byte W12 .byte N06 , An3 , v112 @@ -63,7 +63,7 @@ bgm_gotown_1_000: .byte N01 , As3 , v080 .byte W12 .byte PEND -bgm_gotown_1_001: +mus_rustboro_1_001: .byte W12 .byte N01 , As3 , v080 .byte W03 @@ -86,7 +86,7 @@ bgm_gotown_1_001: .byte N06 , Bn3 , v112 .byte W12 .byte PEND -bgm_gotown_1_002: +mus_rustboro_1_002: .byte N01 , Bn3 , v080 .byte W12 .byte N06 , Bn3 , v112 @@ -104,7 +104,7 @@ bgm_gotown_1_002: .byte N01 , Cn4 , v080 .byte W12 .byte PEND -bgm_gotown_1_003: +mus_rustboro_1_003: .byte W12 .byte N01 , Cn4 , v080 .byte W03 @@ -144,7 +144,7 @@ bgm_gotown_1_003: .byte N01 , Cn4 , v080 .byte W12 .byte VOICE , 3 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte N36 , Fs3 , v112 .byte W15 .byte MOD , 9 @@ -169,7 +169,7 @@ bgm_gotown_1_003: .byte W09 .byte 2 .byte W03 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte W03 .byte VOICE , 6 .byte W03 @@ -190,13 +190,13 @@ bgm_gotown_1_003: .byte N06 , An3 , v112 .byte W12 .byte PATT - .word bgm_gotown_1_000 + .word mus_rustboro_1_000 .byte PATT - .word bgm_gotown_1_001 + .word mus_rustboro_1_001 .byte PATT - .word bgm_gotown_1_002 + .word mus_rustboro_1_002 .byte PATT - .word bgm_gotown_1_003 + .word mus_rustboro_1_003 .byte N01 , Bn3 , v080 .byte W12 .byte N06 , Bn3 , v112 @@ -214,7 +214,7 @@ bgm_gotown_1_003: .byte N01 , Cn4 , v080 .byte W12 .byte VOICE , 3 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte N36 , Fn3 , v112 .byte W12 .byte MOD , 9 @@ -240,7 +240,7 @@ bgm_gotown_1_003: .byte 1 .byte W24 .byte VOICE , 6 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte W24 .byte N06 , Dn4 .byte W12 @@ -270,7 +270,7 @@ bgm_gotown_1_003: .byte W12 .byte N01 , Ds4 , v080 .byte W12 -bgm_gotown_1_004: +mus_rustboro_1_004: .byte N06 , Fn4 , v112 .byte W12 .byte N01 , Fn4 , v080 @@ -332,7 +332,7 @@ bgm_gotown_1_004: .byte W12 .byte N06 , Ds4 , v112 .byte W12 -bgm_gotown_1_005: +mus_rustboro_1_005: .byte N01 , Ds4 , v080 .byte W12 .byte N06 , Ds4 , v112 @@ -353,7 +353,7 @@ bgm_gotown_1_005: .byte W06 .byte PEND .byte VOICE , 3 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte N06 , Cn4 .byte W12 .byte As3 @@ -396,7 +396,7 @@ bgm_gotown_1_005: .byte W03 .byte VOICE , 6 .byte MOD , 1 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte W24 .byte N06 , Dn4 , v112 .byte W12 @@ -429,9 +429,9 @@ bgm_gotown_1_005: .byte Ds4 .byte W12 .byte PATT - .word bgm_gotown_1_004 + .word mus_rustboro_1_004 .byte VOICE , 3 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte N24 , Cn4 , v112 .byte W12 .byte MOD , 8 @@ -462,7 +462,7 @@ bgm_gotown_1_005: .byte W03 .byte VOICE , 6 .byte MOD , 1 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte W24 .byte N06 , Ds4 , v112 .byte W12 @@ -477,7 +477,7 @@ bgm_gotown_1_005: .byte N06 , Ds4 , v112 .byte W12 .byte PATT - .word bgm_gotown_1_005 + .word mus_rustboro_1_005 .byte N06 , Cn4 , v112 .byte W12 .byte As3 @@ -503,17 +503,17 @@ bgm_gotown_1_005: .byte N06 .byte W60 .byte GOTO - .word bgm_gotown_1_B1 + .word mus_rustboro_1_B1 .byte W96 .byte FINE @********************** Track 2 **********************@ -bgm_gotown_2: - .byte KEYSH , bgm_gotown_key+0 +mus_rustboro_2: + .byte KEYSH , mus_rustboro_key+0 .byte VOICE , 73 .byte LFOS , 44 - .byte VOL , 82*bgm_gotown_mvl/mxv + .byte VOL , 82*mus_rustboro_mvl/mxv .byte PAN , c_v+0 .byte N12 , An3 , v112 .byte W12 @@ -533,26 +533,26 @@ bgm_gotown_2: .byte W12 .byte An3 .byte W12 -bgm_gotown_2_B1: - .byte VOL , 46*bgm_gotown_mvl/mxv +mus_rustboro_2_B1: + .byte VOL , 46*mus_rustboro_mvl/mxv .byte N48 , Fn3 , v112 .byte W04 - .byte VOL , 49*bgm_gotown_mvl/mxv + .byte VOL , 49*mus_rustboro_mvl/mxv .byte W04 - .byte 52*bgm_gotown_mvl/mxv + .byte 52*mus_rustboro_mvl/mxv .byte W04 - .byte 54*bgm_gotown_mvl/mxv + .byte 54*mus_rustboro_mvl/mxv .byte W04 - .byte 61*bgm_gotown_mvl/mxv + .byte 61*mus_rustboro_mvl/mxv .byte W04 - .byte 67*bgm_gotown_mvl/mxv + .byte 67*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 74*bgm_gotown_mvl/mxv + .byte VOL , 74*mus_rustboro_mvl/mxv .byte W04 - .byte 81*bgm_gotown_mvl/mxv + .byte 81*mus_rustboro_mvl/mxv .byte W04 - .byte 85*bgm_gotown_mvl/mxv + .byte 85*mus_rustboro_mvl/mxv .byte W16 .byte MOD , 1 .byte W12 @@ -577,25 +577,25 @@ bgm_gotown_2_B1: .byte W12 .byte Cs4 .byte W12 - .byte VOL , 46*bgm_gotown_mvl/mxv + .byte VOL , 46*mus_rustboro_mvl/mxv .byte N48 , Dn4 .byte W04 - .byte VOL , 49*bgm_gotown_mvl/mxv + .byte VOL , 49*mus_rustboro_mvl/mxv .byte W04 - .byte 52*bgm_gotown_mvl/mxv + .byte 52*mus_rustboro_mvl/mxv .byte W04 - .byte 54*bgm_gotown_mvl/mxv + .byte 54*mus_rustboro_mvl/mxv .byte W04 - .byte 61*bgm_gotown_mvl/mxv + .byte 61*mus_rustboro_mvl/mxv .byte W04 - .byte 67*bgm_gotown_mvl/mxv + .byte 67*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 74*bgm_gotown_mvl/mxv + .byte VOL , 74*mus_rustboro_mvl/mxv .byte W04 - .byte 81*bgm_gotown_mvl/mxv + .byte 81*mus_rustboro_mvl/mxv .byte W04 - .byte 85*bgm_gotown_mvl/mxv + .byte 85*mus_rustboro_mvl/mxv .byte W16 .byte MOD , 1 .byte W12 @@ -603,23 +603,23 @@ bgm_gotown_2_B1: .byte W24 .byte Dn4 .byte W12 - .byte VOL , 44*bgm_gotown_mvl/mxv + .byte VOL , 44*mus_rustboro_mvl/mxv .byte N42 , Gn3 .byte W04 - .byte VOL , 50*bgm_gotown_mvl/mxv + .byte VOL , 50*mus_rustboro_mvl/mxv .byte W04 - .byte 54*bgm_gotown_mvl/mxv + .byte 54*mus_rustboro_mvl/mxv .byte W04 - .byte 58*bgm_gotown_mvl/mxv + .byte 58*mus_rustboro_mvl/mxv .byte W04 - .byte 70*bgm_gotown_mvl/mxv + .byte 70*mus_rustboro_mvl/mxv .byte W04 - .byte 80*bgm_gotown_mvl/mxv + .byte 80*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 84*bgm_gotown_mvl/mxv + .byte VOL , 84*mus_rustboro_mvl/mxv .byte W04 - .byte 85*bgm_gotown_mvl/mxv + .byte 85*mus_rustboro_mvl/mxv .byte W20 .byte MOD , 1 .byte W12 @@ -712,7 +712,7 @@ bgm_gotown_2_B1: .byte W12 .byte VOICE , 48 .byte PAN , c_v+28 - .byte VOL , 40*bgm_gotown_mvl/mxv + .byte VOL , 40*mus_rustboro_mvl/mxv .byte N21 , Cn4 .byte W21 .byte N03 , Cs4 @@ -785,12 +785,12 @@ bgm_gotown_2_B1: .byte PAN , c_v+0 .byte N24 , Cs4 .byte W24 - .byte VOL , 36*bgm_gotown_mvl/mxv + .byte VOL , 36*mus_rustboro_mvl/mxv .byte N06 , Ds4 .byte W12 .byte N36 , Cn4 .byte W36 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte N06 , As3 , v056 .byte W06 .byte Ds4 @@ -799,7 +799,7 @@ bgm_gotown_2_B1: .byte W06 .byte As4 .byte W06 - .byte VOL , 47*bgm_gotown_mvl/mxv + .byte VOL , 47*mus_rustboro_mvl/mxv .byte N04 , Cn5 , v068 .byte W04 .byte As4 @@ -810,7 +810,7 @@ bgm_gotown_2_B1: .byte W05 .byte Cn5 .byte W05 - .byte VOL , 54*bgm_gotown_mvl/mxv + .byte VOL , 54*mus_rustboro_mvl/mxv .byte N04 , Dn5 , v076 .byte W04 .byte Cn5 @@ -821,7 +821,7 @@ bgm_gotown_2_B1: .byte W05 .byte Dn5 .byte W05 - .byte VOL , 60*bgm_gotown_mvl/mxv + .byte VOL , 60*mus_rustboro_mvl/mxv .byte N04 , Ds5 , v092 .byte W04 .byte Dn5 @@ -832,7 +832,7 @@ bgm_gotown_2_B1: .byte W05 .byte Ds5 .byte W05 - .byte VOL , 64*bgm_gotown_mvl/mxv + .byte VOL , 64*mus_rustboro_mvl/mxv .byte N04 , Fn5 , v100 .byte W04 .byte Ds5 @@ -843,7 +843,7 @@ bgm_gotown_2_B1: .byte W05 .byte Fn5 .byte W05 - .byte VOL , 69*bgm_gotown_mvl/mxv + .byte VOL , 69*mus_rustboro_mvl/mxv .byte N12 , Gn5 , v112 .byte W12 .byte N03 , Fn5 , v064 @@ -892,34 +892,34 @@ bgm_gotown_2_B1: .byte W12 .byte N48 , Fn5 .byte W15 - .byte VOL , 60*bgm_gotown_mvl/mxv + .byte VOL , 60*mus_rustboro_mvl/mxv .byte W02 - .byte 56*bgm_gotown_mvl/mxv + .byte 56*mus_rustboro_mvl/mxv .byte W03 - .byte 52*bgm_gotown_mvl/mxv + .byte 52*mus_rustboro_mvl/mxv .byte W04 - .byte 51*bgm_gotown_mvl/mxv + .byte 51*mus_rustboro_mvl/mxv .byte W02 - .byte 47*bgm_gotown_mvl/mxv + .byte 47*mus_rustboro_mvl/mxv .byte W03 - .byte 45*bgm_gotown_mvl/mxv + .byte 45*mus_rustboro_mvl/mxv .byte W03 - .byte 42*bgm_gotown_mvl/mxv + .byte 42*mus_rustboro_mvl/mxv .byte W04 - .byte 41*bgm_gotown_mvl/mxv + .byte 41*mus_rustboro_mvl/mxv .byte W02 - .byte 37*bgm_gotown_mvl/mxv + .byte 37*mus_rustboro_mvl/mxv .byte W03 - .byte 34*bgm_gotown_mvl/mxv + .byte 34*mus_rustboro_mvl/mxv .byte W03 - .byte 30*bgm_gotown_mvl/mxv + .byte 30*mus_rustboro_mvl/mxv .byte W04 - .byte 29*bgm_gotown_mvl/mxv + .byte 29*mus_rustboro_mvl/mxv .byte N06 , Fn5 , v032 .byte W02 - .byte VOL , 26*bgm_gotown_mvl/mxv + .byte VOL , 26*mus_rustboro_mvl/mxv .byte W04 - .byte 68*bgm_gotown_mvl/mxv + .byte 68*mus_rustboro_mvl/mxv .byte W06 .byte N06 , Ds5 , v112 .byte W06 @@ -935,26 +935,26 @@ bgm_gotown_2_B1: .byte W06 .byte N24 , Gn5 , v112 .byte W12 - .byte VOL , 60*bgm_gotown_mvl/mxv + .byte VOL , 60*mus_rustboro_mvl/mxv .byte W02 - .byte 55*bgm_gotown_mvl/mxv + .byte 55*mus_rustboro_mvl/mxv .byte W03 - .byte 50*bgm_gotown_mvl/mxv + .byte 50*mus_rustboro_mvl/mxv .byte W03 - .byte 46*bgm_gotown_mvl/mxv + .byte 46*mus_rustboro_mvl/mxv .byte W04 - .byte 62*bgm_gotown_mvl/mxv + .byte 62*mus_rustboro_mvl/mxv .byte N24 , Fn5 .byte W12 - .byte VOL , 58*bgm_gotown_mvl/mxv + .byte VOL , 58*mus_rustboro_mvl/mxv .byte W02 - .byte 52*bgm_gotown_mvl/mxv + .byte 52*mus_rustboro_mvl/mxv .byte W03 - .byte 47*bgm_gotown_mvl/mxv + .byte 47*mus_rustboro_mvl/mxv .byte W03 - .byte 45*bgm_gotown_mvl/mxv + .byte 45*mus_rustboro_mvl/mxv .byte W04 - .byte 67*bgm_gotown_mvl/mxv + .byte 67*mus_rustboro_mvl/mxv .byte N06 , Cn5 .byte W06 .byte Cn5 , v032 @@ -973,23 +973,23 @@ bgm_gotown_2_B1: .byte W03 .byte N36 , Ds5 , v112 .byte W12 - .byte VOL , 58*bgm_gotown_mvl/mxv + .byte VOL , 58*mus_rustboro_mvl/mxv .byte W02 - .byte 55*bgm_gotown_mvl/mxv + .byte 55*mus_rustboro_mvl/mxv .byte W03 - .byte 50*bgm_gotown_mvl/mxv + .byte 50*mus_rustboro_mvl/mxv .byte W03 - .byte 45*bgm_gotown_mvl/mxv + .byte 45*mus_rustboro_mvl/mxv .byte W04 - .byte 42*bgm_gotown_mvl/mxv + .byte 42*mus_rustboro_mvl/mxv .byte W02 - .byte 37*bgm_gotown_mvl/mxv + .byte 37*mus_rustboro_mvl/mxv .byte W03 - .byte 34*bgm_gotown_mvl/mxv + .byte 34*mus_rustboro_mvl/mxv .byte W03 - .byte 31*bgm_gotown_mvl/mxv + .byte 31*mus_rustboro_mvl/mxv .byte W04 - .byte 67*bgm_gotown_mvl/mxv + .byte 67*mus_rustboro_mvl/mxv .byte N06 , As4 .byte W06 .byte As4 , v032 @@ -1046,73 +1046,73 @@ bgm_gotown_2_B1: .byte W18 .byte N24 , An4 , v112 .byte W12 - .byte VOL , 60*bgm_gotown_mvl/mxv + .byte VOL , 60*mus_rustboro_mvl/mxv .byte W12 - .byte 64*bgm_gotown_mvl/mxv + .byte 64*mus_rustboro_mvl/mxv .byte N06 , Fn4 .byte W06 .byte Fn4 , v032 .byte W06 .byte N96 , Dn5 , v112 .byte W24 - .byte VOL , 61*bgm_gotown_mvl/mxv + .byte VOL , 61*mus_rustboro_mvl/mxv .byte W03 - .byte 57*bgm_gotown_mvl/mxv + .byte 57*mus_rustboro_mvl/mxv .byte W03 - .byte 53*bgm_gotown_mvl/mxv + .byte 53*mus_rustboro_mvl/mxv .byte W03 - .byte 50*bgm_gotown_mvl/mxv + .byte 50*mus_rustboro_mvl/mxv .byte W03 - .byte 46*bgm_gotown_mvl/mxv + .byte 46*mus_rustboro_mvl/mxv .byte W03 - .byte 42*bgm_gotown_mvl/mxv + .byte 42*mus_rustboro_mvl/mxv .byte W03 - .byte 37*bgm_gotown_mvl/mxv + .byte 37*mus_rustboro_mvl/mxv .byte W03 - .byte 33*bgm_gotown_mvl/mxv + .byte 33*mus_rustboro_mvl/mxv .byte W03 - .byte 26*bgm_gotown_mvl/mxv + .byte 26*mus_rustboro_mvl/mxv .byte W03 - .byte 24*bgm_gotown_mvl/mxv + .byte 24*mus_rustboro_mvl/mxv .byte W03 - .byte 21*bgm_gotown_mvl/mxv + .byte 21*mus_rustboro_mvl/mxv .byte W03 - .byte 22*bgm_gotown_mvl/mxv + .byte 22*mus_rustboro_mvl/mxv .byte W03 - .byte 24*bgm_gotown_mvl/mxv + .byte 24*mus_rustboro_mvl/mxv .byte W03 - .byte 26*bgm_gotown_mvl/mxv + .byte 26*mus_rustboro_mvl/mxv .byte W03 - .byte 28*bgm_gotown_mvl/mxv + .byte 28*mus_rustboro_mvl/mxv .byte W02 - .byte 36*bgm_gotown_mvl/mxv + .byte 36*mus_rustboro_mvl/mxv .byte W04 - .byte 37*bgm_gotown_mvl/mxv + .byte 37*mus_rustboro_mvl/mxv .byte W02 - .byte 40*bgm_gotown_mvl/mxv + .byte 40*mus_rustboro_mvl/mxv .byte W03 - .byte 42*bgm_gotown_mvl/mxv + .byte 42*mus_rustboro_mvl/mxv .byte W03 - .byte 46*bgm_gotown_mvl/mxv + .byte 46*mus_rustboro_mvl/mxv .byte W01 - .byte 48*bgm_gotown_mvl/mxv + .byte 48*mus_rustboro_mvl/mxv .byte W03 - .byte 55*bgm_gotown_mvl/mxv + .byte 55*mus_rustboro_mvl/mxv .byte W02 - .byte 51*bgm_gotown_mvl/mxv + .byte 51*mus_rustboro_mvl/mxv .byte W01 - .byte 60*bgm_gotown_mvl/mxv + .byte 60*mus_rustboro_mvl/mxv .byte W02 - .byte 55*bgm_gotown_mvl/mxv + .byte 55*mus_rustboro_mvl/mxv .byte W01 - .byte 64*bgm_gotown_mvl/mxv + .byte 64*mus_rustboro_mvl/mxv .byte W02 - .byte 58*bgm_gotown_mvl/mxv + .byte 58*mus_rustboro_mvl/mxv .byte W01 - .byte 71*bgm_gotown_mvl/mxv + .byte 71*mus_rustboro_mvl/mxv .byte W03 .byte VOICE , 17 - .byte VOL , 53*bgm_gotown_mvl/mxv + .byte VOL , 53*mus_rustboro_mvl/mxv .byte N12 , Gn5 .byte W12 .byte N03 , Fn5 , v064 @@ -1214,7 +1214,7 @@ bgm_gotown_2_B1: .byte N06 .byte W12 .byte VOICE , 73 - .byte VOL , 78*bgm_gotown_mvl/mxv + .byte VOL , 78*mus_rustboro_mvl/mxv .byte N12 , As3 .byte W12 .byte N02 , An3 , v092 @@ -1228,18 +1228,18 @@ bgm_gotown_2_B1: .byte An3 .byte W12 .byte GOTO - .word bgm_gotown_2_B1 + .word mus_rustboro_2_B1 .byte W96 .byte FINE @********************** Track 3 **********************@ -bgm_gotown_3: - .byte KEYSH , bgm_gotown_key+0 +mus_rustboro_3: + .byte KEYSH , mus_rustboro_key+0 .byte VOICE , 4 .byte LFOS , 44 .byte PAN , c_v+63 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte N12 , An4 , v112 @@ -1260,27 +1260,27 @@ bgm_gotown_3: .byte W12 .byte An4 .byte W12 -bgm_gotown_3_B1: +mus_rustboro_3_B1: .byte VOICE , 4 .byte MOD , 2 - .byte VOL , 22*bgm_gotown_mvl/mxv + .byte VOL , 22*mus_rustboro_mvl/mxv .byte N48 , Fn4 , v112 .byte W04 - .byte VOL , 25*bgm_gotown_mvl/mxv + .byte VOL , 25*mus_rustboro_mvl/mxv .byte W04 - .byte 28*bgm_gotown_mvl/mxv + .byte 28*mus_rustboro_mvl/mxv .byte W04 - .byte 31*bgm_gotown_mvl/mxv + .byte 31*mus_rustboro_mvl/mxv .byte W04 - .byte 34*bgm_gotown_mvl/mxv + .byte 34*mus_rustboro_mvl/mxv .byte W04 - .byte 36*bgm_gotown_mvl/mxv + .byte 36*mus_rustboro_mvl/mxv .byte W04 - .byte 38*bgm_gotown_mvl/mxv + .byte 38*mus_rustboro_mvl/mxv .byte W04 - .byte 40*bgm_gotown_mvl/mxv + .byte 40*mus_rustboro_mvl/mxv .byte W04 - .byte 42*bgm_gotown_mvl/mxv + .byte 42*mus_rustboro_mvl/mxv .byte W01 .byte MOD , 8 .byte W15 @@ -1307,24 +1307,24 @@ bgm_gotown_3_B1: .byte W12 .byte Cs5 .byte W12 - .byte VOL , 22*bgm_gotown_mvl/mxv + .byte VOL , 22*mus_rustboro_mvl/mxv .byte N48 , Dn5 .byte W04 - .byte VOL , 25*bgm_gotown_mvl/mxv + .byte VOL , 25*mus_rustboro_mvl/mxv .byte W04 - .byte 28*bgm_gotown_mvl/mxv + .byte 28*mus_rustboro_mvl/mxv .byte W04 - .byte 31*bgm_gotown_mvl/mxv + .byte 31*mus_rustboro_mvl/mxv .byte W04 - .byte 34*bgm_gotown_mvl/mxv + .byte 34*mus_rustboro_mvl/mxv .byte W04 - .byte 36*bgm_gotown_mvl/mxv + .byte 36*mus_rustboro_mvl/mxv .byte W04 - .byte 38*bgm_gotown_mvl/mxv + .byte 38*mus_rustboro_mvl/mxv .byte W04 - .byte 40*bgm_gotown_mvl/mxv + .byte 40*mus_rustboro_mvl/mxv .byte W04 - .byte 42*bgm_gotown_mvl/mxv + .byte 42*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 8 .byte W12 @@ -1334,25 +1334,25 @@ bgm_gotown_3_B1: .byte W24 .byte Dn5 .byte W12 - .byte VOL , 22*bgm_gotown_mvl/mxv + .byte VOL , 22*mus_rustboro_mvl/mxv .byte N42 , Gn4 .byte W04 - .byte VOL , 25*bgm_gotown_mvl/mxv + .byte VOL , 25*mus_rustboro_mvl/mxv .byte W04 - .byte 28*bgm_gotown_mvl/mxv + .byte 28*mus_rustboro_mvl/mxv .byte W04 - .byte 31*bgm_gotown_mvl/mxv + .byte 31*mus_rustboro_mvl/mxv .byte W04 - .byte 34*bgm_gotown_mvl/mxv + .byte 34*mus_rustboro_mvl/mxv .byte W04 - .byte 36*bgm_gotown_mvl/mxv + .byte 36*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 38*bgm_gotown_mvl/mxv + .byte VOL , 38*mus_rustboro_mvl/mxv .byte W04 - .byte 40*bgm_gotown_mvl/mxv + .byte 40*mus_rustboro_mvl/mxv .byte W04 - .byte 42*bgm_gotown_mvl/mxv + .byte 42*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 2 .byte W24 @@ -1406,7 +1406,7 @@ bgm_gotown_3_B1: .byte W03 .byte N06 , En5 , v112 .byte W06 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte N36 , Cs3 .byte W15 .byte MOD , 3 @@ -1447,7 +1447,7 @@ bgm_gotown_3_B1: .byte VOICE , 4 .byte PAN , c_v+63 .byte MOD , 1 - .byte VOL , 74*bgm_gotown_mvl/mxv + .byte VOL , 74*mus_rustboro_mvl/mxv .byte W12 .byte N24 , As3 .byte W12 @@ -1457,7 +1457,7 @@ bgm_gotown_3_B1: .byte 1 .byte N06 , Cn4 .byte W12 - .byte VOL , 85*bgm_gotown_mvl/mxv + .byte VOL , 85*mus_rustboro_mvl/mxv .byte W12 .byte PAN , c_v-63 .byte N12 , An3 @@ -1467,7 +1467,7 @@ bgm_gotown_3_B1: .byte An3 .byte W12 .byte PAN , c_v+0 - .byte VOL , 74*bgm_gotown_mvl/mxv + .byte VOL , 74*mus_rustboro_mvl/mxv .byte N06 , Fn3 .byte W06 .byte An3 @@ -1477,7 +1477,7 @@ bgm_gotown_3_B1: .byte Ds4 .byte W06 .byte VOICE , 7 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte PAN , c_v+63 .byte N12 , Gn4 .byte W12 @@ -1770,7 +1770,7 @@ bgm_gotown_3_B1: .byte As4 , v032 .byte W06 .byte VOICE , 4 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte N12 , As4 , v112 .byte W12 .byte N02 , An4 , v092 @@ -1784,16 +1784,16 @@ bgm_gotown_3_B1: .byte An4 .byte W12 .byte GOTO - .word bgm_gotown_3_B1 + .word mus_rustboro_3_B1 .byte W96 .byte FINE @********************** Track 4 **********************@ -bgm_gotown_4: - .byte KEYSH , bgm_gotown_key+0 +mus_rustboro_4: + .byte KEYSH , mus_rustboro_key+0 .byte VOICE , 38 - .byte VOL , 85*bgm_gotown_mvl/mxv + .byte VOL , 85*mus_rustboro_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -1803,7 +1803,7 @@ bgm_gotown_4: .byte W12 .byte N12 , An1 , v112 .byte W12 -bgm_gotown_4_B1: +mus_rustboro_4_B1: .byte BEND , c_v+0 .byte N24 , As1 , v127 .byte W36 @@ -1823,7 +1823,7 @@ bgm_gotown_4_B1: .byte W12 .byte N24 , Fn1 .byte W24 -bgm_gotown_4_000: +mus_rustboro_4_000: .byte N24 , Cn2 , v127 .byte W36 .byte N06 @@ -1863,7 +1863,7 @@ bgm_gotown_4_000: .byte W18 .byte N06 , Fn1 , v127 .byte W06 -bgm_gotown_4_001: +mus_rustboro_4_001: .byte N36 , Fs2 , v127 .byte W36 .byte Cs2 @@ -1947,7 +1947,7 @@ bgm_gotown_4_001: .byte N03 .byte W06 .byte PATT - .word bgm_gotown_4_001 + .word mus_rustboro_4_001 .byte W36 .byte N36 , Fn2 , v127 .byte W48 @@ -1973,7 +1973,7 @@ bgm_gotown_4_001: .byte W24 .byte As1 , v127 .byte W12 -bgm_gotown_4_002: +mus_rustboro_4_002: .byte N24 , Dn2 , v127 .byte W36 .byte N06 @@ -2050,7 +2050,7 @@ bgm_gotown_4_002: .byte N06 , As1 , v127 .byte W12 .byte PATT - .word bgm_gotown_4_002 + .word mus_rustboro_4_002 .byte N24 , Dn2 , v127 .byte W36 .byte N06 @@ -2066,7 +2066,7 @@ bgm_gotown_4_002: .byte Bn1 .byte W06 .byte PATT - .word bgm_gotown_4_000 + .word mus_rustboro_4_000 .byte N24 , Cn2 , v127 .byte W36 .byte N06 @@ -2110,32 +2110,32 @@ bgm_gotown_4_002: .byte c_v-61 .byte W06 .byte GOTO - .word bgm_gotown_4_B1 + .word mus_rustboro_4_B1 .byte W96 .byte FINE @********************** Track 5 **********************@ -bgm_gotown_5: - .byte KEYSH , bgm_gotown_key+0 +mus_rustboro_5: + .byte KEYSH , mus_rustboro_key+0 .byte LFOS , 44 .byte PAN , c_v-32 - .byte VOL , 73*bgm_gotown_mvl/mxv + .byte VOL , 73*mus_rustboro_mvl/mxv .byte W03 - .byte 74*bgm_gotown_mvl/mxv + .byte 74*mus_rustboro_mvl/mxv .byte W09 .byte VOICE , 17 .byte W72 -bgm_gotown_5_B1: +mus_rustboro_5_B1: .byte PAN , c_v-32 .byte W24 - .byte VOL , 74*bgm_gotown_mvl/mxv + .byte VOL , 74*mus_rustboro_mvl/mxv .byte W72 .byte W96 .byte W96 .byte W96 .byte W96 - .byte 69*bgm_gotown_mvl/mxv + .byte 69*mus_rustboro_mvl/mxv .byte W48 .byte N12 , Gs4 , v112 .byte W12 @@ -2162,7 +2162,7 @@ bgm_gotown_5_B1: .byte W06 .byte N18 , Fn4 , v088 .byte W15 - .byte VOL , 74*bgm_gotown_mvl/mxv + .byte VOL , 74*mus_rustboro_mvl/mxv .byte W03 .byte N06 , Fn5 , v096 .byte W06 @@ -2179,29 +2179,29 @@ bgm_gotown_5_B1: .byte W12 .byte As3 .byte W12 - .byte VOL , 64*bgm_gotown_mvl/mxv + .byte VOL , 64*mus_rustboro_mvl/mxv .byte N12 , Gs4 .byte W12 .byte Fs4 .byte W12 .byte PAN , c_v-13 - .byte VOL , 66*bgm_gotown_mvl/mxv + .byte VOL , 66*mus_rustboro_mvl/mxv .byte N48 , Fn4 .byte W04 - .byte VOL , 67*bgm_gotown_mvl/mxv + .byte VOL , 67*mus_rustboro_mvl/mxv .byte W04 - .byte 69*bgm_gotown_mvl/mxv + .byte 69*mus_rustboro_mvl/mxv .byte W04 - .byte 73*bgm_gotown_mvl/mxv + .byte 73*mus_rustboro_mvl/mxv .byte W04 - .byte 77*bgm_gotown_mvl/mxv + .byte 77*mus_rustboro_mvl/mxv .byte W04 - .byte 80*bgm_gotown_mvl/mxv + .byte 80*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 3 .byte W24 .byte 1 - .byte VOL , 78*bgm_gotown_mvl/mxv + .byte VOL , 78*mus_rustboro_mvl/mxv .byte W12 .byte N06 .byte W12 @@ -2230,32 +2230,32 @@ bgm_gotown_5_B1: .byte W03 .byte Cs5 .byte W03 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte N48 , Dn5 , v112 .byte W04 - .byte VOL , 45*bgm_gotown_mvl/mxv + .byte VOL , 45*mus_rustboro_mvl/mxv .byte W04 - .byte 46*bgm_gotown_mvl/mxv + .byte 46*mus_rustboro_mvl/mxv .byte W04 - .byte 49*bgm_gotown_mvl/mxv + .byte 49*mus_rustboro_mvl/mxv .byte W04 - .byte 52*bgm_gotown_mvl/mxv + .byte 52*mus_rustboro_mvl/mxv .byte W04 - .byte 56*bgm_gotown_mvl/mxv + .byte 56*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 3 - .byte VOL , 60*bgm_gotown_mvl/mxv + .byte VOL , 60*mus_rustboro_mvl/mxv .byte W04 - .byte 67*bgm_gotown_mvl/mxv + .byte 67*mus_rustboro_mvl/mxv .byte W04 - .byte 73*bgm_gotown_mvl/mxv + .byte 73*mus_rustboro_mvl/mxv .byte W04 - .byte 77*bgm_gotown_mvl/mxv + .byte 77*mus_rustboro_mvl/mxv .byte W04 - .byte 79*bgm_gotown_mvl/mxv + .byte 79*mus_rustboro_mvl/mxv .byte W08 .byte MOD , 1 - .byte VOL , 74*bgm_gotown_mvl/mxv + .byte VOL , 74*mus_rustboro_mvl/mxv .byte W12 .byte N12 , Ds5 .byte W24 @@ -2273,21 +2273,21 @@ bgm_gotown_5_B1: .byte W12 .byte An4 .byte W12 - .byte VOL , 44*bgm_gotown_mvl/mxv + .byte VOL , 44*mus_rustboro_mvl/mxv .byte N36 , As4 .byte W04 - .byte VOL , 49*bgm_gotown_mvl/mxv + .byte VOL , 49*mus_rustboro_mvl/mxv .byte W04 - .byte 62*bgm_gotown_mvl/mxv + .byte 62*mus_rustboro_mvl/mxv .byte W04 - .byte 67*bgm_gotown_mvl/mxv + .byte 67*mus_rustboro_mvl/mxv .byte W04 - .byte 68*bgm_gotown_mvl/mxv + .byte 68*mus_rustboro_mvl/mxv .byte W04 - .byte 72*bgm_gotown_mvl/mxv + .byte 72*mus_rustboro_mvl/mxv .byte W04 .byte MOD , 3 - .byte VOL , 74*bgm_gotown_mvl/mxv + .byte VOL , 74*mus_rustboro_mvl/mxv .byte W12 .byte MOD , 1 .byte N06 , Cn5 @@ -2317,7 +2317,7 @@ bgm_gotown_5_B1: .byte W09 .byte N03 , En5 .byte W03 - .byte VOL , 72*bgm_gotown_mvl/mxv + .byte VOL , 72*mus_rustboro_mvl/mxv .byte N06 , Fn5 .byte W12 .byte As4 , v104 @@ -2368,22 +2368,22 @@ bgm_gotown_5_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_gotown_5_B1 + .word mus_rustboro_5_B1 .byte W96 .byte FINE @********************** Track 6 **********************@ -bgm_gotown_6: - .byte KEYSH , bgm_gotown_key+0 +mus_rustboro_6: + .byte KEYSH , mus_rustboro_key+0 .byte VOICE , 1 .byte XCMD , xIECV , 12 .byte xIECV , 8 - .byte VOL , 36*bgm_gotown_mvl/mxv + .byte VOL , 36*mus_rustboro_mvl/mxv .byte PAN , c_v+0 .byte W12 .byte W72 -bgm_gotown_6_B1: +mus_rustboro_6_B1: .byte VOICE , 1 .byte W18 .byte N03 , Cn3 , v068 @@ -2402,7 +2402,7 @@ bgm_gotown_6_B1: .byte W12 .byte N06 , Dn3 , v112 .byte W12 -bgm_gotown_6_000: +mus_rustboro_6_000: .byte N01 , Dn3 , v080 .byte W12 .byte N06 , Dn3 , v112 @@ -2441,7 +2441,7 @@ bgm_gotown_6_000: .byte W12 .byte N06 , Ds3 , v112 .byte W12 -bgm_gotown_6_001: +mus_rustboro_6_001: .byte N01 , Ds3 , v080 .byte W12 .byte N06 , Ds3 , v112 @@ -2459,7 +2459,7 @@ bgm_gotown_6_001: .byte N01 , Ds3 , v080 .byte W12 .byte PEND -bgm_gotown_6_002: +mus_rustboro_6_002: .byte W12 .byte N01 , Ds3 , v080 .byte W03 @@ -2483,8 +2483,8 @@ bgm_gotown_6_002: .byte W12 .byte PEND .byte PATT - .word bgm_gotown_6_001 -bgm_gotown_6_003: + .word mus_rustboro_6_001 +mus_rustboro_6_003: .byte VOICE , 2 .byte N36 , As2 , v112 .byte W12 @@ -2535,7 +2535,7 @@ bgm_gotown_6_003: .byte N06 , Dn3 , v112 .byte W12 .byte PATT - .word bgm_gotown_6_000 + .word mus_rustboro_6_000 .byte W12 .byte N01 , Dn3 , v080 .byte W03 @@ -2558,13 +2558,13 @@ bgm_gotown_6_003: .byte N06 , Ds3 , v112 .byte W12 .byte PATT - .word bgm_gotown_6_001 + .word mus_rustboro_6_001 .byte PATT - .word bgm_gotown_6_002 + .word mus_rustboro_6_002 .byte PATT - .word bgm_gotown_6_001 + .word mus_rustboro_6_001 .byte PATT - .word bgm_gotown_6_003 + .word mus_rustboro_6_003 .byte MOD , 8 .byte W24 .byte W03 @@ -2591,7 +2591,7 @@ bgm_gotown_6_003: .byte W12 .byte N06 , Fs3 , v112 .byte W12 -bgm_gotown_6_004: +mus_rustboro_6_004: .byte N01 , Fs3 , v080 .byte W12 .byte N06 , Fs3 , v112 @@ -2609,7 +2609,7 @@ bgm_gotown_6_004: .byte N01 , Fs3 , v080 .byte W12 .byte PEND -bgm_gotown_6_005: +mus_rustboro_6_005: .byte N06 , An3 , v112 .byte W12 .byte N01 , An3 , v080 @@ -2653,7 +2653,7 @@ bgm_gotown_6_005: .byte W03 .byte Cs3 , v040 .byte W03 -bgm_gotown_6_006: +mus_rustboro_6_006: .byte VOICE , 1 .byte MOD , 1 .byte W24 @@ -2671,7 +2671,7 @@ bgm_gotown_6_006: .byte W12 .byte PEND .byte PATT - .word bgm_gotown_6_004 + .word mus_rustboro_6_004 .byte VOICE , 2 .byte N06 , Fn3 , v112 .byte W12 @@ -2716,7 +2716,7 @@ bgm_gotown_6_006: .byte Bn3 .byte W03 .byte PATT - .word bgm_gotown_6_006 + .word mus_rustboro_6_006 .byte N01 , Fs3 , v080 .byte W12 .byte N06 , Fs3 , v112 @@ -2736,7 +2736,7 @@ bgm_gotown_6_006: .byte N06 .byte W12 .byte PATT - .word bgm_gotown_6_005 + .word mus_rustboro_6_005 .byte VOICE , 2 .byte N24 , Gs3 , v112 .byte W12 @@ -2764,9 +2764,9 @@ bgm_gotown_6_006: .byte Cs3 , v044 .byte W03 .byte PATT - .word bgm_gotown_6_006 + .word mus_rustboro_6_006 .byte PATT - .word bgm_gotown_6_004 + .word mus_rustboro_6_004 .byte N06 , Fn3 , v112 .byte W12 .byte Dn3 @@ -2792,21 +2792,21 @@ bgm_gotown_6_006: .byte N06 .byte W60 .byte GOTO - .word bgm_gotown_6_B1 + .word mus_rustboro_6_B1 .byte W96 .byte FINE @********************** Track 7 **********************@ -bgm_gotown_7: - .byte KEYSH , bgm_gotown_key+0 +mus_rustboro_7: + .byte KEYSH , mus_rustboro_key+0 .byte VOICE , 127 .byte PAN , c_v-62 - .byte VOL , 42*bgm_gotown_mvl/mxv + .byte VOL , 42*mus_rustboro_mvl/mxv .byte W12 .byte W72 -bgm_gotown_7_B1: -bgm_gotown_7_000: +mus_rustboro_7_B1: +mus_rustboro_7_000: .byte N06 , An4 , v112 .byte W12 .byte An4 , v064 @@ -2824,7 +2824,7 @@ bgm_gotown_7_000: .byte N06 .byte W12 .byte PEND -bgm_gotown_7_001: +mus_rustboro_7_001: .byte N06 , An4 , v112 .byte W12 .byte An4 , v064 @@ -2843,50 +2843,50 @@ bgm_gotown_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 + .word mus_rustboro_7_001 .byte PATT - .word bgm_gotown_7_000 + .word mus_rustboro_7_000 .byte PATT - .word bgm_gotown_7_001 -bgm_gotown_7_002: + .word mus_rustboro_7_001 +mus_rustboro_7_002: .byte N06 , An4 , v112 .byte W12 .byte An4 , v064 @@ -2904,7 +2904,7 @@ bgm_gotown_7_002: .byte N03 , En4 , v112 .byte W12 .byte PEND -bgm_gotown_7_003: +mus_rustboro_7_003: .byte N06 , An4 , v112 .byte W12 .byte N03 , En4 @@ -2953,11 +2953,11 @@ bgm_gotown_7_003: .byte N06 .byte W12 .byte PATT - .word bgm_gotown_7_002 + .word mus_rustboro_7_002 .byte PATT - .word bgm_gotown_7_003 + .word mus_rustboro_7_003 .byte PATT - .word bgm_gotown_7_002 + .word mus_rustboro_7_002 .byte W12 .byte N03 , En4 , v112 .byte W12 @@ -2972,25 +2972,25 @@ bgm_gotown_7_003: .byte N15 , En4 .byte W24 .byte GOTO - .word bgm_gotown_7_B1 + .word mus_rustboro_7_B1 .byte W96 .byte FINE @********************** Track 8 **********************@ -bgm_gotown_8: - .byte KEYSH , bgm_gotown_key+0 +mus_rustboro_8: + .byte KEYSH , mus_rustboro_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 60*bgm_gotown_mvl/mxv + .byte VOL , 60*mus_rustboro_mvl/mxv .byte W12 .byte W60 .byte N06 , Fs1 , v100 .byte W06 .byte Fs1 , v080 .byte W06 -bgm_gotown_8_B1: -bgm_gotown_8_000: +mus_rustboro_8_B1: +mus_rustboro_8_000: .byte N06 , En3 , v100 .byte W12 .byte Fs1 @@ -3008,7 +3008,7 @@ bgm_gotown_8_000: .byte N06 .byte W12 .byte PEND -bgm_gotown_8_001: +mus_rustboro_8_001: .byte N06 , Fs1 , v100 .byte W12 .byte En3 @@ -3029,34 +3029,34 @@ bgm_gotown_8_001: .byte W06 .byte PEND .byte PATT - .word bgm_gotown_8_000 + .word mus_rustboro_8_000 .byte PATT - .word bgm_gotown_8_001 + .word mus_rustboro_8_001 .byte PATT - .word bgm_gotown_8_000 + .word mus_rustboro_8_000 .byte PATT - .word bgm_gotown_8_001 + .word mus_rustboro_8_001 .byte PATT - .word bgm_gotown_8_000 + .word mus_rustboro_8_000 .byte PATT - .word bgm_gotown_8_001 + .word mus_rustboro_8_001 .byte PATT - .word bgm_gotown_8_000 + .word mus_rustboro_8_000 .byte PATT - .word bgm_gotown_8_001 + .word mus_rustboro_8_001 .byte PATT - .word bgm_gotown_8_000 + .word mus_rustboro_8_000 .byte PATT - .word bgm_gotown_8_001 + .word mus_rustboro_8_001 .byte PATT - .word bgm_gotown_8_000 + .word mus_rustboro_8_000 .byte PATT - .word bgm_gotown_8_001 + .word mus_rustboro_8_001 .byte PATT - .word bgm_gotown_8_000 + .word mus_rustboro_8_000 .byte PATT - .word bgm_gotown_8_001 - .byte VOL , 64*bgm_gotown_mvl/mxv + .word mus_rustboro_8_001 + .byte VOL , 64*mus_rustboro_mvl/mxv .byte N06 , Cn1 , v127 .byte W12 .byte Dn3 , v100 @@ -3191,7 +3191,7 @@ bgm_gotown_8_001: .byte W12 .byte En3 , v100 .byte W12 -bgm_gotown_8_002: +mus_rustboro_8_002: .byte N06 , Cn1 , v127 .byte W12 .byte Dn3 , v100 @@ -3260,7 +3260,7 @@ bgm_gotown_8_002: .byte Cn1 .byte W06 .byte PATT - .word bgm_gotown_8_002 + .word mus_rustboro_8_002 .byte N06 , Cn1 , v127 .byte W12 .byte Dn3 , v100 @@ -3310,28 +3310,28 @@ bgm_gotown_8_002: .byte N12 , As1 , v088 .byte W12 .byte GOTO - .word bgm_gotown_8_B1 + .word mus_rustboro_8_B1 .byte W96 .byte FINE @******************************************************@ .align 2 -bgm_gotown: +mus_rustboro: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_gotown_pri @ Priority - .byte bgm_gotown_rev @ Reverb. + .byte mus_rustboro_pri @ Priority + .byte mus_rustboro_rev @ Reverb. - .word bgm_gotown_grp + .word mus_rustboro_grp - .word bgm_gotown_1 - .word bgm_gotown_2 - .word bgm_gotown_3 - .word bgm_gotown_4 - .word bgm_gotown_5 - .word bgm_gotown_6 - .word bgm_gotown_7 - .word bgm_gotown_8 + .word mus_rustboro_1 + .word mus_rustboro_2 + .word mus_rustboro_3 + .word mus_rustboro_4 + .word mus_rustboro_5 + .word mus_rustboro_6 + .word mus_rustboro_7 + .word mus_rustboro_8 .end diff --git a/sound/songs/bgm_safari.s b/sound/songs/mus_safari_zone.s index ecb083768..8f8dedfea 100644 --- a/sound/songs/bgm_safari.s +++ b/sound/songs/mus_safari_zone.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_safari_grp, voicegroup071 - .equ bgm_safari_pri, 0 - .equ bgm_safari_rev, reverb_set+50 - .equ bgm_safari_mvl, 127 - .equ bgm_safari_key, 0 - .equ bgm_safari_tbs, 1 - .equ bgm_safari_exg, 0 - .equ bgm_safari_cmp, 1 + .equ mus_safari_zone_grp, voicegroup071 + .equ mus_safari_zone_pri, 0 + .equ mus_safari_zone_rev, reverb_set+50 + .equ mus_safari_zone_mvl, 127 + .equ mus_safari_zone_key, 0 + .equ mus_safari_zone_tbs, 1 + .equ mus_safari_zone_exg, 0 + .equ mus_safari_zone_cmp, 1 .section .rodata - .global bgm_safari + .global mus_safari_zone .align 2 @********************** Track 1 **********************@ -bgm_safari_1: - .byte KEYSH , bgm_safari_key+0 - .byte TEMPO , 142*bgm_safari_tbs/2 +mus_safari_zone_1: + .byte KEYSH , mus_safari_zone_key+0 + .byte TEMPO , 142*mus_safari_zone_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 30*bgm_safari_mvl/mxv + .byte VOL , 30*mus_safari_zone_mvl/mxv .byte W12 -bgm_safari_1_B1: -bgm_safari_1_000: +mus_safari_zone_1_B1: +mus_safari_zone_1_000: .byte W12 .byte N03 , En5 , v104 .byte W06 @@ -45,43 +45,43 @@ bgm_safari_1_000: .byte W06 .byte PEND .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte PATT - .word bgm_safari_1_000 + .word mus_safari_zone_1_000 .byte GOTO - .word bgm_safari_1_B1 + .word mus_safari_zone_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_safari_2: - .byte KEYSH , bgm_safari_key+0 +mus_safari_zone_2: + .byte KEYSH , mus_safari_zone_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 32*bgm_safari_mvl/mxv + .byte VOL , 32*mus_safari_zone_mvl/mxv .byte W12 -bgm_safari_2_B1: -bgm_safari_2_000: +mus_safari_zone_2_B1: +mus_safari_zone_2_000: .byte N12 , Gn5 , v112 .byte W24 .byte N12 @@ -92,44 +92,44 @@ bgm_safari_2_000: .byte W24 .byte PEND .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte PATT - .word bgm_safari_2_000 + .word mus_safari_zone_2_000 .byte GOTO - .word bgm_safari_2_B1 + .word mus_safari_zone_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_safari_3: - .byte KEYSH , bgm_safari_key+0 +mus_safari_zone_3: + .byte KEYSH , mus_safari_zone_key+0 .byte VOICE , 35 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 82*bgm_safari_mvl/mxv + .byte VOL , 82*mus_safari_zone_mvl/mxv .byte W12 -bgm_safari_3_B1: +mus_safari_zone_3_B1: .byte W96 .byte W96 .byte W96 @@ -146,7 +146,7 @@ bgm_safari_3_B1: .byte W24 .byte N12 .byte W24 -bgm_safari_3_000: +mus_safari_zone_3_000: .byte BEND , c_v+0 .byte W36 .byte N06 , Fn0 , v127 @@ -162,7 +162,7 @@ bgm_safari_3_000: .byte c_v+0 .byte W12 .byte PEND -bgm_safari_3_001: +mus_safari_zone_3_001: .byte W12 .byte N06 , Fn0 , v127 .byte W12 @@ -189,11 +189,11 @@ bgm_safari_3_001: .byte c_v+0 .byte W12 .byte PATT - .word bgm_safari_3_001 + .word mus_safari_zone_3_001 .byte PATT - .word bgm_safari_3_000 + .word mus_safari_zone_3_000 .byte PATT - .word bgm_safari_3_001 + .word mus_safari_zone_3_001 .byte W36 .byte N06 , Fn0 , v127 .byte W12 @@ -208,18 +208,18 @@ bgm_safari_3_001: .byte c_v+0 .byte W12 .byte GOTO - .word bgm_safari_3_B1 + .word mus_safari_zone_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_safari_4: - .byte KEYSH , bgm_safari_key+0 +mus_safari_zone_4: + .byte KEYSH , mus_safari_zone_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 69*bgm_safari_mvl/mxv + .byte VOL , 69*mus_safari_zone_mvl/mxv .byte BEND , c_v+0 .byte N06 , Fn1 , v112 .byte W06 @@ -227,7 +227,7 @@ bgm_safari_4: .byte W03 .byte En1 .byte W03 -bgm_safari_4_B1: +mus_safari_zone_4_B1: .byte PAN , c_v-21 .byte BEND , c_v+0 .byte N06 , Fn1 , v112 @@ -529,21 +529,21 @@ bgm_safari_4_B1: .byte c_v+62 .byte W04 .byte GOTO - .word bgm_safari_4_B1 + .word mus_safari_zone_4_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 5 **********************@ -bgm_safari_5: - .byte KEYSH , bgm_safari_key+0 +mus_safari_zone_5: + .byte KEYSH , mus_safari_zone_key+0 .byte VOICE , 13 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-28 - .byte VOL , 24*bgm_safari_mvl/mxv + .byte VOL , 24*mus_safari_zone_mvl/mxv .byte W12 -bgm_safari_5_B1: +mus_safari_zone_5_B1: .byte W12 .byte N03 , Fn5 , v112 .byte W12 @@ -618,22 +618,22 @@ bgm_safari_5_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_safari_5_B1 + .word mus_safari_zone_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_safari_6: - .byte KEYSH , bgm_safari_key+0 +mus_safari_zone_6: + .byte KEYSH , mus_safari_zone_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-61 - .byte VOL , 44*bgm_safari_mvl/mxv + .byte VOL , 44*mus_safari_zone_mvl/mxv .byte W12 -bgm_safari_6_B1: +mus_safari_zone_6_B1: .byte W96 .byte W96 .byte W96 @@ -646,7 +646,7 @@ bgm_safari_6_B1: .byte W03 .byte Gn3 .byte W03 -bgm_safari_6_000: +mus_safari_zone_6_000: .byte N60 , As3 , v112 .byte W24 .byte MOD , 5 @@ -676,7 +676,7 @@ bgm_safari_6_000: .byte W24 .byte MOD , 6 .byte W24 -bgm_safari_6_001: +mus_safari_zone_6_001: .byte VOICE , 80 .byte MOD , 0 .byte PAN , c_v-64 @@ -705,7 +705,7 @@ bgm_safari_6_001: .byte Cn4 , v072 .byte W06 .byte PEND -bgm_safari_6_002: +mus_safari_zone_6_002: .byte N03 , As3 , v112 .byte W12 .byte N03 @@ -732,7 +732,7 @@ bgm_safari_6_002: .byte W06 .byte PEND .byte PATT - .word bgm_safari_6_000 + .word mus_safari_zone_6_000 .byte N03 , Gn3 , v112 .byte W12 .byte N06 , Fn3 @@ -753,26 +753,26 @@ bgm_safari_6_002: .byte MOD , 6 .byte W24 .byte PATT - .word bgm_safari_6_001 + .word mus_safari_zone_6_001 .byte PATT - .word bgm_safari_6_002 + .word mus_safari_zone_6_002 .byte GOTO - .word bgm_safari_6_B1 + .word mus_safari_zone_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_safari_7: - .byte KEYSH , bgm_safari_key+0 +mus_safari_zone_7: + .byte KEYSH , mus_safari_zone_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 44*bgm_safari_mvl/mxv + .byte VOL , 44*mus_safari_zone_mvl/mxv .byte W12 -bgm_safari_7_B1: +mus_safari_zone_7_B1: .byte W96 .byte W96 .byte W96 @@ -785,7 +785,7 @@ bgm_safari_7_B1: .byte W03 .byte Dn4 .byte W03 -bgm_safari_7_000: +mus_safari_zone_7_000: .byte N60 , Ds4 , v112 .byte W24 .byte MOD , 5 @@ -815,7 +815,7 @@ bgm_safari_7_000: .byte W24 .byte MOD , 6 .byte W24 -bgm_safari_7_001: +mus_safari_zone_7_001: .byte VOICE , 81 .byte MOD , 0 .byte PAN , c_v+63 @@ -844,7 +844,7 @@ bgm_safari_7_001: .byte Ds4 , v072 .byte W06 .byte PEND -bgm_safari_7_002: +mus_safari_zone_7_002: .byte N03 , Dn4 , v112 .byte W12 .byte N03 @@ -871,7 +871,7 @@ bgm_safari_7_002: .byte W06 .byte PEND .byte PATT - .word bgm_safari_7_000 + .word mus_safari_zone_7_000 .byte N03 , Cn4 , v112 .byte W12 .byte N06 , As3 @@ -892,23 +892,23 @@ bgm_safari_7_002: .byte MOD , 6 .byte W24 .byte PATT - .word bgm_safari_7_001 + .word mus_safari_zone_7_001 .byte PATT - .word bgm_safari_7_002 + .word mus_safari_zone_7_002 .byte GOTO - .word bgm_safari_7_B1 + .word mus_safari_zone_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_safari_8: - .byte KEYSH , bgm_safari_key+0 +mus_safari_zone_8: + .byte KEYSH , mus_safari_zone_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 66*bgm_safari_mvl/mxv + .byte VOL , 66*mus_safari_zone_mvl/mxv .byte W12 -bgm_safari_8_B1: -bgm_safari_8_000: +mus_safari_zone_8_B1: +mus_safari_zone_8_000: .byte N06 , Cn1 , v127 .byte N06 , En3 , v112 .byte W06 @@ -953,7 +953,7 @@ bgm_safari_8_000: .byte N06 , En3 , v076 .byte W06 .byte PEND -bgm_safari_8_001: +mus_safari_zone_8_001: .byte N06 , Cn1 , v127 .byte N06 , En3 , v112 .byte W06 @@ -1006,7 +1006,7 @@ bgm_safari_8_001: .byte N06 , Dn3 , v088 .byte W06 .byte PEND -bgm_safari_8_002: +mus_safari_zone_8_002: .byte N06 , Cn1 , v127 .byte N06 , En3 , v112 .byte W06 @@ -1055,7 +1055,7 @@ bgm_safari_8_002: .byte N06 , En3 , v076 .byte W06 .byte PEND -bgm_safari_8_003: +mus_safari_zone_8_003: .byte N06 , Cn1 , v127 .byte N06 , En3 , v112 .byte W06 @@ -1107,38 +1107,38 @@ bgm_safari_8_003: .byte W06 .byte PEND .byte PATT - .word bgm_safari_8_000 + .word mus_safari_zone_8_000 .byte PATT - .word bgm_safari_8_001 + .word mus_safari_zone_8_001 .byte PATT - .word bgm_safari_8_002 + .word mus_safari_zone_8_002 .byte PATT - .word bgm_safari_8_003 + .word mus_safari_zone_8_003 .byte PATT - .word bgm_safari_8_000 + .word mus_safari_zone_8_000 .byte PATT - .word bgm_safari_8_001 + .word mus_safari_zone_8_001 .byte PATT - .word bgm_safari_8_002 + .word mus_safari_zone_8_002 .byte PATT - .word bgm_safari_8_003 + .word mus_safari_zone_8_003 .byte GOTO - .word bgm_safari_8_B1 + .word mus_safari_zone_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_safari_9: - .byte KEYSH , bgm_safari_key+0 +mus_safari_zone_9: + .byte KEYSH , mus_safari_zone_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 19*bgm_safari_mvl/mxv + .byte VOL , 19*mus_safari_zone_mvl/mxv .byte W12 -bgm_safari_9_B1: -bgm_safari_9_000: +mus_safari_zone_9_B1: +mus_safari_zone_9_000: .byte N03 , Cn5 , v112 .byte W06 .byte Ds5 , v076 @@ -1162,7 +1162,7 @@ bgm_safari_9_000: .byte Cn5 , v076 .byte W06 .byte PEND -bgm_safari_9_001: +mus_safari_zone_9_001: .byte N03 , Cn5 , v112 .byte W06 .byte Bn4 , v080 @@ -1199,48 +1199,48 @@ bgm_safari_9_001: .byte W06 .byte PEND .byte PATT - .word bgm_safari_9_000 + .word mus_safari_zone_9_000 .byte PATT - .word bgm_safari_9_001 + .word mus_safari_zone_9_001 .byte PATT - .word bgm_safari_9_000 + .word mus_safari_zone_9_000 .byte PATT - .word bgm_safari_9_001 + .word mus_safari_zone_9_001 .byte PATT - .word bgm_safari_9_000 + .word mus_safari_zone_9_000 .byte PATT - .word bgm_safari_9_001 + .word mus_safari_zone_9_001 .byte PATT - .word bgm_safari_9_000 + .word mus_safari_zone_9_000 .byte PATT - .word bgm_safari_9_001 + .word mus_safari_zone_9_001 .byte PATT - .word bgm_safari_9_000 + .word mus_safari_zone_9_000 .byte PATT - .word bgm_safari_9_001 + .word mus_safari_zone_9_001 .byte GOTO - .word bgm_safari_9_B1 + .word mus_safari_zone_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_safari: +mus_safari_zone: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_safari_pri @ Priority - .byte bgm_safari_rev @ Reverb. + .byte mus_safari_zone_pri @ Priority + .byte mus_safari_zone_rev @ Reverb. - .word bgm_safari_grp + .word mus_safari_zone_grp - .word bgm_safari_1 - .word bgm_safari_2 - .word bgm_safari_3 - .word bgm_safari_4 - .word bgm_safari_5 - .word bgm_safari_6 - .word bgm_safari_7 - .word bgm_safari_8 - .word bgm_safari_9 + .word mus_safari_zone_1 + .word mus_safari_zone_2 + .word mus_safari_zone_3 + .word mus_safari_zone_4 + .word mus_safari_zone_5 + .word mus_safari_zone_6 + .word mus_safari_zone_7 + .word mus_safari_zone_8 + .word mus_safari_zone_9 .end diff --git a/sound/songs/bgm_m_boat.s b/sound/songs/mus_sailing.s index 383d18923..6266110fc 100644 --- a/sound/songs/bgm_m_boat.s +++ b/sound/songs/mus_sailing.s @@ -1,34 +1,34 @@ .include "MPlayDef.s" - .equ bgm_m_boat_grp, voicegroup074 - .equ bgm_m_boat_pri, 0 - .equ bgm_m_boat_rev, reverb_set+50 - .equ bgm_m_boat_mvl, 127 - .equ bgm_m_boat_key, 0 - .equ bgm_m_boat_tbs, 1 - .equ bgm_m_boat_exg, 0 - .equ bgm_m_boat_cmp, 1 + .equ mus_sailing_grp, voicegroup074 + .equ mus_sailing_pri, 0 + .equ mus_sailing_rev, reverb_set+50 + .equ mus_sailing_mvl, 127 + .equ mus_sailing_key, 0 + .equ mus_sailing_tbs, 1 + .equ mus_sailing_exg, 0 + .equ mus_sailing_cmp, 1 .section .rodata - .global bgm_m_boat + .global mus_sailing .align 2 @********************** Track 1 **********************@ -bgm_m_boat_1: - .byte KEYSH , bgm_m_boat_key+0 - .byte TEMPO , 156*bgm_m_boat_tbs/2 +mus_sailing_1: + .byte KEYSH , mus_sailing_key+0 + .byte TEMPO , 156*mus_sailing_tbs/2 .byte VOICE , 126 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 .byte W12 - .byte VOL , 9*bgm_m_boat_mvl/mxv + .byte VOL , 9*mus_sailing_mvl/mxv .byte TIE , Gn5 , v112 .byte W96 - .byte VOL , 27*bgm_m_boat_mvl/mxv + .byte VOL , 27*mus_sailing_mvl/mxv .byte W96 - .byte 43*bgm_m_boat_mvl/mxv + .byte 43*mus_sailing_mvl/mxv .byte W48 .byte EOT .byte N08 , Gn4 @@ -43,7 +43,7 @@ bgm_m_boat_1: .byte W08 .byte Gn4 , v028 .byte W08 - .byte VOL , 31*bgm_m_boat_mvl/mxv + .byte VOL , 31*mus_sailing_mvl/mxv .byte N09 , Cn4 , v084 .byte W36 .byte N03 , En3 , v064 @@ -56,10 +56,10 @@ bgm_m_boat_1: .byte W12 .byte N12 , Gn5 , v112 .byte W12 -bgm_m_boat_1_B1: +mus_sailing_1_B1: .byte VOICE , 127 .byte PAN , c_v+63 - .byte VOL , 35*bgm_m_boat_mvl/mxv + .byte VOL , 35*mus_sailing_mvl/mxv .byte N03 , En5 , v112 .byte W06 .byte En5 , v060 @@ -84,7 +84,7 @@ bgm_m_boat_1_B1: .byte W06 .byte En5 , v064 .byte W06 -bgm_m_boat_1_000: +mus_sailing_1_000: .byte N03 , En5 , v112 .byte W06 .byte En5 , v060 @@ -159,7 +159,7 @@ bgm_m_boat_1_000: .byte VOICE , 126 .byte N12 , Gn5 , v100 .byte W12 -bgm_m_boat_1_001: +mus_sailing_1_001: .byte VOICE , 127 .byte N03 , En5 , v112 .byte W06 @@ -187,9 +187,9 @@ bgm_m_boat_1_001: .byte W06 .byte PEND .byte PATT - .word bgm_m_boat_1_000 + .word mus_sailing_1_000 .byte PATT - .word bgm_m_boat_1_001 + .word mus_sailing_1_001 .byte VOICE , 127 .byte N03 , En5 , v112 .byte W06 @@ -217,11 +217,11 @@ bgm_m_boat_1_001: .byte N12 , Gn5 , v108 .byte W12 .byte PATT - .word bgm_m_boat_1_001 + .word mus_sailing_1_001 .byte PATT - .word bgm_m_boat_1_000 + .word mus_sailing_1_000 .byte PATT - .word bgm_m_boat_1_001 + .word mus_sailing_1_001 .byte N03 , En5 , v112 .byte W06 .byte En5 , v060 @@ -248,27 +248,27 @@ bgm_m_boat_1_001: .byte N12 , Gn5 , v100 .byte W12 .byte PATT - .word bgm_m_boat_1_001 + .word mus_sailing_1_001 .byte PATT - .word bgm_m_boat_1_000 + .word mus_sailing_1_000 .byte PATT - .word bgm_m_boat_1_001 + .word mus_sailing_1_001 .byte PATT - .word bgm_m_boat_1_000 + .word mus_sailing_1_000 .byte GOTO - .word bgm_m_boat_1_B1 + .word mus_sailing_1_B1 .byte W96 .byte FINE @********************** Track 2 **********************@ -bgm_m_boat_2: - .byte KEYSH , bgm_m_boat_key+0 +mus_sailing_2: + .byte KEYSH , mus_sailing_key+0 .byte VOICE , 46 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+3 - .byte VOL , 69*bgm_m_boat_mvl/mxv + .byte VOL , 69*mus_sailing_mvl/mxv .byte W12 .byte N06 , Gs3 , v112 .byte W06 @@ -396,7 +396,7 @@ bgm_m_boat_2: .byte W06 .byte Gs3 .byte W06 -bgm_m_boat_2_B1: +mus_sailing_2_B1: .byte W96 .byte W96 .byte W96 @@ -414,26 +414,26 @@ bgm_m_boat_2_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_m_boat_2_B1 + .word mus_sailing_2_B1 .byte W96 .byte FINE @********************** Track 3 **********************@ -bgm_m_boat_3: - .byte KEYSH , bgm_m_boat_key+0 +mus_sailing_3: + .byte KEYSH , mus_sailing_key+0 .byte VOICE , 35 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 86*bgm_m_boat_mvl/mxv + .byte VOL , 86*mus_sailing_mvl/mxv .byte N03 , Cn1 , v112 .byte W06 .byte N03 .byte W06 -bgm_m_boat_3_000: +mus_sailing_3_000: .byte N84 , Cs1 , v127 .byte W84 .byte N03 , Cn1 , v112 @@ -442,7 +442,7 @@ bgm_m_boat_3_000: .byte W06 .byte PEND .byte PATT - .word bgm_m_boat_3_000 + .word mus_sailing_3_000 .byte N36 , Cs1 , v127 .byte W36 .byte N03 , Gs0 , v112 @@ -485,8 +485,8 @@ bgm_m_boat_3_000: .byte W03 .byte N06 , Cs2 , v036 .byte W09 -bgm_m_boat_3_B1: -bgm_m_boat_3_001: +mus_sailing_3_B1: +mus_sailing_3_001: .byte N06 , Bn0 , v127 .byte W06 .byte Bn0 , v036 @@ -520,7 +520,7 @@ bgm_m_boat_3_001: .byte Fs1 .byte W06 .byte PEND -bgm_m_boat_3_002: +mus_sailing_3_002: .byte N06 , Cs1 , v127 .byte W06 .byte Cs1 , v036 @@ -554,7 +554,7 @@ bgm_m_boat_3_002: .byte N06 , Cs2 , v036 .byte W09 .byte PEND -bgm_m_boat_3_003: +mus_sailing_3_003: .byte N06 , As0 , v127 .byte W06 .byte As0 , v036 @@ -588,7 +588,7 @@ bgm_m_boat_3_003: .byte N06 , As1 , v036 .byte W09 .byte PEND -bgm_m_boat_3_004: +mus_sailing_3_004: .byte N06 , Ds1 , v127 .byte W06 .byte Ds1 , v036 @@ -622,7 +622,7 @@ bgm_m_boat_3_004: .byte N06 , As1 , v036 .byte W09 .byte PEND -bgm_m_boat_3_005: +mus_sailing_3_005: .byte N06 , Gs0 , v127 .byte W06 .byte Gs0 , v036 @@ -753,15 +753,15 @@ bgm_m_boat_3_005: .byte N06 , As1 , v036 .byte W09 .byte PATT - .word bgm_m_boat_3_001 + .word mus_sailing_3_001 .byte PATT - .word bgm_m_boat_3_002 + .word mus_sailing_3_002 .byte PATT - .word bgm_m_boat_3_003 + .word mus_sailing_3_003 .byte PATT - .word bgm_m_boat_3_004 + .word mus_sailing_3_004 .byte PATT - .word bgm_m_boat_3_005 + .word mus_sailing_3_005 .byte N06 , Gs0 , v127 .byte W06 .byte Gs0 , v036 @@ -795,7 +795,7 @@ bgm_m_boat_3_005: .byte N06 , Gs1 , v036 .byte W09 .byte PATT - .word bgm_m_boat_3_002 + .word mus_sailing_3_002 .byte N06 , Cs2 , v127 .byte W06 .byte Cs2 , v036 @@ -815,19 +815,19 @@ bgm_m_boat_3_005: .byte As0 , v112 .byte W06 .byte GOTO - .word bgm_m_boat_3_B1 + .word mus_sailing_3_B1 .byte W96 .byte FINE @********************** Track 4 **********************@ -bgm_m_boat_4: - .byte KEYSH , bgm_m_boat_key+0 +mus_sailing_4: + .byte KEYSH , mus_sailing_key+0 .byte VOICE , 17 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 32*bgm_m_boat_mvl/mxv + .byte VOL , 32*mus_sailing_mvl/mxv .byte N03 , Gn4 , v112 .byte W06 .byte N03 @@ -872,7 +872,7 @@ bgm_m_boat_4: .byte W06 .byte Cs5 .byte W06 -bgm_m_boat_4_B1: +mus_sailing_4_B1: .byte N36 , Ds5 , v112 .byte W36 .byte N12 , Fs4 @@ -881,7 +881,7 @@ bgm_m_boat_4_B1: .byte W12 .byte N36 , Ds5 .byte W36 -bgm_m_boat_4_000: +mus_sailing_4_000: .byte N36 , Fn5 , v112 .byte W36 .byte N06 , Fs5 @@ -962,7 +962,7 @@ bgm_m_boat_4_000: .byte N36 , Ds5 .byte W36 .byte PATT - .word bgm_m_boat_4_000 + .word mus_sailing_4_000 .byte N36 , As5 , v112 .byte W36 .byte N06 , Fn5 @@ -1030,25 +1030,25 @@ bgm_m_boat_4_000: .byte Dn5 .byte W12 .byte GOTO - .word bgm_m_boat_4_B1 + .word mus_sailing_4_B1 .byte W96 .byte FINE @********************** Track 5 **********************@ -bgm_m_boat_5: - .byte KEYSH , bgm_m_boat_key+0 +mus_sailing_5: + .byte KEYSH , mus_sailing_key+0 .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-22 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte W12 .byte W96 .byte W96 .byte W96 .byte W96 -bgm_m_boat_5_B1: +mus_sailing_5_B1: .byte N02 , Fs3 , v112 .byte W06 .byte Bn3 @@ -1546,21 +1546,21 @@ bgm_m_boat_5_B1: .byte Gs3 .byte W54 .byte GOTO - .word bgm_m_boat_5_B1 + .word mus_sailing_5_B1 .byte W96 .byte FINE @********************** Track 6 **********************@ -bgm_m_boat_6: - .byte KEYSH , bgm_m_boat_key+0 +mus_sailing_6: + .byte KEYSH , mus_sailing_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-61 - .byte VOL , 38*bgm_m_boat_mvl/mxv + .byte VOL , 38*mus_sailing_mvl/mxv .byte W12 .byte N96 , Bn2 , v112 .byte W96 @@ -1572,11 +1572,11 @@ bgm_m_boat_6: .byte W48 .byte N32 , Gs3 .byte W12 - .byte VOL , 35*bgm_m_boat_mvl/mxv + .byte VOL , 35*mus_sailing_mvl/mxv .byte W05 - .byte 43*bgm_m_boat_mvl/mxv + .byte 43*mus_sailing_mvl/mxv .byte W07 - .byte 48*bgm_m_boat_mvl/mxv + .byte 48*mus_sailing_mvl/mxv .byte W12 .byte N03 , Cs3 .byte W06 @@ -1584,15 +1584,15 @@ bgm_m_boat_6: .byte W06 .byte N24 .byte W06 - .byte VOL , 36*bgm_m_boat_mvl/mxv + .byte VOL , 36*mus_sailing_mvl/mxv .byte W06 - .byte 43*bgm_m_boat_mvl/mxv + .byte 43*mus_sailing_mvl/mxv .byte W05 - .byte 49*bgm_m_boat_mvl/mxv + .byte 49*mus_sailing_mvl/mxv .byte W30 .byte W01 -bgm_m_boat_6_B1: - .byte VOL , 39*bgm_m_boat_mvl/mxv +mus_sailing_6_B1: + .byte VOL , 39*mus_sailing_mvl/mxv .byte N24 , Bn2 , v112 .byte W24 .byte Ds2 @@ -1612,17 +1612,17 @@ bgm_m_boat_6_B1: .byte W12 .byte N36 , Gs3 .byte W36 - .byte VOL , 35*bgm_m_boat_mvl/mxv + .byte VOL , 35*mus_sailing_mvl/mxv .byte N24 .byte W24 - .byte VOL , 49*bgm_m_boat_mvl/mxv + .byte VOL , 49*mus_sailing_mvl/mxv .byte N24 , Fn3 .byte W24 .byte Ds3 .byte W24 .byte Cs3 .byte W24 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N36 , Bn2 .byte W12 .byte MOD , 8 @@ -1641,7 +1641,7 @@ bgm_m_boat_6_B1: .byte 0 .byte N06 , Bn2 .byte W12 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N06 , Ds3 .byte W12 .byte Fn3 @@ -1654,7 +1654,7 @@ bgm_m_boat_6_B1: .byte W06 .byte Cs3 .byte W06 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N36 .byte W12 .byte MOD , 8 @@ -1671,28 +1671,28 @@ bgm_m_boat_6_B1: .byte W12 .byte N24 , Fn2 .byte W24 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N24 , Cs3 .byte W24 .byte Bn2 .byte W24 .byte As2 .byte W24 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N24 , Fs2 .byte W24 .byte As2 .byte W24 .byte Cs3 .byte W24 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N12 , Fs3 .byte W12 .byte N06 , Ds3 .byte W06 .byte As2 .byte W06 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N24 , Bn2 .byte W24 .byte Ds2 @@ -1701,7 +1701,7 @@ bgm_m_boat_6_B1: .byte W24 .byte Bn2 .byte W24 - .byte VOL , 44*bgm_m_boat_mvl/mxv + .byte VOL , 44*mus_sailing_mvl/mxv .byte N36 , Fn3 .byte W12 .byte MOD , 8 @@ -1727,17 +1727,17 @@ bgm_m_boat_6_B1: .byte W06 .byte Gs3 .byte W06 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N24 , Ds3 .byte W24 .byte As2 .byte W24 .byte Ds3 .byte W24 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N24 , As3 .byte W24 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N36 , Ds4 .byte W12 .byte MOD , 8 @@ -1747,10 +1747,10 @@ bgm_m_boat_6_B1: .byte W12 .byte N06 , Bn3 .byte W12 - .byte VOL , 47*bgm_m_boat_mvl/mxv + .byte VOL , 47*mus_sailing_mvl/mxv .byte N24 , Ds4 .byte W24 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N06 , Fs3 .byte W06 .byte Gs3 @@ -1762,14 +1762,14 @@ bgm_m_boat_6_B1: .byte 0 .byte N06 , Ds3 .byte W12 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N06 , Cn4 .byte W18 .byte As3 .byte W18 .byte N12 , Gs3 .byte W12 - .byte VOL , 45*bgm_m_boat_mvl/mxv + .byte VOL , 45*mus_sailing_mvl/mxv .byte N30 , Fn3 .byte W36 .byte N03 @@ -1782,7 +1782,7 @@ bgm_m_boat_6_B1: .byte W06 .byte N03 .byte W06 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N06 , Cs3 .byte W48 .byte Gs2 @@ -1798,21 +1798,21 @@ bgm_m_boat_6_B1: .byte N12 , Dn3 .byte W12 .byte GOTO - .word bgm_m_boat_6_B1 + .word mus_sailing_6_B1 .byte W96 .byte FINE @********************** Track 7 **********************@ -bgm_m_boat_7: - .byte KEYSH , bgm_m_boat_key+0 +mus_sailing_7: + .byte KEYSH , mus_sailing_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 37*bgm_m_boat_mvl/mxv + .byte VOL , 37*mus_sailing_mvl/mxv .byte W12 .byte N96 , Ds3 , v112 .byte W96 @@ -1824,11 +1824,11 @@ bgm_m_boat_7: .byte W48 .byte N32 , Cs3 .byte W12 - .byte VOL , 35*bgm_m_boat_mvl/mxv + .byte VOL , 35*mus_sailing_mvl/mxv .byte W05 - .byte 43*bgm_m_boat_mvl/mxv + .byte 43*mus_sailing_mvl/mxv .byte W07 - .byte 48*bgm_m_boat_mvl/mxv + .byte 48*mus_sailing_mvl/mxv .byte W12 .byte N03 , Gs3 .byte W06 @@ -1836,15 +1836,15 @@ bgm_m_boat_7: .byte W06 .byte N24 .byte W06 - .byte VOL , 36*bgm_m_boat_mvl/mxv + .byte VOL , 36*mus_sailing_mvl/mxv .byte W06 - .byte 43*bgm_m_boat_mvl/mxv + .byte 43*mus_sailing_mvl/mxv .byte W05 - .byte 49*bgm_m_boat_mvl/mxv + .byte 49*mus_sailing_mvl/mxv .byte W30 .byte W01 -bgm_m_boat_7_B1: - .byte VOL , 39*bgm_m_boat_mvl/mxv +mus_sailing_7_B1: + .byte VOL , 39*mus_sailing_mvl/mxv .byte N24 , Ds3 , v112 .byte W24 .byte Fs2 @@ -1864,17 +1864,17 @@ bgm_m_boat_7_B1: .byte W12 .byte N36 , Bn3 .byte W36 - .byte VOL , 35*bgm_m_boat_mvl/mxv + .byte VOL , 35*mus_sailing_mvl/mxv .byte N24 , As3 .byte W24 - .byte VOL , 48*bgm_m_boat_mvl/mxv + .byte VOL , 48*mus_sailing_mvl/mxv .byte N24 , Gs3 .byte W24 .byte Fs3 .byte W24 .byte Fn3 .byte W24 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N36 , Ds3 .byte W12 .byte MOD , 8 @@ -1893,7 +1893,7 @@ bgm_m_boat_7_B1: .byte 0 .byte N06 , Fs3 .byte W12 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N06 , Bn3 .byte W12 .byte Cs4 @@ -1906,7 +1906,7 @@ bgm_m_boat_7_B1: .byte W06 .byte As3 .byte W06 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N36 , Gs3 .byte W12 .byte MOD , 8 @@ -1922,28 +1922,28 @@ bgm_m_boat_7_B1: .byte W12 .byte N24 , Cs3 .byte W24 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N24 , Gs3 .byte W24 .byte Fs3 .byte W24 .byte Fn3 .byte W24 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N24 , Ds3 .byte W24 .byte Fs3 .byte W24 .byte As3 .byte W24 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N12 , Cs4 .byte W12 .byte N06 , As3 .byte W06 .byte Fs3 .byte W06 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N24 , Ds3 .byte W24 .byte Fs2 @@ -1952,7 +1952,7 @@ bgm_m_boat_7_B1: .byte W24 .byte Ds3 .byte W24 - .byte VOL , 44*bgm_m_boat_mvl/mxv + .byte VOL , 44*mus_sailing_mvl/mxv .byte N36 , Cs4 .byte W12 .byte MOD , 8 @@ -1978,17 +1978,17 @@ bgm_m_boat_7_B1: .byte W06 .byte Bn3 .byte W06 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N24 , As3 .byte W24 .byte Gn3 .byte W24 .byte As3 .byte W24 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N24 , Ds4 .byte W24 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N36 , Fs4 .byte W12 .byte MOD , 8 @@ -1998,10 +1998,10 @@ bgm_m_boat_7_B1: .byte W12 .byte N06 , Ds4 .byte W12 - .byte VOL , 47*bgm_m_boat_mvl/mxv + .byte VOL , 47*mus_sailing_mvl/mxv .byte N24 , Fs4 .byte W24 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N06 , Bn3 .byte W06 .byte Cs4 @@ -2013,14 +2013,14 @@ bgm_m_boat_7_B1: .byte 0 .byte N06 , Fs3 .byte W12 - .byte VOL , 46*bgm_m_boat_mvl/mxv + .byte VOL , 46*mus_sailing_mvl/mxv .byte N06 , Ds4 .byte W18 .byte Cs4 .byte W18 .byte N12 , Cn4 .byte W12 - .byte VOL , 45*bgm_m_boat_mvl/mxv + .byte VOL , 45*mus_sailing_mvl/mxv .byte N30 , Cs4 .byte W36 .byte N03 @@ -2033,7 +2033,7 @@ bgm_m_boat_7_B1: .byte W06 .byte N03 .byte W06 - .byte VOL , 39*bgm_m_boat_mvl/mxv + .byte VOL , 39*mus_sailing_mvl/mxv .byte N06 , Cs4 .byte W48 .byte Cs3 @@ -2047,21 +2047,21 @@ bgm_m_boat_7_B1: .byte Cs4 .byte W24 .byte GOTO - .word bgm_m_boat_7_B1 + .word mus_sailing_7_B1 .byte W96 .byte FINE @********************** Track 8 **********************@ -bgm_m_boat_8: - .byte KEYSH , bgm_m_boat_key+0 +mus_sailing_8: + .byte KEYSH , mus_sailing_key+0 .byte VOICE , 82 .byte LFOS , 28 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 30*bgm_m_boat_mvl/mxv + .byte VOL , 30*mus_sailing_mvl/mxv .byte BEND , c_v+1 .byte N03 , Gn4 , v112 .byte W06 @@ -2126,7 +2126,7 @@ bgm_m_boat_8: .byte W06 .byte Cs5 .byte W06 -bgm_m_boat_8_B1: +mus_sailing_8_B1: .byte N36 , Ds5 , v112 .byte W24 .byte MOD , 5 @@ -2351,19 +2351,19 @@ bgm_m_boat_8_B1: .byte Dn5 .byte W12 .byte GOTO - .word bgm_m_boat_8_B1 + .word mus_sailing_8_B1 .byte W96 .byte FINE @********************** Track 9 **********************@ -bgm_m_boat_9: - .byte KEYSH , bgm_m_boat_key+0 +mus_sailing_9: + .byte KEYSH , mus_sailing_key+0 .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+19 - .byte VOL , 43*bgm_m_boat_mvl/mxv + .byte VOL , 43*mus_sailing_mvl/mxv .byte W12 .byte W96 .byte W96 @@ -2384,8 +2384,8 @@ bgm_m_boat_9: .byte W06 .byte As3 .byte W06 -bgm_m_boat_9_B1: -bgm_m_boat_9_000: +mus_sailing_9_B1: +mus_sailing_9_000: .byte N36 , Bn3 , v112 .byte W36 .byte N12 , Ds3 @@ -2395,7 +2395,7 @@ bgm_m_boat_9_000: .byte N36 , Bn3 .byte W36 .byte PEND -bgm_m_boat_9_001: +mus_sailing_9_001: .byte N36 , Cs4 , v112 .byte W36 .byte N06 , Ds4 @@ -2457,9 +2457,9 @@ bgm_m_boat_9_001: .byte Fn3 .byte W06 .byte PATT - .word bgm_m_boat_9_000 + .word mus_sailing_9_000 .byte PATT - .word bgm_m_boat_9_001 + .word mus_sailing_9_001 .byte N36 , Fn4 , v112 .byte W36 .byte N06 , Cs4 @@ -2529,29 +2529,29 @@ bgm_m_boat_9_001: .byte Fn4 .byte W24 .byte GOTO - .word bgm_m_boat_9_B1 + .word mus_sailing_9_B1 .byte W96 .byte FINE @******************************************************@ .align 2 -bgm_m_boat: +mus_sailing: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_m_boat_pri @ Priority - .byte bgm_m_boat_rev @ Reverb. + .byte mus_sailing_pri @ Priority + .byte mus_sailing_rev @ Reverb. - .word bgm_m_boat_grp + .word mus_sailing_grp - .word bgm_m_boat_1 - .word bgm_m_boat_2 - .word bgm_m_boat_3 - .word bgm_m_boat_4 - .word bgm_m_boat_5 - .word bgm_m_boat_6 - .word bgm_m_boat_7 - .word bgm_m_boat_8 - .word bgm_m_boat_9 + .word mus_sailing_1 + .word mus_sailing_2 + .word mus_sailing_3 + .word mus_sailing_4 + .word mus_sailing_5 + .word mus_sailing_6 + .word mus_sailing_7 + .word mus_sailing_8 + .word mus_sailing_9 .end diff --git a/sound/songs/bgm_p_school.s b/sound/songs/mus_school.s index 2b85ac891..d1728184b 100644 --- a/sound/songs/bgm_p_school.s +++ b/sound/songs/mus_school.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_p_school_grp, voicegroup078 - .equ bgm_p_school_pri, 0 - .equ bgm_p_school_rev, reverb_set+50 - .equ bgm_p_school_mvl, 127 - .equ bgm_p_school_key, 0 - .equ bgm_p_school_tbs, 1 - .equ bgm_p_school_exg, 0 - .equ bgm_p_school_cmp, 1 + .equ mus_school_grp, voicegroup078 + .equ mus_school_pri, 0 + .equ mus_school_rev, reverb_set+50 + .equ mus_school_mvl, 127 + .equ mus_school_key, 0 + .equ mus_school_tbs, 1 + .equ mus_school_exg, 0 + .equ mus_school_cmp, 1 .section .rodata - .global bgm_p_school + .global mus_school .align 2 @********************** Track 1 **********************@ -bgm_p_school_1: - .byte KEYSH , bgm_p_school_key+0 -bgm_p_school_1_B1: - .byte TEMPO , 116*bgm_p_school_tbs/2 +mus_school_1: + .byte KEYSH , mus_school_key+0 +mus_school_1_B1: + .byte TEMPO , 116*mus_school_tbs/2 .byte VOICE , 1 .byte LFOS , 44 - .byte VOL , 87*bgm_p_school_mvl/mxv + .byte VOL , 87*mus_school_mvl/mxv .byte PAN , c_v+4 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 96*bgm_p_school_mvl/mxv + .byte VOL , 96*mus_school_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -59,15 +59,15 @@ bgm_p_school_1_B1: .byte N18 , En3 .byte W24 .byte GOTO - .word bgm_p_school_1_B1 + .word mus_school_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_p_school_2: - .byte VOL , 100*bgm_p_school_mvl/mxv - .byte KEYSH , bgm_p_school_key+0 -bgm_p_school_2_B1: +mus_school_2: + .byte VOL , 100*mus_school_mvl/mxv + .byte KEYSH , mus_school_key+0 +mus_school_2_B1: .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 @@ -374,15 +374,15 @@ bgm_p_school_2_B1: .byte N18 , En5 .byte W24 .byte GOTO - .word bgm_p_school_2_B1 + .word mus_school_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_p_school_3: - .byte VOL , 100*bgm_p_school_mvl/mxv - .byte KEYSH , bgm_p_school_key+0 -bgm_p_school_3_B1: +mus_school_3: + .byte VOL , 100*mus_school_mvl/mxv + .byte KEYSH , mus_school_key+0 +mus_school_3_B1: .byte VOICE , 1 .byte BENDR , 12 .byte LFOS , 44 @@ -404,7 +404,7 @@ bgm_p_school_3_B1: .byte W12 .byte An2 .byte W12 -bgm_p_school_3_000: +mus_school_3_000: .byte N06 , Dn2 , v064 .byte W12 .byte An2 @@ -423,8 +423,8 @@ bgm_p_school_3_000: .byte W12 .byte PEND .byte PATT - .word bgm_p_school_3_000 -bgm_p_school_3_001: + .word mus_school_3_000 +mus_school_3_001: .byte N06 , En2 , v064 .byte W12 .byte Bn2 @@ -442,7 +442,7 @@ bgm_p_school_3_001: .byte Cs3 .byte W12 .byte PEND -bgm_p_school_3_002: +mus_school_3_002: .byte N06 , Bn1 , v064 .byte W12 .byte Bn2 @@ -460,7 +460,7 @@ bgm_p_school_3_002: .byte Bn2 .byte W12 .byte PEND -bgm_p_school_3_003: +mus_school_3_003: .byte N06 , Gn1 , v064 .byte W12 .byte Bn2 @@ -479,14 +479,14 @@ bgm_p_school_3_003: .byte W12 .byte PEND .byte PATT - .word bgm_p_school_3_000 + .word mus_school_3_000 .byte PATT - .word bgm_p_school_3_001 + .word mus_school_3_001 .byte PATT - .word bgm_p_school_3_002 + .word mus_school_3_002 .byte PATT - .word bgm_p_school_3_003 -bgm_p_school_3_004: + .word mus_school_3_003 +mus_school_3_004: .byte N06 , Gn2 , v064 .byte W12 .byte Bn3 @@ -504,7 +504,7 @@ bgm_p_school_3_004: .byte Bn3 .byte W12 .byte PEND -bgm_p_school_3_005: +mus_school_3_005: .byte N06 , An2 , v064 .byte W12 .byte En3 @@ -522,7 +522,7 @@ bgm_p_school_3_005: .byte Gs2 .byte W12 .byte PEND -bgm_p_school_3_006: +mus_school_3_006: .byte N06 , Gn2 , v064 .byte W12 .byte Gn3 @@ -557,11 +557,11 @@ bgm_p_school_3_006: .byte An3 .byte W12 .byte PATT - .word bgm_p_school_3_004 + .word mus_school_3_004 .byte PATT - .word bgm_p_school_3_005 + .word mus_school_3_005 .byte PATT - .word bgm_p_school_3_006 + .word mus_school_3_006 .byte N06 , An2 , v064 .byte W24 .byte En2 @@ -573,15 +573,15 @@ bgm_p_school_3_006: .byte Cs2 .byte W12 .byte GOTO - .word bgm_p_school_3_B1 + .word mus_school_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_p_school_4: - .byte VOL , 100*bgm_p_school_mvl/mxv - .byte KEYSH , bgm_p_school_key+0 -bgm_p_school_4_B1: +mus_school_4: + .byte VOL , 100*mus_school_mvl/mxv + .byte KEYSH , mus_school_key+0 +mus_school_4_B1: .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 @@ -594,7 +594,7 @@ bgm_p_school_4_B1: .byte W24 .byte N06 .byte W12 -bgm_p_school_4_000: +mus_school_4_000: .byte W12 .byte N06 , Fs3 , v064 .byte W24 @@ -606,8 +606,8 @@ bgm_p_school_4_000: .byte W12 .byte PEND .byte PATT - .word bgm_p_school_4_000 -bgm_p_school_4_001: + .word mus_school_4_000 +mus_school_4_001: .byte W12 .byte N06 , Gn3 , v064 .byte W24 @@ -619,8 +619,8 @@ bgm_p_school_4_001: .byte W12 .byte PEND .byte PATT - .word bgm_p_school_4_000 -bgm_p_school_4_002: + .word mus_school_4_000 +mus_school_4_002: .byte W12 .byte N06 , Gn3 , v064 .byte W24 @@ -632,14 +632,14 @@ bgm_p_school_4_002: .byte W12 .byte PEND .byte PATT - .word bgm_p_school_4_000 + .word mus_school_4_000 .byte PATT - .word bgm_p_school_4_001 + .word mus_school_4_001 .byte PATT - .word bgm_p_school_4_000 + .word mus_school_4_000 .byte PATT - .word bgm_p_school_4_002 -bgm_p_school_4_003: + .word mus_school_4_002 +mus_school_4_003: .byte W12 .byte N06 , Dn4 , v064 .byte W24 @@ -650,7 +650,7 @@ bgm_p_school_4_003: .byte N06 .byte W12 .byte PEND -bgm_p_school_4_004: +mus_school_4_004: .byte W12 .byte N06 , Cs4 , v064 .byte W24 @@ -661,7 +661,7 @@ bgm_p_school_4_004: .byte N06 .byte W12 .byte PEND -bgm_p_school_4_005: +mus_school_4_005: .byte W12 .byte N06 , Bn3 , v064 .byte W24 @@ -673,13 +673,13 @@ bgm_p_school_4_005: .byte W12 .byte PEND .byte PATT - .word bgm_p_school_4_004 + .word mus_school_4_004 .byte PATT - .word bgm_p_school_4_003 + .word mus_school_4_003 .byte PATT - .word bgm_p_school_4_004 + .word mus_school_4_004 .byte PATT - .word bgm_p_school_4_005 + .word mus_school_4_005 .byte W12 .byte N06 , Cs4 , v064 .byte W24 @@ -690,23 +690,23 @@ bgm_p_school_4_005: .byte N18 , An3 .byte W24 .byte GOTO - .word bgm_p_school_4_B1 + .word mus_school_4_B1 .byte FINE @******************************************************@ .align 2 -bgm_p_school: +mus_school: .byte 4 @ NumTrks .byte 0 @ NumBlks - .byte bgm_p_school_pri @ Priority - .byte bgm_p_school_rev @ Reverb. + .byte mus_school_pri @ Priority + .byte mus_school_rev @ Reverb. - .word bgm_p_school_grp + .word mus_school_grp - .word bgm_p_school_1 - .word bgm_p_school_2 - .word bgm_p_school_3 - .word bgm_p_school_4 + .word mus_school_1 + .word mus_school_2 + .word mus_school_3 + .word mus_school_4 .end diff --git a/sound/songs/bgm_maborosi.s b/sound/songs/mus_sealed_chamber.s index 6f2aeec15..d1f5d9534 100644 --- a/sound/songs/bgm_maborosi.s +++ b/sound/songs/mus_sealed_chamber.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_maborosi_grp, voicegroup081 - .equ bgm_maborosi_pri, 0 - .equ bgm_maborosi_rev, reverb_set+50 - .equ bgm_maborosi_mvl, 127 - .equ bgm_maborosi_key, 0 - .equ bgm_maborosi_tbs, 1 - .equ bgm_maborosi_exg, 0 - .equ bgm_maborosi_cmp, 1 + .equ mus_sealed_chamber_grp, voicegroup081 + .equ mus_sealed_chamber_pri, 0 + .equ mus_sealed_chamber_rev, reverb_set+50 + .equ mus_sealed_chamber_mvl, 127 + .equ mus_sealed_chamber_key, 0 + .equ mus_sealed_chamber_tbs, 1 + .equ mus_sealed_chamber_exg, 0 + .equ mus_sealed_chamber_cmp, 1 .section .rodata - .global bgm_maborosi + .global mus_sealed_chamber .align 2 @********************** Track 1 **********************@ -bgm_maborosi_1: - .byte KEYSH , bgm_maborosi_key+0 -bgm_maborosi_1_B1: - .byte TEMPO , 140*bgm_maborosi_tbs/2 +mus_sealed_chamber_1: + .byte KEYSH , mus_sealed_chamber_key+0 +mus_sealed_chamber_1_B1: + .byte TEMPO , 140*mus_sealed_chamber_tbs/2 .byte VOICE , 46 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 100*bgm_maborosi_mvl/mxv + .byte VOL , 100*mus_sealed_chamber_mvl/mxv .byte PAN , c_v+0 .byte W72 .byte W72 @@ -176,20 +176,20 @@ bgm_maborosi_1_B1: .byte As2 .byte W06 .byte GOTO - .word bgm_maborosi_1_B1 + .word mus_sealed_chamber_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_maborosi_2: - .byte KEYSH , bgm_maborosi_key+0 -bgm_maborosi_2_B1: +mus_sealed_chamber_2: + .byte KEYSH , mus_sealed_chamber_key+0 +mus_sealed_chamber_2_B1: .byte VOICE , 46 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 - .byte VOL , 84*bgm_maborosi_mvl/mxv + .byte VOL , 84*mus_sealed_chamber_mvl/mxv .byte PAN , c_v-32 .byte N06 , Bn2 , v064 .byte W12 @@ -203,7 +203,7 @@ bgm_maborosi_2_B1: .byte W12 .byte Dn4 .byte W12 -bgm_maborosi_2_000: +mus_sealed_chamber_2_000: .byte PAN , c_v-16 .byte N06 , Fs4 , v064 .byte W12 @@ -218,7 +218,7 @@ bgm_maborosi_2_000: .byte Gs5 .byte W12 .byte PEND -bgm_maborosi_2_001: +mus_sealed_chamber_2_001: .byte PAN , c_v+48 .byte N06 , As5 , v064 .byte W12 @@ -267,9 +267,9 @@ bgm_maborosi_2_001: .byte Dn4 .byte W12 .byte PATT - .word bgm_maborosi_2_000 + .word mus_sealed_chamber_2_000 .byte PATT - .word bgm_maborosi_2_001 + .word mus_sealed_chamber_2_001 .byte PAN , c_v+27 .byte N04 , As4 , v064 .byte W08 @@ -354,7 +354,7 @@ bgm_maborosi_2_001: .byte Fs1 , v048 .byte W06 .byte PAN , c_v+34 - .byte VOL , 100*bgm_maborosi_mvl/mxv + .byte VOL , 100*mus_sealed_chamber_mvl/mxv .byte N12 , Bn1 , v064 .byte W60 .byte PAN , c_v-32 @@ -412,7 +412,7 @@ bgm_maborosi_2_001: .byte W03 .byte Cs5 , v048 .byte W03 - .byte VOL , 85*bgm_maborosi_mvl/mxv + .byte VOL , 85*mus_sealed_chamber_mvl/mxv .byte N60 , Dn5 , v064 .byte W60 .byte N06 , Bn4 @@ -477,7 +477,7 @@ bgm_maborosi_2_001: .byte W12 .byte N06 , Bn4 .byte W12 -bgm_maborosi_2_002: +mus_sealed_chamber_2_002: .byte N60 , As4 , v064 .byte W60 .byte N06 , Gs4 @@ -492,22 +492,22 @@ bgm_maborosi_2_002: .byte Gs4 .byte W24 .byte PATT - .word bgm_maborosi_2_002 + .word mus_sealed_chamber_2_002 .byte N60 , Fn4 , v064 .byte W72 .byte GOTO - .word bgm_maborosi_2_B1 + .word mus_sealed_chamber_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_maborosi_3: - .byte KEYSH , bgm_maborosi_key+0 -bgm_maborosi_3_B1: +mus_sealed_chamber_3: + .byte KEYSH , mus_sealed_chamber_key+0 +mus_sealed_chamber_3_B1: .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 73*bgm_maborosi_mvl/mxv + .byte VOL , 73*mus_sealed_chamber_mvl/mxv .byte PAN , c_v+18 .byte N12 , Fs4 , v024 .byte W12 @@ -521,7 +521,7 @@ bgm_maborosi_3_B1: .byte W12 .byte Gs4 , v044 .byte W12 -bgm_maborosi_3_000: +mus_sealed_chamber_3_000: .byte N12 , Fs4 , v048 .byte W12 .byte Gs4 , v052 @@ -535,7 +535,7 @@ bgm_maborosi_3_000: .byte Gs4 , v068 .byte W12 .byte PEND -bgm_maborosi_3_001: +mus_sealed_chamber_3_001: .byte N12 , Fn4 , v072 .byte W12 .byte As4 , v068 @@ -549,7 +549,7 @@ bgm_maborosi_3_001: .byte As4 , v048 .byte W12 .byte PEND -bgm_maborosi_3_002: +mus_sealed_chamber_3_002: .byte N12 , Fn4 , v044 .byte W12 .byte As4 , v040 @@ -563,7 +563,7 @@ bgm_maborosi_3_002: .byte As4 , v020 .byte W12 .byte PEND -bgm_maborosi_3_003: +mus_sealed_chamber_3_003: .byte N12 , Fs4 , v024 .byte W12 .byte Gs4 , v028 @@ -578,7 +578,7 @@ bgm_maborosi_3_003: .byte W12 .byte PEND .byte PATT - .word bgm_maborosi_3_000 + .word mus_sealed_chamber_3_000 .byte N12 , Fn4 , v076 .byte W12 .byte As4 , v072 @@ -604,10 +604,10 @@ bgm_maborosi_3_003: .byte As4 , v024 .byte W12 .byte PATT - .word bgm_maborosi_3_003 + .word mus_sealed_chamber_3_003 .byte PATT - .word bgm_maborosi_3_000 -bgm_maborosi_3_004: + .word mus_sealed_chamber_3_000 +mus_sealed_chamber_3_004: .byte N12 , Fn4 , v072 .byte W12 .byte As4 , v068 @@ -634,11 +634,11 @@ bgm_maborosi_3_004: .byte As4 , v024 .byte W12 .byte PATT - .word bgm_maborosi_3_003 + .word mus_sealed_chamber_3_003 .byte PATT - .word bgm_maborosi_3_000 + .word mus_sealed_chamber_3_000 .byte PATT - .word bgm_maborosi_3_004 + .word mus_sealed_chamber_3_004 .byte N12 , Fn4 , v044 .byte W12 .byte As4 , v040 @@ -652,11 +652,11 @@ bgm_maborosi_3_004: .byte As4 , v020 .byte W12 .byte PATT - .word bgm_maborosi_3_003 + .word mus_sealed_chamber_3_003 .byte PATT - .word bgm_maborosi_3_000 + .word mus_sealed_chamber_3_000 .byte PATT - .word bgm_maborosi_3_004 + .word mus_sealed_chamber_3_004 .byte N12 , Fn4 , v048 .byte W12 .byte As4 , v044 @@ -670,9 +670,9 @@ bgm_maborosi_3_004: .byte As4 , v024 .byte W12 .byte PATT - .word bgm_maborosi_3_003 + .word mus_sealed_chamber_3_003 .byte PATT - .word bgm_maborosi_3_000 + .word mus_sealed_chamber_3_000 .byte N12 , Fn4 , v076 .byte W12 .byte As4 , v072 @@ -698,28 +698,28 @@ bgm_maborosi_3_004: .byte As4 , v028 .byte W12 .byte PATT - .word bgm_maborosi_3_003 + .word mus_sealed_chamber_3_003 .byte PATT - .word bgm_maborosi_3_000 + .word mus_sealed_chamber_3_000 .byte PATT - .word bgm_maborosi_3_001 + .word mus_sealed_chamber_3_001 .byte PATT - .word bgm_maborosi_3_002 + .word mus_sealed_chamber_3_002 .byte GOTO - .word bgm_maborosi_3_B1 + .word mus_sealed_chamber_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_maborosi_4: - .byte KEYSH , bgm_maborosi_key+0 -bgm_maborosi_4_B1: +mus_sealed_chamber_4: + .byte KEYSH , mus_sealed_chamber_key+0 +mus_sealed_chamber_4_B1: .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 50*bgm_maborosi_mvl/mxv + .byte VOL , 50*mus_sealed_chamber_mvl/mxv .byte PAN , c_v-62 .byte TIE , Dn3 , v064 .byte W72 @@ -729,7 +729,7 @@ bgm_maborosi_4_B1: .byte W06 .byte En3 .byte W06 -bgm_maborosi_4_000: +mus_sealed_chamber_4_000: .byte N60 , Fn3 , v064 .byte W60 .byte N06 , Ds3 @@ -737,7 +737,7 @@ bgm_maborosi_4_000: .byte Cs3 .byte W06 .byte PEND -bgm_maborosi_4_001: +mus_sealed_chamber_4_001: .byte N60 , Cn3 , v064 .byte W60 .byte N06 , Bn2 @@ -751,7 +751,7 @@ bgm_maborosi_4_001: .byte EOT .byte N06 , Cs3 .byte W06 -bgm_maborosi_4_002: +mus_sealed_chamber_4_002: .byte N60 , Cn3 , v064 .byte W60 .byte N06 , As2 @@ -759,7 +759,7 @@ bgm_maborosi_4_002: .byte Gs2 .byte W06 .byte PEND -bgm_maborosi_4_003: +mus_sealed_chamber_4_003: .byte N66 , Fn2 , v064 .byte W66 .byte N06 , Fs2 @@ -773,7 +773,7 @@ bgm_maborosi_4_003: .byte W06 .byte Ds3 .byte W06 -bgm_maborosi_4_004: +mus_sealed_chamber_4_004: .byte N60 , Fs3 , v064 .byte W60 .byte N06 , Gs3 @@ -792,9 +792,9 @@ bgm_maborosi_4_004: .byte En3 .byte W06 .byte PATT - .word bgm_maborosi_4_000 + .word mus_sealed_chamber_4_000 .byte PATT - .word bgm_maborosi_4_001 + .word mus_sealed_chamber_4_001 .byte TIE , Dn3 , v064 .byte W72 .byte W66 @@ -802,9 +802,9 @@ bgm_maborosi_4_004: .byte N06 , Cs3 .byte W06 .byte PATT - .word bgm_maborosi_4_002 + .word mus_sealed_chamber_4_002 .byte PATT - .word bgm_maborosi_4_003 + .word mus_sealed_chamber_4_003 .byte TIE , Gn2 , v064 .byte W72 .byte W60 @@ -814,7 +814,7 @@ bgm_maborosi_4_004: .byte Ds3 .byte W06 .byte PATT - .word bgm_maborosi_4_004 + .word mus_sealed_chamber_4_004 .byte N72 , Fn3 , v064 .byte W72 .byte TIE , Dn3 @@ -826,24 +826,24 @@ bgm_maborosi_4_004: .byte En3 .byte W06 .byte PATT - .word bgm_maborosi_4_000 + .word mus_sealed_chamber_4_000 .byte PATT - .word bgm_maborosi_4_001 + .word mus_sealed_chamber_4_001 .byte GOTO - .word bgm_maborosi_4_B1 + .word mus_sealed_chamber_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_maborosi_5: - .byte KEYSH , bgm_maborosi_key+0 -bgm_maborosi_5_B1: +mus_sealed_chamber_5: + .byte KEYSH , mus_sealed_chamber_key+0 +mus_sealed_chamber_5_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 50*bgm_maborosi_mvl/mxv + .byte VOL , 50*mus_sealed_chamber_mvl/mxv .byte PAN , c_v+63 .byte TIE , Gs3 , v064 .byte W72 @@ -859,7 +859,7 @@ bgm_maborosi_5_B1: .byte EOT .byte N06 , An3 .byte W06 -bgm_maborosi_5_000: +mus_sealed_chamber_5_000: .byte N60 , Gs3 , v064 .byte W60 .byte N06 , Bn3 @@ -867,25 +867,25 @@ bgm_maborosi_5_000: .byte Cs4 .byte W06 .byte PEND -bgm_maborosi_5_001: +mus_sealed_chamber_5_001: .byte N60 , Dn4 , v064 .byte W60 .byte N12 , Bn3 .byte W12 .byte PEND -bgm_maborosi_5_002: +mus_sealed_chamber_5_002: .byte N60 , Cs4 , v064 .byte W60 .byte N12 , As3 .byte W12 .byte PEND -bgm_maborosi_5_003: +mus_sealed_chamber_5_003: .byte N66 , Cn4 , v064 .byte W66 .byte N06 , Fn3 .byte W06 .byte PEND -bgm_maborosi_5_004: +mus_sealed_chamber_5_004: .byte N60 , Fs3 , v064 .byte W60 .byte N06 , Bn3 @@ -894,8 +894,8 @@ bgm_maborosi_5_004: .byte W06 .byte PEND .byte PATT - .word bgm_maborosi_5_001 -bgm_maborosi_5_005: + .word mus_sealed_chamber_5_001 +mus_sealed_chamber_5_005: .byte N60 , Cs4 , v064 .byte W60 .byte N06 , Ds4 @@ -920,19 +920,19 @@ bgm_maborosi_5_005: .byte N06 , An3 .byte W06 .byte PATT - .word bgm_maborosi_5_000 + .word mus_sealed_chamber_5_000 .byte PATT - .word bgm_maborosi_5_001 + .word mus_sealed_chamber_5_001 .byte PATT - .word bgm_maborosi_5_002 + .word mus_sealed_chamber_5_002 .byte PATT - .word bgm_maborosi_5_003 + .word mus_sealed_chamber_5_003 .byte PATT - .word bgm_maborosi_5_004 + .word mus_sealed_chamber_5_004 .byte PATT - .word bgm_maborosi_5_001 + .word mus_sealed_chamber_5_001 .byte PATT - .word bgm_maborosi_5_005 + .word mus_sealed_chamber_5_005 .byte N72 , Cn4 , v064 .byte W72 .byte TIE , Gs3 @@ -950,16 +950,16 @@ bgm_maborosi_5_005: .byte N06 , An3 .byte W06 .byte GOTO - .word bgm_maborosi_5_B1 + .word mus_sealed_chamber_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_maborosi_6: - .byte KEYSH , bgm_maborosi_key+0 -bgm_maborosi_6_B1: +mus_sealed_chamber_6: + .byte KEYSH , mus_sealed_chamber_key+0 +mus_sealed_chamber_6_B1: .byte VOICE , 0 - .byte VOL , 93*bgm_maborosi_mvl/mxv + .byte VOL , 93*mus_sealed_chamber_mvl/mxv .byte W72 .byte W72 .byte W72 @@ -990,27 +990,27 @@ bgm_maborosi_6_B1: .byte W72 .byte W72 .byte GOTO - .word bgm_maborosi_6_B1 + .word mus_sealed_chamber_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_maborosi_7: - .byte KEYSH , bgm_maborosi_key+0 -bgm_maborosi_7_B1: +mus_sealed_chamber_7: + .byte KEYSH , mus_sealed_chamber_key+0 +mus_sealed_chamber_7_B1: .byte VOICE , 87 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 75*bgm_maborosi_mvl/mxv + .byte VOL , 75*mus_sealed_chamber_mvl/mxv .byte BEND , c_v+0 .byte N60 , Bn1 , v064 .byte W60 .byte N06 , Fs1 .byte W12 -bgm_maborosi_7_000: +mus_sealed_chamber_7_000: .byte N24 , Bn1 , v064 .byte W24 .byte N06 @@ -1026,13 +1026,13 @@ bgm_maborosi_7_000: .byte Gn1 .byte W06 .byte PEND -bgm_maborosi_7_001: +mus_sealed_chamber_7_001: .byte N60 , Fs1 , v064 .byte W60 .byte N06 , Cn1 .byte W12 .byte PEND -bgm_maborosi_7_002: +mus_sealed_chamber_7_002: .byte N30 , Fs1 , v064 .byte W36 .byte N06 , Cn1 @@ -1046,7 +1046,7 @@ bgm_maborosi_7_002: .byte As1 .byte W06 .byte PEND -bgm_maborosi_7_003: +mus_sealed_chamber_7_003: .byte N60 , Bn1 , v064 .byte W60 .byte N06 , Fs1 @@ -1055,9 +1055,9 @@ bgm_maborosi_7_003: .byte W06 .byte PEND .byte PATT - .word bgm_maborosi_7_000 + .word mus_sealed_chamber_7_000 .byte PATT - .word bgm_maborosi_7_001 + .word mus_sealed_chamber_7_001 .byte N24 , Fs1 , v064 .byte W24 .byte N06 @@ -1072,13 +1072,13 @@ bgm_maborosi_7_003: .byte W06 .byte Fs1 .byte W06 -bgm_maborosi_7_004: +mus_sealed_chamber_7_004: .byte N60 , Gn1 , v064 .byte W60 .byte N06 , Bn0 .byte W12 .byte PEND -bgm_maborosi_7_005: +mus_sealed_chamber_7_005: .byte N48 , Gn1 , v064 .byte W48 .byte N06 , Bn0 @@ -1086,7 +1086,7 @@ bgm_maborosi_7_005: .byte N12 , Gn1 .byte W12 .byte PEND -bgm_maborosi_7_006: +mus_sealed_chamber_7_006: .byte N48 , Fs1 , v064 .byte W48 .byte N06 , Cs1 @@ -1102,7 +1102,7 @@ bgm_maborosi_7_006: .byte W12 .byte N06 , As1 .byte W12 -bgm_maborosi_7_007: +mus_sealed_chamber_7_007: .byte N60 , Bn1 , v064 .byte W60 .byte N06 , Fs1 @@ -1121,7 +1121,7 @@ bgm_maborosi_7_007: .byte Gn1 .byte W06 .byte PATT - .word bgm_maborosi_7_001 + .word mus_sealed_chamber_7_001 .byte N30 , Fs1 , v064 .byte W36 .byte N06 @@ -1133,7 +1133,7 @@ bgm_maborosi_7_007: .byte As1 .byte W06 .byte PATT - .word bgm_maborosi_7_003 + .word mus_sealed_chamber_7_003 .byte N60 , Bn1 , v064 .byte W60 .byte N06 , An1 @@ -1141,7 +1141,7 @@ bgm_maborosi_7_007: .byte Gn1 .byte W06 .byte PATT - .word bgm_maborosi_7_001 + .word mus_sealed_chamber_7_001 .byte N24 , Fs1 , v064 .byte W36 .byte N06 @@ -1153,11 +1153,11 @@ bgm_maborosi_7_007: .byte Fs1 .byte W06 .byte PATT - .word bgm_maborosi_7_004 + .word mus_sealed_chamber_7_004 .byte PATT - .word bgm_maborosi_7_005 + .word mus_sealed_chamber_7_005 .byte PATT - .word bgm_maborosi_7_006 + .word mus_sealed_chamber_7_006 .byte N36 , Fs1 , v064 .byte W36 .byte N06 , Cn1 @@ -1167,26 +1167,26 @@ bgm_maborosi_7_007: .byte N06 , Cn1 .byte W12 .byte PATT - .word bgm_maborosi_7_007 + .word mus_sealed_chamber_7_007 .byte PATT - .word bgm_maborosi_7_000 + .word mus_sealed_chamber_7_000 .byte PATT - .word bgm_maborosi_7_001 + .word mus_sealed_chamber_7_001 .byte PATT - .word bgm_maborosi_7_002 + .word mus_sealed_chamber_7_002 .byte GOTO - .word bgm_maborosi_7_B1 + .word mus_sealed_chamber_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_maborosi_8: - .byte KEYSH , bgm_maborosi_key+0 -bgm_maborosi_8_B1: +mus_sealed_chamber_8: + .byte KEYSH , mus_sealed_chamber_key+0 +mus_sealed_chamber_8_B1: .byte VOICE , 24 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 100*bgm_maborosi_mvl/mxv + .byte VOL , 100*mus_sealed_chamber_mvl/mxv .byte PAN , c_v-17 .byte N12 , Bn3 , v024 .byte W12 @@ -1200,7 +1200,7 @@ bgm_maborosi_8_B1: .byte W12 .byte Dn4 , v044 .byte W12 -bgm_maborosi_8_000: +mus_sealed_chamber_8_000: .byte N12 , Bn3 , v048 .byte W12 .byte Dn4 , v052 @@ -1214,7 +1214,7 @@ bgm_maborosi_8_000: .byte Dn4 , v068 .byte W12 .byte PEND -bgm_maborosi_8_001: +mus_sealed_chamber_8_001: .byte N12 , As3 , v072 .byte W12 .byte Cn4 , v068 @@ -1228,7 +1228,7 @@ bgm_maborosi_8_001: .byte Cn4 , v048 .byte W12 .byte PEND -bgm_maborosi_8_002: +mus_sealed_chamber_8_002: .byte N12 , As3 , v044 .byte W12 .byte Cn4 , v040 @@ -1242,7 +1242,7 @@ bgm_maborosi_8_002: .byte Cn4 , v020 .byte W12 .byte PEND -bgm_maborosi_8_003: +mus_sealed_chamber_8_003: .byte N12 , Bn3 , v032 .byte W12 .byte Dn4 , v068 @@ -1256,7 +1256,7 @@ bgm_maborosi_8_003: .byte Dn4 .byte W12 .byte PEND -bgm_maborosi_8_004: +mus_sealed_chamber_8_004: .byte N12 , Bn3 , v052 .byte W12 .byte Dn4 , v064 @@ -1270,7 +1270,7 @@ bgm_maborosi_8_004: .byte Dn4 , v048 .byte W12 .byte PEND -bgm_maborosi_8_005: +mus_sealed_chamber_8_005: .byte N12 , As3 , v064 .byte W12 .byte Cs4 @@ -1284,7 +1284,7 @@ bgm_maborosi_8_005: .byte Cs4 .byte W12 .byte PEND -bgm_maborosi_8_006: +mus_sealed_chamber_8_006: .byte N12 , As3 , v052 .byte W12 .byte Cn4 , v064 @@ -1298,7 +1298,7 @@ bgm_maborosi_8_006: .byte Cn4 , v048 .byte W12 .byte PEND -bgm_maborosi_8_007: +mus_sealed_chamber_8_007: .byte N12 , Fs3 , v064 .byte W12 .byte Bn3 @@ -1312,7 +1312,7 @@ bgm_maborosi_8_007: .byte Bn3 .byte W12 .byte PEND -bgm_maborosi_8_008: +mus_sealed_chamber_8_008: .byte N12 , Gn3 , v052 .byte W12 .byte Bn3 , v064 @@ -1327,10 +1327,10 @@ bgm_maborosi_8_008: .byte W12 .byte PEND .byte PATT - .word bgm_maborosi_8_005 + .word mus_sealed_chamber_8_005 .byte PATT - .word bgm_maborosi_8_006 -bgm_maborosi_8_009: + .word mus_sealed_chamber_8_006 +mus_sealed_chamber_8_009: .byte N12 , Bn3 , v024 .byte W12 .byte Dn4 , v028 @@ -1345,7 +1345,7 @@ bgm_maborosi_8_009: .byte W12 .byte PEND .byte PATT - .word bgm_maborosi_8_000 + .word mus_sealed_chamber_8_000 .byte N12 , As3 , v076 .byte W12 .byte Cn4 , v072 @@ -1371,51 +1371,51 @@ bgm_maborosi_8_009: .byte Cn4 , v020 .byte W12 .byte PATT - .word bgm_maborosi_8_003 + .word mus_sealed_chamber_8_003 .byte PATT - .word bgm_maborosi_8_004 + .word mus_sealed_chamber_8_004 .byte PATT - .word bgm_maborosi_8_005 + .word mus_sealed_chamber_8_005 .byte PATT - .word bgm_maborosi_8_006 + .word mus_sealed_chamber_8_006 .byte PATT - .word bgm_maborosi_8_007 + .word mus_sealed_chamber_8_007 .byte PATT - .word bgm_maborosi_8_008 + .word mus_sealed_chamber_8_008 .byte PATT - .word bgm_maborosi_8_005 + .word mus_sealed_chamber_8_005 .byte PATT - .word bgm_maborosi_8_006 + .word mus_sealed_chamber_8_006 .byte PATT - .word bgm_maborosi_8_009 + .word mus_sealed_chamber_8_009 .byte PATT - .word bgm_maborosi_8_000 + .word mus_sealed_chamber_8_000 .byte PATT - .word bgm_maborosi_8_001 + .word mus_sealed_chamber_8_001 .byte PATT - .word bgm_maborosi_8_002 + .word mus_sealed_chamber_8_002 .byte GOTO - .word bgm_maborosi_8_B1 + .word mus_sealed_chamber_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_maborosi: +mus_sealed_chamber: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_maborosi_pri @ Priority - .byte bgm_maborosi_rev @ Reverb. + .byte mus_sealed_chamber_pri @ Priority + .byte mus_sealed_chamber_rev @ Reverb. - .word bgm_maborosi_grp + .word mus_sealed_chamber_grp - .word bgm_maborosi_1 - .word bgm_maborosi_2 - .word bgm_maborosi_3 - .word bgm_maborosi_4 - .word bgm_maborosi_5 - .word bgm_maborosi_6 - .word bgm_maborosi_7 - .word bgm_maborosi_8 + .word mus_sealed_chamber_1 + .word mus_sealed_chamber_2 + .word mus_sealed_chamber_3 + .word mus_sealed_chamber_4 + .word mus_sealed_chamber_5 + .word mus_sealed_chamber_6 + .word mus_sealed_chamber_7 + .word mus_sealed_chamber_8 .end diff --git a/sound/songs/bgm_finecity.s b/sound/songs/mus_slateport.s index 62f585729..5f2264e26 100644 --- a/sound/songs/bgm_finecity.s +++ b/sound/songs/mus_slateport.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_finecity_grp, voicegroup076 - .equ bgm_finecity_pri, 0 - .equ bgm_finecity_rev, reverb_set+50 - .equ bgm_finecity_mvl, 127 - .equ bgm_finecity_key, 0 - .equ bgm_finecity_tbs, 1 - .equ bgm_finecity_exg, 0 - .equ bgm_finecity_cmp, 1 + .equ mus_slateport_grp, voicegroup076 + .equ mus_slateport_pri, 0 + .equ mus_slateport_rev, reverb_set+50 + .equ mus_slateport_mvl, 127 + .equ mus_slateport_key, 0 + .equ mus_slateport_tbs, 1 + .equ mus_slateport_exg, 0 + .equ mus_slateport_cmp, 1 .section .rodata - .global bgm_finecity + .global mus_slateport .align 2 @********************** Track 1 **********************@ -bgm_finecity_1: - .byte KEYSH , bgm_finecity_key+0 - .byte TEMPO , 124*bgm_finecity_tbs/2 +mus_slateport_1: + .byte KEYSH , mus_slateport_key+0 + .byte TEMPO , 124*mus_slateport_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 41*bgm_finecity_mvl/mxv + .byte VOL , 41*mus_slateport_mvl/mxv .byte W48 -bgm_finecity_1_B1: -bgm_finecity_1_000: +mus_slateport_1_B1: +mus_slateport_1_000: .byte W12 .byte N03 , Gn5 , v064 .byte W24 @@ -37,12 +37,12 @@ bgm_finecity_1_000: .byte W12 .byte PEND .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 -bgm_finecity_1_001: + .word mus_slateport_1_000 +mus_slateport_1_001: .byte N03 , Gn5 , v112 .byte W12 .byte Gn5 , v076 @@ -65,8 +65,8 @@ bgm_finecity_1_001: .byte W06 .byte PEND .byte PATT - .word bgm_finecity_1_001 -bgm_finecity_1_002: + .word mus_slateport_1_001 +mus_slateport_1_002: .byte N03 , Gn5 , v112 .byte W12 .byte Gn5 , v076 @@ -88,7 +88,7 @@ bgm_finecity_1_002: .byte N03 .byte W06 .byte PEND -bgm_finecity_1_003: +mus_slateport_1_003: .byte N03 , Gn5 , v112 .byte W12 .byte Gn5 , v076 @@ -107,12 +107,12 @@ bgm_finecity_1_003: .byte W24 .byte PEND .byte PATT - .word bgm_finecity_1_001 + .word mus_slateport_1_001 .byte PATT - .word bgm_finecity_1_001 + .word mus_slateport_1_001 .byte PATT - .word bgm_finecity_1_001 -bgm_finecity_1_004: + .word mus_slateport_1_001 +mus_slateport_1_004: .byte N03 , Gn5 , v112 .byte W12 .byte Gn5 , v076 @@ -129,7 +129,7 @@ bgm_finecity_1_004: .byte W24 .byte PEND .byte PATT - .word bgm_finecity_1_001 + .word mus_slateport_1_001 .byte N03 , Gn5 , v112 .byte W06 .byte Gn5 , v092 @@ -171,76 +171,76 @@ bgm_finecity_1_004: .byte Gn5 , v080 .byte W06 .byte PATT - .word bgm_finecity_1_004 + .word mus_slateport_1_004 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_001 + .word mus_slateport_1_001 .byte PATT - .word bgm_finecity_1_001 + .word mus_slateport_1_001 .byte PATT - .word bgm_finecity_1_002 + .word mus_slateport_1_002 .byte PATT - .word bgm_finecity_1_003 + .word mus_slateport_1_003 .byte PATT - .word bgm_finecity_1_001 + .word mus_slateport_1_001 .byte PATT - .word bgm_finecity_1_001 + .word mus_slateport_1_001 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte PATT - .word bgm_finecity_1_000 + .word mus_slateport_1_000 .byte GOTO - .word bgm_finecity_1_B1 + .word mus_slateport_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_finecity_2: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_2: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 14 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 68*bgm_finecity_mvl/mxv + .byte VOL , 68*mus_slateport_mvl/mxv .byte PAN , c_v+0 .byte W48 -bgm_finecity_2_B1: +mus_slateport_2_B1: .byte VOICE , 14 - .byte VOL , 68*bgm_finecity_mvl/mxv + .byte VOL , 68*mus_slateport_mvl/mxv .byte N36 , Fs4 , v112 .byte W24 .byte N24 , Dn4 @@ -249,7 +249,7 @@ bgm_finecity_2_B1: .byte W24 .byte An3 .byte W24 -bgm_finecity_2_000: +mus_slateport_2_000: .byte N24 , Fs4 , v112 .byte W24 .byte Dn4 @@ -259,7 +259,7 @@ bgm_finecity_2_000: .byte An4 .byte W24 .byte PEND -bgm_finecity_2_001: +mus_slateport_2_001: .byte N24 , Bn4 , v112 .byte W24 .byte Gn4 @@ -271,7 +271,7 @@ bgm_finecity_2_001: .byte PEND .byte VOICE , 48 .byte PAN , c_v+0 - .byte VOL , 52*bgm_finecity_mvl/mxv + .byte VOL , 52*mus_slateport_mvl/mxv .byte W12 .byte N12 , Gn4 .byte W12 @@ -283,7 +283,7 @@ bgm_finecity_2_001: .byte W24 .byte VOICE , 17 .byte PAN , c_v+0 - .byte VOL , 51*bgm_finecity_mvl/mxv + .byte VOL , 51*mus_slateport_mvl/mxv .byte W36 .byte N03 , Dn5 .byte W06 @@ -407,7 +407,7 @@ bgm_finecity_2_001: .byte VOICE , 73 .byte MOD , 0 .byte W48 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte N12 , Gn5 .byte W12 .byte N06 , Fs5 @@ -435,24 +435,24 @@ bgm_finecity_2_001: .byte N42 , Fs5 .byte W12 .byte MOD , 5 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte W02 - .byte 44*bgm_finecity_mvl/mxv + .byte 44*mus_slateport_mvl/mxv .byte W03 - .byte 41*bgm_finecity_mvl/mxv + .byte 41*mus_slateport_mvl/mxv .byte W03 - .byte 39*bgm_finecity_mvl/mxv + .byte 39*mus_slateport_mvl/mxv .byte W04 - .byte 39*bgm_finecity_mvl/mxv + .byte 39*mus_slateport_mvl/mxv .byte W02 - .byte 36*bgm_finecity_mvl/mxv + .byte 36*mus_slateport_mvl/mxv .byte W03 - .byte 34*bgm_finecity_mvl/mxv + .byte 34*mus_slateport_mvl/mxv .byte W04 - .byte 31*bgm_finecity_mvl/mxv + .byte 31*mus_slateport_mvl/mxv .byte W03 .byte MOD , 0 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte W12 .byte N03 .byte W06 @@ -489,32 +489,32 @@ bgm_finecity_2_001: .byte N48 , En5 .byte W24 .byte MOD , 4 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte W02 - .byte 43*bgm_finecity_mvl/mxv + .byte 43*mus_slateport_mvl/mxv .byte W03 - .byte 41*bgm_finecity_mvl/mxv + .byte 41*mus_slateport_mvl/mxv .byte W03 - .byte 39*bgm_finecity_mvl/mxv + .byte 39*mus_slateport_mvl/mxv .byte W04 - .byte 37*bgm_finecity_mvl/mxv + .byte 37*mus_slateport_mvl/mxv .byte W02 - .byte 36*bgm_finecity_mvl/mxv + .byte 36*mus_slateport_mvl/mxv .byte W03 - .byte 34*bgm_finecity_mvl/mxv + .byte 34*mus_slateport_mvl/mxv .byte W03 - .byte 31*bgm_finecity_mvl/mxv + .byte 31*mus_slateport_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 30*bgm_finecity_mvl/mxv + .byte VOL , 30*mus_slateport_mvl/mxv .byte W02 - .byte 28*bgm_finecity_mvl/mxv + .byte 28*mus_slateport_mvl/mxv .byte W03 - .byte 28*bgm_finecity_mvl/mxv + .byte 28*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W04 - .byte 46*bgm_finecity_mvl/mxv + .byte 46*mus_slateport_mvl/mxv .byte N12 , Gn5 .byte W18 .byte N06 , Fs5 @@ -522,83 +522,83 @@ bgm_finecity_2_001: .byte N48 , En5 .byte W12 .byte MOD , 4 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte W02 - .byte 44*bgm_finecity_mvl/mxv + .byte 44*mus_slateport_mvl/mxv .byte W03 - .byte 41*bgm_finecity_mvl/mxv + .byte 41*mus_slateport_mvl/mxv .byte W03 - .byte 39*bgm_finecity_mvl/mxv + .byte 39*mus_slateport_mvl/mxv .byte W04 - .byte 37*bgm_finecity_mvl/mxv + .byte 37*mus_slateport_mvl/mxv .byte W02 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte W03 - .byte 31*bgm_finecity_mvl/mxv + .byte 31*mus_slateport_mvl/mxv .byte W03 - .byte 30*bgm_finecity_mvl/mxv + .byte 30*mus_slateport_mvl/mxv .byte W04 - .byte 28*bgm_finecity_mvl/mxv + .byte 28*mus_slateport_mvl/mxv .byte W02 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W03 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte N06 , Ds5 .byte W06 .byte N78 , En5 .byte W06 .byte W24 .byte MOD , 6 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte W02 - .byte 45*bgm_finecity_mvl/mxv + .byte 45*mus_slateport_mvl/mxv .byte W03 - .byte 44*bgm_finecity_mvl/mxv + .byte 44*mus_slateport_mvl/mxv .byte W03 - .byte 43*bgm_finecity_mvl/mxv + .byte 43*mus_slateport_mvl/mxv .byte W04 - .byte 41*bgm_finecity_mvl/mxv + .byte 41*mus_slateport_mvl/mxv .byte W05 - .byte 41*bgm_finecity_mvl/mxv + .byte 41*mus_slateport_mvl/mxv .byte W03 - .byte 39*bgm_finecity_mvl/mxv + .byte 39*mus_slateport_mvl/mxv .byte W06 - .byte 36*bgm_finecity_mvl/mxv + .byte 36*mus_slateport_mvl/mxv .byte W03 - .byte 36*bgm_finecity_mvl/mxv + .byte 36*mus_slateport_mvl/mxv .byte W03 - .byte 34*bgm_finecity_mvl/mxv + .byte 34*mus_slateport_mvl/mxv .byte W04 - .byte 34*bgm_finecity_mvl/mxv + .byte 34*mus_slateport_mvl/mxv .byte W02 - .byte 33*bgm_finecity_mvl/mxv + .byte 33*mus_slateport_mvl/mxv .byte W03 - .byte 31*bgm_finecity_mvl/mxv + .byte 31*mus_slateport_mvl/mxv .byte W03 - .byte 28*bgm_finecity_mvl/mxv + .byte 28*mus_slateport_mvl/mxv .byte W04 - .byte 28*bgm_finecity_mvl/mxv + .byte 28*mus_slateport_mvl/mxv .byte W02 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W06 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W04 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W02 - .byte 20*bgm_finecity_mvl/mxv + .byte 20*mus_slateport_mvl/mxv .byte W03 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W03 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W04 .byte VOICE , 14 .byte MOD , 0 - .byte VOL , 63*bgm_finecity_mvl/mxv + .byte VOL , 63*mus_slateport_mvl/mxv .byte PAN , c_v+11 .byte N24 , An4 .byte W24 @@ -609,7 +609,7 @@ bgm_finecity_2_001: .byte Gn4 .byte W24 .byte VOICE , 14 - .byte VOL , 70*bgm_finecity_mvl/mxv + .byte VOL , 70*mus_slateport_mvl/mxv .byte N24 , Fs4 .byte W24 .byte Dn4 @@ -619,11 +619,11 @@ bgm_finecity_2_001: .byte An3 .byte W24 .byte PATT - .word bgm_finecity_2_000 + .word mus_slateport_2_000 .byte PATT - .word bgm_finecity_2_001 + .word mus_slateport_2_001 .byte VOICE , 48 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte N24 , Gn3 , v112 .byte W24 .byte Fs3 @@ -633,7 +633,7 @@ bgm_finecity_2_001: .byte En3 .byte W24 .byte VOICE , 24 - .byte VOL , 55*bgm_finecity_mvl/mxv + .byte VOL , 55*mus_slateport_mvl/mxv .byte N24 , Fs4 .byte W24 .byte Dn4 @@ -643,11 +643,11 @@ bgm_finecity_2_001: .byte An3 .byte W24 .byte PATT - .word bgm_finecity_2_000 + .word mus_slateport_2_000 .byte PATT - .word bgm_finecity_2_001 + .word mus_slateport_2_001 .byte VOICE , 48 - .byte VOL , 48*bgm_finecity_mvl/mxv + .byte VOL , 48*mus_slateport_mvl/mxv .byte N24 , Gn4 , v112 .byte W24 .byte Fs4 @@ -657,7 +657,7 @@ bgm_finecity_2_001: .byte En4 .byte W24 .byte VOICE , 24 - .byte VOL , 57*bgm_finecity_mvl/mxv + .byte VOL , 57*mus_slateport_mvl/mxv .byte N24 , Gn4 .byte W24 .byte Fs4 @@ -668,7 +668,7 @@ bgm_finecity_2_001: .byte W24 .byte VOICE , 48 .byte PAN , c_v+16 - .byte VOL , 48*bgm_finecity_mvl/mxv + .byte VOL , 48*mus_slateport_mvl/mxv .byte W12 .byte N06 , Gn3 .byte W12 @@ -680,7 +680,7 @@ bgm_finecity_2_001: .byte W24 .byte VOICE , 24 .byte PAN , c_v+0 - .byte VOL , 48*bgm_finecity_mvl/mxv + .byte VOL , 48*mus_slateport_mvl/mxv .byte W48 .byte N12 , Fn4 .byte W12 @@ -773,7 +773,7 @@ bgm_finecity_2_001: .byte W12 .byte N06 , Dn4 .byte W12 - .byte VOL , 52*bgm_finecity_mvl/mxv + .byte VOL , 52*mus_slateport_mvl/mxv .byte N24 , Gs4 .byte W24 .byte En4 @@ -799,7 +799,7 @@ bgm_finecity_2_001: .byte Gs4 .byte W24 .byte VOICE , 48 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte W12 .byte N12 , An3 .byte W12 @@ -810,27 +810,27 @@ bgm_finecity_2_001: .byte En3 .byte W24 .byte GOTO - .word bgm_finecity_2_B1 - .byte VOL , 42*bgm_finecity_mvl/mxv + .word mus_slateport_2_B1 + .byte VOL , 42*mus_slateport_mvl/mxv .byte PAN , c_v+0 .byte FINE @********************** Track 3 **********************@ -bgm_finecity_3: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_3: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 24 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte PAN , c_v-16 .byte W48 -bgm_finecity_3_B1: +mus_slateport_3_B1: .byte VOICE , 24 .byte PAN , c_v-16 - .byte VOL , 45*bgm_finecity_mvl/mxv + .byte VOL , 45*mus_slateport_mvl/mxv .byte N06 , An3 , v112 .byte W06 .byte N03 , Dn4 , v064 @@ -973,7 +973,7 @@ bgm_finecity_3_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 49*bgm_finecity_mvl/mxv + .byte VOL , 49*mus_slateport_mvl/mxv .byte N06 , An3 , v112 .byte W06 .byte N03 , Dn4 , v064 @@ -1098,7 +1098,7 @@ bgm_finecity_3_B1: .byte Cs4 .byte W06 .byte PAN , c_v-16 - .byte VOL , 49*bgm_finecity_mvl/mxv + .byte VOL , 49*mus_slateport_mvl/mxv .byte N06 , An3 , v112 .byte W06 .byte N03 , Dn4 , v064 @@ -1195,7 +1195,7 @@ bgm_finecity_3_B1: .byte W06 .byte N03 , An3 , v064 .byte W06 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N24 , Gn3 , v112 .byte W24 .byte Fs3 @@ -1214,7 +1214,7 @@ bgm_finecity_3_B1: .byte En3 .byte W24 .byte VOICE , 24 - .byte VOL , 52*bgm_finecity_mvl/mxv + .byte VOL , 52*mus_slateport_mvl/mxv .byte W12 .byte N06 , Gn3 .byte W12 @@ -1345,7 +1345,7 @@ bgm_finecity_3_B1: .byte N03 , Bn3 , v064 .byte W06 .byte VOICE , 24 - .byte VOL , 52*bgm_finecity_mvl/mxv + .byte VOL , 52*mus_slateport_mvl/mxv .byte W12 .byte N06 , An4 , v112 .byte W12 @@ -1369,20 +1369,20 @@ bgm_finecity_3_B1: .byte Cs4 .byte W06 .byte GOTO - .word bgm_finecity_3_B1 + .word mus_slateport_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_finecity_4: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_4: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 45 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+16 - .byte VOL , 37*bgm_finecity_mvl/mxv + .byte VOL , 37*mus_slateport_mvl/mxv .byte W48 -bgm_finecity_4_B1: +mus_slateport_4_B1: .byte W96 .byte W96 .byte W96 @@ -1515,7 +1515,7 @@ bgm_finecity_4_B1: .byte W24 .byte PAN , c_v+24 .byte MOD , 0 - .byte VOL , 31*bgm_finecity_mvl/mxv + .byte VOL , 31*mus_slateport_mvl/mxv .byte W48 .byte N12 , En5 .byte W12 @@ -1544,24 +1544,24 @@ bgm_finecity_4_B1: .byte N42 , Cn5 .byte W12 .byte MOD , 5 - .byte VOL , 28*bgm_finecity_mvl/mxv + .byte VOL , 28*mus_slateport_mvl/mxv .byte W02 - .byte 27*bgm_finecity_mvl/mxv + .byte 27*mus_slateport_mvl/mxv .byte W03 - .byte 25*bgm_finecity_mvl/mxv + .byte 25*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W04 - .byte 21*bgm_finecity_mvl/mxv + .byte 21*mus_slateport_mvl/mxv .byte W02 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 13*bgm_finecity_mvl/mxv + .byte 13*mus_slateport_mvl/mxv .byte W03 - .byte 12*bgm_finecity_mvl/mxv + .byte 12*mus_slateport_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 31*bgm_finecity_mvl/mxv + .byte VOL , 31*mus_slateport_mvl/mxv .byte W12 .byte N03 , Ds5 .byte W06 @@ -1592,7 +1592,7 @@ bgm_finecity_4_B1: .byte W12 .byte PAN , c_v-32 .byte MOD , 0 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N06 , Cn4 .byte W06 .byte Gn3 @@ -1662,32 +1662,32 @@ bgm_finecity_4_B1: .byte W06 .byte W24 .byte MOD , 6 - .byte VOL , 31*bgm_finecity_mvl/mxv + .byte VOL , 31*mus_slateport_mvl/mxv .byte W05 - .byte 27*bgm_finecity_mvl/mxv + .byte 27*mus_slateport_mvl/mxv .byte W07 - .byte 25*bgm_finecity_mvl/mxv + .byte 25*mus_slateport_mvl/mxv .byte W05 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W07 - .byte 21*bgm_finecity_mvl/mxv + .byte 21*mus_slateport_mvl/mxv .byte W05 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W07 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W05 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W07 - .byte 16*bgm_finecity_mvl/mxv + .byte 16*mus_slateport_mvl/mxv .byte W05 - .byte 15*bgm_finecity_mvl/mxv + .byte 15*mus_slateport_mvl/mxv .byte W07 - .byte 13*bgm_finecity_mvl/mxv + .byte 13*mus_slateport_mvl/mxv .byte W05 - .byte 12*bgm_finecity_mvl/mxv + .byte 12*mus_slateport_mvl/mxv .byte W07 .byte MOD , 0 - .byte VOL , 37*bgm_finecity_mvl/mxv + .byte VOL , 37*mus_slateport_mvl/mxv .byte N06 , An5 , v112 .byte W24 .byte N06 @@ -1723,21 +1723,21 @@ bgm_finecity_4_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_finecity_4_B1 + .word mus_slateport_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_finecity_5: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_5: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 44*bgm_finecity_mvl/mxv + .byte VOL , 44*mus_slateport_mvl/mxv .byte W48 -bgm_finecity_5_B1: -bgm_finecity_5_000: +mus_slateport_5_B1: +mus_slateport_5_000: .byte N06 , En5 , v112 .byte W24 .byte En5 , v080 @@ -1748,11 +1748,11 @@ bgm_finecity_5_000: .byte W24 .byte PEND .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte W96 .byte W96 .byte W96 @@ -1780,33 +1780,33 @@ bgm_finecity_5_000: .byte En5 , v112 .byte W12 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte W96 .byte W96 .byte W96 @@ -1816,169 +1816,169 @@ bgm_finecity_5_000: .byte W96 .byte W96 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte PATT - .word bgm_finecity_5_000 + .word mus_slateport_5_000 .byte GOTO - .word bgm_finecity_5_B1 + .word mus_slateport_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_finecity_6: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_6: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-63 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte BEND , c_v+0 .byte W48 -bgm_finecity_6_B1: +mus_slateport_6_B1: .byte VOICE , 83 .byte W06 .byte N24 , Fs5 , v084 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Bn5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Gn5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N30 , Fs5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte W06 .byte VOICE , 80 .byte N12 , Gn4 , v112 @@ -2166,7 +2166,7 @@ bgm_finecity_6_B1: .byte W24 .byte Fs3 .byte W24 -bgm_finecity_6_000: +mus_slateport_6_000: .byte MOD , 0 .byte N96 , En4 , v112 .byte W24 @@ -2174,7 +2174,7 @@ bgm_finecity_6_000: .byte W72 .byte PEND .byte PATT - .word bgm_finecity_6_000 + .word mus_slateport_6_000 .byte MOD , 0 .byte N96 , Gn4 , v112 .byte W24 @@ -2202,137 +2202,137 @@ bgm_finecity_6_000: .byte W12 .byte N24 , Fs4 , v112 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Bn4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Gn4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 .byte VOICE , 80 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N24 , Gn3 .byte W24 .byte Fs3 @@ -2344,270 +2344,270 @@ bgm_finecity_6_000: .byte VOICE , 83 .byte N24 , Fs5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Bn5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Gn5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 .byte VOICE , 80 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N24 , Gn3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Gn3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An3 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte W12 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte N12 , Gn4 .byte W03 - .byte VOL , 26*bgm_finecity_mvl/mxv + .byte VOL , 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An4 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte W03 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte W03 - .byte 22*bgm_finecity_mvl/mxv + .byte 22*mus_slateport_mvl/mxv .byte W03 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 .byte VOICE , 80 - .byte VOL , 26*bgm_finecity_mvl/mxv + .byte VOL , 26*mus_slateport_mvl/mxv .byte N84 , Dn4 .byte W84 .byte N06 , Fn4 @@ -2665,282 +2665,282 @@ bgm_finecity_6_000: .byte N96 .byte W96 .byte VOICE , 83 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N24 , Gs4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Bn3 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Gs4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Fs4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Bn4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Cs5 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , An4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Bn4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Gs4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte W12 .byte N12 , An4 .byte W12 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N24 , Gs4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , Dn4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 - .byte 35*bgm_finecity_mvl/mxv + .byte 35*mus_slateport_mvl/mxv .byte N24 , En4 .byte W12 - .byte VOL , 32*bgm_finecity_mvl/mxv + .byte VOL , 32*mus_slateport_mvl/mxv .byte W02 - .byte 24*bgm_finecity_mvl/mxv + .byte 24*mus_slateport_mvl/mxv .byte W01 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte W02 - .byte 19*bgm_finecity_mvl/mxv + .byte 19*mus_slateport_mvl/mxv .byte W01 - .byte 23*bgm_finecity_mvl/mxv + .byte 23*mus_slateport_mvl/mxv .byte W02 - .byte 14*bgm_finecity_mvl/mxv + .byte 14*mus_slateport_mvl/mxv .byte W01 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W03 .byte GOTO - .word bgm_finecity_6_B1 + .word mus_slateport_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_finecity_7: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_7: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 39 .byte LFOS , 44 .byte XCMD , xIECV , 12 .byte xIECV , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 61*bgm_finecity_mvl/mxv + .byte VOL , 61*mus_slateport_mvl/mxv .byte W48 -bgm_finecity_7_B1: +mus_slateport_7_B1: .byte N06 , Dn2 , v112 .byte W06 .byte N12 , Dn2 , v036 @@ -2997,7 +2997,7 @@ bgm_finecity_7_B1: .byte W06 .byte Fs1 .byte W06 -bgm_finecity_7_000: +mus_slateport_7_000: .byte N30 , Gn1 , v112 .byte W30 .byte N06 , Gn1 , v036 @@ -3029,7 +3029,7 @@ bgm_finecity_7_000: .byte W24 .byte An1 .byte W24 -bgm_finecity_7_001: +mus_slateport_7_001: .byte N06 , En1 , v112 .byte W06 .byte En1 , v036 @@ -3196,7 +3196,7 @@ bgm_finecity_7_001: .byte N12 , Fn1 .byte W12 .byte PATT - .word bgm_finecity_7_001 + .word mus_slateport_7_001 .byte N06 , An1 , v112 .byte W06 .byte An1 , v036 @@ -3384,7 +3384,7 @@ bgm_finecity_7_001: .byte Fs1 , v036 .byte W06 .byte PATT - .word bgm_finecity_7_000 + .word mus_slateport_7_000 .byte N06 , Gs1 , v112 .byte W06 .byte An1 @@ -3742,16 +3742,16 @@ bgm_finecity_7_001: .byte An1 .byte W24 .byte GOTO - .word bgm_finecity_7_B1 + .word mus_slateport_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_finecity_8: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_8: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 70*bgm_finecity_mvl/mxv + .byte VOL , 70*mus_slateport_mvl/mxv .byte N06 , Cn1 , v127 .byte N42 , An2 , v060 .byte W12 @@ -3767,8 +3767,8 @@ bgm_finecity_8: .byte W03 .byte N03 .byte W03 -bgm_finecity_8_B1: - .byte VOL , 63*bgm_finecity_mvl/mxv +mus_slateport_8_B1: + .byte VOL , 63*mus_slateport_mvl/mxv .byte N06 , En1 , v112 .byte N48 , An2 , v096 .byte W24 @@ -3789,7 +3789,7 @@ bgm_finecity_8_B1: .byte W12 .byte N06 , Cn1 , v127 .byte W12 -bgm_finecity_8_000: +mus_slateport_8_000: .byte N06 , En1 , v112 .byte N48 , An2 , v092 .byte W24 @@ -3813,7 +3813,7 @@ bgm_finecity_8_000: .byte Cn1 , v127 .byte W12 .byte PEND -bgm_finecity_8_001: +mus_slateport_8_001: .byte N06 , En1 , v112 .byte N48 , An2 , v096 .byte W24 @@ -3876,7 +3876,7 @@ bgm_finecity_8_001: .byte W12 .byte En1 .byte W24 -bgm_finecity_8_002: +mus_slateport_8_002: .byte N06 , Cn1 , v120 .byte W24 .byte En1 , v112 @@ -3893,15 +3893,15 @@ bgm_finecity_8_002: .byte W24 .byte PEND .byte PATT - .word bgm_finecity_8_002 + .word mus_slateport_8_002 .byte PATT - .word bgm_finecity_8_002 + .word mus_slateport_8_002 .byte PATT - .word bgm_finecity_8_002 + .word mus_slateport_8_002 .byte PATT - .word bgm_finecity_8_002 + .word mus_slateport_8_002 .byte PATT - .word bgm_finecity_8_002 + .word mus_slateport_8_002 .byte N06 , Cn1 , v120 .byte W24 .byte En1 , v112 @@ -3979,7 +3979,7 @@ bgm_finecity_8_002: .byte W12 .byte N06 .byte W12 -bgm_finecity_8_003: +mus_slateport_8_003: .byte N06 , En1 , v120 .byte W24 .byte En1 , v112 @@ -4002,7 +4002,7 @@ bgm_finecity_8_003: .byte W12 .byte PEND .byte PATT - .word bgm_finecity_8_003 + .word mus_slateport_8_003 .byte N06 , En1 , v124 .byte W24 .byte En1 , v112 @@ -4045,7 +4045,7 @@ bgm_finecity_8_003: .byte W06 .byte Cn1 .byte W12 -bgm_finecity_8_004: +mus_slateport_8_004: .byte N06 , En1 , v112 .byte N48 , An2 , v088 .byte W24 @@ -4068,10 +4068,10 @@ bgm_finecity_8_004: .byte W12 .byte PEND .byte PATT - .word bgm_finecity_8_000 + .word mus_slateport_8_000 .byte PATT - .word bgm_finecity_8_001 -bgm_finecity_8_005: + .word mus_slateport_8_001 +mus_slateport_8_005: .byte N06 , En1 , v112 .byte N48 , An2 , v092 .byte W24 @@ -4098,7 +4098,7 @@ bgm_finecity_8_005: .byte W12 .byte PEND .byte PATT - .word bgm_finecity_8_004 + .word mus_slateport_8_004 .byte N06 , En1 , v112 .byte N48 , An2 , v088 .byte W24 @@ -4122,9 +4122,9 @@ bgm_finecity_8_005: .byte Cn1 .byte W12 .byte PATT - .word bgm_finecity_8_004 + .word mus_slateport_8_004 .byte PATT - .word bgm_finecity_8_005 + .word mus_slateport_8_005 .byte N06 , En1 , v112 .byte N48 , An2 , v088 .byte W24 @@ -4175,7 +4175,7 @@ bgm_finecity_8_005: .byte W06 .byte Cn1 .byte W12 -bgm_finecity_8_006: +mus_slateport_8_006: .byte N06 , Cn1 , v120 .byte W18 .byte N03 , Dn1 , v060 @@ -4260,7 +4260,7 @@ bgm_finecity_8_006: .byte N06 .byte W06 .byte PATT - .word bgm_finecity_8_006 + .word mus_slateport_8_006 .byte N06 , Cn1 , v120 .byte W18 .byte N03 , Dn1 , v060 @@ -4326,7 +4326,7 @@ bgm_finecity_8_006: .byte Cn1 , v127 .byte W12 .byte PATT - .word bgm_finecity_8_004 + .word mus_slateport_8_004 .byte N06 , En1 , v112 .byte N48 , An2 , v088 .byte W24 @@ -4396,25 +4396,25 @@ bgm_finecity_8_006: .byte Cn1 .byte W12 .byte GOTO - .word bgm_finecity_8_B1 + .word mus_slateport_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_finecity_9: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_9: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 18 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte W48 -bgm_finecity_9_B1: -bgm_finecity_9_000: +mus_slateport_9_B1: +mus_slateport_9_000: .byte VOICE , 6 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N06 , An4 , v112 .byte W06 .byte N03 , Dn5 , v064 @@ -4448,7 +4448,7 @@ bgm_finecity_9_000: .byte Gn5 .byte W06 .byte PEND -bgm_finecity_9_001: +mus_slateport_9_001: .byte N06 , Fs5 , v112 .byte W06 .byte N03 , Dn5 , v064 @@ -4482,7 +4482,7 @@ bgm_finecity_9_001: .byte Gn5 .byte W06 .byte PEND -bgm_finecity_9_002: +mus_slateport_9_002: .byte N06 , Fs5 , v112 .byte W06 .byte N03 , Dn5 , v064 @@ -4518,7 +4518,7 @@ bgm_finecity_9_002: .byte PEND .byte VOICE , 81 .byte PAN , c_v+0 - .byte VOL , 44*bgm_finecity_mvl/mxv + .byte VOL , 44*mus_slateport_mvl/mxv .byte W12 .byte N12 , Bn2 , v112 .byte W12 @@ -4530,7 +4530,7 @@ bgm_finecity_9_002: .byte W24 .byte VOICE , 5 .byte PAN , c_v+63 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N30 , Bn3 .byte W36 .byte N03 @@ -4704,7 +4704,7 @@ bgm_finecity_9_002: .byte W24 .byte Fs4 .byte W24 -bgm_finecity_9_003: +mus_slateport_9_003: .byte MOD , 0 .byte N96 , Gn4 , v112 .byte W24 @@ -4712,7 +4712,7 @@ bgm_finecity_9_003: .byte W72 .byte PEND .byte PATT - .word bgm_finecity_9_003 + .word mus_slateport_9_003 .byte MOD , 0 .byte N96 , An4 , v112 .byte W24 @@ -4761,11 +4761,11 @@ bgm_finecity_9_003: .byte Gn5 .byte W06 .byte PATT - .word bgm_finecity_9_001 + .word mus_slateport_9_001 .byte PATT - .word bgm_finecity_9_002 + .word mus_slateport_9_002 .byte VOICE , 81 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N24 , Bn2 , v112 .byte W24 .byte An2 @@ -4775,14 +4775,14 @@ bgm_finecity_9_003: .byte Cs3 .byte W24 .byte PATT - .word bgm_finecity_9_000 + .word mus_slateport_9_000 .byte PATT - .word bgm_finecity_9_001 + .word mus_slateport_9_001 .byte PATT - .word bgm_finecity_9_002 + .word mus_slateport_9_002 .byte VOICE , 81 .byte PAN , c_v+0 - .byte VOL , 26*bgm_finecity_mvl/mxv + .byte VOL , 26*mus_slateport_mvl/mxv .byte N24 , Bn2 , v112 .byte W24 .byte An2 @@ -4810,7 +4810,7 @@ bgm_finecity_9_003: .byte W24 .byte VOICE , 5 .byte PAN , c_v+63 - .byte VOL , 26*bgm_finecity_mvl/mxv + .byte VOL , 26*mus_slateport_mvl/mxv .byte N84 , Fn4 .byte W84 .byte N06 , Gn4 @@ -4868,7 +4868,7 @@ bgm_finecity_9_003: .byte Fs4 .byte W48 .byte VOICE , 6 - .byte VOL , 35*bgm_finecity_mvl/mxv + .byte VOL , 35*mus_slateport_mvl/mxv .byte N06 , Bn4 .byte W06 .byte N03 , En5 , v064 @@ -4966,7 +4966,7 @@ bgm_finecity_9_003: .byte N03 , Bn4 , v064 .byte W06 .byte VOICE , 81 - .byte VOL , 26*bgm_finecity_mvl/mxv + .byte VOL , 26*mus_slateport_mvl/mxv .byte W12 .byte N12 , Cs4 , v112 .byte W12 @@ -4977,31 +4977,31 @@ bgm_finecity_9_003: .byte Cs4 .byte W24 .byte GOTO - .word bgm_finecity_9_B1 + .word mus_slateport_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_finecity_10: - .byte KEYSH , bgm_finecity_key+0 +mus_slateport_10: + .byte KEYSH , mus_slateport_key+0 .byte VOICE , 1 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 44*bgm_finecity_mvl/mxv + .byte VOL , 44*mus_slateport_mvl/mxv .byte W48 -bgm_finecity_10_B1: +mus_slateport_10_B1: .byte W96 .byte W96 .byte W96 .byte W96 .byte VOICE , 48 .byte PAN , c_v+0 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte N48 , En3 , v112 .byte W48 .byte VOICE , 24 - .byte VOL , 40*bgm_finecity_mvl/mxv + .byte VOL , 40*mus_slateport_mvl/mxv .byte N06 , En4 .byte W12 .byte Gn4 @@ -5011,11 +5011,11 @@ bgm_finecity_10_B1: .byte En5 .byte W12 .byte VOICE , 48 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte N48 , Gn3 .byte W48 .byte VOICE , 24 - .byte VOL , 41*bgm_finecity_mvl/mxv + .byte VOL , 41*mus_slateport_mvl/mxv .byte N06 , An4 .byte W12 .byte Cs5 @@ -5024,7 +5024,7 @@ bgm_finecity_10_B1: .byte W12 .byte An5 .byte W12 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte N06 , Gn5 .byte W24 .byte VOICE , 48 @@ -5051,11 +5051,11 @@ bgm_finecity_10_B1: .byte W48 .byte N48 , Gn3 .byte W48 - .byte VOL , 28*bgm_finecity_mvl/mxv + .byte VOL , 28*mus_slateport_mvl/mxv .byte N48 , An3 , v104 .byte W48 .byte VOICE , 24 - .byte VOL , 44*bgm_finecity_mvl/mxv + .byte VOL , 44*mus_slateport_mvl/mxv .byte N06 , Gn4 , v112 .byte W06 .byte En4 @@ -5073,7 +5073,7 @@ bgm_finecity_10_B1: .byte Bn4 .byte W06 .byte PAN , c_v-32 - .byte VOL , 31*bgm_finecity_mvl/mxv + .byte VOL , 31*mus_slateport_mvl/mxv .byte N12 , Dn3 .byte W12 .byte Gn3 @@ -5177,7 +5177,7 @@ bgm_finecity_10_B1: .byte W24 .byte VOICE , 48 .byte MOD , 0 - .byte VOL , 36*bgm_finecity_mvl/mxv + .byte VOL , 36*mus_slateport_mvl/mxv .byte N36 , Bn3 .byte W36 .byte N06 , An3 @@ -5193,7 +5193,7 @@ bgm_finecity_10_B1: .byte An3 .byte W06 .byte VOICE , 24 - .byte VOL , 42*bgm_finecity_mvl/mxv + .byte VOL , 42*mus_slateport_mvl/mxv .byte N06 , En3 .byte W06 .byte Cs3 @@ -5229,7 +5229,7 @@ bgm_finecity_10_B1: .byte En4 .byte W06 .byte VOICE , 48 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -5241,7 +5241,7 @@ bgm_finecity_10_B1: .byte W96 .byte W96 .byte VOICE , 73 - .byte VOL , 29*bgm_finecity_mvl/mxv + .byte VOL , 29*mus_slateport_mvl/mxv .byte PAN , c_v-32 .byte BEND , c_v+1 .byte W48 @@ -5263,13 +5263,13 @@ bgm_finecity_10_B1: .byte W36 .byte N36 , As4 .byte W18 - .byte VOL , 22*bgm_finecity_mvl/mxv + .byte VOL , 22*mus_slateport_mvl/mxv .byte W06 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W05 - .byte 13*bgm_finecity_mvl/mxv + .byte 13*mus_slateport_mvl/mxv .byte W07 - .byte 26*bgm_finecity_mvl/mxv + .byte 26*mus_slateport_mvl/mxv .byte N24 , Gs4 .byte W24 .byte N06 , Gn4 @@ -5280,24 +5280,24 @@ bgm_finecity_10_B1: .byte W12 .byte N72 , Bn4 .byte W24 - .byte VOL , 26*bgm_finecity_mvl/mxv + .byte VOL , 26*mus_slateport_mvl/mxv .byte MOD , 7 .byte W05 - .byte VOL , 22*bgm_finecity_mvl/mxv + .byte VOL , 22*mus_slateport_mvl/mxv .byte W07 - .byte 21*bgm_finecity_mvl/mxv + .byte 21*mus_slateport_mvl/mxv .byte W05 - .byte 17*bgm_finecity_mvl/mxv + .byte 17*mus_slateport_mvl/mxv .byte W07 - .byte 13*bgm_finecity_mvl/mxv + .byte 13*mus_slateport_mvl/mxv .byte W05 - .byte 11*bgm_finecity_mvl/mxv + .byte 11*mus_slateport_mvl/mxv .byte W07 - .byte 8*bgm_finecity_mvl/mxv + .byte 8*mus_slateport_mvl/mxv .byte W05 - .byte 4*bgm_finecity_mvl/mxv + .byte 4*mus_slateport_mvl/mxv .byte W07 - .byte 29*bgm_finecity_mvl/mxv + .byte 29*mus_slateport_mvl/mxv .byte MOD , 2 .byte W24 .byte W48 @@ -5345,36 +5345,36 @@ bgm_finecity_10_B1: .byte W12 .byte N06 , Dn4 .byte W12 - .byte VOL , 46*bgm_finecity_mvl/mxv + .byte VOL , 46*mus_slateport_mvl/mxv .byte BEND , c_v+0 .byte W96 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_finecity_10_B1 + .word mus_slateport_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_finecity: +mus_slateport: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_finecity_pri @ Priority - .byte bgm_finecity_rev @ Reverb. + .byte mus_slateport_pri @ Priority + .byte mus_slateport_rev @ Reverb. - .word bgm_finecity_grp + .word mus_slateport_grp - .word bgm_finecity_1 - .word bgm_finecity_2 - .word bgm_finecity_3 - .word bgm_finecity_4 - .word bgm_finecity_5 - .word bgm_finecity_6 - .word bgm_finecity_7 - .word bgm_finecity_8 - .word bgm_finecity_9 - .word bgm_finecity_10 + .word mus_slateport_1 + .word mus_slateport_2 + .word mus_slateport_3 + .word mus_slateport_4 + .word mus_slateport_5 + .word mus_slateport_6 + .word mus_slateport_7 + .word mus_slateport_8 + .word mus_slateport_9 + .word mus_slateport_10 .end diff --git a/sound/songs/bgm_me_b_big.s b/sound/songs/mus_slots_jackpot.s index c58a17a22..5c1a8fd65 100644 --- a/sound/songs/bgm_me_b_big.s +++ b/sound/songs/mus_slots_jackpot.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_me_b_big_grp, voicegroup009 - .equ bgm_me_b_big_pri, 5 - .equ bgm_me_b_big_rev, reverb_set+50 - .equ bgm_me_b_big_mvl, 127 - .equ bgm_me_b_big_key, 0 - .equ bgm_me_b_big_tbs, 1 - .equ bgm_me_b_big_exg, 0 - .equ bgm_me_b_big_cmp, 1 + .equ mus_slots_jackpot_grp, voicegroup009 + .equ mus_slots_jackpot_pri, 5 + .equ mus_slots_jackpot_rev, reverb_set+50 + .equ mus_slots_jackpot_mvl, 127 + .equ mus_slots_jackpot_key, 0 + .equ mus_slots_jackpot_tbs, 1 + .equ mus_slots_jackpot_exg, 0 + .equ mus_slots_jackpot_cmp, 1 .section .rodata - .global bgm_me_b_big + .global mus_slots_jackpot .align 2 @********************** Track 1 **********************@ -bgm_me_b_big_1: - .byte KEYSH , bgm_me_b_big_key+0 +mus_slots_jackpot_1: + .byte KEYSH , mus_slots_jackpot_key+0 .byte W12 .byte VOICE , 48 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte PAN , c_v+0 .byte N08 , Gn3 , v040 .byte W08 @@ -27,7 +27,7 @@ bgm_me_b_big_1: .byte W08 .byte Dn4 , v060 .byte W08 - .byte TEMPO , 144*bgm_me_b_big_tbs/2 + .byte TEMPO , 144*mus_slots_jackpot_tbs/2 .byte VOICE , 56 .byte N04 , Gn3 , v116 .byte W08 @@ -39,17 +39,17 @@ bgm_me_b_big_1: .byte W24 .byte MOD , 6 .byte W04 - .byte VOL , 88*bgm_me_b_big_mvl/mxv + .byte VOL , 88*mus_slots_jackpot_mvl/mxv .byte W04 - .byte 81*bgm_me_b_big_mvl/mxv + .byte 81*mus_slots_jackpot_mvl/mxv .byte W04 - .byte 68*bgm_me_b_big_mvl/mxv + .byte 68*mus_slots_jackpot_mvl/mxv .byte W04 - .byte 49*bgm_me_b_big_mvl/mxv + .byte 49*mus_slots_jackpot_mvl/mxv .byte W04 .byte MOD , 0 .byte W04 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte N05 , Bn3 .byte W08 .byte Dn4 @@ -64,23 +64,23 @@ bgm_me_b_big_1: .byte W08 .byte N48 , Bn4 .byte W03 - .byte VOL , 82*bgm_me_b_big_mvl/mxv + .byte VOL , 82*mus_slots_jackpot_mvl/mxv .byte W03 - .byte 79*bgm_me_b_big_mvl/mxv + .byte 79*mus_slots_jackpot_mvl/mxv .byte W03 - .byte 68*bgm_me_b_big_mvl/mxv + .byte 68*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 72*bgm_me_b_big_mvl/mxv + .byte 72*mus_slots_jackpot_mvl/mxv .byte W01 .byte MOD , 6 .byte W05 - .byte VOL , 76*bgm_me_b_big_mvl/mxv + .byte VOL , 76*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 82*bgm_me_b_big_mvl/mxv + .byte 82*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 85*bgm_me_b_big_mvl/mxv + .byte 85*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 90*bgm_me_b_big_mvl/mxv + .byte 90*mus_slots_jackpot_mvl/mxv .byte W09 .byte MOD , 0 .byte N12 @@ -89,11 +89,11 @@ bgm_me_b_big_1: @********************** Track 2 **********************@ -bgm_me_b_big_2: - .byte KEYSH , bgm_me_b_big_key+0 +mus_slots_jackpot_2: + .byte KEYSH , mus_slots_jackpot_key+0 .byte W12 .byte VOICE , 48 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte PAN , c_v+10 .byte W04 .byte N08 , An3 , v044 @@ -129,21 +129,21 @@ bgm_me_b_big_2: .byte W08 .byte N48 , Gn5 .byte W03 - .byte VOL , 82*bgm_me_b_big_mvl/mxv + .byte VOL , 82*mus_slots_jackpot_mvl/mxv .byte W03 - .byte 79*bgm_me_b_big_mvl/mxv + .byte 79*mus_slots_jackpot_mvl/mxv .byte W03 - .byte 68*bgm_me_b_big_mvl/mxv + .byte 68*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 72*bgm_me_b_big_mvl/mxv + .byte 72*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 76*bgm_me_b_big_mvl/mxv + .byte 76*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 82*bgm_me_b_big_mvl/mxv + .byte 82*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 85*bgm_me_b_big_mvl/mxv + .byte 85*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 90*bgm_me_b_big_mvl/mxv + .byte 90*mus_slots_jackpot_mvl/mxv .byte W09 .byte N12 .byte W48 @@ -151,12 +151,12 @@ bgm_me_b_big_2: @********************** Track 3 **********************@ -bgm_me_b_big_3: - .byte KEYSH , bgm_me_b_big_key+0 +mus_slots_jackpot_3: + .byte KEYSH , mus_slots_jackpot_key+0 .byte W12 .byte W24 .byte VOICE , 47 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte PAN , c_v+0 .byte N08 , Gn2 , v127 .byte W08 @@ -206,14 +206,14 @@ bgm_me_b_big_3: @********************** Track 4 **********************@ -bgm_me_b_big_4: - .byte KEYSH , bgm_me_b_big_key+0 +mus_slots_jackpot_4: + .byte KEYSH , mus_slots_jackpot_key+0 .byte W12 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte W24 .byte VOICE , 82 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte PAN , c_v-48 .byte N04 , Dn3 , v052 .byte W08 @@ -225,23 +225,23 @@ bgm_me_b_big_4: .byte W24 .byte MOD , 6 .byte W04 - .byte VOL , 87*bgm_me_b_big_mvl/mxv + .byte VOL , 87*mus_slots_jackpot_mvl/mxv .byte W08 - .byte 75*bgm_me_b_big_mvl/mxv + .byte 75*mus_slots_jackpot_mvl/mxv .byte W09 - .byte 64*bgm_me_b_big_mvl/mxv + .byte 64*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 54*bgm_me_b_big_mvl/mxv + .byte 54*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 43*bgm_me_b_big_mvl/mxv + .byte 43*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 27*bgm_me_b_big_mvl/mxv + .byte 27*mus_slots_jackpot_mvl/mxv .byte W03 - .byte 9*bgm_me_b_big_mvl/mxv + .byte 9*mus_slots_jackpot_mvl/mxv .byte W02 .byte MOD , 0 .byte W04 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte N04 , Gn3 .byte W08 .byte En4 @@ -259,13 +259,13 @@ bgm_me_b_big_4: @********************** Track 5 **********************@ -bgm_me_b_big_5: - .byte KEYSH , bgm_me_b_big_key+0 +mus_slots_jackpot_5: + .byte KEYSH , mus_slots_jackpot_key+0 .byte W12 .byte XCMD , xIECV , 10 .byte W24 .byte VOICE , 83 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte PAN , c_v+47 .byte BEND , c_v+0 .byte N04 , Bn2 , v052 @@ -278,23 +278,23 @@ bgm_me_b_big_5: .byte W24 .byte MOD , 6 .byte W04 - .byte VOL , 87*bgm_me_b_big_mvl/mxv + .byte VOL , 87*mus_slots_jackpot_mvl/mxv .byte W08 - .byte 75*bgm_me_b_big_mvl/mxv + .byte 75*mus_slots_jackpot_mvl/mxv .byte W09 - .byte 64*bgm_me_b_big_mvl/mxv + .byte 64*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 54*bgm_me_b_big_mvl/mxv + .byte 54*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 43*bgm_me_b_big_mvl/mxv + .byte 43*mus_slots_jackpot_mvl/mxv .byte W06 - .byte 27*bgm_me_b_big_mvl/mxv + .byte 27*mus_slots_jackpot_mvl/mxv .byte W03 - .byte 9*bgm_me_b_big_mvl/mxv + .byte 9*mus_slots_jackpot_mvl/mxv .byte W02 .byte MOD , 0 .byte W04 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte N04 , En3 .byte W08 .byte Cn4 @@ -312,12 +312,12 @@ bgm_me_b_big_5: @********************** Track 6 **********************@ -bgm_me_b_big_6: - .byte KEYSH , bgm_me_b_big_key+0 +mus_slots_jackpot_6: + .byte KEYSH , mus_slots_jackpot_key+0 .byte W12 .byte W24 .byte VOICE , 88 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte W24 .byte N24 , Gn1 , v080 .byte W32 @@ -347,12 +347,12 @@ bgm_me_b_big_6: @********************** Track 7 **********************@ -bgm_me_b_big_7: - .byte KEYSH , bgm_me_b_big_key+0 +mus_slots_jackpot_7: + .byte KEYSH , mus_slots_jackpot_key+0 .byte W12 .byte W24 .byte VOICE , 0 - .byte VOL , 90*bgm_me_b_big_mvl/mxv + .byte VOL , 90*mus_slots_jackpot_mvl/mxv .byte N04 , En1 , v112 .byte W04 .byte En1 , v076 @@ -423,20 +423,20 @@ bgm_me_b_big_7: @******************************************************@ .align 2 -bgm_me_b_big: +mus_slots_jackpot: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_b_big_pri @ Priority - .byte bgm_me_b_big_rev @ Reverb. + .byte mus_slots_jackpot_pri @ Priority + .byte mus_slots_jackpot_rev @ Reverb. - .word bgm_me_b_big_grp + .word mus_slots_jackpot_grp - .word bgm_me_b_big_1 - .word bgm_me_b_big_2 - .word bgm_me_b_big_3 - .word bgm_me_b_big_4 - .word bgm_me_b_big_5 - .word bgm_me_b_big_6 - .word bgm_me_b_big_7 + .word mus_slots_jackpot_1 + .word mus_slots_jackpot_2 + .word mus_slots_jackpot_3 + .word mus_slots_jackpot_4 + .word mus_slots_jackpot_5 + .word mus_slots_jackpot_6 + .word mus_slots_jackpot_7 .end diff --git a/sound/songs/bgm_me_b_small.s b/sound/songs/mus_slots_win.s index e3db8b351..ed67f4ee9 100644 --- a/sound/songs/bgm_me_b_small.s +++ b/sound/songs/mus_slots_win.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_me_b_small_grp, voicegroup009 - .equ bgm_me_b_small_pri, 5 - .equ bgm_me_b_small_rev, reverb_set+50 - .equ bgm_me_b_small_mvl, 127 - .equ bgm_me_b_small_key, 0 - .equ bgm_me_b_small_tbs, 1 - .equ bgm_me_b_small_exg, 0 - .equ bgm_me_b_small_cmp, 1 + .equ mus_slots_win_grp, voicegroup009 + .equ mus_slots_win_pri, 5 + .equ mus_slots_win_rev, reverb_set+50 + .equ mus_slots_win_mvl, 127 + .equ mus_slots_win_key, 0 + .equ mus_slots_win_tbs, 1 + .equ mus_slots_win_exg, 0 + .equ mus_slots_win_cmp, 1 .section .rodata - .global bgm_me_b_small + .global mus_slots_win .align 2 @********************** Track 1 **********************@ -bgm_me_b_small_1: - .byte KEYSH , bgm_me_b_small_key+0 - .byte TEMPO , 144*bgm_me_b_small_tbs/2 +mus_slots_win_1: + .byte KEYSH , mus_slots_win_key+0 + .byte TEMPO , 144*mus_slots_win_tbs/2 .byte W09 .byte VOICE , 56 - .byte VOL , 90*bgm_me_b_small_mvl/mxv + .byte VOL , 90*mus_slots_win_mvl/mxv .byte PAN , c_v+6 .byte N03 , Cs3 , v084 .byte W03 @@ -60,11 +60,11 @@ bgm_me_b_small_1: @********************** Track 2 **********************@ -bgm_me_b_small_2: - .byte KEYSH , bgm_me_b_small_key+0 +mus_slots_win_2: + .byte KEYSH , mus_slots_win_key+0 .byte W24 .byte VOICE , 60 - .byte VOL , 90*bgm_me_b_small_mvl/mxv + .byte VOL , 90*mus_slots_win_mvl/mxv .byte PAN , c_v-16 .byte N24 , Fs2 , v080 .byte W24 @@ -85,11 +85,11 @@ bgm_me_b_small_2: @********************** Track 3 **********************@ -bgm_me_b_small_3: - .byte KEYSH , bgm_me_b_small_key+0 +mus_slots_win_3: + .byte KEYSH , mus_slots_win_key+0 .byte W24 .byte VOICE , 47 - .byte VOL , 90*bgm_me_b_small_mvl/mxv + .byte VOL , 90*mus_slots_win_mvl/mxv .byte PAN , c_v-4 .byte W48 .byte N03 , Ds2 , v120 @@ -111,13 +111,13 @@ bgm_me_b_small_3: @********************** Track 4 **********************@ -bgm_me_b_small_4: - .byte KEYSH , bgm_me_b_small_key+0 +mus_slots_win_4: + .byte KEYSH , mus_slots_win_key+0 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte W24 .byte VOICE , 90 - .byte VOL , 90*bgm_me_b_small_mvl/mxv + .byte VOL , 90*mus_slots_win_mvl/mxv .byte PAN , c_v+0 .byte N03 , Fs5 , v040 .byte W12 @@ -144,14 +144,14 @@ bgm_me_b_small_4: @********************** Track 5 **********************@ -bgm_me_b_small_5: - .byte KEYSH , bgm_me_b_small_key+0 +mus_slots_win_5: + .byte KEYSH , mus_slots_win_key+0 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte BEND , c_v+0 .byte W24 .byte VOICE , 83 - .byte VOL , 90*bgm_me_b_small_mvl/mxv + .byte VOL , 90*mus_slots_win_mvl/mxv .byte PAN , c_v+48 .byte N06 , Fs3 , v052 .byte W12 @@ -181,11 +181,11 @@ bgm_me_b_small_5: @********************** Track 6 **********************@ -bgm_me_b_small_6: - .byte KEYSH , bgm_me_b_small_key+0 +mus_slots_win_6: + .byte KEYSH , mus_slots_win_key+0 .byte W24 .byte VOICE , 88 - .byte VOL , 90*bgm_me_b_small_mvl/mxv + .byte VOL , 90*mus_slots_win_mvl/mxv .byte N12 , Fs1 , v080 .byte W24 .byte N12 @@ -203,11 +203,11 @@ bgm_me_b_small_6: @********************** Track 7 **********************@ -bgm_me_b_small_7: - .byte KEYSH , bgm_me_b_small_key+0 +mus_slots_win_7: + .byte KEYSH , mus_slots_win_key+0 .byte W24 .byte VOICE , 0 - .byte VOL , 90*bgm_me_b_small_mvl/mxv + .byte VOL , 90*mus_slots_win_mvl/mxv .byte N06 , En1 , v100 .byte N72 , Bn2 , v092 .byte W24 @@ -238,20 +238,20 @@ bgm_me_b_small_7: @******************************************************@ .align 2 -bgm_me_b_small: +mus_slots_win: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_b_small_pri @ Priority - .byte bgm_me_b_small_rev @ Reverb. + .byte mus_slots_win_pri @ Priority + .byte mus_slots_win_rev @ Reverb. - .word bgm_me_b_small_grp + .word mus_slots_win_grp - .word bgm_me_b_small_1 - .word bgm_me_b_small_2 - .word bgm_me_b_small_3 - .word bgm_me_b_small_4 - .word bgm_me_b_small_5 - .word bgm_me_b_small_6 - .word bgm_me_b_small_7 + .word mus_slots_win_1 + .word mus_slots_win_2 + .word mus_slots_win_3 + .word mus_slots_win_4 + .word mus_slots_win_5 + .word mus_slots_win_6 + .word mus_slots_win_7 .end diff --git a/sound/songs/bgm_runecity.s b/sound/songs/mus_sootopolis.s index ae56b2d64..a90ba7316 100644 --- a/sound/songs/bgm_runecity.s +++ b/sound/songs/mus_sootopolis.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_runecity_grp, voicegroup088 - .equ bgm_runecity_pri, 0 - .equ bgm_runecity_rev, reverb_set+50 - .equ bgm_runecity_mvl, 127 - .equ bgm_runecity_key, 0 - .equ bgm_runecity_tbs, 1 - .equ bgm_runecity_exg, 0 - .equ bgm_runecity_cmp, 1 + .equ mus_sootopolis_grp, voicegroup088 + .equ mus_sootopolis_pri, 0 + .equ mus_sootopolis_rev, reverb_set+50 + .equ mus_sootopolis_mvl, 127 + .equ mus_sootopolis_key, 0 + .equ mus_sootopolis_tbs, 1 + .equ mus_sootopolis_exg, 0 + .equ mus_sootopolis_cmp, 1 .section .rodata - .global bgm_runecity + .global mus_sootopolis .align 2 @********************** Track 1 **********************@ -bgm_runecity_1: - .byte KEYSH , bgm_runecity_key+0 - .byte TEMPO , 136*bgm_runecity_tbs/2 +mus_sootopolis_1: + .byte KEYSH , mus_sootopolis_key+0 + .byte TEMPO , 136*mus_sootopolis_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 47*bgm_runecity_mvl/mxv + .byte VOL , 47*mus_sootopolis_mvl/mxv .byte W12 -bgm_runecity_1_B1: -bgm_runecity_1_000: +mus_sootopolis_1_B1: +mus_sootopolis_1_000: .byte N02 , Gn5 , v112 .byte W16 .byte Gn5 , v072 @@ -35,7 +35,7 @@ bgm_runecity_1_000: .byte N02 .byte W24 .byte PEND -bgm_runecity_1_001: +mus_sootopolis_1_001: .byte N02 , Gn5 , v112 .byte W16 .byte Gn5 , v064 @@ -55,7 +55,7 @@ bgm_runecity_1_001: .byte Gn5 , v084 .byte W08 .byte PEND -bgm_runecity_1_002: +mus_sootopolis_1_002: .byte N02 , Gn5 , v112 .byte W16 .byte Gn5 , v072 @@ -68,94 +68,94 @@ bgm_runecity_1_002: .byte W08 .byte PEND .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_002 + .word mus_sootopolis_1_002 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_000 + .word mus_sootopolis_1_000 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte PATT - .word bgm_runecity_1_001 + .word mus_sootopolis_1_001 .byte GOTO - .word bgm_runecity_1_B1 + .word mus_sootopolis_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_runecity_2: - .byte KEYSH , bgm_runecity_key+0 +mus_sootopolis_2: + .byte KEYSH , mus_sootopolis_key+0 .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 45*bgm_runecity_mvl/mxv + .byte VOL , 45*mus_sootopolis_mvl/mxv .byte W02 .byte N04 , Fs4 , v112 .byte W04 @@ -163,7 +163,7 @@ bgm_runecity_2: .byte W02 .byte As4 .byte W04 -bgm_runecity_2_B1: +mus_sootopolis_2_B1: .byte VOICE , 73 .byte N48 , Bn4 , v112 .byte W48 @@ -181,25 +181,25 @@ bgm_runecity_2_B1: .byte W04 .byte Bn3 , v032 .byte W04 -bgm_runecity_2_000: +mus_sootopolis_2_000: .byte N60 , Gs4 , v112 .byte W24 .byte MOD , 7 .byte W12 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte W04 - .byte 40*bgm_runecity_mvl/mxv + .byte 40*mus_sootopolis_mvl/mxv .byte W04 - .byte 30*bgm_runecity_mvl/mxv + .byte 30*mus_sootopolis_mvl/mxv .byte W04 - .byte 25*bgm_runecity_mvl/mxv + .byte 25*mus_sootopolis_mvl/mxv .byte W04 - .byte 16*bgm_runecity_mvl/mxv + .byte 16*mus_sootopolis_mvl/mxv .byte W04 - .byte 9*bgm_runecity_mvl/mxv + .byte 9*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_runecity_mvl/mxv + .byte VOL , 45*mus_sootopolis_mvl/mxv .byte N04 , En4 .byte W04 .byte Fs4 @@ -210,20 +210,20 @@ bgm_runecity_2_000: .byte N48 , An4 .byte W24 .byte MOD , 7 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte W04 - .byte 40*bgm_runecity_mvl/mxv + .byte 40*mus_sootopolis_mvl/mxv .byte W04 - .byte 30*bgm_runecity_mvl/mxv + .byte 30*mus_sootopolis_mvl/mxv .byte W04 - .byte 25*bgm_runecity_mvl/mxv + .byte 25*mus_sootopolis_mvl/mxv .byte W04 - .byte 16*bgm_runecity_mvl/mxv + .byte 16*mus_sootopolis_mvl/mxv .byte W04 - .byte 9*bgm_runecity_mvl/mxv + .byte 9*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_runecity_mvl/mxv + .byte VOL , 45*mus_sootopolis_mvl/mxv .byte N04 , Bn4 .byte W04 .byte Bn4 , v032 @@ -273,24 +273,24 @@ bgm_runecity_2_000: .byte Bn3 , v032 .byte W04 .byte PATT - .word bgm_runecity_2_000 + .word mus_sootopolis_2_000 .byte N48 , An4 , v112 .byte W24 .byte MOD , 7 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte W04 - .byte 40*bgm_runecity_mvl/mxv + .byte 40*mus_sootopolis_mvl/mxv .byte W04 - .byte 30*bgm_runecity_mvl/mxv + .byte 30*mus_sootopolis_mvl/mxv .byte W04 - .byte 25*bgm_runecity_mvl/mxv + .byte 25*mus_sootopolis_mvl/mxv .byte W04 - .byte 20*bgm_runecity_mvl/mxv + .byte 20*mus_sootopolis_mvl/mxv .byte W04 - .byte 15*bgm_runecity_mvl/mxv + .byte 15*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_runecity_mvl/mxv + .byte VOL , 45*mus_sootopolis_mvl/mxv .byte N04 , Bn4 .byte W04 .byte Bn4 , v032 @@ -306,7 +306,7 @@ bgm_runecity_2_000: .byte N24 , Bn4 , v112 .byte W24 .byte VOICE , 58 - .byte VOL , 42*bgm_runecity_mvl/mxv + .byte VOL , 42*mus_sootopolis_mvl/mxv .byte N08 , Fn3 .byte W08 .byte N04 , Bn3 @@ -322,20 +322,20 @@ bgm_runecity_2_000: .byte N44 , Fs4 .byte W22 .byte MOD , 6 - .byte VOL , 37*bgm_runecity_mvl/mxv + .byte VOL , 37*mus_sootopolis_mvl/mxv .byte W04 - .byte 34*bgm_runecity_mvl/mxv + .byte 34*mus_sootopolis_mvl/mxv .byte W04 - .byte 29*bgm_runecity_mvl/mxv + .byte 29*mus_sootopolis_mvl/mxv .byte W04 - .byte 24*bgm_runecity_mvl/mxv + .byte 24*mus_sootopolis_mvl/mxv .byte W04 - .byte 18*bgm_runecity_mvl/mxv + .byte 18*mus_sootopolis_mvl/mxv .byte W04 - .byte 13*bgm_runecity_mvl/mxv + .byte 13*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 43*bgm_runecity_mvl/mxv + .byte VOL , 43*mus_sootopolis_mvl/mxv .byte N02 , Dn5 , v072 .byte W02 .byte N12 , Cs5 , v076 @@ -347,20 +347,20 @@ bgm_runecity_2_000: .byte N48 , Fs4 , v112 .byte W24 .byte MOD , 6 - .byte VOL , 37*bgm_runecity_mvl/mxv + .byte VOL , 37*mus_sootopolis_mvl/mxv .byte W04 - .byte 34*bgm_runecity_mvl/mxv + .byte 34*mus_sootopolis_mvl/mxv .byte W04 - .byte 29*bgm_runecity_mvl/mxv + .byte 29*mus_sootopolis_mvl/mxv .byte W04 - .byte 24*bgm_runecity_mvl/mxv + .byte 24*mus_sootopolis_mvl/mxv .byte W04 - .byte 18*bgm_runecity_mvl/mxv + .byte 18*mus_sootopolis_mvl/mxv .byte W04 - .byte 13*bgm_runecity_mvl/mxv + .byte 13*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 43*bgm_runecity_mvl/mxv + .byte VOL , 43*mus_sootopolis_mvl/mxv .byte N04 , Fs3 .byte W04 .byte Fs3 , v032 @@ -411,14 +411,14 @@ bgm_runecity_2_000: .byte N40 , En4 , v112 .byte W24 .byte MOD , 5 - .byte VOL , 40*bgm_runecity_mvl/mxv + .byte VOL , 40*mus_sootopolis_mvl/mxv .byte W04 - .byte 33*bgm_runecity_mvl/mxv + .byte 33*mus_sootopolis_mvl/mxv .byte W04 - .byte 26*bgm_runecity_mvl/mxv + .byte 26*mus_sootopolis_mvl/mxv .byte W08 .byte MOD , 0 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte N04 , Fs4 .byte W08 .byte En4 @@ -473,21 +473,21 @@ bgm_runecity_2_000: .byte W22 .byte N24 , Cs4 .byte W08 - .byte VOL , 40*bgm_runecity_mvl/mxv + .byte VOL , 40*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 5 - .byte VOL , 37*bgm_runecity_mvl/mxv + .byte VOL , 37*mus_sootopolis_mvl/mxv .byte W04 - .byte 34*bgm_runecity_mvl/mxv + .byte 34*mus_sootopolis_mvl/mxv .byte W04 - .byte 29*bgm_runecity_mvl/mxv + .byte 29*mus_sootopolis_mvl/mxv .byte W04 .byte VOICE , 1 .byte MOD , 0 - .byte VOL , 41*bgm_runecity_mvl/mxv + .byte VOL , 41*mus_sootopolis_mvl/mxv .byte N12 , As3 .byte W12 - .byte VOL , 62*bgm_runecity_mvl/mxv + .byte VOL , 62*mus_sootopolis_mvl/mxv .byte N04 , Dn4 , v080 .byte W04 .byte En4 , v092 @@ -585,7 +585,7 @@ bgm_runecity_2_000: .byte W04 .byte Gn4 .byte W04 - .byte VOL , 57*bgm_runecity_mvl/mxv + .byte VOL , 57*mus_sootopolis_mvl/mxv .byte N56 , Fs4 .byte W56 .byte N04 , Gn4 @@ -683,7 +683,7 @@ bgm_runecity_2_000: .byte N12 , En4 , v112 .byte W12 .byte VOICE , 24 - .byte VOL , 59*bgm_runecity_mvl/mxv + .byte VOL , 59*mus_sootopolis_mvl/mxv .byte N04 , Bn4 .byte W04 .byte An4 @@ -831,20 +831,20 @@ bgm_runecity_2_000: .byte Cs4 , v032 .byte W04 .byte GOTO - .word bgm_runecity_2_B1 + .word mus_sootopolis_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_runecity_3: - .byte KEYSH , bgm_runecity_key+0 +mus_sootopolis_3: + .byte KEYSH , mus_sootopolis_key+0 .byte VOICE , 126 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 46*bgm_runecity_mvl/mxv + .byte VOL , 46*mus_sootopolis_mvl/mxv .byte W12 -bgm_runecity_3_B1: +mus_sootopolis_3_B1: .byte W72 .byte W72 .byte W48 @@ -891,23 +891,23 @@ bgm_runecity_3_B1: .byte W72 .byte W72 .byte GOTO - .word bgm_runecity_3_B1 + .word mus_sootopolis_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_runecity_4: - .byte KEYSH , bgm_runecity_key+0 +mus_sootopolis_4: + .byte KEYSH , mus_sootopolis_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-64 - .byte VOL , 37*bgm_runecity_mvl/mxv + .byte VOL , 37*mus_sootopolis_mvl/mxv .byte W12 -bgm_runecity_4_B1: -bgm_runecity_4_000: +mus_sootopolis_4_B1: +mus_sootopolis_4_000: .byte N02 , Fs2 , v112 .byte W16 .byte N04 , Dn3 @@ -919,7 +919,7 @@ bgm_runecity_4_000: .byte N02 , Fs2 .byte W08 .byte PEND -bgm_runecity_4_001: +mus_sootopolis_4_001: .byte N02 , Fs2 , v112 .byte W16 .byte N02 @@ -935,7 +935,7 @@ bgm_runecity_4_001: .byte Fs2 .byte W08 .byte PEND -bgm_runecity_4_002: +mus_sootopolis_4_002: .byte N02 , Fs2 , v112 .byte W16 .byte N04 , Fs3 @@ -960,11 +960,11 @@ bgm_runecity_4_002: .byte En3 .byte W08 .byte PATT - .word bgm_runecity_4_000 + .word mus_sootopolis_4_000 .byte PATT - .word bgm_runecity_4_001 + .word mus_sootopolis_4_001 .byte PATT - .word bgm_runecity_4_002 + .word mus_sootopolis_4_002 .byte N02 , Fs2 , v112 .byte W16 .byte N02 @@ -1003,7 +1003,7 @@ bgm_runecity_4_002: .byte W08 .byte An2 .byte W08 -bgm_runecity_4_003: +mus_sootopolis_4_003: .byte N16 , Bn2 , v112 .byte W16 .byte N02 , Gs2 @@ -1098,7 +1098,7 @@ bgm_runecity_4_003: .byte Fs2 .byte W08 .byte PATT - .word bgm_runecity_4_003 + .word mus_sootopolis_4_003 .byte N02 , Gn2 , v112 .byte W16 .byte N04 , Bn2 @@ -1364,23 +1364,23 @@ bgm_runecity_4_003: .byte Cs3 .byte W08 .byte GOTO - .word bgm_runecity_4_B1 + .word mus_sootopolis_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_runecity_5: - .byte KEYSH , bgm_runecity_key+0 +mus_sootopolis_5: + .byte KEYSH , mus_sootopolis_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 37*bgm_runecity_mvl/mxv + .byte VOL , 37*mus_sootopolis_mvl/mxv .byte W12 -bgm_runecity_5_B1: -bgm_runecity_5_000: +mus_sootopolis_5_B1: +mus_sootopolis_5_000: .byte N02 , Bn2 , v112 .byte W16 .byte N04 , Fs3 @@ -1392,7 +1392,7 @@ bgm_runecity_5_000: .byte N02 , Bn2 .byte W08 .byte PEND -bgm_runecity_5_001: +mus_sootopolis_5_001: .byte N02 , Bn2 , v112 .byte W16 .byte N02 @@ -1408,7 +1408,7 @@ bgm_runecity_5_001: .byte Cs3 .byte W08 .byte PEND -bgm_runecity_5_002: +mus_sootopolis_5_002: .byte N02 , Bn2 , v112 .byte W16 .byte N04 , An3 @@ -1433,11 +1433,11 @@ bgm_runecity_5_002: .byte Gs3 .byte W08 .byte PATT - .word bgm_runecity_5_000 + .word mus_sootopolis_5_000 .byte PATT - .word bgm_runecity_5_001 + .word mus_sootopolis_5_001 .byte PATT - .word bgm_runecity_5_002 + .word mus_sootopolis_5_002 .byte N02 , Bn2 , v112 .byte W16 .byte N02 @@ -1843,20 +1843,20 @@ bgm_runecity_5_002: .byte As3 .byte W08 .byte GOTO - .word bgm_runecity_5_B1 + .word mus_sootopolis_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_runecity_6: - .byte KEYSH , bgm_runecity_key+0 +mus_sootopolis_6: + .byte KEYSH , mus_sootopolis_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 59*bgm_runecity_mvl/mxv + .byte VOL , 59*mus_sootopolis_mvl/mxv .byte W12 -bgm_runecity_6_B1: +mus_sootopolis_6_B1: .byte W72 -bgm_runecity_6_000: +mus_sootopolis_6_000: .byte W24 .byte N04 , Fs2 , v112 .byte W04 @@ -1873,7 +1873,7 @@ bgm_runecity_6_000: .byte W72 .byte W72 .byte PATT - .word bgm_runecity_6_000 + .word mus_sootopolis_6_000 .byte W72 .byte W72 .byte W72 @@ -1910,27 +1910,27 @@ bgm_runecity_6_000: .byte W72 .byte W72 .byte GOTO - .word bgm_runecity_6_B1 + .word mus_sootopolis_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_runecity_7: - .byte KEYSH , bgm_runecity_key+0 +mus_sootopolis_7: + .byte KEYSH , mus_sootopolis_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 58*bgm_runecity_mvl/mxv + .byte VOL , 58*mus_sootopolis_mvl/mxv .byte N04 , Gs1 , v112 .byte W06 .byte Bn1 .byte W02 .byte Cs2 .byte W04 -bgm_runecity_7_B1: +mus_sootopolis_7_B1: .byte N16 , Bn1 , v112 .byte W16 .byte N04 , Bn2 @@ -1953,7 +1953,7 @@ bgm_runecity_7_B1: .byte W08 .byte As1 .byte W08 -bgm_runecity_7_000: +mus_sootopolis_7_000: .byte N16 , Bn1 , v112 .byte W16 .byte N04 , Cs3 @@ -1996,7 +1996,7 @@ bgm_runecity_7_000: .byte As1 .byte W08 .byte PATT - .word bgm_runecity_7_000 + .word mus_sootopolis_7_000 .byte N16 , Bn1 , v112 .byte W16 .byte N02 , Fs1 @@ -2364,17 +2364,17 @@ bgm_runecity_7_000: .byte Cs1 .byte W08 .byte GOTO - .word bgm_runecity_7_B1 + .word mus_sootopolis_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_runecity_8: - .byte KEYSH , bgm_runecity_key+0 +mus_sootopolis_8: + .byte KEYSH , mus_sootopolis_key+0 .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 45*bgm_runecity_mvl/mxv + .byte VOL , 45*mus_sootopolis_mvl/mxv .byte PAN , c_v-19 .byte N04 , Bn3 , v112 .byte W04 @@ -2382,7 +2382,7 @@ bgm_runecity_8: .byte W04 .byte Cs4 .byte W04 -bgm_runecity_8_B1: +mus_sootopolis_8_B1: .byte VOICE , 73 .byte N48 , Dn4 , v112 .byte W48 @@ -2394,20 +2394,20 @@ bgm_runecity_8_B1: .byte W24 .byte MOD , 7 .byte W12 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte W04 - .byte 40*bgm_runecity_mvl/mxv + .byte 40*mus_sootopolis_mvl/mxv .byte W04 - .byte 30*bgm_runecity_mvl/mxv + .byte 30*mus_sootopolis_mvl/mxv .byte W04 - .byte 25*bgm_runecity_mvl/mxv + .byte 25*mus_sootopolis_mvl/mxv .byte W04 - .byte 16*bgm_runecity_mvl/mxv + .byte 16*mus_sootopolis_mvl/mxv .byte W04 - .byte 9*bgm_runecity_mvl/mxv + .byte 9*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_runecity_mvl/mxv + .byte VOL , 45*mus_sootopolis_mvl/mxv .byte N04 , As3 .byte W04 .byte Bn3 @@ -2417,20 +2417,20 @@ bgm_runecity_8_B1: .byte N48 , Cs4 .byte W24 .byte MOD , 7 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte W04 - .byte 40*bgm_runecity_mvl/mxv + .byte 40*mus_sootopolis_mvl/mxv .byte W04 - .byte 30*bgm_runecity_mvl/mxv + .byte 30*mus_sootopolis_mvl/mxv .byte W04 - .byte 25*bgm_runecity_mvl/mxv + .byte 25*mus_sootopolis_mvl/mxv .byte W04 - .byte 16*bgm_runecity_mvl/mxv + .byte 16*mus_sootopolis_mvl/mxv .byte W04 - .byte 9*bgm_runecity_mvl/mxv + .byte 9*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_runecity_mvl/mxv + .byte VOL , 45*mus_sootopolis_mvl/mxv .byte N04 , Dn4 .byte W16 .byte Cs4 @@ -2463,22 +2463,22 @@ bgm_runecity_8_B1: .byte W24 .byte MOD , 7 .byte W12 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte W04 - .byte 40*bgm_runecity_mvl/mxv + .byte 40*mus_sootopolis_mvl/mxv .byte N08 , Dn4 .byte W04 - .byte VOL , 30*bgm_runecity_mvl/mxv + .byte VOL , 30*mus_sootopolis_mvl/mxv .byte W04 - .byte 25*bgm_runecity_mvl/mxv + .byte 25*mus_sootopolis_mvl/mxv .byte N12 , Cs4 .byte W04 - .byte VOL , 16*bgm_runecity_mvl/mxv + .byte VOL , 16*mus_sootopolis_mvl/mxv .byte W04 - .byte 9*bgm_runecity_mvl/mxv + .byte 9*mus_sootopolis_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 45*bgm_runecity_mvl/mxv + .byte VOL , 45*mus_sootopolis_mvl/mxv .byte N04 , An3 .byte W04 .byte As3 @@ -2488,15 +2488,15 @@ bgm_runecity_8_B1: .byte N40 , Cs4 .byte W24 .byte MOD , 7 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte W04 - .byte 40*bgm_runecity_mvl/mxv + .byte 40*mus_sootopolis_mvl/mxv .byte W04 - .byte 30*bgm_runecity_mvl/mxv + .byte 30*mus_sootopolis_mvl/mxv .byte W04 - .byte 25*bgm_runecity_mvl/mxv + .byte 25*mus_sootopolis_mvl/mxv .byte W04 - .byte 45*bgm_runecity_mvl/mxv + .byte 45*mus_sootopolis_mvl/mxv .byte MOD , 0 .byte N08 , Bn3 .byte W08 @@ -2509,7 +2509,7 @@ bgm_runecity_8_B1: .byte N24 , Dn4 .byte W24 .byte VOICE , 13 - .byte VOL , 39*bgm_runecity_mvl/mxv + .byte VOL , 39*mus_sootopolis_mvl/mxv .byte N08 , Fn3 , v088 .byte W08 .byte N04 , Bn3 , v096 @@ -2806,7 +2806,7 @@ bgm_runecity_8_B1: .byte W04 .byte As3 , v036 .byte W04 - .byte VOL , 44*bgm_runecity_mvl/mxv + .byte VOL , 44*mus_sootopolis_mvl/mxv .byte N16 , Bn3 , v112 .byte W16 .byte N04 , Fs3 @@ -3125,27 +3125,27 @@ bgm_runecity_8_B1: .byte Fs5 .byte W04 .byte GOTO - .word bgm_runecity_8_B1 + .word mus_sootopolis_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_runecity: +mus_sootopolis: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_runecity_pri @ Priority - .byte bgm_runecity_rev @ Reverb. + .byte mus_sootopolis_pri @ Priority + .byte mus_sootopolis_rev @ Reverb. - .word bgm_runecity_grp + .word mus_sootopolis_grp - .word bgm_runecity_1 - .word bgm_runecity_2 - .word bgm_runecity_3 - .word bgm_runecity_4 - .word bgm_runecity_5 - .word bgm_runecity_6 - .word bgm_runecity_7 - .word bgm_runecity_8 + .word mus_sootopolis_1 + .word mus_sootopolis_2 + .word mus_sootopolis_3 + .word mus_sootopolis_4 + .word mus_sootopolis_5 + .word mus_sootopolis_6 + .word mus_sootopolis_7 + .word mus_sootopolis_8 .end diff --git a/sound/songs/bgm_naminori.s b/sound/songs/mus_surf.s index 8b4ee8864..977122971 100644 --- a/sound/songs/bgm_naminori.s +++ b/sound/songs/mus_surf.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_naminori_grp, voicegroup014 - .equ bgm_naminori_pri, 0 - .equ bgm_naminori_rev, reverb_set+50 - .equ bgm_naminori_mvl, 127 - .equ bgm_naminori_key, 0 - .equ bgm_naminori_tbs, 1 - .equ bgm_naminori_exg, 0 - .equ bgm_naminori_cmp, 1 + .equ mus_surf_grp, voicegroup014 + .equ mus_surf_pri, 0 + .equ mus_surf_rev, reverb_set+50 + .equ mus_surf_mvl, 127 + .equ mus_surf_key, 0 + .equ mus_surf_tbs, 1 + .equ mus_surf_exg, 0 + .equ mus_surf_cmp, 1 .section .rodata - .global bgm_naminori + .global mus_surf .align 2 @********************** Track 1 **********************@ -bgm_naminori_1: - .byte KEYSH , bgm_naminori_key+0 - .byte TEMPO , 82*bgm_naminori_tbs/2 +mus_surf_1: + .byte KEYSH , mus_surf_key+0 + .byte TEMPO , 82*mus_surf_tbs/2 .byte VOICE , 48 .byte LFOS , 40 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cs4 , v104 .byte W06 @@ -34,9 +34,9 @@ bgm_naminori_1: .byte W06 .byte Ds4 .byte W06 -bgm_naminori_1_B1: +mus_surf_1_B1: .byte VOICE , 48 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N18 , Fn4 , v104 .byte W18 .byte N06 , Fs4 @@ -172,32 +172,32 @@ bgm_naminori_1_B1: .byte W24 .byte MOD , 5 .byte W24 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte W05 - .byte 70*bgm_naminori_mvl/mxv + .byte 70*mus_surf_mvl/mxv .byte W07 - .byte 64*bgm_naminori_mvl/mxv + .byte 64*mus_surf_mvl/mxv .byte W05 - .byte 57*bgm_naminori_mvl/mxv + .byte 57*mus_surf_mvl/mxv .byte W07 - .byte 52*bgm_naminori_mvl/mxv + .byte 52*mus_surf_mvl/mxv .byte W05 - .byte 45*bgm_naminori_mvl/mxv + .byte 45*mus_surf_mvl/mxv .byte W07 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W05 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W07 - .byte 18*bgm_naminori_mvl/mxv + .byte 18*mus_surf_mvl/mxv .byte W05 - .byte 7*bgm_naminori_mvl/mxv + .byte 7*mus_surf_mvl/mxv .byte W07 .byte EOT - .byte VOL , 1*bgm_naminori_mvl/mxv + .byte VOL , 1*mus_surf_mvl/mxv .byte MOD , 0 .byte W36 .byte VOICE , 73 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N06 , As4 , v072 .byte W06 .byte Cn5 @@ -228,19 +228,19 @@ bgm_naminori_1_B1: .byte W12 .byte N32 , Cs5 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte MOD , 5 .byte W05 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W05 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W04 .byte MOD , 0 .byte W03 .byte VOICE , 60 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N18 , Cn3 , v116 .byte W18 .byte N06 , Gs2 @@ -259,21 +259,21 @@ bgm_naminori_1_B1: .byte W06 .byte N60 , Fn3 .byte W30 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 - .byte 61*bgm_naminori_mvl/mxv + .byte 61*mus_surf_mvl/mxv .byte W05 - .byte 52*bgm_naminori_mvl/mxv + .byte 52*mus_surf_mvl/mxv .byte W07 - .byte 42*bgm_naminori_mvl/mxv + .byte 42*mus_surf_mvl/mxv .byte W05 - .byte 31*bgm_naminori_mvl/mxv + .byte 31*mus_surf_mvl/mxv .byte W07 - .byte 21*bgm_naminori_mvl/mxv + .byte 21*mus_surf_mvl/mxv .byte W05 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W07 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N18 .byte W18 .byte N06 , Dn3 @@ -292,22 +292,22 @@ bgm_naminori_1_B1: .byte W06 .byte N60 , Fs3 .byte W30 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 - .byte 61*bgm_naminori_mvl/mxv + .byte 61*mus_surf_mvl/mxv .byte W05 - .byte 52*bgm_naminori_mvl/mxv + .byte 52*mus_surf_mvl/mxv .byte W07 - .byte 42*bgm_naminori_mvl/mxv + .byte 42*mus_surf_mvl/mxv .byte W05 - .byte 31*bgm_naminori_mvl/mxv + .byte 31*mus_surf_mvl/mxv .byte W07 - .byte 21*bgm_naminori_mvl/mxv + .byte 21*mus_surf_mvl/mxv .byte W05 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W07 .byte VOICE , 73 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N15 , As4 , v112 .byte W06 .byte MOD , 5 @@ -411,7 +411,7 @@ bgm_naminori_1_B1: .byte W06 .byte Fn4 .byte W12 -bgm_naminori_1_000: +mus_surf_1_000: .byte N18 , Fn4 , v104 .byte W18 .byte N06 , Fs4 @@ -449,15 +449,15 @@ bgm_naminori_1_000: .byte W12 .byte N30 , Gs4 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W06 - .byte 66*bgm_naminori_mvl/mxv + .byte 66*mus_surf_mvl/mxv .byte W06 - .byte 53*bgm_naminori_mvl/mxv + .byte 53*mus_surf_mvl/mxv .byte W06 - .byte 36*bgm_naminori_mvl/mxv + .byte 36*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N18 , Fn4 .byte W18 .byte N06 , Fs4 @@ -471,7 +471,7 @@ bgm_naminori_1_000: .byte Fn4 .byte W12 .byte PATT - .word bgm_naminori_1_000 + .word mus_surf_1_000 .byte N18 , As4 , v104 .byte W18 .byte N06 , An4 @@ -496,16 +496,16 @@ bgm_naminori_1_000: .byte W06 .byte N32 , Cn5 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W06 - .byte 66*bgm_naminori_mvl/mxv + .byte 66*mus_surf_mvl/mxv .byte W06 - .byte 53*bgm_naminori_mvl/mxv + .byte 53*mus_surf_mvl/mxv .byte W06 - .byte 36*bgm_naminori_mvl/mxv + .byte 36*mus_surf_mvl/mxv .byte W06 .byte VOICE , 73 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N54 , Cs5 , v120 .byte W21 .byte MOD , 5 @@ -544,43 +544,43 @@ bgm_naminori_1_000: .byte W12 .byte N32 , Fn5 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W03 .byte MOD , 5 .byte W03 - .byte VOL , 59*bgm_naminori_mvl/mxv + .byte VOL , 59*mus_surf_mvl/mxv .byte W06 - .byte 44*bgm_naminori_mvl/mxv + .byte 44*mus_surf_mvl/mxv .byte W06 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N32 , Cs5 .byte W09 .byte MOD , 5 .byte W09 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte W06 - .byte 27*bgm_naminori_mvl/mxv + .byte 27*mus_surf_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 .byte GOTO - .word bgm_naminori_1_B1 + .word mus_surf_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_naminori_2: - .byte KEYSH , bgm_naminori_key+0 +mus_surf_2: + .byte KEYSH , mus_surf_key+0 .byte W36 -bgm_naminori_2_B1: +mus_surf_2_B1: .byte VOICE , 58 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte PAN , c_v+0 .byte N24 , Cs1 , v127 .byte W24 @@ -602,29 +602,29 @@ bgm_naminori_2_B1: .byte W12 .byte N36 , Bn0 .byte W36 - .byte VOL , 77*bgm_naminori_mvl/mxv + .byte VOL , 77*mus_surf_mvl/mxv .byte N32 , As0 .byte W05 - .byte VOL , 74*bgm_naminori_mvl/mxv + .byte VOL , 74*mus_surf_mvl/mxv .byte W07 - .byte 68*bgm_naminori_mvl/mxv + .byte 68*mus_surf_mvl/mxv .byte W05 - .byte 56*bgm_naminori_mvl/mxv + .byte 56*mus_surf_mvl/mxv .byte W07 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W06 - .byte 33*bgm_naminori_mvl/mxv + .byte 33*mus_surf_mvl/mxv .byte W06 - .byte 43*bgm_naminori_mvl/mxv + .byte 43*mus_surf_mvl/mxv .byte N36 , Fs0 .byte W05 - .byte VOL , 53*bgm_naminori_mvl/mxv + .byte VOL , 53*mus_surf_mvl/mxv .byte W07 - .byte 65*bgm_naminori_mvl/mxv + .byte 65*mus_surf_mvl/mxv .byte W05 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W19 -bgm_naminori_2_000: +mus_surf_2_000: .byte N24 , Cs1 , v127 .byte W24 .byte N06 , Gs0 @@ -632,7 +632,7 @@ bgm_naminori_2_000: .byte N36 , Cs1 .byte W36 .byte PEND -bgm_naminori_2_001: +mus_surf_2_001: .byte N24 , Bn0 , v127 .byte W24 .byte N06 , Gs0 @@ -659,9 +659,9 @@ bgm_naminori_2_001: .byte N12 , Cs1 .byte W12 .byte PATT - .word bgm_naminori_2_000 + .word mus_surf_2_000 .byte PATT - .word bgm_naminori_2_001 + .word mus_surf_2_001 .byte N24 , As0 , v127 .byte W24 .byte N06 , Fs0 @@ -686,30 +686,30 @@ bgm_naminori_2_001: .byte W06 .byte N48 , Gs1 .byte W24 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W05 - .byte 58*bgm_naminori_mvl/mxv + .byte 58*mus_surf_mvl/mxv .byte W07 - .byte 42*bgm_naminori_mvl/mxv + .byte 42*mus_surf_mvl/mxv .byte W05 - .byte 31*bgm_naminori_mvl/mxv + .byte 31*mus_surf_mvl/mxv .byte W07 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W12 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 .byte W12 .byte N32 , Cs2 .byte W12 - .byte VOL , 76*bgm_naminori_mvl/mxv + .byte VOL , 76*mus_surf_mvl/mxv .byte W05 - .byte 58*bgm_naminori_mvl/mxv + .byte 58*mus_surf_mvl/mxv .byte W07 - .byte 38*bgm_naminori_mvl/mxv + .byte 38*mus_surf_mvl/mxv .byte W05 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W07 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 .byte W12 .byte Gs1 @@ -718,76 +718,76 @@ bgm_naminori_2_001: .byte W12 .byte N48 , Dn2 .byte W24 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W05 - .byte 58*bgm_naminori_mvl/mxv + .byte 58*mus_surf_mvl/mxv .byte W07 - .byte 42*bgm_naminori_mvl/mxv + .byte 42*mus_surf_mvl/mxv .byte W05 - .byte 31*bgm_naminori_mvl/mxv + .byte 31*mus_surf_mvl/mxv .byte W07 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W12 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 , Gs1 .byte W12 .byte N66 , Ds2 .byte W30 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 62*bgm_naminori_mvl/mxv + .byte 62*mus_surf_mvl/mxv .byte W05 - .byte 55*bgm_naminori_mvl/mxv + .byte 55*mus_surf_mvl/mxv .byte W07 - .byte 41*bgm_naminori_mvl/mxv + .byte 41*mus_surf_mvl/mxv .byte W05 - .byte 35*bgm_naminori_mvl/mxv + .byte 35*mus_surf_mvl/mxv .byte W07 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W05 - .byte 15*bgm_naminori_mvl/mxv + .byte 15*mus_surf_mvl/mxv .byte W07 -bgm_naminori_2_002: - .byte VOL , 80*bgm_naminori_mvl/mxv +mus_surf_2_002: + .byte VOL , 80*mus_surf_mvl/mxv .byte N32 , Fs2 , v112 .byte W18 - .byte VOL , 66*bgm_naminori_mvl/mxv + .byte VOL , 66*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte W06 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N32 , Fn2 .byte W18 - .byte VOL , 66*bgm_naminori_mvl/mxv + .byte VOL , 66*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte W06 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W06 .byte PEND - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N32 , Ds2 .byte W18 - .byte VOL , 66*bgm_naminori_mvl/mxv + .byte VOL , 66*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte W06 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N32 , Cs2 .byte W18 - .byte VOL , 66*bgm_naminori_mvl/mxv + .byte VOL , 66*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte W06 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W06 .byte PATT - .word bgm_naminori_2_002 - .byte VOL , 80*bgm_naminori_mvl/mxv + .word mus_surf_2_002 + .byte VOL , 80*mus_surf_mvl/mxv .byte N32 , Ds2 , v112 .byte W36 .byte N12 , Gs0 , v127 @@ -796,7 +796,7 @@ bgm_naminori_2_002: .byte W12 .byte Cn1 .byte W12 -bgm_naminori_2_003: +mus_surf_2_003: .byte N24 , Cs1 , v127 .byte W24 .byte N06 @@ -805,7 +805,7 @@ bgm_naminori_2_003: .byte W36 .byte PEND .byte PATT - .word bgm_naminori_2_003 + .word mus_surf_2_003 .byte N24 , As0 , v127 .byte W24 .byte N06 @@ -822,102 +822,102 @@ bgm_naminori_2_003: .byte W12 .byte Cn1 .byte W12 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N24 , Cs1 .byte W09 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W03 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W03 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W03 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W03 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W15 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N24 , Gs0 .byte W09 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W03 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W03 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W03 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W03 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W15 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N21 , Cs1 .byte W09 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W03 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W03 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W03 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W03 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W03 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N24 , An0 .byte W09 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W03 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W03 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W03 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W03 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W15 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N24 , As0 .byte W09 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W03 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W03 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W03 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W03 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W15 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N36 , Fn0 .byte W06 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 52*bgm_naminori_mvl/mxv + .byte 52*mus_surf_mvl/mxv .byte W06 - .byte 61*bgm_naminori_mvl/mxv + .byte 61*mus_surf_mvl/mxv .byte W06 - .byte 73*bgm_naminori_mvl/mxv + .byte 73*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W06 .byte N21 , Fn1 .byte W09 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W03 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W03 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W03 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W03 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W03 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 .byte W12 .byte Gs1 @@ -928,49 +928,49 @@ bgm_naminori_2_003: .byte W12 .byte N21 , Fs1 .byte W09 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W03 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W03 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W03 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W03 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W03 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N09 .byte W12 .byte N36 .byte W36 .byte N21 , Cs1 .byte W09 - .byte VOL , 61*bgm_naminori_mvl/mxv + .byte VOL , 61*mus_surf_mvl/mxv .byte W03 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W03 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W03 - .byte 25*bgm_naminori_mvl/mxv + .byte 25*mus_surf_mvl/mxv .byte W03 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W03 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N09 .byte W12 .byte N36 .byte W36 .byte N32 , Fs1 .byte W06 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 - .byte 63*bgm_naminori_mvl/mxv + .byte 63*mus_surf_mvl/mxv .byte W05 - .byte 46*bgm_naminori_mvl/mxv + .byte 46*mus_surf_mvl/mxv .byte W07 - .byte 36*bgm_naminori_mvl/mxv + .byte 36*mus_surf_mvl/mxv .byte W12 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 .byte W12 .byte Gs1 @@ -979,107 +979,107 @@ bgm_naminori_2_003: .byte W12 .byte N32 , Gs1 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W06 - .byte 59*bgm_naminori_mvl/mxv + .byte 59*mus_surf_mvl/mxv .byte W06 - .byte 44*bgm_naminori_mvl/mxv + .byte 44*mus_surf_mvl/mxv .byte W06 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N32 , Cs1 .byte W18 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte W06 - .byte 27*bgm_naminori_mvl/mxv + .byte 27*mus_surf_mvl/mxv .byte W06 .byte GOTO - .word bgm_naminori_2_B1 + .word mus_surf_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_naminori_3: - .byte KEYSH , bgm_naminori_key+0 +mus_surf_3: + .byte KEYSH , mus_surf_key+0 .byte W36 -bgm_naminori_3_B1: +mus_surf_3_B1: .byte PAN , c_v+0 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte W72 .byte W48 .byte VOICE , 48 - .byte VOL , 56*bgm_naminori_mvl/mxv + .byte VOL , 56*mus_surf_mvl/mxv .byte PAN , c_v+16 .byte N24 , An4 , v072 .byte W02 - .byte VOL , 60*bgm_naminori_mvl/mxv + .byte VOL , 60*mus_surf_mvl/mxv .byte W03 - .byte 65*bgm_naminori_mvl/mxv + .byte 65*mus_surf_mvl/mxv .byte W03 - .byte 68*bgm_naminori_mvl/mxv + .byte 68*mus_surf_mvl/mxv .byte W04 - .byte 71*bgm_naminori_mvl/mxv + .byte 71*mus_surf_mvl/mxv .byte W02 - .byte 77*bgm_naminori_mvl/mxv + .byte 77*mus_surf_mvl/mxv .byte W03 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W07 - .byte 51*bgm_naminori_mvl/mxv + .byte 51*mus_surf_mvl/mxv .byte N36 , Cs5 , v064 .byte W02 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte W03 - .byte 56*bgm_naminori_mvl/mxv + .byte 56*mus_surf_mvl/mxv .byte W03 - .byte 59*bgm_naminori_mvl/mxv + .byte 59*mus_surf_mvl/mxv .byte W04 - .byte 62*bgm_naminori_mvl/mxv + .byte 62*mus_surf_mvl/mxv .byte W02 - .byte 66*bgm_naminori_mvl/mxv + .byte 66*mus_surf_mvl/mxv .byte W03 - .byte 70*bgm_naminori_mvl/mxv + .byte 70*mus_surf_mvl/mxv .byte W03 - .byte 77*bgm_naminori_mvl/mxv + .byte 77*mus_surf_mvl/mxv .byte W04 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W12 - .byte 57*bgm_naminori_mvl/mxv + .byte 57*mus_surf_mvl/mxv .byte N36 , Bn4 .byte W02 - .byte VOL , 59*bgm_naminori_mvl/mxv + .byte VOL , 59*mus_surf_mvl/mxv .byte W03 - .byte 62*bgm_naminori_mvl/mxv + .byte 62*mus_surf_mvl/mxv .byte W03 - .byte 64*bgm_naminori_mvl/mxv + .byte 64*mus_surf_mvl/mxv .byte W04 - .byte 65*bgm_naminori_mvl/mxv + .byte 65*mus_surf_mvl/mxv .byte W02 - .byte 70*bgm_naminori_mvl/mxv + .byte 70*mus_surf_mvl/mxv .byte W03 - .byte 76*bgm_naminori_mvl/mxv + .byte 76*mus_surf_mvl/mxv .byte W03 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W16 - .byte 77*bgm_naminori_mvl/mxv + .byte 77*mus_surf_mvl/mxv .byte N36 , As4 .byte W05 - .byte VOL , 74*bgm_naminori_mvl/mxv + .byte VOL , 74*mus_surf_mvl/mxv .byte W07 - .byte 68*bgm_naminori_mvl/mxv + .byte 68*mus_surf_mvl/mxv .byte W05 - .byte 56*bgm_naminori_mvl/mxv + .byte 56*mus_surf_mvl/mxv .byte W07 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W06 - .byte 33*bgm_naminori_mvl/mxv + .byte 33*mus_surf_mvl/mxv .byte W06 - .byte 17*bgm_naminori_mvl/mxv + .byte 17*mus_surf_mvl/mxv .byte W36 .byte VOICE , 45 - .byte VOL , 78*bgm_naminori_mvl/mxv + .byte VOL , 78*mus_surf_mvl/mxv .byte W12 .byte N06 , Cs4 .byte W12 @@ -1178,17 +1178,17 @@ bgm_naminori_3_B1: .byte W12 .byte N32 , Fn4 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W05 - .byte 61*bgm_naminori_mvl/mxv + .byte 61*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W05 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W07 .byte VOICE , 45 .byte W12 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N06 , Gs3 , v064 .byte W12 .byte N06 @@ -1236,14 +1236,14 @@ bgm_naminori_3_B1: .byte W72 .byte W72 .byte VOICE , 60 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte N36 , Fs3 , v072 .byte W06 - .byte VOL , 60*bgm_naminori_mvl/mxv + .byte VOL , 60*mus_surf_mvl/mxv .byte W06 - .byte 71*bgm_naminori_mvl/mxv + .byte 71*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W18 .byte N36 , Fn3 , v076 .byte W36 @@ -1258,14 +1258,14 @@ bgm_naminori_3_B1: .byte W72 .byte W72 .byte W72 - .byte VOL , 45*bgm_naminori_mvl/mxv + .byte VOL , 45*mus_surf_mvl/mxv .byte N24 , Cn3 .byte W06 - .byte VOL , 50*bgm_naminori_mvl/mxv + .byte VOL , 50*mus_surf_mvl/mxv .byte W03 - .byte 68*bgm_naminori_mvl/mxv + .byte 68*mus_surf_mvl/mxv .byte W03 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W12 .byte N12 , Ds3 .byte W12 @@ -1281,15 +1281,15 @@ bgm_naminori_3_B1: .byte W12 .byte N32 .byte W21 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W03 - .byte 61*bgm_naminori_mvl/mxv + .byte 61*mus_surf_mvl/mxv .byte W03 - .byte 41*bgm_naminori_mvl/mxv + .byte 41*mus_surf_mvl/mxv .byte W03 - .byte 27*bgm_naminori_mvl/mxv + .byte 27*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N24 .byte W24 .byte N06 , Fs3 @@ -1320,26 +1320,26 @@ bgm_naminori_3_B1: .byte W12 .byte N32 , Gs3 .byte W18 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W06 - .byte 60*bgm_naminori_mvl/mxv + .byte 60*mus_surf_mvl/mxv .byte W06 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N36 , As2 , v076 .byte W36 .byte Cn3 .byte W36 .byte N32 , Cs3 .byte W18 - .byte VOL , 74*bgm_naminori_mvl/mxv + .byte VOL , 74*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 33*bgm_naminori_mvl/mxv + .byte 33*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 .byte W12 .byte Ds3 @@ -1348,17 +1348,17 @@ bgm_naminori_3_B1: .byte W12 .byte N32 , Fs3 .byte W06 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 - .byte 63*bgm_naminori_mvl/mxv + .byte 63*mus_surf_mvl/mxv .byte W05 - .byte 46*bgm_naminori_mvl/mxv + .byte 46*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W05 - .byte 33*bgm_naminori_mvl/mxv + .byte 33*mus_surf_mvl/mxv .byte W07 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 , Ds3 .byte W12 .byte Fn3 @@ -1367,14 +1367,14 @@ bgm_naminori_3_B1: .byte W12 .byte N30 , Fn3 .byte W06 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 57*bgm_naminori_mvl/mxv + .byte 57*mus_surf_mvl/mxv .byte W06 - .byte 37*bgm_naminori_mvl/mxv + .byte 37*mus_surf_mvl/mxv .byte W18 .byte VOICE , 48 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cs4 , v104 .byte W06 @@ -1389,20 +1389,20 @@ bgm_naminori_3_B1: .byte Ds4 .byte W06 .byte GOTO - .word bgm_naminori_3_B1 + .word mus_surf_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_naminori_4: - .byte KEYSH , bgm_naminori_key+0 +mus_surf_4: + .byte KEYSH , mus_surf_key+0 .byte W36 -bgm_naminori_4_B1: +mus_surf_4_B1: .byte VOICE , 83 .byte PAN , c_v-48 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N24 , Gs3 , v060 .byte W24 .byte N06 , Cs4 @@ -1423,22 +1423,22 @@ bgm_naminori_4_B1: .byte W12 .byte N36 , Fn3 .byte W36 - .byte VOL , 77*bgm_naminori_mvl/mxv + .byte VOL , 77*mus_surf_mvl/mxv .byte N32 , Fs3 .byte W05 - .byte VOL , 74*bgm_naminori_mvl/mxv + .byte VOL , 74*mus_surf_mvl/mxv .byte W07 - .byte 68*bgm_naminori_mvl/mxv + .byte 68*mus_surf_mvl/mxv .byte W05 - .byte 56*bgm_naminori_mvl/mxv + .byte 56*mus_surf_mvl/mxv .byte W07 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W06 - .byte 33*bgm_naminori_mvl/mxv + .byte 33*mus_surf_mvl/mxv .byte W06 .byte VOICE , 80 .byte PAN , c_v+0 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , Fs3 , v040 .byte W12 .byte Gs3 @@ -1575,103 +1575,103 @@ bgm_naminori_4_B1: .byte W12 .byte N32 , Fn3 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W05 - .byte 61*bgm_naminori_mvl/mxv + .byte 61*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W05 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W07 .byte VOICE , 88 .byte PAN , c_v-48 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N36 , Ds4 , v036 .byte W12 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte W06 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N36 , Gs4 .byte W12 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte W06 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N24 , Cs4 .byte W12 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N06 , Fn4 .byte W12 .byte N36 , Gs4 .byte W12 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte W06 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N36 , Dn4 .byte W12 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte W06 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N36 , Fn4 .byte W12 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte W06 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N24 , Ds4 .byte W12 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N06 , Fs4 .byte W12 .byte N36 , As4 .byte W12 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte W06 - .byte 11*bgm_naminori_mvl/mxv + .byte 11*mus_surf_mvl/mxv .byte W06 .byte VOICE , 45 .byte PAN , c_v+0 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , Fs3 , v064 .byte W12 .byte Cs4 @@ -1773,26 +1773,26 @@ bgm_naminori_4_B1: .byte W12 .byte N32 .byte W18 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W06 - .byte 60*bgm_naminori_mvl/mxv + .byte 60*mus_surf_mvl/mxv .byte W06 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N24 .byte W24 .byte N06 .byte W12 .byte N32 .byte W18 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W06 - .byte 60*bgm_naminori_mvl/mxv + .byte 60*mus_surf_mvl/mxv .byte W06 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N24 , Fn3 .byte W24 .byte N06 @@ -1809,14 +1809,14 @@ bgm_naminori_4_B1: .byte W12 .byte N32 , Fn3 .byte W18 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W06 - .byte 60*bgm_naminori_mvl/mxv + .byte 60*mus_surf_mvl/mxv .byte W06 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W06 .byte VOICE , 80 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , Fs3 , v048 .byte W12 .byte N06 , Cs4 @@ -1843,58 +1843,58 @@ bgm_naminori_4_B1: .byte W12 .byte N32 .byte W06 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 - .byte 63*bgm_naminori_mvl/mxv + .byte 63*mus_surf_mvl/mxv .byte W05 - .byte 46*bgm_naminori_mvl/mxv + .byte 46*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W05 - .byte 33*bgm_naminori_mvl/mxv + .byte 33*mus_surf_mvl/mxv .byte W07 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte N36 , Cs3 , v060 .byte W06 - .byte VOL , 55*bgm_naminori_mvl/mxv + .byte VOL , 55*mus_surf_mvl/mxv .byte W06 - .byte 62*bgm_naminori_mvl/mxv + .byte 62*mus_surf_mvl/mxv .byte W05 - .byte 75*bgm_naminori_mvl/mxv + .byte 75*mus_surf_mvl/mxv .byte W07 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W12 .byte N32 , Cs4 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W06 - .byte 59*bgm_naminori_mvl/mxv + .byte 59*mus_surf_mvl/mxv .byte W06 - .byte 44*bgm_naminori_mvl/mxv + .byte 44*mus_surf_mvl/mxv .byte W06 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N32 , Fn3 .byte W18 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte W06 - .byte 27*bgm_naminori_mvl/mxv + .byte 27*mus_surf_mvl/mxv .byte W06 .byte GOTO - .word bgm_naminori_4_B1 + .word mus_surf_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_naminori_5: - .byte KEYSH , bgm_naminori_key+0 +mus_surf_5: + .byte KEYSH , mus_surf_key+0 .byte W36 -bgm_naminori_5_B1: +mus_surf_5_B1: .byte VOICE , 84 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte PAN , c_v+48 .byte XCMD , xIECV , 8 .byte xIECL , 8 @@ -1930,23 +1930,23 @@ bgm_naminori_5_B1: .byte N12 .byte W12 .byte VOICE , 84 - .byte VOL , 77*bgm_naminori_mvl/mxv + .byte VOL , 77*mus_surf_mvl/mxv .byte N32 .byte W05 - .byte VOL , 74*bgm_naminori_mvl/mxv + .byte VOL , 74*mus_surf_mvl/mxv .byte W07 - .byte 68*bgm_naminori_mvl/mxv + .byte 68*mus_surf_mvl/mxv .byte W05 - .byte 56*bgm_naminori_mvl/mxv + .byte 56*mus_surf_mvl/mxv .byte W07 - .byte 47*bgm_naminori_mvl/mxv + .byte 47*mus_surf_mvl/mxv .byte W06 - .byte 33*bgm_naminori_mvl/mxv + .byte 33*mus_surf_mvl/mxv .byte W06 .byte VOICE , 82 - .byte VOL , 17*bgm_naminori_mvl/mxv + .byte VOL , 17*mus_surf_mvl/mxv .byte W03 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-2 .byte N12 , Fs3 , v024 @@ -2093,129 +2093,129 @@ bgm_naminori_5_B1: .byte W12 .byte N32 , Fn3 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W05 - .byte 61*bgm_naminori_mvl/mxv + .byte 61*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W05 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W04 .byte VOICE , 89 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte PAN , c_v+48 .byte BEND , c_v+0 .byte N12 , Gs3 , v036 .byte W12 .byte VOICE , 90 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 11*bgm_naminori_mvl/mxv + .byte VOL , 11*mus_surf_mvl/mxv .byte W06 .byte VOICE , 89 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , Ds4 .byte W12 .byte VOICE , 90 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 11*bgm_naminori_mvl/mxv + .byte VOL , 11*mus_surf_mvl/mxv .byte W06 .byte VOICE , 89 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N24 , Gs3 .byte W12 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N06 , Cs4 .byte W12 .byte N12 , Fn4 .byte W12 .byte VOICE , 90 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 11*bgm_naminori_mvl/mxv + .byte VOL , 11*mus_surf_mvl/mxv .byte W06 .byte VOICE , 89 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , Gs3 .byte W12 .byte VOICE , 90 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 11*bgm_naminori_mvl/mxv + .byte VOL , 11*mus_surf_mvl/mxv .byte W06 .byte VOICE , 89 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , Dn4 .byte W12 .byte VOICE , 90 - .byte VOL , 67*bgm_naminori_mvl/mxv + .byte VOL , 67*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 11*bgm_naminori_mvl/mxv + .byte VOL , 11*mus_surf_mvl/mxv .byte W06 .byte VOICE , 89 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N24 , As3 .byte W12 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N06 , Ds4 .byte W12 .byte N12 , Fs4 .byte W12 .byte VOICE , 90 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte W06 - .byte 26*bgm_naminori_mvl/mxv + .byte 26*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 11*bgm_naminori_mvl/mxv + .byte VOL , 11*mus_surf_mvl/mxv .byte W06 .byte BEND , c_v-4 .byte W72 .byte W72 .byte VOICE , 82 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , As3 , v032 .byte W12 .byte VOICE , 86 @@ -2247,7 +2247,7 @@ bgm_naminori_5_B1: .byte W12 .byte Cn3 .byte W12 -bgm_naminori_5_000: +mus_surf_5_000: .byte N12 , Cs3 , v060 .byte W12 .byte N06 , Fn3 @@ -2262,7 +2262,7 @@ bgm_naminori_5_000: .byte W12 .byte PEND .byte PATT - .word bgm_naminori_5_000 + .word mus_surf_5_000 .byte N12 , Fn3 , v060 .byte W12 .byte N06 , As3 @@ -2297,15 +2297,15 @@ bgm_naminori_5_000: .byte VOICE , 86 .byte N12 .byte W06 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W06 - .byte 60*bgm_naminori_mvl/mxv + .byte 60*mus_surf_mvl/mxv .byte N09 .byte W06 - .byte VOL , 40*bgm_naminori_mvl/mxv + .byte VOL , 40*mus_surf_mvl/mxv .byte W06 .byte VOICE , 84 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N24 , An2 .byte W24 .byte N06 @@ -2315,15 +2315,15 @@ bgm_naminori_5_000: .byte VOICE , 86 .byte N12 .byte W06 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W06 - .byte 60*bgm_naminori_mvl/mxv + .byte 60*mus_surf_mvl/mxv .byte N09 .byte W06 - .byte VOL , 40*bgm_naminori_mvl/mxv + .byte VOL , 40*mus_surf_mvl/mxv .byte W06 .byte VOICE , 84 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N24 , Cs3 .byte W24 .byte N06 @@ -2343,15 +2343,15 @@ bgm_naminori_5_000: .byte VOICE , 86 .byte N12 .byte W06 - .byte VOL , 69*bgm_naminori_mvl/mxv + .byte VOL , 69*mus_surf_mvl/mxv .byte W06 - .byte 60*bgm_naminori_mvl/mxv + .byte 60*mus_surf_mvl/mxv .byte N09 .byte W06 - .byte VOL , 40*bgm_naminori_mvl/mxv + .byte VOL , 40*mus_surf_mvl/mxv .byte W06 .byte VOICE , 82 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , Cs3 , v048 .byte W12 .byte N06 , As3 @@ -2378,75 +2378,75 @@ bgm_naminori_5_000: .byte W12 .byte N12 , An3 .byte W06 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 .byte VOICE , 86 - .byte VOL , 63*bgm_naminori_mvl/mxv + .byte VOL , 63*mus_surf_mvl/mxv .byte N12 .byte W05 - .byte VOL , 46*bgm_naminori_mvl/mxv + .byte VOL , 46*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte N09 .byte W05 - .byte VOL , 33*bgm_naminori_mvl/mxv + .byte VOL , 33*mus_surf_mvl/mxv .byte W07 .byte VOICE , 82 - .byte VOL , 49*bgm_naminori_mvl/mxv + .byte VOL , 49*mus_surf_mvl/mxv .byte N12 , An2 , v060 .byte W06 - .byte VOL , 55*bgm_naminori_mvl/mxv + .byte VOL , 55*mus_surf_mvl/mxv .byte W06 .byte VOICE , 86 - .byte VOL , 62*bgm_naminori_mvl/mxv + .byte VOL , 62*mus_surf_mvl/mxv .byte N12 .byte W05 - .byte VOL , 75*bgm_naminori_mvl/mxv + .byte VOL , 75*mus_surf_mvl/mxv .byte W07 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 .byte W12 .byte VOICE , 82 .byte N12 , Gs3 .byte W12 .byte VOICE , 86 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 59*bgm_naminori_mvl/mxv + .byte VOL , 59*mus_surf_mvl/mxv .byte W06 - .byte 44*bgm_naminori_mvl/mxv + .byte 44*mus_surf_mvl/mxv .byte N12 .byte W06 - .byte VOL , 29*bgm_naminori_mvl/mxv + .byte VOL , 29*mus_surf_mvl/mxv .byte W06 .byte VOICE , 82 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte N12 , Cs3 , v056 .byte W12 .byte VOICE , 86 .byte N12 , Cs3 , v060 .byte W06 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte N09 .byte W06 - .byte VOL , 27*bgm_naminori_mvl/mxv + .byte VOL , 27*mus_surf_mvl/mxv .byte W06 .byte GOTO - .word bgm_naminori_5_B1 + .word mus_surf_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_naminori_6: - .byte KEYSH , bgm_naminori_key+0 +mus_surf_6: + .byte KEYSH , mus_surf_key+0 .byte LFOS , 40 .byte W36 -bgm_naminori_6_B1: +mus_surf_6_B1: .byte VOICE , 46 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte PAN , c_v-16 .byte N06 , Cs4 , v088 .byte W06 @@ -2582,57 +2582,57 @@ bgm_naminori_6_B1: .byte As4 , v056 .byte W06 .byte VOICE , 48 - .byte VOL , 54*bgm_naminori_mvl/mxv + .byte VOL , 54*mus_surf_mvl/mxv .byte N36 , Fs2 , v064 .byte W05 - .byte VOL , 58*bgm_naminori_mvl/mxv + .byte VOL , 58*mus_surf_mvl/mxv .byte W07 - .byte 65*bgm_naminori_mvl/mxv + .byte 65*mus_surf_mvl/mxv .byte W05 - .byte 77*bgm_naminori_mvl/mxv + .byte 77*mus_surf_mvl/mxv .byte W07 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W12 - .byte 54*bgm_naminori_mvl/mxv + .byte 54*mus_surf_mvl/mxv .byte N36 , An2 .byte W05 - .byte VOL , 58*bgm_naminori_mvl/mxv + .byte VOL , 58*mus_surf_mvl/mxv .byte W07 - .byte 65*bgm_naminori_mvl/mxv + .byte 65*mus_surf_mvl/mxv .byte W05 - .byte 77*bgm_naminori_mvl/mxv + .byte 77*mus_surf_mvl/mxv .byte W07 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W12 .byte N72 , Gs2 .byte W30 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte W06 - .byte 70*bgm_naminori_mvl/mxv + .byte 70*mus_surf_mvl/mxv .byte W05 - .byte 66*bgm_naminori_mvl/mxv + .byte 66*mus_surf_mvl/mxv .byte W07 - .byte 57*bgm_naminori_mvl/mxv + .byte 57*mus_surf_mvl/mxv .byte W05 - .byte 45*bgm_naminori_mvl/mxv + .byte 45*mus_surf_mvl/mxv .byte W07 - .byte 35*bgm_naminori_mvl/mxv + .byte 35*mus_surf_mvl/mxv .byte W05 - .byte 22*bgm_naminori_mvl/mxv + .byte 22*mus_surf_mvl/mxv .byte W07 .byte W36 - .byte 50*bgm_naminori_mvl/mxv + .byte 50*mus_surf_mvl/mxv .byte N36 .byte W06 - .byte VOL , 58*bgm_naminori_mvl/mxv + .byte VOL , 58*mus_surf_mvl/mxv .byte W06 - .byte 60*bgm_naminori_mvl/mxv + .byte 60*mus_surf_mvl/mxv .byte W05 - .byte 65*bgm_naminori_mvl/mxv + .byte 65*mus_surf_mvl/mxv .byte W07 - .byte 71*bgm_naminori_mvl/mxv + .byte 71*mus_surf_mvl/mxv .byte W05 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte W07 .byte N24 , As2 .byte W24 @@ -2654,17 +2654,17 @@ bgm_naminori_6_B1: .byte W12 .byte N32 , Cs3 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W05 - .byte 61*bgm_naminori_mvl/mxv + .byte 61*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W05 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W07 .byte W72 .byte VOICE , 73 - .byte VOL , 80*bgm_naminori_mvl/mxv + .byte VOL , 80*mus_surf_mvl/mxv .byte PAN , c_v+8 .byte N18 , Cs5 , v060 .byte W09 @@ -2713,21 +2713,21 @@ bgm_naminori_6_B1: .byte W72 .byte W36 .byte VOICE , 48 - .byte VOL , 34*bgm_naminori_mvl/mxv + .byte VOL , 34*mus_surf_mvl/mxv .byte PAN , c_v-17 .byte N36 , Gs3 , v076 .byte W06 - .byte VOL , 47*bgm_naminori_mvl/mxv + .byte VOL , 47*mus_surf_mvl/mxv .byte W06 - .byte 56*bgm_naminori_mvl/mxv + .byte 56*mus_surf_mvl/mxv .byte W06 - .byte 63*bgm_naminori_mvl/mxv + .byte 63*mus_surf_mvl/mxv .byte W06 - .byte 71*bgm_naminori_mvl/mxv + .byte 71*mus_surf_mvl/mxv .byte W06 - .byte 76*bgm_naminori_mvl/mxv + .byte 76*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N36 , As3 .byte W36 .byte N12 , Cn4 @@ -2761,7 +2761,7 @@ bgm_naminori_6_B1: .byte W06 .byte Gs4 .byte W06 -bgm_naminori_6_000: +mus_surf_6_000: .byte N06 , An2 , v092 .byte W06 .byte Cs3 @@ -2787,7 +2787,7 @@ bgm_naminori_6_000: .byte An4 .byte W06 .byte PEND -bgm_naminori_6_001: +mus_surf_6_001: .byte N06 , As2 , v092 .byte W06 .byte Cs3 @@ -2862,9 +2862,9 @@ bgm_naminori_6_001: .byte Gs4 .byte W06 .byte PATT - .word bgm_naminori_6_000 + .word mus_surf_6_000 .byte PATT - .word bgm_naminori_6_001 + .word mus_surf_6_001 .byte N06 , Cn3 , v092 .byte W06 .byte Fn3 @@ -2944,17 +2944,17 @@ bgm_naminori_6_001: .byte W06 .byte N32 , Fs4 , v064 .byte W06 - .byte VOL , 71*bgm_naminori_mvl/mxv + .byte VOL , 71*mus_surf_mvl/mxv .byte W06 - .byte 63*bgm_naminori_mvl/mxv + .byte 63*mus_surf_mvl/mxv .byte W05 - .byte 46*bgm_naminori_mvl/mxv + .byte 46*mus_surf_mvl/mxv .byte W07 - .byte 40*bgm_naminori_mvl/mxv + .byte 40*mus_surf_mvl/mxv .byte W05 - .byte 33*bgm_naminori_mvl/mxv + .byte 33*mus_surf_mvl/mxv .byte W07 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N12 , Ds4 .byte W12 .byte Fn4 @@ -2963,43 +2963,43 @@ bgm_naminori_6_001: .byte W12 .byte N32 , Fn4 .byte W12 - .byte VOL , 73*bgm_naminori_mvl/mxv + .byte VOL , 73*mus_surf_mvl/mxv .byte W06 - .byte 59*bgm_naminori_mvl/mxv + .byte 59*mus_surf_mvl/mxv .byte W06 - .byte 44*bgm_naminori_mvl/mxv + .byte 44*mus_surf_mvl/mxv .byte W06 - .byte 29*bgm_naminori_mvl/mxv + .byte 29*mus_surf_mvl/mxv .byte W06 - .byte 80*bgm_naminori_mvl/mxv + .byte 80*mus_surf_mvl/mxv .byte N32 , Gs2 .byte W18 - .byte VOL , 70*bgm_naminori_mvl/mxv + .byte VOL , 70*mus_surf_mvl/mxv .byte W06 - .byte 49*bgm_naminori_mvl/mxv + .byte 49*mus_surf_mvl/mxv .byte W06 - .byte 27*bgm_naminori_mvl/mxv + .byte 27*mus_surf_mvl/mxv .byte W06 .byte GOTO - .word bgm_naminori_6_B1 + .word mus_surf_6_B1 .byte FINE @******************************************************@ .align 2 -bgm_naminori: +mus_surf: .byte 6 @ NumTrks .byte 0 @ NumBlks - .byte bgm_naminori_pri @ Priority - .byte bgm_naminori_rev @ Reverb. + .byte mus_surf_pri @ Priority + .byte mus_surf_rev @ Reverb. - .word bgm_naminori_grp + .word mus_surf_grp - .word bgm_naminori_1 - .word bgm_naminori_2 - .word bgm_naminori_3 - .word bgm_naminori_4 - .word bgm_naminori_5 - .word bgm_naminori_6 + .word mus_surf_1 + .word mus_surf_2 + .word mus_surf_3 + .word mus_surf_4 + .word mus_surf_5 + .word mus_surf_6 .end diff --git a/sound/songs/bgm_title3.s b/sound/songs/mus_title.s index 6a696bae9..e09059271 100644 --- a/sound/songs/bgm_title3.s +++ b/sound/songs/mus_title.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_title3_grp, voicegroup056 - .equ bgm_title3_pri, 0 - .equ bgm_title3_rev, reverb_set+50 - .equ bgm_title3_mvl, 127 - .equ bgm_title3_key, 0 - .equ bgm_title3_tbs, 1 - .equ bgm_title3_exg, 0 - .equ bgm_title3_cmp, 1 + .equ mus_title_grp, voicegroup056 + .equ mus_title_pri, 0 + .equ mus_title_rev, reverb_set+50 + .equ mus_title_mvl, 127 + .equ mus_title_key, 0 + .equ mus_title_tbs, 1 + .equ mus_title_exg, 0 + .equ mus_title_cmp, 1 .section .rodata - .global bgm_title3 + .global mus_title .align 2 @********************** Track 1 **********************@ -bgm_title3_1: - .byte KEYSH , bgm_title3_key+0 - .byte TEMPO , 144*bgm_title3_tbs/2 +mus_title_1: + .byte KEYSH , mus_title_key+0 + .byte TEMPO , 144*mus_title_tbs/2 .byte VOICE , 14 .byte PAN , c_v+40 .byte LFOS , 44 - .byte VOL , 86*bgm_title3_mvl/mxv + .byte VOL , 86*mus_title_mvl/mxv .byte W24 .byte PAN , c_v-32 .byte N48 , An2 , v120 @@ -54,28 +54,28 @@ bgm_title3_1: .byte W16 .byte N08 , Gn3 , v112 .byte W08 - .byte TEMPO , 140*bgm_title3_tbs/2 + .byte TEMPO , 140*mus_title_tbs/2 .byte PAN , c_v+32 .byte N24 , As3 .byte W24 - .byte TEMPO , 132*bgm_title3_tbs/2 + .byte TEMPO , 132*mus_title_tbs/2 .byte N16 , Gn3 .byte W16 .byte N08 , As3 , v100 .byte W08 - .byte TEMPO , 140*bgm_title3_tbs/2 - .byte VOL , 68*bgm_title3_mvl/mxv + .byte TEMPO , 140*mus_title_tbs/2 + .byte VOL , 68*mus_title_mvl/mxv .byte PAN , c_v-23 .byte N48 , Cn4 , v124 .byte W48 - .byte TEMPO , 144*bgm_title3_tbs/2 + .byte TEMPO , 144*mus_title_tbs/2 .byte W48 .byte W96 .byte W96 .byte W96 .byte VOICE , 1 .byte PAN , c_v+16 - .byte VOL , 54*bgm_title3_mvl/mxv + .byte VOL , 54*mus_title_mvl/mxv .byte N02 , Fs4 , v112 .byte W02 .byte N06 , Fn4 @@ -127,7 +127,7 @@ bgm_title3_1: .byte W96 .byte W96 .byte VOICE , 1 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte PAN , c_v-21 .byte W48 .byte N24 , Cn4 @@ -179,7 +179,7 @@ bgm_title3_1: .byte W96 .byte VOICE , 60 .byte PAN , c_v-41 - .byte VOL , 41*bgm_title3_mvl/mxv + .byte VOL , 41*mus_title_mvl/mxv .byte W48 .byte N24 , Gs2 .byte W14 @@ -259,251 +259,251 @@ bgm_title3_1: .byte N04 , Bn2 .byte W08 .byte VOICE , 14 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N96 , Cn3 , v127 .byte W08 - .byte VOL , 89*bgm_title3_mvl/mxv + .byte VOL , 89*mus_title_mvl/mxv .byte W01 - .byte 84*bgm_title3_mvl/mxv + .byte 84*mus_title_mvl/mxv .byte W03 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W04 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W04 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W01 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W03 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W01 - .byte 69*bgm_title3_mvl/mxv + .byte 69*mus_title_mvl/mxv .byte W07 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W01 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W03 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W04 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W01 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W03 - .byte 54*bgm_title3_mvl/mxv + .byte 54*mus_title_mvl/mxv .byte W01 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W03 - .byte 51*bgm_title3_mvl/mxv + .byte 51*mus_title_mvl/mxv .byte W04 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W04 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W01 - .byte 42*bgm_title3_mvl/mxv + .byte 42*mus_title_mvl/mxv .byte W07 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W01 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W03 - .byte 35*bgm_title3_mvl/mxv + .byte 35*mus_title_mvl/mxv .byte W04 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W01 - .byte 33*bgm_title3_mvl/mxv + .byte 33*mus_title_mvl/mxv .byte W03 - .byte 30*bgm_title3_mvl/mxv + .byte 30*mus_title_mvl/mxv .byte W01 - .byte 29*bgm_title3_mvl/mxv + .byte 29*mus_title_mvl/mxv .byte W07 - .byte 28*bgm_title3_mvl/mxv + .byte 28*mus_title_mvl/mxv .byte W04 - .byte 25*bgm_title3_mvl/mxv + .byte 25*mus_title_mvl/mxv .byte W08 .byte PAN , c_v+32 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N96 , Cn4 , v104 .byte W08 - .byte VOL , 89*bgm_title3_mvl/mxv + .byte VOL , 89*mus_title_mvl/mxv .byte W01 - .byte 84*bgm_title3_mvl/mxv + .byte 84*mus_title_mvl/mxv .byte W03 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W04 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W04 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W01 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W03 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W01 - .byte 69*bgm_title3_mvl/mxv + .byte 69*mus_title_mvl/mxv .byte W07 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W01 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W03 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W04 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W01 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W03 - .byte 54*bgm_title3_mvl/mxv + .byte 54*mus_title_mvl/mxv .byte W01 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W03 - .byte 51*bgm_title3_mvl/mxv + .byte 51*mus_title_mvl/mxv .byte W04 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W04 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W01 - .byte 42*bgm_title3_mvl/mxv + .byte 42*mus_title_mvl/mxv .byte W07 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W01 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W03 - .byte 35*bgm_title3_mvl/mxv + .byte 35*mus_title_mvl/mxv .byte W04 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W01 - .byte 33*bgm_title3_mvl/mxv + .byte 33*mus_title_mvl/mxv .byte W03 - .byte 30*bgm_title3_mvl/mxv + .byte 30*mus_title_mvl/mxv .byte W01 - .byte 29*bgm_title3_mvl/mxv + .byte 29*mus_title_mvl/mxv .byte W07 - .byte 28*bgm_title3_mvl/mxv + .byte 28*mus_title_mvl/mxv .byte W04 - .byte 25*bgm_title3_mvl/mxv + .byte 25*mus_title_mvl/mxv .byte W08 .byte PAN , c_v-48 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N96 , Cn3 , v124 .byte W08 - .byte VOL , 89*bgm_title3_mvl/mxv + .byte VOL , 89*mus_title_mvl/mxv .byte W01 - .byte 84*bgm_title3_mvl/mxv + .byte 84*mus_title_mvl/mxv .byte W03 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W04 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W04 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W01 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W03 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W01 - .byte 69*bgm_title3_mvl/mxv + .byte 69*mus_title_mvl/mxv .byte W07 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W01 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W03 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W04 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W01 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W03 - .byte 54*bgm_title3_mvl/mxv + .byte 54*mus_title_mvl/mxv .byte W01 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W03 - .byte 51*bgm_title3_mvl/mxv + .byte 51*mus_title_mvl/mxv .byte W04 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W04 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W01 - .byte 42*bgm_title3_mvl/mxv + .byte 42*mus_title_mvl/mxv .byte W07 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W01 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W03 - .byte 35*bgm_title3_mvl/mxv + .byte 35*mus_title_mvl/mxv .byte W04 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W01 - .byte 33*bgm_title3_mvl/mxv + .byte 33*mus_title_mvl/mxv .byte W03 - .byte 30*bgm_title3_mvl/mxv + .byte 30*mus_title_mvl/mxv .byte W01 - .byte 29*bgm_title3_mvl/mxv + .byte 29*mus_title_mvl/mxv .byte W07 - .byte 28*bgm_title3_mvl/mxv + .byte 28*mus_title_mvl/mxv .byte W04 - .byte 25*bgm_title3_mvl/mxv + .byte 25*mus_title_mvl/mxv .byte W08 .byte PAN , c_v+30 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N96 , Cn4 , v104 .byte W08 - .byte VOL , 89*bgm_title3_mvl/mxv + .byte VOL , 89*mus_title_mvl/mxv .byte W01 - .byte 84*bgm_title3_mvl/mxv + .byte 84*mus_title_mvl/mxv .byte W03 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W04 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W04 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W01 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W03 - .byte TEMPO , 140*bgm_title3_tbs/2 - .byte 73*bgm_title3_mvl/mxv + .byte TEMPO , 140*mus_title_tbs/2 + .byte 73*mus_title_mvl/mxv .byte W01 - .byte 69*bgm_title3_mvl/mxv + .byte 69*mus_title_mvl/mxv .byte W07 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W01 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W03 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W04 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W01 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W03 - .byte 54*bgm_title3_mvl/mxv + .byte 54*mus_title_mvl/mxv .byte W01 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W03 - .byte TEMPO , 138*bgm_title3_tbs/2 - .byte 51*bgm_title3_mvl/mxv + .byte TEMPO , 138*mus_title_tbs/2 + .byte 51*mus_title_mvl/mxv .byte W04 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W04 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W01 - .byte 42*bgm_title3_mvl/mxv + .byte 42*mus_title_mvl/mxv .byte W07 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W01 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W03 - .byte 35*bgm_title3_mvl/mxv + .byte 35*mus_title_mvl/mxv .byte W04 - .byte TEMPO , 136*bgm_title3_tbs/2 - .byte 34*bgm_title3_mvl/mxv + .byte TEMPO , 136*mus_title_tbs/2 + .byte 34*mus_title_mvl/mxv .byte W01 - .byte 33*bgm_title3_mvl/mxv + .byte 33*mus_title_mvl/mxv .byte W03 - .byte 30*bgm_title3_mvl/mxv + .byte 30*mus_title_mvl/mxv .byte W01 - .byte 29*bgm_title3_mvl/mxv + .byte 29*mus_title_mvl/mxv .byte W07 - .byte 28*bgm_title3_mvl/mxv + .byte 28*mus_title_mvl/mxv .byte W04 - .byte 25*bgm_title3_mvl/mxv + .byte 25*mus_title_mvl/mxv .byte W08 - .byte TEMPO , 134*bgm_title3_tbs/2 + .byte TEMPO , 134*mus_title_tbs/2 .byte PAN , c_v-25 - .byte VOL , 68*bgm_title3_mvl/mxv + .byte VOL , 68*mus_title_mvl/mxv .byte N48 , Cn4 , v112 .byte W48 .byte N24 , Dn4 @@ -514,7 +514,7 @@ bgm_title3_1: .byte W48 .byte N44 , As3 .byte W48 - .byte TEMPO , 134*bgm_title3_tbs/2 + .byte TEMPO , 134*mus_title_tbs/2 .byte N48 .byte W48 .byte N24 , Cn4 @@ -539,7 +539,7 @@ bgm_title3_1: .byte W24 .byte Gs3 .byte W24 - .byte TEMPO , 132*bgm_title3_tbs/2 + .byte TEMPO , 132*mus_title_tbs/2 .byte Gs4 .byte W24 .byte Ds4 @@ -548,23 +548,23 @@ bgm_title3_1: .byte W24 .byte Ds4 .byte W24 - .byte TEMPO , 136*bgm_title3_tbs/2 + .byte TEMPO , 136*mus_title_tbs/2 .byte Fs4 .byte W24 .byte Fn4 .byte W24 - .byte TEMPO , 134*bgm_title3_tbs/2 + .byte TEMPO , 134*mus_title_tbs/2 .byte Ds4 .byte W24 - .byte TEMPO , 128*bgm_title3_tbs/2 + .byte TEMPO , 128*mus_title_tbs/2 .byte Cs4 .byte W24 - .byte TEMPO , 138*bgm_title3_tbs/2 + .byte TEMPO , 138*mus_title_tbs/2 .byte W96 .byte VOICE , 1 .byte W96 .byte W96 - .byte VOL , 62*bgm_title3_mvl/mxv + .byte VOL , 62*mus_title_mvl/mxv .byte N04 , Gs4 .byte W08 .byte As4 @@ -675,26 +675,26 @@ bgm_title3_1: .byte W24 .byte Cs5 .byte W24 - .byte VOL , 56*bgm_title3_mvl/mxv + .byte VOL , 56*mus_title_mvl/mxv .byte N24 , En5 .byte W24 .byte N16 , Ds5 .byte W16 .byte N08 , Gs4 .byte W08 - .byte TEMPO , 136*bgm_title3_tbs/2 + .byte TEMPO , 136*mus_title_tbs/2 .byte N24 , Cs5 .byte W24 .byte Gs4 .byte W24 .byte Bn4 .byte W24 - .byte TEMPO , 128*bgm_title3_tbs/2 + .byte TEMPO , 128*mus_title_tbs/2 .byte N16 , Fs4 .byte W16 .byte N08 , Cs4 .byte W08 - .byte TEMPO , 120*bgm_title3_tbs/2 + .byte TEMPO , 120*mus_title_tbs/2 .byte N24 , As4 .byte W24 .byte Fs4 @@ -705,93 +705,93 @@ bgm_title3_1: .byte W16 .byte N08 , Gs4 .byte W08 - .byte TEMPO , 100*bgm_title3_tbs/2 + .byte TEMPO , 100*mus_title_tbs/2 .byte N96 , As4 .byte W12 - .byte VOL , 63*bgm_title3_mvl/mxv + .byte VOL , 63*mus_title_mvl/mxv .byte W01 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W03 - .byte 61*bgm_title3_mvl/mxv + .byte 61*mus_title_mvl/mxv .byte W01 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W04 - .byte 59*bgm_title3_mvl/mxv + .byte 59*mus_title_mvl/mxv .byte W03 - .byte TEMPO , 82*bgm_title3_tbs/2 - .byte 58*bgm_title3_mvl/mxv + .byte TEMPO , 82*mus_title_tbs/2 + .byte 58*mus_title_mvl/mxv .byte W01 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W03 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W04 - .byte 55*bgm_title3_mvl/mxv + .byte 55*mus_title_mvl/mxv .byte W01 - .byte 55*bgm_title3_mvl/mxv + .byte 55*mus_title_mvl/mxv .byte W03 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W01 - .byte 51*bgm_title3_mvl/mxv + .byte 51*mus_title_mvl/mxv .byte W03 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W04 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W01 - .byte 44*bgm_title3_mvl/mxv + .byte 44*mus_title_mvl/mxv .byte W03 - .byte TEMPO , 64*bgm_title3_tbs/2 - .byte 43*bgm_title3_mvl/mxv + .byte TEMPO , 64*mus_title_tbs/2 + .byte 43*mus_title_mvl/mxv .byte W01 - .byte 42*bgm_title3_mvl/mxv + .byte 42*mus_title_mvl/mxv .byte W03 - .byte 40*bgm_title3_mvl/mxv + .byte 40*mus_title_mvl/mxv .byte W01 - .byte 38*bgm_title3_mvl/mxv + .byte 38*mus_title_mvl/mxv .byte W03 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W01 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W03 - .byte 32*bgm_title3_mvl/mxv + .byte 32*mus_title_mvl/mxv .byte W01 - .byte 30*bgm_title3_mvl/mxv + .byte 30*mus_title_mvl/mxv .byte W03 - .byte 26*bgm_title3_mvl/mxv + .byte 26*mus_title_mvl/mxv .byte W01 - .byte 26*bgm_title3_mvl/mxv + .byte 26*mus_title_mvl/mxv .byte W03 - .byte 24*bgm_title3_mvl/mxv + .byte 24*mus_title_mvl/mxv .byte W01 - .byte 22*bgm_title3_mvl/mxv + .byte 22*mus_title_mvl/mxv .byte W03 - .byte 20*bgm_title3_mvl/mxv + .byte 20*mus_title_mvl/mxv .byte W04 - .byte 17*bgm_title3_mvl/mxv + .byte 17*mus_title_mvl/mxv .byte W01 - .byte 17*bgm_title3_mvl/mxv + .byte 17*mus_title_mvl/mxv .byte W03 - .byte 15*bgm_title3_mvl/mxv + .byte 15*mus_title_mvl/mxv .byte W01 - .byte 14*bgm_title3_mvl/mxv + .byte 14*mus_title_mvl/mxv .byte W03 - .byte 12*bgm_title3_mvl/mxv + .byte 12*mus_title_mvl/mxv .byte W01 - .byte 11*bgm_title3_mvl/mxv + .byte 11*mus_title_mvl/mxv .byte W03 - .byte 9*bgm_title3_mvl/mxv + .byte 9*mus_title_mvl/mxv .byte W04 - .byte 8*bgm_title3_mvl/mxv + .byte 8*mus_title_mvl/mxv .byte W04 .byte FINE @********************** Track 2 **********************@ -bgm_title3_2: - .byte KEYSH , bgm_title3_key+0 +mus_title_2: + .byte KEYSH , mus_title_key+0 .byte VOICE , 46 .byte PAN , c_v+0 .byte c_v+22 - .byte VOL , 84*bgm_title3_mvl/mxv + .byte VOL , 84*mus_title_mvl/mxv .byte LFOS , 44 .byte N04 , Fn3 , v112 .byte W04 @@ -812,7 +812,7 @@ bgm_title3_2: .byte W96 .byte W96 .byte VOICE , 60 - .byte VOL , 63*bgm_title3_mvl/mxv + .byte VOL , 63*mus_title_mvl/mxv .byte PAN , c_v+16 .byte W72 .byte N08 , An2 @@ -848,7 +848,7 @@ bgm_title3_2: .byte W08 .byte W96 .byte VOICE , 56 - .byte VOL , 59*bgm_title3_mvl/mxv + .byte VOL , 59*mus_title_mvl/mxv .byte W48 .byte N04 , An4 .byte W08 @@ -873,7 +873,7 @@ bgm_title3_2: .byte N04 , Gn4 .byte W56 .byte PAN , c_v+27 - .byte VOL , 68*bgm_title3_mvl/mxv + .byte VOL , 68*mus_title_mvl/mxv .byte N04 , An4 .byte W08 .byte As4 @@ -937,7 +937,7 @@ bgm_title3_2: .byte N04 .byte W08 .byte VOICE , 56 - .byte VOL , 70*bgm_title3_mvl/mxv + .byte VOL , 70*mus_title_mvl/mxv .byte PAN , c_v-17 .byte N04 , Fn3 .byte W08 @@ -977,7 +977,7 @@ bgm_title3_2: .byte W24 .byte N04 .byte W08 - .byte VOL , 80*bgm_title3_mvl/mxv + .byte VOL , 80*mus_title_mvl/mxv .byte N24 , Gs3 .byte W18 .byte MOD , 7 @@ -1026,7 +1026,7 @@ bgm_title3_2: .byte En4 , v068 .byte W06 .byte VOICE , 46 - .byte VOL , 68*bgm_title3_mvl/mxv + .byte VOL , 68*mus_title_mvl/mxv .byte PAN , c_v+32 .byte N04 , Gn2 , v112 .byte W04 @@ -1053,7 +1053,7 @@ bgm_title3_2: .byte W04 .byte En5 .byte W04 - .byte VOL , 56*bgm_title3_mvl/mxv + .byte VOL , 56*mus_title_mvl/mxv .byte PAN , c_v-40 .byte N02 , Gs5 .byte W02 @@ -1460,7 +1460,7 @@ bgm_title3_2: .byte W96 .byte W96 .byte VOICE , 46 - .byte VOL , 51*bgm_title3_mvl/mxv + .byte VOL , 51*mus_title_mvl/mxv .byte W96 .byte PAN , c_v-32 .byte N04 , As2 , v112 @@ -1719,7 +1719,7 @@ bgm_title3_2: .byte W04 .byte VOICE , 73 .byte PAN , c_v+35 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte W48 .byte N16 , Fs4 .byte W16 @@ -1759,7 +1759,7 @@ bgm_title3_2: .byte W08 .byte Dn5 .byte W08 -bgm_title3_2_000: +mus_title_2_000: .byte N04 , Cs5 , v112 .byte W04 .byte Ds5 @@ -1867,7 +1867,7 @@ bgm_title3_2_000: .byte Cn5 .byte W08 .byte PATT - .word bgm_title3_2_000 + .word mus_title_2_000 .byte N04 , Gs4 , v112 .byte W08 .byte As4 @@ -1893,7 +1893,7 @@ bgm_title3_2_000: .byte Gs5 .byte W08 .byte VOICE , 60 - .byte VOL , 68*bgm_title3_mvl/mxv + .byte VOL , 68*mus_title_mvl/mxv .byte W48 .byte N08 , Fs2 .byte W08 @@ -1912,7 +1912,7 @@ bgm_title3_2_000: .byte N24 , Fs3 .byte W24 .byte PAN , c_v-35 - .byte VOL , 48*bgm_title3_mvl/mxv + .byte VOL , 48*mus_title_mvl/mxv .byte N04 , Ds4 .byte W16 .byte N08 , Fs4 @@ -1929,7 +1929,7 @@ bgm_title3_2_000: .byte W96 .byte VOICE , 60 .byte PAN , c_v+32 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte N08 , Fs2 .byte W08 .byte N04 , Bn2 @@ -2036,14 +2036,14 @@ bgm_title3_2_000: @********************** Track 3 **********************@ -bgm_title3_3: - .byte KEYSH , bgm_title3_key+0 +mus_title_3: + .byte KEYSH , mus_title_key+0 .byte VOICE , 58 - .byte VOL , 77*bgm_title3_mvl/mxv + .byte VOL , 77*mus_title_mvl/mxv .byte LFOS , 44 .byte PAN , c_v+9 .byte W24 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -2065,7 +2065,7 @@ bgm_title3_3: .byte W08 .byte En2 .byte W08 -bgm_title3_3_000: +mus_title_3_000: .byte N08 , Fn1 , v112 .byte W16 .byte N04 , Fn1 , v080 @@ -2085,7 +2085,7 @@ bgm_title3_3_000: .byte N04 , En1 , v080 .byte W08 .byte PEND -bgm_title3_3_001: +mus_title_3_001: .byte N08 , Ds1 , v112 .byte W16 .byte N04 , Ds1 , v080 @@ -2106,7 +2106,7 @@ bgm_title3_3_001: .byte W08 .byte PEND .byte PATT - .word bgm_title3_3_000 + .word mus_title_3_000 .byte N20 , Ds1 , v112 .byte W24 .byte N04 @@ -2148,9 +2148,9 @@ bgm_title3_3_001: .byte N04 , En1 , v080 .byte W08 .byte PATT - .word bgm_title3_3_001 + .word mus_title_3_001 .byte PATT - .word bgm_title3_3_000 + .word mus_title_3_000 .byte N08 , Ds1 , v112 .byte W08 .byte N04 , Dn1 @@ -2213,7 +2213,7 @@ bgm_title3_3_001: .byte N04 , En1 , v080 .byte W08 .byte PATT - .word bgm_title3_3_000 + .word mus_title_3_000 .byte N04 , Ds1 , v112 .byte W08 .byte N04 @@ -2405,7 +2405,7 @@ bgm_title3_3_001: .byte W08 .byte VOICE , 58 .byte PAN , c_v+0 - .byte VOL , 72*bgm_title3_mvl/mxv + .byte VOL , 72*mus_title_mvl/mxv .byte N48 , Ds1 .byte W24 .byte MOD , 10 @@ -2543,7 +2543,7 @@ bgm_title3_3_001: .byte W04 .byte Cs1 .byte W08 - .byte VOL , 84*bgm_title3_mvl/mxv + .byte VOL , 84*mus_title_mvl/mxv .byte W16 .byte N04 , Fn1 .byte W08 @@ -2559,7 +2559,7 @@ bgm_title3_3_001: .byte W16 .byte Fn1 .byte W08 -bgm_title3_3_002: +mus_title_3_002: .byte N12 , Fs1 , v112 .byte W16 .byte N04 , Fn1 @@ -2575,7 +2575,7 @@ bgm_title3_3_002: .byte N04 .byte W24 .byte PEND -bgm_title3_3_003: +mus_title_3_003: .byte W16 .byte N04 , Fn1 , v112 .byte W08 @@ -2609,11 +2609,11 @@ bgm_title3_3_003: .byte Fn1 .byte W08 .byte PATT - .word bgm_title3_3_003 + .word mus_title_3_003 .byte PATT - .word bgm_title3_3_002 + .word mus_title_3_002 .byte PATT - .word bgm_title3_3_003 + .word mus_title_3_003 .byte N12 , Fs1 , v112 .byte W16 .byte N04 , Fn1 @@ -2645,116 +2645,116 @@ bgm_title3_3_003: .byte W04 .byte TIE , En1 .byte W48 - .byte VOL , 84*bgm_title3_mvl/mxv + .byte VOL , 84*mus_title_mvl/mxv .byte W04 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W04 - .byte 80*bgm_title3_mvl/mxv + .byte 80*mus_title_mvl/mxv .byte W04 - .byte 80*bgm_title3_mvl/mxv + .byte 80*mus_title_mvl/mxv .byte W04 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W04 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W04 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W04 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W01 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W03 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W01 - .byte 71*bgm_title3_mvl/mxv + .byte 71*mus_title_mvl/mxv .byte W03 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W04 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W05 - .byte 67*bgm_title3_mvl/mxv + .byte 67*mus_title_mvl/mxv .byte W03 .byte MOD , 4 - .byte VOL , 66*bgm_title3_mvl/mxv + .byte VOL , 66*mus_title_mvl/mxv .byte W04 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W04 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W01 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W03 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W04 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W04 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W04 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W05 - .byte 55*bgm_title3_mvl/mxv + .byte 55*mus_title_mvl/mxv .byte W03 - .byte 54*bgm_title3_mvl/mxv + .byte 54*mus_title_mvl/mxv .byte W01 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W03 - .byte 51*bgm_title3_mvl/mxv + .byte 51*mus_title_mvl/mxv .byte W01 - .byte 50*bgm_title3_mvl/mxv + .byte 50*mus_title_mvl/mxv .byte W03 - .byte 49*bgm_title3_mvl/mxv + .byte 49*mus_title_mvl/mxv .byte W01 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W03 - .byte 46*bgm_title3_mvl/mxv + .byte 46*mus_title_mvl/mxv .byte W04 .byte MOD , 9 - .byte VOL , 46*bgm_title3_mvl/mxv + .byte VOL , 46*mus_title_mvl/mxv .byte W01 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W03 - .byte 44*bgm_title3_mvl/mxv + .byte 44*mus_title_mvl/mxv .byte W04 - .byte 43*bgm_title3_mvl/mxv + .byte 43*mus_title_mvl/mxv .byte W01 - .byte 42*bgm_title3_mvl/mxv + .byte 42*mus_title_mvl/mxv .byte W03 - .byte 41*bgm_title3_mvl/mxv + .byte 41*mus_title_mvl/mxv .byte W04 - .byte 41*bgm_title3_mvl/mxv + .byte 41*mus_title_mvl/mxv .byte W04 - .byte 40*bgm_title3_mvl/mxv + .byte 40*mus_title_mvl/mxv .byte W01 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W03 .byte MOD , 12 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte W01 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W03 - .byte 52*bgm_title3_mvl/mxv + .byte 52*mus_title_mvl/mxv .byte W01 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W01 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W02 - .byte 61*bgm_title3_mvl/mxv + .byte 61*mus_title_mvl/mxv .byte W01 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W03 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W01 - .byte 71*bgm_title3_mvl/mxv + .byte 71*mus_title_mvl/mxv .byte W03 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W01 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W03 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W01 - .byte 81*bgm_title3_mvl/mxv + .byte 81*mus_title_mvl/mxv .byte W03 .byte EOT .byte MOD , 0 - .byte VOL , 85*bgm_title3_mvl/mxv + .byte VOL , 85*mus_title_mvl/mxv .byte N08 , Fs1 .byte W08 .byte Fn1 @@ -2821,11 +2821,11 @@ bgm_title3_3_003: @********************** Track 4 **********************@ -bgm_title3_4: - .byte KEYSH , bgm_title3_key+0 +mus_title_4: + .byte KEYSH , mus_title_key+0 .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte MOD , 0 .byte LFOS , 44 .byte N04 , Cn3 , v112 @@ -2918,38 +2918,38 @@ bgm_title3_4: .byte N88 , Cn4 , v120 .byte W48 .byte MOD , 6 - .byte VOL , 87*bgm_title3_mvl/mxv + .byte VOL , 87*mus_title_mvl/mxv .byte W01 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W03 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte W04 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W01 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W03 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W04 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W01 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W03 - .byte 74*bgm_title3_mvl/mxv + .byte 74*mus_title_mvl/mxv .byte W01 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W03 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W01 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W03 - .byte 69*bgm_title3_mvl/mxv + .byte 69*mus_title_mvl/mxv .byte W04 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W04 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N04 , Cs4 , v112 .byte W04 .byte Dn4 @@ -2963,53 +2963,53 @@ bgm_title3_4: .byte N96 , Cn4 , v124 .byte W48 .byte MOD , 6 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte W02 - .byte 89*bgm_title3_mvl/mxv + .byte 89*mus_title_mvl/mxv .byte W02 - .byte 89*bgm_title3_mvl/mxv + .byte 89*mus_title_mvl/mxv .byte W02 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W02 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W02 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte W04 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W02 - .byte 81*bgm_title3_mvl/mxv + .byte 81*mus_title_mvl/mxv .byte W02 - .byte 80*bgm_title3_mvl/mxv + .byte 80*mus_title_mvl/mxv .byte W02 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W02 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W02 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W02 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W02 - .byte 71*bgm_title3_mvl/mxv + .byte 71*mus_title_mvl/mxv .byte W02 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W02 - .byte 67*bgm_title3_mvl/mxv + .byte 67*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W02 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W02 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W02 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W04 .byte VOICE , 60 .byte MOD , 0 - .byte VOL , 79*bgm_title3_mvl/mxv + .byte VOL , 79*mus_title_mvl/mxv .byte N20 , As3 , v112 .byte W24 .byte N04 @@ -3069,34 +3069,34 @@ bgm_title3_4: .byte W48 .byte MOD , 2 .byte W24 - .byte VOL , 78*bgm_title3_mvl/mxv + .byte VOL , 78*mus_title_mvl/mxv .byte W02 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W02 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W02 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W02 - .byte 71*bgm_title3_mvl/mxv + .byte 71*mus_title_mvl/mxv .byte W02 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W02 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 61*bgm_title3_mvl/mxv + .byte 61*mus_title_mvl/mxv .byte W02 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W04 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte MOD , 0 .byte W96 .byte VOICE , 56 .byte PAN , c_v+0 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N24 , Cn3 , v124 .byte W24 .byte N08 , Fn3 @@ -3108,46 +3108,46 @@ bgm_title3_4: .byte N88 , Cn4 , v124 .byte W48 .byte MOD , 6 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte W02 - .byte 89*bgm_title3_mvl/mxv + .byte 89*mus_title_mvl/mxv .byte W02 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte W02 - .byte 81*bgm_title3_mvl/mxv + .byte 81*mus_title_mvl/mxv .byte W02 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W02 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W02 - .byte 76*bgm_title3_mvl/mxv + .byte 76*mus_title_mvl/mxv .byte W02 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W02 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W02 - .byte 71*bgm_title3_mvl/mxv + .byte 71*mus_title_mvl/mxv .byte W02 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W02 - .byte 67*bgm_title3_mvl/mxv + .byte 67*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W02 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W02 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W04 - .byte 59*bgm_title3_mvl/mxv + .byte 59*mus_title_mvl/mxv .byte W02 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N04 , Cs4 , v112 .byte W04 .byte Dn4 @@ -3161,56 +3161,56 @@ bgm_title3_4: .byte N96 , Cn4 , v124 .byte W48 .byte MOD , 6 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte W01 - .byte 89*bgm_title3_mvl/mxv + .byte 89*mus_title_mvl/mxv .byte W01 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W02 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W02 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte W02 - .byte 81*bgm_title3_mvl/mxv + .byte 81*mus_title_mvl/mxv .byte W02 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W02 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W02 - .byte 76*bgm_title3_mvl/mxv + .byte 76*mus_title_mvl/mxv .byte W02 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W02 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W02 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W02 - .byte 71*bgm_title3_mvl/mxv + .byte 71*mus_title_mvl/mxv .byte W02 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W02 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W02 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W02 - .byte 67*bgm_title3_mvl/mxv + .byte 67*mus_title_mvl/mxv .byte W02 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 64*bgm_title3_mvl/mxv + .byte 64*mus_title_mvl/mxv .byte W02 - .byte 61*bgm_title3_mvl/mxv + .byte 61*mus_title_mvl/mxv .byte W02 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W02 - .byte 59*bgm_title3_mvl/mxv + .byte 59*mus_title_mvl/mxv .byte W02 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W04 .byte VOICE , 60 - .byte VOL , 76*bgm_title3_mvl/mxv + .byte VOL , 76*mus_title_mvl/mxv .byte MOD , 0 .byte N04 , Ds4 , v112 .byte W08 @@ -3228,7 +3228,7 @@ bgm_title3_4: .byte W16 .byte N04 .byte W08 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte PAN , c_v+0 .byte N12 , Fn3 .byte W12 @@ -3253,54 +3253,54 @@ bgm_title3_4: .byte N96 , Cn4 .byte W48 .byte MOD , 4 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte W02 - .byte 89*bgm_title3_mvl/mxv + .byte 89*mus_title_mvl/mxv .byte W02 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W02 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte W02 - .byte 84*bgm_title3_mvl/mxv + .byte 84*mus_title_mvl/mxv .byte W02 - .byte 81*bgm_title3_mvl/mxv + .byte 81*mus_title_mvl/mxv .byte W02 - .byte 80*bgm_title3_mvl/mxv + .byte 80*mus_title_mvl/mxv .byte W02 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W02 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W02 - .byte 76*bgm_title3_mvl/mxv + .byte 76*mus_title_mvl/mxv .byte W02 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W02 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W02 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W02 - .byte 71*bgm_title3_mvl/mxv + .byte 71*mus_title_mvl/mxv .byte W02 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W02 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W02 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W04 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 64*bgm_title3_mvl/mxv + .byte 64*mus_title_mvl/mxv .byte W02 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W02 - .byte 61*bgm_title3_mvl/mxv + .byte 61*mus_title_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N18 , Ds4 .byte W18 .byte N16 , Dn4 @@ -3310,30 +3310,30 @@ bgm_title3_4: .byte N36 , Fn4 .byte W16 .byte MOD , 4 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte W02 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte W02 - .byte 81*bgm_title3_mvl/mxv + .byte 81*mus_title_mvl/mxv .byte W02 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W02 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W02 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W02 - .byte 67*bgm_title3_mvl/mxv + .byte 67*mus_title_mvl/mxv .byte W02 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W02 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W02 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 60*bgm_title3_mvl/mxv + .byte VOL , 60*mus_title_mvl/mxv .byte W02 - .byte 90*bgm_title3_mvl/mxv + .byte 90*mus_title_mvl/mxv .byte N02 , An4 , v092 .byte W02 .byte N08 , Gs4 , v112 @@ -3343,46 +3343,46 @@ bgm_title3_4: .byte N92 , Fn4 .byte W44 .byte W02 - .byte VOL , 86*bgm_title3_mvl/mxv + .byte VOL , 86*mus_title_mvl/mxv .byte W01 - .byte 84*bgm_title3_mvl/mxv + .byte 84*mus_title_mvl/mxv .byte W03 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W01 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W03 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W01 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W03 - .byte 60*bgm_title3_mvl/mxv + .byte 60*mus_title_mvl/mxv .byte MOD , 6 .byte W01 - .byte VOL , 56*bgm_title3_mvl/mxv + .byte VOL , 56*mus_title_mvl/mxv .byte W03 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W01 - .byte 51*bgm_title3_mvl/mxv + .byte 51*mus_title_mvl/mxv .byte W03 - .byte 49*bgm_title3_mvl/mxv + .byte 49*mus_title_mvl/mxv .byte W01 - .byte 47*bgm_title3_mvl/mxv + .byte 47*mus_title_mvl/mxv .byte W03 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W01 - .byte 43*bgm_title3_mvl/mxv + .byte 43*mus_title_mvl/mxv .byte W03 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W01 - .byte 37*bgm_title3_mvl/mxv + .byte 37*mus_title_mvl/mxv .byte W03 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W01 - .byte 35*bgm_title3_mvl/mxv + .byte 35*mus_title_mvl/mxv .byte W15 .byte MOD , 0 .byte W48 - .byte VOL , 37*bgm_title3_mvl/mxv + .byte VOL , 37*mus_title_mvl/mxv .byte N40 , Cn4 .byte W16 .byte MOD , 6 @@ -3392,39 +3392,39 @@ bgm_title3_4: .byte MOD , 0 .byte W54 .byte 5 - .byte VOL , 37*bgm_title3_mvl/mxv + .byte VOL , 37*mus_title_mvl/mxv .byte W04 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W01 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W04 - .byte 35*bgm_title3_mvl/mxv + .byte 35*mus_title_mvl/mxv .byte W03 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W01 - .byte 33*bgm_title3_mvl/mxv + .byte 33*mus_title_mvl/mxv .byte W03 - .byte 32*bgm_title3_mvl/mxv + .byte 32*mus_title_mvl/mxv .byte W04 - .byte 31*bgm_title3_mvl/mxv + .byte 31*mus_title_mvl/mxv .byte W04 - .byte 31*bgm_title3_mvl/mxv + .byte 31*mus_title_mvl/mxv .byte W04 - .byte 30*bgm_title3_mvl/mxv + .byte 30*mus_title_mvl/mxv .byte W08 - .byte 28*bgm_title3_mvl/mxv + .byte 28*mus_title_mvl/mxv .byte W01 - .byte 27*bgm_title3_mvl/mxv + .byte 27*mus_title_mvl/mxv .byte W11 .byte EOT .byte MOD , 0 - .byte VOL , 39*bgm_title3_mvl/mxv + .byte VOL , 39*mus_title_mvl/mxv .byte N24 , Cn4 .byte W24 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte N24 , Cs4 .byte W24 - .byte VOL , 54*bgm_title3_mvl/mxv + .byte VOL , 54*mus_title_mvl/mxv .byte N40 , Dn4 .byte W16 .byte MOD , 6 @@ -3433,44 +3433,44 @@ bgm_title3_4: .byte TIE , As3 .byte W56 .byte MOD , 6 - .byte VOL , 55*bgm_title3_mvl/mxv + .byte VOL , 55*mus_title_mvl/mxv .byte W01 - .byte 54*bgm_title3_mvl/mxv + .byte 54*mus_title_mvl/mxv .byte W04 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W03 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W04 - .byte 51*bgm_title3_mvl/mxv + .byte 51*mus_title_mvl/mxv .byte W01 - .byte 50*bgm_title3_mvl/mxv + .byte 50*mus_title_mvl/mxv .byte W04 - .byte 49*bgm_title3_mvl/mxv + .byte 49*mus_title_mvl/mxv .byte W04 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W04 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W04 - .byte 47*bgm_title3_mvl/mxv + .byte 47*mus_title_mvl/mxv .byte W03 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W04 - .byte 44*bgm_title3_mvl/mxv + .byte 44*mus_title_mvl/mxv .byte W01 - .byte 43*bgm_title3_mvl/mxv + .byte 43*mus_title_mvl/mxv .byte W03 - .byte 43*bgm_title3_mvl/mxv + .byte 43*mus_title_mvl/mxv .byte W04 - .byte 40*bgm_title3_mvl/mxv + .byte 40*mus_title_mvl/mxv .byte W04 .byte EOT .byte MOD , 0 - .byte VOL , 65*bgm_title3_mvl/mxv + .byte VOL , 65*mus_title_mvl/mxv .byte N24 , Fn4 .byte W24 .byte Fs4 .byte W24 - .byte VOL , 70*bgm_title3_mvl/mxv + .byte VOL , 70*mus_title_mvl/mxv .byte PAN , c_v-16 .byte N08 , Gn4 .byte W08 @@ -3573,13 +3573,13 @@ bgm_title3_4: .byte W08 .byte VOICE , 60 .byte PAN , c_v-21 - .byte VOL , 41*bgm_title3_mvl/mxv + .byte VOL , 41*mus_title_mvl/mxv .byte W48 .byte N24 , Dn3 .byte W24 .byte Ds3 .byte W24 - .byte VOL , 40*bgm_title3_mvl/mxv + .byte VOL , 40*mus_title_mvl/mxv .byte N08 , Fn3 .byte W08 .byte N04 , En3 @@ -3705,7 +3705,7 @@ bgm_title3_4: .byte W08 .byte Gs3 .byte W08 - .byte VOL , 87*bgm_title3_mvl/mxv + .byte VOL , 87*mus_title_mvl/mxv .byte PAN , c_v+0 .byte N24 , Fs3 .byte W12 @@ -3719,20 +3719,20 @@ bgm_title3_4: .byte W16 .byte MOD , 7 .byte W08 - .byte VOL , 86*bgm_title3_mvl/mxv + .byte VOL , 86*mus_title_mvl/mxv .byte W04 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W04 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W04 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W04 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W04 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 86*bgm_title3_mvl/mxv + .byte VOL , 86*mus_title_mvl/mxv .byte N24 , Gs3 .byte W16 .byte MOD , 7 @@ -3755,36 +3755,36 @@ bgm_title3_4: .byte N96 , Cs4 .byte W48 .byte MOD , 6 - .byte VOL , 85*bgm_title3_mvl/mxv + .byte VOL , 85*mus_title_mvl/mxv .byte W04 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W04 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W04 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W04 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W04 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W04 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W04 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W04 - .byte 66*bgm_title3_mvl/mxv + .byte 66*mus_title_mvl/mxv .byte W04 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W04 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W04 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 87*bgm_title3_mvl/mxv + .byte VOL , 87*mus_title_mvl/mxv .byte W72 .byte VOICE , 56 .byte W24 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N08 , Fs3 .byte W08 .byte Cs3 @@ -3799,30 +3799,30 @@ bgm_title3_4: .byte W08 .byte MOD , 5 .byte W16 - .byte VOL , 88*bgm_title3_mvl/mxv + .byte VOL , 88*mus_title_mvl/mxv .byte W01 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W03 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W01 - .byte 80*bgm_title3_mvl/mxv + .byte 80*mus_title_mvl/mxv .byte W03 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W01 - .byte 76*bgm_title3_mvl/mxv + .byte 76*mus_title_mvl/mxv .byte W03 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W01 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W03 - .byte 69*bgm_title3_mvl/mxv + .byte 69*mus_title_mvl/mxv .byte W01 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W03 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte N08 , Gs3 .byte W08 .byte N04 , Ds3 @@ -3846,43 +3846,43 @@ bgm_title3_4: .byte W08 .byte N96 , Cs4 .byte W48 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte W01 - .byte 89*bgm_title3_mvl/mxv + .byte 89*mus_title_mvl/mxv .byte W03 .byte MOD , 6 - .byte VOL , 88*bgm_title3_mvl/mxv + .byte VOL , 88*mus_title_mvl/mxv .byte W01 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W03 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte W04 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W01 - .byte 82*bgm_title3_mvl/mxv + .byte 82*mus_title_mvl/mxv .byte W03 - .byte 80*bgm_title3_mvl/mxv + .byte 80*mus_title_mvl/mxv .byte W01 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W03 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W01 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W03 - .byte 76*bgm_title3_mvl/mxv + .byte 76*mus_title_mvl/mxv .byte W01 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W07 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W05 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W03 - .byte 71*bgm_title3_mvl/mxv + .byte 71*mus_title_mvl/mxv .byte W04 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 90*bgm_title3_mvl/mxv + .byte VOL , 90*mus_title_mvl/mxv .byte W96 .byte VOICE , 56 .byte N08 , Fs3 @@ -3897,144 +3897,144 @@ bgm_title3_4: .byte W08 .byte TIE , Fs4 .byte W48 - .byte VOL , 87*bgm_title3_mvl/mxv + .byte VOL , 87*mus_title_mvl/mxv .byte W01 - .byte 87*bgm_title3_mvl/mxv + .byte 87*mus_title_mvl/mxv .byte W03 - .byte 86*bgm_title3_mvl/mxv + .byte 86*mus_title_mvl/mxv .byte W01 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte W03 - .byte 85*bgm_title3_mvl/mxv + .byte 85*mus_title_mvl/mxv .byte MOD , 1 .byte W04 - .byte VOL , 82*bgm_title3_mvl/mxv + .byte VOL , 82*mus_title_mvl/mxv .byte W04 - .byte 80*bgm_title3_mvl/mxv + .byte 80*mus_title_mvl/mxv .byte W01 - .byte 79*bgm_title3_mvl/mxv + .byte 79*mus_title_mvl/mxv .byte W07 - .byte 78*bgm_title3_mvl/mxv + .byte 78*mus_title_mvl/mxv .byte W01 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W03 - .byte 77*bgm_title3_mvl/mxv + .byte 77*mus_title_mvl/mxv .byte W01 - .byte 76*bgm_title3_mvl/mxv + .byte 76*mus_title_mvl/mxv .byte W03 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W04 - .byte 72*bgm_title3_mvl/mxv + .byte 72*mus_title_mvl/mxv .byte W01 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W03 - .byte 70*bgm_title3_mvl/mxv + .byte 70*mus_title_mvl/mxv .byte W04 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W01 - .byte 68*bgm_title3_mvl/mxv + .byte 68*mus_title_mvl/mxv .byte W03 .byte MOD , 6 .byte W01 - .byte VOL , 66*bgm_title3_mvl/mxv + .byte VOL , 66*mus_title_mvl/mxv .byte W03 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W04 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W01 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W03 - .byte 62*bgm_title3_mvl/mxv + .byte 62*mus_title_mvl/mxv .byte W05 - .byte 61*bgm_title3_mvl/mxv + .byte 61*mus_title_mvl/mxv .byte W03 - .byte 59*bgm_title3_mvl/mxv + .byte 59*mus_title_mvl/mxv .byte W01 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W03 - .byte 57*bgm_title3_mvl/mxv + .byte 57*mus_title_mvl/mxv .byte W04 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W04 - .byte 55*bgm_title3_mvl/mxv + .byte 55*mus_title_mvl/mxv .byte W01 - .byte 54*bgm_title3_mvl/mxv + .byte 54*mus_title_mvl/mxv .byte W03 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W01 - .byte 52*bgm_title3_mvl/mxv + .byte 52*mus_title_mvl/mxv .byte W03 - .byte 51*bgm_title3_mvl/mxv + .byte 51*mus_title_mvl/mxv .byte W01 - .byte 50*bgm_title3_mvl/mxv + .byte 50*mus_title_mvl/mxv .byte W03 - .byte 49*bgm_title3_mvl/mxv + .byte 49*mus_title_mvl/mxv .byte W01 - .byte 47*bgm_title3_mvl/mxv + .byte 47*mus_title_mvl/mxv .byte W03 .byte W01 - .byte 46*bgm_title3_mvl/mxv + .byte 46*mus_title_mvl/mxv .byte W03 - .byte 44*bgm_title3_mvl/mxv + .byte 44*mus_title_mvl/mxv .byte W04 - .byte 43*bgm_title3_mvl/mxv + .byte 43*mus_title_mvl/mxv .byte W01 - .byte 42*bgm_title3_mvl/mxv + .byte 42*mus_title_mvl/mxv .byte W03 - .byte 41*bgm_title3_mvl/mxv + .byte 41*mus_title_mvl/mxv .byte W01 - .byte 40*bgm_title3_mvl/mxv + .byte 40*mus_title_mvl/mxv .byte W04 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W07 - .byte 38*bgm_title3_mvl/mxv + .byte 38*mus_title_mvl/mxv .byte W04 - .byte 38*bgm_title3_mvl/mxv + .byte 38*mus_title_mvl/mxv .byte W04 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W16 - .byte 43*bgm_title3_mvl/mxv + .byte 43*mus_title_mvl/mxv .byte W04 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W01 - .byte 46*bgm_title3_mvl/mxv + .byte 46*mus_title_mvl/mxv .byte W03 - .byte 49*bgm_title3_mvl/mxv + .byte 49*mus_title_mvl/mxv .byte W04 .byte MOD , 7 .byte W01 - .byte VOL , 51*bgm_title3_mvl/mxv + .byte VOL , 51*mus_title_mvl/mxv .byte W03 - .byte 52*bgm_title3_mvl/mxv + .byte 52*mus_title_mvl/mxv .byte W01 - .byte 53*bgm_title3_mvl/mxv + .byte 53*mus_title_mvl/mxv .byte W04 - .byte 56*bgm_title3_mvl/mxv + .byte 56*mus_title_mvl/mxv .byte W03 - .byte 58*bgm_title3_mvl/mxv + .byte 58*mus_title_mvl/mxv .byte W01 - .byte 59*bgm_title3_mvl/mxv + .byte 59*mus_title_mvl/mxv .byte W03 - .byte 61*bgm_title3_mvl/mxv + .byte 61*mus_title_mvl/mxv .byte W01 - .byte 63*bgm_title3_mvl/mxv + .byte 63*mus_title_mvl/mxv .byte W03 - .byte 65*bgm_title3_mvl/mxv + .byte 65*mus_title_mvl/mxv .byte W04 - .byte 67*bgm_title3_mvl/mxv + .byte 67*mus_title_mvl/mxv .byte W01 - .byte 69*bgm_title3_mvl/mxv + .byte 69*mus_title_mvl/mxv .byte W03 - .byte 73*bgm_title3_mvl/mxv + .byte 73*mus_title_mvl/mxv .byte W01 - .byte 75*bgm_title3_mvl/mxv + .byte 75*mus_title_mvl/mxv .byte W05 .byte EOT - .byte VOL , 64*bgm_title3_mvl/mxv + .byte VOL , 64*mus_title_mvl/mxv .byte N02 , As4 .byte W02 .byte VOICE , 48 - .byte VOL , 65*bgm_title3_mvl/mxv + .byte VOL , 65*mus_title_mvl/mxv .byte MOD , 0 .byte N06 , Bn4 .byte W08 @@ -4084,7 +4084,7 @@ bgm_title3_4: .byte W06 .byte Ds5 .byte W02 - .byte VOL , 58*bgm_title3_mvl/mxv + .byte VOL , 58*mus_title_mvl/mxv .byte N24 , Dn5 , v088 .byte W24 .byte N04 , Bn4 , v112 @@ -4100,7 +4100,7 @@ bgm_title3_4: .byte Dn3 .byte W04 .byte VOICE , 56 - .byte VOL , 69*bgm_title3_mvl/mxv + .byte VOL , 69*mus_title_mvl/mxv .byte PAN , c_v-34 .byte N08 , Fs3 , v112 .byte W12 @@ -4124,7 +4124,7 @@ bgm_title3_4: .byte W08 .byte N04 .byte W08 -bgm_title3_4_000: +mus_title_4_000: .byte N08 , Fs3 , v112 .byte W12 .byte N02 @@ -4149,15 +4149,15 @@ bgm_title3_4_000: .byte W08 .byte PEND .byte PATT - .word bgm_title3_4_000 + .word mus_title_4_000 .byte PATT - .word bgm_title3_4_000 + .word mus_title_4_000 .byte PATT - .word bgm_title3_4_000 + .word mus_title_4_000 .byte PATT - .word bgm_title3_4_000 + .word mus_title_4_000 .byte PATT - .word bgm_title3_4_000 + .word mus_title_4_000 .byte N06 , Fs5 , v112 .byte W24 .byte N04 , Fs3 @@ -4172,22 +4172,22 @@ bgm_title3_4_000: @********************** Track 5 **********************@ -bgm_title3_5: - .byte KEYSH , bgm_title3_key+0 +mus_title_5: + .byte KEYSH , mus_title_key+0 .byte VOICE , 47 .byte PAN , c_v-16 - .byte VOL , 86*bgm_title3_mvl/mxv + .byte VOL , 86*mus_title_mvl/mxv .byte W16 .byte N04 , Cn2 , v127 .byte W08 -bgm_title3_5_000: +mus_title_5_000: .byte N24 , Fn1 , v127 .byte W88 .byte N04 , Cn2 .byte W08 .byte PEND .byte PATT - .word bgm_title3_5_000 + .word mus_title_5_000 .byte N24 , Fn1 , v127 .byte W88 .byte N02 , Cn2 @@ -4325,7 +4325,7 @@ bgm_title3_5_000: .byte W96 .byte W96 .byte W96 -bgm_title3_5_001: +mus_title_5_001: .byte N08 , Gn2 , v112 .byte W16 .byte Cn2 , v127 @@ -4352,7 +4352,7 @@ bgm_title3_5_001: .byte N24 , Cn1 .byte W24 .byte PATT - .word bgm_title3_5_001 + .word mus_title_5_001 .byte N08 , Gn2 , v127 .byte W16 .byte Cn2 @@ -4428,7 +4428,7 @@ bgm_title3_5_001: .byte W88 .byte N08 , Fs2 .byte W08 - .byte VOL , 65*bgm_title3_mvl/mxv + .byte VOL , 65*mus_title_mvl/mxv .byte N08 , Fs1 .byte W12 .byte N02 @@ -4451,7 +4451,7 @@ bgm_title3_5_001: .byte W08 .byte N04 .byte W08 -bgm_title3_5_002: +mus_title_5_002: .byte N08 , Fs1 , v112 .byte W12 .byte N02 @@ -4476,10 +4476,10 @@ bgm_title3_5_002: .byte W08 .byte PEND .byte PATT - .word bgm_title3_5_002 + .word mus_title_5_002 .byte PATT - .word bgm_title3_5_002 - .byte VOL , 76*bgm_title3_mvl/mxv + .word mus_title_5_002 + .byte VOL , 76*mus_title_mvl/mxv .byte N08 , Fs1 , v112 .byte W12 .byte N02 @@ -4503,9 +4503,9 @@ bgm_title3_5_002: .byte N04 .byte W08 .byte PATT - .word bgm_title3_5_002 + .word mus_title_5_002 .byte PATT - .word bgm_title3_5_002 + .word mus_title_5_002 .byte N06 , Fs2 , v112 .byte W24 .byte N04 , Fs1 @@ -4520,12 +4520,12 @@ bgm_title3_5_002: @********************** Track 6 **********************@ -bgm_title3_6: - .byte KEYSH , bgm_title3_key+0 +mus_title_6: + .byte KEYSH , mus_title_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte PAN , c_v-22 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte N04 , An4 , v112 .byte W06 .byte As4 @@ -4536,7 +4536,7 @@ bgm_title3_6: .byte W04 .byte N02 , An4 .byte W02 -bgm_title3_6_000: +mus_title_6_000: .byte N06 , As4 , v112 .byte W08 .byte N02 , An4 @@ -4571,7 +4571,7 @@ bgm_title3_6_000: .byte W02 .byte PEND .byte PATT - .word bgm_title3_6_000 + .word mus_title_6_000 .byte N06 , As4 , v112 .byte W08 .byte N02 , An4 @@ -4630,7 +4630,7 @@ bgm_title3_6_000: .byte W02 .byte En4 .byte W02 -bgm_title3_6_001: +mus_title_6_001: .byte N06 , Ds4 , v112 .byte W08 .byte N02 , Dn4 @@ -4686,7 +4686,7 @@ bgm_title3_6_001: .byte W08 .byte Dn4 .byte W08 -bgm_title3_6_002: +mus_title_6_002: .byte N06 , As3 , v112 .byte W08 .byte N02 , Ds4 @@ -4716,7 +4716,7 @@ bgm_title3_6_002: .byte En4 .byte W02 .byte PEND - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte N06 , Fn4 .byte W08 .byte N02 , En4 @@ -4746,7 +4746,7 @@ bgm_title3_6_002: .byte En4 .byte W02 .byte PATT - .word bgm_title3_6_001 + .word mus_title_6_001 .byte N06 , An4 , v112 .byte W08 .byte N02 , Gs4 @@ -4801,7 +4801,7 @@ bgm_title3_6_002: .byte W06 .byte N02 , En4 .byte W02 -bgm_title3_6_003: +mus_title_6_003: .byte N06 , Fn4 , v112 .byte W08 .byte N02 , En4 @@ -4832,7 +4832,7 @@ bgm_title3_6_003: .byte W02 .byte PEND .byte PATT - .word bgm_title3_6_001 + .word mus_title_6_001 .byte N06 , An4 , v112 .byte W08 .byte N02 , Gs4 @@ -4862,9 +4862,9 @@ bgm_title3_6_003: .byte An3 .byte W02 .byte PATT - .word bgm_title3_6_002 + .word mus_title_6_002 .byte PATT - .word bgm_title3_6_003 + .word mus_title_6_003 .byte N06 , Ds4 , v112 .byte W08 .byte N02 , Dn4 @@ -4938,79 +4938,79 @@ bgm_title3_6_003: .byte N48 , Gn4 .byte W48 .byte PAN , c_v+0 - .byte VOL , 36*bgm_title3_mvl/mxv + .byte VOL , 36*mus_title_mvl/mxv .byte N40 , Gs4 .byte W40 .byte TIE , Ds4 .byte W56 - .byte VOL , 36*bgm_title3_mvl/mxv + .byte VOL , 36*mus_title_mvl/mxv .byte W08 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W01 - .byte 33*bgm_title3_mvl/mxv + .byte 33*mus_title_mvl/mxv .byte W03 - .byte 32*bgm_title3_mvl/mxv + .byte 32*mus_title_mvl/mxv .byte W01 - .byte 31*bgm_title3_mvl/mxv + .byte 31*mus_title_mvl/mxv .byte W08 - .byte 31*bgm_title3_mvl/mxv + .byte 31*mus_title_mvl/mxv .byte W03 - .byte 30*bgm_title3_mvl/mxv + .byte 30*mus_title_mvl/mxv .byte W13 - .byte 28*bgm_title3_mvl/mxv + .byte 28*mus_title_mvl/mxv .byte W08 - .byte 27*bgm_title3_mvl/mxv + .byte 27*mus_title_mvl/mxv .byte W03 .byte EOT - .byte VOL , 36*bgm_title3_mvl/mxv + .byte VOL , 36*mus_title_mvl/mxv .byte N24 , Gs4 .byte W24 - .byte VOL , 41*bgm_title3_mvl/mxv + .byte VOL , 41*mus_title_mvl/mxv .byte N24 , An4 .byte W24 - .byte VOL , 48*bgm_title3_mvl/mxv + .byte VOL , 48*mus_title_mvl/mxv .byte N40 , As4 .byte W40 .byte TIE , Fn4 .byte W56 - .byte VOL , 48*bgm_title3_mvl/mxv + .byte VOL , 48*mus_title_mvl/mxv .byte W04 - .byte 48*bgm_title3_mvl/mxv + .byte 48*mus_title_mvl/mxv .byte W05 - .byte 47*bgm_title3_mvl/mxv + .byte 47*mus_title_mvl/mxv .byte W03 - .byte 45*bgm_title3_mvl/mxv + .byte 45*mus_title_mvl/mxv .byte W04 - .byte 44*bgm_title3_mvl/mxv + .byte 44*mus_title_mvl/mxv .byte W01 - .byte 43*bgm_title3_mvl/mxv + .byte 43*mus_title_mvl/mxv .byte W03 - .byte 43*bgm_title3_mvl/mxv + .byte 43*mus_title_mvl/mxv .byte W01 - .byte 41*bgm_title3_mvl/mxv + .byte 41*mus_title_mvl/mxv .byte W03 - .byte 40*bgm_title3_mvl/mxv + .byte 40*mus_title_mvl/mxv .byte W01 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W03 - .byte 37*bgm_title3_mvl/mxv + .byte 37*mus_title_mvl/mxv .byte W01 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W03 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W01 - .byte 35*bgm_title3_mvl/mxv + .byte 35*mus_title_mvl/mxv .byte W03 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W01 - .byte 33*bgm_title3_mvl/mxv + .byte 33*mus_title_mvl/mxv .byte W03 - .byte 32*bgm_title3_mvl/mxv + .byte 32*mus_title_mvl/mxv .byte W01 - .byte 31*bgm_title3_mvl/mxv + .byte 31*mus_title_mvl/mxv .byte W07 .byte EOT - .byte VOL , 60*bgm_title3_mvl/mxv + .byte VOL , 60*mus_title_mvl/mxv .byte N24 , As4 .byte W24 .byte Bn4 @@ -5088,7 +5088,7 @@ bgm_title3_6_003: .byte Fs4 , v032 .byte W04 .byte PAN , c_v+0 - .byte VOL , 41*bgm_title3_mvl/mxv + .byte VOL , 41*mus_title_mvl/mxv .byte N44 , Cn5 , v112 .byte W44 .byte W02 @@ -5215,7 +5215,7 @@ bgm_title3_6_003: .byte N04 , Fn4 , v032 .byte W08 .byte PAN , c_v-34 - .byte VOL , 44*bgm_title3_mvl/mxv + .byte VOL , 44*mus_title_mvl/mxv .byte N28 , As2 , v112 .byte W28 .byte N04 , As2 , v032 @@ -5244,7 +5244,7 @@ bgm_title3_6_003: .byte W04 .byte Fs3 , v032 .byte W04 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte N04 , As3 , v112 .byte W04 .byte As3 , v032 @@ -5499,89 +5499,89 @@ bgm_title3_6_003: .byte W08 .byte TIE , Bn3 , v088 .byte W48 - .byte VOL , 43*bgm_title3_mvl/mxv + .byte VOL , 43*mus_title_mvl/mxv .byte W01 - .byte 42*bgm_title3_mvl/mxv + .byte 42*mus_title_mvl/mxv .byte W03 - .byte 41*bgm_title3_mvl/mxv + .byte 41*mus_title_mvl/mxv .byte W04 - .byte 39*bgm_title3_mvl/mxv + .byte 39*mus_title_mvl/mxv .byte W04 - .byte 38*bgm_title3_mvl/mxv + .byte 38*mus_title_mvl/mxv .byte W04 - .byte 38*bgm_title3_mvl/mxv + .byte 38*mus_title_mvl/mxv .byte W01 - .byte 36*bgm_title3_mvl/mxv + .byte 36*mus_title_mvl/mxv .byte W03 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W04 - .byte 34*bgm_title3_mvl/mxv + .byte 34*mus_title_mvl/mxv .byte W04 - .byte 33*bgm_title3_mvl/mxv + .byte 33*mus_title_mvl/mxv .byte W01 - .byte 32*bgm_title3_mvl/mxv + .byte 32*mus_title_mvl/mxv .byte W03 - .byte 31*bgm_title3_mvl/mxv + .byte 31*mus_title_mvl/mxv .byte W01 - .byte 31*bgm_title3_mvl/mxv + .byte 31*mus_title_mvl/mxv .byte W03 - .byte 27*bgm_title3_mvl/mxv + .byte 27*mus_title_mvl/mxv .byte W04 - .byte 26*bgm_title3_mvl/mxv + .byte 26*mus_title_mvl/mxv .byte W04 - .byte 26*bgm_title3_mvl/mxv + .byte 26*mus_title_mvl/mxv .byte W01 - .byte 25*bgm_title3_mvl/mxv + .byte 25*mus_title_mvl/mxv .byte W03 - .byte 24*bgm_title3_mvl/mxv + .byte 24*mus_title_mvl/mxv .byte W01 - .byte 24*bgm_title3_mvl/mxv + .byte 24*mus_title_mvl/mxv .byte W03 - .byte 22*bgm_title3_mvl/mxv + .byte 22*mus_title_mvl/mxv .byte W05 - .byte 21*bgm_title3_mvl/mxv + .byte 21*mus_title_mvl/mxv .byte W03 - .byte 20*bgm_title3_mvl/mxv + .byte 20*mus_title_mvl/mxv .byte W04 - .byte 19*bgm_title3_mvl/mxv + .byte 19*mus_title_mvl/mxv .byte W01 - .byte 19*bgm_title3_mvl/mxv + .byte 19*mus_title_mvl/mxv .byte W03 - .byte 18*bgm_title3_mvl/mxv + .byte 18*mus_title_mvl/mxv .byte W01 - .byte 17*bgm_title3_mvl/mxv + .byte 17*mus_title_mvl/mxv .byte W03 - .byte 17*bgm_title3_mvl/mxv + .byte 17*mus_title_mvl/mxv .byte W08 - .byte 16*bgm_title3_mvl/mxv + .byte 16*mus_title_mvl/mxv .byte W04 - .byte 14*bgm_title3_mvl/mxv + .byte 14*mus_title_mvl/mxv .byte W05 - .byte 14*bgm_title3_mvl/mxv + .byte 14*mus_title_mvl/mxv .byte W07 .byte W05 - .byte 13*bgm_title3_mvl/mxv + .byte 13*mus_title_mvl/mxv .byte W15 - .byte 14*bgm_title3_mvl/mxv + .byte 14*mus_title_mvl/mxv .byte W01 - .byte 14*bgm_title3_mvl/mxv + .byte 14*mus_title_mvl/mxv .byte W07 - .byte 16*bgm_title3_mvl/mxv + .byte 16*mus_title_mvl/mxv .byte W01 - .byte 17*bgm_title3_mvl/mxv + .byte 17*mus_title_mvl/mxv .byte W08 - .byte 17*bgm_title3_mvl/mxv + .byte 17*mus_title_mvl/mxv .byte W03 - .byte 18*bgm_title3_mvl/mxv + .byte 18*mus_title_mvl/mxv .byte W01 - .byte 19*bgm_title3_mvl/mxv + .byte 19*mus_title_mvl/mxv .byte W03 - .byte 20*bgm_title3_mvl/mxv + .byte 20*mus_title_mvl/mxv .byte W01 - .byte 21*bgm_title3_mvl/mxv + .byte 21*mus_title_mvl/mxv .byte W03 .byte EOT - .byte VOL , 46*bgm_title3_mvl/mxv + .byte VOL , 46*mus_title_mvl/mxv .byte N08 , Cs4 , v112 .byte W08 .byte Ds4 @@ -5607,7 +5607,7 @@ bgm_title3_6_003: .byte W40 .byte N04 , Fs4 .byte W08 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte N08 .byte W12 .byte N02 , Fn4 @@ -5874,18 +5874,18 @@ bgm_title3_6_003: @********************** Track 7 **********************@ -bgm_title3_7: - .byte KEYSH , bgm_title3_key+0 +mus_title_7: + .byte KEYSH , mus_title_key+0 .byte VOICE , 80 .byte PAN , c_v-59 .byte c_v+0 .byte LFOS , 44 - .byte VOL , 67*bgm_title3_mvl/mxv + .byte VOL , 67*mus_title_mvl/mxv .byte XCMD , xIECV , 10 .byte xIECL , 12 .byte PAN , c_v-59 .byte c_v+0 - .byte VOL , 67*bgm_title3_mvl/mxv + .byte VOL , 67*mus_title_mvl/mxv .byte BENDR , 12 .byte N04 , Cn3 , v112 .byte W04 @@ -5902,9 +5902,9 @@ bgm_title3_7: .byte Fs1 .byte W04 .byte PAN , c_v+0 - .byte VOL , 79*bgm_title3_mvl/mxv + .byte VOL , 79*mus_title_mvl/mxv .byte PAN , c_v+0 - .byte VOL , 79*bgm_title3_mvl/mxv + .byte VOL , 79*mus_title_mvl/mxv .byte N08 , Fn1 .byte W08 .byte Fn1 , v032 @@ -6001,7 +6001,7 @@ bgm_title3_7: .byte W08 .byte VOICE , 84 .byte PAN , c_v+63 - .byte VOL , 30*bgm_title3_mvl/mxv + .byte VOL , 30*mus_title_mvl/mxv .byte N40 , An2 .byte W16 .byte MOD , 8 @@ -6355,7 +6355,7 @@ bgm_title3_7: .byte En2 .byte W04 .byte VOICE , 83 - .byte VOL , 40*bgm_title3_mvl/mxv + .byte VOL , 40*mus_title_mvl/mxv .byte N24 , Ds2 .byte W12 .byte MOD , 13 @@ -6438,7 +6438,7 @@ bgm_title3_7: .byte W04 .byte VOICE , 80 .byte PAN , c_v+39 - .byte VOL , 40*bgm_title3_mvl/mxv + .byte VOL , 40*mus_title_mvl/mxv .byte N12 , Cn1 .byte W12 .byte N02 , Gn2 @@ -6461,7 +6461,7 @@ bgm_title3_7: .byte W08 .byte Gn2 .byte W08 -bgm_title3_7_000: +mus_title_7_000: .byte N12 , Cn1 , v112 .byte W12 .byte N02 , Gn2 @@ -6486,7 +6486,7 @@ bgm_title3_7_000: .byte W08 .byte PEND .byte PATT - .word bgm_title3_7_000 + .word mus_title_7_000 .byte N12 , Cn1 , v112 .byte W12 .byte N02 , Gn2 @@ -6512,7 +6512,7 @@ bgm_title3_7_000: .byte Fs2 .byte W08 .byte PAN , c_v+63 - .byte VOL , 30*bgm_title3_mvl/mxv + .byte VOL , 30*mus_title_mvl/mxv .byte N44 , Gn4 .byte W24 .byte MOD , 12 @@ -6525,7 +6525,7 @@ bgm_title3_7_000: .byte W24 .byte Ds4 .byte W24 - .byte VOL , 26*bgm_title3_mvl/mxv + .byte VOL , 26*mus_title_mvl/mxv .byte N32 , Dn4 .byte W12 .byte MOD , 8 @@ -6651,7 +6651,7 @@ bgm_title3_7_000: .byte W08 .byte Gs3 .byte W08 - .byte VOL , 33*bgm_title3_mvl/mxv + .byte VOL , 33*mus_title_mvl/mxv .byte N16 , Ds3 .byte W16 .byte N04 , Cs3 @@ -6664,7 +6664,7 @@ bgm_title3_7_000: .byte W24 .byte N04 .byte W08 -bgm_title3_7_001: +mus_title_7_001: .byte N16 , Ds3 , v112 .byte W16 .byte N04 , Cs3 @@ -6679,17 +6679,17 @@ bgm_title3_7_001: .byte W08 .byte PEND .byte PATT - .word bgm_title3_7_001 + .word mus_title_7_001 .byte PATT - .word bgm_title3_7_001 + .word mus_title_7_001 .byte PATT - .word bgm_title3_7_001 + .word mus_title_7_001 .byte PATT - .word bgm_title3_7_001 + .word mus_title_7_001 .byte PATT - .word bgm_title3_7_001 + .word mus_title_7_001 .byte PATT - .word bgm_title3_7_001 + .word mus_title_7_001 .byte W48 .byte N08 , Bn1 , v112 .byte W08 @@ -6753,7 +6753,7 @@ bgm_title3_7_001: .byte W08 .byte Dn4 .byte W08 -bgm_title3_7_002: +mus_title_7_002: .byte N08 , Cs4 , v112 .byte W12 .byte N02 , Cn4 @@ -6804,7 +6804,7 @@ bgm_title3_7_002: .byte N04 .byte W08 .byte PATT - .word bgm_title3_7_002 + .word mus_title_7_002 .byte N08 , Cs4 , v112 .byte W12 .byte N02 , Cn4 @@ -6921,19 +6921,19 @@ bgm_title3_7_002: @********************** Track 8 **********************@ -bgm_title3_8: - .byte KEYSH , bgm_title3_key+0 +mus_title_8: + .byte KEYSH , mus_title_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte PAN , c_v+0 .byte XCMD , xIECV , 10 .byte xIECL , 12 .byte PAN , c_v+0 - .byte VOL , 36*bgm_title3_mvl/mxv + .byte VOL , 36*mus_title_mvl/mxv .byte BENDR , 12 .byte W24 .byte PAN , c_v+63 - .byte VOL , 36*bgm_title3_mvl/mxv + .byte VOL , 36*mus_title_mvl/mxv .byte N04 , An2 , v112 .byte W08 .byte Fn2 @@ -7033,7 +7033,7 @@ bgm_title3_8: .byte N02 , En4 .byte W02 .byte PAN , c_v-62 - .byte VOL , 40*bgm_title3_mvl/mxv + .byte VOL , 40*mus_title_mvl/mxv .byte N06 , Fn4 .byte W08 .byte N02 , En4 @@ -7062,11 +7062,11 @@ bgm_title3_8: .byte W08 .byte PAN , c_v-62 .byte W96 - .byte VOL , 31*bgm_title3_mvl/mxv + .byte VOL , 31*mus_title_mvl/mxv .byte W96 .byte W96 .byte VOICE , 88 - .byte VOL , 36*bgm_title3_mvl/mxv + .byte VOL , 36*mus_title_mvl/mxv .byte N02 , Fs3 .byte W02 .byte N06 , Fn3 @@ -7145,7 +7145,7 @@ bgm_title3_8: .byte N08 , Ds3 .byte W08 .byte VOICE , 4 - .byte VOL , 37*bgm_title3_mvl/mxv + .byte VOL , 37*mus_title_mvl/mxv .byte W48 .byte N24 , Cn3 .byte W24 @@ -7181,7 +7181,7 @@ bgm_title3_8: .byte W08 .byte N04 .byte W08 - .byte VOL , 38*bgm_title3_mvl/mxv + .byte VOL , 38*mus_title_mvl/mxv .byte N08 , An2 .byte W08 .byte As2 @@ -7215,7 +7215,7 @@ bgm_title3_8: .byte W08 .byte As2 .byte W08 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte N04 , Cn3 .byte W08 .byte An2 @@ -7296,7 +7296,7 @@ bgm_title3_8: .byte VOICE , 81 .byte PAN , c_v+0 .byte MOD , 1 - .byte VOL , 22*bgm_title3_mvl/mxv + .byte VOL , 22*mus_title_mvl/mxv .byte BEND , c_v+1 .byte N02 , Gs5 .byte W02 @@ -7684,7 +7684,7 @@ bgm_title3_8: .byte W02 .byte VOICE , 81 .byte PAN , c_v-34 - .byte VOL , 38*bgm_title3_mvl/mxv + .byte VOL , 38*mus_title_mvl/mxv .byte BEND , c_v+0 .byte N08 , Cn2 , v112 .byte W12 @@ -7708,7 +7708,7 @@ bgm_title3_8: .byte W08 .byte Cn2 .byte W08 -bgm_title3_8_000: +mus_title_8_000: .byte N06 , Cn2 , v112 .byte W12 .byte N02 @@ -7733,7 +7733,7 @@ bgm_title3_8_000: .byte W08 .byte PEND .byte PATT - .word bgm_title3_8_000 + .word mus_title_8_000 .byte N06 , Cn2 , v112 .byte W12 .byte N02 @@ -7760,7 +7760,7 @@ bgm_title3_8_000: .byte W08 .byte VOICE , 4 .byte PAN , c_v-62 - .byte VOL , 34*bgm_title3_mvl/mxv + .byte VOL , 34*mus_title_mvl/mxv .byte N08 , As2 .byte W08 .byte N04 , An2 @@ -7777,7 +7777,7 @@ bgm_title3_8_000: .byte W24 .byte Gn2 .byte W24 - .byte VOL , 28*bgm_title3_mvl/mxv + .byte VOL , 28*mus_title_mvl/mxv .byte N08 , As2 .byte W08 .byte N04 , An2 @@ -7903,7 +7903,7 @@ bgm_title3_8_000: .byte W08 .byte Cs3 .byte W08 - .byte VOL , 34*bgm_title3_mvl/mxv + .byte VOL , 34*mus_title_mvl/mxv .byte N16 , Fs2 .byte W16 .byte N04 , Fn2 @@ -7916,7 +7916,7 @@ bgm_title3_8_000: .byte W24 .byte N04 .byte W08 -bgm_title3_8_001: +mus_title_8_001: .byte N16 , Fs2 , v112 .byte W16 .byte N04 , Fn2 @@ -7931,17 +7931,17 @@ bgm_title3_8_001: .byte W08 .byte PEND .byte PATT - .word bgm_title3_8_001 + .word mus_title_8_001 .byte PATT - .word bgm_title3_8_001 + .word mus_title_8_001 .byte PATT - .word bgm_title3_8_001 + .word mus_title_8_001 .byte PATT - .word bgm_title3_8_001 + .word mus_title_8_001 .byte PATT - .word bgm_title3_8_001 + .word mus_title_8_001 .byte PATT - .word bgm_title3_8_001 + .word mus_title_8_001 .byte N08 , Fs4 , v112 .byte W08 .byte N04 , Fn4 @@ -7958,7 +7958,7 @@ bgm_title3_8_001: .byte W96 .byte EOT .byte PAN , c_v-1 - .byte VOL , 29*bgm_title3_mvl/mxv + .byte VOL , 29*mus_title_mvl/mxv .byte N16 , Ds2 .byte W16 .byte Fs2 @@ -7992,7 +7992,7 @@ bgm_title3_8_001: .byte Bn1 .byte W04 .byte VOICE , 81 - .byte VOL , 63*bgm_title3_mvl/mxv + .byte VOL , 63*mus_title_mvl/mxv .byte N06 , Fs1 , v112 .byte W12 .byte N02 @@ -8015,7 +8015,7 @@ bgm_title3_8_001: .byte W08 .byte N02 .byte W08 -bgm_title3_8_002: +mus_title_8_002: .byte N06 , Fs1 , v112 .byte W12 .byte N02 @@ -8040,9 +8040,9 @@ bgm_title3_8_002: .byte W08 .byte PEND .byte PATT - .word bgm_title3_8_002 + .word mus_title_8_002 .byte PATT - .word bgm_title3_8_002 + .word mus_title_8_002 .byte N06 , Fs1 , v112 .byte W12 .byte N02 @@ -8066,10 +8066,10 @@ bgm_title3_8_002: .byte N02 .byte W08 .byte PATT - .word bgm_title3_8_002 + .word mus_title_8_002 .byte PATT - .word bgm_title3_8_002 - .byte VOL , 25*bgm_title3_mvl/mxv + .word mus_title_8_002 + .byte VOL , 25*mus_title_mvl/mxv .byte N06 , Cs4 , v112 .byte W24 .byte N04 @@ -8084,11 +8084,11 @@ bgm_title3_8_002: @********************** Track 9 **********************@ -bgm_title3_9: - .byte KEYSH , bgm_title3_key+0 +mus_title_9: + .byte KEYSH , mus_title_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 65*bgm_title3_mvl/mxv + .byte VOL , 65*mus_title_mvl/mxv .byte W24 .byte N72 , An2 , v112 .byte W96 @@ -8139,7 +8139,7 @@ bgm_title3_9: .byte N48 .byte W96 .byte W96 - .byte VOL , 58*bgm_title3_mvl/mxv + .byte VOL , 58*mus_title_mvl/mxv .byte N48 .byte W96 .byte W96 @@ -8151,7 +8151,7 @@ bgm_title3_9: .byte W96 .byte W96 .byte VOICE , 127 - .byte VOL , 68*bgm_title3_mvl/mxv + .byte VOL , 68*mus_title_mvl/mxv .byte N01 , Dn5 .byte W04 .byte Dn5 , v064 @@ -8274,7 +8274,7 @@ bgm_title3_9: .byte W16 .byte En1 , v080 .byte W08 -bgm_title3_9_000: +mus_title_9_000: .byte N04 , En1 , v112 .byte W08 .byte En1 , v080 @@ -8303,7 +8303,7 @@ bgm_title3_9_000: .byte W04 .byte PEND .byte PATT - .word bgm_title3_9_000 + .word mus_title_9_000 .byte N04 , En1 , v112 .byte W08 .byte En1 , v080 @@ -8363,7 +8363,7 @@ bgm_title3_9_000: .byte N04 .byte W04 .byte PATT - .word bgm_title3_9_000 + .word mus_title_9_000 .byte N48 , An2 , v112 .byte W96 .byte W96 @@ -8382,10 +8382,10 @@ bgm_title3_9_000: @********************** Track 10 **********************@ -bgm_title3_10: - .byte KEYSH , bgm_title3_key+0 +mus_title_10: + .byte KEYSH , mus_title_key+0 .byte VOICE , 6 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte XCMD , xIECV , 16 .byte xIECL , 12 .byte PAN , c_v-64 @@ -8511,7 +8511,7 @@ bgm_title3_10: .byte W16 .byte N04 , En1 , v080 .byte W08 -bgm_title3_10_000: +mus_title_10_000: .byte N08 , Ds1 , v112 .byte W16 .byte N04 , Ds1 , v080 @@ -8531,7 +8531,7 @@ bgm_title3_10_000: .byte En2 .byte W08 .byte PEND -bgm_title3_10_001: +mus_title_10_001: .byte N08 , Fn1 , v112 .byte W16 .byte N04 , Fn1 , v080 @@ -8574,11 +8574,11 @@ bgm_title3_10_001: .byte En2 .byte W08 .byte PATT - .word bgm_title3_10_001 + .word mus_title_10_001 .byte PATT - .word bgm_title3_10_000 + .word mus_title_10_000 .byte PATT - .word bgm_title3_10_001 + .word mus_title_10_001 .byte N08 , Ds1 , v112 .byte W08 .byte N04 , Dn1 @@ -8641,7 +8641,7 @@ bgm_title3_10_001: .byte N04 , En1 , v080 .byte W08 .byte PATT - .word bgm_title3_10_001 + .word mus_title_10_001 .byte N04 , Ds1 , v112 .byte W08 .byte N04 @@ -8802,7 +8802,7 @@ bgm_title3_10_001: .byte Bn1 .byte W08 .byte VOICE , 6 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N24 , Cn2 @@ -8865,7 +8865,7 @@ bgm_title3_10_001: .byte W08 .byte As3 .byte W08 - .byte VOL , 45*bgm_title3_mvl/mxv + .byte VOL , 45*mus_title_mvl/mxv .byte N04 , Cn4 .byte W12 .byte N02 @@ -8890,7 +8890,7 @@ bgm_title3_10_001: .byte W08 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 28*bgm_title3_mvl/mxv + .byte VOL , 28*mus_title_mvl/mxv .byte BEND , c_v+1 .byte N44 , Cn5 .byte W24 @@ -9012,7 +9012,7 @@ bgm_title3_10_001: .byte MOD , 7 .byte W24 .byte VOICE , 87 - .byte VOL , 59*bgm_title3_mvl/mxv + .byte VOL , 59*mus_title_mvl/mxv .byte MOD , 0 .byte BEND , c_v+5 .byte N12 , Fs1 @@ -9031,7 +9031,7 @@ bgm_title3_10_001: .byte W16 .byte Fn1 .byte W08 -bgm_title3_10_002: +mus_title_10_002: .byte N12 , Fs1 , v112 .byte W16 .byte N04 , Fn1 @@ -9050,15 +9050,15 @@ bgm_title3_10_002: .byte W08 .byte PEND .byte PATT - .word bgm_title3_10_002 + .word mus_title_10_002 .byte PATT - .word bgm_title3_10_002 + .word mus_title_10_002 .byte PATT - .word bgm_title3_10_002 + .word mus_title_10_002 .byte PATT - .word bgm_title3_10_002 + .word mus_title_10_002 .byte PATT - .word bgm_title3_10_002 + .word mus_title_10_002 .byte N12 , Fs1 , v112 .byte W16 .byte N04 , Fn1 @@ -9096,23 +9096,23 @@ bgm_title3_10_002: @******************************************************@ .align 2 -bgm_title3: +mus_title: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_title3_pri @ Priority - .byte bgm_title3_rev @ Reverb. + .byte mus_title_pri @ Priority + .byte mus_title_rev @ Reverb. - .word bgm_title3_grp + .word mus_title_grp - .word bgm_title3_1 - .word bgm_title3_2 - .word bgm_title3_3 - .word bgm_title3_4 - .word bgm_title3_5 - .word bgm_title3_6 - .word bgm_title3_7 - .word bgm_title3_8 - .word bgm_title3_9 - .word bgm_title3_10 + .word mus_title_1 + .word mus_title_2 + .word mus_title_3 + .word mus_title_4 + .word mus_title_5 + .word mus_title_6 + .word mus_title_7 + .word mus_title_8 + .word mus_title_9 + .word mus_title_10 .end diff --git a/sound/songs/bgm_me_zannen.s b/sound/songs/mus_too_bad.s index 9c8d946b5..7cbb01a38 100644 --- a/sound/songs/bgm_me_zannen.s +++ b/sound/songs/mus_too_bad.s @@ -1,24 +1,24 @@ .include "MPlayDef.s" - .equ bgm_me_zannen_grp, voicegroup009 - .equ bgm_me_zannen_pri, 5 - .equ bgm_me_zannen_rev, reverb_set+50 - .equ bgm_me_zannen_mvl, 127 - .equ bgm_me_zannen_key, 0 - .equ bgm_me_zannen_tbs, 1 - .equ bgm_me_zannen_exg, 0 - .equ bgm_me_zannen_cmp, 1 + .equ mus_too_bad_grp, voicegroup009 + .equ mus_too_bad_pri, 5 + .equ mus_too_bad_rev, reverb_set+50 + .equ mus_too_bad_mvl, 127 + .equ mus_too_bad_key, 0 + .equ mus_too_bad_tbs, 1 + .equ mus_too_bad_exg, 0 + .equ mus_too_bad_cmp, 1 .section .rodata - .global bgm_me_zannen + .global mus_too_bad .align 2 @********************** Track 1 **********************@ -bgm_me_zannen_1: - .byte KEYSH , bgm_me_zannen_key+0 - .byte TEMPO , 180*bgm_me_zannen_tbs/2 - .byte VOL , 90*bgm_me_zannen_mvl/mxv +mus_too_bad_1: + .byte KEYSH , mus_too_bad_key+0 + .byte TEMPO , 180*mus_too_bad_tbs/2 + .byte VOL , 90*mus_too_bad_mvl/mxv .byte W09 .byte VOICE , 73 .byte PAN , c_v+1 @@ -50,28 +50,28 @@ bgm_me_zannen_1: .byte W09 .byte MOD , 32 .byte W21 - .byte VOL , 85*bgm_me_zannen_mvl/mxv + .byte VOL , 85*mus_too_bad_mvl/mxv .byte W06 - .byte 79*bgm_me_zannen_mvl/mxv + .byte 79*mus_too_bad_mvl/mxv .byte W06 - .byte 73*bgm_me_zannen_mvl/mxv + .byte 73*mus_too_bad_mvl/mxv .byte W03 .byte W03 - .byte 62*bgm_me_zannen_mvl/mxv + .byte 62*mus_too_bad_mvl/mxv .byte W03 - .byte 45*bgm_me_zannen_mvl/mxv + .byte 45*mus_too_bad_mvl/mxv .byte W03 - .byte 31*bgm_me_zannen_mvl/mxv + .byte 31*mus_too_bad_mvl/mxv .byte W03 - .byte 14*bgm_me_zannen_mvl/mxv + .byte 14*mus_too_bad_mvl/mxv .byte W12 .byte FINE @********************** Track 2 **********************@ -bgm_me_zannen_2: - .byte KEYSH , bgm_me_zannen_key+0 - .byte VOL , 90*bgm_me_zannen_mvl/mxv +mus_too_bad_2: + .byte KEYSH , mus_too_bad_key+0 + .byte VOL , 90*mus_too_bad_mvl/mxv .byte W09 .byte VOICE , 73 .byte PAN , c_v+20 @@ -98,30 +98,30 @@ bgm_me_zannen_2: .byte W12 .byte MOD , 32 .byte W21 - .byte VOL , 85*bgm_me_zannen_mvl/mxv + .byte VOL , 85*mus_too_bad_mvl/mxv .byte W06 - .byte 79*bgm_me_zannen_mvl/mxv + .byte 79*mus_too_bad_mvl/mxv .byte W06 - .byte 73*bgm_me_zannen_mvl/mxv + .byte 73*mus_too_bad_mvl/mxv .byte W03 .byte W03 - .byte 62*bgm_me_zannen_mvl/mxv + .byte 62*mus_too_bad_mvl/mxv .byte W03 - .byte 45*bgm_me_zannen_mvl/mxv + .byte 45*mus_too_bad_mvl/mxv .byte W03 - .byte 31*bgm_me_zannen_mvl/mxv + .byte 31*mus_too_bad_mvl/mxv .byte W03 - .byte 14*bgm_me_zannen_mvl/mxv + .byte 14*mus_too_bad_mvl/mxv .byte W12 .byte FINE @********************** Track 3 **********************@ -bgm_me_zannen_3: - .byte KEYSH , bgm_me_zannen_key+0 +mus_too_bad_3: + .byte KEYSH , mus_too_bad_key+0 .byte W24 .byte VOICE , 2 - .byte VOL , 90*bgm_me_zannen_mvl/mxv + .byte VOL , 90*mus_too_bad_mvl/mxv .byte N09 , Dn2 , v112 .byte W12 .byte Bn2 @@ -137,32 +137,32 @@ bgm_me_zannen_3: .byte N60 , Dn2 .byte W32 .byte W01 - .byte VOL , 85*bgm_me_zannen_mvl/mxv + .byte VOL , 85*mus_too_bad_mvl/mxv .byte W06 - .byte 79*bgm_me_zannen_mvl/mxv + .byte 79*mus_too_bad_mvl/mxv .byte W06 - .byte 73*bgm_me_zannen_mvl/mxv + .byte 73*mus_too_bad_mvl/mxv .byte W03 .byte W03 - .byte 62*bgm_me_zannen_mvl/mxv + .byte 62*mus_too_bad_mvl/mxv .byte W03 - .byte 45*bgm_me_zannen_mvl/mxv + .byte 45*mus_too_bad_mvl/mxv .byte W03 - .byte 31*bgm_me_zannen_mvl/mxv + .byte 31*mus_too_bad_mvl/mxv .byte W03 - .byte 14*bgm_me_zannen_mvl/mxv + .byte 14*mus_too_bad_mvl/mxv .byte W12 .byte FINE @********************** Track 4 **********************@ -bgm_me_zannen_4: - .byte KEYSH , bgm_me_zannen_key+0 +mus_too_bad_4: + .byte KEYSH , mus_too_bad_key+0 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte W24 .byte VOICE , 90 - .byte VOL , 90*bgm_me_zannen_mvl/mxv + .byte VOL , 90*mus_too_bad_mvl/mxv .byte PAN , c_v-48 .byte W03 .byte N06 , Bn5 , v052 @@ -180,11 +180,11 @@ bgm_me_zannen_4: @********************** Track 5 **********************@ -bgm_me_zannen_5: - .byte KEYSH , bgm_me_zannen_key+0 +mus_too_bad_5: + .byte KEYSH , mus_too_bad_key+0 .byte W24 .byte VOICE , 0 - .byte VOL , 90*bgm_me_zannen_mvl/mxv + .byte VOL , 90*mus_too_bad_mvl/mxv .byte W03 .byte N03 , En3 , v064 .byte W21 @@ -204,18 +204,18 @@ bgm_me_zannen_5: @******************************************************@ .align 2 -bgm_me_zannen: +mus_too_bad: .byte 5 @ NumTrks .byte 0 @ NumBlks - .byte bgm_me_zannen_pri @ Priority - .byte bgm_me_zannen_rev @ Reverb. + .byte mus_too_bad_pri @ Priority + .byte mus_too_bad_rev @ Reverb. - .word bgm_me_zannen_grp + .word mus_too_bad_grp - .word bgm_me_zannen_1 - .word bgm_me_zannen_2 - .word bgm_me_zannen_3 - .word bgm_me_zannen_4 - .word bgm_me_zannen_5 + .word mus_too_bad_1 + .word mus_too_bad_2 + .word mus_too_bad_3 + .word mus_too_bad_4 + .word mus_too_bad_5 .end diff --git a/sound/songs/bgm_karakuri.s b/sound/songs/mus_trick_house.s index bedf9fc71..083ff162d 100644 --- a/sound/songs/bgm_karakuri.s +++ b/sound/songs/mus_trick_house.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_karakuri_grp, voicegroup091 - .equ bgm_karakuri_pri, 0 - .equ bgm_karakuri_rev, reverb_set+50 - .equ bgm_karakuri_mvl, 127 - .equ bgm_karakuri_key, 0 - .equ bgm_karakuri_tbs, 1 - .equ bgm_karakuri_exg, 0 - .equ bgm_karakuri_cmp, 1 + .equ mus_trick_house_grp, voicegroup091 + .equ mus_trick_house_pri, 0 + .equ mus_trick_house_rev, reverb_set+50 + .equ mus_trick_house_mvl, 127 + .equ mus_trick_house_key, 0 + .equ mus_trick_house_tbs, 1 + .equ mus_trick_house_exg, 0 + .equ mus_trick_house_cmp, 1 .section .rodata - .global bgm_karakuri + .global mus_trick_house .align 2 @********************** Track 1 **********************@ -bgm_karakuri_1: - .byte KEYSH , bgm_karakuri_key+0 - .byte TEMPO , 136*bgm_karakuri_tbs/2 +mus_trick_house_1: + .byte KEYSH , mus_trick_house_key+0 + .byte TEMPO , 136*mus_trick_house_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 40*bgm_karakuri_mvl/mxv + .byte VOL , 40*mus_trick_house_mvl/mxv .byte PAN , c_v+0 .byte W96 -bgm_karakuri_1_B1: -bgm_karakuri_1_000: +mus_trick_house_1_B1: +mus_trick_house_1_000: .byte N03 , Gn5 , v112 .byte W06 .byte Gn5 , v052 @@ -60,64 +60,64 @@ bgm_karakuri_1_000: .byte W06 .byte PEND .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte PATT - .word bgm_karakuri_1_000 + .word mus_trick_house_1_000 .byte GOTO - .word bgm_karakuri_1_B1 + .word mus_trick_house_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_karakuri_2: - .byte KEYSH , bgm_karakuri_key+0 +mus_trick_house_2: + .byte KEYSH , mus_trick_house_key+0 .byte VOICE , 13 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 44*bgm_karakuri_mvl/mxv + .byte VOL , 44*mus_trick_house_mvl/mxv .byte N03 , As4 , v112 .byte W03 .byte Fs4 , v064 @@ -182,9 +182,9 @@ bgm_karakuri_2: .byte W03 .byte As4 .byte W03 -bgm_karakuri_2_B1: +mus_trick_house_2_B1: .byte VOICE , 13 - .byte VOL , 45*bgm_karakuri_mvl/mxv + .byte VOL , 45*mus_trick_house_mvl/mxv .byte N06 , As4 , v112 .byte W06 .byte Bn4 @@ -217,7 +217,7 @@ bgm_karakuri_2_B1: .byte W06 .byte Cs5 .byte W06 -bgm_karakuri_2_000: +mus_trick_house_2_000: .byte N06 , As4 , v112 .byte W06 .byte Bn4 @@ -262,7 +262,7 @@ bgm_karakuri_2_000: .byte Gs4 .byte W12 .byte VOICE , 24 - .byte VOL , 30*bgm_karakuri_mvl/mxv + .byte VOL , 30*mus_trick_house_mvl/mxv .byte N06 , Cs4 .byte W06 .byte N12 , Gs3 @@ -274,7 +274,7 @@ bgm_karakuri_2_000: .byte N06 , Cs6 .byte W12 .byte VOICE , 47 - .byte VOL , 45*bgm_karakuri_mvl/mxv + .byte VOL , 45*mus_trick_house_mvl/mxv .byte N06 , Cs3 .byte W06 .byte Cs4 @@ -287,7 +287,7 @@ bgm_karakuri_2_000: .byte W06 .byte Cs3 , v112 .byte W12 -bgm_karakuri_2_001: +mus_trick_house_2_001: .byte VOICE , 13 .byte N06 , Gs4 , v112 .byte W06 @@ -322,7 +322,7 @@ bgm_karakuri_2_001: .byte Bn4 .byte W06 .byte PEND -bgm_karakuri_2_002: +mus_trick_house_2_002: .byte N06 , Gs4 , v112 .byte W06 .byte An4 @@ -367,7 +367,7 @@ bgm_karakuri_2_002: .byte Fs4 .byte W12 .byte VOICE , 17 - .byte VOL , 42*bgm_karakuri_mvl/mxv + .byte VOL , 42*mus_trick_house_mvl/mxv .byte N03 , As4 .byte W03 .byte Bn4 @@ -387,7 +387,7 @@ bgm_karakuri_2_002: .byte Cs4 .byte W03 .byte VOICE , 56 - .byte VOL , 45*bgm_karakuri_mvl/mxv + .byte VOL , 45*mus_trick_house_mvl/mxv .byte N03 , Fs4 .byte W06 .byte N03 @@ -438,7 +438,7 @@ bgm_karakuri_2_002: .byte Cs5 .byte W06 .byte PATT - .word bgm_karakuri_2_000 + .word mus_trick_house_2_000 .byte N06 , Cs5 , v112 .byte W06 .byte Fs4 @@ -495,9 +495,9 @@ bgm_karakuri_2_002: .byte Dn5 , v064 .byte W09 .byte PATT - .word bgm_karakuri_2_001 + .word mus_trick_house_2_001 .byte PATT - .word bgm_karakuri_2_002 + .word mus_trick_house_2_002 .byte N06 , Cs5 , v112 .byte W24 .byte Bn4 @@ -545,7 +545,7 @@ bgm_karakuri_2_002: .byte Fs5 .byte W03 .byte VOICE , 21 - .byte VOL , 36*bgm_karakuri_mvl/mxv + .byte VOL , 36*mus_trick_house_mvl/mxv .byte N32 , Fs4 .byte W36 .byte N06 @@ -667,18 +667,18 @@ bgm_karakuri_2_002: .byte N06 .byte W24 .byte GOTO - .word bgm_karakuri_2_B1 + .word mus_trick_house_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_karakuri_3: - .byte KEYSH , bgm_karakuri_key+0 +mus_trick_house_3: + .byte KEYSH , mus_trick_house_key+0 .byte VOICE , 21 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-32 - .byte VOL , 38*bgm_karakuri_mvl/mxv + .byte VOL , 38*mus_trick_house_mvl/mxv .byte N03 , As3 , v112 .byte W03 .byte Fs3 , v064 @@ -743,7 +743,7 @@ bgm_karakuri_3: .byte W03 .byte As3 .byte W03 -bgm_karakuri_3_B1: +mus_trick_house_3_B1: .byte W48 .byte VOICE , 56 .byte N06 , Fs4 , v112 @@ -875,7 +875,7 @@ bgm_karakuri_3_B1: .byte N03 , Cs5 .byte W06 .byte VOICE , 14 - .byte VOL , 30*bgm_karakuri_mvl/mxv + .byte VOL , 30*mus_trick_house_mvl/mxv .byte PAN , c_v-52 .byte N48 , As3 .byte W48 @@ -928,7 +928,7 @@ bgm_karakuri_3_B1: .byte Bn4 , v064 .byte W09 .byte VOICE , 73 - .byte VOL , 25*bgm_karakuri_mvl/mxv + .byte VOL , 25*mus_trick_house_mvl/mxv .byte PAN , c_v-43 .byte N06 , Cs5 , v112 .byte W06 @@ -959,12 +959,12 @@ bgm_karakuri_3_B1: .byte W06 .byte Ds5 .byte W06 - .byte VOL , 28*bgm_karakuri_mvl/mxv + .byte VOL , 28*mus_trick_house_mvl/mxv .byte N06 , Cs5 .byte W06 .byte Ds5 .byte W06 - .byte VOL , 40*bgm_karakuri_mvl/mxv + .byte VOL , 40*mus_trick_house_mvl/mxv .byte N06 , Cs5 .byte W06 .byte Ds5 @@ -973,7 +973,7 @@ bgm_karakuri_3_B1: .byte W06 .byte Ds5 .byte W06 - .byte VOL , 35*bgm_karakuri_mvl/mxv + .byte VOL , 35*mus_trick_house_mvl/mxv .byte PAN , c_v+47 .byte N06 , Cs5 .byte W06 @@ -985,7 +985,7 @@ bgm_karakuri_3_B1: .byte W03 .byte N06 , Ds5 .byte W06 - .byte VOL , 26*bgm_karakuri_mvl/mxv + .byte VOL , 26*mus_trick_house_mvl/mxv .byte PAN , c_v+10 .byte N06 , Cs5 .byte W06 @@ -1000,7 +1000,7 @@ bgm_karakuri_3_B1: .byte W06 .byte Ds5 .byte W03 - .byte VOL , 31*bgm_karakuri_mvl/mxv + .byte VOL , 31*mus_trick_house_mvl/mxv .byte W03 .byte PAN , c_v-34 .byte N06 , Fn5 @@ -1008,7 +1008,7 @@ bgm_karakuri_3_B1: .byte Ds5 .byte W06 .byte PAN , c_v-49 - .byte VOL , 39*bgm_karakuri_mvl/mxv + .byte VOL , 39*mus_trick_house_mvl/mxv .byte N06 , Cs5 .byte W06 .byte Bn4 @@ -1019,7 +1019,7 @@ bgm_karakuri_3_B1: .byte W06 .byte VOICE , 47 .byte PAN , c_v+47 - .byte VOL , 56*bgm_karakuri_mvl/mxv + .byte VOL , 56*mus_trick_house_mvl/mxv .byte N06 , Cs3 .byte W12 .byte PAN , c_v-43 @@ -1045,7 +1045,7 @@ bgm_karakuri_3_B1: .byte W12 .byte VOICE , 17 .byte PAN , c_v+0 - .byte VOL , 30*bgm_karakuri_mvl/mxv + .byte VOL , 30*mus_trick_house_mvl/mxv .byte W06 .byte N06 , As3 .byte W06 @@ -1355,20 +1355,20 @@ bgm_karakuri_3_B1: .byte Fn4 .byte W06 .byte GOTO - .word bgm_karakuri_3_B1 + .word mus_trick_house_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_karakuri_4: - .byte KEYSH , bgm_karakuri_key+0 +mus_trick_house_4: + .byte KEYSH , mus_trick_house_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-62 - .byte VOL , 32*bgm_karakuri_mvl/mxv + .byte VOL , 32*mus_trick_house_mvl/mxv .byte N24 , As3 , v112 .byte W24 .byte Bn3 @@ -1377,9 +1377,9 @@ bgm_karakuri_4: .byte W24 .byte Cs4 .byte W24 -bgm_karakuri_4_B1: +mus_trick_house_4_B1: .byte PAN , c_v-63 - .byte VOL , 33*bgm_karakuri_mvl/mxv + .byte VOL , 33*mus_trick_house_mvl/mxv .byte N03 , Fs3 , v112 .byte W06 .byte Fs3 , v096 @@ -1412,7 +1412,7 @@ bgm_karakuri_4_B1: .byte W03 .byte N06 , As2 , v080 .byte W09 -bgm_karakuri_4_000: +mus_trick_house_4_000: .byte N03 , Fs3 , v112 .byte W06 .byte Fs3 , v096 @@ -1447,7 +1447,7 @@ bgm_karakuri_4_000: .byte W09 .byte PEND .byte PATT - .word bgm_karakuri_4_000 + .word mus_trick_house_4_000 .byte N06 , Gs3 , v112 .byte W06 .byte N12 , Fn3 @@ -1530,11 +1530,11 @@ bgm_karakuri_4_000: .byte Cs4 .byte W12 .byte PATT - .word bgm_karakuri_4_000 + .word mus_trick_house_4_000 .byte PATT - .word bgm_karakuri_4_000 + .word mus_trick_house_4_000 .byte PATT - .word bgm_karakuri_4_000 + .word mus_trick_house_4_000 .byte W96 .byte N03 , Cs4 , v112 .byte W06 @@ -1569,14 +1569,14 @@ bgm_karakuri_4_000: .byte Bn3 , v064 .byte W09 .byte PATT - .word bgm_karakuri_4_000 + .word mus_trick_house_4_000 .byte PATT - .word bgm_karakuri_4_000 + .word mus_trick_house_4_000 .byte PATT - .word bgm_karakuri_4_000 + .word mus_trick_house_4_000 .byte W96 .byte PAN , c_v+0 - .byte VOL , 32*bgm_karakuri_mvl/mxv + .byte VOL , 32*mus_trick_house_mvl/mxv .byte BEND , c_v+2 .byte N32 , Ds5 , v112 .byte W36 @@ -1700,21 +1700,21 @@ bgm_karakuri_4_000: .byte N06 .byte W24 .byte GOTO - .word bgm_karakuri_4_B1 + .word mus_trick_house_4_B1 .byte BEND , c_v+0 .byte FINE @********************** Track 5 **********************@ -bgm_karakuri_5: - .byte KEYSH , bgm_karakuri_key+0 +mus_trick_house_5: + .byte KEYSH , mus_trick_house_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 34*bgm_karakuri_mvl/mxv + .byte VOL , 34*mus_trick_house_mvl/mxv .byte N24 , Cs3 , v112 .byte W24 .byte Bn2 @@ -1723,9 +1723,9 @@ bgm_karakuri_5: .byte W24 .byte Fn2 .byte W24 -bgm_karakuri_5_B1: +mus_trick_house_5_B1: .byte PAN , c_v+63 - .byte VOL , 36*bgm_karakuri_mvl/mxv + .byte VOL , 36*mus_trick_house_mvl/mxv .byte N03 , Cs4 , v112 .byte W06 .byte Cs4 , v096 @@ -1758,7 +1758,7 @@ bgm_karakuri_5_B1: .byte W06 .byte N03 .byte W06 -bgm_karakuri_5_000: +mus_trick_house_5_000: .byte N03 , Cs4 , v112 .byte W06 .byte Cs4 , v096 @@ -1793,7 +1793,7 @@ bgm_karakuri_5_000: .byte W06 .byte PEND .byte PATT - .word bgm_karakuri_5_000 + .word mus_trick_house_5_000 .byte N06 , Cs4 , v112 .byte W06 .byte N12 , Gs3 @@ -1860,11 +1860,11 @@ bgm_karakuri_5_000: .byte Fs4 .byte W12 .byte PATT - .word bgm_karakuri_5_000 + .word mus_trick_house_5_000 .byte PATT - .word bgm_karakuri_5_000 + .word mus_trick_house_5_000 .byte PATT - .word bgm_karakuri_5_000 + .word mus_trick_house_5_000 .byte W96 .byte N03 , Fn4 , v112 .byte W06 @@ -1899,14 +1899,14 @@ bgm_karakuri_5_000: .byte Dn4 , v064 .byte W09 .byte PATT - .word bgm_karakuri_5_000 + .word mus_trick_house_5_000 .byte PATT - .word bgm_karakuri_5_000 + .word mus_trick_house_5_000 .byte PATT - .word bgm_karakuri_5_000 + .word mus_trick_house_5_000 .byte W96 .byte PAN , c_v+0 - .byte VOL , 36*bgm_karakuri_mvl/mxv + .byte VOL , 36*mus_trick_house_mvl/mxv .byte N32 , Ds5 , v112 .byte W36 .byte N06 @@ -2027,19 +2027,19 @@ bgm_karakuri_5_000: .byte N06 .byte W24 .byte GOTO - .word bgm_karakuri_5_B1 + .word mus_trick_house_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_karakuri_6: - .byte KEYSH , bgm_karakuri_key+0 +mus_trick_house_6: + .byte KEYSH , mus_trick_house_key+0 .byte VOICE , 0 - .byte VOL , 70*bgm_karakuri_mvl/mxv + .byte VOL , 70*mus_trick_house_mvl/mxv .byte PAN , c_v+0 .byte W96 -bgm_karakuri_6_B1: -bgm_karakuri_6_000: +mus_trick_house_6_B1: +mus_trick_house_6_000: .byte N06 , Cn1 , v112 .byte W06 .byte Cn1 , v088 @@ -2065,49 +2065,49 @@ bgm_karakuri_6_000: .byte W06 .byte PEND .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte PATT - .word bgm_karakuri_6_000 + .word mus_trick_house_6_000 .byte N06 , Cn1 , v112 .byte W12 .byte Cn1 , v088 @@ -2131,20 +2131,20 @@ bgm_karakuri_6_000: .byte En3 , v092 .byte W06 .byte GOTO - .word bgm_karakuri_6_B1 + .word mus_trick_house_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_karakuri_7: - .byte KEYSH , bgm_karakuri_key+0 +mus_trick_house_7: + .byte KEYSH , mus_trick_house_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 59*bgm_karakuri_mvl/mxv + .byte VOL , 59*mus_trick_house_mvl/mxv .byte BEND , c_v+0 .byte N24 , Cs2 , v112 .byte W24 @@ -2158,8 +2158,8 @@ bgm_karakuri_7: .byte W06 .byte c_v+0 .byte W12 -bgm_karakuri_7_B1: -bgm_karakuri_7_000: +mus_trick_house_7_B1: +mus_trick_house_7_000: .byte N03 , Fs1 , v112 .byte W06 .byte N06 @@ -2182,10 +2182,10 @@ bgm_karakuri_7_000: .byte W12 .byte PEND .byte PATT - .word bgm_karakuri_7_000 + .word mus_trick_house_7_000 .byte PATT - .word bgm_karakuri_7_000 -bgm_karakuri_7_001: + .word mus_trick_house_7_000 +mus_trick_house_7_001: .byte N03 , Cs1 , v112 .byte W06 .byte N06 @@ -2208,9 +2208,9 @@ bgm_karakuri_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_karakuri_7_001 + .word mus_trick_house_7_001 .byte PATT - .word bgm_karakuri_7_001 + .word mus_trick_house_7_001 .byte N03 , Cs1 , v112 .byte W06 .byte N06 @@ -2252,17 +2252,17 @@ bgm_karakuri_7_001: .byte N06 , Fs2 .byte W12 .byte PATT - .word bgm_karakuri_7_000 + .word mus_trick_house_7_000 .byte PATT - .word bgm_karakuri_7_000 + .word mus_trick_house_7_000 .byte PATT - .word bgm_karakuri_7_000 + .word mus_trick_house_7_000 .byte PATT - .word bgm_karakuri_7_001 + .word mus_trick_house_7_001 .byte PATT - .word bgm_karakuri_7_001 + .word mus_trick_house_7_001 .byte PATT - .word bgm_karakuri_7_001 + .word mus_trick_house_7_001 .byte N03 , Cs1 , v112 .byte W06 .byte N06 @@ -2303,7 +2303,7 @@ bgm_karakuri_7_001: .byte W12 .byte N06 , Fs2 .byte W12 -bgm_karakuri_7_002: +mus_trick_house_7_002: .byte N03 , Bn1 , v112 .byte W06 .byte N06 @@ -2386,7 +2386,7 @@ bgm_karakuri_7_002: .byte N06 , Cs2 .byte W12 .byte PATT - .word bgm_karakuri_7_002 + .word mus_trick_house_7_002 .byte N03 , Fs1 , v112 .byte W06 .byte N06 , As1 @@ -2444,20 +2444,20 @@ bgm_karakuri_7_002: .byte N06 .byte W24 .byte GOTO - .word bgm_karakuri_7_B1 + .word mus_trick_house_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_karakuri_8: - .byte KEYSH , bgm_karakuri_key+0 +mus_trick_house_8: + .byte KEYSH , mus_trick_house_key+0 .byte VOICE , 13 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 39*bgm_karakuri_mvl/mxv + .byte VOL , 39*mus_trick_house_mvl/mxv .byte PAN , c_v+16 .byte W96 -bgm_karakuri_8_B1: +mus_trick_house_8_B1: .byte VOICE , 56 .byte PAN , c_v+16 .byte W48 @@ -2582,7 +2582,7 @@ bgm_karakuri_8_B1: .byte N06 .byte W12 .byte W96 - .byte VOL , 32*bgm_karakuri_mvl/mxv + .byte VOL , 32*mus_trick_house_mvl/mxv .byte N06 , As4 , v112 .byte W06 .byte Gs4 @@ -2670,7 +2670,7 @@ bgm_karakuri_8_B1: .byte Cs5 .byte W12 .byte VOICE , 56 - .byte VOL , 37*bgm_karakuri_mvl/mxv + .byte VOL , 37*mus_trick_house_mvl/mxv .byte N03 , Fn4 .byte W06 .byte N03 @@ -2704,7 +2704,7 @@ bgm_karakuri_8_B1: .byte Dn4 , v064 .byte W09 .byte VOICE , 13 - .byte VOL , 34*bgm_karakuri_mvl/mxv + .byte VOL , 34*mus_trick_house_mvl/mxv .byte N06 , Gs4 , v112 .byte W06 .byte Fn4 @@ -2780,7 +2780,7 @@ bgm_karakuri_8_B1: .byte W24 .byte VOICE , 47 .byte PAN , c_v+35 - .byte VOL , 56*bgm_karakuri_mvl/mxv + .byte VOL , 56*mus_trick_house_mvl/mxv .byte N06 , Fs3 .byte W12 .byte N06 @@ -2807,7 +2807,7 @@ bgm_karakuri_8_B1: .byte N06 , Fs3 .byte W06 .byte VOICE , 13 - .byte VOL , 40*bgm_karakuri_mvl/mxv + .byte VOL , 40*mus_trick_house_mvl/mxv .byte W12 .byte N06 , Ds6 , v092 .byte W12 @@ -2923,27 +2923,27 @@ bgm_karakuri_8_B1: .byte Gs4 .byte W06 .byte GOTO - .word bgm_karakuri_8_B1 + .word mus_trick_house_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_karakuri: +mus_trick_house: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_karakuri_pri @ Priority - .byte bgm_karakuri_rev @ Reverb. + .byte mus_trick_house_pri @ Priority + .byte mus_trick_house_rev @ Reverb. - .word bgm_karakuri_grp + .word mus_trick_house_grp - .word bgm_karakuri_1 - .word bgm_karakuri_2 - .word bgm_karakuri_3 - .word bgm_karakuri_4 - .word bgm_karakuri_5 - .word bgm_karakuri_6 - .word bgm_karakuri_7 - .word bgm_karakuri_8 + .word mus_trick_house_1 + .word mus_trick_house_2 + .word mus_trick_house_3 + .word mus_trick_house_4 + .word mus_trick_house_5 + .word mus_trick_house_6 + .word mus_trick_house_7 + .word mus_trick_house_8 .end diff --git a/sound/songs/bgm_deepdeep.s b/sound/songs/mus_underwater.s index cba06ab17..d06daed74 100644 --- a/sound/songs/bgm_deepdeep.s +++ b/sound/songs/mus_underwater.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ bgm_deepdeep_grp, voicegroup054 - .equ bgm_deepdeep_pri, 0 - .equ bgm_deepdeep_rev, reverb_set+50 - .equ bgm_deepdeep_mvl, 127 - .equ bgm_deepdeep_key, 0 - .equ bgm_deepdeep_tbs, 1 - .equ bgm_deepdeep_exg, 0 - .equ bgm_deepdeep_cmp, 1 + .equ mus_underwater_grp, voicegroup054 + .equ mus_underwater_pri, 0 + .equ mus_underwater_rev, reverb_set+50 + .equ mus_underwater_mvl, 127 + .equ mus_underwater_key, 0 + .equ mus_underwater_tbs, 1 + .equ mus_underwater_exg, 0 + .equ mus_underwater_cmp, 1 .section .rodata - .global bgm_deepdeep + .global mus_underwater .align 2 @********************** Track 1 **********************@ -bgm_deepdeep_1: - .byte KEYSH , bgm_deepdeep_key+0 - .byte TEMPO , 86*bgm_deepdeep_tbs/2 +mus_underwater_1: + .byte KEYSH , mus_underwater_key+0 + .byte TEMPO , 86*mus_underwater_tbs/2 .byte VOICE , 46 .byte PAN , c_v+16 - .byte VOL , 75*bgm_deepdeep_mvl/mxv + .byte VOL , 75*mus_underwater_mvl/mxv .byte W96 -bgm_deepdeep_1_000: +mus_underwater_1_000: .byte N04 , Gn1 , v112 .byte W04 .byte Gn1 , v036 @@ -121,7 +121,7 @@ bgm_deepdeep_1_000: .byte Cn3 .byte W04 .byte PATT - .word bgm_deepdeep_1_000 + .word mus_underwater_1_000 .byte N04 , Gs1 , v112 .byte W04 .byte Gs1 , v036 @@ -172,8 +172,8 @@ bgm_deepdeep_1_000: .byte Cn5 .byte W04 .byte PATT - .word bgm_deepdeep_1_000 -bgm_deepdeep_1_001: + .word mus_underwater_1_000 +mus_underwater_1_001: .byte N04 , Fn1 , v112 .byte W04 .byte Fn1 , v036 @@ -225,8 +225,8 @@ bgm_deepdeep_1_001: .byte W04 .byte PEND .byte PATT - .word bgm_deepdeep_1_000 - .byte TEMPO , 86*bgm_deepdeep_tbs/2 + .word mus_underwater_1_000 + .byte TEMPO , 86*mus_underwater_tbs/2 .byte N04 , Gs1 , v112 .byte W04 .byte Gs1 , v036 @@ -276,8 +276,8 @@ bgm_deepdeep_1_001: .byte W04 .byte Cn5 .byte W04 -bgm_deepdeep_1_B1: -bgm_deepdeep_1_002: +mus_underwater_1_B1: +mus_underwater_1_002: .byte N04 , Ds1 , v112 .byte W04 .byte Gn1 @@ -328,7 +328,7 @@ bgm_deepdeep_1_002: .byte Ds3 .byte W04 .byte PEND -bgm_deepdeep_1_003: +mus_underwater_1_003: .byte N04 , Dn1 , v112 .byte W04 .byte Dn1 , v036 @@ -379,7 +379,7 @@ bgm_deepdeep_1_003: .byte En4 .byte W04 .byte PEND -bgm_deepdeep_1_004: +mus_underwater_1_004: .byte N04 , Gs1 , v112 .byte W04 .byte Cn2 @@ -430,7 +430,7 @@ bgm_deepdeep_1_004: .byte As3 , v112 .byte W04 .byte PEND -bgm_deepdeep_1_005: +mus_underwater_1_005: .byte N04 , Gn1 , v112 .byte W04 .byte Bn1 @@ -482,12 +482,12 @@ bgm_deepdeep_1_005: .byte W04 .byte PEND .byte PATT - .word bgm_deepdeep_1_000 + .word mus_underwater_1_000 .byte PATT - .word bgm_deepdeep_1_001 + .word mus_underwater_1_001 .byte PATT - .word bgm_deepdeep_1_000 -bgm_deepdeep_1_006: + .word mus_underwater_1_000 +mus_underwater_1_006: .byte N04 , Fn1 , v112 .byte W04 .byte Fn1 , v036 @@ -588,9 +588,9 @@ bgm_deepdeep_1_006: .byte Ds3 .byte W04 .byte PATT - .word bgm_deepdeep_1_003 + .word mus_underwater_1_003 .byte PATT - .word bgm_deepdeep_1_004 + .word mus_underwater_1_004 .byte N04 , Gn1 , v112 .byte W04 .byte Gn1 , v036 @@ -641,15 +641,15 @@ bgm_deepdeep_1_006: .byte Dn3 .byte W04 .byte PATT - .word bgm_deepdeep_1_002 + .word mus_underwater_1_002 .byte PATT - .word bgm_deepdeep_1_003 + .word mus_underwater_1_003 .byte PATT - .word bgm_deepdeep_1_004 + .word mus_underwater_1_004 .byte PATT - .word bgm_deepdeep_1_005 + .word mus_underwater_1_005 .byte PATT - .word bgm_deepdeep_1_000 + .word mus_underwater_1_000 .byte N04 , Fn1 , v112 .byte W04 .byte Fn1 , v036 @@ -700,22 +700,22 @@ bgm_deepdeep_1_006: .byte Cn3 .byte W04 .byte PATT - .word bgm_deepdeep_1_000 + .word mus_underwater_1_000 .byte PATT - .word bgm_deepdeep_1_006 + .word mus_underwater_1_006 .byte W96 .byte W96 .byte GOTO - .word bgm_deepdeep_1_B1 + .word mus_underwater_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_deepdeep_2: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_2: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 23 .byte PAN , c_v+0 - .byte VOL , 47*bgm_deepdeep_mvl/mxv + .byte VOL , 47*mus_underwater_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -725,7 +725,7 @@ bgm_deepdeep_2: .byte W96 .byte W96 .byte W96 -bgm_deepdeep_2_B1: +mus_underwater_2_B1: .byte W96 .byte W96 .byte W96 @@ -746,7 +746,7 @@ bgm_deepdeep_2_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 34*bgm_deepdeep_mvl/mxv + .byte VOL , 34*mus_underwater_mvl/mxv .byte N04 , Cn2 , v064 .byte W04 .byte Ds2 , v044 @@ -761,7 +761,7 @@ bgm_deepdeep_2_B1: .byte W02 .byte Cn2 , v064 .byte W02 - .byte VOL , 42*bgm_deepdeep_mvl/mxv + .byte VOL , 42*mus_underwater_mvl/mxv .byte N04 , An1 .byte W04 .byte Bn1 @@ -774,7 +774,7 @@ bgm_deepdeep_2_B1: .byte W04 .byte An1 , v064 .byte W04 - .byte VOL , 47*bgm_deepdeep_mvl/mxv + .byte VOL , 47*mus_underwater_mvl/mxv .byte N04 , Cn2 .byte W04 .byte As1 , v048 @@ -815,7 +815,7 @@ bgm_deepdeep_2_B1: .byte W04 .byte An1 .byte W04 - .byte VOL , 42*bgm_deepdeep_mvl/mxv + .byte VOL , 42*mus_underwater_mvl/mxv .byte N04 , Bn1 , v064 .byte W04 .byte Gs1 @@ -828,7 +828,7 @@ bgm_deepdeep_2_B1: .byte W04 .byte Bn1 , v064 .byte W04 - .byte VOL , 37*bgm_deepdeep_mvl/mxv + .byte VOL , 37*mus_underwater_mvl/mxv .byte N04 , Gn2 .byte W04 .byte Cs2 , v040 @@ -841,7 +841,7 @@ bgm_deepdeep_2_B1: .byte W04 .byte Bn1 , v040 .byte W04 - .byte VOL , 31*bgm_deepdeep_mvl/mxv + .byte VOL , 31*mus_underwater_mvl/mxv .byte N04 , As2 , v064 .byte W04 .byte Dn2 , v040 @@ -855,16 +855,16 @@ bgm_deepdeep_2_B1: .byte Cn2 , v044 .byte W04 .byte GOTO - .word bgm_deepdeep_2_B1 + .word mus_underwater_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_deepdeep_3: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_3: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 35 .byte PAN , c_v+0 - .byte VOL , 94*bgm_deepdeep_mvl/mxv + .byte VOL , 94*mus_underwater_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -874,8 +874,8 @@ bgm_deepdeep_3: .byte W96 .byte W96 .byte W96 -bgm_deepdeep_3_B1: -bgm_deepdeep_3_000: +mus_underwater_3_B1: +mus_underwater_3_000: .byte N04 , Ds1 , v127 .byte W08 .byte Dn1 @@ -899,7 +899,7 @@ bgm_deepdeep_3_000: .byte N12 , Ds1 .byte W12 .byte PEND -bgm_deepdeep_3_001: +mus_underwater_3_001: .byte N04 , Dn1 , v127 .byte W08 .byte Cs1 @@ -955,7 +955,7 @@ bgm_deepdeep_3_001: .byte W08 .byte Gs1 .byte W04 -bgm_deepdeep_3_002: +mus_underwater_3_002: .byte N04 , Gn1 , v127 .byte W08 .byte Fs1 @@ -989,7 +989,7 @@ bgm_deepdeep_3_002: .byte Dn2 .byte W04 .byte PEND -bgm_deepdeep_3_003: +mus_underwater_3_003: .byte N12 , Gn1 , v127 .byte W12 .byte N08 , Gn1 , v036 @@ -1001,7 +1001,7 @@ bgm_deepdeep_3_003: .byte N04 , Gn2 , v127 .byte W04 .byte PEND -bgm_deepdeep_3_004: +mus_underwater_3_004: .byte N12 , Fn1 , v127 .byte W12 .byte N08 , Fn1 , v036 @@ -1023,7 +1023,7 @@ bgm_deepdeep_3_004: .byte W68 .byte N04 , Gn2 , v127 .byte W04 -bgm_deepdeep_3_005: +mus_underwater_3_005: .byte N12 , Fn1 , v127 .byte W12 .byte N08 , Fn1 , v036 @@ -1034,9 +1034,9 @@ bgm_deepdeep_3_005: .byte W72 .byte PEND .byte PATT - .word bgm_deepdeep_3_000 + .word mus_underwater_3_000 .byte PATT - .word bgm_deepdeep_3_001 + .word mus_underwater_3_001 .byte N04 , Fn1 , v127 .byte W08 .byte En1 @@ -1070,9 +1070,9 @@ bgm_deepdeep_3_005: .byte Gs1 .byte W04 .byte PATT - .word bgm_deepdeep_3_002 + .word mus_underwater_3_002 .byte PATT - .word bgm_deepdeep_3_000 + .word mus_underwater_3_000 .byte N04 , Dn1 , v127 .byte W08 .byte Cs1 @@ -1174,23 +1174,23 @@ bgm_deepdeep_3_005: .byte N04 , Gn2 , v127 .byte W04 .byte PATT - .word bgm_deepdeep_3_004 + .word mus_underwater_3_004 .byte PATT - .word bgm_deepdeep_3_003 + .word mus_underwater_3_003 .byte PATT - .word bgm_deepdeep_3_005 + .word mus_underwater_3_005 .byte W96 .byte W96 .byte GOTO - .word bgm_deepdeep_3_B1 + .word mus_underwater_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_deepdeep_4: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_4: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 126 - .byte VOL , 31*bgm_deepdeep_mvl/mxv + .byte VOL , 31*mus_underwater_mvl/mxv .byte PAN , c_v-64 .byte W96 .byte W96 @@ -1208,15 +1208,15 @@ bgm_deepdeep_4: .byte W24 .byte Gn4 , v127 .byte W36 -bgm_deepdeep_4_B1: -bgm_deepdeep_4_000: +mus_underwater_4_B1: +mus_underwater_4_000: .byte W24 .byte N10 , Gn4 , v112 .byte W36 .byte N10 .byte W36 .byte PEND -bgm_deepdeep_4_001: +mus_underwater_4_001: .byte W24 .byte N10 , Gn4 , v112 .byte W36 @@ -1226,56 +1226,56 @@ bgm_deepdeep_4_001: .byte W12 .byte PEND .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte PATT - .word bgm_deepdeep_4_000 + .word mus_underwater_4_000 .byte PATT - .word bgm_deepdeep_4_001 + .word mus_underwater_4_001 .byte GOTO - .word bgm_deepdeep_4_B1 + .word mus_underwater_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_deepdeep_5: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_5: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 9 .byte PAN , c_v-32 - .byte VOL , 15*bgm_deepdeep_mvl/mxv + .byte VOL , 15*mus_underwater_mvl/mxv .byte N04 , Gn4 , v080 .byte W08 .byte Gn4 , v052 @@ -1283,7 +1283,7 @@ bgm_deepdeep_5: .byte N12 , Gn5 , v084 .byte W12 .byte PAN , c_v+32 - .byte VOL , 26*bgm_deepdeep_mvl/mxv + .byte VOL , 26*mus_underwater_mvl/mxv .byte N04 , Gn4 , v080 .byte W04 .byte Gn4 , v044 @@ -1293,7 +1293,7 @@ bgm_deepdeep_5: .byte N12 , Gn5 , v084 .byte W12 .byte PAN , c_v-32 - .byte VOL , 35*bgm_deepdeep_mvl/mxv + .byte VOL , 35*mus_underwater_mvl/mxv .byte N04 , Gn4 , v080 .byte W08 .byte Gn4 , v052 @@ -1301,7 +1301,7 @@ bgm_deepdeep_5: .byte N12 , Gn5 , v084 .byte W12 .byte PAN , c_v+32 - .byte VOL , 47*bgm_deepdeep_mvl/mxv + .byte VOL , 47*mus_underwater_mvl/mxv .byte N04 , Gn4 , v080 .byte W08 .byte Gn4 , v052 @@ -1310,7 +1310,7 @@ bgm_deepdeep_5: .byte W08 .byte N04 , Gn5 , v052 .byte W04 - .byte VOL , 53*bgm_deepdeep_mvl/mxv + .byte VOL , 53*mus_underwater_mvl/mxv .byte PAN , c_v-32 .byte N04 , Gn4 , v080 .byte W04 @@ -1345,7 +1345,7 @@ bgm_deepdeep_5: .byte W04 .byte N12 , Gn5 , v084 .byte W12 -bgm_deepdeep_5_000: +mus_underwater_5_000: .byte PAN , c_v-32 .byte N04 , Gn4 , v080 .byte W08 @@ -1379,7 +1379,7 @@ bgm_deepdeep_5_000: .byte N04 , Gn5 , v052 .byte W04 .byte PEND -bgm_deepdeep_5_001: +mus_underwater_5_001: .byte PAN , c_v-32 .byte N04 , Gn4 , v080 .byte W04 @@ -1416,46 +1416,46 @@ bgm_deepdeep_5_001: .byte W12 .byte PEND .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 -bgm_deepdeep_5_B1: + .word mus_underwater_5_000 +mus_underwater_5_B1: .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PAN , c_v-32 .byte N04 , Gn4 , v080 .byte W04 @@ -1492,7 +1492,7 @@ bgm_deepdeep_5_B1: .byte W12 .byte VOICE , 45 .byte PAN , c_v-32 - .byte VOL , 65*bgm_deepdeep_mvl/mxv + .byte VOL , 65*mus_underwater_mvl/mxv .byte W12 .byte N04 , Gn4 , v112 .byte W04 @@ -1564,7 +1564,7 @@ bgm_deepdeep_5_B1: .byte W04 .byte Cn4 .byte W20 - .byte VOL , 53*bgm_deepdeep_mvl/mxv + .byte VOL , 53*mus_underwater_mvl/mxv .byte W12 .byte PAN , c_v-32 .byte N04 , Bn4 , v112 @@ -1607,24 +1607,24 @@ bgm_deepdeep_5_B1: .byte N12 , Gn5 , v092 .byte W12 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte PATT - .word bgm_deepdeep_5_001 + .word mus_underwater_5_001 .byte PATT - .word bgm_deepdeep_5_000 + .word mus_underwater_5_000 .byte GOTO - .word bgm_deepdeep_5_B1 + .word mus_underwater_5_B1 .byte PAN , c_v-32 .byte FINE @********************** Track 6 **********************@ -bgm_deepdeep_6: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_6: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 92 .byte LFOS , 44 .byte PAN , c_v+0 - .byte VOL , 35*bgm_deepdeep_mvl/mxv + .byte VOL , 35*mus_underwater_mvl/mxv .byte XCMD , xIECV , 18 .byte xIECV , 12 .byte BENDR , 12 @@ -1634,7 +1634,7 @@ bgm_deepdeep_6: .byte W96 .byte W96 .byte W72 - .byte VOL , 39*bgm_deepdeep_mvl/mxv + .byte VOL , 39*mus_underwater_mvl/mxv .byte W12 .byte N04 , An3 , v048 .byte W04 @@ -1645,22 +1645,22 @@ bgm_deepdeep_6: .byte N72 , Dn4 , v112 .byte W24 .byte MOD , 3 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte W04 - .byte 35*bgm_deepdeep_mvl/mxv + .byte 35*mus_underwater_mvl/mxv .byte W04 - .byte 31*bgm_deepdeep_mvl/mxv + .byte 31*mus_underwater_mvl/mxv .byte W04 - .byte 28*bgm_deepdeep_mvl/mxv + .byte 28*mus_underwater_mvl/mxv .byte W04 - .byte 25*bgm_deepdeep_mvl/mxv + .byte 25*mus_underwater_mvl/mxv .byte W04 - .byte 21*bgm_deepdeep_mvl/mxv + .byte 21*mus_underwater_mvl/mxv .byte W04 .byte MOD , 7 .byte W24 .byte 0 - .byte VOL , 39*bgm_deepdeep_mvl/mxv + .byte VOL , 39*mus_underwater_mvl/mxv .byte N04 , Fs4 .byte W04 .byte En4 @@ -1671,26 +1671,26 @@ bgm_deepdeep_6: .byte W12 .byte MOD , 2 .byte W24 - .byte VOL , 37*bgm_deepdeep_mvl/mxv + .byte VOL , 37*mus_underwater_mvl/mxv .byte W04 - .byte 35*bgm_deepdeep_mvl/mxv + .byte 35*mus_underwater_mvl/mxv .byte W04 - .byte 32*bgm_deepdeep_mvl/mxv + .byte 32*mus_underwater_mvl/mxv .byte W04 - .byte 29*bgm_deepdeep_mvl/mxv + .byte 29*mus_underwater_mvl/mxv .byte W04 - .byte 26*bgm_deepdeep_mvl/mxv + .byte 26*mus_underwater_mvl/mxv .byte W04 - .byte 23*bgm_deepdeep_mvl/mxv + .byte 23*mus_underwater_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 21*bgm_deepdeep_mvl/mxv + .byte VOL , 21*mus_underwater_mvl/mxv .byte W04 - .byte 19*bgm_deepdeep_mvl/mxv + .byte 19*mus_underwater_mvl/mxv .byte W20 .byte MOD , 0 .byte W08 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte N06 , Fs4 .byte W12 .byte N04 , Cs4 @@ -1698,28 +1698,28 @@ bgm_deepdeep_6: .byte N92 , Dn4 .byte W24 .byte MOD , 2 - .byte VOL , 37*bgm_deepdeep_mvl/mxv + .byte VOL , 37*mus_underwater_mvl/mxv .byte W04 - .byte 34*bgm_deepdeep_mvl/mxv + .byte 34*mus_underwater_mvl/mxv .byte W04 - .byte 32*bgm_deepdeep_mvl/mxv + .byte 32*mus_underwater_mvl/mxv .byte W04 - .byte 30*bgm_deepdeep_mvl/mxv + .byte 30*mus_underwater_mvl/mxv .byte W04 - .byte 28*bgm_deepdeep_mvl/mxv + .byte 28*mus_underwater_mvl/mxv .byte W04 - .byte 26*bgm_deepdeep_mvl/mxv + .byte 26*mus_underwater_mvl/mxv .byte W04 - .byte 23*bgm_deepdeep_mvl/mxv + .byte 23*mus_underwater_mvl/mxv .byte W04 - .byte 22*bgm_deepdeep_mvl/mxv + .byte 22*mus_underwater_mvl/mxv .byte W04 - .byte 20*bgm_deepdeep_mvl/mxv + .byte 20*mus_underwater_mvl/mxv .byte W12 .byte MOD , 7 .byte W24 .byte 0 - .byte VOL , 39*bgm_deepdeep_mvl/mxv + .byte VOL , 39*mus_underwater_mvl/mxv .byte N02 , Cs4 .byte W02 .byte Dn4 @@ -1728,21 +1728,21 @@ bgm_deepdeep_6: .byte W20 .byte MOD , 7 .byte W04 - .byte VOL , 34*bgm_deepdeep_mvl/mxv + .byte VOL , 34*mus_underwater_mvl/mxv .byte W04 - .byte 29*bgm_deepdeep_mvl/mxv + .byte 29*mus_underwater_mvl/mxv .byte W04 - .byte 24*bgm_deepdeep_mvl/mxv + .byte 24*mus_underwater_mvl/mxv .byte W04 - .byte 20*bgm_deepdeep_mvl/mxv + .byte 20*mus_underwater_mvl/mxv .byte W08 .byte MOD , 0 - .byte VOL , 14*bgm_deepdeep_mvl/mxv + .byte VOL , 14*mus_underwater_mvl/mxv .byte W02 - .byte 39*bgm_deepdeep_mvl/mxv + .byte 39*mus_underwater_mvl/mxv .byte N02 , En4 .byte W02 - .byte VOL , 39*bgm_deepdeep_mvl/mxv + .byte VOL , 39*mus_underwater_mvl/mxv .byte N24 , Fn4 .byte W24 .byte N08 , Ds4 @@ -1763,8 +1763,8 @@ bgm_deepdeep_6: .byte W02 .byte Dn3 .byte W02 -bgm_deepdeep_6_B1: - .byte VOL , 27*bgm_deepdeep_mvl/mxv +mus_underwater_6_B1: + .byte VOL , 27*mus_underwater_mvl/mxv .byte BEND , c_v+2 .byte N04 , Ds1 , v127 .byte W08 @@ -1864,7 +1864,7 @@ bgm_deepdeep_6_B1: .byte W04 .byte N08 , Gn1 .byte W12 - .byte VOL , 39*bgm_deepdeep_mvl/mxv + .byte VOL , 39*mus_underwater_mvl/mxv .byte BEND , c_v+0 .byte N04 , Dn4 , v112 .byte W04 @@ -1881,22 +1881,22 @@ bgm_deepdeep_6_B1: .byte N72 , Dn4 .byte W24 .byte MOD , 3 - .byte VOL , 35*bgm_deepdeep_mvl/mxv + .byte VOL , 35*mus_underwater_mvl/mxv .byte W04 - .byte 31*bgm_deepdeep_mvl/mxv + .byte 31*mus_underwater_mvl/mxv .byte W04 - .byte 28*bgm_deepdeep_mvl/mxv + .byte 28*mus_underwater_mvl/mxv .byte W04 - .byte 25*bgm_deepdeep_mvl/mxv + .byte 25*mus_underwater_mvl/mxv .byte W04 - .byte 23*bgm_deepdeep_mvl/mxv + .byte 23*mus_underwater_mvl/mxv .byte W04 - .byte 21*bgm_deepdeep_mvl/mxv + .byte 21*mus_underwater_mvl/mxv .byte W04 .byte MOD , 6 .byte W24 .byte 0 - .byte VOL , 39*bgm_deepdeep_mvl/mxv + .byte VOL , 39*mus_underwater_mvl/mxv .byte N04 , Fs4 .byte W04 .byte En4 @@ -1908,33 +1908,33 @@ bgm_deepdeep_6_B1: .byte MOD , 2 .byte W24 .byte 3 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte W04 - .byte 35*bgm_deepdeep_mvl/mxv + .byte 35*mus_underwater_mvl/mxv .byte W04 - .byte 33*bgm_deepdeep_mvl/mxv + .byte 33*mus_underwater_mvl/mxv .byte W04 - .byte 32*bgm_deepdeep_mvl/mxv + .byte 32*mus_underwater_mvl/mxv .byte W04 - .byte 29*bgm_deepdeep_mvl/mxv + .byte 29*mus_underwater_mvl/mxv .byte W04 - .byte 28*bgm_deepdeep_mvl/mxv + .byte 28*mus_underwater_mvl/mxv .byte W04 .byte MOD , 6 - .byte VOL , 25*bgm_deepdeep_mvl/mxv + .byte VOL , 25*mus_underwater_mvl/mxv .byte W04 - .byte 23*bgm_deepdeep_mvl/mxv + .byte 23*mus_underwater_mvl/mxv .byte W04 - .byte 21*bgm_deepdeep_mvl/mxv + .byte 21*mus_underwater_mvl/mxv .byte W16 .byte MOD , 0 .byte W08 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte N06 , Fs4 .byte W12 .byte N04 , Cs4 .byte W04 -bgm_deepdeep_6_000: +mus_underwater_6_000: .byte TIE , Dn4 , v112 .byte W48 .byte MOD , 2 @@ -1942,24 +1942,24 @@ bgm_deepdeep_6_000: .byte PEND .byte W24 .byte 4 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte W04 - .byte 35*bgm_deepdeep_mvl/mxv + .byte 35*mus_underwater_mvl/mxv .byte W04 - .byte 32*bgm_deepdeep_mvl/mxv + .byte 32*mus_underwater_mvl/mxv .byte W04 - .byte 29*bgm_deepdeep_mvl/mxv + .byte 29*mus_underwater_mvl/mxv .byte W04 - .byte 26*bgm_deepdeep_mvl/mxv + .byte 26*mus_underwater_mvl/mxv .byte W04 - .byte 23*bgm_deepdeep_mvl/mxv + .byte 23*mus_underwater_mvl/mxv .byte W04 .byte MOD , 6 - .byte VOL , 21*bgm_deepdeep_mvl/mxv + .byte VOL , 21*mus_underwater_mvl/mxv .byte W24 .byte EOT .byte MOD , 0 - .byte VOL , 39*bgm_deepdeep_mvl/mxv + .byte VOL , 39*mus_underwater_mvl/mxv .byte N02 , Cn4 , v064 .byte W02 .byte Bn3 @@ -1982,7 +1982,7 @@ bgm_deepdeep_6_000: .byte W02 .byte Gs2 .byte W02 - .byte VOL , 39*bgm_deepdeep_mvl/mxv + .byte VOL , 39*mus_underwater_mvl/mxv .byte N16 , Gn2 , v112 .byte W16 .byte N14 , Gs2 @@ -2144,18 +2144,18 @@ bgm_deepdeep_6_000: .byte W12 .byte N48 , Bn3 .byte W24 - .byte VOL , 37*bgm_deepdeep_mvl/mxv + .byte VOL , 37*mus_underwater_mvl/mxv .byte MOD , 5 .byte W04 - .byte VOL , 33*bgm_deepdeep_mvl/mxv + .byte VOL , 33*mus_underwater_mvl/mxv .byte W04 - .byte 30*bgm_deepdeep_mvl/mxv + .byte 30*mus_underwater_mvl/mxv .byte W04 - .byte 25*bgm_deepdeep_mvl/mxv + .byte 25*mus_underwater_mvl/mxv .byte W04 - .byte 23*bgm_deepdeep_mvl/mxv + .byte 23*mus_underwater_mvl/mxv .byte W08 - .byte 39*bgm_deepdeep_mvl/mxv + .byte 39*mus_underwater_mvl/mxv .byte MOD , 0 .byte N24 , Dn4 .byte W24 @@ -2174,22 +2174,22 @@ bgm_deepdeep_6_000: .byte N72 , Dn4 .byte W24 .byte MOD , 3 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte W04 - .byte 34*bgm_deepdeep_mvl/mxv + .byte 34*mus_underwater_mvl/mxv .byte W04 - .byte 31*bgm_deepdeep_mvl/mxv + .byte 31*mus_underwater_mvl/mxv .byte W04 - .byte 29*bgm_deepdeep_mvl/mxv + .byte 29*mus_underwater_mvl/mxv .byte W04 - .byte 26*bgm_deepdeep_mvl/mxv + .byte 26*mus_underwater_mvl/mxv .byte W04 - .byte 24*bgm_deepdeep_mvl/mxv + .byte 24*mus_underwater_mvl/mxv .byte W04 .byte MOD , 6 .byte W24 .byte 0 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte N04 , Fs4 .byte W04 .byte En4 @@ -2201,52 +2201,52 @@ bgm_deepdeep_6_000: .byte MOD , 2 .byte W24 .byte 3 - .byte VOL , 37*bgm_deepdeep_mvl/mxv + .byte VOL , 37*mus_underwater_mvl/mxv .byte W04 - .byte 34*bgm_deepdeep_mvl/mxv + .byte 34*mus_underwater_mvl/mxv .byte W04 - .byte 32*bgm_deepdeep_mvl/mxv + .byte 32*mus_underwater_mvl/mxv .byte W04 - .byte 29*bgm_deepdeep_mvl/mxv + .byte 29*mus_underwater_mvl/mxv .byte W04 - .byte 27*bgm_deepdeep_mvl/mxv + .byte 27*mus_underwater_mvl/mxv .byte W04 - .byte 25*bgm_deepdeep_mvl/mxv + .byte 25*mus_underwater_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 24*bgm_deepdeep_mvl/mxv + .byte VOL , 24*mus_underwater_mvl/mxv .byte W04 - .byte 22*bgm_deepdeep_mvl/mxv + .byte 22*mus_underwater_mvl/mxv .byte W20 .byte MOD , 0 .byte W08 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte N06 , Fs4 .byte W12 .byte N04 , Cs4 .byte W04 .byte PATT - .word bgm_deepdeep_6_000 + .word mus_underwater_6_000 .byte W24 .byte MOD , 6 - .byte VOL , 35*bgm_deepdeep_mvl/mxv + .byte VOL , 35*mus_underwater_mvl/mxv .byte W04 - .byte 32*bgm_deepdeep_mvl/mxv + .byte 32*mus_underwater_mvl/mxv .byte W04 - .byte 29*bgm_deepdeep_mvl/mxv + .byte 29*mus_underwater_mvl/mxv .byte W04 - .byte 27*bgm_deepdeep_mvl/mxv + .byte 27*mus_underwater_mvl/mxv .byte W04 - .byte 25*bgm_deepdeep_mvl/mxv + .byte 25*mus_underwater_mvl/mxv .byte W04 - .byte 23*bgm_deepdeep_mvl/mxv + .byte 23*mus_underwater_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 21*bgm_deepdeep_mvl/mxv + .byte VOL , 21*mus_underwater_mvl/mxv .byte W24 .byte EOT , Dn4 .byte MOD , 0 - .byte VOL , 38*bgm_deepdeep_mvl/mxv + .byte VOL , 38*mus_underwater_mvl/mxv .byte N02 , Cn4 , v064 .byte W02 .byte Bn3 @@ -2269,20 +2269,20 @@ bgm_deepdeep_6_000: .byte W02 .byte Gs2 .byte W02 - .byte VOL , 47*bgm_deepdeep_mvl/mxv + .byte VOL , 47*mus_underwater_mvl/mxv .byte W96 .byte W96 .byte GOTO - .word bgm_deepdeep_6_B1 + .word mus_underwater_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_deepdeep_7: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_7: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 80 .byte PAN , c_v+0 - .byte VOL , 37*bgm_deepdeep_mvl/mxv + .byte VOL , 37*mus_underwater_mvl/mxv .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte LFOS , 44 @@ -2446,7 +2446,7 @@ bgm_deepdeep_7: .byte W96 .byte W96 .byte W96 -bgm_deepdeep_7_B1: +mus_underwater_7_B1: .byte BEND , c_v+2 .byte N04 , Ds1 , v112 .byte W04 @@ -2618,7 +2618,7 @@ bgm_deepdeep_7_B1: .byte W68 .byte N04 , Gn2 , v124 .byte W04 -bgm_deepdeep_7_000: +mus_underwater_7_000: .byte N12 , Fn1 , v124 .byte W12 .byte N08 , Fn1 , v036 @@ -2630,7 +2630,7 @@ bgm_deepdeep_7_000: .byte N04 , Gn2 , v124 .byte W04 .byte PEND -bgm_deepdeep_7_001: +mus_underwater_7_001: .byte N12 , Gn1 , v124 .byte W12 .byte N08 , Gn1 , v036 @@ -2642,7 +2642,7 @@ bgm_deepdeep_7_001: .byte N04 , Gn2 , v124 .byte W04 .byte PEND -bgm_deepdeep_7_002: +mus_underwater_7_002: .byte N12 , Fn1 , v124 .byte W12 .byte N08 , Fn1 , v036 @@ -2652,7 +2652,7 @@ bgm_deepdeep_7_002: .byte N08 , Fn1 , v036 .byte W72 .byte PEND - .byte VOL , 35*bgm_deepdeep_mvl/mxv + .byte VOL , 35*mus_underwater_mvl/mxv .byte N04 , Ds1 , v124 .byte W08 .byte Dn1 @@ -2735,7 +2735,7 @@ bgm_deepdeep_7_002: .byte W08 .byte Gs1 .byte W04 -bgm_deepdeep_7_003: +mus_underwater_7_003: .byte N04 , Gn1 , v124 .byte W08 .byte Fs1 @@ -2850,32 +2850,32 @@ bgm_deepdeep_7_003: .byte Gs1 .byte W04 .byte PATT - .word bgm_deepdeep_7_003 + .word mus_underwater_7_003 .byte PATT - .word bgm_deepdeep_7_001 + .word mus_underwater_7_001 .byte PATT - .word bgm_deepdeep_7_000 + .word mus_underwater_7_000 .byte PATT - .word bgm_deepdeep_7_001 + .word mus_underwater_7_001 .byte PATT - .word bgm_deepdeep_7_002 + .word mus_underwater_7_002 .byte W96 .byte W96 .byte GOTO - .word bgm_deepdeep_7_B1 + .word mus_underwater_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_deepdeep_8: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_8: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 92 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte LFOS , 44 .byte PAN , c_v-63 .byte BENDR , 12 - .byte VOL , 5*bgm_deepdeep_mvl/mxv + .byte VOL , 5*mus_underwater_mvl/mxv .byte N04 , Gn6 , v080 .byte W08 .byte Gn6 , v052 @@ -2883,7 +2883,7 @@ bgm_deepdeep_8: .byte N12 , Gn7 , v084 .byte W12 .byte PAN , c_v+63 - .byte VOL , 8*bgm_deepdeep_mvl/mxv + .byte VOL , 8*mus_underwater_mvl/mxv .byte N04 , Gn6 , v080 .byte W04 .byte Gn6 , v044 @@ -2893,7 +2893,7 @@ bgm_deepdeep_8: .byte N12 , Gn7 , v084 .byte W12 .byte PAN , c_v-63 - .byte VOL , 11*bgm_deepdeep_mvl/mxv + .byte VOL , 11*mus_underwater_mvl/mxv .byte N04 , Gn6 , v080 .byte W08 .byte Gn6 , v052 @@ -2901,7 +2901,7 @@ bgm_deepdeep_8: .byte N12 , Gn7 , v084 .byte W12 .byte PAN , c_v+63 - .byte VOL , 15*bgm_deepdeep_mvl/mxv + .byte VOL , 15*mus_underwater_mvl/mxv .byte N04 , Gn6 , v080 .byte W08 .byte Gn6 , v052 @@ -2911,7 +2911,7 @@ bgm_deepdeep_8: .byte N04 , Gn7 , v052 .byte W04 .byte PAN , c_v-63 - .byte VOL , 18*bgm_deepdeep_mvl/mxv + .byte VOL , 18*mus_underwater_mvl/mxv .byte N04 , Gn6 , v080 .byte W04 .byte Gn6 , v048 @@ -3036,7 +3036,7 @@ bgm_deepdeep_8: .byte W12 .byte VOICE , 82 .byte PAN , c_v+0 - .byte VOL , 71*bgm_deepdeep_mvl/mxv + .byte VOL , 71*mus_underwater_mvl/mxv .byte W12 .byte N04 , Fs4 , v048 .byte W04 @@ -3129,7 +3129,7 @@ bgm_deepdeep_8: .byte W02 .byte Bn3 .byte W02 -bgm_deepdeep_8_B1: +mus_underwater_8_B1: .byte BEND , c_v+0 .byte W96 .byte W96 @@ -3449,16 +3449,16 @@ bgm_deepdeep_8_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_deepdeep_8_B1 + .word mus_underwater_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_deepdeep_9: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_9: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 94*bgm_deepdeep_mvl/mxv + .byte VOL , 94*mus_underwater_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -3516,8 +3516,8 @@ bgm_deepdeep_9: .byte W04 .byte En1 .byte W04 -bgm_deepdeep_9_B1: -bgm_deepdeep_9_000: +mus_underwater_9_B1: +mus_underwater_9_000: .byte N04 , Cn1 , v127 .byte W08 .byte Cn1 , v096 @@ -3557,7 +3557,7 @@ bgm_deepdeep_9_000: .byte Cn1 , v096 .byte W04 .byte PEND -bgm_deepdeep_9_001: +mus_underwater_9_001: .byte N04 , Cn1 , v127 .byte W08 .byte Cn1 , v096 @@ -3598,23 +3598,23 @@ bgm_deepdeep_9_001: .byte W04 .byte PEND .byte PATT - .word bgm_deepdeep_9_000 + .word mus_underwater_9_000 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte PATT - .word bgm_deepdeep_9_000 + .word mus_underwater_9_000 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte PATT - .word bgm_deepdeep_9_000 + .word mus_underwater_9_000 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte PATT - .word bgm_deepdeep_9_000 + .word mus_underwater_9_000 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte PATT - .word bgm_deepdeep_9_000 + .word mus_underwater_9_000 .byte N04 , Cn1 , v124 .byte W08 .byte Cn1 , v096 @@ -3692,19 +3692,19 @@ bgm_deepdeep_9_001: .byte Cn1 , v096 .byte W04 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte PATT - .word bgm_deepdeep_9_000 + .word mus_underwater_9_000 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte PATT - .word bgm_deepdeep_9_000 + .word mus_underwater_9_000 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte PATT - .word bgm_deepdeep_9_000 + .word mus_underwater_9_000 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte N04 , Cn1 , v127 .byte W08 .byte Cn1 , v096 @@ -3742,17 +3742,17 @@ bgm_deepdeep_9_001: .byte Cn1 , v096 .byte W04 .byte PATT - .word bgm_deepdeep_9_001 + .word mus_underwater_9_001 .byte GOTO - .word bgm_deepdeep_9_B1 + .word mus_underwater_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_deepdeep_10: - .byte KEYSH , bgm_deepdeep_key+0 +mus_underwater_10: + .byte KEYSH , mus_underwater_key+0 .byte VOICE , 127 - .byte VOL , 47*bgm_deepdeep_mvl/mxv + .byte VOL , 47*mus_underwater_mvl/mxv .byte PAN , c_v+0 .byte XCMD , xIECV , 18 .byte xIECV , 16 @@ -3784,8 +3784,8 @@ bgm_deepdeep_10: .byte W04 .byte N03 .byte W04 -bgm_deepdeep_10_B1: -bgm_deepdeep_10_000: +mus_underwater_10_B1: +mus_underwater_10_000: .byte N03 , Fn4 , v112 .byte W08 .byte Fn4 , v064 @@ -3817,7 +3817,7 @@ bgm_deepdeep_10_000: .byte Fn4 , v064 .byte W04 .byte PEND -bgm_deepdeep_10_001: +mus_underwater_10_001: .byte N03 , Fn4 , v112 .byte W08 .byte Fn4 , v064 @@ -3844,43 +3844,43 @@ bgm_deepdeep_10_001: .byte W04 .byte PEND .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte PATT - .word bgm_deepdeep_10_001 + .word mus_underwater_10_001 .byte PATT - .word bgm_deepdeep_10_000 + .word mus_underwater_10_000 .byte N03 , Fn4 , v112 .byte W08 .byte Fn4 , v064 @@ -3904,29 +3904,29 @@ bgm_deepdeep_10_001: .byte Fn4 , v112 .byte W24 .byte GOTO - .word bgm_deepdeep_10_B1 + .word mus_underwater_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_deepdeep: +mus_underwater: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_deepdeep_pri @ Priority - .byte bgm_deepdeep_rev @ Reverb. + .byte mus_underwater_pri @ Priority + .byte mus_underwater_rev @ Reverb. - .word bgm_deepdeep_grp + .word mus_underwater_grp - .word bgm_deepdeep_1 - .word bgm_deepdeep_2 - .word bgm_deepdeep_3 - .word bgm_deepdeep_4 - .word bgm_deepdeep_5 - .word bgm_deepdeep_6 - .word bgm_deepdeep_7 - .word bgm_deepdeep_8 - .word bgm_deepdeep_9 - .word bgm_deepdeep_10 + .word mus_underwater_1 + .word mus_underwater_2 + .word mus_underwater_3 + .word mus_underwater_4 + .word mus_underwater_5 + .word mus_underwater_6 + .word mus_underwater_7 + .word mus_underwater_8 + .word mus_underwater_9 + .word mus_underwater_10 .end diff --git a/sound/songs/bgm_gomachi0.s b/sound/songs/mus_verdanturf.s index a5ebcfa25..4c9958628 100644 --- a/sound/songs/bgm_gomachi0.s +++ b/sound/songs/mus_verdanturf.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_gomachi0_grp, voicegroup041 - .equ bgm_gomachi0_pri, 0 - .equ bgm_gomachi0_rev, reverb_set+50 - .equ bgm_gomachi0_mvl, 127 - .equ bgm_gomachi0_key, 0 - .equ bgm_gomachi0_tbs, 1 - .equ bgm_gomachi0_exg, 0 - .equ bgm_gomachi0_cmp, 1 + .equ mus_verdanturf_grp, voicegroup041 + .equ mus_verdanturf_pri, 0 + .equ mus_verdanturf_rev, reverb_set+50 + .equ mus_verdanturf_mvl, 127 + .equ mus_verdanturf_key, 0 + .equ mus_verdanturf_tbs, 1 + .equ mus_verdanturf_exg, 0 + .equ mus_verdanturf_cmp, 1 .section .rodata - .global bgm_gomachi0 + .global mus_verdanturf .align 2 @********************** Track 1 **********************@ -bgm_gomachi0_1: - .byte KEYSH , bgm_gomachi0_key+0 - .byte TEMPO , 84*bgm_gomachi0_tbs/2 +mus_verdanturf_1: + .byte KEYSH , mus_verdanturf_key+0 + .byte TEMPO , 84*mus_verdanturf_tbs/2 .byte VOICE , 0 - .byte VOL , 88*bgm_gomachi0_mvl/mxv + .byte VOL , 88*mus_verdanturf_mvl/mxv .byte PAN , c_v+16 .byte N06 , An3 , v080 .byte W06 @@ -27,7 +27,7 @@ bgm_gomachi0_1: .byte W06 .byte En4 , v104 .byte W06 -bgm_gomachi0_1_B1: +mus_verdanturf_1_B1: .byte N36 , Fs4 , v116 .byte W36 .byte N12 , Gn4 , v088 @@ -106,107 +106,107 @@ bgm_gomachi0_1_B1: .byte En4 .byte W06 .byte GOTO - .word bgm_gomachi0_1_B1 + .word mus_verdanturf_1_B1 .byte W96 .byte FINE @********************** Track 2 **********************@ -bgm_gomachi0_2: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_2: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 48 - .byte VOL , 90*bgm_gomachi0_mvl/mxv + .byte VOL , 90*mus_verdanturf_mvl/mxv .byte PAN , c_v+32 .byte W18 -bgm_gomachi0_2_B1: +mus_verdanturf_2_B1: .byte PAN , c_v+32 .byte W96 .byte W96 .byte W96 .byte W48 - .byte VOL , 27*bgm_gomachi0_mvl/mxv + .byte VOL , 27*mus_verdanturf_mvl/mxv .byte N36 , En3 , v060 .byte W02 - .byte VOL , 36*bgm_gomachi0_mvl/mxv + .byte VOL , 36*mus_verdanturf_mvl/mxv .byte W04 - .byte 41*bgm_gomachi0_mvl/mxv + .byte 41*mus_verdanturf_mvl/mxv .byte W02 - .byte 52*bgm_gomachi0_mvl/mxv + .byte 52*mus_verdanturf_mvl/mxv .byte W03 - .byte 58*bgm_gomachi0_mvl/mxv + .byte 58*mus_verdanturf_mvl/mxv .byte W03 - .byte 64*bgm_gomachi0_mvl/mxv + .byte 64*mus_verdanturf_mvl/mxv .byte W04 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte W02 - .byte 74*bgm_gomachi0_mvl/mxv + .byte 74*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 89*bgm_gomachi0_mvl/mxv + .byte 89*mus_verdanturf_mvl/mxv .byte W01 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W03 - .byte 59*bgm_gomachi0_mvl/mxv + .byte 59*mus_verdanturf_mvl/mxv .byte W06 .byte N06 , An2 .byte W03 - .byte VOL , 68*bgm_gomachi0_mvl/mxv + .byte VOL , 68*mus_verdanturf_mvl/mxv .byte W03 .byte N06 , Cs3 .byte W06 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 , Dn3 , v064 .byte W02 - .byte VOL , 48*bgm_gomachi0_mvl/mxv + .byte VOL , 48*mus_verdanturf_mvl/mxv .byte W04 - .byte 51*bgm_gomachi0_mvl/mxv + .byte 51*mus_verdanturf_mvl/mxv .byte W02 - .byte 52*bgm_gomachi0_mvl/mxv + .byte 52*mus_verdanturf_mvl/mxv .byte W03 - .byte 56*bgm_gomachi0_mvl/mxv + .byte 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 62*bgm_gomachi0_mvl/mxv + .byte 62*mus_verdanturf_mvl/mxv .byte W04 - .byte 64*bgm_gomachi0_mvl/mxv + .byte 64*mus_verdanturf_mvl/mxv .byte W02 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W04 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte W12 .byte N12 , An2 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 , En3 .byte W02 - .byte VOL , 48*bgm_gomachi0_mvl/mxv + .byte VOL , 48*mus_verdanturf_mvl/mxv .byte W04 - .byte 51*bgm_gomachi0_mvl/mxv + .byte 51*mus_verdanturf_mvl/mxv .byte W02 - .byte 52*bgm_gomachi0_mvl/mxv + .byte 52*mus_verdanturf_mvl/mxv .byte W03 - .byte 56*bgm_gomachi0_mvl/mxv + .byte 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 62*bgm_gomachi0_mvl/mxv + .byte 62*mus_verdanturf_mvl/mxv .byte W04 - .byte 64*bgm_gomachi0_mvl/mxv + .byte 64*mus_verdanturf_mvl/mxv .byte W02 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W04 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte W12 .byte N12 , Gn3 .byte W12 - .byte VOL , 52*bgm_gomachi0_mvl/mxv + .byte VOL , 52*mus_verdanturf_mvl/mxv .byte N24 , Fs3 .byte W02 - .byte VOL , 55*bgm_gomachi0_mvl/mxv + .byte VOL , 55*mus_verdanturf_mvl/mxv .byte W04 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W02 - .byte 66*bgm_gomachi0_mvl/mxv + .byte 66*mus_verdanturf_mvl/mxv .byte W03 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte W13 .byte N06 , An3 .byte W06 @@ -216,23 +216,23 @@ bgm_gomachi0_2_B1: .byte W03 .byte N36 , Dn3 .byte W12 - .byte VOL , 65*bgm_gomachi0_mvl/mxv + .byte VOL , 65*mus_verdanturf_mvl/mxv .byte W02 - .byte 59*bgm_gomachi0_mvl/mxv + .byte 59*mus_verdanturf_mvl/mxv .byte W04 - .byte 56*bgm_gomachi0_mvl/mxv + .byte 56*mus_verdanturf_mvl/mxv .byte W02 - .byte 53*bgm_gomachi0_mvl/mxv + .byte 53*mus_verdanturf_mvl/mxv .byte W03 - .byte 50*bgm_gomachi0_mvl/mxv + .byte 50*mus_verdanturf_mvl/mxv .byte W03 - .byte 48*bgm_gomachi0_mvl/mxv + .byte 48*mus_verdanturf_mvl/mxv .byte W04 - .byte 44*bgm_gomachi0_mvl/mxv + .byte 44*mus_verdanturf_mvl/mxv .byte W02 - .byte 39*bgm_gomachi0_mvl/mxv + .byte 39*mus_verdanturf_mvl/mxv .byte W04 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte N06 , Bn3 .byte W06 .byte An3 @@ -241,48 +241,48 @@ bgm_gomachi0_2_B1: .byte W06 .byte Fs3 .byte W06 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 , Gn3 .byte W02 - .byte VOL , 48*bgm_gomachi0_mvl/mxv + .byte VOL , 48*mus_verdanturf_mvl/mxv .byte W04 - .byte 51*bgm_gomachi0_mvl/mxv + .byte 51*mus_verdanturf_mvl/mxv .byte W02 - .byte 52*bgm_gomachi0_mvl/mxv + .byte 52*mus_verdanturf_mvl/mxv .byte W03 - .byte 56*bgm_gomachi0_mvl/mxv + .byte 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 62*bgm_gomachi0_mvl/mxv + .byte 62*mus_verdanturf_mvl/mxv .byte W04 - .byte 64*bgm_gomachi0_mvl/mxv + .byte 64*mus_verdanturf_mvl/mxv .byte W02 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W04 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte W12 .byte N12 , Dn3 .byte W12 - .byte VOL , 52*bgm_gomachi0_mvl/mxv + .byte VOL , 52*mus_verdanturf_mvl/mxv .byte N24 , Cs3 .byte W02 - .byte VOL , 55*bgm_gomachi0_mvl/mxv + .byte VOL , 55*mus_verdanturf_mvl/mxv .byte W04 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W02 - .byte 66*bgm_gomachi0_mvl/mxv + .byte 66*mus_verdanturf_mvl/mxv .byte W03 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte W13 - .byte 52*bgm_gomachi0_mvl/mxv + .byte 52*mus_verdanturf_mvl/mxv .byte N24 , Bn3 .byte W02 - .byte VOL , 55*bgm_gomachi0_mvl/mxv + .byte VOL , 55*mus_verdanturf_mvl/mxv .byte W04 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W02 - .byte 66*bgm_gomachi0_mvl/mxv + .byte 66*mus_verdanturf_mvl/mxv .byte W03 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte W13 .byte N12 , Cs4 .byte W12 @@ -309,106 +309,106 @@ bgm_gomachi0_2_B1: .byte W06 .byte An4 .byte W06 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N36 , Bn4 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W12 - .byte 85*bgm_gomachi0_mvl/mxv + .byte 85*mus_verdanturf_mvl/mxv .byte W03 - .byte 82*bgm_gomachi0_mvl/mxv + .byte 82*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte N12 , Fs4 .byte W12 .byte N24 , En4 .byte W12 - .byte VOL , 87*bgm_gomachi0_mvl/mxv + .byte VOL , 87*mus_verdanturf_mvl/mxv .byte W03 - .byte 85*bgm_gomachi0_mvl/mxv + .byte 85*mus_verdanturf_mvl/mxv .byte W03 - .byte 83*bgm_gomachi0_mvl/mxv + .byte 83*mus_verdanturf_mvl/mxv .byte W03 - .byte 80*bgm_gomachi0_mvl/mxv + .byte 80*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte N12 , Fs4 .byte W12 .byte Gn4 .byte W12 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N36 , An4 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W12 - .byte 87*bgm_gomachi0_mvl/mxv + .byte 87*mus_verdanturf_mvl/mxv .byte W03 - .byte 86*bgm_gomachi0_mvl/mxv + .byte 86*mus_verdanturf_mvl/mxv .byte W03 - .byte 83*bgm_gomachi0_mvl/mxv + .byte 83*mus_verdanturf_mvl/mxv .byte W03 - .byte 82*bgm_gomachi0_mvl/mxv + .byte 82*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte N12 , Fs4 .byte W12 .byte N24 , Dn4 .byte W12 - .byte VOL , 87*bgm_gomachi0_mvl/mxv + .byte VOL , 87*mus_verdanturf_mvl/mxv .byte W03 - .byte 85*bgm_gomachi0_mvl/mxv + .byte 85*mus_verdanturf_mvl/mxv .byte W03 - .byte 83*bgm_gomachi0_mvl/mxv + .byte 83*mus_verdanturf_mvl/mxv .byte W03 - .byte 80*bgm_gomachi0_mvl/mxv + .byte 80*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte N12 , En4 .byte W12 .byte Fs4 .byte W12 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N48 , Gn4 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W15 - .byte 87*bgm_gomachi0_mvl/mxv + .byte 87*mus_verdanturf_mvl/mxv .byte W03 - .byte 85*bgm_gomachi0_mvl/mxv + .byte 85*mus_verdanturf_mvl/mxv .byte W03 - .byte 82*bgm_gomachi0_mvl/mxv + .byte 82*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 76*bgm_gomachi0_mvl/mxv + .byte 76*mus_verdanturf_mvl/mxv .byte W03 - .byte 75*bgm_gomachi0_mvl/mxv + .byte 75*mus_verdanturf_mvl/mxv .byte W03 - .byte 74*bgm_gomachi0_mvl/mxv + .byte 74*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte N12 , An4 .byte W12 .byte N02 , Gn4 @@ -421,38 +421,38 @@ bgm_gomachi0_2_B1: .byte W12 .byte En4 .byte W12 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N36 , Gn4 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W12 - .byte 87*bgm_gomachi0_mvl/mxv + .byte 87*mus_verdanturf_mvl/mxv .byte W03 - .byte 85*bgm_gomachi0_mvl/mxv + .byte 85*mus_verdanturf_mvl/mxv .byte W03 - .byte 83*bgm_gomachi0_mvl/mxv + .byte 83*mus_verdanturf_mvl/mxv .byte W03 - .byte 81*bgm_gomachi0_mvl/mxv + .byte 81*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte N12 , An4 .byte W12 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N24 , Fs4 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W18 .byte N06 .byte W06 @@ -460,26 +460,26 @@ bgm_gomachi0_2_B1: .byte W06 .byte An4 .byte W06 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N36 , Bn4 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W12 - .byte 87*bgm_gomachi0_mvl/mxv + .byte 87*mus_verdanturf_mvl/mxv .byte W03 - .byte 85*bgm_gomachi0_mvl/mxv + .byte 85*mus_verdanturf_mvl/mxv .byte W03 - .byte 82*bgm_gomachi0_mvl/mxv + .byte 82*mus_verdanturf_mvl/mxv .byte W03 - .byte 80*bgm_gomachi0_mvl/mxv + .byte 80*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W06 .byte N06 .byte W06 @@ -491,27 +491,27 @@ bgm_gomachi0_2_B1: .byte W12 .byte N06 , Cs5 .byte W06 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N42 , An4 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W21 - .byte 87*bgm_gomachi0_mvl/mxv + .byte 87*mus_verdanturf_mvl/mxv .byte W03 - .byte 84*bgm_gomachi0_mvl/mxv + .byte 84*mus_verdanturf_mvl/mxv .byte W03 - .byte 82*bgm_gomachi0_mvl/mxv + .byte 82*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte N12 , Fs4 .byte W12 - .byte VOL , 90*bgm_gomachi0_mvl/mxv + .byte VOL , 90*mus_verdanturf_mvl/mxv .byte N12 , Bn4 .byte W12 .byte N02 , An4 @@ -528,26 +528,26 @@ bgm_gomachi0_2_B1: .byte W18 .byte N06 , Gn4 .byte W18 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N36 , Dn4 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W12 - .byte 86*bgm_gomachi0_mvl/mxv + .byte 86*mus_verdanturf_mvl/mxv .byte W03 - .byte 83*bgm_gomachi0_mvl/mxv + .byte 83*mus_verdanturf_mvl/mxv .byte W03 - .byte 82*bgm_gomachi0_mvl/mxv + .byte 82*mus_verdanturf_mvl/mxv .byte W03 - .byte 80*bgm_gomachi0_mvl/mxv + .byte 80*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte N12 , Bn3 .byte W12 .byte Dn4 @@ -556,47 +556,47 @@ bgm_gomachi0_2_B1: .byte W18 .byte N06 , Gn4 .byte W18 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte N36 .byte W03 - .byte VOL , 67*bgm_gomachi0_mvl/mxv + .byte VOL , 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W03 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W09 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W02 - .byte 86*bgm_gomachi0_mvl/mxv + .byte 86*mus_verdanturf_mvl/mxv .byte W03 - .byte 84*bgm_gomachi0_mvl/mxv + .byte 84*mus_verdanturf_mvl/mxv .byte W04 - .byte 78*bgm_gomachi0_mvl/mxv + .byte 78*mus_verdanturf_mvl/mxv .byte W02 - .byte 75*bgm_gomachi0_mvl/mxv + .byte 75*mus_verdanturf_mvl/mxv .byte W04 - .byte 68*bgm_gomachi0_mvl/mxv + .byte 68*mus_verdanturf_mvl/mxv .byte W09 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W15 .byte GOTO - .word bgm_gomachi0_2_B1 + .word mus_verdanturf_2_B1 .byte W96 .byte FINE @********************** Track 3 **********************@ -bgm_gomachi0_3: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_3: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 73 - .byte VOL , 90*bgm_gomachi0_mvl/mxv + .byte VOL , 90*mus_verdanturf_mvl/mxv .byte LFOS , 44 .byte PAN , c_v+0 .byte W18 -bgm_gomachi0_3_B1: - .byte VOL , 90*bgm_gomachi0_mvl/mxv +mus_verdanturf_3_B1: + .byte VOL , 90*mus_verdanturf_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -604,7 +604,7 @@ bgm_gomachi0_3_B1: .byte W01 .byte N03 , Ds5 , v076 .byte W03 - .byte VOL , 79*bgm_gomachi0_mvl/mxv + .byte VOL , 79*mus_verdanturf_mvl/mxv .byte N06 , Dn5 , v096 .byte W06 .byte Cs5 @@ -613,58 +613,58 @@ bgm_gomachi0_3_B1: .byte W06 .byte En5 , v092 .byte W06 - .byte VOL , 44*bgm_gomachi0_mvl/mxv + .byte VOL , 44*mus_verdanturf_mvl/mxv .byte N03 , Fn5 , v060 .byte W02 - .byte VOL , 48*bgm_gomachi0_mvl/mxv + .byte VOL , 48*mus_verdanturf_mvl/mxv .byte W01 .byte N32 , Fs5 , v096 .byte W03 - .byte VOL , 49*bgm_gomachi0_mvl/mxv + .byte VOL , 49*mus_verdanturf_mvl/mxv .byte W02 - .byte 53*bgm_gomachi0_mvl/mxv + .byte 53*mus_verdanturf_mvl/mxv .byte W03 - .byte 58*bgm_gomachi0_mvl/mxv + .byte 58*mus_verdanturf_mvl/mxv .byte W01 .byte MOD , 6 .byte W02 - .byte VOL , 65*bgm_gomachi0_mvl/mxv + .byte VOL , 65*mus_verdanturf_mvl/mxv .byte W04 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W02 - .byte 84*bgm_gomachi0_mvl/mxv + .byte 84*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W01 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W12 .byte MOD , 0 .byte N09 , Gn5 .byte W09 .byte N03 , Fs5 , v100 .byte W03 - .byte VOL , 44*bgm_gomachi0_mvl/mxv + .byte VOL , 44*mus_verdanturf_mvl/mxv .byte N36 , En5 , v108 .byte W02 - .byte VOL , 48*bgm_gomachi0_mvl/mxv + .byte VOL , 48*mus_verdanturf_mvl/mxv .byte W04 - .byte 49*bgm_gomachi0_mvl/mxv + .byte 49*mus_verdanturf_mvl/mxv .byte W02 - .byte 53*bgm_gomachi0_mvl/mxv + .byte 53*mus_verdanturf_mvl/mxv .byte W03 - .byte 58*bgm_gomachi0_mvl/mxv + .byte 58*mus_verdanturf_mvl/mxv .byte W01 .byte MOD , 6 .byte W02 - .byte VOL , 65*bgm_gomachi0_mvl/mxv + .byte VOL , 65*mus_verdanturf_mvl/mxv .byte W04 - .byte 73*bgm_gomachi0_mvl/mxv + .byte 73*mus_verdanturf_mvl/mxv .byte W02 - .byte 84*bgm_gomachi0_mvl/mxv + .byte 84*mus_verdanturf_mvl/mxv .byte W03 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W01 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W12 .byte MOD , 0 .byte N09 , Fs5 , v096 @@ -704,56 +704,56 @@ bgm_gomachi0_3_B1: .byte W06 .byte Dn5 , v092 .byte W06 - .byte VOL , 77*bgm_gomachi0_mvl/mxv + .byte VOL , 77*mus_verdanturf_mvl/mxv .byte N15 , Bn5 , v064 .byte W02 - .byte VOL , 82*bgm_gomachi0_mvl/mxv + .byte VOL , 82*mus_verdanturf_mvl/mxv .byte W04 .byte MOD , 7 - .byte VOL , 85*bgm_gomachi0_mvl/mxv + .byte VOL , 85*mus_verdanturf_mvl/mxv .byte W02 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W07 .byte N03 , Ds5 , v092 .byte W03 .byte MOD , 0 - .byte VOL , 84*bgm_gomachi0_mvl/mxv + .byte VOL , 84*mus_verdanturf_mvl/mxv .byte N54 , Dn5 , v096 .byte W03 - .byte VOL , 80*bgm_gomachi0_mvl/mxv + .byte VOL , 80*mus_verdanturf_mvl/mxv .byte W02 - .byte 43*bgm_gomachi0_mvl/mxv + .byte 43*mus_verdanturf_mvl/mxv .byte W01 - .byte 72*bgm_gomachi0_mvl/mxv + .byte 72*mus_verdanturf_mvl/mxv .byte W02 - .byte 44*bgm_gomachi0_mvl/mxv + .byte 44*mus_verdanturf_mvl/mxv .byte W01 .byte MOD , 7 - .byte VOL , 60*bgm_gomachi0_mvl/mxv + .byte VOL , 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 58*bgm_gomachi0_mvl/mxv + .byte 58*mus_verdanturf_mvl/mxv .byte W02 - .byte 56*bgm_gomachi0_mvl/mxv + .byte 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 55*bgm_gomachi0_mvl/mxv + .byte 55*mus_verdanturf_mvl/mxv .byte W09 - .byte 53*bgm_gomachi0_mvl/mxv + .byte 53*mus_verdanturf_mvl/mxv .byte W03 - .byte 55*bgm_gomachi0_mvl/mxv + .byte 55*mus_verdanturf_mvl/mxv .byte W07 - .byte 56*bgm_gomachi0_mvl/mxv + .byte 56*mus_verdanturf_mvl/mxv .byte W02 - .byte 58*bgm_gomachi0_mvl/mxv + .byte 58*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 72*bgm_gomachi0_mvl/mxv + .byte 72*mus_verdanturf_mvl/mxv .byte W04 - .byte 75*bgm_gomachi0_mvl/mxv + .byte 75*mus_verdanturf_mvl/mxv .byte W02 - .byte 76*bgm_gomachi0_mvl/mxv + .byte 76*mus_verdanturf_mvl/mxv .byte W01 - .byte 80*bgm_gomachi0_mvl/mxv + .byte 80*mus_verdanturf_mvl/mxv .byte W03 .byte MOD , 0 .byte W12 @@ -775,22 +775,22 @@ bgm_gomachi0_3_B1: .byte W12 .byte Dn5 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N24 , En5 , v104 .byte W02 - .byte VOL , 55*bgm_gomachi0_mvl/mxv + .byte VOL , 55*mus_verdanturf_mvl/mxv .byte W04 - .byte 58*bgm_gomachi0_mvl/mxv + .byte 58*mus_verdanturf_mvl/mxv .byte W02 - .byte 65*bgm_gomachi0_mvl/mxv + .byte 65*mus_verdanturf_mvl/mxv .byte W03 - .byte 71*bgm_gomachi0_mvl/mxv + .byte 71*mus_verdanturf_mvl/mxv .byte W01 .byte MOD , 6 .byte W02 - .byte VOL , 79*bgm_gomachi0_mvl/mxv + .byte VOL , 79*mus_verdanturf_mvl/mxv .byte W04 - .byte 90*bgm_gomachi0_mvl/mxv + .byte 90*mus_verdanturf_mvl/mxv .byte W06 .byte MOD , 0 .byte W96 @@ -802,20 +802,20 @@ bgm_gomachi0_3_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_gomachi0_3_B1 + .word mus_verdanturf_3_B1 .byte W96 .byte FINE @********************** Track 4 **********************@ -bgm_gomachi0_4: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_4: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 35 - .byte VOL , 90*bgm_gomachi0_mvl/mxv + .byte VOL , 90*mus_verdanturf_mvl/mxv .byte PAN , c_v+0 .byte W18 -bgm_gomachi0_4_B1: - .byte VOL , 90*bgm_gomachi0_mvl/mxv +mus_verdanturf_4_B1: + .byte VOL , 90*mus_verdanturf_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -828,7 +828,7 @@ bgm_gomachi0_4_B1: .byte W06 .byte Fs1 .byte W06 -bgm_gomachi0_4_000: +mus_verdanturf_4_000: .byte N12 , Gn1 , v127 .byte W36 .byte N06 , Dn1 @@ -883,7 +883,7 @@ bgm_gomachi0_4_000: .byte N12 , Fs1 .byte W12 .byte PATT - .word bgm_gomachi0_4_000 + .word mus_verdanturf_4_000 .byte N12 , Fs1 , v127 .byte W36 .byte N06 , Cs1 @@ -918,41 +918,41 @@ bgm_gomachi0_4_000: .byte W18 .byte N36 , En2 , v104 .byte W12 - .byte VOL , 86*bgm_gomachi0_mvl/mxv + .byte VOL , 86*mus_verdanturf_mvl/mxv .byte W02 - .byte 79*bgm_gomachi0_mvl/mxv + .byte 79*mus_verdanturf_mvl/mxv .byte W04 - .byte 74*bgm_gomachi0_mvl/mxv + .byte 74*mus_verdanturf_mvl/mxv .byte W02 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W03 - .byte 62*bgm_gomachi0_mvl/mxv + .byte 62*mus_verdanturf_mvl/mxv .byte W03 - .byte 55*bgm_gomachi0_mvl/mxv + .byte 55*mus_verdanturf_mvl/mxv .byte W04 - .byte 51*bgm_gomachi0_mvl/mxv + .byte 51*mus_verdanturf_mvl/mxv .byte W02 - .byte 44*bgm_gomachi0_mvl/mxv + .byte 44*mus_verdanturf_mvl/mxv .byte W04 - .byte 32*bgm_gomachi0_mvl/mxv + .byte 32*mus_verdanturf_mvl/mxv .byte W24 .byte GOTO - .word bgm_gomachi0_4_B1 + .word mus_verdanturf_4_B1 .byte W96 .byte FINE @********************** Track 5 **********************@ -bgm_gomachi0_5: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_5: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 0 .byte PAN , c_v+32 - .byte VOL , 52*bgm_gomachi0_mvl/mxv + .byte VOL , 52*mus_verdanturf_mvl/mxv .byte W18 -bgm_gomachi0_5_B1: +mus_verdanturf_5_B1: .byte VOICE , 0 .byte PAN , c_v+32 - .byte VOL , 52*bgm_gomachi0_mvl/mxv + .byte VOL , 52*mus_verdanturf_mvl/mxv .byte W12 .byte N12 , Dn2 , v016 .byte W12 @@ -1008,7 +1008,7 @@ bgm_gomachi0_5_B1: .byte W12 .byte En2 .byte W60 - .byte VOL , 70*bgm_gomachi0_mvl/mxv + .byte VOL , 70*mus_verdanturf_mvl/mxv .byte PAN , c_v-22 .byte N12 , An1 .byte W12 @@ -1093,19 +1093,19 @@ bgm_gomachi0_5_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_gomachi0_5_B1 + .word mus_verdanturf_5_B1 .byte W96 .byte FINE @********************** Track 6 **********************@ -bgm_gomachi0_6: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_6: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 0 .byte PAN , c_v-17 - .byte VOL , 82*bgm_gomachi0_mvl/mxv + .byte VOL , 82*mus_verdanturf_mvl/mxv .byte W18 -bgm_gomachi0_6_B1: +mus_verdanturf_6_B1: .byte N12 , Dn2 , v076 .byte W12 .byte An2 , v052 @@ -1243,28 +1243,28 @@ bgm_gomachi0_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_gomachi0_6_B1 + .word mus_verdanturf_6_B1 .byte W96 .byte FINE @********************** Track 7 **********************@ -bgm_gomachi0_7: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_7: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 0 - .byte VOL , 68*bgm_gomachi0_mvl/mxv + .byte VOL , 68*mus_verdanturf_mvl/mxv .byte PAN , c_v-6 .byte XCMD , xIECV , 12 .byte xIECL , 10 .byte W18 -bgm_gomachi0_7_B1: - .byte VOL , 0*bgm_gomachi0_mvl/mxv +mus_verdanturf_7_B1: + .byte VOL , 0*mus_verdanturf_mvl/mxv .byte PAN , c_v-16 .byte W96 .byte W96 .byte W96 .byte VOICE , 0 - .byte VOL , 68*bgm_gomachi0_mvl/mxv + .byte VOL , 68*mus_verdanturf_mvl/mxv .byte W36 .byte N12 , Gn3 , v088 .byte W12 @@ -1281,9 +1281,9 @@ bgm_gomachi0_7_B1: .byte W96 .byte VOICE , 5 .byte PAN , c_v-64 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte W96 -bgm_gomachi0_7_000: +mus_verdanturf_7_000: .byte N12 , Bn4 , v112 .byte W12 .byte Gn3 @@ -1299,7 +1299,7 @@ bgm_gomachi0_7_000: .byte Cs5 .byte W12 .byte PEND -bgm_gomachi0_7_001: +mus_verdanturf_7_001: .byte W12 .byte N12 , Fs3 , v112 .byte W12 @@ -1358,9 +1358,9 @@ bgm_gomachi0_7_001: .byte Fs4 .byte W12 .byte PATT - .word bgm_gomachi0_7_000 + .word mus_verdanturf_7_000 .byte PATT - .word bgm_gomachi0_7_001 + .word mus_verdanturf_7_001 .byte N06 , En4 , v112 .byte W06 .byte Gn4 @@ -1369,49 +1369,49 @@ bgm_gomachi0_7_001: .byte W06 .byte Dn5 .byte W06 - .byte VOL , 42*bgm_gomachi0_mvl/mxv + .byte VOL , 42*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v+63 - .byte VOL , 38*bgm_gomachi0_mvl/mxv + .byte VOL , 38*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 34*bgm_gomachi0_mvl/mxv + .byte VOL , 34*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v-61 - .byte VOL , 28*bgm_gomachi0_mvl/mxv + .byte VOL , 28*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 22*bgm_gomachi0_mvl/mxv + .byte VOL , 22*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v+63 - .byte VOL , 17*bgm_gomachi0_mvl/mxv + .byte VOL , 17*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 11*bgm_gomachi0_mvl/mxv + .byte VOL , 11*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v-61 - .byte VOL , 6*bgm_gomachi0_mvl/mxv + .byte VOL , 6*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 10*bgm_gomachi0_mvl/mxv + .byte VOL , 10*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v+63 - .byte VOL , 17*bgm_gomachi0_mvl/mxv + .byte VOL , 17*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 22*bgm_gomachi0_mvl/mxv + .byte VOL , 22*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v-61 - .byte VOL , 28*bgm_gomachi0_mvl/mxv + .byte VOL , 28*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 48*bgm_gomachi0_mvl/mxv + .byte VOL , 48*mus_verdanturf_mvl/mxv .byte N06 , An4 .byte W06 .byte Dn5 @@ -1420,69 +1420,69 @@ bgm_gomachi0_7_001: .byte W06 .byte Gn5 .byte W06 - .byte VOL , 43*bgm_gomachi0_mvl/mxv + .byte VOL , 43*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v+63 - .byte VOL , 36*bgm_gomachi0_mvl/mxv + .byte VOL , 36*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 34*bgm_gomachi0_mvl/mxv + .byte VOL , 34*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v-61 - .byte VOL , 28*bgm_gomachi0_mvl/mxv + .byte VOL , 28*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 22*bgm_gomachi0_mvl/mxv + .byte VOL , 22*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v+63 - .byte VOL , 17*bgm_gomachi0_mvl/mxv + .byte VOL , 17*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 11*bgm_gomachi0_mvl/mxv + .byte VOL , 11*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v-61 - .byte VOL , 8*bgm_gomachi0_mvl/mxv + .byte VOL , 8*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 6*bgm_gomachi0_mvl/mxv + .byte VOL , 6*mus_verdanturf_mvl/mxv .byte N06 .byte W06 .byte PAN , c_v+63 - .byte VOL , 5*bgm_gomachi0_mvl/mxv + .byte VOL , 5*mus_verdanturf_mvl/mxv .byte N06 .byte W06 - .byte VOL , 4*bgm_gomachi0_mvl/mxv + .byte VOL , 4*mus_verdanturf_mvl/mxv .byte W06 .byte PAN , c_v-61 - .byte VOL , 3*bgm_gomachi0_mvl/mxv + .byte VOL , 3*mus_verdanturf_mvl/mxv .byte W06 .byte GOTO - .word bgm_gomachi0_7_B1 + .word mus_verdanturf_7_B1 .byte W96 .byte FINE @********************** Track 8 **********************@ -bgm_gomachi0_8: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_8: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 4 .byte PAN , c_v+0 .byte LFOS , 80 .byte XCMD , xIECV , 10 .byte xIECL , 6 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte W18 -bgm_gomachi0_8_B1: +mus_verdanturf_8_B1: .byte W96 .byte W96 .byte W96 .byte BEND , c_v+0 .byte W96 - .byte VOL , 30*bgm_gomachi0_mvl/mxv + .byte VOL , 30*mus_verdanturf_mvl/mxv .byte BEND , c_v+0 .byte N12 , Dn1 , v096 .byte W12 @@ -1546,7 +1546,7 @@ bgm_gomachi0_8_B1: .byte W09 .byte N03 , Gs5 , v080 .byte W03 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte BEND , c_v+0 .byte N06 , Gn5 .byte W06 @@ -1684,23 +1684,23 @@ bgm_gomachi0_8_B1: .byte 0 .byte W24 .byte GOTO - .word bgm_gomachi0_8_B1 + .word mus_verdanturf_8_B1 .byte W96 .byte FINE @********************** Track 9 **********************@ -bgm_gomachi0_9: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_9: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 0 - .byte VOL , 68*bgm_gomachi0_mvl/mxv + .byte VOL , 68*mus_verdanturf_mvl/mxv .byte PAN , c_v-48 .byte XCMD , xIECV , 12 .byte xIECL , 8 .byte W12 .byte N06 , An3 , v004 .byte W06 -bgm_gomachi0_9_B1: +mus_verdanturf_9_B1: .byte VOICE , 0 .byte PAN , c_v-48 .byte N06 , Dn4 , v012 @@ -1757,64 +1757,64 @@ bgm_gomachi0_9_B1: .byte W12 .byte En3 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 , Dn4 , v032 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W24 .byte W03 .byte N12 , Bn3 , v028 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N24 , Gn3 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W15 .byte N12 , An3 .byte W12 .byte Cs4 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 , En4 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W24 .byte W03 .byte N12 , Cs4 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N24 , Fs3 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W15 .byte N12 , Gn3 .byte W12 .byte An3 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N48 , Bn3 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W36 .byte W03 .byte N12 , Cs4 @@ -1829,14 +1829,14 @@ bgm_gomachi0_9_B1: .byte W12 .byte En3 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 , Bn3 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W24 .byte W03 .byte N12 , Fs3 @@ -1849,14 +1849,14 @@ bgm_gomachi0_9_B1: .byte W06 .byte An3 .byte W06 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 , Dn4 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W32 .byte W01 .byte N06 @@ -1871,13 +1871,13 @@ bgm_gomachi0_9_B1: .byte W06 .byte N42 , Cs4 .byte W06 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte W03 - .byte 56*bgm_gomachi0_mvl/mxv + .byte 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W24 .byte W03 .byte N12 , An3 @@ -1892,26 +1892,26 @@ bgm_gomachi0_9_B1: .byte W08 .byte N12 , Bn3 .byte W12 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N30 , An3 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W03 .byte W18 .byte N06 , Bn3 .byte W18 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 , Gn3 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W24 .byte W03 .byte N12 , Dn3 @@ -1922,32 +1922,32 @@ bgm_gomachi0_9_B1: .byte W18 .byte N06 , En4 .byte W18 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte N36 .byte W03 - .byte VOL , 56*bgm_gomachi0_mvl/mxv + .byte VOL , 56*mus_verdanturf_mvl/mxv .byte W03 - .byte 60*bgm_gomachi0_mvl/mxv + .byte 60*mus_verdanturf_mvl/mxv .byte W03 - .byte 67*bgm_gomachi0_mvl/mxv + .byte 67*mus_verdanturf_mvl/mxv .byte W48 .byte W03 .byte GOTO - .word bgm_gomachi0_9_B1 + .word mus_verdanturf_9_B1 .byte W96 .byte FINE @********************** Track 10 **********************@ -bgm_gomachi0_10: - .byte KEYSH , bgm_gomachi0_key+0 +mus_verdanturf_10: + .byte KEYSH , mus_verdanturf_key+0 .byte VOICE , 80 .byte PAN , c_v+0 .byte XCMD , xIECV , 12 .byte xIECL , 8 - .byte VOL , 45*bgm_gomachi0_mvl/mxv + .byte VOL , 45*mus_verdanturf_mvl/mxv .byte W18 -bgm_gomachi0_10_B1: +mus_verdanturf_10_B1: .byte W96 .byte W96 .byte W96 @@ -2056,30 +2056,30 @@ bgm_gomachi0_10_B1: .byte N36 , En2 , v104 .byte W60 .byte GOTO - .word bgm_gomachi0_10_B1 + .word mus_verdanturf_10_B1 .byte W96 .byte FINE @******************************************************@ .align 2 -bgm_gomachi0: +mus_verdanturf: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_gomachi0_pri @ Priority - .byte bgm_gomachi0_rev @ Reverb. + .byte mus_verdanturf_pri @ Priority + .byte mus_verdanturf_rev @ Reverb. - .word bgm_gomachi0_grp + .word mus_verdanturf_grp - .word bgm_gomachi0_1 - .word bgm_gomachi0_2 - .word bgm_gomachi0_3 - .word bgm_gomachi0_4 - .word bgm_gomachi0_5 - .word bgm_gomachi0_6 - .word bgm_gomachi0_7 - .word bgm_gomachi0_8 - .word bgm_gomachi0_9 - .word bgm_gomachi0_10 + .word mus_verdanturf_1 + .word mus_verdanturf_2 + .word mus_verdanturf_3 + .word mus_verdanturf_4 + .word mus_verdanturf_5 + .word mus_verdanturf_6 + .word mus_verdanturf_7 + .word mus_verdanturf_8 + .word mus_verdanturf_9 + .word mus_verdanturf_10 .end diff --git a/sound/songs/bgm_kachi4.s b/sound/songs/mus_victory_aqua_magma.s index 1f776e16e..0f3af9add 100644 --- a/sound/songs/bgm_kachi4.s +++ b/sound/songs/mus_victory_aqua_magma.s @@ -1,33 +1,33 @@ .include "MPlayDef.s" - .equ bgm_kachi4_grp, voicegroup067 - .equ bgm_kachi4_pri, 0 - .equ bgm_kachi4_rev, reverb_set+50 - .equ bgm_kachi4_mvl, 127 - .equ bgm_kachi4_key, 0 - .equ bgm_kachi4_tbs, 1 - .equ bgm_kachi4_exg, 0 - .equ bgm_kachi4_cmp, 1 + .equ mus_victory_aqua_magma_grp, voicegroup067 + .equ mus_victory_aqua_magma_pri, 0 + .equ mus_victory_aqua_magma_rev, reverb_set+50 + .equ mus_victory_aqua_magma_mvl, 127 + .equ mus_victory_aqua_magma_key, 0 + .equ mus_victory_aqua_magma_tbs, 1 + .equ mus_victory_aqua_magma_exg, 0 + .equ mus_victory_aqua_magma_cmp, 1 .section .rodata - .global bgm_kachi4 + .global mus_victory_aqua_magma .align 2 @********************** Track 1 **********************@ -bgm_kachi4_1: - .byte KEYSH , bgm_kachi4_key+0 - .byte TEMPO , 142*bgm_kachi4_tbs/2 +mus_victory_aqua_magma_1: + .byte KEYSH , mus_victory_aqua_magma_key+0 + .byte TEMPO , 142*mus_victory_aqua_magma_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 44*bgm_kachi4_mvl/mxv + .byte VOL , 44*mus_victory_aqua_magma_mvl/mxv .byte W08 .byte W08 .byte W96 .byte W96 -bgm_kachi4_1_B1: +mus_victory_aqua_magma_1_B1: .byte VOICE , 127 .byte N04 , En5 , v096 .byte W12 @@ -58,7 +58,7 @@ bgm_kachi4_1_B1: .byte W02 .byte N04 .byte W06 -bgm_kachi4_1_000: +mus_victory_aqua_magma_1_000: .byte N04 , En5 , v096 .byte W12 .byte En5 , v080 @@ -123,20 +123,20 @@ bgm_kachi4_1_000: .byte N04 .byte W06 .byte PATT - .word bgm_kachi4_1_000 + .word mus_victory_aqua_magma_1_000 .byte GOTO - .word bgm_kachi4_1_B1 + .word mus_victory_aqua_magma_1_B1 .byte W96 .byte FINE @********************** Track 2 **********************@ -bgm_kachi4_2: - .byte KEYSH , bgm_kachi4_key+0 +mus_victory_aqua_magma_2: + .byte KEYSH , mus_victory_aqua_magma_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 82*bgm_kachi4_mvl/mxv + .byte VOL , 82*mus_victory_aqua_magma_mvl/mxv .byte PAN , c_v-13 .byte W08 .byte W08 @@ -160,9 +160,9 @@ bgm_kachi4_2: .byte W24 .byte Ds4 , v096 .byte W24 -bgm_kachi4_2_B1: +mus_victory_aqua_magma_2_B1: .byte VOICE , 24 - .byte VOL , 48*bgm_kachi4_mvl/mxv + .byte VOL , 48*mus_victory_aqua_magma_mvl/mxv .byte W02 .byte N44 , Fn4 , v112 .byte W48 @@ -249,18 +249,18 @@ bgm_kachi4_2_B1: .byte Dn4 , v036 .byte W06 .byte GOTO - .word bgm_kachi4_2_B1 + .word mus_victory_aqua_magma_2_B1 .byte W96 .byte FINE @********************** Track 3 **********************@ -bgm_kachi4_3: - .byte KEYSH , bgm_kachi4_key+0 +mus_victory_aqua_magma_3: + .byte KEYSH , mus_victory_aqua_magma_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 85*bgm_kachi4_mvl/mxv + .byte VOL , 85*mus_victory_aqua_magma_mvl/mxv .byte PAN , c_v+14 .byte W08 .byte W08 @@ -288,9 +288,9 @@ bgm_kachi4_3: .byte W24 .byte Gs4 , v096 .byte W24 -bgm_kachi4_3_B1: +mus_victory_aqua_magma_3_B1: .byte VOICE , 24 - .byte VOL , 63*bgm_kachi4_mvl/mxv + .byte VOL , 63*mus_victory_aqua_magma_mvl/mxv .byte N48 , An4 , v112 .byte W48 .byte N04 , Dn5 @@ -370,19 +370,19 @@ bgm_kachi4_3_B1: .byte N08 , Bn4 , v036 .byte W08 .byte GOTO - .word bgm_kachi4_3_B1 + .word mus_victory_aqua_magma_3_B1 .byte W96 .byte FINE @********************** Track 4 **********************@ -bgm_kachi4_4: - .byte KEYSH , bgm_kachi4_key+0 +mus_victory_aqua_magma_4: + .byte KEYSH , mus_victory_aqua_magma_key+0 .byte VOICE , 47 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 88*bgm_kachi4_mvl/mxv + .byte VOL , 88*mus_victory_aqua_magma_mvl/mxv .byte W08 .byte N02 , Fn2 , v108 .byte W04 @@ -418,9 +418,9 @@ bgm_kachi4_4: .byte W24 .byte Fs1 .byte W24 -bgm_kachi4_4_B1: +mus_victory_aqua_magma_4_B1: .byte VOICE , 48 - .byte VOL , 35*bgm_kachi4_mvl/mxv + .byte VOL , 35*mus_victory_aqua_magma_mvl/mxv .byte N72 , Cn3 , v112 .byte W72 .byte N08 , An2 @@ -454,20 +454,20 @@ bgm_kachi4_4_B1: .byte Bn2 .byte W08 .byte GOTO - .word bgm_kachi4_4_B1 + .word mus_victory_aqua_magma_4_B1 .byte W96 .byte FINE @********************** Track 5 **********************@ -bgm_kachi4_5: - .byte KEYSH , bgm_kachi4_key+0 +mus_victory_aqua_magma_5: + .byte KEYSH , mus_victory_aqua_magma_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 41*bgm_kachi4_mvl/mxv + .byte VOL , 41*mus_victory_aqua_magma_mvl/mxv .byte PAN , c_v+63 .byte W08 .byte W08 @@ -495,8 +495,8 @@ bgm_kachi4_5: .byte W24 .byte Cn4 .byte W24 -bgm_kachi4_5_B1: -bgm_kachi4_5_000: +mus_victory_aqua_magma_5_B1: +mus_victory_aqua_magma_5_000: .byte W12 .byte N04 , An3 , v112 .byte W06 @@ -509,7 +509,7 @@ bgm_kachi4_5_000: .byte As3 .byte W12 .byte PEND -bgm_kachi4_5_001: +mus_victory_aqua_magma_5_001: .byte W12 .byte N04 , Bn3 , v112 .byte W06 @@ -523,27 +523,27 @@ bgm_kachi4_5_001: .byte W12 .byte PEND .byte PATT - .word bgm_kachi4_5_000 + .word mus_victory_aqua_magma_5_000 .byte PATT - .word bgm_kachi4_5_001 + .word mus_victory_aqua_magma_5_001 .byte GOTO - .word bgm_kachi4_5_B1 + .word mus_victory_aqua_magma_5_B1 .byte W96 .byte FINE @********************** Track 6 **********************@ -bgm_kachi4_6: - .byte KEYSH , bgm_kachi4_key+0 +mus_victory_aqua_magma_6: + .byte KEYSH , mus_victory_aqua_magma_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-1 - .byte VOL , 58*bgm_kachi4_mvl/mxv + .byte VOL , 58*mus_victory_aqua_magma_mvl/mxv .byte W02 - .byte 55*bgm_kachi4_mvl/mxv + .byte 55*mus_victory_aqua_magma_mvl/mxv .byte W06 .byte W08 .byte N06 , Fn1 , v112 @@ -570,8 +570,8 @@ bgm_kachi4_6: .byte W24 .byte Fs1 .byte W24 -bgm_kachi4_6_B1: -bgm_kachi4_6_000: +mus_victory_aqua_magma_6_B1: +mus_victory_aqua_magma_6_000: .byte N04 , Fn1 , v112 .byte W12 .byte Fn2 @@ -602,7 +602,7 @@ bgm_kachi4_6_000: .byte N04 .byte W12 .byte PATT - .word bgm_kachi4_6_000 + .word mus_victory_aqua_magma_6_000 .byte N04 , Gn1 , v112 .byte W12 .byte Gn2 @@ -618,23 +618,23 @@ bgm_kachi4_6_000: .byte Fs2 .byte W12 .byte GOTO - .word bgm_kachi4_6_B1 + .word mus_victory_aqua_magma_6_B1 .byte W96 .byte FINE @********************** Track 7 **********************@ -bgm_kachi4_7: - .byte KEYSH , bgm_kachi4_key+0 +mus_victory_aqua_magma_7: + .byte KEYSH , mus_victory_aqua_magma_key+0 .byte VOICE , 0 - .byte VOL , 65*bgm_kachi4_mvl/mxv + .byte VOL , 65*mus_victory_aqua_magma_mvl/mxv .byte W08 .byte W08 .byte N48 , An2 , v112 .byte W96 .byte W96 -bgm_kachi4_7_B1: -bgm_kachi4_7_000: +mus_victory_aqua_magma_7_B1: +mus_victory_aqua_magma_7_000: .byte N04 , Cn1 , v112 .byte W24 .byte Dn1 @@ -657,7 +657,7 @@ bgm_kachi4_7_000: .byte Cn1 , v096 .byte W06 .byte PATT - .word bgm_kachi4_7_000 + .word mus_victory_aqua_magma_7_000 .byte N04 , Dn1 , v088 .byte W12 .byte Dn1 , v112 @@ -677,20 +677,20 @@ bgm_kachi4_7_000: .byte Cn1 , v096 .byte W12 .byte GOTO - .word bgm_kachi4_7_B1 + .word mus_victory_aqua_magma_7_B1 .byte W96 .byte FINE @********************** Track 8 **********************@ -bgm_kachi4_8: - .byte KEYSH , bgm_kachi4_key+0 +mus_victory_aqua_magma_8: + .byte KEYSH , mus_victory_aqua_magma_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 41*bgm_kachi4_mvl/mxv + .byte VOL , 41*mus_victory_aqua_magma_mvl/mxv .byte PAN , c_v-64 .byte W08 .byte W08 @@ -705,8 +705,8 @@ bgm_kachi4_8: .byte N24 , Fs5 .byte W24 .byte W96 -bgm_kachi4_8_B1: -bgm_kachi4_8_000: +mus_victory_aqua_magma_8_B1: +mus_victory_aqua_magma_8_000: .byte W12 .byte N04 , Cn3 , v112 .byte W06 @@ -719,7 +719,7 @@ bgm_kachi4_8_000: .byte Cs3 .byte W12 .byte PEND -bgm_kachi4_8_001: +mus_victory_aqua_magma_8_001: .byte W12 .byte N04 , Dn3 , v112 .byte W06 @@ -733,22 +733,22 @@ bgm_kachi4_8_001: .byte W12 .byte PEND .byte PATT - .word bgm_kachi4_8_000 + .word mus_victory_aqua_magma_8_000 .byte PATT - .word bgm_kachi4_8_001 + .word mus_victory_aqua_magma_8_001 .byte GOTO - .word bgm_kachi4_8_B1 + .word mus_victory_aqua_magma_8_B1 .byte W96 .byte FINE @********************** Track 9 **********************@ -bgm_kachi4_9: - .byte KEYSH , bgm_kachi4_key+0 +mus_victory_aqua_magma_9: + .byte KEYSH , mus_victory_aqua_magma_key+0 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v-1 - .byte VOL , 37*bgm_kachi4_mvl/mxv + .byte VOL , 37*mus_victory_aqua_magma_mvl/mxv .byte W03 .byte VOICE , 46 .byte W05 @@ -864,35 +864,35 @@ bgm_kachi4_9: .byte W04 .byte Cn5 .byte W04 -bgm_kachi4_9_B1: +mus_victory_aqua_magma_9_B1: .byte W96 .byte W96 .byte W96 .byte W96 .byte GOTO - .word bgm_kachi4_9_B1 + .word mus_victory_aqua_magma_9_B1 .byte W96 .byte FINE @******************************************************@ .align 2 -bgm_kachi4: +mus_victory_aqua_magma: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_kachi4_pri @ Priority - .byte bgm_kachi4_rev @ Reverb. + .byte mus_victory_aqua_magma_pri @ Priority + .byte mus_victory_aqua_magma_rev @ Reverb. - .word bgm_kachi4_grp + .word mus_victory_aqua_magma_grp - .word bgm_kachi4_1 - .word bgm_kachi4_2 - .word bgm_kachi4_3 - .word bgm_kachi4_4 - .word bgm_kachi4_5 - .word bgm_kachi4_6 - .word bgm_kachi4_7 - .word bgm_kachi4_8 - .word bgm_kachi4_9 + .word mus_victory_aqua_magma_1 + .word mus_victory_aqua_magma_2 + .word mus_victory_aqua_magma_3 + .word mus_victory_aqua_magma_4 + .word mus_victory_aqua_magma_5 + .word mus_victory_aqua_magma_6 + .word mus_victory_aqua_magma_7 + .word mus_victory_aqua_magma_8 + .word mus_victory_aqua_magma_9 .end diff --git a/sound/songs/bgm_kachi3.s b/sound/songs/mus_victory_gym_leader.s index bbaf98982..f1b961fa6 100644 --- a/sound/songs/bgm_kachi3.s +++ b/sound/songs/mus_victory_gym_leader.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_kachi3_grp, voicegroup021 - .equ bgm_kachi3_pri, 0 - .equ bgm_kachi3_rev, reverb_set+50 - .equ bgm_kachi3_mvl, 127 - .equ bgm_kachi3_key, 0 - .equ bgm_kachi3_tbs, 1 - .equ bgm_kachi3_exg, 0 - .equ bgm_kachi3_cmp, 1 + .equ mus_victory_gym_leader_grp, voicegroup021 + .equ mus_victory_gym_leader_pri, 0 + .equ mus_victory_gym_leader_rev, reverb_set+50 + .equ mus_victory_gym_leader_mvl, 127 + .equ mus_victory_gym_leader_key, 0 + .equ mus_victory_gym_leader_tbs, 1 + .equ mus_victory_gym_leader_exg, 0 + .equ mus_victory_gym_leader_cmp, 1 .section .rodata - .global bgm_kachi3 + .global mus_victory_gym_leader .align 2 @********************** Track 1 **********************@ -bgm_kachi3_1: - .byte KEYSH , bgm_kachi3_key+0 +mus_victory_gym_leader_1: + .byte KEYSH , mus_victory_gym_leader_key+0 .byte W09 - .byte TEMPO , 138*bgm_kachi3_tbs/2 + .byte TEMPO , 138*mus_victory_gym_leader_tbs/2 .byte VOICE , 56 .byte LFOS , 26 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte N32 , As3 , v112 .byte W15 .byte MOD , 3 @@ -42,61 +42,61 @@ bgm_kachi3_1: .byte W06 .byte Ds4 .byte W06 - .byte VOL , 69*bgm_kachi3_mvl/mxv + .byte VOL , 69*mus_victory_gym_leader_mvl/mxv .byte N36 , Gn4 .byte W04 - .byte VOL , 65*bgm_kachi3_mvl/mxv + .byte VOL , 65*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W03 .byte MOD , 3 .byte W04 - .byte VOL , 52*bgm_kachi3_mvl/mxv + .byte VOL , 52*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 43*bgm_kachi3_mvl/mxv + .byte 43*mus_victory_gym_leader_mvl/mxv .byte W10 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte MOD , 0 .byte N03 , Ds4 .byte W06 .byte Gn4 .byte W06 - .byte VOL , 58*bgm_kachi3_mvl/mxv + .byte VOL , 58*mus_victory_gym_leader_mvl/mxv .byte N92 , As4 , v120 .byte W09 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 71*bgm_kachi3_mvl/mxv + .byte 71*mus_victory_gym_leader_mvl/mxv .byte MOD , 3 .byte W06 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W24 .byte W03 - .byte 75*bgm_kachi3_mvl/mxv + .byte 75*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 66*bgm_kachi3_mvl/mxv + .byte 66*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 56*bgm_kachi3_mvl/mxv + .byte 56*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 45*bgm_kachi3_mvl/mxv + .byte 45*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 21*bgm_kachi3_mvl/mxv + .byte 21*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 17*bgm_kachi3_mvl/mxv + .byte 17*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 5*bgm_kachi3_mvl/mxv + .byte 5*mus_victory_gym_leader_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 -bgm_kachi3_1_000: +mus_victory_gym_leader_1_000: .byte VOICE , 73 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte N06 , Ds5 , v100 .byte W12 .byte Dn5 @@ -110,7 +110,7 @@ bgm_kachi3_1_000: .byte As4 .byte W24 .byte PEND -bgm_kachi3_1_B1: +mus_victory_gym_leader_1_B1: .byte N06 , Cn5 , v100 .byte W12 .byte As4 @@ -153,7 +153,7 @@ bgm_kachi3_1_B1: .byte W06 .byte Dn4 .byte W06 -bgm_kachi3_1_001: +mus_victory_gym_leader_1_001: .byte N06 , Ds4 , v112 .byte W12 .byte Dn4 @@ -180,7 +180,7 @@ bgm_kachi3_1_001: .byte N24 .byte W24 .byte PATT - .word bgm_kachi3_1_001 + .word mus_victory_gym_leader_1_001 .byte N06 , Cn4 , v112 .byte W12 .byte As3 @@ -210,26 +210,26 @@ bgm_kachi3_1_001: .byte BEND , c_v+0 .byte W44 .byte W01 -bgm_kachi3_1_002: +mus_victory_gym_leader_1_002: .byte MOD , 4 .byte W48 - .byte VOL , 71*bgm_kachi3_mvl/mxv + .byte VOL , 71*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 57*bgm_kachi3_mvl/mxv + .byte 57*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 47*bgm_kachi3_mvl/mxv + .byte 47*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 31*bgm_kachi3_mvl/mxv + .byte 31*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 18*bgm_kachi3_mvl/mxv + .byte 18*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 6*bgm_kachi3_mvl/mxv + .byte 6*mus_victory_gym_leader_mvl/mxv .byte W15 .byte PEND .byte EOT , Ds4 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte N36 , Cn4 , v112 .byte W18 .byte MOD , 4 @@ -242,11 +242,11 @@ bgm_kachi3_1_002: .byte TIE , Fn4 .byte W48 .byte PATT - .word bgm_kachi3_1_002 + .word mus_victory_gym_leader_1_002 .byte EOT , Fn4 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte BEND , c_v-11 .byte N36 , Gs3 , v112 .byte W03 @@ -271,21 +271,21 @@ bgm_kachi3_1_002: .byte W03 .byte MOD , 4 .byte W12 - .byte VOL , 71*bgm_kachi3_mvl/mxv + .byte VOL , 71*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 57*bgm_kachi3_mvl/mxv + .byte 57*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 47*bgm_kachi3_mvl/mxv + .byte 47*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 31*bgm_kachi3_mvl/mxv + .byte 31*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 18*bgm_kachi3_mvl/mxv + .byte 18*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 6*bgm_kachi3_mvl/mxv + .byte 6*mus_victory_gym_leader_mvl/mxv .byte W15 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte BEND , c_v-20 .byte N24 , Gn4 .byte W03 @@ -300,20 +300,20 @@ bgm_kachi3_1_002: .byte W12 .byte MOD , 4 .byte W12 - .byte VOL , 62*bgm_kachi3_mvl/mxv + .byte VOL , 62*mus_victory_gym_leader_mvl/mxv .byte MOD , 0 .byte N80 , Ds4 .byte W09 - .byte VOL , 65*bgm_kachi3_mvl/mxv + .byte VOL , 65*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 71*bgm_kachi3_mvl/mxv + .byte 71*mus_victory_gym_leader_mvl/mxv .byte MOD , 4 .byte W09 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W36 .byte MOD , 0 .byte W03 @@ -323,22 +323,22 @@ bgm_kachi3_1_002: .byte W30 .byte MOD , 4 .byte W18 - .byte VOL , 71*bgm_kachi3_mvl/mxv + .byte VOL , 71*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 57*bgm_kachi3_mvl/mxv + .byte 57*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 47*bgm_kachi3_mvl/mxv + .byte 47*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 31*bgm_kachi3_mvl/mxv + .byte 31*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 18*bgm_kachi3_mvl/mxv + .byte 18*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 6*bgm_kachi3_mvl/mxv + .byte 6*mus_victory_gym_leader_mvl/mxv .byte W15 .byte MOD , 0 .byte W03 .byte VOICE , 48 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte N36 , As4 , v096 .byte W36 .byte N06 , Gn4 @@ -347,30 +347,30 @@ bgm_kachi3_1_002: .byte W06 .byte TIE , Ds5 .byte W48 -bgm_kachi3_1_003: +mus_victory_gym_leader_1_003: .byte W36 .byte W03 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 72*bgm_kachi3_mvl/mxv + .byte 72*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 62*bgm_kachi3_mvl/mxv + .byte 62*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 16*bgm_kachi3_mvl/mxv + .byte 16*mus_victory_gym_leader_mvl/mxv .byte W03 .byte PEND .byte EOT , Ds5 - .byte VOL , 5*bgm_kachi3_mvl/mxv + .byte VOL , 5*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N36 , Cn5 , v096 .byte W36 .byte N06 , An4 @@ -380,11 +380,11 @@ bgm_kachi3_1_003: .byte TIE , Fn5 .byte W48 .byte PATT - .word bgm_kachi3_1_003 + .word mus_victory_gym_leader_1_003 .byte EOT , Fn5 - .byte VOL , 5*bgm_kachi3_mvl/mxv + .byte VOL , 5*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N36 , Gs4 , v096 .byte W36 .byte N06 , Fn4 @@ -393,21 +393,21 @@ bgm_kachi3_1_003: .byte W06 .byte N90 , Dn5 .byte W48 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 72*bgm_kachi3_mvl/mxv + .byte 72*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 62*bgm_kachi3_mvl/mxv + .byte 62*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N24 , As4 .byte W24 .byte Dn5 @@ -418,34 +418,34 @@ bgm_kachi3_1_003: .byte W12 .byte N90 , Ds5 .byte W48 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 72*bgm_kachi3_mvl/mxv + .byte 72*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 62*bgm_kachi3_mvl/mxv + .byte 62*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W06 .byte PATT - .word bgm_kachi3_1_000 + .word mus_victory_gym_leader_1_000 .byte GOTO - .word bgm_kachi3_1_B1 + .word mus_victory_gym_leader_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_kachi3_2: - .byte KEYSH , bgm_kachi3_key+0 +mus_victory_gym_leader_2: + .byte KEYSH , mus_victory_gym_leader_key+0 .byte W09 .byte VOICE , 56 .byte LFOS , 26 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v+16 .byte N32 , Gn3 , v084 .byte W15 @@ -467,61 +467,61 @@ bgm_kachi3_2: .byte W06 .byte As3 .byte W06 - .byte VOL , 69*bgm_kachi3_mvl/mxv + .byte VOL , 69*mus_victory_gym_leader_mvl/mxv .byte N32 , Ds4 , v104 .byte W04 - .byte VOL , 65*bgm_kachi3_mvl/mxv + .byte VOL , 65*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W03 .byte MOD , 3 .byte W04 - .byte VOL , 52*bgm_kachi3_mvl/mxv + .byte VOL , 52*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 43*bgm_kachi3_mvl/mxv + .byte 43*mus_victory_gym_leader_mvl/mxv .byte W10 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte MOD , 0 .byte N03 , As3 , v092 .byte W06 .byte Ds4 .byte W06 - .byte VOL , 58*bgm_kachi3_mvl/mxv + .byte VOL , 58*mus_victory_gym_leader_mvl/mxv .byte N92 , Fn4 , v104 .byte W09 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 71*bgm_kachi3_mvl/mxv + .byte 71*mus_victory_gym_leader_mvl/mxv .byte MOD , 3 .byte W06 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W24 .byte W03 - .byte 75*bgm_kachi3_mvl/mxv + .byte 75*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 66*bgm_kachi3_mvl/mxv + .byte 66*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 56*bgm_kachi3_mvl/mxv + .byte 56*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 45*bgm_kachi3_mvl/mxv + .byte 45*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 21*bgm_kachi3_mvl/mxv + .byte 21*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 17*bgm_kachi3_mvl/mxv + .byte 17*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 5*bgm_kachi3_mvl/mxv + .byte 5*mus_victory_gym_leader_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 -bgm_kachi3_2_000: +mus_victory_gym_leader_2_000: .byte VOICE , 60 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v+0 .byte N09 , Ds3 , v100 .byte W12 @@ -542,7 +542,7 @@ bgm_kachi3_2_000: .byte Fn4 , v072 .byte W24 .byte PEND -bgm_kachi3_2_B1: +mus_victory_gym_leader_2_B1: .byte VOICE , 60 .byte PAN , c_v+0 .byte N09 , Cn3 , v100 @@ -638,19 +638,19 @@ bgm_kachi3_2_B1: .byte Ds4 , v008 .byte W12 .byte VOICE , 60 - .byte VOL , 53*bgm_kachi3_mvl/mxv + .byte VOL , 53*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v+16 .byte N36 , Gn3 , v092 .byte W06 - .byte VOL , 59*bgm_kachi3_mvl/mxv + .byte VOL , 59*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 73*bgm_kachi3_mvl/mxv + .byte 73*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 77*bgm_kachi3_mvl/mxv + .byte 77*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W18 .byte N06 , Ds3 .byte W06 @@ -658,33 +658,33 @@ bgm_kachi3_2_B1: .byte W06 .byte N48 , As3 .byte W18 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 63*bgm_kachi3_mvl/mxv + .byte 63*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 57*bgm_kachi3_mvl/mxv + .byte 57*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 63*bgm_kachi3_mvl/mxv + .byte 63*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 70*bgm_kachi3_mvl/mxv + .byte 70*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N44 , An3 .byte W24 - .byte VOL , 74*bgm_kachi3_mvl/mxv + .byte VOL , 74*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 65*bgm_kachi3_mvl/mxv + .byte 65*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 37*bgm_kachi3_mvl/mxv + .byte 37*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 25*bgm_kachi3_mvl/mxv + .byte 25*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 13*bgm_kachi3_mvl/mxv + .byte 13*mus_victory_gym_leader_mvl/mxv .byte W06 .byte VOICE , 56 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v-32 .byte N03 , Cn5 , v076 .byte W18 @@ -697,19 +697,19 @@ bgm_kachi3_2_B1: .byte Fn4 , v008 .byte W12 .byte VOICE , 60 - .byte VOL , 53*bgm_kachi3_mvl/mxv + .byte VOL , 53*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v+16 .byte N36 , An3 , v092 .byte W06 - .byte VOL , 59*bgm_kachi3_mvl/mxv + .byte VOL , 59*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 73*bgm_kachi3_mvl/mxv + .byte 73*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 77*bgm_kachi3_mvl/mxv + .byte 77*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W18 .byte N06 , Fn3 .byte W06 @@ -717,19 +717,19 @@ bgm_kachi3_2_B1: .byte W06 .byte N44 , Cn4 .byte W24 - .byte VOL , 74*bgm_kachi3_mvl/mxv + .byte VOL , 74*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 65*bgm_kachi3_mvl/mxv + .byte 65*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 37*bgm_kachi3_mvl/mxv + .byte 37*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 25*bgm_kachi3_mvl/mxv + .byte 25*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 13*bgm_kachi3_mvl/mxv + .byte 13*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W24 .byte VOICE , 56 .byte PAN , c_v-32 @@ -757,20 +757,20 @@ bgm_kachi3_2_B1: .byte W06 .byte N44 , As3 .byte W24 - .byte VOL , 74*bgm_kachi3_mvl/mxv + .byte VOL , 74*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 65*bgm_kachi3_mvl/mxv + .byte 65*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 37*bgm_kachi3_mvl/mxv + .byte 37*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 25*bgm_kachi3_mvl/mxv + .byte 25*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 13*bgm_kachi3_mvl/mxv + .byte 13*mus_victory_gym_leader_mvl/mxv .byte W06 .byte VOICE , 56 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v-32 .byte N03 , As3 , v076 .byte W06 @@ -797,18 +797,18 @@ bgm_kachi3_2_B1: .byte N44 , Dn3 .byte W32 .byte W01 - .byte VOL , 74*bgm_kachi3_mvl/mxv + .byte VOL , 74*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 62*bgm_kachi3_mvl/mxv + .byte 62*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 45*bgm_kachi3_mvl/mxv + .byte 45*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 25*bgm_kachi3_mvl/mxv + .byte 25*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 9*bgm_kachi3_mvl/mxv + .byte 9*mus_victory_gym_leader_mvl/mxv .byte W03 .byte VOICE , 48 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v+0 .byte N08 , As2 , v112 .byte W08 @@ -826,125 +826,125 @@ bgm_kachi3_2_B1: .byte PAN , c_v+16 .byte N96 , Gn3 , v080 .byte W12 - .byte VOL , 77*bgm_kachi3_mvl/mxv + .byte VOL , 77*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 70*bgm_kachi3_mvl/mxv + .byte 70*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 64*bgm_kachi3_mvl/mxv + .byte 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 57*bgm_kachi3_mvl/mxv + .byte 57*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 45*bgm_kachi3_mvl/mxv + .byte 45*mus_victory_gym_leader_mvl/mxv .byte W20 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N96 .byte W08 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 44*bgm_kachi3_mvl/mxv + .byte 44*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 48*bgm_kachi3_mvl/mxv + .byte 48*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 53*bgm_kachi3_mvl/mxv + .byte 53*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 76*bgm_kachi3_mvl/mxv + .byte 76*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W20 .byte N96 , An3 .byte W12 - .byte VOL , 77*bgm_kachi3_mvl/mxv + .byte VOL , 77*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 70*bgm_kachi3_mvl/mxv + .byte 70*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 64*bgm_kachi3_mvl/mxv + .byte 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 57*bgm_kachi3_mvl/mxv + .byte 57*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 45*bgm_kachi3_mvl/mxv + .byte 45*mus_victory_gym_leader_mvl/mxv .byte W20 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N96 .byte W08 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 44*bgm_kachi3_mvl/mxv + .byte 44*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 48*bgm_kachi3_mvl/mxv + .byte 48*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 53*bgm_kachi3_mvl/mxv + .byte 53*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 76*bgm_kachi3_mvl/mxv + .byte 76*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W20 .byte N96 , As3 .byte W12 - .byte VOL , 77*bgm_kachi3_mvl/mxv + .byte VOL , 77*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 70*bgm_kachi3_mvl/mxv + .byte 70*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 64*bgm_kachi3_mvl/mxv + .byte 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 57*bgm_kachi3_mvl/mxv + .byte 57*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 45*bgm_kachi3_mvl/mxv + .byte 45*mus_victory_gym_leader_mvl/mxv .byte W20 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W03 .byte N96 , As3 , v092 .byte W05 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 44*bgm_kachi3_mvl/mxv + .byte 44*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 48*bgm_kachi3_mvl/mxv + .byte 48*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 53*bgm_kachi3_mvl/mxv + .byte 53*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 76*bgm_kachi3_mvl/mxv + .byte 76*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W23 .byte W96 .byte W96 .byte PATT - .word bgm_kachi3_2_000 + .word mus_victory_gym_leader_2_000 .byte GOTO - .word bgm_kachi3_2_B1 + .word mus_victory_gym_leader_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_kachi3_3: - .byte KEYSH , bgm_kachi3_key+0 +mus_victory_gym_leader_3: + .byte KEYSH , mus_victory_gym_leader_key+0 .byte W09 .byte VOICE , 90 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte N04 , Ds3 , v040 .byte W04 .byte Gn3 @@ -1050,12 +1050,12 @@ bgm_kachi3_3: .byte W48 .byte Dn2 .byte W48 -bgm_kachi3_3_B1: +mus_victory_gym_leader_3_B1: .byte N06 , Cn2 , v040 .byte W48 .byte As1 .byte W48 -bgm_kachi3_3_000: +mus_victory_gym_leader_3_000: .byte N06 , Ds2 , v040 .byte W48 .byte Dn2 @@ -1069,7 +1069,7 @@ bgm_kachi3_3_000: .byte W12 .byte Ds2 .byte W48 -bgm_kachi3_3_001: +mus_victory_gym_leader_3_001: .byte N06 , Ds1 , v080 .byte W24 .byte N06 @@ -1088,7 +1088,7 @@ bgm_kachi3_3_001: .byte N24 , Dn1 .byte W24 .byte PATT - .word bgm_kachi3_3_001 + .word mus_victory_gym_leader_3_001 .byte N06 , Gs1 , v080 .byte W12 .byte As1 @@ -1242,20 +1242,20 @@ bgm_kachi3_3_001: .byte N06 , Ds2 .byte W12 .byte PATT - .word bgm_kachi3_3_000 + .word mus_victory_gym_leader_3_000 .byte GOTO - .word bgm_kachi3_3_B1 + .word mus_victory_gym_leader_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_kachi3_4: - .byte VOL , 80*bgm_kachi3_mvl/mxv - .byte KEYSH , bgm_kachi3_key+0 +mus_victory_gym_leader_4: + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv + .byte KEYSH , mus_victory_gym_leader_key+0 .byte N24 , Cn3 , v064 .byte W09 .byte VOICE , 84 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte N32 , Ds2 , v080 @@ -1274,59 +1274,59 @@ bgm_kachi3_4: .byte W06 .byte Ds2 , v028 .byte W06 - .byte VOL , 69*bgm_kachi3_mvl/mxv + .byte VOL , 69*mus_victory_gym_leader_mvl/mxv .byte N48 , Ds2 , v080 .byte W04 - .byte VOL , 65*bgm_kachi3_mvl/mxv + .byte VOL , 65*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 52*bgm_kachi3_mvl/mxv + .byte 52*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 43*bgm_kachi3_mvl/mxv + .byte 43*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 37*bgm_kachi3_mvl/mxv + .byte 37*mus_victory_gym_leader_mvl/mxv .byte W10 - .byte 41*bgm_kachi3_mvl/mxv + .byte 41*mus_victory_gym_leader_mvl/mxv .byte W05 .byte N96 , Dn2 .byte W02 - .byte VOL , 45*bgm_kachi3_mvl/mxv + .byte VOL , 45*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 52*bgm_kachi3_mvl/mxv + .byte 52*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 66*bgm_kachi3_mvl/mxv + .byte 66*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 74*bgm_kachi3_mvl/mxv + .byte 74*mus_victory_gym_leader_mvl/mxv .byte W07 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W24 .byte W01 - .byte 75*bgm_kachi3_mvl/mxv + .byte 75*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 66*bgm_kachi3_mvl/mxv + .byte 66*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 56*bgm_kachi3_mvl/mxv + .byte 56*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 45*bgm_kachi3_mvl/mxv + .byte 45*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 21*bgm_kachi3_mvl/mxv + .byte 21*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 17*bgm_kachi3_mvl/mxv + .byte 17*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 5*bgm_kachi3_mvl/mxv + .byte 5*mus_victory_gym_leader_mvl/mxv .byte W06 .byte W96 -bgm_kachi3_4_B1: +mus_victory_gym_leader_4_B1: .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte W96 .byte VOICE , 83 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte N06 , Ds6 , v032 .byte W12 .byte Dn6 @@ -1352,63 +1352,63 @@ bgm_kachi3_4_B1: .byte VOICE , 80 .byte N12 , Ds3 , v052 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , As3 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , Dn3 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , As3 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , Cn3 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , Gs3 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , As2 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 .byte N24 , Fn3 , v072 .byte W06 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 66*bgm_kachi3_mvl/mxv + .byte 66*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 69*bgm_kachi3_mvl/mxv + .byte 69*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 75*bgm_kachi3_mvl/mxv + .byte 75*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W06 .byte VOICE , 83 .byte PAN , c_v-49 @@ -1438,13 +1438,13 @@ bgm_kachi3_4_B1: .byte PAN , c_v+0 .byte N24 , As2 , v060 .byte W15 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 29*bgm_kachi3_mvl/mxv + .byte 29*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N06 .byte W12 .byte N06 @@ -1481,13 +1481,13 @@ bgm_kachi3_4_B1: .byte W12 .byte N24 , Cn3 .byte W15 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 29*bgm_kachi3_mvl/mxv + .byte 29*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N06 .byte W12 .byte N06 @@ -1524,13 +1524,13 @@ bgm_kachi3_4_B1: .byte W12 .byte N24 , Dn3 .byte W15 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 29*bgm_kachi3_mvl/mxv + .byte 29*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N06 .byte W12 .byte N06 @@ -1605,24 +1605,24 @@ bgm_kachi3_4_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 51*bgm_kachi3_mvl/mxv + .byte VOL , 51*mus_victory_gym_leader_mvl/mxv .byte N96 , Dn3 , v068 .byte W12 - .byte VOL , 54*bgm_kachi3_mvl/mxv + .byte VOL , 54*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 58*bgm_kachi3_mvl/mxv + .byte 58*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 62*bgm_kachi3_mvl/mxv + .byte 62*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 65*bgm_kachi3_mvl/mxv + .byte 65*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 71*bgm_kachi3_mvl/mxv + .byte 71*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 76*bgm_kachi3_mvl/mxv + .byte 76*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W18 .byte N06 , Gs3 , v060 .byte W12 @@ -1684,16 +1684,16 @@ bgm_kachi3_4_B1: .byte PAN , c_v+0 .byte W96 .byte GOTO - .word bgm_kachi3_4_B1 + .word mus_victory_gym_leader_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_kachi3_5: - .byte KEYSH , bgm_kachi3_key+0 +mus_victory_gym_leader_5: + .byte KEYSH , mus_victory_gym_leader_key+0 .byte W09 .byte VOICE , 82 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v-48 .byte BEND , c_v+5 .byte W04 @@ -1799,7 +1799,7 @@ bgm_kachi3_5: .byte W06 .byte BEND , c_v+0 .byte W90 -bgm_kachi3_5_B1: +mus_victory_gym_leader_5_B1: .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte xIECV , 8 @@ -1811,63 +1811,63 @@ bgm_kachi3_5_B1: .byte PAN , c_v+0 .byte N12 , As2 , v052 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , Gn3 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , As2 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , Fn3 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , Gs2 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , Ds3 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N12 , Fn2 .byte W06 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 59*bgm_kachi3_mvl/mxv + .byte 59*mus_victory_gym_leader_mvl/mxv .byte W15 .byte N24 , Dn3 , v072 .byte W06 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 66*bgm_kachi3_mvl/mxv + .byte 66*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 69*bgm_kachi3_mvl/mxv + .byte 69*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 75*bgm_kachi3_mvl/mxv + .byte 75*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W06 .byte VOICE , 86 .byte PAN , c_v+48 @@ -1897,13 +1897,13 @@ bgm_kachi3_5_B1: .byte PAN , c_v+0 .byte N24 , Gn2 , v060 .byte W15 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 29*bgm_kachi3_mvl/mxv + .byte 29*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N06 .byte W12 .byte N06 @@ -1940,13 +1940,13 @@ bgm_kachi3_5_B1: .byte W12 .byte N24 , An2 .byte W15 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 29*bgm_kachi3_mvl/mxv + .byte 29*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N06 .byte W12 .byte N06 @@ -1983,13 +1983,13 @@ bgm_kachi3_5_B1: .byte W12 .byte N24 , As2 .byte W15 - .byte VOL , 70*bgm_kachi3_mvl/mxv + .byte VOL , 70*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 51*bgm_kachi3_mvl/mxv + .byte 51*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 29*bgm_kachi3_mvl/mxv + .byte 29*mus_victory_gym_leader_mvl/mxv .byte W15 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N06 .byte W12 .byte N06 @@ -2064,36 +2064,36 @@ bgm_kachi3_5_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 51*bgm_kachi3_mvl/mxv + .byte VOL , 51*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v+48 .byte N12 , As2 , v068 .byte W12 .byte VOICE , 87 - .byte VOL , 54*bgm_kachi3_mvl/mxv + .byte VOL , 54*mus_victory_gym_leader_mvl/mxv .byte N12 .byte W09 - .byte VOL , 58*bgm_kachi3_mvl/mxv + .byte VOL , 58*mus_victory_gym_leader_mvl/mxv .byte W03 .byte N12 .byte W06 - .byte VOL , 62*bgm_kachi3_mvl/mxv + .byte VOL , 62*mus_victory_gym_leader_mvl/mxv .byte W06 .byte N12 .byte W03 - .byte VOL , 65*bgm_kachi3_mvl/mxv + .byte VOL , 65*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte N12 .byte W09 - .byte VOL , 71*bgm_kachi3_mvl/mxv + .byte VOL , 71*mus_victory_gym_leader_mvl/mxv .byte W03 .byte N12 .byte W09 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W03 .byte N12 .byte W06 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte W06 .byte N12 .byte W12 @@ -2158,22 +2158,22 @@ bgm_kachi3_5_B1: .byte PAN , c_v+0 .byte W96 .byte GOTO - .word bgm_kachi3_5_B1 + .word mus_victory_gym_leader_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_kachi3_6: - .byte KEYSH , bgm_kachi3_key+0 +mus_victory_gym_leader_6: + .byte KEYSH , mus_victory_gym_leader_key+0 .byte W09 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte W48 .byte BEND , c_v+2 .byte W48 .byte c_v+0 .byte W96 .byte W48 -bgm_kachi3_6_000: +mus_victory_gym_leader_6_000: .byte VOICE , 60 .byte PAN , c_v+9 .byte N09 , As2 , v100 @@ -2195,7 +2195,7 @@ bgm_kachi3_6_000: .byte Dn4 , v060 .byte W24 .byte PEND -bgm_kachi3_6_B1: +mus_victory_gym_leader_6_B1: .byte VOICE , 60 .byte PAN , c_v+9 .byte N09 , Gs2 , v100 @@ -2217,7 +2217,7 @@ bgm_kachi3_6_B1: .byte As3 , v060 .byte W24 .byte PATT - .word bgm_kachi3_6_000 + .word mus_victory_gym_leader_6_000 .byte VOICE , 60 .byte PAN , c_v+9 .byte N09 , Gs2 , v100 @@ -2314,25 +2314,25 @@ bgm_kachi3_6_B1: .byte N92 , Fn3 .byte W36 .byte W03 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 72*bgm_kachi3_mvl/mxv + .byte 72*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 62*bgm_kachi3_mvl/mxv + .byte 62*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 16*bgm_kachi3_mvl/mxv + .byte 16*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 5*bgm_kachi3_mvl/mxv + .byte 5*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte N16 , Fn4 .byte W16 .byte Gn4 @@ -2348,25 +2348,25 @@ bgm_kachi3_6_B1: .byte N92 , Dn4 .byte W36 .byte W03 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 72*bgm_kachi3_mvl/mxv + .byte 72*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 62*bgm_kachi3_mvl/mxv + .byte 62*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 16*bgm_kachi3_mvl/mxv + .byte 16*mus_victory_gym_leader_mvl/mxv .byte W03 - .byte 5*bgm_kachi3_mvl/mxv + .byte 5*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W48 .byte N24 .byte W24 @@ -2378,22 +2378,22 @@ bgm_kachi3_6_B1: .byte W12 .byte N90 , Gn4 .byte W48 - .byte VOL , 76*bgm_kachi3_mvl/mxv + .byte VOL , 76*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 72*bgm_kachi3_mvl/mxv + .byte 72*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W09 - .byte 62*bgm_kachi3_mvl/mxv + .byte 62*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 50*bgm_kachi3_mvl/mxv + .byte 50*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 40*bgm_kachi3_mvl/mxv + .byte 40*mus_victory_gym_leader_mvl/mxv .byte W06 - .byte 28*bgm_kachi3_mvl/mxv + .byte 28*mus_victory_gym_leader_mvl/mxv .byte W06 .byte VOICE , 60 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v-1 .byte N09 , As2 , v100 .byte W12 @@ -2414,16 +2414,16 @@ bgm_kachi3_6_B1: .byte Dn4 , v060 .byte W24 .byte GOTO - .word bgm_kachi3_6_B1 + .word mus_victory_gym_leader_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_kachi3_7: - .byte KEYSH , bgm_kachi3_key+0 +mus_victory_gym_leader_7: + .byte KEYSH , mus_victory_gym_leader_key+0 .byte W09 .byte VOICE , 47 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte PAN , c_v-8 .byte N12 , As1 , v120 .byte W36 @@ -2449,7 +2449,7 @@ bgm_kachi3_7: .byte W12 .byte Ds2 .byte W96 -bgm_kachi3_7_B1: +mus_victory_gym_leader_7_B1: .byte N12 , Cn2 , v120 .byte W84 .byte Dn2 @@ -2462,7 +2462,7 @@ bgm_kachi3_7_B1: .byte W12 .byte Ds2 .byte W48 -bgm_kachi3_7_000: +mus_victory_gym_leader_7_000: .byte N12 , Ds2 , v120 .byte W24 .byte As1 @@ -2481,7 +2481,7 @@ bgm_kachi3_7_000: .byte As1 .byte W24 .byte PATT - .word bgm_kachi3_7_000 + .word mus_victory_gym_leader_7_000 .byte N12 , Cn2 , v120 .byte W24 .byte Gs1 @@ -2566,59 +2566,59 @@ bgm_kachi3_7_000: .byte PAN , c_v+0 .byte N96 , As2 , v092 .byte W08 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 44*bgm_kachi3_mvl/mxv + .byte 44*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 48*bgm_kachi3_mvl/mxv + .byte 48*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 53*bgm_kachi3_mvl/mxv + .byte 53*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 76*bgm_kachi3_mvl/mxv + .byte 76*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W20 .byte W96 .byte N96 , Cn3 .byte W08 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 44*bgm_kachi3_mvl/mxv + .byte 44*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 48*bgm_kachi3_mvl/mxv + .byte 48*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 53*bgm_kachi3_mvl/mxv + .byte 53*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 76*bgm_kachi3_mvl/mxv + .byte 76*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W20 .byte W96 .byte N96 , Fn3 , v100 .byte W08 - .byte VOL , 64*bgm_kachi3_mvl/mxv + .byte VOL , 64*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 44*bgm_kachi3_mvl/mxv + .byte 44*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 48*bgm_kachi3_mvl/mxv + .byte 48*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 53*bgm_kachi3_mvl/mxv + .byte 53*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 60*bgm_kachi3_mvl/mxv + .byte 60*mus_victory_gym_leader_mvl/mxv .byte W12 - .byte 68*bgm_kachi3_mvl/mxv + .byte 68*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 76*bgm_kachi3_mvl/mxv + .byte 76*mus_victory_gym_leader_mvl/mxv .byte W08 - .byte 80*bgm_kachi3_mvl/mxv + .byte 80*mus_victory_gym_leader_mvl/mxv .byte W20 .byte VOICE , 47 .byte PAN , c_v-8 @@ -2653,16 +2653,16 @@ bgm_kachi3_7_000: .byte Ds2 .byte W96 .byte GOTO - .word bgm_kachi3_7_B1 + .word mus_victory_gym_leader_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_kachi3_8: - .byte KEYSH , bgm_kachi3_key+0 +mus_victory_gym_leader_8: + .byte KEYSH , mus_victory_gym_leader_key+0 .byte W09 .byte VOICE , 0 - .byte VOL , 80*bgm_kachi3_mvl/mxv + .byte VOL , 80*mus_victory_gym_leader_mvl/mxv .byte N48 , Bn2 , v104 .byte W48 .byte N36 , Bn2 , v092 @@ -2674,7 +2674,7 @@ bgm_kachi3_8: .byte N96 .byte W96 .byte W96 -bgm_kachi3_8_B1: +mus_victory_gym_leader_8_B1: .byte W96 .byte W96 .byte W72 @@ -2792,7 +2792,7 @@ bgm_kachi3_8_B1: .byte W06 .byte En1 , v080 .byte W06 -bgm_kachi3_8_000: +mus_victory_gym_leader_8_000: .byte N06 , En1 , v112 .byte W24 .byte En1 , v127 @@ -2831,7 +2831,7 @@ bgm_kachi3_8_000: .byte En1 , v080 .byte W06 .byte PATT - .word bgm_kachi3_8_000 + .word mus_victory_gym_leader_8_000 .byte N06 , En1 , v112 .byte W12 .byte En1 , v080 @@ -2925,27 +2925,27 @@ bgm_kachi3_8_000: .byte W12 .byte W96 .byte GOTO - .word bgm_kachi3_8_B1 + .word mus_victory_gym_leader_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_kachi3: +mus_victory_gym_leader: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_kachi3_pri @ Priority - .byte bgm_kachi3_rev @ Reverb. + .byte mus_victory_gym_leader_pri @ Priority + .byte mus_victory_gym_leader_rev @ Reverb. - .word bgm_kachi3_grp + .word mus_victory_gym_leader_grp - .word bgm_kachi3_1 - .word bgm_kachi3_2 - .word bgm_kachi3_3 - .word bgm_kachi3_4 - .word bgm_kachi3_5 - .word bgm_kachi3_6 - .word bgm_kachi3_7 - .word bgm_kachi3_8 + .word mus_victory_gym_leader_1 + .word mus_victory_gym_leader_2 + .word mus_victory_gym_leader_3 + .word mus_victory_gym_leader_4 + .word mus_victory_gym_leader_5 + .word mus_victory_gym_leader_6 + .word mus_victory_gym_leader_7 + .word mus_victory_gym_leader_8 .end diff --git a/sound/songs/bgm_kachi5.s b/sound/songs/mus_victory_league.s index cef1c47bf..64beeea9d 100644 --- a/sound/songs/bgm_kachi5.s +++ b/sound/songs/mus_victory_league.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_kachi5_grp, voicegroup026 - .equ bgm_kachi5_pri, 0 - .equ bgm_kachi5_rev, reverb_set+50 - .equ bgm_kachi5_mvl, 127 - .equ bgm_kachi5_key, 0 - .equ bgm_kachi5_tbs, 1 - .equ bgm_kachi5_exg, 0 - .equ bgm_kachi5_cmp, 1 + .equ mus_victory_league_grp, voicegroup026 + .equ mus_victory_league_pri, 0 + .equ mus_victory_league_rev, reverb_set+50 + .equ mus_victory_league_mvl, 127 + .equ mus_victory_league_key, 0 + .equ mus_victory_league_tbs, 1 + .equ mus_victory_league_exg, 0 + .equ mus_victory_league_cmp, 1 .section .rodata - .global bgm_kachi5 + .global mus_victory_league .align 2 @********************** Track 1 **********************@ -bgm_kachi5_1: - .byte KEYSH , bgm_kachi5_key+0 - .byte TEMPO , 140*bgm_kachi5_tbs/2 +mus_victory_league_1: + .byte KEYSH , mus_victory_league_key+0 + .byte TEMPO , 140*mus_victory_league_tbs/2 .byte W12 .byte VOICE , 56 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N04 , Fn3 , v112 .byte W08 .byte Cn4 @@ -78,7 +78,7 @@ bgm_kachi5_1: .byte W08 .byte N12 .byte W48 -bgm_kachi5_1_B1: +mus_victory_league_1_B1: .byte VOICE , 56 .byte PAN , c_v-1 .byte N36 , Fn4 , v112 @@ -104,17 +104,17 @@ bgm_kachi5_1_B1: .byte W20 .byte MOD , 6 .byte W24 - .byte VOL , 63*bgm_kachi5_mvl/mxv + .byte VOL , 63*mus_victory_league_mvl/mxv .byte W04 - .byte 53*bgm_kachi5_mvl/mxv + .byte 53*mus_victory_league_mvl/mxv .byte W04 - .byte 36*bgm_kachi5_mvl/mxv + .byte 36*mus_victory_league_mvl/mxv .byte W04 - .byte 16*bgm_kachi5_mvl/mxv + .byte 16*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 0 .byte W04 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N08 , An3 .byte W08 .byte N16 , Cn4 @@ -147,21 +147,21 @@ bgm_kachi5_1_B1: .byte W24 .byte MOD , 6 .byte W28 - .byte VOL , 68*bgm_kachi5_mvl/mxv + .byte VOL , 68*mus_victory_league_mvl/mxv .byte W08 - .byte 60*bgm_kachi5_mvl/mxv + .byte 60*mus_victory_league_mvl/mxv .byte W08 - .byte 50*bgm_kachi5_mvl/mxv + .byte 50*mus_victory_league_mvl/mxv .byte W08 - .byte 39*bgm_kachi5_mvl/mxv + .byte 39*mus_victory_league_mvl/mxv .byte W08 - .byte 27*bgm_kachi5_mvl/mxv + .byte 27*mus_victory_league_mvl/mxv .byte W04 - .byte 13*bgm_kachi5_mvl/mxv + .byte 13*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 0 .byte W04 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N40 , Fn4 .byte W16 .byte MOD , 6 @@ -188,17 +188,17 @@ bgm_kachi5_1_B1: .byte W20 .byte MOD , 6 .byte W24 - .byte VOL , 63*bgm_kachi5_mvl/mxv + .byte VOL , 63*mus_victory_league_mvl/mxv .byte W04 - .byte 53*bgm_kachi5_mvl/mxv + .byte 53*mus_victory_league_mvl/mxv .byte W04 - .byte 36*bgm_kachi5_mvl/mxv + .byte 36*mus_victory_league_mvl/mxv .byte W04 - .byte 16*bgm_kachi5_mvl/mxv + .byte 16*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 0 .byte W04 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N08 .byte W08 .byte N16 , Gn4 @@ -233,21 +233,21 @@ bgm_kachi5_1_B1: .byte W24 .byte MOD , 6 .byte W08 - .byte VOL , 70*bgm_kachi5_mvl/mxv + .byte VOL , 70*mus_victory_league_mvl/mxv .byte W08 - .byte 62*bgm_kachi5_mvl/mxv + .byte 62*mus_victory_league_mvl/mxv .byte W04 - .byte 52*bgm_kachi5_mvl/mxv + .byte 52*mus_victory_league_mvl/mxv .byte W04 - .byte 34*bgm_kachi5_mvl/mxv + .byte 34*mus_victory_league_mvl/mxv .byte W04 - .byte 13*bgm_kachi5_mvl/mxv + .byte 13*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 0 .byte W04 .byte VOICE , 60 .byte W04 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N08 , Fn2 .byte W08 .byte N16 , Fn3 @@ -292,20 +292,20 @@ bgm_kachi5_1_B1: .byte W08 .byte N48 , Cn3 .byte W24 - .byte VOL , 73*bgm_kachi5_mvl/mxv + .byte VOL , 73*mus_victory_league_mvl/mxv .byte MOD , 6 .byte W08 - .byte VOL , 66*bgm_kachi5_mvl/mxv + .byte VOL , 66*mus_victory_league_mvl/mxv .byte W08 - .byte 53*bgm_kachi5_mvl/mxv + .byte 53*mus_victory_league_mvl/mxv .byte W04 - .byte 30*bgm_kachi5_mvl/mxv + .byte 30*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 0 .byte W12 .byte VOICE , 48 .byte W04 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N08 .byte W08 .byte N16 , Gn3 @@ -358,16 +358,16 @@ bgm_kachi5_1_B1: .byte N24 , An3 .byte W24 .byte GOTO - .word bgm_kachi5_1_B1 + .word mus_victory_league_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_kachi5_2: - .byte KEYSH , bgm_kachi5_key+0 +mus_victory_league_2: + .byte KEYSH , mus_victory_league_key+0 .byte W12 .byte VOICE , 56 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N04 , Cn3 , v092 .byte W08 .byte An3 @@ -425,7 +425,7 @@ bgm_kachi5_2: .byte W08 .byte N12 .byte W48 -bgm_kachi5_2_B1: +mus_victory_league_2_B1: .byte W96 .byte VOICE , 73 .byte PAN , c_v+16 @@ -480,21 +480,21 @@ bgm_kachi5_2_B1: .byte W24 .byte MOD , 6 .byte W28 - .byte VOL , 68*bgm_kachi5_mvl/mxv + .byte VOL , 68*mus_victory_league_mvl/mxv .byte W08 - .byte 60*bgm_kachi5_mvl/mxv + .byte 60*mus_victory_league_mvl/mxv .byte W08 - .byte 50*bgm_kachi5_mvl/mxv + .byte 50*mus_victory_league_mvl/mxv .byte W08 - .byte 39*bgm_kachi5_mvl/mxv + .byte 39*mus_victory_league_mvl/mxv .byte W08 - .byte 27*bgm_kachi5_mvl/mxv + .byte 27*mus_victory_league_mvl/mxv .byte W04 - .byte 13*bgm_kachi5_mvl/mxv + .byte 13*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 0 .byte W04 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte W96 .byte VOICE , 73 .byte PAN , c_v+16 @@ -547,22 +547,22 @@ bgm_kachi5_2_B1: .byte W24 .byte MOD , 6 .byte W08 - .byte VOL , 70*bgm_kachi5_mvl/mxv + .byte VOL , 70*mus_victory_league_mvl/mxv .byte W08 - .byte 62*bgm_kachi5_mvl/mxv + .byte 62*mus_victory_league_mvl/mxv .byte W04 - .byte 52*bgm_kachi5_mvl/mxv + .byte 52*mus_victory_league_mvl/mxv .byte W04 - .byte 34*bgm_kachi5_mvl/mxv + .byte 34*mus_victory_league_mvl/mxv .byte W04 - .byte 13*bgm_kachi5_mvl/mxv + .byte 13*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 0 .byte W40 .byte VOICE , 45 .byte PAN , c_v-10 .byte W16 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N08 .byte W08 .byte As4 @@ -612,18 +612,18 @@ bgm_kachi5_2_B1: .byte W08 .byte W48 .byte VOICE , 60 - .byte VOL , 35*bgm_kachi5_mvl/mxv + .byte VOL , 35*mus_victory_league_mvl/mxv .byte N48 , Fn2 .byte W08 - .byte VOL , 42*bgm_kachi5_mvl/mxv + .byte VOL , 42*mus_victory_league_mvl/mxv .byte W08 - .byte 55*bgm_kachi5_mvl/mxv + .byte 55*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 6 .byte W04 - .byte VOL , 66*bgm_kachi5_mvl/mxv + .byte VOL , 66*mus_victory_league_mvl/mxv .byte W08 - .byte 80*bgm_kachi5_mvl/mxv + .byte 80*mus_victory_league_mvl/mxv .byte W16 .byte MOD , 0 .byte N08 , Fs2 , v080 @@ -650,21 +650,21 @@ bgm_kachi5_2_B1: .byte W16 .byte MOD , 6 .byte W04 - .byte VOL , 75*bgm_kachi5_mvl/mxv + .byte VOL , 75*mus_victory_league_mvl/mxv .byte W08 - .byte 72*bgm_kachi5_mvl/mxv + .byte 72*mus_victory_league_mvl/mxv .byte W08 - .byte 65*bgm_kachi5_mvl/mxv + .byte 65*mus_victory_league_mvl/mxv .byte W04 - .byte 47*bgm_kachi5_mvl/mxv + .byte 47*mus_victory_league_mvl/mxv .byte W04 - .byte 28*bgm_kachi5_mvl/mxv + .byte 28*mus_victory_league_mvl/mxv .byte W04 .byte MOD , 0 .byte W16 .byte VOICE , 56 .byte PAN , c_v+0 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte N08 , Dn4 , v112 .byte W08 .byte N16 , Cn4 @@ -690,22 +690,22 @@ bgm_kachi5_2_B1: .byte MOD , 6 .byte W16 .byte GOTO - .word bgm_kachi5_2_B1 + .word mus_victory_league_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_kachi5_3: - .byte KEYSH , bgm_kachi5_key+0 +mus_victory_league_3: + .byte KEYSH , mus_victory_league_key+0 .byte W12 .byte BEND , c_v+1 .byte W24 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 -bgm_kachi5_3_B1: +mus_victory_league_3_B1: .byte VOICE , 48 .byte PAN , c_v-10 .byte N12 , Dn3 , v080 @@ -890,20 +890,20 @@ bgm_kachi5_3_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_kachi5_3_B1 + .word mus_victory_league_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_kachi5_4: - .byte KEYSH , bgm_kachi5_key+0 +mus_victory_league_4: + .byte KEYSH , mus_victory_league_key+0 .byte W12 .byte VOICE , 7 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte BEND , c_v-2 .byte W24 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte PAN , c_v+0 .byte N08 , An3 , v052 .byte W04 @@ -1064,7 +1064,7 @@ bgm_kachi5_4: .byte VOICE , 80 .byte N12 .byte W48 -bgm_kachi5_4_B1: +mus_victory_league_4_B1: .byte VOICE , 80 .byte N12 , As2 , v052 .byte W24 @@ -1300,18 +1300,18 @@ bgm_kachi5_4_B1: .byte N24 , Ds3 .byte W24 .byte GOTO - .word bgm_kachi5_4_B1 + .word mus_victory_league_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_kachi5_5: - .byte KEYSH , bgm_kachi5_key+0 +mus_victory_league_5: + .byte KEYSH , mus_victory_league_key+0 .byte W12 .byte VOICE , 8 .byte XCMD , xIECV , 8 .byte xIECL , 8 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte W24 .byte PAN , c_v+48 .byte W08 @@ -1469,7 +1469,7 @@ bgm_kachi5_5: .byte VOICE , 82 .byte N12 .byte W48 -bgm_kachi5_5_B1: +mus_victory_league_5_B1: .byte VOICE , 82 .byte N12 , Fn2 , v052 .byte W24 @@ -1708,16 +1708,16 @@ bgm_kachi5_5_B1: .byte N24 , Cn3 .byte W24 .byte GOTO - .word bgm_kachi5_5_B1 + .word mus_victory_league_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_kachi5_6: - .byte KEYSH , bgm_kachi5_key+0 +mus_victory_league_6: + .byte KEYSH , mus_victory_league_key+0 .byte W12 .byte VOICE , 81 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte BEND , c_v+5 .byte W24 .byte N24 , Fn1 , v080 @@ -1754,7 +1754,7 @@ bgm_kachi5_6: .byte W08 .byte N12 .byte W48 -bgm_kachi5_6_B1: +mus_victory_league_6_B1: .byte N12 , As1 , v080 .byte W24 .byte N04 @@ -1962,16 +1962,16 @@ bgm_kachi5_6_B1: .byte N24 , Fn1 .byte W24 .byte GOTO - .word bgm_kachi5_6_B1 + .word mus_victory_league_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_kachi5_7: - .byte KEYSH , bgm_kachi5_key+0 +mus_victory_league_7: + .byte KEYSH , mus_victory_league_key+0 .byte W12 .byte VOICE , 47 - .byte VOL , 80*bgm_kachi5_mvl/mxv + .byte VOL , 80*mus_victory_league_mvl/mxv .byte W24 .byte PAN , c_v-9 .byte N08 , Fn1 , v120 @@ -2040,7 +2040,7 @@ bgm_kachi5_7: .byte W08 .byte N12 .byte W48 -bgm_kachi5_7_B1: +mus_victory_league_7_B1: .byte W96 .byte W96 .byte W96 @@ -2126,14 +2126,14 @@ bgm_kachi5_7_B1: .byte N12 , Fn1 .byte W24 .byte GOTO - .word bgm_kachi5_7_B1 + .word mus_victory_league_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_kachi5_8: - .byte VOL , 80*bgm_kachi5_mvl/mxv - .byte KEYSH , bgm_kachi5_key+0 +mus_victory_league_8: + .byte VOL , 80*mus_victory_league_mvl/mxv + .byte KEYSH , mus_victory_league_key+0 .byte W12 .byte VOICE , 0 .byte W24 @@ -2156,8 +2156,8 @@ bgm_kachi5_8: .byte W08 .byte En1 , v112 .byte W08 -bgm_kachi5_8_B1: -bgm_kachi5_8_000: +mus_victory_league_8_B1: +mus_victory_league_8_000: .byte N04 , En1 , v112 .byte N96 , Bn2 , v092 .byte W16 @@ -2180,7 +2180,7 @@ bgm_kachi5_8_000: .byte En1 , v080 .byte W08 .byte PEND -bgm_kachi5_8_001: +mus_victory_league_8_001: .byte N04 , En1 , v112 .byte W16 .byte En1 , v080 @@ -2202,7 +2202,7 @@ bgm_kachi5_8_001: .byte En1 , v080 .byte W08 .byte PEND -bgm_kachi5_8_002: +mus_victory_league_8_002: .byte N04 , En1 , v112 .byte W16 .byte En1 , v080 @@ -2225,13 +2225,13 @@ bgm_kachi5_8_002: .byte W08 .byte PEND .byte PATT - .word bgm_kachi5_8_001 + .word mus_victory_league_8_001 .byte PATT - .word bgm_kachi5_8_000 + .word mus_victory_league_8_000 .byte PATT - .word bgm_kachi5_8_001 + .word mus_victory_league_8_001 .byte PATT - .word bgm_kachi5_8_002 + .word mus_victory_league_8_002 .byte N04 , En1 , v112 .byte W16 .byte En1 , v080 @@ -2309,27 +2309,27 @@ bgm_kachi5_8_002: .byte N48 .byte W48 .byte GOTO - .word bgm_kachi5_8_B1 + .word mus_victory_league_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_kachi5: +mus_victory_league: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_kachi5_pri @ Priority - .byte bgm_kachi5_rev @ Reverb. + .byte mus_victory_league_pri @ Priority + .byte mus_victory_league_rev @ Reverb. - .word bgm_kachi5_grp + .word mus_victory_league_grp - .word bgm_kachi5_1 - .word bgm_kachi5_2 - .word bgm_kachi5_3 - .word bgm_kachi5_4 - .word bgm_kachi5_5 - .word bgm_kachi5_6 - .word bgm_kachi5_7 - .word bgm_kachi5_8 + .word mus_victory_league_1 + .word mus_victory_league_2 + .word mus_victory_league_3 + .word mus_victory_league_4 + .word mus_victory_league_5 + .word mus_victory_league_6 + .word mus_victory_league_7 + .word mus_victory_league_8 .end diff --git a/sound/songs/bgm_c_road.s b/sound/songs/mus_victory_road.s index 52093e41b..52281059a 100644 --- a/sound/songs/bgm_c_road.s +++ b/sound/songs/mus_victory_road.s @@ -1,30 +1,30 @@ .include "MPlayDef.s" - .equ bgm_c_road_grp, voicegroup072 - .equ bgm_c_road_pri, 0 - .equ bgm_c_road_rev, reverb_set+50 - .equ bgm_c_road_mvl, 127 - .equ bgm_c_road_key, 0 - .equ bgm_c_road_tbs, 1 - .equ bgm_c_road_exg, 0 - .equ bgm_c_road_cmp, 1 + .equ mus_victory_road_grp, voicegroup072 + .equ mus_victory_road_pri, 0 + .equ mus_victory_road_rev, reverb_set+50 + .equ mus_victory_road_mvl, 127 + .equ mus_victory_road_key, 0 + .equ mus_victory_road_tbs, 1 + .equ mus_victory_road_exg, 0 + .equ mus_victory_road_cmp, 1 .section .rodata - .global bgm_c_road + .global mus_victory_road .align 2 @********************** Track 1 **********************@ -bgm_c_road_1: - .byte KEYSH , bgm_c_road_key+0 - .byte TEMPO , 134*bgm_c_road_tbs/2 +mus_victory_road_1: + .byte KEYSH , mus_victory_road_key+0 + .byte TEMPO , 134*mus_victory_road_tbs/2 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 29*bgm_c_road_mvl/mxv + .byte VOL , 29*mus_victory_road_mvl/mxv .byte W96 -bgm_c_road_1_000: +mus_victory_road_1_000: .byte N02 , Cn5 , v112 .byte W16 .byte N02 @@ -82,62 +82,62 @@ bgm_c_road_1_000: .byte N02 .byte W02 .byte PEND -bgm_c_road_1_001: +mus_victory_road_1_001: .byte N02 , Cn5 , v112 .byte W24 .byte N02 .byte W72 .byte PEND .byte PATT - .word bgm_c_road_1_000 + .word mus_victory_road_1_000 .byte N02 , Cn5 , v112 .byte W24 .byte N02 .byte W24 .byte VOICE , 126 - .byte VOL , 5*bgm_c_road_mvl/mxv + .byte VOL , 5*mus_victory_road_mvl/mxv .byte N48 , Gn5 .byte W05 - .byte VOL , 8*bgm_c_road_mvl/mxv + .byte VOL , 8*mus_victory_road_mvl/mxv .byte W11 - .byte 11*bgm_c_road_mvl/mxv + .byte 11*mus_victory_road_mvl/mxv .byte W01 - .byte 14*bgm_c_road_mvl/mxv + .byte 14*mus_victory_road_mvl/mxv .byte W03 - .byte 17*bgm_c_road_mvl/mxv + .byte 17*mus_victory_road_mvl/mxv .byte W01 - .byte 19*bgm_c_road_mvl/mxv + .byte 19*mus_victory_road_mvl/mxv .byte W03 - .byte 22*bgm_c_road_mvl/mxv + .byte 22*mus_victory_road_mvl/mxv .byte W01 - .byte 23*bgm_c_road_mvl/mxv + .byte 23*mus_victory_road_mvl/mxv .byte W03 - .byte 26*bgm_c_road_mvl/mxv + .byte 26*mus_victory_road_mvl/mxv .byte W01 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte W03 - .byte 32*bgm_c_road_mvl/mxv + .byte 32*mus_victory_road_mvl/mxv .byte W01 - .byte 34*bgm_c_road_mvl/mxv + .byte 34*mus_victory_road_mvl/mxv .byte W03 - .byte 38*bgm_c_road_mvl/mxv + .byte 38*mus_victory_road_mvl/mxv .byte W01 - .byte 40*bgm_c_road_mvl/mxv + .byte 40*mus_victory_road_mvl/mxv .byte W03 - .byte 49*bgm_c_road_mvl/mxv + .byte 49*mus_victory_road_mvl/mxv .byte W01 - .byte 54*bgm_c_road_mvl/mxv + .byte 54*mus_victory_road_mvl/mxv .byte W03 - .byte 62*bgm_c_road_mvl/mxv + .byte 62*mus_victory_road_mvl/mxv .byte W01 - .byte 65*bgm_c_road_mvl/mxv + .byte 65*mus_victory_road_mvl/mxv .byte W03 -bgm_c_road_1_B1: +mus_victory_road_1_B1: .byte VOICE , 127 - .byte VOL , 38*bgm_c_road_mvl/mxv + .byte VOL , 38*mus_victory_road_mvl/mxv .byte N02 , Dn5 , v112 .byte W02 - .byte VOL , 29*bgm_c_road_mvl/mxv + .byte VOL , 29*mus_victory_road_mvl/mxv .byte W06 .byte N02 , Dn5 , v064 .byte W08 @@ -161,7 +161,7 @@ bgm_c_road_1_B1: .byte W08 .byte N02 .byte W08 -bgm_c_road_1_002: +mus_victory_road_1_002: .byte N02 , Dn5 , v112 .byte W08 .byte Dn5 , v064 @@ -189,7 +189,7 @@ bgm_c_road_1_002: .byte N02 .byte W08 .byte PEND -bgm_c_road_1_003: +mus_victory_road_1_003: .byte N02 , Dn5 , v112 .byte W08 .byte Dn5 , v064 @@ -216,117 +216,117 @@ bgm_c_road_1_003: .byte W08 .byte PEND .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_003 + .word mus_victory_road_1_003 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_003 + .word mus_victory_road_1_003 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte W96 .byte W96 .byte W96 .byte W96 .byte W96 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_002 + .word mus_victory_road_1_002 .byte PATT - .word bgm_c_road_1_000 + .word mus_victory_road_1_000 .byte PATT - .word bgm_c_road_1_001 + .word mus_victory_road_1_001 .byte PATT - .word bgm_c_road_1_000 + .word mus_victory_road_1_000 .byte PATT - .word bgm_c_road_1_001 + .word mus_victory_road_1_001 .byte GOTO - .word bgm_c_road_1_B1 + .word mus_victory_road_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_c_road_2: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_2: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 8*bgm_c_road_mvl/mxv + .byte VOL , 8*mus_victory_road_mvl/mxv .byte PAN , c_v-32 .byte N48 , Ds4 , v108 .byte W05 - .byte VOL , 9*bgm_c_road_mvl/mxv + .byte VOL , 9*mus_victory_road_mvl/mxv .byte W08 - .byte 12*bgm_c_road_mvl/mxv + .byte 12*mus_victory_road_mvl/mxv .byte W11 - .byte 13*bgm_c_road_mvl/mxv + .byte 13*mus_victory_road_mvl/mxv .byte W08 - .byte 16*bgm_c_road_mvl/mxv + .byte 16*mus_victory_road_mvl/mxv .byte W01 - .byte 17*bgm_c_road_mvl/mxv + .byte 17*mus_victory_road_mvl/mxv .byte W03 - .byte 19*bgm_c_road_mvl/mxv + .byte 19*mus_victory_road_mvl/mxv .byte W01 - .byte 22*bgm_c_road_mvl/mxv + .byte 22*mus_victory_road_mvl/mxv .byte W03 - .byte 23*bgm_c_road_mvl/mxv + .byte 23*mus_victory_road_mvl/mxv .byte W01 - .byte 26*bgm_c_road_mvl/mxv + .byte 26*mus_victory_road_mvl/mxv .byte W03 - .byte 27*bgm_c_road_mvl/mxv + .byte 27*mus_victory_road_mvl/mxv .byte W04 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte N48 , En4 , v112 .byte W01 - .byte VOL , 31*bgm_c_road_mvl/mxv + .byte VOL , 31*mus_victory_road_mvl/mxv .byte W03 - .byte 32*bgm_c_road_mvl/mxv + .byte 32*mus_victory_road_mvl/mxv .byte W01 - .byte 35*bgm_c_road_mvl/mxv + .byte 35*mus_victory_road_mvl/mxv .byte W03 - .byte 38*bgm_c_road_mvl/mxv + .byte 38*mus_victory_road_mvl/mxv .byte W01 - .byte 41*bgm_c_road_mvl/mxv + .byte 41*mus_victory_road_mvl/mxv .byte W03 - .byte 42*bgm_c_road_mvl/mxv + .byte 42*mus_victory_road_mvl/mxv .byte W01 - .byte 45*bgm_c_road_mvl/mxv + .byte 45*mus_victory_road_mvl/mxv .byte W03 - .byte 46*bgm_c_road_mvl/mxv + .byte 46*mus_victory_road_mvl/mxv .byte W01 - .byte 47*bgm_c_road_mvl/mxv + .byte 47*mus_victory_road_mvl/mxv .byte W03 - .byte 53*bgm_c_road_mvl/mxv + .byte 53*mus_victory_road_mvl/mxv .byte W08 - .byte 55*bgm_c_road_mvl/mxv + .byte 55*mus_victory_road_mvl/mxv .byte W01 - .byte 56*bgm_c_road_mvl/mxv + .byte 56*mus_victory_road_mvl/mxv .byte W03 - .byte 57*bgm_c_road_mvl/mxv + .byte 57*mus_victory_road_mvl/mxv .byte W01 - .byte 59*bgm_c_road_mvl/mxv + .byte 59*mus_victory_road_mvl/mxv .byte W03 - .byte 60*bgm_c_road_mvl/mxv + .byte 60*mus_victory_road_mvl/mxv .byte W04 - .byte 63*bgm_c_road_mvl/mxv + .byte 63*mus_victory_road_mvl/mxv .byte W05 - .byte 66*bgm_c_road_mvl/mxv + .byte 66*mus_victory_road_mvl/mxv .byte W03 - .byte 63*bgm_c_road_mvl/mxv + .byte 63*mus_victory_road_mvl/mxv .byte N08 , Fn4 .byte W48 .byte N08 @@ -335,7 +335,7 @@ bgm_c_road_2: .byte W24 .byte N08 .byte W24 - .byte VOL , 68*bgm_c_road_mvl/mxv + .byte VOL , 68*mus_victory_road_mvl/mxv .byte N04 , Ds4 .byte W08 .byte N02 @@ -348,12 +348,12 @@ bgm_c_road_2: .byte W08 .byte N04 , En4 .byte W08 - .byte VOL , 69*bgm_c_road_mvl/mxv + .byte VOL , 69*mus_victory_road_mvl/mxv .byte N08 , Fn4 .byte W48 .byte N08 .byte W48 - .byte VOL , 46*bgm_c_road_mvl/mxv + .byte VOL , 46*mus_victory_road_mvl/mxv .byte N08 .byte W24 .byte N08 @@ -383,10 +383,10 @@ bgm_c_road_2: .byte W04 .byte Cn3 .byte W04 -bgm_c_road_2_B1: +mus_victory_road_2_B1: .byte VOICE , 84 .byte PAN , c_v+0 - .byte VOL , 62*bgm_c_road_mvl/mxv + .byte VOL , 62*mus_victory_road_mvl/mxv .byte BEND , c_v+2 .byte N04 , Cs1 , v108 .byte W08 @@ -412,7 +412,7 @@ bgm_c_road_2_B1: .byte W08 .byte En1 .byte W08 -bgm_c_road_2_000: +mus_victory_road_2_000: .byte N04 , Dn1 , v112 .byte W08 .byte En1 , v072 @@ -463,8 +463,8 @@ bgm_c_road_2_000: .byte Cn1 .byte W08 .byte PATT - .word bgm_c_road_2_000 -bgm_c_road_2_001: + .word mus_victory_road_2_000 +mus_victory_road_2_001: .byte N04 , Cs1 , v112 .byte W08 .byte Ds1 , v072 @@ -491,9 +491,9 @@ bgm_c_road_2_001: .byte W08 .byte PEND .byte PATT - .word bgm_c_road_2_000 + .word mus_victory_road_2_000 .byte PATT - .word bgm_c_road_2_001 + .word mus_victory_road_2_001 .byte N04 , Dn1 , v112 .byte W08 .byte En1 , v072 @@ -519,7 +519,7 @@ bgm_c_road_2_001: .byte W48 .byte VOICE , 56 .byte PAN , c_v-44 - .byte VOL , 67*bgm_c_road_mvl/mxv + .byte VOL , 67*mus_victory_road_mvl/mxv .byte N02 , Gn4 .byte W08 .byte N02 @@ -536,7 +536,7 @@ bgm_c_road_2_001: .byte W08 .byte VOICE , 1 .byte PAN , c_v-32 - .byte VOL , 61*bgm_c_road_mvl/mxv + .byte VOL , 61*mus_victory_road_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -551,7 +551,7 @@ bgm_c_road_2_001: .byte W96 .byte 56 .byte PAN , c_v-21 - .byte VOL , 57*bgm_c_road_mvl/mxv + .byte VOL , 57*mus_victory_road_mvl/mxv .byte N08 , Gs5 .byte W08 .byte N04 , Gn5 , v052 @@ -611,78 +611,78 @@ bgm_c_road_2_001: .byte Ds3 .byte W04 .byte GOTO - .word bgm_c_road_2_B1 + .word mus_victory_road_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_c_road_3: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_3: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 60 .byte BENDR , 12 .byte LFOS , 44 .byte BENDR , 12 .byte LFOS , 44 - .byte VOL , 8*bgm_c_road_mvl/mxv + .byte VOL , 8*mus_victory_road_mvl/mxv .byte PAN , c_v-12 .byte N48 , Gn2 , v112 .byte W05 - .byte VOL , 9*bgm_c_road_mvl/mxv + .byte VOL , 9*mus_victory_road_mvl/mxv .byte W08 - .byte 12*bgm_c_road_mvl/mxv + .byte 12*mus_victory_road_mvl/mxv .byte W11 - .byte 13*bgm_c_road_mvl/mxv + .byte 13*mus_victory_road_mvl/mxv .byte W08 - .byte 16*bgm_c_road_mvl/mxv + .byte 16*mus_victory_road_mvl/mxv .byte W01 - .byte 17*bgm_c_road_mvl/mxv + .byte 17*mus_victory_road_mvl/mxv .byte W03 - .byte 19*bgm_c_road_mvl/mxv + .byte 19*mus_victory_road_mvl/mxv .byte W01 - .byte 22*bgm_c_road_mvl/mxv + .byte 22*mus_victory_road_mvl/mxv .byte W03 - .byte 23*bgm_c_road_mvl/mxv + .byte 23*mus_victory_road_mvl/mxv .byte W01 - .byte 26*bgm_c_road_mvl/mxv + .byte 26*mus_victory_road_mvl/mxv .byte W03 - .byte 27*bgm_c_road_mvl/mxv + .byte 27*mus_victory_road_mvl/mxv .byte W04 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte N48 , Fs2 .byte W01 - .byte VOL , 31*bgm_c_road_mvl/mxv + .byte VOL , 31*mus_victory_road_mvl/mxv .byte W03 - .byte 32*bgm_c_road_mvl/mxv + .byte 32*mus_victory_road_mvl/mxv .byte W01 - .byte 35*bgm_c_road_mvl/mxv + .byte 35*mus_victory_road_mvl/mxv .byte W03 - .byte 38*bgm_c_road_mvl/mxv + .byte 38*mus_victory_road_mvl/mxv .byte W01 - .byte 41*bgm_c_road_mvl/mxv + .byte 41*mus_victory_road_mvl/mxv .byte W03 - .byte 42*bgm_c_road_mvl/mxv + .byte 42*mus_victory_road_mvl/mxv .byte W01 - .byte 45*bgm_c_road_mvl/mxv + .byte 45*mus_victory_road_mvl/mxv .byte W03 - .byte 46*bgm_c_road_mvl/mxv + .byte 46*mus_victory_road_mvl/mxv .byte W01 - .byte 47*bgm_c_road_mvl/mxv + .byte 47*mus_victory_road_mvl/mxv .byte W03 - .byte 53*bgm_c_road_mvl/mxv + .byte 53*mus_victory_road_mvl/mxv .byte W08 - .byte 55*bgm_c_road_mvl/mxv + .byte 55*mus_victory_road_mvl/mxv .byte W01 - .byte 56*bgm_c_road_mvl/mxv + .byte 56*mus_victory_road_mvl/mxv .byte W03 - .byte 57*bgm_c_road_mvl/mxv + .byte 57*mus_victory_road_mvl/mxv .byte W01 - .byte 59*bgm_c_road_mvl/mxv + .byte 59*mus_victory_road_mvl/mxv .byte W03 - .byte 60*bgm_c_road_mvl/mxv + .byte 60*mus_victory_road_mvl/mxv .byte W04 - .byte 63*bgm_c_road_mvl/mxv + .byte 63*mus_victory_road_mvl/mxv .byte W05 - .byte 66*bgm_c_road_mvl/mxv + .byte 66*mus_victory_road_mvl/mxv .byte W03 .byte W96 .byte BEND , c_v+0 @@ -706,10 +706,10 @@ bgm_c_road_3: .byte 14 .byte N48 , Gs3 .byte W48 -bgm_c_road_3_B1: +mus_victory_road_3_B1: .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N36 , Cs3 , v108 .byte W24 .byte MOD , 8 @@ -746,7 +746,7 @@ bgm_c_road_3_B1: .byte W48 .byte VOICE , 56 .byte MOD , 0 - .byte VOL , 67*bgm_c_road_mvl/mxv + .byte VOL , 67*mus_victory_road_mvl/mxv .byte PAN , c_v+42 .byte N04 , Dn3 .byte W08 @@ -776,7 +776,7 @@ bgm_c_road_3_B1: .byte W08 .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N04 , Cs4 .byte W16 .byte En4 @@ -833,7 +833,7 @@ bgm_c_road_3_B1: .byte An4 .byte W24 .byte VOICE , 48 - .byte VOL , 59*bgm_c_road_mvl/mxv + .byte VOL , 59*mus_victory_road_mvl/mxv .byte PAN , c_v+0 .byte W24 .byte N24 , En5 @@ -878,7 +878,7 @@ bgm_c_road_3_B1: .byte Gn5 .byte W24 .byte VOICE , 56 - .byte VOL , 67*bgm_c_road_mvl/mxv + .byte VOL , 67*mus_victory_road_mvl/mxv .byte PAN , c_v+31 .byte N06 , Gs5 .byte W24 @@ -900,52 +900,52 @@ bgm_c_road_3_B1: .byte W08 .byte VOICE , 73 .byte PAN , c_v+0 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N40 , Cs4 .byte W24 .byte MOD , 6 - .byte VOL , 72*bgm_c_road_mvl/mxv + .byte VOL , 72*mus_victory_road_mvl/mxv .byte W04 - .byte 69*bgm_c_road_mvl/mxv + .byte 69*mus_victory_road_mvl/mxv .byte W04 - .byte 67*bgm_c_road_mvl/mxv + .byte 67*mus_victory_road_mvl/mxv .byte W04 - .byte 64*bgm_c_road_mvl/mxv + .byte 64*mus_victory_road_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N04 , En4 .byte W08 .byte N48 , Gs4 .byte W24 .byte MOD , 7 - .byte VOL , 71*bgm_c_road_mvl/mxv + .byte VOL , 71*mus_victory_road_mvl/mxv .byte W04 - .byte 69*bgm_c_road_mvl/mxv + .byte 69*mus_victory_road_mvl/mxv .byte W04 - .byte 67*bgm_c_road_mvl/mxv + .byte 67*mus_victory_road_mvl/mxv .byte W04 - .byte 66*bgm_c_road_mvl/mxv + .byte 66*mus_victory_road_mvl/mxv .byte W04 - .byte 62*bgm_c_road_mvl/mxv + .byte 62*mus_victory_road_mvl/mxv .byte W04 - .byte 60*bgm_c_road_mvl/mxv + .byte 60*mus_victory_road_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N40 , Ds4 .byte W24 .byte MOD , 7 - .byte VOL , 71*bgm_c_road_mvl/mxv + .byte VOL , 71*mus_victory_road_mvl/mxv .byte W04 - .byte 70*bgm_c_road_mvl/mxv + .byte 70*mus_victory_road_mvl/mxv .byte W04 - .byte 67*bgm_c_road_mvl/mxv + .byte 67*mus_victory_road_mvl/mxv .byte W04 - .byte 63*bgm_c_road_mvl/mxv + .byte 63*mus_victory_road_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N04 , Fs4 .byte W08 .byte N24 , Bn4 @@ -957,33 +957,33 @@ bgm_c_road_3_B1: .byte N96 , Gs4 .byte W48 .byte MOD , 7 - .byte VOL , 72*bgm_c_road_mvl/mxv + .byte VOL , 72*mus_victory_road_mvl/mxv .byte W04 - .byte 70*bgm_c_road_mvl/mxv + .byte 70*mus_victory_road_mvl/mxv .byte W04 - .byte 67*bgm_c_road_mvl/mxv + .byte 67*mus_victory_road_mvl/mxv .byte W04 - .byte 65*bgm_c_road_mvl/mxv + .byte 65*mus_victory_road_mvl/mxv .byte W04 - .byte 62*bgm_c_road_mvl/mxv + .byte 62*mus_victory_road_mvl/mxv .byte W04 - .byte 61*bgm_c_road_mvl/mxv + .byte 61*mus_victory_road_mvl/mxv .byte W04 - .byte 58*bgm_c_road_mvl/mxv + .byte 58*mus_victory_road_mvl/mxv .byte W04 - .byte 57*bgm_c_road_mvl/mxv + .byte 57*mus_victory_road_mvl/mxv .byte W04 - .byte 55*bgm_c_road_mvl/mxv + .byte 55*mus_victory_road_mvl/mxv .byte W04 - .byte 52*bgm_c_road_mvl/mxv + .byte 52*mus_victory_road_mvl/mxv .byte W04 - .byte 50*bgm_c_road_mvl/mxv + .byte 50*mus_victory_road_mvl/mxv .byte W04 - .byte 50*bgm_c_road_mvl/mxv + .byte 50*mus_victory_road_mvl/mxv .byte W04 .byte VOICE , 60 .byte MOD , 0 - .byte VOL , 64*bgm_c_road_mvl/mxv + .byte VOL , 64*mus_victory_road_mvl/mxv .byte N04 , An4 .byte W16 .byte En4 @@ -1007,7 +1007,7 @@ bgm_c_road_3_B1: .byte W08 .byte VOICE , 73 .byte MOD , 0 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N08 , Cs4 .byte W08 .byte Cn4 @@ -1022,18 +1022,18 @@ bgm_c_road_3_B1: .byte W24 .byte MOD , 8 .byte W04 - .byte VOL , 73*bgm_c_road_mvl/mxv + .byte VOL , 73*mus_victory_road_mvl/mxv .byte W04 - .byte 70*bgm_c_road_mvl/mxv + .byte 70*mus_victory_road_mvl/mxv .byte W04 - .byte 67*bgm_c_road_mvl/mxv + .byte 67*mus_victory_road_mvl/mxv .byte W04 - .byte 64*bgm_c_road_mvl/mxv + .byte 64*mus_victory_road_mvl/mxv .byte W04 - .byte 62*bgm_c_road_mvl/mxv + .byte 62*mus_victory_road_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N08 , Ds4 .byte W08 .byte Dn4 @@ -1057,33 +1057,33 @@ bgm_c_road_3_B1: .byte N80 , Gs4 .byte W32 .byte MOD , 12 - .byte VOL , 71*bgm_c_road_mvl/mxv + .byte VOL , 71*mus_victory_road_mvl/mxv .byte W04 - .byte 70*bgm_c_road_mvl/mxv + .byte 70*mus_victory_road_mvl/mxv .byte W04 - .byte 68*bgm_c_road_mvl/mxv + .byte 68*mus_victory_road_mvl/mxv .byte W04 - .byte 67*bgm_c_road_mvl/mxv + .byte 67*mus_victory_road_mvl/mxv .byte W04 - .byte 65*bgm_c_road_mvl/mxv + .byte 65*mus_victory_road_mvl/mxv .byte W04 - .byte 63*bgm_c_road_mvl/mxv + .byte 63*mus_victory_road_mvl/mxv .byte W04 - .byte 62*bgm_c_road_mvl/mxv + .byte 62*mus_victory_road_mvl/mxv .byte W04 - .byte 61*bgm_c_road_mvl/mxv + .byte 61*mus_victory_road_mvl/mxv .byte W04 - .byte 59*bgm_c_road_mvl/mxv + .byte 59*mus_victory_road_mvl/mxv .byte W04 - .byte 58*bgm_c_road_mvl/mxv + .byte 58*mus_victory_road_mvl/mxv .byte W04 - .byte 57*bgm_c_road_mvl/mxv + .byte 57*mus_victory_road_mvl/mxv .byte W04 - .byte 56*bgm_c_road_mvl/mxv + .byte 56*mus_victory_road_mvl/mxv .byte W04 .byte VOICE , 60 .byte MOD , 0 - .byte VOL , 64*bgm_c_road_mvl/mxv + .byte VOL , 64*mus_victory_road_mvl/mxv .byte N04 , An4 .byte W08 .byte Gs4 @@ -1106,7 +1106,7 @@ bgm_c_road_3_B1: .byte W08 .byte Fs5 .byte W08 - .byte VOL , 71*bgm_c_road_mvl/mxv + .byte VOL , 71*mus_victory_road_mvl/mxv .byte W96 .byte W48 .byte N04 , Gs3 @@ -1122,78 +1122,78 @@ bgm_c_road_3_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_c_road_3_B1 + .word mus_victory_road_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_c_road_4: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_4: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 26*bgm_c_road_mvl/mxv + .byte VOL , 26*mus_victory_road_mvl/mxv .byte PAN , c_v+16 .byte N48 , Ds5 , v088 .byte W21 - .byte VOL , 27*bgm_c_road_mvl/mxv + .byte VOL , 27*mus_victory_road_mvl/mxv .byte W08 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte W03 - .byte 31*bgm_c_road_mvl/mxv + .byte 31*mus_victory_road_mvl/mxv .byte W04 - .byte 32*bgm_c_road_mvl/mxv + .byte 32*mus_victory_road_mvl/mxv .byte W01 - .byte 35*bgm_c_road_mvl/mxv + .byte 35*mus_victory_road_mvl/mxv .byte W03 - .byte 37*bgm_c_road_mvl/mxv + .byte 37*mus_victory_road_mvl/mxv .byte W05 - .byte 41*bgm_c_road_mvl/mxv + .byte 41*mus_victory_road_mvl/mxv .byte W03 .byte N48 , En5 .byte W01 - .byte VOL , 42*bgm_c_road_mvl/mxv + .byte VOL , 42*mus_victory_road_mvl/mxv .byte W03 - .byte 45*bgm_c_road_mvl/mxv + .byte 45*mus_victory_road_mvl/mxv .byte W05 - .byte 47*bgm_c_road_mvl/mxv + .byte 47*mus_victory_road_mvl/mxv .byte W03 - .byte 49*bgm_c_road_mvl/mxv + .byte 49*mus_victory_road_mvl/mxv .byte W01 - .byte 50*bgm_c_road_mvl/mxv + .byte 50*mus_victory_road_mvl/mxv .byte W03 - .byte 56*bgm_c_road_mvl/mxv + .byte 56*mus_victory_road_mvl/mxv .byte W01 - .byte 57*bgm_c_road_mvl/mxv + .byte 57*mus_victory_road_mvl/mxv .byte W03 - .byte 63*bgm_c_road_mvl/mxv + .byte 63*mus_victory_road_mvl/mxv .byte W01 - .byte 66*bgm_c_road_mvl/mxv + .byte 66*mus_victory_road_mvl/mxv .byte W03 - .byte 69*bgm_c_road_mvl/mxv + .byte 69*mus_victory_road_mvl/mxv .byte W01 - .byte 71*bgm_c_road_mvl/mxv + .byte 71*mus_victory_road_mvl/mxv .byte W03 - .byte 75*bgm_c_road_mvl/mxv + .byte 75*mus_victory_road_mvl/mxv .byte W01 - .byte 76*bgm_c_road_mvl/mxv + .byte 76*mus_victory_road_mvl/mxv .byte W19 -bgm_c_road_4_000: +mus_victory_road_4_000: .byte VOICE , 14 - .byte VOL , 67*bgm_c_road_mvl/mxv + .byte VOL , 67*mus_victory_road_mvl/mxv .byte N48 , Fn4 , v112 .byte W48 .byte N48 .byte W48 .byte PEND - .byte VOL , 67*bgm_c_road_mvl/mxv + .byte VOL , 67*mus_victory_road_mvl/mxv .byte PAN , c_v+29 .byte N24 .byte W24 .byte N24 .byte W24 .byte VOICE , 56 - .byte VOL , 69*bgm_c_road_mvl/mxv + .byte VOL , 69*mus_victory_road_mvl/mxv .byte N04 , Cn3 .byte W08 .byte Fn2 @@ -1205,14 +1205,14 @@ bgm_c_road_4_000: .byte N04 , En3 .byte W08 .byte PATT - .word bgm_c_road_4_000 - .byte VOL , 67*bgm_c_road_mvl/mxv + .word mus_victory_road_4_000 + .byte VOL , 67*mus_victory_road_mvl/mxv .byte N24 , Fn4 , v112 .byte W24 .byte N24 .byte W24 .byte VOICE , 48 - .byte VOL , 47*bgm_c_road_mvl/mxv + .byte VOL , 47*mus_victory_road_mvl/mxv .byte N04 , Gs4 , v108 .byte W04 .byte Gn4 @@ -1237,10 +1237,10 @@ bgm_c_road_4_000: .byte W04 .byte An3 .byte W04 -bgm_c_road_4_B1: +mus_victory_road_4_B1: .byte VOICE , 60 .byte PAN , c_v-32 - .byte VOL , 47*bgm_c_road_mvl/mxv + .byte VOL , 47*mus_victory_road_mvl/mxv .byte N04 , En2 , v108 .byte W16 .byte Cs2 , v112 @@ -1291,7 +1291,7 @@ bgm_c_road_4_B1: .byte W24 .byte VOICE , 56 .byte PAN , c_v+31 - .byte VOL , 58*bgm_c_road_mvl/mxv + .byte VOL , 58*mus_victory_road_mvl/mxv .byte N04 , Fs2 .byte W08 .byte Dn2 @@ -1320,38 +1320,38 @@ bgm_c_road_4_B1: .byte W08 .byte VOICE , 48 .byte PAN , c_v+40 - .byte VOL , 34*bgm_c_road_mvl/mxv + .byte VOL , 34*mus_victory_road_mvl/mxv .byte N04 , Gs3 .byte W16 .byte En3 .byte W08 .byte N72 , Cs4 .byte W24 - .byte VOL , 32*bgm_c_road_mvl/mxv + .byte VOL , 32*mus_victory_road_mvl/mxv .byte W04 - .byte 31*bgm_c_road_mvl/mxv + .byte 31*mus_victory_road_mvl/mxv .byte W04 - .byte 29*bgm_c_road_mvl/mxv + .byte 29*mus_victory_road_mvl/mxv .byte W04 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte W04 - .byte 26*bgm_c_road_mvl/mxv + .byte 26*mus_victory_road_mvl/mxv .byte W04 - .byte 25*bgm_c_road_mvl/mxv + .byte 25*mus_victory_road_mvl/mxv .byte W04 - .byte 23*bgm_c_road_mvl/mxv + .byte 23*mus_victory_road_mvl/mxv .byte W04 - .byte 21*bgm_c_road_mvl/mxv + .byte 21*mus_victory_road_mvl/mxv .byte W04 - .byte 20*bgm_c_road_mvl/mxv + .byte 20*mus_victory_road_mvl/mxv .byte W04 - .byte 19*bgm_c_road_mvl/mxv + .byte 19*mus_victory_road_mvl/mxv .byte W04 - .byte 18*bgm_c_road_mvl/mxv + .byte 18*mus_victory_road_mvl/mxv .byte W04 - .byte 16*bgm_c_road_mvl/mxv + .byte 16*mus_victory_road_mvl/mxv .byte W04 - .byte 34*bgm_c_road_mvl/mxv + .byte 34*mus_victory_road_mvl/mxv .byte N04 , An3 .byte W16 .byte Fs3 @@ -1391,7 +1391,7 @@ bgm_c_road_4_B1: .byte Dn4 .byte W24 .byte VOICE , 56 - .byte VOL , 43*bgm_c_road_mvl/mxv + .byte VOL , 43*mus_victory_road_mvl/mxv .byte PAN , c_v-32 .byte W24 .byte N24 , Gn4 @@ -1435,7 +1435,7 @@ bgm_c_road_4_B1: .byte W24 .byte N22 , As4 .byte W24 - .byte VOL , 55*bgm_c_road_mvl/mxv + .byte VOL , 55*mus_victory_road_mvl/mxv .byte PAN , c_v+16 .byte N06 , Cn5 .byte W24 @@ -1456,7 +1456,7 @@ bgm_c_road_4_B1: .byte Ds4 .byte W08 .byte VOICE , 48 - .byte VOL , 45*bgm_c_road_mvl/mxv + .byte VOL , 45*mus_victory_road_mvl/mxv .byte PAN , c_v+32 .byte N24 , Gs3 .byte W24 @@ -1590,7 +1590,7 @@ bgm_c_road_4_B1: .byte N24 .byte W24 .byte VOICE , 56 - .byte VOL , 61*bgm_c_road_mvl/mxv + .byte VOL , 61*mus_victory_road_mvl/mxv .byte PAN , c_v+50 .byte N04 , Ds3 .byte W08 @@ -1603,12 +1603,12 @@ bgm_c_road_4_B1: .byte N04 , Gn3 .byte W08 .byte VOICE , 48 - .byte VOL , 57*bgm_c_road_mvl/mxv + .byte VOL , 57*mus_victory_road_mvl/mxv .byte N08 , Gs3 .byte W48 .byte N08 .byte W48 - .byte VOL , 46*bgm_c_road_mvl/mxv + .byte VOL , 46*mus_victory_road_mvl/mxv .byte PAN , c_v+50 .byte N06 .byte W24 @@ -1641,78 +1641,78 @@ bgm_c_road_4_B1: .byte Cn4 .byte W04 .byte GOTO - .word bgm_c_road_4_B1 + .word mus_victory_road_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_c_road_5: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_5: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 48 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 56*bgm_c_road_mvl/mxv + .byte VOL , 56*mus_victory_road_mvl/mxv .byte PAN , c_v+0 .byte N48 , Ds3 , v112 .byte W07 - .byte VOL , 12*bgm_c_road_mvl/mxv + .byte VOL , 12*mus_victory_road_mvl/mxv .byte W11 - .byte 13*bgm_c_road_mvl/mxv + .byte 13*mus_victory_road_mvl/mxv .byte W08 - .byte 16*bgm_c_road_mvl/mxv + .byte 16*mus_victory_road_mvl/mxv .byte W01 - .byte 16*bgm_c_road_mvl/mxv + .byte 16*mus_victory_road_mvl/mxv .byte W02 - .byte 16*bgm_c_road_mvl/mxv + .byte 16*mus_victory_road_mvl/mxv .byte W03 - .byte 17*bgm_c_road_mvl/mxv + .byte 17*mus_victory_road_mvl/mxv .byte W04 - .byte 18*bgm_c_road_mvl/mxv + .byte 18*mus_victory_road_mvl/mxv .byte W02 - .byte 21*bgm_c_road_mvl/mxv + .byte 21*mus_victory_road_mvl/mxv .byte W03 - .byte 22*bgm_c_road_mvl/mxv + .byte 22*mus_victory_road_mvl/mxv .byte W03 - .byte 23*bgm_c_road_mvl/mxv + .byte 23*mus_victory_road_mvl/mxv .byte W04 - .byte 25*bgm_c_road_mvl/mxv + .byte 25*mus_victory_road_mvl/mxv .byte N48 , En3 .byte W02 - .byte VOL , 26*bgm_c_road_mvl/mxv + .byte VOL , 26*mus_victory_road_mvl/mxv .byte W03 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte W03 - .byte 29*bgm_c_road_mvl/mxv + .byte 29*mus_victory_road_mvl/mxv .byte W04 - .byte 31*bgm_c_road_mvl/mxv + .byte 31*mus_victory_road_mvl/mxv .byte W02 - .byte 33*bgm_c_road_mvl/mxv + .byte 33*mus_victory_road_mvl/mxv .byte W03 - .byte 34*bgm_c_road_mvl/mxv + .byte 34*mus_victory_road_mvl/mxv .byte W03 - .byte 36*bgm_c_road_mvl/mxv + .byte 36*mus_victory_road_mvl/mxv .byte W04 - .byte 41*bgm_c_road_mvl/mxv + .byte 41*mus_victory_road_mvl/mxv .byte W02 - .byte 42*bgm_c_road_mvl/mxv + .byte 42*mus_victory_road_mvl/mxv .byte W06 - .byte 44*bgm_c_road_mvl/mxv + .byte 44*mus_victory_road_mvl/mxv .byte W04 - .byte 46*bgm_c_road_mvl/mxv + .byte 46*mus_victory_road_mvl/mxv .byte W02 - .byte 47*bgm_c_road_mvl/mxv + .byte 47*mus_victory_road_mvl/mxv .byte W03 - .byte 50*bgm_c_road_mvl/mxv + .byte 50*mus_victory_road_mvl/mxv .byte W03 - .byte 50*bgm_c_road_mvl/mxv + .byte 50*mus_victory_road_mvl/mxv .byte N02 , Fn2 .byte W02 .byte N02 .byte W01 - .byte VOL , 9*bgm_c_road_mvl/mxv + .byte VOL , 9*mus_victory_road_mvl/mxv .byte W01 .byte VOICE , 47 - .byte VOL , 63*bgm_c_road_mvl/mxv + .byte VOL , 63*mus_victory_road_mvl/mxv .byte N24 , Fn1 .byte W48 .byte N24 @@ -1748,10 +1748,10 @@ bgm_c_road_5: .byte N24 .byte W24 .byte VOICE , 48 - .byte VOL , 46*bgm_c_road_mvl/mxv + .byte VOL , 46*mus_victory_road_mvl/mxv .byte N24 , Gs3 .byte W24 - .byte VOL , 42*bgm_c_road_mvl/mxv + .byte VOL , 42*mus_victory_road_mvl/mxv .byte N04 , Bn3 .byte W04 .byte As3 @@ -1764,10 +1764,10 @@ bgm_c_road_5: .byte W04 .byte Fs3 .byte W04 -bgm_c_road_5_B1: +mus_victory_road_5_B1: .byte VOICE , 1 .byte PAN , c_v-16 - .byte VOL , 56*bgm_c_road_mvl/mxv + .byte VOL , 56*mus_victory_road_mvl/mxv .byte N02 , Cs2 , v108 .byte W08 .byte Ds2 , v072 @@ -1795,7 +1795,7 @@ bgm_c_road_5_B1: .byte W08 .byte En2 .byte W08 -bgm_c_road_5_000: +mus_victory_road_5_000: .byte PAN , c_v-16 .byte N02 , Dn2 , v112 .byte W08 @@ -1854,8 +1854,8 @@ bgm_c_road_5_000: .byte Cn2 .byte W08 .byte PATT - .word bgm_c_road_5_000 -bgm_c_road_5_001: + .word mus_victory_road_5_000 +mus_victory_road_5_001: .byte PAN , c_v-16 .byte N02 , Cs2 , v112 .byte W08 @@ -1886,9 +1886,9 @@ bgm_c_road_5_001: .byte W08 .byte PEND .byte PATT - .word bgm_c_road_5_000 + .word mus_victory_road_5_000 .byte PATT - .word bgm_c_road_5_001 + .word mus_victory_road_5_001 .byte PAN , c_v-16 .byte N02 , Dn2 , v112 .byte W08 @@ -1911,7 +1911,7 @@ bgm_c_road_5_001: .byte Fs2 .byte W08 .byte VOICE , 47 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte PAN , c_v+0 .byte N12 , Gs1 , v112 .byte W12 @@ -1923,33 +1923,33 @@ bgm_c_road_5_001: .byte W04 .byte N84 .byte W24 - .byte VOL , 74*bgm_c_road_mvl/mxv + .byte VOL , 74*mus_victory_road_mvl/mxv .byte W03 - .byte 71*bgm_c_road_mvl/mxv + .byte 71*mus_victory_road_mvl/mxv .byte W04 - .byte 68*bgm_c_road_mvl/mxv + .byte 68*mus_victory_road_mvl/mxv .byte W08 - .byte 65*bgm_c_road_mvl/mxv + .byte 65*mus_victory_road_mvl/mxv .byte W04 - .byte 64*bgm_c_road_mvl/mxv + .byte 64*mus_victory_road_mvl/mxv .byte W04 - .byte 61*bgm_c_road_mvl/mxv + .byte 61*mus_victory_road_mvl/mxv .byte W08 - .byte 58*bgm_c_road_mvl/mxv + .byte 58*mus_victory_road_mvl/mxv .byte W04 - .byte 56*bgm_c_road_mvl/mxv + .byte 56*mus_victory_road_mvl/mxv .byte W08 - .byte 54*bgm_c_road_mvl/mxv + .byte 54*mus_victory_road_mvl/mxv .byte W04 - .byte 51*bgm_c_road_mvl/mxv + .byte 51*mus_victory_road_mvl/mxv .byte W04 - .byte 49*bgm_c_road_mvl/mxv + .byte 49*mus_victory_road_mvl/mxv .byte W04 - .byte 46*bgm_c_road_mvl/mxv + .byte 46*mus_victory_road_mvl/mxv .byte W04 - .byte 42*bgm_c_road_mvl/mxv + .byte 42*mus_victory_road_mvl/mxv .byte W01 - .byte 76*bgm_c_road_mvl/mxv + .byte 76*mus_victory_road_mvl/mxv .byte N04 .byte W04 .byte N04 @@ -1958,35 +1958,35 @@ bgm_c_road_5_001: .byte W04 .byte N72 , Gn1 .byte W24 - .byte VOL , 74*bgm_c_road_mvl/mxv + .byte VOL , 74*mus_victory_road_mvl/mxv .byte W03 - .byte 69*bgm_c_road_mvl/mxv + .byte 69*mus_victory_road_mvl/mxv .byte W04 - .byte 66*bgm_c_road_mvl/mxv + .byte 66*mus_victory_road_mvl/mxv .byte W04 - .byte 64*bgm_c_road_mvl/mxv + .byte 64*mus_victory_road_mvl/mxv .byte W04 - .byte 61*bgm_c_road_mvl/mxv + .byte 61*mus_victory_road_mvl/mxv .byte W04 - .byte 59*bgm_c_road_mvl/mxv + .byte 59*mus_victory_road_mvl/mxv .byte W04 - .byte 56*bgm_c_road_mvl/mxv + .byte 56*mus_victory_road_mvl/mxv .byte W04 - .byte 54*bgm_c_road_mvl/mxv + .byte 54*mus_victory_road_mvl/mxv .byte W04 - .byte 50*bgm_c_road_mvl/mxv + .byte 50*mus_victory_road_mvl/mxv .byte W04 - .byte 44*bgm_c_road_mvl/mxv + .byte 44*mus_victory_road_mvl/mxv .byte W01 - .byte 47*bgm_c_road_mvl/mxv + .byte 47*mus_victory_road_mvl/mxv .byte W03 - .byte 43*bgm_c_road_mvl/mxv + .byte 43*mus_victory_road_mvl/mxv .byte W01 - .byte 46*bgm_c_road_mvl/mxv + .byte 46*mus_victory_road_mvl/mxv .byte W04 - .byte 43*bgm_c_road_mvl/mxv + .byte 43*mus_victory_road_mvl/mxv .byte W04 - .byte 76*bgm_c_road_mvl/mxv + .byte 76*mus_victory_road_mvl/mxv .byte N04 , Gn2 , v060 .byte W08 .byte Gn2 , v076 @@ -1995,37 +1995,37 @@ bgm_c_road_5_001: .byte W08 .byte N84 , Cs2 .byte W24 - .byte VOL , 71*bgm_c_road_mvl/mxv + .byte VOL , 71*mus_victory_road_mvl/mxv .byte W03 - .byte 69*bgm_c_road_mvl/mxv + .byte 69*mus_victory_road_mvl/mxv .byte W04 - .byte 67*bgm_c_road_mvl/mxv + .byte 67*mus_victory_road_mvl/mxv .byte W04 - .byte 65*bgm_c_road_mvl/mxv + .byte 65*mus_victory_road_mvl/mxv .byte W04 - .byte 64*bgm_c_road_mvl/mxv + .byte 64*mus_victory_road_mvl/mxv .byte W04 - .byte 62*bgm_c_road_mvl/mxv + .byte 62*mus_victory_road_mvl/mxv .byte W04 - .byte 60*bgm_c_road_mvl/mxv + .byte 60*mus_victory_road_mvl/mxv .byte W04 - .byte 57*bgm_c_road_mvl/mxv + .byte 57*mus_victory_road_mvl/mxv .byte W04 - .byte 55*bgm_c_road_mvl/mxv + .byte 55*mus_victory_road_mvl/mxv .byte W04 - .byte 52*bgm_c_road_mvl/mxv + .byte 52*mus_victory_road_mvl/mxv .byte W04 - .byte 50*bgm_c_road_mvl/mxv + .byte 50*mus_victory_road_mvl/mxv .byte W04 - .byte 47*bgm_c_road_mvl/mxv + .byte 47*mus_victory_road_mvl/mxv .byte W04 - .byte 44*bgm_c_road_mvl/mxv + .byte 44*mus_victory_road_mvl/mxv .byte W04 - .byte 42*bgm_c_road_mvl/mxv + .byte 42*mus_victory_road_mvl/mxv .byte W04 - .byte 41*bgm_c_road_mvl/mxv + .byte 41*mus_victory_road_mvl/mxv .byte W05 - .byte 76*bgm_c_road_mvl/mxv + .byte 76*mus_victory_road_mvl/mxv .byte N04 .byte W04 .byte N04 @@ -2034,33 +2034,33 @@ bgm_c_road_5_001: .byte W04 .byte N72 , Gn1 .byte W24 - .byte VOL , 73*bgm_c_road_mvl/mxv + .byte VOL , 73*mus_victory_road_mvl/mxv .byte W03 - .byte 69*bgm_c_road_mvl/mxv + .byte 69*mus_victory_road_mvl/mxv .byte W04 - .byte 65*bgm_c_road_mvl/mxv + .byte 65*mus_victory_road_mvl/mxv .byte W04 - .byte 64*bgm_c_road_mvl/mxv + .byte 64*mus_victory_road_mvl/mxv .byte W04 - .byte 61*bgm_c_road_mvl/mxv + .byte 61*mus_victory_road_mvl/mxv .byte W04 - .byte 57*bgm_c_road_mvl/mxv + .byte 57*mus_victory_road_mvl/mxv .byte W04 - .byte 55*bgm_c_road_mvl/mxv + .byte 55*mus_victory_road_mvl/mxv .byte W04 - .byte 52*bgm_c_road_mvl/mxv + .byte 52*mus_victory_road_mvl/mxv .byte W04 - .byte 50*bgm_c_road_mvl/mxv + .byte 50*mus_victory_road_mvl/mxv .byte W04 - .byte 47*bgm_c_road_mvl/mxv + .byte 47*mus_victory_road_mvl/mxv .byte W04 - .byte 45*bgm_c_road_mvl/mxv + .byte 45*mus_victory_road_mvl/mxv .byte W04 - .byte 44*bgm_c_road_mvl/mxv + .byte 44*mus_victory_road_mvl/mxv .byte W04 - .byte 42*bgm_c_road_mvl/mxv + .byte 42*mus_victory_road_mvl/mxv .byte W01 - .byte 76*bgm_c_road_mvl/mxv + .byte 76*mus_victory_road_mvl/mxv .byte N04 , Gn2 , v064 .byte W08 .byte Gn2 , v080 @@ -2081,7 +2081,7 @@ bgm_c_road_5_001: .byte W16 .byte N16 , Gs1 , v127 .byte W16 -bgm_c_road_5_002: +mus_victory_road_5_002: .byte N04 , Cs2 , v112 .byte W16 .byte Gs1 @@ -2093,7 +2093,7 @@ bgm_c_road_5_002: .byte N16 , Gs1 , v112 .byte W16 .byte PEND -bgm_c_road_5_003: +mus_victory_road_5_003: .byte N04 , Bn1 , v112 .byte W16 .byte Fs1 @@ -2132,9 +2132,9 @@ bgm_c_road_5_003: .byte N16 .byte W24 .byte PATT - .word bgm_c_road_5_002 + .word mus_victory_road_5_002 .byte PATT - .word bgm_c_road_5_003 + .word mus_victory_road_5_003 .byte N04 , As1 , v112 .byte W24 .byte N04 @@ -2186,7 +2186,7 @@ bgm_c_road_5_003: .byte W02 .byte N02 .byte W02 - .byte VOL , 59*bgm_c_road_mvl/mxv + .byte VOL , 59*mus_victory_road_mvl/mxv .byte N24 , Gs1 .byte W24 .byte N24 @@ -2206,80 +2206,80 @@ bgm_c_road_5_003: .byte An3 .byte W04 .byte GOTO - .word bgm_c_road_5_B1 + .word mus_victory_road_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_c_road_6: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_6: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-60 - .byte VOL , 8*bgm_c_road_mvl/mxv + .byte VOL , 8*mus_victory_road_mvl/mxv .byte N48 , Ds3 , v112 .byte W05 - .byte VOL , 9*bgm_c_road_mvl/mxv + .byte VOL , 9*mus_victory_road_mvl/mxv .byte W08 - .byte 12*bgm_c_road_mvl/mxv + .byte 12*mus_victory_road_mvl/mxv .byte W11 - .byte 13*bgm_c_road_mvl/mxv + .byte 13*mus_victory_road_mvl/mxv .byte W08 - .byte 16*bgm_c_road_mvl/mxv + .byte 16*mus_victory_road_mvl/mxv .byte W01 - .byte 17*bgm_c_road_mvl/mxv + .byte 17*mus_victory_road_mvl/mxv .byte W03 - .byte 19*bgm_c_road_mvl/mxv + .byte 19*mus_victory_road_mvl/mxv .byte W01 - .byte 22*bgm_c_road_mvl/mxv + .byte 22*mus_victory_road_mvl/mxv .byte W03 - .byte 23*bgm_c_road_mvl/mxv + .byte 23*mus_victory_road_mvl/mxv .byte W01 - .byte 26*bgm_c_road_mvl/mxv + .byte 26*mus_victory_road_mvl/mxv .byte W03 - .byte 27*bgm_c_road_mvl/mxv + .byte 27*mus_victory_road_mvl/mxv .byte W04 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte N48 , En3 .byte W01 - .byte VOL , 31*bgm_c_road_mvl/mxv + .byte VOL , 31*mus_victory_road_mvl/mxv .byte W03 - .byte 32*bgm_c_road_mvl/mxv + .byte 32*mus_victory_road_mvl/mxv .byte W01 - .byte 35*bgm_c_road_mvl/mxv + .byte 35*mus_victory_road_mvl/mxv .byte W03 - .byte 38*bgm_c_road_mvl/mxv + .byte 38*mus_victory_road_mvl/mxv .byte W01 - .byte 41*bgm_c_road_mvl/mxv + .byte 41*mus_victory_road_mvl/mxv .byte W03 - .byte 42*bgm_c_road_mvl/mxv + .byte 42*mus_victory_road_mvl/mxv .byte W01 - .byte 45*bgm_c_road_mvl/mxv + .byte 45*mus_victory_road_mvl/mxv .byte W03 - .byte 46*bgm_c_road_mvl/mxv + .byte 46*mus_victory_road_mvl/mxv .byte W01 - .byte 47*bgm_c_road_mvl/mxv + .byte 47*mus_victory_road_mvl/mxv .byte W03 - .byte 53*bgm_c_road_mvl/mxv + .byte 53*mus_victory_road_mvl/mxv .byte W08 - .byte 55*bgm_c_road_mvl/mxv + .byte 55*mus_victory_road_mvl/mxv .byte W01 - .byte 56*bgm_c_road_mvl/mxv + .byte 56*mus_victory_road_mvl/mxv .byte W03 - .byte 57*bgm_c_road_mvl/mxv + .byte 57*mus_victory_road_mvl/mxv .byte W01 - .byte 59*bgm_c_road_mvl/mxv + .byte 59*mus_victory_road_mvl/mxv .byte W03 - .byte 60*bgm_c_road_mvl/mxv + .byte 60*mus_victory_road_mvl/mxv .byte W04 - .byte 63*bgm_c_road_mvl/mxv + .byte 63*mus_victory_road_mvl/mxv .byte W05 - .byte 66*bgm_c_road_mvl/mxv + .byte 66*mus_victory_road_mvl/mxv .byte W03 - .byte 40*bgm_c_road_mvl/mxv + .byte 40*mus_victory_road_mvl/mxv .byte N04 , Fn3 .byte W48 .byte N04 @@ -2308,9 +2308,9 @@ bgm_c_road_6: .byte W24 .byte N04 .byte W72 -bgm_c_road_6_B1: +mus_victory_road_6_B1: .byte VOICE , 80 - .byte VOL , 36*bgm_c_road_mvl/mxv + .byte VOL , 36*mus_victory_road_mvl/mxv .byte N40 , Gs2 , v112 .byte W40 .byte N08 , En2 @@ -2377,7 +2377,7 @@ bgm_c_road_6_B1: .byte W24 .byte Fs2 .byte W24 - .byte VOL , 37*bgm_c_road_mvl/mxv + .byte VOL , 37*mus_victory_road_mvl/mxv .byte W24 .byte N04 , En2 .byte W08 @@ -2409,7 +2409,7 @@ bgm_c_road_6_B1: .byte W08 .byte As2 .byte W08 - .byte VOL , 47*bgm_c_road_mvl/mxv + .byte VOL , 47*mus_victory_road_mvl/mxv .byte N02 , As3 .byte W08 .byte N02 @@ -2424,7 +2424,7 @@ bgm_c_road_6_B1: .byte W08 .byte N04 .byte W08 - .byte VOL , 38*bgm_c_road_mvl/mxv + .byte VOL , 38*mus_victory_road_mvl/mxv .byte W24 .byte N04 , En2 .byte W08 @@ -2469,7 +2469,7 @@ bgm_c_road_6_B1: .byte En3 .byte W08 .byte VOICE , 87 - .byte VOL , 28*bgm_c_road_mvl/mxv + .byte VOL , 28*mus_victory_road_mvl/mxv .byte N06 , Ds4 .byte W24 .byte Ds3 @@ -2489,7 +2489,7 @@ bgm_c_road_6_B1: .byte Cn4 .byte W08 .byte VOICE , 80 - .byte VOL , 28*bgm_c_road_mvl/mxv + .byte VOL , 28*mus_victory_road_mvl/mxv .byte N02 , Gs3 .byte W04 .byte Ds3 @@ -2635,7 +2635,7 @@ bgm_c_road_6_B1: .byte As3 .byte W04 .byte VOICE , 87 - .byte VOL , 28*bgm_c_road_mvl/mxv + .byte VOL , 28*mus_victory_road_mvl/mxv .byte N04 , En3 .byte W08 .byte Cs3 @@ -2664,7 +2664,7 @@ bgm_c_road_6_B1: .byte Dn3 .byte W10 .byte VOICE , 80 - .byte VOL , 28*bgm_c_road_mvl/mxv + .byte VOL , 28*mus_victory_road_mvl/mxv .byte N02 , Gs3 , v112 .byte W04 .byte Fs3 @@ -2855,20 +2855,20 @@ bgm_c_road_6_B1: .byte N04 .byte W72 .byte GOTO - .word bgm_c_road_6_B1 + .word mus_victory_road_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_c_road_7: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_7: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 83 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 38*bgm_c_road_mvl/mxv + .byte VOL , 38*mus_victory_road_mvl/mxv .byte W96 .byte VOICE , 83 .byte N04 , Fn4 , v112 @@ -2899,9 +2899,9 @@ bgm_c_road_7: .byte W24 .byte N04 .byte W72 -bgm_c_road_7_B1: +mus_victory_road_7_B1: .byte VOICE , 82 - .byte VOL , 34*bgm_c_road_mvl/mxv + .byte VOL , 34*mus_victory_road_mvl/mxv .byte N40 , En3 , v112 .byte W24 .byte MOD , 9 @@ -3125,7 +3125,7 @@ bgm_c_road_7_B1: .byte W08 .byte Fs3 .byte W08 - .byte VOL , 28*bgm_c_road_mvl/mxv + .byte VOL , 28*mus_victory_road_mvl/mxv .byte N02 , Cs4 .byte W04 .byte Gs3 @@ -3491,34 +3491,34 @@ bgm_c_road_7_B1: .byte N04 .byte W72 .byte GOTO - .word bgm_c_road_7_B1 + .word mus_victory_road_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_c_road_8: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_8: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 71*bgm_c_road_mvl/mxv + .byte VOL , 71*mus_victory_road_mvl/mxv .byte W96 -bgm_c_road_8_000: +mus_victory_road_8_000: .byte N48 , An2 , v112 .byte W48 .byte N48 .byte W48 .byte PEND -bgm_c_road_8_001: +mus_victory_road_8_001: .byte N24 , Gn2 , v112 .byte W24 .byte An2 .byte W72 .byte PEND .byte PATT - .word bgm_c_road_8_000 + .word mus_victory_road_8_000 .byte PATT - .word bgm_c_road_8_001 -bgm_c_road_8_B1: + .word mus_victory_road_8_001 +mus_victory_road_8_B1: .byte W96 .byte W96 .byte W96 @@ -3560,35 +3560,35 @@ bgm_c_road_8_B1: .byte N48 .byte W72 .byte PATT - .word bgm_c_road_8_000 + .word mus_victory_road_8_000 .byte PATT - .word bgm_c_road_8_001 + .word mus_victory_road_8_001 .byte PATT - .word bgm_c_road_8_000 + .word mus_victory_road_8_000 .byte PATT - .word bgm_c_road_8_001 + .word mus_victory_road_8_001 .byte GOTO - .word bgm_c_road_8_B1 + .word mus_victory_road_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_c_road_9: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_9: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 38*bgm_c_road_mvl/mxv + .byte VOL , 38*mus_victory_road_mvl/mxv .byte N48 , Ds4 , v112 .byte W48 .byte En4 .byte W48 .byte VOICE , 84 .byte PAN , c_v+0 - .byte VOL , 57*bgm_c_road_mvl/mxv + .byte VOL , 57*mus_victory_road_mvl/mxv .byte N14 , Fn1 .byte W48 .byte N14 @@ -3623,10 +3623,10 @@ bgm_c_road_9: .byte W08 .byte N24 .byte W24 -bgm_c_road_9_B1: +mus_victory_road_9_B1: .byte VOICE , 48 .byte PAN , c_v-32 - .byte VOL , 31*bgm_c_road_mvl/mxv + .byte VOL , 31*mus_victory_road_mvl/mxv .byte N36 , Cs4 , v108 .byte W24 .byte MOD , 3 @@ -3660,32 +3660,32 @@ bgm_c_road_9_B1: .byte N96 , Gs4 .byte W48 .byte MOD , 3 - .byte VOL , 31*bgm_c_road_mvl/mxv + .byte VOL , 31*mus_victory_road_mvl/mxv .byte W04 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte W04 - .byte 28*bgm_c_road_mvl/mxv + .byte 28*mus_victory_road_mvl/mxv .byte W04 - .byte 26*bgm_c_road_mvl/mxv + .byte 26*mus_victory_road_mvl/mxv .byte W04 - .byte 24*bgm_c_road_mvl/mxv + .byte 24*mus_victory_road_mvl/mxv .byte W04 - .byte 22*bgm_c_road_mvl/mxv + .byte 22*mus_victory_road_mvl/mxv .byte W04 - .byte 20*bgm_c_road_mvl/mxv + .byte 20*mus_victory_road_mvl/mxv .byte W04 - .byte 19*bgm_c_road_mvl/mxv + .byte 19*mus_victory_road_mvl/mxv .byte W04 - .byte 17*bgm_c_road_mvl/mxv + .byte 17*mus_victory_road_mvl/mxv .byte W04 - .byte 14*bgm_c_road_mvl/mxv + .byte 14*mus_victory_road_mvl/mxv .byte W04 - .byte 13*bgm_c_road_mvl/mxv + .byte 13*mus_victory_road_mvl/mxv .byte W04 - .byte 11*bgm_c_road_mvl/mxv + .byte 11*mus_victory_road_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 32*bgm_c_road_mvl/mxv + .byte VOL , 32*mus_victory_road_mvl/mxv .byte N04 , Dn4 .byte W08 .byte An3 @@ -3723,7 +3723,7 @@ bgm_c_road_9_B1: .byte 0 .byte W72 .byte VOICE , 84 - .byte VOL , 57*bgm_c_road_mvl/mxv + .byte VOL , 57*mus_victory_road_mvl/mxv .byte PAN , c_v+0 .byte W12 .byte N02 , Cs1 @@ -3732,7 +3732,7 @@ bgm_c_road_9_B1: .byte W04 .byte Cs1 , v112 .byte W04 -bgm_c_road_9_000: +mus_victory_road_9_000: .byte N84 , Cs1 , v112 .byte W88 .byte N04 , Cs2 @@ -3752,7 +3752,7 @@ bgm_c_road_9_000: .byte Dn1 .byte W08 .byte PATT - .word bgm_c_road_9_000 + .word mus_victory_road_9_000 .byte N48 , Gn2 , v112 .byte W24 .byte MOD , 5 @@ -3778,7 +3778,7 @@ bgm_c_road_9_000: .byte W04 .byte N04 , Gs1 .byte W32 - .byte VOL , 57*bgm_c_road_mvl/mxv + .byte VOL , 57*mus_victory_road_mvl/mxv .byte N04 , Cs2 .byte W16 .byte Gs1 @@ -3800,7 +3800,7 @@ bgm_c_road_9_000: .byte W08 .byte Cs2 .byte W08 -bgm_c_road_9_001: +mus_victory_road_9_001: .byte N04 , Bn1 , v112 .byte W16 .byte Fs1 @@ -3820,7 +3820,7 @@ bgm_c_road_9_001: .byte Bn1 .byte W08 .byte PEND -bgm_c_road_9_002: +mus_victory_road_9_002: .byte N04 , As1 , v112 .byte W16 .byte Fs1 @@ -3840,7 +3840,7 @@ bgm_c_road_9_002: .byte As1 .byte W08 .byte PEND -bgm_c_road_9_003: +mus_victory_road_9_003: .byte N04 , An1 , v112 .byte W16 .byte En1 @@ -3879,12 +3879,12 @@ bgm_c_road_9_003: .byte Cs2 .byte W08 .byte PATT - .word bgm_c_road_9_001 + .word mus_victory_road_9_001 .byte PATT - .word bgm_c_road_9_002 + .word mus_victory_road_9_002 .byte PATT - .word bgm_c_road_9_003 -bgm_c_road_9_004: + .word mus_victory_road_9_003 +mus_victory_road_9_004: .byte N04 , Gs1 , v112 .byte W48 .byte N04 @@ -3905,37 +3905,37 @@ bgm_c_road_9_004: .byte N04 , Ds1 .byte W08 .byte PATT - .word bgm_c_road_9_004 + .word mus_victory_road_9_004 .byte N04 , Gs1 , v112 .byte W24 .byte N04 .byte W72 .byte GOTO - .word bgm_c_road_9_B1 + .word mus_victory_road_9_B1 .byte FINE @********************** Track 10 **********************@ -bgm_c_road_10: - .byte KEYSH , bgm_c_road_key+0 +mus_victory_road_10: + .byte KEYSH , mus_victory_road_key+0 .byte VOICE , 56 .byte LFOS , 44 .byte BENDR , 12 - .byte VOL , 71*bgm_c_road_mvl/mxv + .byte VOL , 71*mus_victory_road_mvl/mxv .byte PAN , c_v-19 .byte W96 .byte W96 .byte W96 .byte W96 .byte W96 -bgm_c_road_10_B1: +mus_victory_road_10_B1: .byte W96 .byte W96 .byte W96 .byte W96 .byte VOICE , 56 .byte PAN , c_v-40 - .byte VOL , 50*bgm_c_road_mvl/mxv + .byte VOL , 50*mus_victory_road_mvl/mxv .byte W48 .byte N04 , En3 , v112 .byte W16 @@ -3973,7 +3973,7 @@ bgm_c_road_10_B1: .byte W24 .byte VOICE , 14 .byte PAN , c_v-32 - .byte VOL , 76*bgm_c_road_mvl/mxv + .byte VOL , 76*mus_victory_road_mvl/mxv .byte N96 , Cs3 , v088 .byte W96 .byte PAN , c_v+32 @@ -4008,29 +4008,29 @@ bgm_c_road_10_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_c_road_10_B1 + .word mus_victory_road_10_B1 .byte FINE @******************************************************@ .align 2 -bgm_c_road: +mus_victory_road: .byte 10 @ NumTrks .byte 0 @ NumBlks - .byte bgm_c_road_pri @ Priority - .byte bgm_c_road_rev @ Reverb. + .byte mus_victory_road_pri @ Priority + .byte mus_victory_road_rev @ Reverb. - .word bgm_c_road_grp + .word mus_victory_road_grp - .word bgm_c_road_1 - .word bgm_c_road_2 - .word bgm_c_road_3 - .word bgm_c_road_4 - .word bgm_c_road_5 - .word bgm_c_road_6 - .word bgm_c_road_7 - .word bgm_c_road_8 - .word bgm_c_road_9 - .word bgm_c_road_10 + .word mus_victory_road_1 + .word mus_victory_road_2 + .word mus_victory_road_3 + .word mus_victory_road_4 + .word mus_victory_road_5 + .word mus_victory_road_6 + .word mus_victory_road_7 + .word mus_victory_road_8 + .word mus_victory_road_9 + .word mus_victory_road_10 .end diff --git a/sound/songs/bgm_kachi1.s b/sound/songs/mus_victory_trainer.s index 9fa0fd0fa..b69dfe963 100644 --- a/sound/songs/bgm_kachi1.s +++ b/sound/songs/mus_victory_trainer.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_kachi1_grp, voicegroup055 - .equ bgm_kachi1_pri, 0 - .equ bgm_kachi1_rev, reverb_set+50 - .equ bgm_kachi1_mvl, 127 - .equ bgm_kachi1_key, 0 - .equ bgm_kachi1_tbs, 1 - .equ bgm_kachi1_exg, 0 - .equ bgm_kachi1_cmp, 1 + .equ mus_victory_trainer_grp, voicegroup055 + .equ mus_victory_trainer_pri, 0 + .equ mus_victory_trainer_rev, reverb_set+50 + .equ mus_victory_trainer_mvl, 127 + .equ mus_victory_trainer_key, 0 + .equ mus_victory_trainer_tbs, 1 + .equ mus_victory_trainer_exg, 0 + .equ mus_victory_trainer_cmp, 1 .section .rodata - .global bgm_kachi1 + .global mus_victory_trainer .align 2 @********************** Track 1 **********************@ -bgm_kachi1_1: - .byte KEYSH , bgm_kachi1_key+0 - .byte TEMPO , 136*bgm_kachi1_tbs/2 +mus_victory_trainer_1: + .byte KEYSH , mus_victory_trainer_key+0 + .byte TEMPO , 136*mus_victory_trainer_tbs/2 .byte W08 .byte VOICE , 56 .byte PAN , c_v-16 - .byte VOL , 89*bgm_kachi1_mvl/mxv + .byte VOL , 89*mus_victory_trainer_mvl/mxv .byte N02 , Dn3 , v112 .byte W02 .byte Ds3 @@ -52,32 +52,32 @@ bgm_kachi1_1: .byte W06 .byte N08 , An3 , v112 .byte W08 - .byte VOL , 34*bgm_kachi1_mvl/mxv + .byte VOL , 34*mus_victory_trainer_mvl/mxv .byte N24 , Bn3 .byte W02 - .byte VOL , 37*bgm_kachi1_mvl/mxv + .byte VOL , 37*mus_victory_trainer_mvl/mxv .byte W02 - .byte 40*bgm_kachi1_mvl/mxv + .byte 40*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 49*bgm_kachi1_mvl/mxv + .byte 49*mus_victory_trainer_mvl/mxv .byte W02 - .byte 54*bgm_kachi1_mvl/mxv + .byte 54*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 72*bgm_kachi1_mvl/mxv + .byte 72*mus_victory_trainer_mvl/mxv .byte W02 - .byte 78*bgm_kachi1_mvl/mxv + .byte 78*mus_victory_trainer_mvl/mxv .byte W02 - .byte 85*bgm_kachi1_mvl/mxv + .byte 85*mus_victory_trainer_mvl/mxv .byte W02 - .byte 91*bgm_kachi1_mvl/mxv + .byte 91*mus_victory_trainer_mvl/mxv .byte W02 - .byte 89*bgm_kachi1_mvl/mxv + .byte 89*mus_victory_trainer_mvl/mxv .byte PAN , c_v-32 .byte N08 , Gn4 , v096 .byte W08 @@ -94,7 +94,7 @@ bgm_kachi1_1: .byte W04 .byte Fs4 .byte W04 -bgm_kachi1_1_B1: +mus_victory_trainer_1_B1: .byte W96 .byte W96 .byte W96 @@ -104,35 +104,35 @@ bgm_kachi1_1_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_kachi1_1_B1 + .word mus_victory_trainer_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_kachi1_2: - .byte KEYSH , bgm_kachi1_key+0 +mus_victory_trainer_2: + .byte KEYSH , mus_victory_trainer_key+0 .byte W08 .byte VOICE , 17 .byte PAN , c_v+0 - .byte VOL , 85*bgm_kachi1_mvl/mxv + .byte VOL , 85*mus_victory_trainer_mvl/mxv .byte W08 .byte W84 .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 59*bgm_kachi1_mvl/mxv + .byte 59*mus_victory_trainer_mvl/mxv .byte N08 , As3 , v096 .byte W02 - .byte VOL , 69*bgm_kachi1_mvl/mxv + .byte VOL , 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 75*bgm_kachi1_mvl/mxv + .byte 75*mus_victory_trainer_mvl/mxv .byte W02 - .byte 81*bgm_kachi1_mvl/mxv + .byte 81*mus_victory_trainer_mvl/mxv .byte W02 -bgm_kachi1_2_B1: - .byte VOL , 55*bgm_kachi1_mvl/mxv +mus_victory_trainer_2_B1: + .byte VOL , 55*mus_victory_trainer_mvl/mxv .byte PAN , c_v-16 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , Bn3 , v096 .byte W04 .byte Bn3 , v036 @@ -147,34 +147,34 @@ bgm_kachi1_2_B1: .byte W02 .byte An3 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , Bn3 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , En4 .byte W04 .byte En4 , v036 @@ -189,34 +189,34 @@ bgm_kachi1_2_B1: .byte W02 .byte Ds4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , En4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , Dn4 .byte W04 .byte Dn4 , v036 @@ -231,34 +231,34 @@ bgm_kachi1_2_B1: .byte W02 .byte N02 , Gn4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , Fs4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , Cn4 .byte W04 .byte Cn4 , v036 @@ -273,34 +273,34 @@ bgm_kachi1_2_B1: .byte W02 .byte N02 , Fn4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , En4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , Bn3 .byte W04 .byte Bn3 , v036 @@ -315,34 +315,34 @@ bgm_kachi1_2_B1: .byte W02 .byte As3 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , Bn3 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , En4 .byte W04 .byte En4 , v036 @@ -357,34 +357,34 @@ bgm_kachi1_2_B1: .byte W02 .byte Ds4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , En4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , Dn4 .byte W04 .byte Dn4 , v036 @@ -399,34 +399,34 @@ bgm_kachi1_2_B1: .byte W02 .byte Gn4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , Fs4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , Gn4 .byte W04 .byte Gn4 , v036 @@ -441,34 +441,34 @@ bgm_kachi1_2_B1: .byte W02 .byte Gn4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , Fs4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , Bn3 .byte W04 .byte Bn3 , v036 @@ -483,34 +483,34 @@ bgm_kachi1_2_B1: .byte W02 .byte An3 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , Bn3 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , En4 .byte W04 .byte En4 , v036 @@ -525,34 +525,34 @@ bgm_kachi1_2_B1: .byte W02 .byte Ds4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , En4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , Dn4 .byte W04 .byte Dn4 , v036 @@ -567,34 +567,34 @@ bgm_kachi1_2_B1: .byte W02 .byte Ds4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , Dn4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N04 , En4 .byte W04 .byte En4 , v036 @@ -609,194 +609,194 @@ bgm_kachi1_2_B1: .byte W02 .byte Fn4 , v096 .byte W02 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N22 , En4 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 23*bgm_kachi1_mvl/mxv + .byte VOL , 23*mus_victory_trainer_mvl/mxv .byte N02 , Ds4 .byte W02 - .byte VOL , 23*bgm_kachi1_mvl/mxv + .byte VOL , 23*mus_victory_trainer_mvl/mxv .byte N44 , Dn4 .byte W02 - .byte VOL , 24*bgm_kachi1_mvl/mxv + .byte VOL , 24*mus_victory_trainer_mvl/mxv .byte W02 - .byte 25*bgm_kachi1_mvl/mxv + .byte 25*mus_victory_trainer_mvl/mxv .byte W02 - .byte 26*bgm_kachi1_mvl/mxv + .byte 26*mus_victory_trainer_mvl/mxv .byte W02 - .byte 28*bgm_kachi1_mvl/mxv + .byte 28*mus_victory_trainer_mvl/mxv .byte W02 - .byte 29*bgm_kachi1_mvl/mxv + .byte 29*mus_victory_trainer_mvl/mxv .byte W04 - .byte 32*bgm_kachi1_mvl/mxv + .byte 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 36*bgm_kachi1_mvl/mxv + .byte 36*mus_victory_trainer_mvl/mxv .byte W02 - .byte 40*bgm_kachi1_mvl/mxv + .byte 40*mus_victory_trainer_mvl/mxv .byte W02 - .byte 42*bgm_kachi1_mvl/mxv + .byte 42*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 51*bgm_kachi1_mvl/mxv + .byte 51*mus_victory_trainer_mvl/mxv .byte W02 - .byte 54*bgm_kachi1_mvl/mxv + .byte 54*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W06 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 .byte W06 .byte 0 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N02 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte N02 .byte W02 - .byte VOL , 44*bgm_kachi1_mvl/mxv + .byte VOL , 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte N02 .byte W02 - .byte VOL , 52*bgm_kachi1_mvl/mxv + .byte VOL , 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte N02 .byte W02 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte N02 .byte W08 .byte N08 , Ds4 .byte W08 .byte N04 , Dn4 .byte W08 - .byte VOL , 23*bgm_kachi1_mvl/mxv + .byte VOL , 23*mus_victory_trainer_mvl/mxv .byte N02 .byte W02 - .byte VOL , 23*bgm_kachi1_mvl/mxv + .byte VOL , 23*mus_victory_trainer_mvl/mxv .byte N44 , Cs4 .byte W02 - .byte VOL , 24*bgm_kachi1_mvl/mxv + .byte VOL , 24*mus_victory_trainer_mvl/mxv .byte W02 - .byte 25*bgm_kachi1_mvl/mxv + .byte 25*mus_victory_trainer_mvl/mxv .byte W02 - .byte 26*bgm_kachi1_mvl/mxv + .byte 26*mus_victory_trainer_mvl/mxv .byte W02 - .byte 28*bgm_kachi1_mvl/mxv + .byte 28*mus_victory_trainer_mvl/mxv .byte W02 - .byte 29*bgm_kachi1_mvl/mxv + .byte 29*mus_victory_trainer_mvl/mxv .byte W04 - .byte 32*bgm_kachi1_mvl/mxv + .byte 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 36*bgm_kachi1_mvl/mxv + .byte 36*mus_victory_trainer_mvl/mxv .byte W02 - .byte 40*bgm_kachi1_mvl/mxv + .byte 40*mus_victory_trainer_mvl/mxv .byte W02 - .byte 42*bgm_kachi1_mvl/mxv + .byte 42*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 51*bgm_kachi1_mvl/mxv + .byte 51*mus_victory_trainer_mvl/mxv .byte W02 - .byte 54*bgm_kachi1_mvl/mxv + .byte 54*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W06 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 .byte W06 .byte 0 - .byte VOL , 29*bgm_kachi1_mvl/mxv + .byte VOL , 29*mus_victory_trainer_mvl/mxv .byte N24 , An3 .byte W02 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 38*bgm_kachi1_mvl/mxv + .byte 38*mus_victory_trainer_mvl/mxv .byte W02 - .byte 41*bgm_kachi1_mvl/mxv + .byte 41*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 60*bgm_kachi1_mvl/mxv + .byte VOL , 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N16 , Bn3 .byte W16 .byte N08 , An3 .byte W08 .byte GOTO - .word bgm_kachi1_2_B1 + .word mus_victory_trainer_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_kachi1_3: - .byte KEYSH , bgm_kachi1_key+0 +mus_victory_trainer_3: + .byte KEYSH , mus_victory_trainer_key+0 .byte W08 .byte VOICE , 58 .byte PAN , c_v+0 - .byte VOL , 91*bgm_kachi1_mvl/mxv + .byte VOL , 91*mus_victory_trainer_mvl/mxv .byte BEND , c_v+0 .byte N02 , As1 , v112 .byte W02 @@ -843,7 +843,7 @@ bgm_kachi1_3: .byte W04 .byte Fs1 .byte W04 -bgm_kachi1_3_B1: +mus_victory_trainer_3_B1: .byte VOICE , 35 .byte N04 , Gn1 , v112 .byte W04 @@ -1146,18 +1146,18 @@ bgm_kachi1_3_B1: .byte N04 , Gn1 , v036 .byte W06 .byte GOTO - .word bgm_kachi1_3_B1 + .word mus_victory_trainer_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_kachi1_4: - .byte KEYSH , bgm_kachi1_key+0 +mus_victory_trainer_4: + .byte KEYSH , mus_victory_trainer_key+0 .byte W08 .byte VOICE , 56 .byte LFOS , 44 .byte PAN , c_v+16 - .byte VOL , 90*bgm_kachi1_mvl/mxv + .byte VOL , 90*mus_victory_trainer_mvl/mxv .byte N02 , As3 , v112 .byte W02 .byte Bn3 @@ -1188,34 +1188,34 @@ bgm_kachi1_4: .byte W04 .byte N08 , Fs4 , v112 .byte W08 - .byte VOL , 34*bgm_kachi1_mvl/mxv + .byte VOL , 34*mus_victory_trainer_mvl/mxv .byte N24 , Gn4 .byte W02 - .byte VOL , 37*bgm_kachi1_mvl/mxv + .byte VOL , 37*mus_victory_trainer_mvl/mxv .byte W02 - .byte 40*bgm_kachi1_mvl/mxv + .byte 40*mus_victory_trainer_mvl/mxv .byte W02 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte W02 - .byte 49*bgm_kachi1_mvl/mxv + .byte 49*mus_victory_trainer_mvl/mxv .byte W02 - .byte 54*bgm_kachi1_mvl/mxv + .byte 54*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 67*bgm_kachi1_mvl/mxv + .byte 67*mus_victory_trainer_mvl/mxv .byte W02 .byte VOICE , 56 - .byte VOL , 72*bgm_kachi1_mvl/mxv + .byte VOL , 72*mus_victory_trainer_mvl/mxv .byte W02 - .byte 78*bgm_kachi1_mvl/mxv + .byte 78*mus_victory_trainer_mvl/mxv .byte W02 - .byte 85*bgm_kachi1_mvl/mxv + .byte 85*mus_victory_trainer_mvl/mxv .byte W02 - .byte 91*bgm_kachi1_mvl/mxv + .byte 91*mus_victory_trainer_mvl/mxv .byte W02 .byte PAN , c_v+32 - .byte VOL , 89*bgm_kachi1_mvl/mxv + .byte VOL , 89*mus_victory_trainer_mvl/mxv .byte N08 , Dn5 , v096 .byte W08 .byte PAN , c_v+0 @@ -1237,10 +1237,10 @@ bgm_kachi1_4: .byte W02 .byte Dn4 , v032 .byte W02 -bgm_kachi1_4_B1: +mus_victory_trainer_4_B1: .byte VOICE , 17 .byte PAN , c_v+16 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , Gn4 , v112 .byte W04 .byte Gn4 , v036 @@ -1255,32 +1255,32 @@ bgm_kachi1_4_B1: .byte W02 .byte Fs4 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , Gn4 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , An4 .byte W04 .byte An4 , v036 @@ -1295,32 +1295,32 @@ bgm_kachi1_4_B1: .byte W02 .byte Gs4 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , An4 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , Bn4 .byte W04 .byte Bn4 , v036 @@ -1335,32 +1335,32 @@ bgm_kachi1_4_B1: .byte W02 .byte Ds5 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , Dn5 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , An4 .byte W04 .byte An4 , v036 @@ -1375,33 +1375,33 @@ bgm_kachi1_4_B1: .byte W02 .byte Cs5 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , Cn5 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 -bgm_kachi1_4_000: +mus_victory_trainer_4_000: .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , Gn4 , v112 .byte W04 .byte Gn4 , v036 @@ -1416,32 +1416,32 @@ bgm_kachi1_4_000: .byte W02 .byte Fs4 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , Gn4 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , An4 .byte W04 .byte An4 , v036 @@ -1456,33 +1456,33 @@ bgm_kachi1_4_000: .byte W02 .byte Gs4 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , An4 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte PEND .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , Bn4 .byte W04 .byte Bn4 , v036 @@ -1497,32 +1497,32 @@ bgm_kachi1_4_000: .byte W02 .byte Ds5 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , Dn5 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , Bn4 .byte W04 .byte Bn4 , v036 @@ -1537,34 +1537,34 @@ bgm_kachi1_4_000: .byte W02 .byte Ds5 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , Dn5 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte PATT - .word bgm_kachi1_4_000 + .word mus_victory_trainer_4_000 .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , As4 , v112 .byte W04 .byte As4 , v036 @@ -1579,32 +1579,32 @@ bgm_kachi1_4_000: .byte W02 .byte Bn4 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , As4 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , Cn5 .byte W04 .byte Cn5 , v036 @@ -1619,66 +1619,66 @@ bgm_kachi1_4_000: .byte W02 .byte Cs5 , v112 .byte W02 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N22 , Cn5 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W02 .byte N02 , Cn5 , v036 .byte W02 .byte MOD , 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N02 , Cn5 , v112 .byte W02 .byte N44 , Bn4 .byte W04 - .byte VOL , 47*bgm_kachi1_mvl/mxv + .byte VOL , 47*mus_victory_trainer_mvl/mxv .byte W06 - .byte 49*bgm_kachi1_mvl/mxv + .byte 49*mus_victory_trainer_mvl/mxv .byte W02 - .byte 49*bgm_kachi1_mvl/mxv + .byte 49*mus_victory_trainer_mvl/mxv .byte W02 - .byte 51*bgm_kachi1_mvl/mxv + .byte 51*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 55*bgm_kachi1_mvl/mxv + .byte 55*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 63*bgm_kachi1_mvl/mxv + .byte 63*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 76*bgm_kachi1_mvl/mxv + .byte 76*mus_victory_trainer_mvl/mxv .byte W02 - .byte 85*bgm_kachi1_mvl/mxv + .byte 85*mus_victory_trainer_mvl/mxv .byte W02 - .byte 85*bgm_kachi1_mvl/mxv + .byte 85*mus_victory_trainer_mvl/mxv .byte W10 .byte MOD , 6 .byte W06 .byte 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N02 .byte W08 .byte N02 @@ -1697,70 +1697,70 @@ bgm_kachi1_4_000: .byte W04 .byte Bn4 , v036 .byte W04 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N02 , As4 , v112 .byte W02 .byte N44 , An4 .byte W04 - .byte VOL , 47*bgm_kachi1_mvl/mxv + .byte VOL , 47*mus_victory_trainer_mvl/mxv .byte W02 - .byte 49*bgm_kachi1_mvl/mxv + .byte 49*mus_victory_trainer_mvl/mxv .byte W02 - .byte 50*bgm_kachi1_mvl/mxv + .byte 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 51*bgm_kachi1_mvl/mxv + .byte 51*mus_victory_trainer_mvl/mxv .byte W02 - .byte 54*bgm_kachi1_mvl/mxv + .byte 54*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 65*bgm_kachi1_mvl/mxv + .byte 65*mus_victory_trainer_mvl/mxv .byte W02 - .byte 72*bgm_kachi1_mvl/mxv + .byte 72*mus_victory_trainer_mvl/mxv .byte W02 - .byte 76*bgm_kachi1_mvl/mxv + .byte 76*mus_victory_trainer_mvl/mxv .byte W02 - .byte 78*bgm_kachi1_mvl/mxv + .byte 78*mus_victory_trainer_mvl/mxv .byte W02 - .byte 81*bgm_kachi1_mvl/mxv + .byte 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 84*bgm_kachi1_mvl/mxv + .byte 84*mus_victory_trainer_mvl/mxv .byte W08 .byte MOD , 6 .byte W06 .byte 0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte N24 , En4 .byte W02 - .byte VOL , 50*bgm_kachi1_mvl/mxv + .byte VOL , 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 56*bgm_kachi1_mvl/mxv + .byte 56*mus_victory_trainer_mvl/mxv .byte W02 - .byte 57*bgm_kachi1_mvl/mxv + .byte 57*mus_victory_trainer_mvl/mxv .byte W02 - .byte 60*bgm_kachi1_mvl/mxv + .byte 60*mus_victory_trainer_mvl/mxv .byte W02 - .byte 64*bgm_kachi1_mvl/mxv + .byte 64*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 - .byte 74*bgm_kachi1_mvl/mxv + .byte 74*mus_victory_trainer_mvl/mxv .byte W02 .byte MOD , 6 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte W02 - .byte 87*bgm_kachi1_mvl/mxv + .byte 87*mus_victory_trainer_mvl/mxv .byte W04 .byte MOD , 0 - .byte VOL , 81*bgm_kachi1_mvl/mxv + .byte VOL , 81*mus_victory_trainer_mvl/mxv .byte N04 , Bn3 , v064 .byte W04 .byte Cn4 @@ -1774,19 +1774,19 @@ bgm_kachi1_4_000: .byte Fs4 .byte W04 .byte GOTO - .word bgm_kachi1_4_B1 + .word mus_victory_trainer_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_kachi1_5: - .byte KEYSH , bgm_kachi1_key+0 +mus_victory_trainer_5: + .byte KEYSH , mus_victory_trainer_key+0 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte W08 .byte VOICE , 75 .byte PAN , c_v+0 - .byte VOL , 46*bgm_kachi1_mvl/mxv + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte W08 .byte PAN , c_v+0 .byte LFOS , 36 @@ -1799,8 +1799,8 @@ bgm_kachi1_5: .byte W08 .byte Fs3 .byte W08 -bgm_kachi1_5_B1: - .byte VOL , 46*bgm_kachi1_mvl/mxv +mus_victory_trainer_5_B1: + .byte VOL , 46*mus_victory_trainer_mvl/mxv .byte BEND , c_v-5 .byte N04 , Gn4 , v112 .byte W08 @@ -1853,7 +1853,7 @@ bgm_kachi1_5_B1: .byte W12 .byte MOD , 6 .byte W12 -bgm_kachi1_5_000: +mus_victory_trainer_5_000: .byte MOD , 0 .byte N04 , Gn4 , v112 .byte W08 @@ -1904,7 +1904,7 @@ bgm_kachi1_5_000: .byte MOD , 6 .byte W12 .byte PATT - .word bgm_kachi1_5_000 + .word mus_victory_trainer_5_000 .byte MOD , 0 .byte N04 , As4 , v112 .byte W08 @@ -1986,19 +1986,19 @@ bgm_kachi1_5_000: .byte Fs5 .byte W04 .byte GOTO - .word bgm_kachi1_5_B1 + .word mus_victory_trainer_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_kachi1_6: - .byte KEYSH , bgm_kachi1_key+0 +mus_victory_trainer_6: + .byte KEYSH , mus_victory_trainer_key+0 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte W08 .byte VOICE , 83 .byte PAN , c_v-62 - .byte VOL , 57*bgm_kachi1_mvl/mxv + .byte VOL , 57*mus_victory_trainer_mvl/mxv .byte N02 , As2 , v112 .byte W02 .byte Bn2 @@ -2030,58 +2030,58 @@ bgm_kachi1_6: .byte W06 .byte N08 , An2 , v112 .byte W08 - .byte VOL , 23*bgm_kachi1_mvl/mxv + .byte VOL , 23*mus_victory_trainer_mvl/mxv .byte N24 , Gn2 .byte W02 - .byte VOL , 26*bgm_kachi1_mvl/mxv + .byte VOL , 26*mus_victory_trainer_mvl/mxv .byte W02 - .byte 27*bgm_kachi1_mvl/mxv + .byte 27*mus_victory_trainer_mvl/mxv .byte W02 - .byte 29*bgm_kachi1_mvl/mxv + .byte 29*mus_victory_trainer_mvl/mxv .byte W02 - .byte 34*bgm_kachi1_mvl/mxv + .byte 34*mus_victory_trainer_mvl/mxv .byte W02 - .byte 40*bgm_kachi1_mvl/mxv + .byte 40*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte MOD , 8 .byte W02 - .byte VOL , 52*bgm_kachi1_mvl/mxv + .byte VOL , 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 59*bgm_kachi1_mvl/mxv + .byte 59*mus_victory_trainer_mvl/mxv .byte W02 - .byte 62*bgm_kachi1_mvl/mxv + .byte 62*mus_victory_trainer_mvl/mxv .byte W04 - .byte 15*bgm_kachi1_mvl/mxv + .byte 15*mus_victory_trainer_mvl/mxv .byte MOD , 0 .byte N24 , Bn2 .byte W04 - .byte VOL , 17*bgm_kachi1_mvl/mxv + .byte VOL , 17*mus_victory_trainer_mvl/mxv .byte W02 - .byte 21*bgm_kachi1_mvl/mxv + .byte 21*mus_victory_trainer_mvl/mxv .byte W02 - .byte 23*bgm_kachi1_mvl/mxv + .byte 23*mus_victory_trainer_mvl/mxv .byte W02 - .byte 27*bgm_kachi1_mvl/mxv + .byte 27*mus_victory_trainer_mvl/mxv .byte W02 - .byte 33*bgm_kachi1_mvl/mxv + .byte 33*mus_victory_trainer_mvl/mxv .byte MOD , 8 .byte W02 - .byte VOL , 39*bgm_kachi1_mvl/mxv + .byte VOL , 39*mus_victory_trainer_mvl/mxv .byte W02 - .byte 44*bgm_kachi1_mvl/mxv + .byte 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 50*bgm_kachi1_mvl/mxv + .byte 50*mus_victory_trainer_mvl/mxv .byte W02 - .byte 61*bgm_kachi1_mvl/mxv + .byte 61*mus_victory_trainer_mvl/mxv .byte W02 - .byte 69*bgm_kachi1_mvl/mxv + .byte 69*mus_victory_trainer_mvl/mxv .byte W02 -bgm_kachi1_6_B1: +mus_victory_trainer_6_B1: .byte VOICE , 80 - .byte VOL , 31*bgm_kachi1_mvl/mxv + .byte VOL , 31*mus_victory_trainer_mvl/mxv .byte PAN , c_v+0 .byte MOD , 0 .byte N02 , Bn3 , v096 @@ -2180,7 +2180,7 @@ bgm_kachi1_6_B1: .byte W04 .byte En4 , v032 .byte W04 -bgm_kachi1_6_000: +mus_victory_trainer_6_000: .byte N02 , Bn3 , v096 .byte W04 .byte Bn3 , v032 @@ -2267,7 +2267,7 @@ bgm_kachi1_6_000: .byte Cn4 .byte W04 .byte PATT - .word bgm_kachi1_6_000 + .word mus_victory_trainer_6_000 .byte N02 , As3 , v096 .byte W04 .byte As3 , v032 @@ -2415,19 +2415,19 @@ bgm_kachi1_6_000: .byte Gn3 .byte W04 .byte GOTO - .word bgm_kachi1_6_B1 + .word mus_victory_trainer_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_kachi1_7: - .byte KEYSH , bgm_kachi1_key+0 +mus_victory_trainer_7: + .byte KEYSH , mus_victory_trainer_key+0 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte W08 .byte VOICE , 82 .byte PAN , c_v+63 - .byte VOL , 57*bgm_kachi1_mvl/mxv + .byte VOL , 57*mus_victory_trainer_mvl/mxv .byte W02 .byte N02 , Ds3 , v112 .byte W02 @@ -2460,37 +2460,37 @@ bgm_kachi1_7: .byte W04 .byte An3 , v036 .byte W04 - .byte VOL , 23*bgm_kachi1_mvl/mxv + .byte VOL , 23*mus_victory_trainer_mvl/mxv .byte N24 , Bn3 , v112 .byte W02 - .byte VOL , 24*bgm_kachi1_mvl/mxv + .byte VOL , 24*mus_victory_trainer_mvl/mxv .byte W02 - .byte 29*bgm_kachi1_mvl/mxv + .byte 29*mus_victory_trainer_mvl/mxv .byte W04 - .byte 32*bgm_kachi1_mvl/mxv + .byte 32*mus_victory_trainer_mvl/mxv .byte W02 - .byte 37*bgm_kachi1_mvl/mxv + .byte 37*mus_victory_trainer_mvl/mxv .byte W02 - .byte 43*bgm_kachi1_mvl/mxv + .byte 43*mus_victory_trainer_mvl/mxv .byte MOD , 8 .byte W02 - .byte VOL , 44*bgm_kachi1_mvl/mxv + .byte VOL , 44*mus_victory_trainer_mvl/mxv .byte W02 - .byte 52*bgm_kachi1_mvl/mxv + .byte 52*mus_victory_trainer_mvl/mxv .byte W02 - .byte 62*bgm_kachi1_mvl/mxv + .byte 62*mus_victory_trainer_mvl/mxv .byte W02 - .byte 65*bgm_kachi1_mvl/mxv + .byte 65*mus_victory_trainer_mvl/mxv .byte W04 - .byte 46*bgm_kachi1_mvl/mxv + .byte 46*mus_victory_trainer_mvl/mxv .byte MOD , 0 .byte N24 , Dn4 .byte W12 .byte MOD , 8 .byte W12 -bgm_kachi1_7_B1: +mus_victory_trainer_7_B1: .byte VOICE , 81 - .byte VOL , 32*bgm_kachi1_mvl/mxv + .byte VOL , 32*mus_victory_trainer_mvl/mxv .byte PAN , c_v-63 .byte MOD , 0 .byte N02 , Gn4 , v096 @@ -2592,7 +2592,7 @@ bgm_kachi1_7_B1: .byte W04 .byte Cn5 , v032 .byte W04 -bgm_kachi1_7_000: +mus_victory_trainer_7_000: .byte PAN , c_v-63 .byte N02 , Gn4 , v096 .byte W04 @@ -2683,7 +2683,7 @@ bgm_kachi1_7_000: .byte An4 .byte W04 .byte PATT - .word bgm_kachi1_7_000 + .word mus_victory_trainer_7_000 .byte PAN , c_v-63 .byte N02 , Fn4 , v096 .byte W04 @@ -2832,16 +2832,16 @@ bgm_kachi1_7_000: .byte En4 .byte W04 .byte GOTO - .word bgm_kachi1_7_B1 + .word mus_victory_trainer_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_kachi1_8: - .byte KEYSH , bgm_kachi1_key+0 +mus_victory_trainer_8: + .byte KEYSH , mus_victory_trainer_key+0 .byte W08 .byte VOICE , 0 - .byte VOL , 69*bgm_kachi1_mvl/mxv + .byte VOL , 69*mus_victory_trainer_mvl/mxv .byte PAN , c_v+0 .byte N02 , Cn1 , v112 .byte W02 @@ -2871,8 +2871,8 @@ bgm_kachi1_8: .byte W08 .byte N24 , An2 .byte W24 -bgm_kachi1_8_B1: -bgm_kachi1_8_000: +mus_victory_trainer_8_B1: +mus_victory_trainer_8_000: .byte N04 , Cn1 , v112 .byte W08 .byte N04 @@ -2919,7 +2919,7 @@ bgm_kachi1_8_000: .byte N04 .byte W08 .byte PATT - .word bgm_kachi1_8_000 + .word mus_victory_trainer_8_000 .byte N04 , Cn1 , v112 .byte W08 .byte En1 @@ -2945,7 +2945,7 @@ bgm_kachi1_8_000: .byte N04 .byte W08 .byte PATT - .word bgm_kachi1_8_000 + .word mus_victory_trainer_8_000 .byte N04 , Cn1 , v112 .byte W08 .byte N04 @@ -2971,7 +2971,7 @@ bgm_kachi1_8_000: .byte Dn1 .byte W08 .byte PATT - .word bgm_kachi1_8_000 + .word mus_victory_trainer_8_000 .byte N04 , Cn1 , v112 .byte W08 .byte N04 @@ -2995,15 +2995,15 @@ bgm_kachi1_8_000: .byte N04 .byte W08 .byte GOTO - .word bgm_kachi1_8_B1 + .word mus_victory_trainer_8_B1 .byte FINE @********************** Track 9 **********************@ -bgm_kachi1_9: - .byte KEYSH , bgm_kachi1_key+0 +mus_victory_trainer_9: + .byte KEYSH , mus_victory_trainer_key+0 .byte PAN , c_v+0 - .byte VOL , 42*bgm_kachi1_mvl/mxv + .byte VOL , 42*mus_victory_trainer_mvl/mxv .byte W08 .byte VOICE , 127 .byte W08 @@ -3031,7 +3031,7 @@ bgm_kachi1_9: .byte W08 .byte PAN , c_v-64 .byte W16 -bgm_kachi1_9_B1: +mus_victory_trainer_9_B1: .byte VOICE , 127 .byte PAN , c_v+0 .byte N04 , Gn5 , v112 @@ -3058,7 +3058,7 @@ bgm_kachi1_9_B1: .byte W08 .byte N04 .byte W08 -bgm_kachi1_9_000: +mus_victory_trainer_9_000: .byte N04 , Gn5 , v112 .byte W08 .byte Gn5 , v064 @@ -3085,7 +3085,7 @@ bgm_kachi1_9_000: .byte W08 .byte PEND .byte PATT - .word bgm_kachi1_9_000 + .word mus_victory_trainer_9_000 .byte N04 , Gn5 , v112 .byte W08 .byte Gn5 , v064 @@ -3123,11 +3123,11 @@ bgm_kachi1_9_000: .byte N02 .byte W04 .byte PATT - .word bgm_kachi1_9_000 + .word mus_victory_trainer_9_000 .byte PATT - .word bgm_kachi1_9_000 + .word mus_victory_trainer_9_000 .byte PATT - .word bgm_kachi1_9_000 + .word mus_victory_trainer_9_000 .byte N04 , Gn5 , v112 .byte W08 .byte Gn5 , v064 @@ -3159,28 +3159,28 @@ bgm_kachi1_9_000: .byte N02 .byte W04 .byte GOTO - .word bgm_kachi1_9_B1 + .word mus_victory_trainer_9_B1 .byte FINE @******************************************************@ .align 2 -bgm_kachi1: +mus_victory_trainer: .byte 9 @ NumTrks .byte 0 @ NumBlks - .byte bgm_kachi1_pri @ Priority - .byte bgm_kachi1_rev @ Reverb. + .byte mus_victory_trainer_pri @ Priority + .byte mus_victory_trainer_rev @ Reverb. - .word bgm_kachi1_grp + .word mus_victory_trainer_grp - .word bgm_kachi1_1 - .word bgm_kachi1_2 - .word bgm_kachi1_3 - .word bgm_kachi1_4 - .word bgm_kachi1_5 - .word bgm_kachi1_6 - .word bgm_kachi1_7 - .word bgm_kachi1_8 - .word bgm_kachi1_9 + .word mus_victory_trainer_1 + .word mus_victory_trainer_2 + .word mus_victory_trainer_3 + .word mus_victory_trainer_4 + .word mus_victory_trainer_5 + .word mus_victory_trainer_6 + .word mus_victory_trainer_7 + .word mus_victory_trainer_8 + .word mus_victory_trainer_9 .end diff --git a/sound/songs/bgm_kachi2.s b/sound/songs/mus_victory_wild.s index 828baa6f8..5ecb0f00a 100644 --- a/sound/songs/bgm_kachi2.s +++ b/sound/songs/mus_victory_wild.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_kachi2_grp, voicegroup022 - .equ bgm_kachi2_pri, 0 - .equ bgm_kachi2_rev, reverb_set+50 - .equ bgm_kachi2_mvl, 127 - .equ bgm_kachi2_key, 0 - .equ bgm_kachi2_tbs, 1 - .equ bgm_kachi2_exg, 0 - .equ bgm_kachi2_cmp, 1 + .equ mus_victory_wild_grp, voicegroup022 + .equ mus_victory_wild_pri, 0 + .equ mus_victory_wild_rev, reverb_set+50 + .equ mus_victory_wild_mvl, 127 + .equ mus_victory_wild_key, 0 + .equ mus_victory_wild_tbs, 1 + .equ mus_victory_wild_exg, 0 + .equ mus_victory_wild_cmp, 1 .section .rodata - .global bgm_kachi2 + .global mus_victory_wild .align 2 @********************** Track 1 **********************@ -bgm_kachi2_1: - .byte KEYSH , bgm_kachi2_key+0 - .byte TEMPO , 140*bgm_kachi2_tbs/2 +mus_victory_wild_1: + .byte KEYSH , mus_victory_wild_key+0 + .byte TEMPO , 140*mus_victory_wild_tbs/2 .byte W09 .byte VOICE , 73 - .byte VOL , 80*bgm_kachi2_mvl/mxv + .byte VOL , 80*mus_victory_wild_mvl/mxv .byte BENDR , 3 .byte PAN , c_v-8 .byte BEND , c_v+0 @@ -34,31 +34,31 @@ bgm_kachi2_1: .byte W06 .byte N68 , Bn4 .byte W06 - .byte VOL , 69*bgm_kachi2_mvl/mxv + .byte VOL , 69*mus_victory_wild_mvl/mxv .byte W03 - .byte 60*bgm_kachi2_mvl/mxv + .byte 60*mus_victory_wild_mvl/mxv .byte W03 - .byte 52*bgm_kachi2_mvl/mxv + .byte 52*mus_victory_wild_mvl/mxv .byte W06 - .byte 45*bgm_kachi2_mvl/mxv + .byte 45*mus_victory_wild_mvl/mxv .byte W06 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W12 .byte MOD , 5 .byte W03 - .byte VOL , 44*bgm_kachi2_mvl/mxv + .byte VOL , 44*mus_victory_wild_mvl/mxv .byte W06 - .byte 49*bgm_kachi2_mvl/mxv + .byte 49*mus_victory_wild_mvl/mxv .byte W03 - .byte 56*bgm_kachi2_mvl/mxv + .byte 56*mus_victory_wild_mvl/mxv .byte W03 - .byte 63*bgm_kachi2_mvl/mxv + .byte 63*mus_victory_wild_mvl/mxv .byte W03 - .byte 70*bgm_kachi2_mvl/mxv + .byte 70*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte W15 -bgm_kachi2_1_B1: +mus_victory_wild_1_B1: .byte PAN , c_v+0 .byte MOD , 0 .byte N06 , Bn4 , v112 @@ -123,7 +123,7 @@ bgm_kachi2_1_B1: .byte W06 .byte As4 .byte W06 -bgm_kachi2_1_000: +mus_victory_wild_1_000: .byte N06 , Cn5 , v112 .byte W12 .byte As4 @@ -155,7 +155,7 @@ bgm_kachi2_1_000: .byte N06 .byte W24 .byte PATT - .word bgm_kachi2_1_000 + .word mus_victory_wild_1_000 .byte N06 , Dn5 , v112 .byte W12 .byte N06 @@ -176,16 +176,16 @@ bgm_kachi2_1_000: .byte An4 .byte W06 .byte GOTO - .word bgm_kachi2_1_B1 + .word mus_victory_wild_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_kachi2_2: - .byte KEYSH , bgm_kachi2_key+0 +mus_victory_wild_2: + .byte KEYSH , mus_victory_wild_key+0 .byte W09 .byte VOICE , 56 - .byte VOL , 80*bgm_kachi2_mvl/mxv + .byte VOL , 80*mus_victory_wild_mvl/mxv .byte PAN , c_v+10 .byte N06 , Gs3 , v080 .byte W06 @@ -197,31 +197,31 @@ bgm_kachi2_2: .byte W06 .byte N68 , En4 , v100 .byte W06 - .byte VOL , 69*bgm_kachi2_mvl/mxv + .byte VOL , 69*mus_victory_wild_mvl/mxv .byte W03 - .byte 60*bgm_kachi2_mvl/mxv + .byte 60*mus_victory_wild_mvl/mxv .byte W03 - .byte 52*bgm_kachi2_mvl/mxv + .byte 52*mus_victory_wild_mvl/mxv .byte W06 - .byte 45*bgm_kachi2_mvl/mxv + .byte 45*mus_victory_wild_mvl/mxv .byte W06 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W12 .byte MOD , 5 .byte W03 - .byte VOL , 44*bgm_kachi2_mvl/mxv + .byte VOL , 44*mus_victory_wild_mvl/mxv .byte W06 - .byte 49*bgm_kachi2_mvl/mxv + .byte 49*mus_victory_wild_mvl/mxv .byte W03 - .byte 56*bgm_kachi2_mvl/mxv + .byte 56*mus_victory_wild_mvl/mxv .byte W03 - .byte 63*bgm_kachi2_mvl/mxv + .byte 63*mus_victory_wild_mvl/mxv .byte W03 - .byte 70*bgm_kachi2_mvl/mxv + .byte 70*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte W15 -bgm_kachi2_2_B1: +mus_victory_wild_2_B1: .byte VOICE , 56 .byte PAN , c_v+0 .byte MOD , 0 @@ -261,7 +261,7 @@ bgm_kachi2_2_B1: .byte W24 .byte Bn1 .byte W48 -bgm_kachi2_2_000: +mus_victory_wild_2_000: .byte VOICE , 56 .byte PAN , c_v+0 .byte W12 @@ -283,7 +283,7 @@ bgm_kachi2_2_000: .byte Cn2 .byte W48 .byte PATT - .word bgm_kachi2_2_000 + .word mus_victory_wild_2_000 .byte N06 , Fn3 , v092 .byte W24 .byte VOICE , 47 @@ -293,368 +293,368 @@ bgm_kachi2_2_000: .byte Cn2 .byte W48 .byte GOTO - .word bgm_kachi2_2_B1 + .word mus_victory_wild_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_kachi2_3: - .byte KEYSH , bgm_kachi2_key+0 +mus_victory_wild_3: + .byte KEYSH , mus_victory_wild_key+0 .byte W09 .byte VOICE , 58 - .byte VOL , 80*bgm_kachi2_mvl/mxv + .byte VOL , 80*mus_victory_wild_mvl/mxv .byte W24 .byte N21 , En1 , v127 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Gs0 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 -bgm_kachi2_3_B1: - .byte VOL , 80*bgm_kachi2_mvl/mxv +mus_victory_wild_3_B1: + .byte VOL , 80*mus_victory_wild_mvl/mxv .byte N21 , En1 , v127 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , En1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N48 , An1 .byte W06 - .byte VOL , 67*bgm_kachi2_mvl/mxv + .byte VOL , 67*mus_victory_wild_mvl/mxv .byte W03 - .byte 58*bgm_kachi2_mvl/mxv + .byte 58*mus_victory_wild_mvl/mxv .byte W06 - .byte 54*bgm_kachi2_mvl/mxv + .byte 54*mus_victory_wild_mvl/mxv .byte W06 - .byte 57*bgm_kachi2_mvl/mxv + .byte 57*mus_victory_wild_mvl/mxv .byte W06 - .byte 64*bgm_kachi2_mvl/mxv + .byte 64*mus_victory_wild_mvl/mxv .byte W03 - .byte 69*bgm_kachi2_mvl/mxv + .byte 69*mus_victory_wild_mvl/mxv .byte W03 - .byte 76*bgm_kachi2_mvl/mxv + .byte 76*mus_victory_wild_mvl/mxv .byte W06 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte W09 - .byte 62*bgm_kachi2_mvl/mxv + .byte 62*mus_victory_wild_mvl/mxv .byte N48 , Bn1 .byte W06 - .byte VOL , 65*bgm_kachi2_mvl/mxv + .byte VOL , 65*mus_victory_wild_mvl/mxv .byte W06 - .byte 67*bgm_kachi2_mvl/mxv + .byte 67*mus_victory_wild_mvl/mxv .byte W06 - .byte 69*bgm_kachi2_mvl/mxv + .byte 69*mus_victory_wild_mvl/mxv .byte W06 - .byte 73*bgm_kachi2_mvl/mxv + .byte 73*mus_victory_wild_mvl/mxv .byte W09 - .byte 76*bgm_kachi2_mvl/mxv + .byte 76*mus_victory_wild_mvl/mxv .byte W06 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte W09 .byte N21 , En1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , En1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N24 , An1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W30 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , En1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N48 , As1 .byte W06 - .byte VOL , 67*bgm_kachi2_mvl/mxv + .byte VOL , 67*mus_victory_wild_mvl/mxv .byte W03 - .byte 58*bgm_kachi2_mvl/mxv + .byte 58*mus_victory_wild_mvl/mxv .byte W06 - .byte 54*bgm_kachi2_mvl/mxv + .byte 54*mus_victory_wild_mvl/mxv .byte W06 - .byte 57*bgm_kachi2_mvl/mxv + .byte 57*mus_victory_wild_mvl/mxv .byte W06 - .byte 64*bgm_kachi2_mvl/mxv + .byte 64*mus_victory_wild_mvl/mxv .byte W03 - .byte 69*bgm_kachi2_mvl/mxv + .byte 69*mus_victory_wild_mvl/mxv .byte W03 - .byte 76*bgm_kachi2_mvl/mxv + .byte 76*mus_victory_wild_mvl/mxv .byte W06 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte W09 - .byte 62*bgm_kachi2_mvl/mxv + .byte 62*mus_victory_wild_mvl/mxv .byte N48 , Cn2 .byte W06 - .byte VOL , 65*bgm_kachi2_mvl/mxv + .byte VOL , 65*mus_victory_wild_mvl/mxv .byte W06 - .byte 67*bgm_kachi2_mvl/mxv + .byte 67*mus_victory_wild_mvl/mxv .byte W06 - .byte 69*bgm_kachi2_mvl/mxv + .byte 69*mus_victory_wild_mvl/mxv .byte W06 - .byte 73*bgm_kachi2_mvl/mxv + .byte 73*mus_victory_wild_mvl/mxv .byte W09 - .byte 76*bgm_kachi2_mvl/mxv + .byte 76*mus_victory_wild_mvl/mxv .byte W06 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte W09 .byte N21 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N21 , Cn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N24 , As1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W30 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N24 , Fn1 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte N24 , Bn0 .byte W12 - .byte VOL , 73*bgm_kachi2_mvl/mxv + .byte VOL , 73*mus_victory_wild_mvl/mxv .byte W03 - .byte 61*bgm_kachi2_mvl/mxv + .byte 61*mus_victory_wild_mvl/mxv .byte W03 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W03 - .byte 25*bgm_kachi2_mvl/mxv + .byte 25*mus_victory_wild_mvl/mxv .byte W03 .byte GOTO - .word bgm_kachi2_3_B1 + .word mus_victory_wild_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_kachi2_4: - .byte KEYSH , bgm_kachi2_key+0 +mus_victory_wild_4: + .byte KEYSH , mus_victory_wild_key+0 .byte W09 .byte VOICE , 82 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v-48 - .byte VOL , 80*bgm_kachi2_mvl/mxv + .byte VOL , 80*mus_victory_wild_mvl/mxv .byte N06 , Bn2 , v052 .byte W06 .byte Cs3 @@ -665,29 +665,29 @@ bgm_kachi2_4: .byte W06 .byte N72 , Gs3 .byte W06 - .byte VOL , 69*bgm_kachi2_mvl/mxv + .byte VOL , 69*mus_victory_wild_mvl/mxv .byte W03 - .byte 60*bgm_kachi2_mvl/mxv + .byte 60*mus_victory_wild_mvl/mxv .byte W03 - .byte 52*bgm_kachi2_mvl/mxv + .byte 52*mus_victory_wild_mvl/mxv .byte W06 - .byte 45*bgm_kachi2_mvl/mxv + .byte 45*mus_victory_wild_mvl/mxv .byte W06 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W15 - .byte 44*bgm_kachi2_mvl/mxv + .byte 44*mus_victory_wild_mvl/mxv .byte W06 - .byte 49*bgm_kachi2_mvl/mxv + .byte 49*mus_victory_wild_mvl/mxv .byte W03 - .byte 56*bgm_kachi2_mvl/mxv + .byte 56*mus_victory_wild_mvl/mxv .byte W03 - .byte 63*bgm_kachi2_mvl/mxv + .byte 63*mus_victory_wild_mvl/mxv .byte W03 - .byte 70*bgm_kachi2_mvl/mxv + .byte 70*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte W15 -bgm_kachi2_4_B1: +mus_victory_wild_4_B1: .byte PAN , c_v+0 .byte W12 .byte N06 , Bn2 , v060 @@ -711,7 +711,7 @@ bgm_kachi2_4_B1: .byte W12 .byte Cs3 .byte W96 -bgm_kachi2_4_000: +mus_victory_wild_4_000: .byte W12 .byte N06 , Cn3 , v060 .byte W24 @@ -725,23 +725,23 @@ bgm_kachi2_4_000: .byte Dn3 .byte W96 .byte PATT - .word bgm_kachi2_4_000 + .word mus_victory_wild_4_000 .byte N06 , Dn3 , v060 .byte W96 .byte GOTO - .word bgm_kachi2_4_B1 + .word mus_victory_wild_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_kachi2_5: - .byte KEYSH , bgm_kachi2_key+0 +mus_victory_wild_5: + .byte KEYSH , mus_victory_wild_key+0 .byte W09 .byte VOICE , 80 .byte XCMD , xIECV , 8 .byte xIECL , 8 .byte PAN , c_v+48 - .byte VOL , 80*bgm_kachi2_mvl/mxv + .byte VOL , 80*mus_victory_wild_mvl/mxv .byte N06 , Gs2 , v052 .byte W06 .byte An2 @@ -752,29 +752,29 @@ bgm_kachi2_5: .byte W06 .byte N72 , En3 .byte W06 - .byte VOL , 69*bgm_kachi2_mvl/mxv + .byte VOL , 69*mus_victory_wild_mvl/mxv .byte W03 - .byte 60*bgm_kachi2_mvl/mxv + .byte 60*mus_victory_wild_mvl/mxv .byte W03 - .byte 52*bgm_kachi2_mvl/mxv + .byte 52*mus_victory_wild_mvl/mxv .byte W06 - .byte 45*bgm_kachi2_mvl/mxv + .byte 45*mus_victory_wild_mvl/mxv .byte W06 - .byte 37*bgm_kachi2_mvl/mxv + .byte 37*mus_victory_wild_mvl/mxv .byte W15 - .byte 44*bgm_kachi2_mvl/mxv + .byte 44*mus_victory_wild_mvl/mxv .byte W06 - .byte 49*bgm_kachi2_mvl/mxv + .byte 49*mus_victory_wild_mvl/mxv .byte W03 - .byte 56*bgm_kachi2_mvl/mxv + .byte 56*mus_victory_wild_mvl/mxv .byte W03 - .byte 63*bgm_kachi2_mvl/mxv + .byte 63*mus_victory_wild_mvl/mxv .byte W03 - .byte 70*bgm_kachi2_mvl/mxv + .byte 70*mus_victory_wild_mvl/mxv .byte W03 - .byte 80*bgm_kachi2_mvl/mxv + .byte 80*mus_victory_wild_mvl/mxv .byte W15 -bgm_kachi2_5_B1: +mus_victory_wild_5_B1: .byte VOICE , 83 .byte PAN , c_v+48 .byte N03 , Bn5 , v032 @@ -825,7 +825,7 @@ bgm_kachi2_5_B1: .byte W24 .byte Bn5 .byte W48 -bgm_kachi2_5_000: +mus_victory_wild_5_000: .byte N03 , Cn6 , v032 .byte W12 .byte As5 @@ -854,7 +854,7 @@ bgm_kachi2_5_000: .byte N03 .byte W24 .byte PATT - .word bgm_kachi2_5_000 + .word mus_victory_wild_5_000 .byte N03 , Dn6 , v032 .byte W12 .byte N03 @@ -864,16 +864,16 @@ bgm_kachi2_5_000: .byte Cn6 .byte W48 .byte GOTO - .word bgm_kachi2_5_B1 + .word mus_victory_wild_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_kachi2_6: - .byte KEYSH , bgm_kachi2_key+0 +mus_victory_wild_6: + .byte KEYSH , mus_victory_wild_key+0 .byte W09 .byte VOICE , 81 - .byte VOL , 80*bgm_kachi2_mvl/mxv + .byte VOL , 80*mus_victory_wild_mvl/mxv .byte W36 .byte N06 , Ds5 , v080 .byte W06 @@ -888,7 +888,7 @@ bgm_kachi2_6: .byte W12 .byte En5 , v032 .byte W12 -bgm_kachi2_6_B1: +mus_victory_wild_6_B1: .byte MOD , 0 .byte BEND , c_v+0 .byte W96 @@ -948,16 +948,16 @@ bgm_kachi2_6_B1: .byte N06 , An4 .byte W48 .byte GOTO - .word bgm_kachi2_6_B1 + .word mus_victory_wild_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_kachi2_7: - .byte KEYSH , bgm_kachi2_key+0 +mus_victory_wild_7: + .byte KEYSH , mus_victory_wild_key+0 .byte W09 .byte VOICE , 0 - .byte VOL , 80*bgm_kachi2_mvl/mxv + .byte VOL , 80*mus_victory_wild_mvl/mxv .byte W24 .byte N03 , En1 , v112 .byte W03 @@ -983,8 +983,8 @@ bgm_kachi2_7: .byte W06 .byte En1 , v084 .byte W06 -bgm_kachi2_7_B1: -bgm_kachi2_7_000: +mus_victory_wild_7_B1: +mus_victory_wild_7_000: .byte N06 , En1 , v076 .byte W12 .byte N06 @@ -1014,7 +1014,7 @@ bgm_kachi2_7_000: .byte En1 , v064 .byte W06 .byte PEND -bgm_kachi2_7_001: +mus_victory_wild_7_001: .byte N06 , En1 , v112 .byte W24 .byte Fs2 , v064 @@ -1036,38 +1036,38 @@ bgm_kachi2_7_001: .byte W06 .byte PEND .byte PATT - .word bgm_kachi2_7_000 + .word mus_victory_wild_7_000 .byte PATT - .word bgm_kachi2_7_001 + .word mus_victory_wild_7_001 .byte PATT - .word bgm_kachi2_7_000 + .word mus_victory_wild_7_000 .byte PATT - .word bgm_kachi2_7_001 + .word mus_victory_wild_7_001 .byte PATT - .word bgm_kachi2_7_000 + .word mus_victory_wild_7_000 .byte PATT - .word bgm_kachi2_7_001 + .word mus_victory_wild_7_001 .byte GOTO - .word bgm_kachi2_7_B1 + .word mus_victory_wild_7_B1 .byte FINE @******************************************************@ .align 2 -bgm_kachi2: +mus_victory_wild: .byte 7 @ NumTrks .byte 0 @ NumBlks - .byte bgm_kachi2_pri @ Priority - .byte bgm_kachi2_rev @ Reverb. + .byte mus_victory_wild_pri @ Priority + .byte mus_victory_wild_rev @ Reverb. - .word bgm_kachi2_grp + .word mus_victory_wild_grp - .word bgm_kachi2_1 - .word bgm_kachi2_2 - .word bgm_kachi2_3 - .word bgm_kachi2_4 - .word bgm_kachi2_5 - .word bgm_kachi2_6 - .word bgm_kachi2_7 + .word mus_victory_wild_1 + .word mus_victory_wild_2 + .word mus_victory_wild_3 + .word mus_victory_wild_4 + .word mus_victory_wild_5 + .word mus_victory_wild_6 + .word mus_victory_wild_7 .end diff --git a/sound/songs/bgm_battle31.s b/sound/songs/mus_vs_aqua_magma.s index 1bcf122a3..7cdc072c6 100644 --- a/sound/songs/bgm_battle31.s +++ b/sound/songs/mus_vs_aqua_magma.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_battle31_grp, voicegroup101 - .equ bgm_battle31_pri, 1 - .equ bgm_battle31_rev, reverb_set+50 - .equ bgm_battle31_mvl, 127 - .equ bgm_battle31_key, 0 - .equ bgm_battle31_tbs, 1 - .equ bgm_battle31_exg, 0 - .equ bgm_battle31_cmp, 1 + .equ mus_vs_aqua_magma_grp, voicegroup101 + .equ mus_vs_aqua_magma_pri, 1 + .equ mus_vs_aqua_magma_rev, reverb_set+50 + .equ mus_vs_aqua_magma_mvl, 127 + .equ mus_vs_aqua_magma_key, 0 + .equ mus_vs_aqua_magma_tbs, 1 + .equ mus_vs_aqua_magma_exg, 0 + .equ mus_vs_aqua_magma_cmp, 1 .section .rodata - .global bgm_battle31 + .global mus_vs_aqua_magma .align 2 @********************** Track 1 **********************@ -bgm_battle31_1: - .byte KEYSH , bgm_battle31_key+0 - .byte TEMPO , 200*bgm_battle31_tbs/2 +mus_vs_aqua_magma_1: + .byte KEYSH , mus_vs_aqua_magma_key+0 + .byte TEMPO , 200*mus_vs_aqua_magma_tbs/2 .byte VOICE , 46 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte PAN , c_v+0 .byte N06 , As4 , v092 .byte W06 @@ -96,7 +96,7 @@ bgm_battle31_1: .byte W36 .byte N12 .byte W24 -bgm_battle31_1_000: +mus_vs_aqua_magma_1_000: .byte N12 , Fn4 , v096 .byte W36 .byte N12 @@ -104,7 +104,7 @@ bgm_battle31_1_000: .byte N24 , Fs4 .byte W24 .byte PEND -bgm_battle31_1_001: +mus_vs_aqua_magma_1_001: .byte N12 , Fn4 , v096 .byte W36 .byte N12 @@ -112,7 +112,7 @@ bgm_battle31_1_001: .byte N12 .byte W24 .byte PEND -bgm_battle31_1_002: +mus_vs_aqua_magma_1_002: .byte N12 , Fn4 , v096 .byte W36 .byte N12 @@ -123,14 +123,14 @@ bgm_battle31_1_002: .byte W24 .byte PEND .byte PATT - .word bgm_battle31_1_001 + .word mus_vs_aqua_magma_1_001 .byte PATT - .word bgm_battle31_1_000 + .word mus_vs_aqua_magma_1_000 .byte PATT - .word bgm_battle31_1_001 + .word mus_vs_aqua_magma_1_001 .byte PATT - .word bgm_battle31_1_002 -bgm_battle31_1_B1: + .word mus_vs_aqua_magma_1_002 +mus_vs_aqua_magma_1_B1: .byte VOICE , 48 .byte N36 , As3 , v096 .byte W36 @@ -138,7 +138,7 @@ bgm_battle31_1_B1: .byte W36 .byte N24 , Ds3 .byte W24 -bgm_battle31_1_003: +mus_vs_aqua_magma_1_003: .byte N36 , Dn3 , v096 .byte W36 .byte Ds3 @@ -146,7 +146,7 @@ bgm_battle31_1_003: .byte N24 , Fn3 .byte W24 .byte PEND -bgm_battle31_1_004: +mus_vs_aqua_magma_1_004: .byte N12 , Bn2 , v096 .byte W12 .byte Fs2 @@ -165,7 +165,7 @@ bgm_battle31_1_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_1_004 + .word mus_vs_aqua_magma_1_004 .byte N36 , As3 , v096 .byte W36 .byte Fn3 @@ -173,11 +173,11 @@ bgm_battle31_1_004: .byte N24 , Ds3 .byte W24 .byte PATT - .word bgm_battle31_1_003 + .word mus_vs_aqua_magma_1_003 .byte PATT - .word bgm_battle31_1_004 + .word mus_vs_aqua_magma_1_004 .byte PATT - .word bgm_battle31_1_004 + .word mus_vs_aqua_magma_1_004 .byte VOICE , 21 .byte N12 , Dn4 , v088 .byte W36 @@ -185,7 +185,7 @@ bgm_battle31_1_004: .byte W36 .byte N24 .byte W24 -bgm_battle31_1_005: +mus_vs_aqua_magma_1_005: .byte N12 , Ds4 , v088 .byte W36 .byte N12 @@ -200,7 +200,7 @@ bgm_battle31_1_005: .byte N24 .byte W24 .byte PATT - .word bgm_battle31_1_005 + .word mus_vs_aqua_magma_1_005 .byte N12 , Dn4 , v088 .byte W36 .byte N12 @@ -208,7 +208,7 @@ bgm_battle31_1_005: .byte N24 .byte W24 .byte PATT - .word bgm_battle31_1_005 + .word mus_vs_aqua_magma_1_005 .byte N12 , Fn4 , v088 .byte W36 .byte N12 @@ -224,7 +224,7 @@ bgm_battle31_1_005: .byte VOICE , 38 .byte N96 , As1 , v100 .byte W96 -bgm_battle31_1_006: +mus_vs_aqua_magma_1_006: .byte W12 .byte N12 , As1 , v100 .byte W12 @@ -244,7 +244,7 @@ bgm_battle31_1_006: .byte N96 , As1 .byte W96 .byte PATT - .word bgm_battle31_1_006 + .word mus_vs_aqua_magma_1_006 .byte N96 , As1 , v100 .byte W96 .byte W12 @@ -273,7 +273,7 @@ bgm_battle31_1_006: .byte W48 .byte N96 , Gs2 .byte W96 -bgm_battle31_1_007: +mus_vs_aqua_magma_1_007: .byte W12 .byte N12 , Gs2 , v100 .byte W12 @@ -293,7 +293,7 @@ bgm_battle31_1_007: .byte N96 , Gs2 .byte W96 .byte PATT - .word bgm_battle31_1_007 + .word mus_vs_aqua_magma_1_007 .byte N96 , Gs2 , v100 .byte W96 .byte W96 @@ -301,14 +301,14 @@ bgm_battle31_1_007: .byte W48 .byte An2 .byte W48 -bgm_battle31_1_008: +mus_vs_aqua_magma_1_008: .byte N48 , As2 , v100 .byte W48 .byte Bn2 .byte W48 .byte PEND .byte PATT - .word bgm_battle31_1_008 + .word mus_vs_aqua_magma_1_008 .byte N48 , Cn3 , v100 .byte W48 .byte Cs3 @@ -331,7 +331,7 @@ bgm_battle31_1_008: .byte W12 .byte Ds4 .byte W12 -bgm_battle31_1_009: +mus_vs_aqua_magma_1_009: .byte N12 , As3 , v088 .byte W12 .byte Fn3 @@ -349,7 +349,7 @@ bgm_battle31_1_009: .byte Fn3 .byte W12 .byte PEND -bgm_battle31_1_010: +mus_vs_aqua_magma_1_010: .byte N12 , As3 , v088 .byte W12 .byte Fn4 @@ -368,8 +368,8 @@ bgm_battle31_1_010: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_1_009 -bgm_battle31_1_011: + .word mus_vs_aqua_magma_1_009 +mus_vs_aqua_magma_1_011: .byte N12 , Cs4 , v088 .byte W12 .byte Gs4 @@ -387,7 +387,7 @@ bgm_battle31_1_011: .byte Fs4 .byte W12 .byte PEND -bgm_battle31_1_012: +mus_vs_aqua_magma_1_012: .byte N12 , Cs4 , v088 .byte W12 .byte Gs3 @@ -406,49 +406,49 @@ bgm_battle31_1_012: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_1_011 + .word mus_vs_aqua_magma_1_011 .byte PATT - .word bgm_battle31_1_012 + .word mus_vs_aqua_magma_1_012 .byte PATT - .word bgm_battle31_1_010 + .word mus_vs_aqua_magma_1_010 .byte PATT - .word bgm_battle31_1_009 + .word mus_vs_aqua_magma_1_009 .byte PATT - .word bgm_battle31_1_010 + .word mus_vs_aqua_magma_1_010 .byte PATT - .word bgm_battle31_1_009 + .word mus_vs_aqua_magma_1_009 .byte PATT - .word bgm_battle31_1_010 + .word mus_vs_aqua_magma_1_010 .byte PATT - .word bgm_battle31_1_009 + .word mus_vs_aqua_magma_1_009 .byte PATT - .word bgm_battle31_1_010 + .word mus_vs_aqua_magma_1_010 .byte PATT - .word bgm_battle31_1_009 + .word mus_vs_aqua_magma_1_009 .byte PATT - .word bgm_battle31_1_011 + .word mus_vs_aqua_magma_1_011 .byte PATT - .word bgm_battle31_1_012 + .word mus_vs_aqua_magma_1_012 .byte PATT - .word bgm_battle31_1_011 + .word mus_vs_aqua_magma_1_011 .byte PATT - .word bgm_battle31_1_012 + .word mus_vs_aqua_magma_1_012 .byte PATT - .word bgm_battle31_1_011 + .word mus_vs_aqua_magma_1_011 .byte PATT - .word bgm_battle31_1_012 + .word mus_vs_aqua_magma_1_012 .byte PATT - .word bgm_battle31_1_011 + .word mus_vs_aqua_magma_1_011 .byte PATT - .word bgm_battle31_1_012 + .word mus_vs_aqua_magma_1_012 .byte PATT - .word bgm_battle31_1_011 + .word mus_vs_aqua_magma_1_011 .byte PATT - .word bgm_battle31_1_012 + .word mus_vs_aqua_magma_1_012 .byte PATT - .word bgm_battle31_1_011 + .word mus_vs_aqua_magma_1_011 .byte PATT - .word bgm_battle31_1_012 + .word mus_vs_aqua_magma_1_012 .byte VOICE , 21 .byte N12 , Fn3 , v092 .byte W36 @@ -456,7 +456,7 @@ bgm_battle31_1_012: .byte W36 .byte N12 .byte W24 -bgm_battle31_1_013: +mus_vs_aqua_magma_1_013: .byte N12 , Fn3 , v092 .byte W36 .byte N12 @@ -466,7 +466,7 @@ bgm_battle31_1_013: .byte N24 , En3 .byte W24 .byte PEND -bgm_battle31_1_014: +mus_vs_aqua_magma_1_014: .byte N12 , Fn3 , v092 .byte W36 .byte N12 @@ -481,11 +481,11 @@ bgm_battle31_1_014: .byte N24 , An3 .byte W24 .byte PATT - .word bgm_battle31_1_014 + .word mus_vs_aqua_magma_1_014 .byte PATT - .word bgm_battle31_1_013 + .word mus_vs_aqua_magma_1_013 .byte PATT - .word bgm_battle31_1_014 + .word mus_vs_aqua_magma_1_014 .byte N12 , Fn3 , v092 .byte W36 .byte N12 @@ -494,43 +494,43 @@ bgm_battle31_1_014: .byte W48 .byte TIE , Fn4 .byte W96 - .byte VOL , 76*bgm_battle31_mvl/mxv + .byte VOL , 76*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 71*bgm_battle31_mvl/mxv + .byte 71*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 66*bgm_battle31_mvl/mxv + .byte 66*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 62*bgm_battle31_mvl/mxv + .byte 62*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 56*bgm_battle31_mvl/mxv + .byte 56*mus_vs_aqua_magma_mvl/mxv .byte W09 - .byte 50*bgm_battle31_mvl/mxv + .byte 50*mus_vs_aqua_magma_mvl/mxv .byte W09 - .byte 42*bgm_battle31_mvl/mxv + .byte 42*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 31*bgm_battle31_mvl/mxv + .byte 31*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 18*bgm_battle31_mvl/mxv + .byte 18*mus_vs_aqua_magma_mvl/mxv .byte W03 .byte EOT .byte W06 .byte VOICE , 48 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte TIE , As2 , v088 .byte W96 .byte W96 .byte EOT .byte GOTO - .word bgm_battle31_1_B1 + .word mus_vs_aqua_magma_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle31_2: - .byte KEYSH , bgm_battle31_key+0 +mus_vs_aqua_magma_2: + .byte KEYSH , mus_vs_aqua_magma_key+0 .byte VOICE , 17 .byte LFOS , 22 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte N06 , Fn5 , v060 .byte W06 .byte En5 @@ -607,7 +607,7 @@ bgm_battle31_2: .byte W12 .byte N24 , Bn3 .byte W24 -bgm_battle31_2_000: +mus_vs_aqua_magma_2_000: .byte N12 , Fn5 , v080 .byte W36 .byte N12 @@ -622,7 +622,7 @@ bgm_battle31_2_000: .byte N24 , Fs5 .byte W24 .byte PATT - .word bgm_battle31_2_000 + .word mus_vs_aqua_magma_2_000 .byte N12 , Fn5 , v080 .byte W36 .byte N12 @@ -631,9 +631,9 @@ bgm_battle31_2_000: .byte W12 .byte N24 , Fs5 .byte W24 -bgm_battle31_2_B1: +mus_vs_aqua_magma_2_B1: .byte VOICE , 17 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte PAN , c_v+0 .byte N36 , Fn4 , v108 .byte W36 @@ -684,37 +684,37 @@ bgm_battle31_2_B1: .byte TIE , Dn5 .byte W96 .byte W96 -bgm_battle31_2_001: - .byte VOL , 74*bgm_battle31_mvl/mxv +mus_vs_aqua_magma_2_001: + .byte VOL , 74*mus_vs_aqua_magma_mvl/mxv .byte W18 - .byte 69*bgm_battle31_mvl/mxv + .byte 69*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 65*bgm_battle31_mvl/mxv + .byte 65*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 60*bgm_battle31_mvl/mxv + .byte 60*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 57*bgm_battle31_mvl/mxv + .byte 57*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 53*bgm_battle31_mvl/mxv + .byte 53*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 48*bgm_battle31_mvl/mxv + .byte 48*mus_vs_aqua_magma_mvl/mxv .byte W03 .byte PEND .byte W12 - .byte 43*bgm_battle31_mvl/mxv + .byte 43*mus_vs_aqua_magma_mvl/mxv .byte W18 - .byte 37*bgm_battle31_mvl/mxv + .byte 37*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 27*bgm_battle31_mvl/mxv + .byte 27*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 19*bgm_battle31_mvl/mxv + .byte 19*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 10*bgm_battle31_mvl/mxv + .byte 10*mus_vs_aqua_magma_mvl/mxv .byte W12 .byte EOT , Dn5 .byte W12 .byte VOICE , 21 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte PAN , c_v-1 .byte N12 , As4 , v080 .byte W36 @@ -838,14 +838,14 @@ bgm_battle31_2_001: .byte W48 .byte Dn3 .byte W48 -bgm_battle31_2_002: +mus_vs_aqua_magma_2_002: .byte N48 , Ds3 , v100 .byte W48 .byte En3 .byte W48 .byte PEND .byte PATT - .word bgm_battle31_2_002 + .word mus_vs_aqua_magma_2_002 .byte N48 , Fn3 , v100 .byte W48 .byte Fs3 @@ -912,25 +912,25 @@ bgm_battle31_2_002: .byte W36 .byte MOD , 7 .byte W12 - .byte VOL , 77*bgm_battle31_mvl/mxv + .byte VOL , 77*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 74*bgm_battle31_mvl/mxv + .byte 74*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 68*bgm_battle31_mvl/mxv + .byte 68*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 62*bgm_battle31_mvl/mxv + .byte 62*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 57*bgm_battle31_mvl/mxv + .byte 57*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 45*bgm_battle31_mvl/mxv + .byte 45*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 34*bgm_battle31_mvl/mxv + .byte 34*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 22*bgm_battle31_mvl/mxv + .byte 22*mus_vs_aqua_magma_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte N36 , Fn3 .byte W18 .byte MOD , 7 @@ -972,31 +972,31 @@ bgm_battle31_2_002: .byte W12 .byte Bn3 .byte W12 -bgm_battle31_2_003: +mus_vs_aqua_magma_2_003: .byte N92 , Cs4 , v072 .byte W36 .byte MOD , 7 .byte W12 - .byte VOL , 77*bgm_battle31_mvl/mxv + .byte VOL , 77*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 74*bgm_battle31_mvl/mxv + .byte 74*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 68*bgm_battle31_mvl/mxv + .byte 68*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 62*bgm_battle31_mvl/mxv + .byte 62*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 57*bgm_battle31_mvl/mxv + .byte 57*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 45*bgm_battle31_mvl/mxv + .byte 45*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 34*bgm_battle31_mvl/mxv + .byte 34*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 22*bgm_battle31_mvl/mxv + .byte 22*mus_vs_aqua_magma_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 .byte PEND - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte N36 .byte W18 .byte MOD , 7 @@ -1011,7 +1011,7 @@ bgm_battle31_2_003: .byte W12 .byte MOD , 7 .byte W12 -bgm_battle31_2_004: +mus_vs_aqua_magma_2_004: .byte MOD , 0 .byte N36 , Dn4 , v072 .byte W18 @@ -1041,8 +1041,8 @@ bgm_battle31_2_004: .byte Dn4 .byte W12 .byte PATT - .word bgm_battle31_2_003 - .byte VOL , 80*bgm_battle31_mvl/mxv + .word mus_vs_aqua_magma_2_003 + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte N36 , Gs3 , v072 .byte W18 .byte MOD , 7 @@ -1058,7 +1058,7 @@ bgm_battle31_2_004: .byte MOD , 7 .byte W12 .byte PATT - .word bgm_battle31_2_004 + .word mus_vs_aqua_magma_2_004 .byte MOD , 0 .byte N60 , Fn4 , v072 .byte W24 @@ -1075,27 +1075,27 @@ bgm_battle31_2_004: .byte W36 .byte MOD , 7 .byte W12 - .byte VOL , 77*bgm_battle31_mvl/mxv + .byte VOL , 77*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 74*bgm_battle31_mvl/mxv + .byte 74*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 68*bgm_battle31_mvl/mxv + .byte 68*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 62*bgm_battle31_mvl/mxv + .byte 62*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 57*bgm_battle31_mvl/mxv + .byte 57*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 45*bgm_battle31_mvl/mxv + .byte 45*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 34*bgm_battle31_mvl/mxv + .byte 34*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 22*bgm_battle31_mvl/mxv + .byte 22*mus_vs_aqua_magma_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 .byte VOICE , 60 .byte PAN , c_v+0 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte N96 , Cs3 , v100 .byte W96 .byte Fn3 @@ -1119,7 +1119,7 @@ bgm_battle31_2_004: .byte W12 .byte N24 , Fs4 .byte W24 -bgm_battle31_2_005: +mus_vs_aqua_magma_2_005: .byte N12 , Fn4 , v088 .byte W36 .byte N12 @@ -1134,7 +1134,7 @@ bgm_battle31_2_005: .byte N24 , Fs4 .byte W24 .byte PATT - .word bgm_battle31_2_005 + .word mus_vs_aqua_magma_2_005 .byte N12 , Fn4 , v088 .byte W36 .byte N12 @@ -1144,7 +1144,7 @@ bgm_battle31_2_005: .byte N24 , En4 .byte W24 .byte PATT - .word bgm_battle31_2_005 + .word mus_vs_aqua_magma_2_005 .byte N12 , Fn4 , v088 .byte W36 .byte N12 @@ -1154,30 +1154,30 @@ bgm_battle31_2_005: .byte TIE , As4 .byte W96 .byte PATT - .word bgm_battle31_2_001 + .word mus_vs_aqua_magma_2_001 .byte W12 - .byte VOL , 43*bgm_battle31_mvl/mxv + .byte VOL , 43*mus_vs_aqua_magma_mvl/mxv .byte W18 - .byte 37*bgm_battle31_mvl/mxv + .byte 37*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 27*bgm_battle31_mvl/mxv + .byte 27*mus_vs_aqua_magma_mvl/mxv .byte W15 - .byte 19*bgm_battle31_mvl/mxv + .byte 19*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 10*bgm_battle31_mvl/mxv + .byte 10*mus_vs_aqua_magma_mvl/mxv .byte W24 .byte EOT , As4 .byte W96 .byte GOTO - .word bgm_battle31_2_B1 + .word mus_vs_aqua_magma_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle31_3: - .byte KEYSH , bgm_battle31_key+0 +mus_vs_aqua_magma_3: + .byte KEYSH , mus_vs_aqua_magma_key+0 .byte VOICE , 33 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte W12 .byte N12 , As1 , v108 .byte W24 @@ -1191,7 +1191,7 @@ bgm_battle31_3: .byte W48 .byte Bn0 .byte W48 -bgm_battle31_3_000: +mus_vs_aqua_magma_3_000: .byte N12 , As0 , v108 .byte W12 .byte Fn0 @@ -1209,7 +1209,7 @@ bgm_battle31_3_000: .byte Cs1 .byte W12 .byte PEND -bgm_battle31_3_001: +mus_vs_aqua_magma_3_001: .byte N12 , As0 , v108 .byte W12 .byte Fn0 @@ -1228,8 +1228,8 @@ bgm_battle31_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_3_000 -bgm_battle31_3_002: + .word mus_vs_aqua_magma_3_000 +mus_vs_aqua_magma_3_002: .byte N12 , As0 , v108 .byte W12 .byte Fn0 @@ -1248,15 +1248,15 @@ bgm_battle31_3_002: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_001 + .word mus_vs_aqua_magma_3_001 .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_002 -bgm_battle31_3_B1: -bgm_battle31_3_003: + .word mus_vs_aqua_magma_3_002 +mus_vs_aqua_magma_3_B1: +mus_vs_aqua_magma_3_003: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -1275,8 +1275,8 @@ bgm_battle31_3_003: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_3_003 -bgm_battle31_3_004: + .word mus_vs_aqua_magma_3_003 +mus_vs_aqua_magma_3_004: .byte N12 , Bn0 , v108 .byte W12 .byte Fs1 @@ -1295,16 +1295,16 @@ bgm_battle31_3_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_3_004 + .word mus_vs_aqua_magma_3_004 .byte PATT - .word bgm_battle31_3_003 + .word mus_vs_aqua_magma_3_003 .byte PATT - .word bgm_battle31_3_003 + .word mus_vs_aqua_magma_3_003 .byte PATT - .word bgm_battle31_3_004 + .word mus_vs_aqua_magma_3_004 .byte PATT - .word bgm_battle31_3_004 -bgm_battle31_3_005: + .word mus_vs_aqua_magma_3_004 +mus_vs_aqua_magma_3_005: .byte N12 , As0 , v108 .byte W12 .byte Dn1 @@ -1322,7 +1322,7 @@ bgm_battle31_3_005: .byte Fn1 .byte W12 .byte PEND -bgm_battle31_3_006: +mus_vs_aqua_magma_3_006: .byte N12 , As0 , v108 .byte W12 .byte Ds1 @@ -1340,7 +1340,7 @@ bgm_battle31_3_006: .byte Fs1 .byte W12 .byte PEND -bgm_battle31_3_007: +mus_vs_aqua_magma_3_007: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -1359,25 +1359,25 @@ bgm_battle31_3_007: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_3_006 + .word mus_vs_aqua_magma_3_006 .byte PATT - .word bgm_battle31_3_005 + .word mus_vs_aqua_magma_3_005 .byte PATT - .word bgm_battle31_3_006 + .word mus_vs_aqua_magma_3_006 .byte PATT - .word bgm_battle31_3_007 + .word mus_vs_aqua_magma_3_007 .byte PATT - .word bgm_battle31_3_006 + .word mus_vs_aqua_magma_3_006 .byte PATT - .word bgm_battle31_3_003 + .word mus_vs_aqua_magma_3_003 .byte PATT - .word bgm_battle31_3_003 + .word mus_vs_aqua_magma_3_003 .byte PATT - .word bgm_battle31_3_003 + .word mus_vs_aqua_magma_3_003 .byte PATT - .word bgm_battle31_3_003 + .word mus_vs_aqua_magma_3_003 .byte PATT - .word bgm_battle31_3_003 + .word mus_vs_aqua_magma_3_003 .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -1426,7 +1426,7 @@ bgm_battle31_3_007: .byte W12 .byte Fs1 .byte W12 -bgm_battle31_3_008: +mus_vs_aqua_magma_3_008: .byte N12 , Cs1 , v108 .byte W12 .byte Gs1 @@ -1445,32 +1445,32 @@ bgm_battle31_3_008: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_008 + .word mus_vs_aqua_magma_3_008 .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_001 + .word mus_vs_aqua_magma_3_001 .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_002 -bgm_battle31_3_009: + .word mus_vs_aqua_magma_3_002 +mus_vs_aqua_magma_3_009: .byte N12 , Cs1 , v108 .byte W12 .byte Gs0 @@ -1488,7 +1488,7 @@ bgm_battle31_3_009: .byte En1 .byte W12 .byte PEND -bgm_battle31_3_010: +mus_vs_aqua_magma_3_010: .byte N12 , Cs1 , v108 .byte W12 .byte Gs0 @@ -1507,8 +1507,8 @@ bgm_battle31_3_010: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_3_009 -bgm_battle31_3_011: + .word mus_vs_aqua_magma_3_009 +mus_vs_aqua_magma_3_011: .byte N12 , Cs1 , v108 .byte W12 .byte Gs0 @@ -1527,59 +1527,59 @@ bgm_battle31_3_011: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_001 + .word mus_vs_aqua_magma_3_001 .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_002 + .word mus_vs_aqua_magma_3_002 .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_001 + .word mus_vs_aqua_magma_3_001 .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_002 + .word mus_vs_aqua_magma_3_002 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_010 + .word mus_vs_aqua_magma_3_010 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_011 + .word mus_vs_aqua_magma_3_011 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_010 + .word mus_vs_aqua_magma_3_010 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_011 + .word mus_vs_aqua_magma_3_011 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_010 + .word mus_vs_aqua_magma_3_010 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_011 + .word mus_vs_aqua_magma_3_011 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_010 + .word mus_vs_aqua_magma_3_010 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_011 + .word mus_vs_aqua_magma_3_011 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte PATT - .word bgm_battle31_3_010 + .word mus_vs_aqua_magma_3_010 .byte PATT - .word bgm_battle31_3_009 + .word mus_vs_aqua_magma_3_009 .byte N12 , Cs1 , v108 .byte W12 .byte Gs0 @@ -1597,26 +1597,26 @@ bgm_battle31_3_011: .byte Bn0 .byte W12 .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_001 + .word mus_vs_aqua_magma_3_001 .byte PATT - .word bgm_battle31_3_000 + .word mus_vs_aqua_magma_3_000 .byte PATT - .word bgm_battle31_3_002 + .word mus_vs_aqua_magma_3_002 .byte GOTO - .word bgm_battle31_3_B1 + .word mus_vs_aqua_magma_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle31_4: - .byte KEYSH , bgm_battle31_key+0 +mus_vs_aqua_magma_4: + .byte KEYSH , mus_vs_aqua_magma_key+0 .byte VOICE , 80 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte LFOS , 22 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte PAN , c_v-48 .byte W18 .byte N06 , As5 , v052 @@ -1668,7 +1668,7 @@ bgm_battle31_4: .byte W12 .byte N24 , Bn3 .byte W24 -bgm_battle31_4_B1: +mus_vs_aqua_magma_4_B1: .byte MOD , 0 .byte W96 .byte W60 @@ -1684,30 +1684,30 @@ bgm_battle31_4_B1: .byte W60 .byte MOD , 3 .byte W36 -bgm_battle31_4_000: - .byte VOL , 76*bgm_battle31_mvl/mxv +mus_vs_aqua_magma_4_000: + .byte VOL , 76*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 71*bgm_battle31_mvl/mxv + .byte 71*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 66*bgm_battle31_mvl/mxv + .byte 66*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 62*bgm_battle31_mvl/mxv + .byte 62*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 53*bgm_battle31_mvl/mxv + .byte 53*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 45*bgm_battle31_mvl/mxv + .byte 45*mus_vs_aqua_magma_mvl/mxv .byte W12 - .byte 32*bgm_battle31_mvl/mxv + .byte 32*mus_vs_aqua_magma_mvl/mxv .byte W09 - .byte 22*bgm_battle31_mvl/mxv + .byte 22*mus_vs_aqua_magma_mvl/mxv .byte W06 - .byte 10*bgm_battle31_mvl/mxv + .byte 10*mus_vs_aqua_magma_mvl/mxv .byte W09 .byte PEND .byte EOT , Bn3 .byte MOD , 0 .byte W48 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte PAN , c_v+0 .byte N36 , As2 , v052 .byte W36 @@ -1727,12 +1727,12 @@ bgm_battle31_4_000: .byte MOD , 3 .byte W36 .byte PATT - .word bgm_battle31_4_000 + .word mus_vs_aqua_magma_4_000 .byte EOT , Bn3 .byte VOICE , 4 .byte PAN , c_v+0 .byte MOD , 0 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte N12 , As3 , v052 .byte W12 .byte Dn3 @@ -1747,7 +1747,7 @@ bgm_battle31_4_000: .byte W12 .byte N24 , As3 .byte W24 -bgm_battle31_4_001: +mus_vs_aqua_magma_4_001: .byte N12 , Bn3 , v052 .byte W12 .byte Ds3 @@ -1778,7 +1778,7 @@ bgm_battle31_4_001: .byte N24 , Cs4 .byte W24 .byte PATT - .word bgm_battle31_4_001 + .word mus_vs_aqua_magma_4_001 .byte N12 , As3 , v052 .byte W12 .byte Dn3 @@ -1794,7 +1794,7 @@ bgm_battle31_4_001: .byte N24 , As3 .byte W24 .byte PATT - .word bgm_battle31_4_001 + .word mus_vs_aqua_magma_4_001 .byte N12 , Cs4 , v052 .byte W12 .byte Fn3 @@ -1827,7 +1827,7 @@ bgm_battle31_4_001: .byte W36 .byte As4 .byte W24 -bgm_battle31_4_002: +mus_vs_aqua_magma_4_002: .byte N12 , Bn4 , v060 .byte W72 .byte As4 @@ -1845,11 +1845,11 @@ bgm_battle31_4_002: .byte As4 .byte W24 .byte PATT - .word bgm_battle31_4_002 + .word mus_vs_aqua_magma_4_002 .byte N12 , As4 , v060 .byte W96 .byte W96 -bgm_battle31_4_003: +mus_vs_aqua_magma_4_003: .byte N12 , Cs4 , v060 .byte W36 .byte Gs4 @@ -1857,7 +1857,7 @@ bgm_battle31_4_003: .byte Cs5 .byte W24 .byte PEND -bgm_battle31_4_004: +mus_vs_aqua_magma_4_004: .byte N12 , Dn5 , v060 .byte W72 .byte Cs5 @@ -1869,9 +1869,9 @@ bgm_battle31_4_004: .byte W96 .byte W96 .byte PATT - .word bgm_battle31_4_003 + .word mus_vs_aqua_magma_4_003 .byte PATT - .word bgm_battle31_4_004 + .word mus_vs_aqua_magma_4_004 .byte N12 , Cs5 , v060 .byte W96 .byte W96 @@ -1905,7 +1905,7 @@ bgm_battle31_4_004: .byte W36 .byte N12 .byte W24 -bgm_battle31_4_005: +mus_vs_aqua_magma_4_005: .byte N12 , Fn2 , v060 .byte W36 .byte N12 @@ -1913,7 +1913,7 @@ bgm_battle31_4_005: .byte N24 , Fs2 .byte W24 .byte PEND -bgm_battle31_4_006: +mus_vs_aqua_magma_4_006: .byte N12 , Fn2 , v060 .byte W36 .byte N12 @@ -1921,7 +1921,7 @@ bgm_battle31_4_006: .byte N12 .byte W24 .byte PEND -bgm_battle31_4_007: +mus_vs_aqua_magma_4_007: .byte N12 , Fn2 , v060 .byte W36 .byte N12 @@ -1932,13 +1932,13 @@ bgm_battle31_4_007: .byte W24 .byte PEND .byte PATT - .word bgm_battle31_4_006 + .word mus_vs_aqua_magma_4_006 .byte PATT - .word bgm_battle31_4_005 + .word mus_vs_aqua_magma_4_005 .byte PATT - .word bgm_battle31_4_006 + .word mus_vs_aqua_magma_4_006 .byte PATT - .word bgm_battle31_4_007 + .word mus_vs_aqua_magma_4_007 .byte VOICE , 5 .byte PAN , c_v+48 .byte N12 , As2 , v052 @@ -1947,7 +1947,7 @@ bgm_battle31_4_007: .byte W36 .byte N12 .byte W24 -bgm_battle31_4_008: +mus_vs_aqua_magma_4_008: .byte N12 , As2 , v052 .byte W36 .byte N12 @@ -1957,7 +1957,7 @@ bgm_battle31_4_008: .byte N24 , An2 .byte W24 .byte PEND -bgm_battle31_4_009: +mus_vs_aqua_magma_4_009: .byte N12 , As2 , v052 .byte W36 .byte N12 @@ -1972,11 +1972,11 @@ bgm_battle31_4_009: .byte N24 , Bn2 .byte W24 .byte PATT - .word bgm_battle31_4_009 + .word mus_vs_aqua_magma_4_009 .byte PATT - .word bgm_battle31_4_008 + .word mus_vs_aqua_magma_4_008 .byte PATT - .word bgm_battle31_4_009 + .word mus_vs_aqua_magma_4_009 .byte N12 , As2 , v052 .byte W36 .byte N12 @@ -2071,19 +2071,19 @@ bgm_battle31_4_009: .byte N12 .byte W12 .byte GOTO - .word bgm_battle31_4_B1 + .word mus_vs_aqua_magma_4_B1 .byte MOD , 0 .byte FINE @********************** Track 5 **********************@ -bgm_battle31_5: - .byte KEYSH , bgm_battle31_key+0 +mus_vs_aqua_magma_5: + .byte KEYSH , mus_vs_aqua_magma_key+0 .byte VOICE , 82 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte LFOS , 22 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte PAN , c_v+48 .byte N06 , As2 , v052 .byte W12 @@ -2127,7 +2127,7 @@ bgm_battle31_5: .byte W96 .byte W96 .byte W96 -bgm_battle31_5_B1: +mus_vs_aqua_magma_5_B1: .byte PAN , c_v+48 .byte MOD , 0 .byte W96 @@ -2211,59 +2211,59 @@ bgm_battle31_5_B1: .byte W12 .byte N12 .byte W12 - .byte VOL , 74*bgm_battle31_mvl/mxv + .byte VOL , 74*mus_vs_aqua_magma_mvl/mxv .byte MOD , 3 .byte N12 .byte W12 .byte N12 .byte W06 - .byte VOL , 69*bgm_battle31_mvl/mxv + .byte VOL , 69*mus_vs_aqua_magma_mvl/mxv .byte W06 .byte N12 .byte W09 - .byte VOL , 65*bgm_battle31_mvl/mxv + .byte VOL , 65*mus_vs_aqua_magma_mvl/mxv .byte W03 .byte N12 .byte W12 - .byte VOL , 60*bgm_battle31_mvl/mxv + .byte VOL , 60*mus_vs_aqua_magma_mvl/mxv .byte N12 .byte W12 .byte N12 .byte W03 - .byte VOL , 57*bgm_battle31_mvl/mxv + .byte VOL , 57*mus_vs_aqua_magma_mvl/mxv .byte W09 .byte N12 .byte W06 - .byte VOL , 53*bgm_battle31_mvl/mxv + .byte VOL , 53*mus_vs_aqua_magma_mvl/mxv .byte W06 .byte N12 .byte W09 - .byte VOL , 48*bgm_battle31_mvl/mxv + .byte VOL , 48*mus_vs_aqua_magma_mvl/mxv .byte W03 .byte N12 .byte W12 - .byte VOL , 43*bgm_battle31_mvl/mxv + .byte VOL , 43*mus_vs_aqua_magma_mvl/mxv .byte N12 .byte W12 .byte N12 .byte W06 - .byte VOL , 37*bgm_battle31_mvl/mxv + .byte VOL , 37*mus_vs_aqua_magma_mvl/mxv .byte W06 .byte N12 .byte W09 - .byte VOL , 27*bgm_battle31_mvl/mxv + .byte VOL , 27*mus_vs_aqua_magma_mvl/mxv .byte W03 .byte N12 .byte W12 - .byte VOL , 19*bgm_battle31_mvl/mxv + .byte VOL , 19*mus_vs_aqua_magma_mvl/mxv .byte N12 .byte W12 - .byte VOL , 10*bgm_battle31_mvl/mxv + .byte VOL , 10*mus_vs_aqua_magma_mvl/mxv .byte N12 .byte W12 .byte MOD , 0 .byte W12 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -2275,14 +2275,14 @@ bgm_battle31_5_B1: .byte W36 .byte Fn4 .byte W24 -bgm_battle31_5_000: +mus_vs_aqua_magma_5_000: .byte W12 .byte N12 , As4 , v040 .byte W24 .byte Bn4 .byte W60 .byte PEND -bgm_battle31_5_001: +mus_vs_aqua_magma_5_001: .byte W12 .byte N12 , As4 , v040 .byte W12 @@ -2298,25 +2298,25 @@ bgm_battle31_5_001: .byte Fn4 .byte W24 .byte PATT - .word bgm_battle31_5_000 + .word mus_vs_aqua_magma_5_000 .byte PATT - .word bgm_battle31_5_001 + .word mus_vs_aqua_magma_5_001 .byte W96 -bgm_battle31_5_002: +mus_vs_aqua_magma_5_002: .byte W36 .byte N12 , Cs4 , v040 .byte W36 .byte Gs4 .byte W24 .byte PEND -bgm_battle31_5_003: +mus_vs_aqua_magma_5_003: .byte W12 .byte N12 , Cs5 , v040 .byte W24 .byte Dn5 .byte W60 .byte PEND -bgm_battle31_5_004: +mus_vs_aqua_magma_5_004: .byte W12 .byte N12 , Cs5 , v040 .byte W12 @@ -2327,11 +2327,11 @@ bgm_battle31_5_004: .byte PEND .byte W96 .byte PATT - .word bgm_battle31_5_002 + .word mus_vs_aqua_magma_5_002 .byte PATT - .word bgm_battle31_5_003 + .word mus_vs_aqua_magma_5_003 .byte PATT - .word bgm_battle31_5_004 + .word mus_vs_aqua_magma_5_004 .byte W96 .byte W96 .byte W96 @@ -2448,7 +2448,7 @@ bgm_battle31_5_004: .byte W36 .byte N12 .byte W24 -bgm_battle31_5_005: +mus_vs_aqua_magma_5_005: .byte N12 , Cs4 , v052 .byte W36 .byte N12 @@ -2458,7 +2458,7 @@ bgm_battle31_5_005: .byte N24 , Cn4 .byte W24 .byte PEND -bgm_battle31_5_006: +mus_vs_aqua_magma_5_006: .byte N12 , Cs4 , v052 .byte W36 .byte N12 @@ -2473,11 +2473,11 @@ bgm_battle31_5_006: .byte N24 , Dn4 .byte W24 .byte PATT - .word bgm_battle31_5_006 + .word mus_vs_aqua_magma_5_006 .byte PATT - .word bgm_battle31_5_005 + .word mus_vs_aqua_magma_5_005 .byte PATT - .word bgm_battle31_5_006 + .word mus_vs_aqua_magma_5_006 .byte N12 , Cs4 , v052 .byte W36 .byte N12 @@ -2505,15 +2505,15 @@ bgm_battle31_5_006: .byte MOD , 5 .byte W48 .byte GOTO - .word bgm_battle31_5_B1 + .word mus_vs_aqua_magma_5_B1 .byte MOD , 0 .byte FINE @********************** Track 6 **********************@ -bgm_battle31_6: - .byte KEYSH , bgm_battle31_key+0 - .byte VOL , 80*bgm_battle31_mvl/mxv +mus_vs_aqua_magma_6: + .byte KEYSH , mus_vs_aqua_magma_key+0 + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte W96 .byte W72 .byte VOICE , 84 @@ -2527,7 +2527,7 @@ bgm_battle31_6: .byte W96 .byte W96 .byte W96 -bgm_battle31_6_B1: +mus_vs_aqua_magma_6_B1: .byte W96 .byte W96 .byte W96 @@ -2611,14 +2611,14 @@ bgm_battle31_6_B1: .byte W48 .byte Dn2 .byte W48 -bgm_battle31_6_000: +mus_vs_aqua_magma_6_000: .byte N48 , Ds2 , v080 .byte W48 .byte En2 .byte W48 .byte PEND .byte PATT - .word bgm_battle31_6_000 + .word mus_vs_aqua_magma_6_000 .byte N48 , Fn2 , v080 .byte W48 .byte Fs2 @@ -2639,7 +2639,7 @@ bgm_battle31_6_000: .byte W12 .byte Cs2 .byte W12 -bgm_battle31_6_001: +mus_vs_aqua_magma_6_001: .byte N12 , As1 , v080 .byte W12 .byte Fn1 @@ -2657,7 +2657,7 @@ bgm_battle31_6_001: .byte Fn2 .byte W12 .byte PEND -bgm_battle31_6_002: +mus_vs_aqua_magma_6_002: .byte N12 , As1 , v080 .byte W12 .byte Fn1 @@ -2675,7 +2675,7 @@ bgm_battle31_6_002: .byte Cs2 .byte W12 .byte PEND -bgm_battle31_6_003: +mus_vs_aqua_magma_6_003: .byte N12 , As1 , v080 .byte W12 .byte Fn1 @@ -2693,7 +2693,7 @@ bgm_battle31_6_003: .byte Gs1 .byte W12 .byte PEND -bgm_battle31_6_004: +mus_vs_aqua_magma_6_004: .byte N12 , Cs2 , v080 .byte W12 .byte Gs1 @@ -2711,7 +2711,7 @@ bgm_battle31_6_004: .byte En2 .byte W12 .byte PEND -bgm_battle31_6_005: +mus_vs_aqua_magma_6_005: .byte N12 , Cs2 , v080 .byte W12 .byte Gs1 @@ -2730,8 +2730,8 @@ bgm_battle31_6_005: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_6_004 -bgm_battle31_6_006: + .word mus_vs_aqua_magma_6_004 +mus_vs_aqua_magma_6_006: .byte N12 , Cs2 , v080 .byte W12 .byte Gs1 @@ -2750,59 +2750,59 @@ bgm_battle31_6_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle31_6_002 + .word mus_vs_aqua_magma_6_002 .byte PATT - .word bgm_battle31_6_001 + .word mus_vs_aqua_magma_6_001 .byte PATT - .word bgm_battle31_6_002 + .word mus_vs_aqua_magma_6_002 .byte PATT - .word bgm_battle31_6_003 + .word mus_vs_aqua_magma_6_003 .byte PATT - .word bgm_battle31_6_002 + .word mus_vs_aqua_magma_6_002 .byte PATT - .word bgm_battle31_6_001 + .word mus_vs_aqua_magma_6_001 .byte PATT - .word bgm_battle31_6_002 + .word mus_vs_aqua_magma_6_002 .byte PATT - .word bgm_battle31_6_003 + .word mus_vs_aqua_magma_6_003 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_005 + .word mus_vs_aqua_magma_6_005 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_006 + .word mus_vs_aqua_magma_6_006 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_005 + .word mus_vs_aqua_magma_6_005 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_006 + .word mus_vs_aqua_magma_6_006 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_005 + .word mus_vs_aqua_magma_6_005 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_006 + .word mus_vs_aqua_magma_6_006 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_005 + .word mus_vs_aqua_magma_6_005 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_006 + .word mus_vs_aqua_magma_6_006 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte PATT - .word bgm_battle31_6_005 + .word mus_vs_aqua_magma_6_005 .byte PATT - .word bgm_battle31_6_004 + .word mus_vs_aqua_magma_6_004 .byte N12 , Cs2 , v080 .byte W12 .byte Gs1 @@ -2824,22 +2824,22 @@ bgm_battle31_6_006: .byte W96 .byte W96 .byte GOTO - .word bgm_battle31_6_B1 + .word mus_vs_aqua_magma_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle31_7: - .byte KEYSH , bgm_battle31_key+0 +mus_vs_aqua_magma_7: + .byte KEYSH , mus_vs_aqua_magma_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte W96 .byte W72 .byte N12 , Dn1 , v112 .byte W12 .byte N12 .byte W12 -bgm_battle31_7_000: +mus_vs_aqua_magma_7_000: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2847,18 +2847,18 @@ bgm_battle31_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 -bgm_battle31_7_001: + .word mus_vs_aqua_magma_7_000 +mus_vs_aqua_magma_7_001: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2867,38 +2867,38 @@ bgm_battle31_7_001: .byte N12 .byte W12 .byte PEND -bgm_battle31_7_B1: +mus_vs_aqua_magma_7_B1: .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_001 + .word mus_vs_aqua_magma_7_001 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 -bgm_battle31_7_002: + .word mus_vs_aqua_magma_7_000 +mus_vs_aqua_magma_7_002: .byte W24 .byte N12 , Dn1 , v112 .byte W24 @@ -2918,41 +2918,41 @@ bgm_battle31_7_002: .byte W96 .byte W96 .byte PATT - .word bgm_battle31_7_002 + .word mus_vs_aqua_magma_7_002 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_001 + .word mus_vs_aqua_magma_7_001 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W36 @@ -2961,43 +2961,43 @@ bgm_battle31_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_001 + .word mus_vs_aqua_magma_7_001 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_001 + .word mus_vs_aqua_magma_7_001 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_001 + .word mus_vs_aqua_magma_7_001 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W12 @@ -3008,19 +3008,19 @@ bgm_battle31_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_001 + .word mus_vs_aqua_magma_7_001 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W36 @@ -3031,23 +3031,23 @@ bgm_battle31_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_000 + .word mus_vs_aqua_magma_7_000 .byte PATT - .word bgm_battle31_7_001 + .word mus_vs_aqua_magma_7_001 .byte GOTO - .word bgm_battle31_7_B1 + .word mus_vs_aqua_magma_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle31_8: - .byte KEYSH , bgm_battle31_key+0 +mus_vs_aqua_magma_8: + .byte KEYSH , mus_vs_aqua_magma_key+0 .byte VOICE , 47 - .byte VOL , 80*bgm_battle31_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_mvl/mxv .byte PAN , c_v-6 .byte N48 , Cn2 , v112 .byte W96 @@ -3057,13 +3057,13 @@ bgm_battle31_8: .byte W24 .byte N12 .byte W48 -bgm_battle31_8_000: +mus_vs_aqua_magma_8_000: .byte N12 , Cn2 , v112 .byte W48 .byte N12 .byte W48 .byte PEND -bgm_battle31_8_001: +mus_vs_aqua_magma_8_001: .byte N12 , Cn2 , v112 .byte W36 .byte N12 @@ -3072,8 +3072,8 @@ bgm_battle31_8_001: .byte W36 .byte PEND .byte PATT - .word bgm_battle31_8_000 -bgm_battle31_8_002: + .word mus_vs_aqua_magma_8_000 +mus_vs_aqua_magma_8_002: .byte N12 , Cn2 , v112 .byte W48 .byte N12 @@ -3082,48 +3082,48 @@ bgm_battle31_8_002: .byte W36 .byte PEND .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 -bgm_battle31_8_B1: + .word mus_vs_aqua_magma_8_001 +mus_vs_aqua_magma_8_B1: .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte N12 , Cn2 , v108 .byte W48 .byte Cn2 , v112 .byte W48 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte W96 .byte W96 .byte W96 @@ -3133,131 +3133,131 @@ bgm_battle31_8_B1: .byte W96 .byte W96 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_002 + .word mus_vs_aqua_magma_8_002 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_000 -bgm_battle31_8_003: + .word mus_vs_aqua_magma_8_000 +mus_vs_aqua_magma_8_003: .byte N12 , Cn2 , v112 .byte W36 .byte N12 .byte W60 .byte PEND .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_003 + .word mus_vs_aqua_magma_8_003 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte PATT - .word bgm_battle31_8_000 + .word mus_vs_aqua_magma_8_000 .byte PATT - .word bgm_battle31_8_001 + .word mus_vs_aqua_magma_8_001 .byte GOTO - .word bgm_battle31_8_B1 + .word mus_vs_aqua_magma_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle31: +mus_vs_aqua_magma: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle31_pri @ Priority - .byte bgm_battle31_rev @ Reverb. + .byte mus_vs_aqua_magma_pri @ Priority + .byte mus_vs_aqua_magma_rev @ Reverb. - .word bgm_battle31_grp + .word mus_vs_aqua_magma_grp - .word bgm_battle31_1 - .word bgm_battle31_2 - .word bgm_battle31_3 - .word bgm_battle31_4 - .word bgm_battle31_5 - .word bgm_battle31_6 - .word bgm_battle31_7 - .word bgm_battle31_8 + .word mus_vs_aqua_magma_1 + .word mus_vs_aqua_magma_2 + .word mus_vs_aqua_magma_3 + .word mus_vs_aqua_magma_4 + .word mus_vs_aqua_magma_5 + .word mus_vs_aqua_magma_6 + .word mus_vs_aqua_magma_7 + .word mus_vs_aqua_magma_8 .end diff --git a/sound/songs/bgm_battle30.s b/sound/songs/mus_vs_aqua_magma_leader.s index 57f5e3e42..dd62fdbd1 100644 --- a/sound/songs/bgm_battle30.s +++ b/sound/songs/mus_vs_aqua_magma_leader.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_battle30_grp, voicegroup109 - .equ bgm_battle30_pri, 1 - .equ bgm_battle30_rev, reverb_set+50 - .equ bgm_battle30_mvl, 127 - .equ bgm_battle30_key, 0 - .equ bgm_battle30_tbs, 1 - .equ bgm_battle30_exg, 0 - .equ bgm_battle30_cmp, 1 + .equ mus_vs_aqua_magma_leader_grp, voicegroup109 + .equ mus_vs_aqua_magma_leader_pri, 1 + .equ mus_vs_aqua_magma_leader_rev, reverb_set+50 + .equ mus_vs_aqua_magma_leader_mvl, 127 + .equ mus_vs_aqua_magma_leader_key, 0 + .equ mus_vs_aqua_magma_leader_tbs, 1 + .equ mus_vs_aqua_magma_leader_exg, 0 + .equ mus_vs_aqua_magma_leader_cmp, 1 .section .rodata - .global bgm_battle30 + .global mus_vs_aqua_magma_leader .align 2 @********************** Track 1 **********************@ -bgm_battle30_1: - .byte KEYSH , bgm_battle30_key+0 - .byte TEMPO , 202*bgm_battle30_tbs/2 +mus_vs_aqua_magma_leader_1: + .byte KEYSH , mus_vs_aqua_magma_leader_key+0 + .byte TEMPO , 202*mus_vs_aqua_magma_leader_tbs/2 .byte LFOS , 16 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte W48 .byte W96 .byte W96 @@ -44,7 +44,7 @@ bgm_battle30_1: .byte W36 .byte N12 , Ds2 .byte W24 -bgm_battle30_1_000: +mus_vs_aqua_magma_leader_1_000: .byte N12 , Fn2 , v108 .byte W36 .byte N36 , Cn2 @@ -52,7 +52,7 @@ bgm_battle30_1_000: .byte N12 , En2 .byte W24 .byte PEND -bgm_battle30_1_001: +mus_vs_aqua_magma_leader_1_001: .byte N12 , Fn2 , v108 .byte W36 .byte N24 , As2 @@ -64,7 +64,7 @@ bgm_battle30_1_001: .byte En2 .byte W12 .byte PEND -bgm_battle30_1_002: +mus_vs_aqua_magma_leader_1_002: .byte N12 , Fn2 , v108 .byte W36 .byte N36 , Cn2 @@ -73,12 +73,12 @@ bgm_battle30_1_002: .byte W24 .byte PEND .byte PATT - .word bgm_battle30_1_000 + .word mus_vs_aqua_magma_leader_1_000 .byte PATT - .word bgm_battle30_1_000 + .word mus_vs_aqua_magma_leader_1_000 .byte PATT - .word bgm_battle30_1_001 -bgm_battle30_1_003: + .word mus_vs_aqua_magma_leader_1_001 +mus_vs_aqua_magma_leader_1_003: .byte N12 , Fn2 , v108 .byte W36 .byte Cn2 @@ -86,7 +86,7 @@ bgm_battle30_1_003: .byte N48 , Fn2 .byte W48 .byte PEND -bgm_battle30_1_B1: +mus_vs_aqua_magma_leader_1_B1: .byte PAN , c_v-8 .byte N12 , Gn2 , v108 .byte W36 @@ -94,7 +94,7 @@ bgm_battle30_1_B1: .byte W36 .byte N12 , Fn2 .byte W24 -bgm_battle30_1_004: +mus_vs_aqua_magma_leader_1_004: .byte N12 , Gn2 , v108 .byte W36 .byte N36 , Dn2 @@ -102,7 +102,7 @@ bgm_battle30_1_004: .byte N12 , Fs2 .byte W24 .byte PEND -bgm_battle30_1_005: +mus_vs_aqua_magma_leader_1_005: .byte N12 , Gn2 , v108 .byte W36 .byte N24 , Cn3 @@ -121,11 +121,11 @@ bgm_battle30_1_005: .byte N12 , Gs2 .byte W24 .byte PATT - .word bgm_battle30_1_004 + .word mus_vs_aqua_magma_leader_1_004 .byte PATT - .word bgm_battle30_1_004 + .word mus_vs_aqua_magma_leader_1_004 .byte PATT - .word bgm_battle30_1_005 + .word mus_vs_aqua_magma_leader_1_005 .byte N12 , Gn2 , v108 .byte W36 .byte Dn2 @@ -163,7 +163,7 @@ bgm_battle30_1_005: .byte W96 .byte W96 .byte W96 -bgm_battle30_1_006: +mus_vs_aqua_magma_leader_1_006: .byte N36 , Cn2 , v108 .byte W36 .byte Cs2 @@ -178,7 +178,7 @@ bgm_battle30_1_006: .byte N24 , Bn1 .byte W24 .byte PATT - .word bgm_battle30_1_006 + .word mus_vs_aqua_magma_leader_1_006 .byte N36 , Fn2 , v108 .byte W36 .byte Fs2 @@ -310,29 +310,29 @@ bgm_battle30_1_006: .byte N12 , Ds2 .byte W24 .byte PATT - .word bgm_battle30_1_000 + .word mus_vs_aqua_magma_leader_1_000 .byte PATT - .word bgm_battle30_1_001 + .word mus_vs_aqua_magma_leader_1_001 .byte PATT - .word bgm_battle30_1_002 + .word mus_vs_aqua_magma_leader_1_002 .byte PATT - .word bgm_battle30_1_000 + .word mus_vs_aqua_magma_leader_1_000 .byte PATT - .word bgm_battle30_1_000 + .word mus_vs_aqua_magma_leader_1_000 .byte PATT - .word bgm_battle30_1_001 + .word mus_vs_aqua_magma_leader_1_001 .byte PATT - .word bgm_battle30_1_003 + .word mus_vs_aqua_magma_leader_1_003 .byte GOTO - .word bgm_battle30_1_B1 + .word mus_vs_aqua_magma_leader_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle30_2: - .byte KEYSH , bgm_battle30_key+0 +mus_vs_aqua_magma_leader_2: + .byte KEYSH , mus_vs_aqua_magma_leader_key+0 .byte LFOS , 16 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte PAN , c_v+0 .byte W48 .byte W96 @@ -341,7 +341,7 @@ bgm_battle30_2: .byte VOICE , 56 .byte N06 , Dn3 , v120 .byte W06 -bgm_battle30_2_000: +mus_vs_aqua_magma_leader_2_000: .byte N96 , Ds3 , v120 .byte W48 .byte MOD , 6 @@ -366,7 +366,7 @@ bgm_battle30_2_000: .byte Cs3 .byte W12 .byte PATT - .word bgm_battle30_2_000 + .word mus_vs_aqua_magma_leader_2_000 .byte MOD , 0 .byte W12 .byte N12 , Ds3 , v120 @@ -384,7 +384,7 @@ bgm_battle30_2_000: .byte En3 .byte W12 .byte PATT - .word bgm_battle30_2_000 + .word mus_vs_aqua_magma_leader_2_000 .byte MOD , 0 .byte W12 .byte N12 , Ds3 , v120 @@ -406,36 +406,36 @@ bgm_battle30_2_000: .byte MOD , 6 .byte W32 .byte W01 - .byte VOL , 76*bgm_battle30_mvl/mxv + .byte VOL , 76*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 73*bgm_battle30_mvl/mxv + .byte 73*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 .byte W03 - .byte 68*bgm_battle30_mvl/mxv + .byte 68*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 59*bgm_battle30_mvl/mxv + .byte 59*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 50*bgm_battle30_mvl/mxv + .byte 50*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 38*bgm_battle30_mvl/mxv + .byte 38*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 - .byte 25*bgm_battle30_mvl/mxv + .byte 25*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 - .byte 13*bgm_battle30_mvl/mxv + .byte 13*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 .byte EOT .byte MOD , 0 .byte W42 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte N06 , En3 , v124 .byte W06 -bgm_battle30_2_001: +mus_vs_aqua_magma_leader_2_001: .byte N96 , Fn3 , v124 .byte W48 .byte MOD , 6 .byte W48 .byte PEND -bgm_battle30_2_002: +mus_vs_aqua_magma_leader_2_002: .byte MOD , 0 .byte W06 .byte N06 , En3 , v124 @@ -456,8 +456,8 @@ bgm_battle30_2_002: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_2_001 -bgm_battle30_2_003: + .word mus_vs_aqua_magma_leader_2_001 +mus_vs_aqua_magma_leader_2_003: .byte MOD , 0 .byte W12 .byte N12 , Fn3 , v124 @@ -476,8 +476,8 @@ bgm_battle30_2_003: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_2_001 -bgm_battle30_2_004: + .word mus_vs_aqua_magma_leader_2_001 +mus_vs_aqua_magma_leader_2_004: .byte MOD , 0 .byte W12 .byte N12 , Fn3 , v124 @@ -504,14 +504,14 @@ bgm_battle30_2_004: .byte MOD , 0 .byte N48 , Fs3 .byte W48 -bgm_battle30_2_B1: -bgm_battle30_2_005: +mus_vs_aqua_magma_leader_2_B1: +mus_vs_aqua_magma_leader_2_005: .byte N96 , Gn3 , v124 .byte W48 .byte MOD , 6 .byte W48 .byte PEND -bgm_battle30_2_006: +mus_vs_aqua_magma_leader_2_006: .byte MOD , 0 .byte W12 .byte N12 , Gn3 , v124 @@ -530,7 +530,7 @@ bgm_battle30_2_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_2_005 + .word mus_vs_aqua_magma_leader_2_005 .byte MOD , 0 .byte W12 .byte N12 , Gn3 , v124 @@ -548,9 +548,9 @@ bgm_battle30_2_006: .byte Gs3 .byte W12 .byte PATT - .word bgm_battle30_2_005 + .word mus_vs_aqua_magma_leader_2_005 .byte PATT - .word bgm_battle30_2_006 + .word mus_vs_aqua_magma_leader_2_006 .byte N72 , Gn3 , v124 .byte W36 .byte MOD , 6 @@ -620,7 +620,7 @@ bgm_battle30_2_006: .byte W36 .byte N24 , Ds2 .byte W24 -bgm_battle30_2_007: +mus_vs_aqua_magma_leader_2_007: .byte N36 , Fn2 , v116 .byte W36 .byte Fs2 @@ -635,7 +635,7 @@ bgm_battle30_2_007: .byte N24 , En2 .byte W24 .byte PATT - .word bgm_battle30_2_007 + .word mus_vs_aqua_magma_leader_2_007 .byte N36 , As2 , v116 .byte W36 .byte Bn2 @@ -748,82 +748,82 @@ bgm_battle30_2_007: .byte EOT .byte TIE , Fn5 , v100 .byte W24 - .byte VOL , 78*bgm_battle30_mvl/mxv + .byte VOL , 78*mus_vs_aqua_magma_leader_mvl/mxv .byte W15 - .byte 74*bgm_battle30_mvl/mxv + .byte 74*mus_vs_aqua_magma_leader_mvl/mxv .byte W15 - .byte 70*bgm_battle30_mvl/mxv + .byte 70*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 68*bgm_battle30_mvl/mxv + .byte 68*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 65*bgm_battle30_mvl/mxv + .byte 65*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 62*bgm_battle30_mvl/mxv + .byte 62*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 .byte W09 - .byte 59*bgm_battle30_mvl/mxv + .byte 59*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 55*bgm_battle30_mvl/mxv + .byte 55*mus_vs_aqua_magma_leader_mvl/mxv .byte W18 - .byte 58*bgm_battle30_mvl/mxv + .byte 58*mus_vs_aqua_magma_leader_mvl/mxv .byte W15 - .byte 61*bgm_battle30_mvl/mxv + .byte 61*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 63*bgm_battle30_mvl/mxv + .byte 63*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 66*bgm_battle30_mvl/mxv + .byte 66*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 69*bgm_battle30_mvl/mxv + .byte 69*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 .byte W06 - .byte 70*bgm_battle30_mvl/mxv + .byte 70*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 74*bgm_battle30_mvl/mxv + .byte 74*mus_vs_aqua_magma_leader_mvl/mxv .byte W12 - .byte 77*bgm_battle30_mvl/mxv + .byte 77*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 80*bgm_battle30_mvl/mxv + .byte 80*mus_vs_aqua_magma_leader_mvl/mxv .byte W56 .byte W01 .byte W18 - .byte 76*bgm_battle30_mvl/mxv + .byte 76*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 72*bgm_battle30_mvl/mxv + .byte 72*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 68*bgm_battle30_mvl/mxv + .byte 68*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 62*bgm_battle30_mvl/mxv + .byte 62*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 56*bgm_battle30_mvl/mxv + .byte 56*mus_vs_aqua_magma_leader_mvl/mxv .byte W09 - .byte 46*bgm_battle30_mvl/mxv + .byte 46*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 - .byte 34*bgm_battle30_mvl/mxv + .byte 34*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 - .byte 22*bgm_battle30_mvl/mxv + .byte 22*mus_vs_aqua_magma_leader_mvl/mxv .byte W03 - .byte 10*bgm_battle30_mvl/mxv + .byte 10*mus_vs_aqua_magma_leader_mvl/mxv .byte W03 - .byte 5*bgm_battle30_mvl/mxv + .byte 5*mus_vs_aqua_magma_leader_mvl/mxv .byte W06 .byte EOT .byte W03 .byte VOICE , 56 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte N06 , En3 , v124 .byte W06 .byte PATT - .word bgm_battle30_2_001 + .word mus_vs_aqua_magma_leader_2_001 .byte PATT - .word bgm_battle30_2_002 + .word mus_vs_aqua_magma_leader_2_002 .byte PATT - .word bgm_battle30_2_001 + .word mus_vs_aqua_magma_leader_2_001 .byte PATT - .word bgm_battle30_2_003 + .word mus_vs_aqua_magma_leader_2_003 .byte PATT - .word bgm_battle30_2_001 + .word mus_vs_aqua_magma_leader_2_001 .byte PATT - .word bgm_battle30_2_004 + .word mus_vs_aqua_magma_leader_2_004 .byte N72 , Fn3 , v124 .byte W36 .byte MOD , 6 @@ -843,15 +843,15 @@ bgm_battle30_2_007: .byte 0 .byte W03 .byte GOTO - .word bgm_battle30_2_B1 + .word mus_vs_aqua_magma_leader_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle30_3: - .byte KEYSH , bgm_battle30_key+0 +mus_vs_aqua_magma_leader_3: + .byte KEYSH , mus_vs_aqua_magma_leader_key+0 .byte VOICE , 33 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte N24 , Ds0 , v116 .byte W24 .byte Fs0 @@ -896,7 +896,7 @@ bgm_battle30_3: .byte W12 .byte As0 .byte W12 -bgm_battle30_3_000: +mus_vs_aqua_magma_leader_3_000: .byte N12 , Ds0 , v116 .byte W12 .byte As0 @@ -914,7 +914,7 @@ bgm_battle30_3_000: .byte Bn0 .byte W12 .byte PEND -bgm_battle30_3_001: +mus_vs_aqua_magma_leader_3_001: .byte N12 , Ds0 , v116 .byte W12 .byte As0 @@ -965,9 +965,9 @@ bgm_battle30_3_001: .byte Bn0 .byte W12 .byte PATT - .word bgm_battle30_3_000 + .word mus_vs_aqua_magma_leader_3_000 .byte PATT - .word bgm_battle30_3_001 + .word mus_vs_aqua_magma_leader_3_001 .byte N12 , Ds0 , v116 .byte W12 .byte As0 @@ -984,7 +984,7 @@ bgm_battle30_3_001: .byte W12 .byte As0 .byte W12 -bgm_battle30_3_002: +mus_vs_aqua_magma_leader_3_002: .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1002,7 +1002,7 @@ bgm_battle30_3_002: .byte Cn1 .byte W12 .byte PEND -bgm_battle30_3_003: +mus_vs_aqua_magma_leader_3_003: .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1020,7 +1020,7 @@ bgm_battle30_3_003: .byte Cs1 .byte W12 .byte PEND -bgm_battle30_3_004: +mus_vs_aqua_magma_leader_3_004: .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1038,7 +1038,7 @@ bgm_battle30_3_004: .byte Cs1 .byte W12 .byte PEND -bgm_battle30_3_005: +mus_vs_aqua_magma_leader_3_005: .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1056,7 +1056,7 @@ bgm_battle30_3_005: .byte As0 .byte W12 .byte PEND -bgm_battle30_3_006: +mus_vs_aqua_magma_leader_3_006: .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1075,10 +1075,10 @@ bgm_battle30_3_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_3_003 + .word mus_vs_aqua_magma_leader_3_003 .byte PATT - .word bgm_battle30_3_004 -bgm_battle30_3_007: + .word mus_vs_aqua_magma_leader_3_004 +mus_vs_aqua_magma_leader_3_007: .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1096,8 +1096,8 @@ bgm_battle30_3_007: .byte An0 .byte W12 .byte PEND -bgm_battle30_3_B1: -bgm_battle30_3_008: +mus_vs_aqua_magma_leader_3_B1: +mus_vs_aqua_magma_leader_3_008: .byte N12 , Gn0 , v116 .byte W12 .byte Dn1 @@ -1115,7 +1115,7 @@ bgm_battle30_3_008: .byte Dn1 .byte W12 .byte PEND -bgm_battle30_3_009: +mus_vs_aqua_magma_leader_3_009: .byte N12 , Gn0 , v116 .byte W12 .byte Dn1 @@ -1133,7 +1133,7 @@ bgm_battle30_3_009: .byte Ds1 .byte W12 .byte PEND -bgm_battle30_3_010: +mus_vs_aqua_magma_leader_3_010: .byte N12 , Gn0 , v116 .byte W12 .byte Dn1 @@ -1184,9 +1184,9 @@ bgm_battle30_3_010: .byte Ds1 .byte W12 .byte PATT - .word bgm_battle30_3_009 + .word mus_vs_aqua_magma_leader_3_009 .byte PATT - .word bgm_battle30_3_010 + .word mus_vs_aqua_magma_leader_3_010 .byte N12 , Gn0 , v116 .byte W12 .byte Dn1 @@ -1204,9 +1204,9 @@ bgm_battle30_3_010: .byte Bn0 .byte W12 .byte PATT - .word bgm_battle30_3_008 + .word mus_vs_aqua_magma_leader_3_008 .byte PATT - .word bgm_battle30_3_008 + .word mus_vs_aqua_magma_leader_3_008 .byte N12 , Gn0 , v116 .byte W12 .byte Dn1 @@ -1223,7 +1223,7 @@ bgm_battle30_3_010: .byte W12 .byte Dn1 .byte W12 -bgm_battle30_3_011: +mus_vs_aqua_magma_leader_3_011: .byte N12 , Gs0 , v116 .byte W12 .byte Ds1 @@ -1242,14 +1242,14 @@ bgm_battle30_3_011: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_3_011 + .word mus_vs_aqua_magma_leader_3_011 .byte PATT - .word bgm_battle30_3_011 + .word mus_vs_aqua_magma_leader_3_011 .byte PATT - .word bgm_battle30_3_011 + .word mus_vs_aqua_magma_leader_3_011 .byte PATT - .word bgm_battle30_3_002 -bgm_battle30_3_012: + .word mus_vs_aqua_magma_leader_3_002 +mus_vs_aqua_magma_leader_3_012: .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1268,15 +1268,15 @@ bgm_battle30_3_012: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_012 + .word mus_vs_aqua_magma_leader_3_012 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_012 + .word mus_vs_aqua_magma_leader_3_012 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1293,7 +1293,7 @@ bgm_battle30_3_012: .byte W12 .byte Ds1 .byte W12 -bgm_battle30_3_013: +mus_vs_aqua_magma_leader_3_013: .byte N12 , Gn0 , v116 .byte W12 .byte Cn1 @@ -1328,7 +1328,7 @@ bgm_battle30_3_013: .byte Cn1 .byte W12 .byte PATT - .word bgm_battle30_3_013 + .word mus_vs_aqua_magma_leader_3_013 .byte N12 , Cn1 , v116 .byte W12 .byte N12 @@ -1410,19 +1410,19 @@ bgm_battle30_3_013: .byte En1 .byte W12 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte N12 , Fn0 , v116 .byte W12 .byte Cn1 @@ -1440,31 +1440,31 @@ bgm_battle30_3_013: .byte Cn1 .byte W12 .byte PATT - .word bgm_battle30_3_002 + .word mus_vs_aqua_magma_leader_3_002 .byte PATT - .word bgm_battle30_3_003 + .word mus_vs_aqua_magma_leader_3_003 .byte PATT - .word bgm_battle30_3_004 + .word mus_vs_aqua_magma_leader_3_004 .byte PATT - .word bgm_battle30_3_005 + .word mus_vs_aqua_magma_leader_3_005 .byte PATT - .word bgm_battle30_3_006 + .word mus_vs_aqua_magma_leader_3_006 .byte PATT - .word bgm_battle30_3_003 + .word mus_vs_aqua_magma_leader_3_003 .byte PATT - .word bgm_battle30_3_004 + .word mus_vs_aqua_magma_leader_3_004 .byte PATT - .word bgm_battle30_3_007 + .word mus_vs_aqua_magma_leader_3_007 .byte GOTO - .word bgm_battle30_3_B1 + .word mus_vs_aqua_magma_leader_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle30_4: - .byte KEYSH , bgm_battle30_key+0 +mus_vs_aqua_magma_leader_4: + .byte KEYSH , mus_vs_aqua_magma_leader_key+0 .byte LFOS , 16 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte W48 @@ -1479,7 +1479,7 @@ bgm_battle30_4: .byte W36 .byte N06 .byte W24 -bgm_battle30_4_000: +mus_vs_aqua_magma_leader_4_000: .byte N06 , Ds4 , v052 .byte W36 .byte N06 @@ -1492,7 +1492,7 @@ bgm_battle30_4_000: .byte W96 .byte W96 .byte PATT - .word bgm_battle30_4_000 + .word mus_vs_aqua_magma_leader_4_000 .byte N06 , Ds4 , v052 .byte W96 .byte W96 @@ -1502,7 +1502,7 @@ bgm_battle30_4_000: .byte W36 .byte N06 .byte W24 -bgm_battle30_4_001: +mus_vs_aqua_magma_leader_4_001: .byte N06 , Fn4 , v052 .byte W36 .byte N06 @@ -1515,11 +1515,11 @@ bgm_battle30_4_001: .byte W96 .byte W96 .byte PATT - .word bgm_battle30_4_001 + .word mus_vs_aqua_magma_leader_4_001 .byte N06 , Fn4 , v052 .byte W96 .byte W96 -bgm_battle30_4_B1: +mus_vs_aqua_magma_leader_4_B1: .byte PAN , c_v-48 .byte N06 , Gn4 , v052 .byte W36 @@ -1527,7 +1527,7 @@ bgm_battle30_4_B1: .byte W36 .byte N06 .byte W24 -bgm_battle30_4_002: +mus_vs_aqua_magma_leader_4_002: .byte N06 , Gn4 , v052 .byte W36 .byte N06 @@ -1540,7 +1540,7 @@ bgm_battle30_4_002: .byte W96 .byte W96 .byte PATT - .word bgm_battle30_4_002 + .word mus_vs_aqua_magma_leader_4_002 .byte N06 , Gn4 , v052 .byte W96 .byte W96 @@ -1629,7 +1629,7 @@ bgm_battle30_4_002: .byte W24 .byte En2 .byte W24 -bgm_battle30_4_003: +mus_vs_aqua_magma_leader_4_003: .byte N12 , Cn3 , v060 .byte W12 .byte N12 @@ -1658,7 +1658,7 @@ bgm_battle30_4_003: .byte Cn3 .byte W12 .byte PATT - .word bgm_battle30_4_003 + .word mus_vs_aqua_magma_leader_4_003 .byte N12 , Cn3 , v060 .byte W12 .byte N12 @@ -1834,15 +1834,15 @@ bgm_battle30_4_003: .byte W96 .byte W96 .byte GOTO - .word bgm_battle30_4_B1 + .word mus_vs_aqua_magma_leader_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle30_5: - .byte KEYSH , bgm_battle30_key+0 +mus_vs_aqua_magma_leader_5: + .byte KEYSH , mus_vs_aqua_magma_leader_key+0 .byte LFOS , 16 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte BEND , c_v+0 @@ -1858,7 +1858,7 @@ bgm_battle30_5: .byte W36 .byte N06 .byte W24 -bgm_battle30_5_000: +mus_vs_aqua_magma_leader_5_000: .byte N06 , As3 , v052 .byte W36 .byte N06 @@ -1871,7 +1871,7 @@ bgm_battle30_5_000: .byte W96 .byte W96 .byte PATT - .word bgm_battle30_5_000 + .word mus_vs_aqua_magma_leader_5_000 .byte N06 , As3 , v052 .byte W96 .byte W96 @@ -1881,7 +1881,7 @@ bgm_battle30_5_000: .byte W36 .byte N06 .byte W24 -bgm_battle30_5_001: +mus_vs_aqua_magma_leader_5_001: .byte N06 , Cn4 , v052 .byte W36 .byte N06 @@ -1894,11 +1894,11 @@ bgm_battle30_5_001: .byte W96 .byte W96 .byte PATT - .word bgm_battle30_5_001 + .word mus_vs_aqua_magma_leader_5_001 .byte N06 , Cn4 , v052 .byte W96 .byte W96 -bgm_battle30_5_B1: +mus_vs_aqua_magma_leader_5_B1: .byte PAN , c_v+48 .byte N06 , Dn4 , v052 .byte W36 @@ -1906,7 +1906,7 @@ bgm_battle30_5_B1: .byte W36 .byte N06 .byte W24 -bgm_battle30_5_002: +mus_vs_aqua_magma_leader_5_002: .byte N06 , Dn4 , v052 .byte W36 .byte N06 @@ -1919,7 +1919,7 @@ bgm_battle30_5_002: .byte W96 .byte W96 .byte PATT - .word bgm_battle30_5_002 + .word mus_vs_aqua_magma_leader_5_002 .byte N06 , Dn4 , v052 .byte W96 .byte W96 @@ -2133,15 +2133,15 @@ bgm_battle30_5_002: .byte W96 .byte W96 .byte GOTO - .word bgm_battle30_5_B1 + .word mus_vs_aqua_magma_leader_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle30_6: - .byte KEYSH , bgm_battle30_key+0 +mus_vs_aqua_magma_leader_6: + .byte KEYSH , mus_vs_aqua_magma_leader_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte W48 .byte W96 .byte W96 @@ -2158,7 +2158,7 @@ bgm_battle30_6: .byte W24 .byte N12 .byte W24 -bgm_battle30_6_000: +mus_vs_aqua_magma_leader_6_000: .byte N12 , Cn3 , v048 .byte W36 .byte N12 @@ -2166,7 +2166,7 @@ bgm_battle30_6_000: .byte N12 .byte W24 .byte PEND -bgm_battle30_6_001: +mus_vs_aqua_magma_leader_6_001: .byte N12 , Cn3 , v048 .byte W36 .byte N12 @@ -2179,8 +2179,8 @@ bgm_battle30_6_001: .byte W06 .byte PEND .byte PATT - .word bgm_battle30_6_000 -bgm_battle30_6_002: + .word mus_vs_aqua_magma_leader_6_000 +mus_vs_aqua_magma_leader_6_002: .byte N12 , Cn3 , v048 .byte W36 .byte N12 @@ -2193,12 +2193,12 @@ bgm_battle30_6_002: .byte W06 .byte PEND .byte PATT - .word bgm_battle30_6_000 + .word mus_vs_aqua_magma_leader_6_000 .byte PATT - .word bgm_battle30_6_001 + .word mus_vs_aqua_magma_leader_6_001 .byte PATT - .word bgm_battle30_6_000 -bgm_battle30_6_003: + .word mus_vs_aqua_magma_leader_6_000 +mus_vs_aqua_magma_leader_6_003: .byte N12 , Cn3 , v048 .byte W36 .byte N12 @@ -2208,8 +2208,8 @@ bgm_battle30_6_003: .byte N12 .byte W24 .byte PEND -bgm_battle30_6_B1: -bgm_battle30_6_004: +mus_vs_aqua_magma_leader_6_B1: +mus_vs_aqua_magma_leader_6_004: .byte N12 , Dn3 , v048 .byte W24 .byte Gn2 @@ -2221,7 +2221,7 @@ bgm_battle30_6_004: .byte Dn3 .byte W24 .byte PEND -bgm_battle30_6_005: +mus_vs_aqua_magma_leader_6_005: .byte N12 , Dn3 , v048 .byte W24 .byte Fn2 @@ -2240,7 +2240,7 @@ bgm_battle30_6_005: .byte W06 .byte PEND .byte PATT - .word bgm_battle30_6_004 + .word mus_vs_aqua_magma_leader_6_004 .byte N12 , Dn3 , v048 .byte W24 .byte Fn2 @@ -2258,9 +2258,9 @@ bgm_battle30_6_005: .byte N06 .byte W06 .byte PATT - .word bgm_battle30_6_004 + .word mus_vs_aqua_magma_leader_6_004 .byte PATT - .word bgm_battle30_6_005 + .word mus_vs_aqua_magma_leader_6_005 .byte N12 , Dn3 , v048 .byte W24 .byte Gn2 @@ -2313,31 +2313,31 @@ bgm_battle30_6_005: .byte W96 .byte W96 .byte PATT - .word bgm_battle30_6_000 + .word mus_vs_aqua_magma_leader_6_000 .byte PATT - .word bgm_battle30_6_001 + .word mus_vs_aqua_magma_leader_6_001 .byte PATT - .word bgm_battle30_6_000 + .word mus_vs_aqua_magma_leader_6_000 .byte PATT - .word bgm_battle30_6_002 + .word mus_vs_aqua_magma_leader_6_002 .byte PATT - .word bgm_battle30_6_000 + .word mus_vs_aqua_magma_leader_6_000 .byte PATT - .word bgm_battle30_6_001 + .word mus_vs_aqua_magma_leader_6_001 .byte PATT - .word bgm_battle30_6_000 + .word mus_vs_aqua_magma_leader_6_000 .byte PATT - .word bgm_battle30_6_003 + .word mus_vs_aqua_magma_leader_6_003 .byte GOTO - .word bgm_battle30_6_B1 + .word mus_vs_aqua_magma_leader_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle30_7: - .byte KEYSH , bgm_battle30_key+0 +mus_vs_aqua_magma_leader_7: + .byte KEYSH , mus_vs_aqua_magma_leader_key+0 .byte VOICE , 127 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte PAN , c_v-8 .byte N96 , Gn2 , v116 .byte W48 @@ -2361,7 +2361,7 @@ bgm_battle30_7: .byte VOICE , 0 .byte N12 , Dn1 , v112 .byte W24 -bgm_battle30_7_000: +mus_vs_aqua_magma_leader_7_000: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2369,35 +2369,35 @@ bgm_battle30_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 -bgm_battle30_7_B1: + .word mus_vs_aqua_magma_leader_7_000 +mus_vs_aqua_magma_leader_7_B1: .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 -bgm_battle30_7_001: + .word mus_vs_aqua_magma_leader_7_000 +mus_vs_aqua_magma_leader_7_001: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2407,12 +2407,12 @@ bgm_battle30_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 -bgm_battle30_7_002: + .word mus_vs_aqua_magma_leader_7_000 +mus_vs_aqua_magma_leader_7_002: .byte W24 .byte N12 , Ds1 , v092 .byte W48 @@ -2420,9 +2420,9 @@ bgm_battle30_7_002: .byte W24 .byte PEND .byte PATT - .word bgm_battle30_7_002 + .word mus_vs_aqua_magma_leader_7_002 .byte PATT - .word bgm_battle30_7_002 + .word mus_vs_aqua_magma_leader_7_002 .byte W24 .byte N12 , Dn1 , v112 .byte W24 @@ -2433,39 +2433,39 @@ bgm_battle30_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_001 + .word mus_vs_aqua_magma_leader_7_001 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte W12 .byte N12 , Dn1 , v112 .byte W72 .byte N12 .byte W12 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 -bgm_battle30_7_003: + .word mus_vs_aqua_magma_leader_7_000 +mus_vs_aqua_magma_leader_7_003: .byte W24 .byte N12 , Dn1 , v112 .byte W36 @@ -2475,47 +2475,47 @@ bgm_battle30_7_003: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_003 + .word mus_vs_aqua_magma_leader_7_003 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte PATT - .word bgm_battle30_7_000 + .word mus_vs_aqua_magma_leader_7_000 .byte GOTO - .word bgm_battle30_7_B1 + .word mus_vs_aqua_magma_leader_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle30_8: - .byte KEYSH , bgm_battle30_key+0 +mus_vs_aqua_magma_leader_8: + .byte KEYSH , mus_vs_aqua_magma_leader_key+0 .byte VOICE , 47 - .byte VOL , 80*bgm_battle30_mvl/mxv + .byte VOL , 80*mus_vs_aqua_magma_leader_mvl/mxv .byte PAN , c_v+8 .byte N96 , Ds2 , v112 .byte W48 @@ -2531,7 +2531,7 @@ bgm_battle30_8: .byte W24 .byte N24 .byte W24 -bgm_battle30_8_000: +mus_vs_aqua_magma_leader_8_000: .byte N36 , Gn2 , v112 .byte W36 .byte N36 @@ -2539,7 +2539,7 @@ bgm_battle30_8_000: .byte N24 , Cn2 .byte W24 .byte PEND -bgm_battle30_8_001: +mus_vs_aqua_magma_leader_8_001: .byte N36 , Gn2 , v112 .byte W36 .byte N36 @@ -2552,15 +2552,15 @@ bgm_battle30_8_001: .byte W06 .byte PEND .byte PATT - .word bgm_battle30_8_000 + .word mus_vs_aqua_magma_leader_8_000 .byte PATT - .word bgm_battle30_8_001 + .word mus_vs_aqua_magma_leader_8_001 .byte PATT - .word bgm_battle30_8_000 + .word mus_vs_aqua_magma_leader_8_000 .byte PATT - .word bgm_battle30_8_000 + .word mus_vs_aqua_magma_leader_8_000 .byte PATT - .word bgm_battle30_8_000 + .word mus_vs_aqua_magma_leader_8_000 .byte N36 , Gn2 , v112 .byte W36 .byte N36 @@ -2569,17 +2569,17 @@ bgm_battle30_8_001: .byte W06 .byte Fn2 .byte W06 -bgm_battle30_8_002: +mus_vs_aqua_magma_leader_8_002: .byte N12 , Gn2 , v112 .byte W36 .byte N12 .byte W60 .byte PEND .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 -bgm_battle30_8_003: + .word mus_vs_aqua_magma_leader_8_002 +mus_vs_aqua_magma_leader_8_003: .byte N12 , Gn2 , v112 .byte W36 .byte N12 @@ -2590,61 +2590,61 @@ bgm_battle30_8_003: .byte W06 .byte PEND .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 -bgm_battle30_8_B1: + .word mus_vs_aqua_magma_leader_8_002 +mus_vs_aqua_magma_leader_8_B1: .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_003 + .word mus_vs_aqua_magma_leader_8_003 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_003 + .word mus_vs_aqua_magma_leader_8_003 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte W96 .byte W96 .byte W96 .byte W96 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte N12 , Gn2 , v112 .byte W36 .byte N12 .byte W24 .byte N12 .byte W36 -bgm_battle30_8_004: +mus_vs_aqua_magma_leader_8_004: .byte N12 , Gn2 , v112 .byte W12 .byte Dn2 @@ -2659,9 +2659,9 @@ bgm_battle30_8_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle30_8_004 + .word mus_vs_aqua_magma_leader_8_004 .byte PATT - .word bgm_battle30_8_004 + .word mus_vs_aqua_magma_leader_8_004 .byte N12 , Gn2 , v112 .byte W12 .byte Dn2 @@ -2675,11 +2675,11 @@ bgm_battle30_8_004: .byte Dn2 .byte W12 .byte PATT - .word bgm_battle30_8_004 + .word mus_vs_aqua_magma_leader_8_004 .byte PATT - .word bgm_battle30_8_004 + .word mus_vs_aqua_magma_leader_8_004 .byte PATT - .word bgm_battle30_8_004 + .word mus_vs_aqua_magma_leader_8_004 .byte N12 , Gn2 , v112 .byte W12 .byte Dn2 @@ -2691,59 +2691,59 @@ bgm_battle30_8_004: .byte N12 .byte W24 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_003 + .word mus_vs_aqua_magma_leader_8_003 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte PATT - .word bgm_battle30_8_002 + .word mus_vs_aqua_magma_leader_8_002 .byte GOTO - .word bgm_battle30_8_B1 + .word mus_vs_aqua_magma_leader_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle30: +mus_vs_aqua_magma_leader: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle30_pri @ Priority - .byte bgm_battle30_rev @ Reverb. + .byte mus_vs_aqua_magma_leader_pri @ Priority + .byte mus_vs_aqua_magma_leader_rev @ Reverb. - .word bgm_battle30_grp + .word mus_vs_aqua_magma_leader_grp - .word bgm_battle30_1 - .word bgm_battle30_2 - .word bgm_battle30_3 - .word bgm_battle30_4 - .word bgm_battle30_5 - .word bgm_battle30_6 - .word bgm_battle30_7 - .word bgm_battle30_8 + .word mus_vs_aqua_magma_leader_1 + .word mus_vs_aqua_magma_leader_2 + .word mus_vs_aqua_magma_leader_3 + .word mus_vs_aqua_magma_leader_4 + .word mus_vs_aqua_magma_leader_5 + .word mus_vs_aqua_magma_leader_6 + .word mus_vs_aqua_magma_leader_7 + .word mus_vs_aqua_magma_leader_8 .end diff --git a/sound/songs/bgm_battle33.s b/sound/songs/mus_vs_champion.s index da51f1dfb..213370f46 100644 --- a/sound/songs/bgm_battle33.s +++ b/sound/songs/mus_vs_champion.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_battle33_grp, voicegroup104 - .equ bgm_battle33_pri, 1 - .equ bgm_battle33_rev, reverb_set+50 - .equ bgm_battle33_mvl, 127 - .equ bgm_battle33_key, 0 - .equ bgm_battle33_tbs, 1 - .equ bgm_battle33_exg, 0 - .equ bgm_battle33_cmp, 1 + .equ mus_vs_champion_grp, voicegroup104 + .equ mus_vs_champion_pri, 1 + .equ mus_vs_champion_rev, reverb_set+50 + .equ mus_vs_champion_mvl, 127 + .equ mus_vs_champion_key, 0 + .equ mus_vs_champion_tbs, 1 + .equ mus_vs_champion_exg, 0 + .equ mus_vs_champion_cmp, 1 .section .rodata - .global bgm_battle33 + .global mus_vs_champion .align 2 @********************** Track 1 **********************@ -bgm_battle33_1: - .byte KEYSH , bgm_battle33_key+0 - .byte TEMPO , 212*bgm_battle33_tbs/2 +mus_vs_champion_1: + .byte KEYSH , mus_vs_champion_key+0 + .byte TEMPO , 212*mus_vs_champion_tbs/2 .byte VOICE , 56 .byte LFOS , 16 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte PAN , c_v+48 .byte N06 , Ds4 , v096 .byte W06 @@ -115,7 +115,7 @@ bgm_battle33_1: .byte W36 .byte N24 , Gn3 .byte W24 -bgm_battle33_1_000: +mus_vs_champion_1_000: .byte N12 , Gn3 , v096 .byte W36 .byte Gs3 @@ -129,7 +129,7 @@ bgm_battle33_1_000: .byte W36 .byte N24 , Cs4 .byte W24 -bgm_battle33_1_001: +mus_vs_champion_1_001: .byte N12 , Cn4 , v096 .byte W36 .byte Cs4 @@ -138,16 +138,16 @@ bgm_battle33_1_001: .byte W24 .byte PEND .byte PATT - .word bgm_battle33_1_000 + .word mus_vs_champion_1_000 .byte PATT - .word bgm_battle33_1_001 + .word mus_vs_champion_1_001 .byte N12 , Ds4 , v096 .byte W36 .byte Fn4 .byte W36 .byte N24 , Gn4 .byte W24 -bgm_battle33_1_B1: +mus_vs_champion_1_B1: .byte VOICE , 60 .byte PAN , c_v+10 .byte MOD , 0 @@ -155,7 +155,7 @@ bgm_battle33_1_B1: .byte W84 .byte N12 , Cn3 .byte W12 -bgm_battle33_1_002: +mus_vs_champion_1_002: .byte N24 , En2 , v096 .byte W24 .byte N12 , Gn2 @@ -167,27 +167,27 @@ bgm_battle33_1_002: .byte N12 , Gs3 .byte W12 .byte PEND -bgm_battle33_1_003: +mus_vs_champion_1_003: .byte N84 , As3 , v096 .byte W84 .byte N12 , An3 .byte W12 .byte PEND -bgm_battle33_1_004: +mus_vs_champion_1_004: .byte N12 , As3 , v096 .byte W12 .byte An3 .byte W12 .byte N24 , As3 .byte W15 - .byte VOL , 74*bgm_battle33_mvl/mxv + .byte VOL , 74*mus_vs_champion_mvl/mxv .byte W03 - .byte 61*bgm_battle33_mvl/mxv + .byte 61*mus_vs_champion_mvl/mxv .byte W03 - .byte 40*bgm_battle33_mvl/mxv + .byte 40*mus_vs_champion_mvl/mxv .byte W03 .byte VOICE , 56 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte N06 .byte W12 .byte N06 @@ -201,11 +201,11 @@ bgm_battle33_1_004: .byte N12 , Cn3 .byte W12 .byte PATT - .word bgm_battle33_1_002 + .word mus_vs_champion_1_002 .byte PATT - .word bgm_battle33_1_003 + .word mus_vs_champion_1_003 .byte PATT - .word bgm_battle33_1_004 + .word mus_vs_champion_1_004 .byte VOICE , 1 .byte N36 , En3 , v096 .byte W36 @@ -248,37 +248,37 @@ bgm_battle33_1_004: .byte TIE , Cn4 , v096 .byte W84 .byte W03 - .byte VOL , 74*bgm_battle33_mvl/mxv + .byte VOL , 74*mus_vs_champion_mvl/mxv .byte W09 - .byte 71*bgm_battle33_mvl/mxv + .byte 71*mus_vs_champion_mvl/mxv .byte W09 - .byte 68*bgm_battle33_mvl/mxv + .byte 68*mus_vs_champion_mvl/mxv .byte W12 - .byte 65*bgm_battle33_mvl/mxv + .byte 65*mus_vs_champion_mvl/mxv .byte W09 - .byte 58*bgm_battle33_mvl/mxv + .byte 58*mus_vs_champion_mvl/mxv .byte W12 - .byte 53*bgm_battle33_mvl/mxv + .byte 53*mus_vs_champion_mvl/mxv .byte W15 - .byte 48*bgm_battle33_mvl/mxv + .byte 48*mus_vs_champion_mvl/mxv .byte W36 .byte W03 .byte W32 .byte W01 - .byte 53*bgm_battle33_mvl/mxv + .byte 53*mus_vs_champion_mvl/mxv .byte W15 - .byte 58*bgm_battle33_mvl/mxv + .byte 58*mus_vs_champion_mvl/mxv .byte W12 - .byte 63*bgm_battle33_mvl/mxv + .byte 63*mus_vs_champion_mvl/mxv .byte W12 - .byte 68*bgm_battle33_mvl/mxv + .byte 68*mus_vs_champion_mvl/mxv .byte W09 - .byte 71*bgm_battle33_mvl/mxv + .byte 71*mus_vs_champion_mvl/mxv .byte W09 - .byte 77*bgm_battle33_mvl/mxv + .byte 77*mus_vs_champion_mvl/mxv .byte W06 .byte W06 - .byte 80*bgm_battle33_mvl/mxv + .byte 80*mus_vs_champion_mvl/mxv .byte W90 .byte EOT .byte VOICE , 60 @@ -293,7 +293,7 @@ bgm_battle33_1_004: .byte W36 .byte N24 , As3 .byte W24 -bgm_battle33_1_005: +mus_vs_champion_1_005: .byte N12 , En3 , v096 .byte W12 .byte N12 @@ -305,7 +305,7 @@ bgm_battle33_1_005: .byte N24 , Gs3 .byte W24 .byte PEND -bgm_battle33_1_006: +mus_vs_champion_1_006: .byte N12 , Gn3 , v096 .byte W12 .byte N12 @@ -317,7 +317,7 @@ bgm_battle33_1_006: .byte N24 , As3 .byte W24 .byte PEND -bgm_battle33_1_007: +mus_vs_champion_1_007: .byte N12 , Cn4 , v096 .byte W12 .byte N12 @@ -330,13 +330,13 @@ bgm_battle33_1_007: .byte W24 .byte PEND .byte PATT - .word bgm_battle33_1_006 + .word mus_vs_champion_1_006 .byte PATT - .word bgm_battle33_1_005 + .word mus_vs_champion_1_005 .byte PATT - .word bgm_battle33_1_006 + .word mus_vs_champion_1_006 .byte PATT - .word bgm_battle33_1_007 + .word mus_vs_champion_1_007 .byte VOICE , 56 .byte N24 , Gs3 , v096 .byte W24 @@ -479,7 +479,7 @@ bgm_battle33_1_007: .byte MOD , 5 .byte W96 .byte EOT -bgm_battle33_1_008: +mus_vs_champion_1_008: .byte MOD , 0 .byte TIE , Fn3 , v096 .byte W96 @@ -494,22 +494,22 @@ bgm_battle33_1_008: .byte W96 .byte EOT .byte PATT - .word bgm_battle33_1_008 + .word mus_vs_champion_1_008 .byte MOD , 5 .byte W96 .byte EOT , Fn3 .byte GOTO - .word bgm_battle33_1_B1 + .word mus_vs_champion_1_B1 .byte MOD , 0 .byte FINE @********************** Track 2 **********************@ -bgm_battle33_2: - .byte KEYSH , bgm_battle33_key+0 +mus_vs_champion_2: + .byte KEYSH , mus_vs_champion_key+0 .byte VOICE , 48 .byte LFOS , 16 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte PAN , c_v+0 .byte N06 , Gn5 , v076 .byte W06 @@ -559,7 +559,7 @@ bgm_battle33_2: .byte W06 .byte N12 , As5 .byte W12 -bgm_battle33_2_000: +mus_vs_champion_2_000: .byte N12 , Cn4 , v100 .byte W36 .byte Cs4 @@ -574,14 +574,14 @@ bgm_battle33_2_000: .byte N24 , As3 .byte W24 .byte PATT - .word bgm_battle33_2_000 + .word mus_vs_champion_2_000 .byte N12 , Ds4 , v100 .byte W36 .byte Fn4 .byte W36 .byte N24 , Fs4 .byte W24 -bgm_battle33_2_001: +mus_vs_champion_2_001: .byte N12 , Cn5 , v100 .byte W36 .byte Cs5 @@ -596,14 +596,14 @@ bgm_battle33_2_001: .byte N24 , As4 .byte W24 .byte PATT - .word bgm_battle33_2_001 + .word mus_vs_champion_2_001 .byte N12 , Ds5 , v100 .byte W36 .byte Fn5 .byte W36 .byte N24 , Gn5 .byte W24 -bgm_battle33_2_B1: +mus_vs_champion_2_B1: .byte VOICE , 48 .byte PAN , c_v+0 .byte MOD , 0 @@ -611,7 +611,7 @@ bgm_battle33_2_B1: .byte W84 .byte N12 , Gn3 .byte W12 -bgm_battle33_2_002: +mus_vs_champion_2_002: .byte N12 , Cn4 , v100 .byte W12 .byte Gn3 @@ -627,13 +627,13 @@ bgm_battle33_2_002: .byte Fn4 .byte W12 .byte PEND -bgm_battle33_2_003: +mus_vs_champion_2_003: .byte N84 , Fs4 , v100 .byte W84 .byte N12 , Fn4 .byte W12 .byte PEND -bgm_battle33_2_004: +mus_vs_champion_2_004: .byte N12 , Fs4 , v100 .byte W12 .byte Fn4 @@ -646,11 +646,11 @@ bgm_battle33_2_004: .byte N12 , Gn3 .byte W12 .byte PATT - .word bgm_battle33_2_002 + .word mus_vs_champion_2_002 .byte PATT - .word bgm_battle33_2_003 + .word mus_vs_champion_2_003 .byte PATT - .word bgm_battle33_2_004 + .word mus_vs_champion_2_004 .byte VOICE , 73 .byte N36 , Gn3 , v112 .byte W18 @@ -688,30 +688,30 @@ bgm_battle33_2_004: .byte 6 .byte W18 .byte W15 - .byte VOL , 75*bgm_battle33_mvl/mxv + .byte VOL , 75*mus_vs_champion_mvl/mxv .byte W03 .byte MOD , 7 .byte W09 - .byte VOL , 69*bgm_battle33_mvl/mxv + .byte VOL , 69*mus_vs_champion_mvl/mxv .byte W12 - .byte 63*bgm_battle33_mvl/mxv + .byte 63*mus_vs_champion_mvl/mxv .byte W09 .byte MOD , 8 .byte W03 - .byte VOL , 56*bgm_battle33_mvl/mxv + .byte VOL , 56*mus_vs_champion_mvl/mxv .byte W12 - .byte 47*bgm_battle33_mvl/mxv + .byte 47*mus_vs_champion_mvl/mxv .byte W09 - .byte 35*bgm_battle33_mvl/mxv + .byte 35*mus_vs_champion_mvl/mxv .byte W09 - .byte 22*bgm_battle33_mvl/mxv + .byte 22*mus_vs_champion_mvl/mxv .byte W09 - .byte 9*bgm_battle33_mvl/mxv + .byte 9*mus_vs_champion_mvl/mxv .byte W03 .byte EOT .byte W03 .byte VOICE , 56 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte MOD , 0 .byte N36 , As3 , v100 .byte W18 @@ -757,28 +757,28 @@ bgm_battle33_2_004: .byte W24 .byte Fn3 .byte W24 - .byte VOL , 48*bgm_battle33_mvl/mxv + .byte VOL , 48*mus_vs_champion_mvl/mxv .byte TIE , En4 .byte W32 .byte W01 - .byte VOL , 53*bgm_battle33_mvl/mxv + .byte VOL , 53*mus_vs_champion_mvl/mxv .byte W09 .byte MOD , 5 .byte W06 - .byte VOL , 58*bgm_battle33_mvl/mxv + .byte VOL , 58*mus_vs_champion_mvl/mxv .byte W12 - .byte 63*bgm_battle33_mvl/mxv + .byte 63*mus_vs_champion_mvl/mxv .byte W12 - .byte 68*bgm_battle33_mvl/mxv + .byte 68*mus_vs_champion_mvl/mxv .byte W06 .byte MOD , 6 .byte W03 - .byte VOL , 71*bgm_battle33_mvl/mxv + .byte VOL , 71*mus_vs_champion_mvl/mxv .byte W09 - .byte 77*bgm_battle33_mvl/mxv + .byte 77*mus_vs_champion_mvl/mxv .byte W06 .byte W06 - .byte 80*bgm_battle33_mvl/mxv + .byte 80*mus_vs_champion_mvl/mxv .byte W12 .byte MOD , 7 .byte W30 @@ -797,7 +797,7 @@ bgm_battle33_2_004: .byte W36 .byte N24 , Ds4 .byte W24 -bgm_battle33_2_005: +mus_vs_champion_2_005: .byte N12 , Gn3 , v100 .byte W12 .byte N12 @@ -809,7 +809,7 @@ bgm_battle33_2_005: .byte N24 , Cs4 .byte W24 .byte PEND -bgm_battle33_2_006: +mus_vs_champion_2_006: .byte N12 , Cn4 , v100 .byte W12 .byte N12 @@ -821,7 +821,7 @@ bgm_battle33_2_006: .byte N24 , Ds4 .byte W24 .byte PEND -bgm_battle33_2_007: +mus_vs_champion_2_007: .byte N12 , Ds4 , v100 .byte W12 .byte N12 @@ -834,13 +834,13 @@ bgm_battle33_2_007: .byte W24 .byte PEND .byte PATT - .word bgm_battle33_2_006 + .word mus_vs_champion_2_006 .byte PATT - .word bgm_battle33_2_005 + .word mus_vs_champion_2_005 .byte PATT - .word bgm_battle33_2_006 + .word mus_vs_champion_2_006 .byte PATT - .word bgm_battle33_2_007 + .word mus_vs_champion_2_007 .byte VOICE , 48 .byte N24 , Cs4 , v100 .byte W24 @@ -979,7 +979,7 @@ bgm_battle33_2_007: .byte MOD , 5 .byte W96 .byte EOT -bgm_battle33_2_008: +mus_vs_champion_2_008: .byte MOD , 0 .byte TIE , As3 , v100 .byte W96 @@ -994,21 +994,21 @@ bgm_battle33_2_008: .byte W96 .byte EOT .byte PATT - .word bgm_battle33_2_008 + .word mus_vs_champion_2_008 .byte MOD , 5 .byte W96 .byte EOT , As3 .byte GOTO - .word bgm_battle33_2_B1 + .word mus_vs_champion_2_B1 .byte MOD , 0 .byte FINE @********************** Track 3 **********************@ -bgm_battle33_3: - .byte KEYSH , bgm_battle33_key+0 +mus_vs_champion_3: + .byte KEYSH , mus_vs_champion_key+0 .byte VOICE , 33 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte N12 , Cn2 , v108 .byte W12 .byte Gn1 @@ -1041,7 +1041,7 @@ bgm_battle33_3: .byte W12 .byte Cs1 .byte W12 -bgm_battle33_3_000: +mus_vs_champion_3_000: .byte N12 , Cn1 , v108 .byte W12 .byte Fs1 @@ -1059,7 +1059,7 @@ bgm_battle33_3_000: .byte Fs1 .byte W12 .byte PEND -bgm_battle33_3_001: +mus_vs_champion_3_001: .byte N12 , Fn1 , v108 .byte W12 .byte Ds1 @@ -1078,15 +1078,15 @@ bgm_battle33_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle33_3_000 + .word mus_vs_champion_3_000 .byte PATT - .word bgm_battle33_3_001 + .word mus_vs_champion_3_001 .byte PATT - .word bgm_battle33_3_000 + .word mus_vs_champion_3_000 .byte PATT - .word bgm_battle33_3_001 + .word mus_vs_champion_3_001 .byte PATT - .word bgm_battle33_3_000 + .word mus_vs_champion_3_000 .byte N12 , Fn1 , v108 .byte W12 .byte Ds1 @@ -1103,8 +1103,8 @@ bgm_battle33_3_001: .byte W12 .byte Ds1 .byte W12 -bgm_battle33_3_B1: -bgm_battle33_3_002: +mus_vs_champion_3_B1: +mus_vs_champion_3_002: .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -1138,7 +1138,7 @@ bgm_battle33_3_002: .byte W12 .byte En1 .byte W12 -bgm_battle33_3_003: +mus_vs_champion_3_003: .byte N12 , Cs1 , v108 .byte W12 .byte Gs1 @@ -1156,7 +1156,7 @@ bgm_battle33_3_003: .byte Gs1 .byte W12 .byte PEND -bgm_battle33_3_004: +mus_vs_champion_3_004: .byte N12 , Cs1 , v108 .byte W12 .byte Gs1 @@ -1175,7 +1175,7 @@ bgm_battle33_3_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle33_3_002 + .word mus_vs_champion_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -1193,18 +1193,18 @@ bgm_battle33_3_004: .byte Gn1 .byte W12 .byte PATT - .word bgm_battle33_3_003 + .word mus_vs_champion_3_003 .byte PATT - .word bgm_battle33_3_003 + .word mus_vs_champion_3_003 .byte PATT - .word bgm_battle33_3_002 + .word mus_vs_champion_3_002 .byte PATT - .word bgm_battle33_3_002 + .word mus_vs_champion_3_002 .byte PATT - .word bgm_battle33_3_003 + .word mus_vs_champion_3_003 .byte PATT - .word bgm_battle33_3_003 -bgm_battle33_3_005: + .word mus_vs_champion_3_003 +mus_vs_champion_3_005: .byte N12 , Ds1 , v108 .byte W12 .byte As1 @@ -1223,8 +1223,8 @@ bgm_battle33_3_005: .byte W12 .byte PEND .byte PATT - .word bgm_battle33_3_005 -bgm_battle33_3_006: + .word mus_vs_champion_3_005 +mus_vs_champion_3_006: .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -1259,7 +1259,7 @@ bgm_battle33_3_006: .byte Gn1 .byte W12 .byte PATT - .word bgm_battle33_3_006 + .word mus_vs_champion_3_006 .byte N12 , Cn2 , v108 .byte W12 .byte Gn2 @@ -1276,7 +1276,7 @@ bgm_battle33_3_006: .byte W12 .byte En2 .byte W12 -bgm_battle33_3_007: +mus_vs_champion_3_007: .byte N12 , Cn1 , v108 .byte W12 .byte N12 @@ -1288,7 +1288,7 @@ bgm_battle33_3_007: .byte N24 , Ds1 .byte W24 .byte PEND -bgm_battle33_3_008: +mus_vs_champion_3_008: .byte N12 , Gn0 , v108 .byte W12 .byte N12 @@ -1301,15 +1301,15 @@ bgm_battle33_3_008: .byte W24 .byte PEND .byte PATT - .word bgm_battle33_3_007 + .word mus_vs_champion_3_007 .byte PATT - .word bgm_battle33_3_008 + .word mus_vs_champion_3_008 .byte PATT - .word bgm_battle33_3_007 + .word mus_vs_champion_3_007 .byte PATT - .word bgm_battle33_3_008 + .word mus_vs_champion_3_008 .byte PATT - .word bgm_battle33_3_007 + .word mus_vs_champion_3_007 .byte N12 , Gn0 , v108 .byte W12 .byte N12 @@ -1322,7 +1322,7 @@ bgm_battle33_3_008: .byte W12 .byte N24 , Dn1 .byte W24 -bgm_battle33_3_009: +mus_vs_champion_3_009: .byte N12 , Cs1 , v108 .byte W12 .byte Gs1 @@ -1340,7 +1340,7 @@ bgm_battle33_3_009: .byte An1 .byte W12 .byte PEND -bgm_battle33_3_010: +mus_vs_champion_3_010: .byte N12 , Cs1 , v108 .byte W12 .byte Gs1 @@ -1359,10 +1359,10 @@ bgm_battle33_3_010: .byte W12 .byte PEND .byte PATT - .word bgm_battle33_3_009 + .word mus_vs_champion_3_009 .byte PATT - .word bgm_battle33_3_010 -bgm_battle33_3_011: + .word mus_vs_champion_3_010 +mus_vs_champion_3_011: .byte N12 , En1 , v108 .byte W12 .byte Bn1 @@ -1380,7 +1380,7 @@ bgm_battle33_3_011: .byte Cn2 .byte W12 .byte PEND -bgm_battle33_3_012: +mus_vs_champion_3_012: .byte N12 , En1 , v108 .byte W12 .byte Bn1 @@ -1399,9 +1399,9 @@ bgm_battle33_3_012: .byte W12 .byte PEND .byte PATT - .word bgm_battle33_3_011 + .word mus_vs_champion_3_011 .byte PATT - .word bgm_battle33_3_012 + .word mus_vs_champion_3_012 .byte N24 , An1 , v108 .byte W24 .byte En1 @@ -1475,34 +1475,34 @@ bgm_battle33_3_012: .byte Gn1 .byte W12 .byte PATT - .word bgm_battle33_3_002 + .word mus_vs_champion_3_002 .byte PATT - .word bgm_battle33_3_002 + .word mus_vs_champion_3_002 .byte PATT - .word bgm_battle33_3_003 + .word mus_vs_champion_3_003 .byte PATT - .word bgm_battle33_3_003 + .word mus_vs_champion_3_003 .byte PATT - .word bgm_battle33_3_002 + .word mus_vs_champion_3_002 .byte PATT - .word bgm_battle33_3_002 + .word mus_vs_champion_3_002 .byte PATT - .word bgm_battle33_3_003 + .word mus_vs_champion_3_003 .byte PATT - .word bgm_battle33_3_004 + .word mus_vs_champion_3_004 .byte GOTO - .word bgm_battle33_3_B1 + .word mus_vs_champion_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle33_4: - .byte KEYSH , bgm_battle33_key+0 +mus_vs_champion_4: + .byte KEYSH , mus_vs_champion_key+0 .byte VOICE , 80 .byte LFOS , 16 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte PAN , c_v-48 .byte N06 , Cn5 , v060 .byte W18 @@ -1644,7 +1644,7 @@ bgm_battle33_4: .byte W12 .byte MOD , 6 .byte W12 -bgm_battle33_4_B1: +mus_vs_champion_4_B1: .byte MOD , 0 .byte W96 .byte W96 @@ -1733,19 +1733,19 @@ bgm_battle33_4_B1: .byte TIE , Cn3 .byte W84 .byte W03 - .byte VOL , 74*bgm_battle33_mvl/mxv + .byte VOL , 74*mus_vs_champion_mvl/mxv .byte W09 - .byte 71*bgm_battle33_mvl/mxv + .byte 71*mus_vs_champion_mvl/mxv .byte W09 - .byte 68*bgm_battle33_mvl/mxv + .byte 68*mus_vs_champion_mvl/mxv .byte W12 - .byte 65*bgm_battle33_mvl/mxv + .byte 65*mus_vs_champion_mvl/mxv .byte W09 - .byte 58*bgm_battle33_mvl/mxv + .byte 58*mus_vs_champion_mvl/mxv .byte W12 - .byte 53*bgm_battle33_mvl/mxv + .byte 53*mus_vs_champion_mvl/mxv .byte W15 - .byte 48*bgm_battle33_mvl/mxv + .byte 48*mus_vs_champion_mvl/mxv .byte W36 .byte W03 .byte EOT @@ -1756,28 +1756,28 @@ bgm_battle33_4_B1: .byte W12 .byte N12 .byte W09 - .byte VOL , 53*bgm_battle33_mvl/mxv + .byte VOL , 53*mus_vs_champion_mvl/mxv .byte W03 .byte N12 .byte W12 - .byte VOL , 58*bgm_battle33_mvl/mxv + .byte VOL , 58*mus_vs_champion_mvl/mxv .byte N12 .byte W12 - .byte VOL , 63*bgm_battle33_mvl/mxv + .byte VOL , 63*mus_vs_champion_mvl/mxv .byte N12 .byte W12 - .byte VOL , 68*bgm_battle33_mvl/mxv + .byte VOL , 68*mus_vs_champion_mvl/mxv .byte N12 .byte W09 - .byte VOL , 71*bgm_battle33_mvl/mxv + .byte VOL , 71*mus_vs_champion_mvl/mxv .byte W03 .byte N12 .byte W06 - .byte VOL , 77*bgm_battle33_mvl/mxv + .byte VOL , 77*mus_vs_champion_mvl/mxv .byte W06 .byte N12 .byte W06 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte W06 .byte N12 .byte W12 @@ -2046,18 +2046,18 @@ bgm_battle33_4_B1: .byte W96 .byte EOT .byte GOTO - .word bgm_battle33_4_B1 + .word mus_vs_champion_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle33_5: - .byte KEYSH , bgm_battle33_key+0 +mus_vs_champion_5: + .byte KEYSH , mus_vs_champion_key+0 .byte VOICE , 82 .byte LFOS , 16 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-2 .byte N06 , Gn3 , v060 @@ -2148,7 +2148,7 @@ bgm_battle33_5: .byte W12 .byte MOD , 6 .byte W12 -bgm_battle33_5_B1: +mus_vs_champion_5_B1: .byte MOD , 0 .byte W96 .byte W96 @@ -2167,25 +2167,25 @@ bgm_battle33_5_B1: .byte W96 .byte W96 .byte VOICE , 83 - .byte VOL , 48*bgm_battle33_mvl/mxv + .byte VOL , 48*mus_vs_champion_mvl/mxv .byte PAN , c_v+48 .byte TIE , En3 , v060 .byte W32 .byte W01 - .byte VOL , 53*bgm_battle33_mvl/mxv + .byte VOL , 53*mus_vs_champion_mvl/mxv .byte W15 - .byte 58*bgm_battle33_mvl/mxv + .byte 58*mus_vs_champion_mvl/mxv .byte W12 - .byte 63*bgm_battle33_mvl/mxv + .byte 63*mus_vs_champion_mvl/mxv .byte W12 - .byte 68*bgm_battle33_mvl/mxv + .byte 68*mus_vs_champion_mvl/mxv .byte W09 - .byte 71*bgm_battle33_mvl/mxv + .byte 71*mus_vs_champion_mvl/mxv .byte W09 - .byte 77*bgm_battle33_mvl/mxv + .byte 77*mus_vs_champion_mvl/mxv .byte W06 .byte W06 - .byte 80*bgm_battle33_mvl/mxv + .byte 80*mus_vs_champion_mvl/mxv .byte W90 .byte EOT .byte W96 @@ -2273,15 +2273,15 @@ bgm_battle33_5_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_battle33_5_B1 + .word mus_vs_champion_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle33_6: - .byte KEYSH , bgm_battle33_key+0 +mus_vs_champion_6: + .byte KEYSH , mus_vs_champion_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte W48 .byte N06 , Gn2 , v080 .byte W06 @@ -2339,7 +2339,7 @@ bgm_battle33_6: .byte W96 .byte W96 .byte W96 -bgm_battle33_6_B1: +mus_vs_champion_6_B1: .byte W96 .byte W96 .byte W96 @@ -2389,19 +2389,19 @@ bgm_battle33_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_battle33_6_B1 + .word mus_vs_champion_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle33_7: - .byte KEYSH , bgm_battle33_key+0 +mus_vs_champion_7: + .byte KEYSH , mus_vs_champion_key+0 .byte VOICE , 0 .byte PAN , c_v+1 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte W96 .byte W96 -bgm_battle33_7_000: +mus_vs_champion_7_000: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2409,17 +2409,17 @@ bgm_battle33_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W12 @@ -2429,33 +2429,33 @@ bgm_battle33_7_000: .byte W12 .byte N12 .byte W12 -bgm_battle33_7_B1: +mus_vs_champion_7_B1: .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W60 .byte N12 .byte W12 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 -bgm_battle33_7_001: + .word mus_vs_champion_7_000 +mus_vs_champion_7_001: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2465,9 +2465,9 @@ bgm_battle33_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_001 + .word mus_vs_champion_7_001 .byte W96 .byte W96 .byte W96 @@ -2476,7 +2476,7 @@ bgm_battle33_7_001: .byte W12 .byte N12 .byte W12 -bgm_battle33_7_002: +mus_vs_champion_7_002: .byte W24 .byte N12 , Dn1 , v112 .byte W36 @@ -2486,17 +2486,17 @@ bgm_battle33_7_002: .byte W12 .byte PEND .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_002 + .word mus_vs_champion_7_002 .byte PATT - .word bgm_battle33_7_002 + .word mus_vs_champion_7_002 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_002 + .word mus_vs_champion_7_002 .byte W24 .byte N12 , Dn1 , v112 .byte W36 @@ -2507,21 +2507,21 @@ bgm_battle33_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_001 + .word mus_vs_champion_7_001 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_001 + .word mus_vs_champion_7_001 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_001 + .word mus_vs_champion_7_001 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_001 + .word mus_vs_champion_7_001 .byte W24 .byte N12 , Dn1 , v112 .byte W24 @@ -2542,25 +2542,25 @@ bgm_battle33_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_001 + .word mus_vs_champion_7_001 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte PATT - .word bgm_battle33_7_000 + .word mus_vs_champion_7_000 .byte W12 .byte N12 , Dn1 , v112 .byte W12 @@ -2569,15 +2569,15 @@ bgm_battle33_7_002: .byte N12 .byte W12 .byte GOTO - .word bgm_battle33_7_B1 + .word mus_vs_champion_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle33_8: - .byte KEYSH , bgm_battle33_key+0 +mus_vs_champion_8: + .byte KEYSH , mus_vs_champion_key+0 .byte PAN , c_v-10 - .byte VOL , 80*bgm_battle33_mvl/mxv + .byte VOL , 80*mus_vs_champion_mvl/mxv .byte N12 , Gn2 , v100 .byte W03 .byte VOICE , 47 @@ -2612,7 +2612,7 @@ bgm_battle33_8: .byte W12 .byte Gn2 .byte W12 -bgm_battle33_8_000: +mus_vs_champion_8_000: .byte N12 , Gn2 , v100 .byte W12 .byte N12 @@ -2624,7 +2624,7 @@ bgm_battle33_8_000: .byte N12 .byte W12 .byte PEND -bgm_battle33_8_001: +mus_vs_champion_8_001: .byte N12 , Gn2 , v100 .byte W36 .byte N12 @@ -2636,7 +2636,7 @@ bgm_battle33_8_001: .byte N12 .byte W12 .byte PEND -bgm_battle33_8_002: +mus_vs_champion_8_002: .byte N12 , Gn2 , v100 .byte W12 .byte N12 @@ -2659,11 +2659,11 @@ bgm_battle33_8_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle33_8_000 + .word mus_vs_champion_8_000 .byte PATT - .word bgm_battle33_8_001 + .word mus_vs_champion_8_001 .byte PATT - .word bgm_battle33_8_002 + .word mus_vs_champion_8_002 .byte N12 , Gn2 , v100 .byte W12 .byte N12 @@ -2672,8 +2672,8 @@ bgm_battle33_8_002: .byte W12 .byte En2 .byte W36 -bgm_battle33_8_B1: -bgm_battle33_8_003: +mus_vs_champion_8_B1: +mus_vs_champion_8_003: .byte N12 , Gn2 , v100 .byte W48 .byte N12 @@ -2681,7 +2681,7 @@ bgm_battle33_8_003: .byte N12 .byte W36 .byte PEND -bgm_battle33_8_004: +mus_vs_champion_8_004: .byte N12 , Gn2 , v100 .byte W36 .byte N12 @@ -2692,8 +2692,8 @@ bgm_battle33_8_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle33_8_003 -bgm_battle33_8_005: + .word mus_vs_champion_8_003 +mus_vs_champion_8_005: .byte N12 , Gn2 , v100 .byte W36 .byte N12 @@ -2702,14 +2702,14 @@ bgm_battle33_8_005: .byte W36 .byte PEND .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_005 + .word mus_vs_champion_8_005 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_005 -bgm_battle33_8_006: + .word mus_vs_champion_8_005 +mus_vs_champion_8_006: .byte N12 , Gn2 , v100 .byte W12 .byte N12 @@ -2720,7 +2720,7 @@ bgm_battle33_8_006: .byte W36 .byte PEND .byte PATT - .word bgm_battle33_8_006 + .word mus_vs_champion_8_006 .byte N12 , Gn2 , v100 .byte W12 .byte N12 @@ -2732,11 +2732,11 @@ bgm_battle33_8_006: .byte Fn2 .byte W12 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_005 + .word mus_vs_champion_8_005 .byte W96 .byte W96 .byte W96 @@ -2749,7 +2749,7 @@ bgm_battle33_8_006: .byte W24 .byte N12 .byte W24 -bgm_battle33_8_007: +mus_vs_champion_8_007: .byte N12 , Gn2 , v100 .byte W12 .byte En2 @@ -2764,7 +2764,7 @@ bgm_battle33_8_007: .byte W06 .byte PEND .byte PATT - .word bgm_battle33_8_007 + .word mus_vs_champion_8_007 .byte N12 , Gn2 , v100 .byte W12 .byte En2 @@ -2808,21 +2808,21 @@ bgm_battle33_8_007: .byte En2 .byte W48 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte N12 , Gn2 , v100 .byte W72 .byte N12 @@ -2833,54 +2833,54 @@ bgm_battle33_8_007: .byte W24 .byte N12 .byte W72 -bgm_battle33_8_008: +mus_vs_champion_8_008: .byte N12 , Gn2 , v100 .byte W48 .byte N12 .byte W48 .byte PEND .byte PATT - .word bgm_battle33_8_008 + .word mus_vs_champion_8_008 .byte PATT - .word bgm_battle33_8_008 + .word mus_vs_champion_8_008 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_004 + .word mus_vs_champion_8_004 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_005 + .word mus_vs_champion_8_005 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_004 + .word mus_vs_champion_8_004 .byte PATT - .word bgm_battle33_8_003 + .word mus_vs_champion_8_003 .byte PATT - .word bgm_battle33_8_005 + .word mus_vs_champion_8_005 .byte GOTO - .word bgm_battle33_8_B1 + .word mus_vs_champion_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle33: +mus_vs_champion: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle33_pri @ Priority - .byte bgm_battle33_rev @ Reverb. + .byte mus_vs_champion_pri @ Priority + .byte mus_vs_champion_rev @ Reverb. - .word bgm_battle33_grp + .word mus_vs_champion_grp - .word bgm_battle33_1 - .word bgm_battle33_2 - .word bgm_battle33_3 - .word bgm_battle33_4 - .word bgm_battle33_5 - .word bgm_battle33_6 - .word bgm_battle33_7 - .word bgm_battle33_8 + .word mus_vs_champion_1 + .word mus_vs_champion_2 + .word mus_vs_champion_3 + .word mus_vs_champion_4 + .word mus_vs_champion_5 + .word mus_vs_champion_6 + .word mus_vs_champion_7 + .word mus_vs_champion_8 .end diff --git a/sound/songs/bgm_battle38.s b/sound/songs/mus_vs_elite_four.s index 78d40f682..d20a7e177 100644 --- a/sound/songs/bgm_battle38.s +++ b/sound/songs/mus_vs_elite_four.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_battle38_grp, voicegroup108 - .equ bgm_battle38_pri, 1 - .equ bgm_battle38_rev, reverb_set+50 - .equ bgm_battle38_mvl, 127 - .equ bgm_battle38_key, 0 - .equ bgm_battle38_tbs, 1 - .equ bgm_battle38_exg, 0 - .equ bgm_battle38_cmp, 1 + .equ mus_vs_elite_four_grp, voicegroup108 + .equ mus_vs_elite_four_pri, 1 + .equ mus_vs_elite_four_rev, reverb_set+50 + .equ mus_vs_elite_four_mvl, 127 + .equ mus_vs_elite_four_key, 0 + .equ mus_vs_elite_four_tbs, 1 + .equ mus_vs_elite_four_exg, 0 + .equ mus_vs_elite_four_cmp, 1 .section .rodata - .global bgm_battle38 + .global mus_vs_elite_four .align 2 @********************** Track 1 **********************@ -bgm_battle38_1: - .byte KEYSH , bgm_battle38_key+0 - .byte TEMPO , 214*bgm_battle38_tbs/2 +mus_vs_elite_four_1: + .byte KEYSH , mus_vs_elite_four_key+0 + .byte TEMPO , 214*mus_vs_elite_four_tbs/2 .byte VOICE , 60 .byte LFOS , 15 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte PAN , c_v+10 .byte N12 , An3 , v108 .byte W48 @@ -30,7 +30,7 @@ bgm_battle38_1: .byte EOT .byte N12 , Dn4 .byte W96 -bgm_battle38_1_000: +mus_vs_elite_four_1_000: .byte N12 , Dn4 , v096 .byte W72 .byte N24 , Ds4 , v108 @@ -47,7 +47,7 @@ bgm_battle38_1_000: .byte N12 , Dn4 .byte W96 .byte PATT - .word bgm_battle38_1_000 + .word mus_vs_elite_four_1_000 .byte N12 , Fn4 , v108 .byte W72 .byte N24 , Ds4 @@ -58,9 +58,9 @@ bgm_battle38_1_000: .byte W36 .byte N24 , Ds4 .byte W24 -bgm_battle38_1_B1: +mus_vs_elite_four_1_B1: .byte VOICE , 56 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte PAN , c_v+10 .byte N06 , An3 , v112 .byte W12 @@ -241,21 +241,21 @@ bgm_battle38_1_B1: .byte TIE , An3 .byte W96 .byte W30 - .byte VOL , 78*bgm_battle38_mvl/mxv + .byte VOL , 78*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 76*bgm_battle38_mvl/mxv + .byte 76*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 70*bgm_battle38_mvl/mxv + .byte 70*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 65*bgm_battle38_mvl/mxv + .byte 65*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 58*bgm_battle38_mvl/mxv + .byte 58*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 54*bgm_battle38_mvl/mxv + .byte 54*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 44*bgm_battle38_mvl/mxv + .byte 44*mus_vs_elite_four_mvl/mxv .byte W06 - .byte 32*bgm_battle38_mvl/mxv + .byte 32*mus_vs_elite_four_mvl/mxv .byte W03 .byte EOT .byte W03 @@ -263,7 +263,7 @@ bgm_battle38_1_B1: .byte W96 .byte W96 .byte W96 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte N36 , Bn3 .byte W36 .byte An3 @@ -306,16 +306,16 @@ bgm_battle38_1_B1: .byte W96 .byte EOT .byte GOTO - .word bgm_battle38_1_B1 + .word mus_vs_elite_four_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle38_2: - .byte KEYSH , bgm_battle38_key+0 +mus_vs_elite_four_2: + .byte KEYSH , mus_vs_elite_four_key+0 .byte VOICE , 48 .byte LFOS , 15 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte PAN , c_v+0 .byte N12 , Dn4 , v108 .byte W48 @@ -325,7 +325,7 @@ bgm_battle38_2: .byte EOT .byte N12 , An4 .byte W96 -bgm_battle38_2_000: +mus_vs_elite_four_2_000: .byte N12 , An4 , v096 .byte W72 .byte N24 , As4 , v108 @@ -342,7 +342,7 @@ bgm_battle38_2_000: .byte N12 , An4 .byte W96 .byte PATT - .word bgm_battle38_2_000 + .word mus_vs_elite_four_2_000 .byte N12 , Cn5 , v108 .byte W72 .byte N24 , As4 @@ -353,9 +353,9 @@ bgm_battle38_2_000: .byte W36 .byte N24 , As4 .byte W24 -bgm_battle38_2_B1: +mus_vs_elite_four_2_B1: .byte VOICE , 56 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte PAN , c_v+0 .byte N06 , Dn4 , v112 .byte W12 @@ -496,31 +496,31 @@ bgm_battle38_2_B1: .byte TIE , Dn5 .byte W96 .byte W96 - .byte VOL , 74*bgm_battle38_mvl/mxv + .byte VOL , 74*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 70*bgm_battle38_mvl/mxv + .byte 70*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 65*bgm_battle38_mvl/mxv + .byte 65*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 60*bgm_battle38_mvl/mxv + .byte 60*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 53*bgm_battle38_mvl/mxv + .byte 53*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 45*bgm_battle38_mvl/mxv + .byte 45*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 35*bgm_battle38_mvl/mxv + .byte 35*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 25*bgm_battle38_mvl/mxv + .byte 25*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 15*bgm_battle38_mvl/mxv + .byte 15*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 7*bgm_battle38_mvl/mxv + .byte 7*mus_vs_elite_four_mvl/mxv .byte W09 .byte EOT .byte W06 .byte W96 .byte VOICE , 60 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte N24 , As3 .byte W24 .byte TIE , Cn4 @@ -573,26 +573,26 @@ bgm_battle38_2_B1: .byte TIE , Fs4 .byte W96 .byte W30 - .byte VOL , 78*bgm_battle38_mvl/mxv + .byte VOL , 78*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 76*bgm_battle38_mvl/mxv + .byte 76*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 70*bgm_battle38_mvl/mxv + .byte 70*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 65*bgm_battle38_mvl/mxv + .byte 65*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 58*bgm_battle38_mvl/mxv + .byte 58*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 54*bgm_battle38_mvl/mxv + .byte 54*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 44*bgm_battle38_mvl/mxv + .byte 44*mus_vs_elite_four_mvl/mxv .byte W06 - .byte 32*bgm_battle38_mvl/mxv + .byte 32*mus_vs_elite_four_mvl/mxv .byte W03 .byte EOT .byte W03 .byte VOICE , 56 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte N36 , Gn3 , v116 .byte W18 .byte MOD , 6 @@ -703,15 +703,15 @@ bgm_battle38_2_B1: .byte W96 .byte EOT .byte GOTO - .word bgm_battle38_2_B1 + .word mus_vs_elite_four_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle38_3: - .byte KEYSH , bgm_battle38_key+0 +mus_vs_elite_four_3: + .byte KEYSH , mus_vs_elite_four_key+0 .byte VOICE , 38 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte N12 , Dn1 , v120 .byte W48 .byte N12 @@ -720,7 +720,7 @@ bgm_battle38_3: .byte W48 .byte N12 .byte W48 -bgm_battle38_3_000: +mus_vs_elite_four_3_000: .byte N12 , Dn1 , v120 .byte W12 .byte Cn1 @@ -738,7 +738,7 @@ bgm_battle38_3_000: .byte Ds1 .byte W12 .byte PEND -bgm_battle38_3_001: +mus_vs_elite_four_3_001: .byte N12 , Dn1 , v120 .byte W12 .byte Cn1 @@ -755,8 +755,8 @@ bgm_battle38_3_001: .byte W24 .byte PEND .byte PATT - .word bgm_battle38_3_000 -bgm_battle38_3_002: + .word mus_vs_elite_four_3_000 +mus_vs_elite_four_3_002: .byte N12 , Dn1 , v120 .byte W12 .byte Cn1 @@ -773,15 +773,15 @@ bgm_battle38_3_002: .byte W24 .byte PEND .byte PATT - .word bgm_battle38_3_000 + .word mus_vs_elite_four_3_000 .byte PATT - .word bgm_battle38_3_001 + .word mus_vs_elite_four_3_001 .byte PATT - .word bgm_battle38_3_000 + .word mus_vs_elite_four_3_000 .byte PATT - .word bgm_battle38_3_002 -bgm_battle38_3_B1: -bgm_battle38_3_003: + .word mus_vs_elite_four_3_002 +mus_vs_elite_four_3_B1: +mus_vs_elite_four_3_003: .byte N12 , Dn1 , v120 .byte W12 .byte An1 @@ -816,7 +816,7 @@ bgm_battle38_3_003: .byte An1 .byte W12 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte N12 , Dn1 , v120 .byte W12 .byte An1 @@ -834,7 +834,7 @@ bgm_battle38_3_003: .byte Cn2 .byte W12 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte N12 , Ds1 , v120 .byte W12 .byte As1 @@ -899,7 +899,7 @@ bgm_battle38_3_003: .byte W12 .byte Fn1 .byte W12 -bgm_battle38_3_004: +mus_vs_elite_four_3_004: .byte N12 , Dn1 , v120 .byte W12 .byte An1 @@ -917,7 +917,7 @@ bgm_battle38_3_004: .byte An1 .byte W12 .byte PEND -bgm_battle38_3_005: +mus_vs_elite_four_3_005: .byte N12 , Dn1 , v120 .byte W12 .byte An1 @@ -936,10 +936,10 @@ bgm_battle38_3_005: .byte W12 .byte PEND .byte PATT - .word bgm_battle38_3_004 + .word mus_vs_elite_four_3_004 .byte PATT - .word bgm_battle38_3_005 -bgm_battle38_3_006: + .word mus_vs_elite_four_3_005 +mus_vs_elite_four_3_006: .byte N12 , Dn1 , v120 .byte W24 .byte Dn2 @@ -956,37 +956,37 @@ bgm_battle38_3_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle38_3_005 + .word mus_vs_elite_four_3_005 .byte PATT - .word bgm_battle38_3_004 + .word mus_vs_elite_four_3_004 .byte PATT - .word bgm_battle38_3_005 + .word mus_vs_elite_four_3_005 .byte PATT - .word bgm_battle38_3_004 + .word mus_vs_elite_four_3_004 .byte PATT - .word bgm_battle38_3_005 + .word mus_vs_elite_four_3_005 .byte PATT - .word bgm_battle38_3_004 + .word mus_vs_elite_four_3_004 .byte PATT - .word bgm_battle38_3_005 + .word mus_vs_elite_four_3_005 .byte PATT - .word bgm_battle38_3_006 + .word mus_vs_elite_four_3_006 .byte PATT - .word bgm_battle38_3_005 + .word mus_vs_elite_four_3_005 .byte PATT - .word bgm_battle38_3_004 + .word mus_vs_elite_four_3_004 .byte PATT - .word bgm_battle38_3_005 + .word mus_vs_elite_four_3_005 .byte PATT - .word bgm_battle38_3_006 + .word mus_vs_elite_four_3_006 .byte PATT - .word bgm_battle38_3_005 + .word mus_vs_elite_four_3_005 .byte PATT - .word bgm_battle38_3_004 + .word mus_vs_elite_four_3_004 .byte PATT - .word bgm_battle38_3_005 + .word mus_vs_elite_four_3_005 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte N12 , Dn1 , v120 .byte W12 .byte An1 @@ -1036,22 +1036,22 @@ bgm_battle38_3_006: .byte En2 .byte W12 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte PATT - .word bgm_battle38_3_003 -bgm_battle38_3_007: + .word mus_vs_elite_four_3_003 +mus_vs_elite_four_3_007: .byte N12 , Dn1 , v120 .byte W12 .byte Gn1 @@ -1070,24 +1070,24 @@ bgm_battle38_3_007: .byte W12 .byte PEND .byte PATT - .word bgm_battle38_3_007 + .word mus_vs_elite_four_3_007 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte PATT - .word bgm_battle38_3_003 + .word mus_vs_elite_four_3_003 .byte GOTO - .word bgm_battle38_3_B1 + .word mus_vs_elite_four_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle38_4: - .byte KEYSH , bgm_battle38_key+0 +mus_vs_elite_four_4: + .byte KEYSH , mus_vs_elite_four_key+0 .byte VOICE , 80 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte LFOS , 15 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte PAN , c_v-48 .byte N12 , Dn3 , v060 .byte W48 @@ -1128,7 +1128,7 @@ bgm_battle38_4: .byte W36 .byte N24 , As3 .byte W24 -bgm_battle38_4_B1: +mus_vs_elite_four_4_B1: .byte PAN , c_v+0 .byte N36 , Dn3 , v072 .byte W36 @@ -1230,7 +1230,7 @@ bgm_battle38_4_B1: .byte W12 .byte Cs3 .byte W12 -bgm_battle38_4_000: +mus_vs_elite_four_4_000: .byte N12 , Dn3 , v048 .byte W12 .byte Dn2 @@ -1249,12 +1249,12 @@ bgm_battle38_4_000: .byte W12 .byte PEND .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 -bgm_battle38_4_001: + .word mus_vs_elite_four_4_000 +mus_vs_elite_four_4_001: .byte N12 , Dn3 , v048 .byte W24 .byte An2 @@ -1271,35 +1271,35 @@ bgm_battle38_4_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_001 + .word mus_vs_elite_four_4_001 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_001 + .word mus_vs_elite_four_4_001 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte PATT - .word bgm_battle38_4_000 + .word mus_vs_elite_four_4_000 .byte W96 .byte W96 .byte W96 @@ -1438,18 +1438,18 @@ bgm_battle38_4_001: .byte Bn3 .byte W12 .byte GOTO - .word bgm_battle38_4_B1 + .word mus_vs_elite_four_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle38_5: - .byte KEYSH , bgm_battle38_key+0 +mus_vs_elite_four_5: + .byte KEYSH , mus_vs_elite_four_key+0 .byte VOICE , 82 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte LFOS , 15 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte PAN , c_v+48 .byte BEND , c_v+0 .byte N12 , An2 , v060 @@ -1491,7 +1491,7 @@ bgm_battle38_5: .byte W96 .byte W96 .byte W96 -bgm_battle38_5_B1: +mus_vs_elite_four_5_B1: .byte W96 .byte W96 .byte W96 @@ -1648,29 +1648,29 @@ bgm_battle38_5_B1: .byte W12 .byte N12 .byte W06 - .byte VOL , 78*bgm_battle38_mvl/mxv + .byte VOL , 78*mus_vs_elite_four_mvl/mxv .byte W06 .byte N12 .byte W03 - .byte VOL , 76*bgm_battle38_mvl/mxv + .byte VOL , 76*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 70*bgm_battle38_mvl/mxv + .byte 70*mus_vs_elite_four_mvl/mxv .byte N12 .byte W09 - .byte VOL , 65*bgm_battle38_mvl/mxv + .byte VOL , 65*mus_vs_elite_four_mvl/mxv .byte W03 .byte N12 .byte W06 - .byte VOL , 58*bgm_battle38_mvl/mxv + .byte VOL , 58*mus_vs_elite_four_mvl/mxv .byte W06 .byte N12 .byte W03 - .byte VOL , 54*bgm_battle38_mvl/mxv + .byte VOL , 54*mus_vs_elite_four_mvl/mxv .byte W09 - .byte 44*bgm_battle38_mvl/mxv + .byte 44*mus_vs_elite_four_mvl/mxv .byte N12 .byte W06 - .byte VOL , 32*bgm_battle38_mvl/mxv + .byte VOL , 32*mus_vs_elite_four_mvl/mxv .byte W06 .byte W96 .byte W96 @@ -1681,7 +1681,7 @@ bgm_battle38_5_B1: .byte W96 .byte W96 .byte VOICE , 82 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte W12 .byte N12 , Cn3 , v052 .byte W12 @@ -1810,17 +1810,17 @@ bgm_battle38_5_B1: .byte An3 .byte W12 .byte GOTO - .word bgm_battle38_5_B1 + .word mus_vs_elite_four_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle38_6: - .byte KEYSH , bgm_battle38_key+0 +mus_vs_elite_four_6: + .byte KEYSH , mus_vs_elite_four_key+0 .byte VOICE , 80 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1831,7 +1831,7 @@ bgm_battle38_6: .byte W96 .byte W96 .byte W96 -bgm_battle38_6_B1: +mus_vs_elite_four_6_B1: .byte W96 .byte W96 .byte W96 @@ -1923,15 +1923,15 @@ bgm_battle38_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_battle38_6_B1 + .word mus_vs_elite_four_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle38_7: - .byte KEYSH , bgm_battle38_key+0 +mus_vs_elite_four_7: + .byte KEYSH , mus_vs_elite_four_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1969,8 +1969,8 @@ bgm_battle38_7: .byte W12 .byte N12 .byte W12 -bgm_battle38_7_B1: -bgm_battle38_7_000: +mus_vs_elite_four_7_B1: +mus_vs_elite_four_7_000: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -1978,10 +1978,10 @@ bgm_battle38_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 -bgm_battle38_7_001: + .word mus_vs_elite_four_7_000 +mus_vs_elite_four_7_001: .byte W24 .byte N12 , Dn1 , v112 .byte W36 @@ -1991,21 +1991,21 @@ bgm_battle38_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte N12 , Dn1 , v112 .byte W48 .byte N12 @@ -2013,35 +2013,35 @@ bgm_battle38_7_001: .byte N12 .byte W12 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2049,7 +2049,7 @@ bgm_battle38_7_001: .byte W12 .byte N12 .byte W12 -bgm_battle38_7_002: +mus_vs_elite_four_7_002: .byte W24 .byte N12 , Ds1 , v092 .byte W48 @@ -2057,9 +2057,9 @@ bgm_battle38_7_002: .byte W24 .byte PEND .byte PATT - .word bgm_battle38_7_002 + .word mus_vs_elite_four_7_002 .byte PATT - .word bgm_battle38_7_002 + .word mus_vs_elite_four_7_002 .byte W24 .byte N12 , Ds1 , v092 .byte W48 @@ -2068,51 +2068,51 @@ bgm_battle38_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_001 + .word mus_vs_elite_four_7_001 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_001 + .word mus_vs_elite_four_7_001 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_000 + .word mus_vs_elite_four_7_000 .byte PATT - .word bgm_battle38_7_001 + .word mus_vs_elite_four_7_001 .byte GOTO - .word bgm_battle38_7_B1 + .word mus_vs_elite_four_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle38_8: - .byte KEYSH , bgm_battle38_key+0 +mus_vs_elite_four_8: + .byte KEYSH , mus_vs_elite_four_key+0 .byte VOICE , 47 - .byte VOL , 80*bgm_battle38_mvl/mxv + .byte VOL , 80*mus_vs_elite_four_mvl/mxv .byte PAN , c_v-8 .byte N12 , Dn2 , v112 .byte W48 .byte N12 .byte W48 -bgm_battle38_8_000: +mus_vs_elite_four_8_000: .byte N12 , Dn2 , v112 .byte W48 .byte N12 .byte W48 .byte PEND -bgm_battle38_8_001: +mus_vs_elite_four_8_001: .byte N12 , Dn2 , v112 .byte W12 .byte N12 @@ -2123,44 +2123,44 @@ bgm_battle38_8_001: .byte W36 .byte PEND .byte PATT - .word bgm_battle38_8_001 + .word mus_vs_elite_four_8_001 .byte PATT - .word bgm_battle38_8_001 + .word mus_vs_elite_four_8_001 .byte PATT - .word bgm_battle38_8_001 + .word mus_vs_elite_four_8_001 .byte PATT - .word bgm_battle38_8_001 + .word mus_vs_elite_four_8_001 .byte PATT - .word bgm_battle38_8_001 + .word mus_vs_elite_four_8_001 .byte PATT - .word bgm_battle38_8_001 + .word mus_vs_elite_four_8_001 .byte PATT - .word bgm_battle38_8_001 -bgm_battle38_8_B1: + .word mus_vs_elite_four_8_001 +mus_vs_elite_four_8_B1: .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte W12 .byte N12 , Dn2 , v112 .byte W12 @@ -2171,38 +2171,38 @@ bgm_battle38_8_B1: .byte N12 .byte W24 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 -bgm_battle38_8_002: + .word mus_vs_elite_four_8_000 +mus_vs_elite_four_8_002: .byte N12 , Dn2 , v112 .byte W36 .byte N12 @@ -2211,57 +2211,57 @@ bgm_battle38_8_002: .byte W36 .byte PEND .byte PATT - .word bgm_battle38_8_002 + .word mus_vs_elite_four_8_002 .byte PATT - .word bgm_battle38_8_002 + .word mus_vs_elite_four_8_002 .byte PATT - .word bgm_battle38_8_002 + .word mus_vs_elite_four_8_002 .byte PATT - .word bgm_battle38_8_002 + .word mus_vs_elite_four_8_002 .byte PATT - .word bgm_battle38_8_002 + .word mus_vs_elite_four_8_002 .byte PATT - .word bgm_battle38_8_002 + .word mus_vs_elite_four_8_002 .byte PATT - .word bgm_battle38_8_002 + .word mus_vs_elite_four_8_002 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte PATT - .word bgm_battle38_8_000 + .word mus_vs_elite_four_8_000 .byte GOTO - .word bgm_battle38_8_B1 + .word mus_vs_elite_four_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle38: +mus_vs_elite_four: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle38_pri @ Priority - .byte bgm_battle38_rev @ Reverb. + .byte mus_vs_elite_four_pri @ Priority + .byte mus_vs_elite_four_rev @ Reverb. - .word bgm_battle38_grp + .word mus_vs_elite_four_grp - .word bgm_battle38_1 - .word bgm_battle38_2 - .word bgm_battle38_3 - .word bgm_battle38_4 - .word bgm_battle38_5 - .word bgm_battle38_6 - .word bgm_battle38_7 - .word bgm_battle38_8 + .word mus_vs_elite_four_1 + .word mus_vs_elite_four_2 + .word mus_vs_elite_four_3 + .word mus_vs_elite_four_4 + .word mus_vs_elite_four_5 + .word mus_vs_elite_four_6 + .word mus_vs_elite_four_7 + .word mus_vs_elite_four_8 .end diff --git a/sound/songs/bgm_battle32.s b/sound/songs/mus_vs_gym_leader.s index d27f5a171..78a836987 100644 --- a/sound/songs/bgm_battle32.s +++ b/sound/songs/mus_vs_gym_leader.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_battle32_grp, voicegroup103 - .equ bgm_battle32_pri, 1 - .equ bgm_battle32_rev, reverb_set+50 - .equ bgm_battle32_mvl, 127 - .equ bgm_battle32_key, 0 - .equ bgm_battle32_tbs, 1 - .equ bgm_battle32_exg, 0 - .equ bgm_battle32_cmp, 1 + .equ mus_vs_gym_leader_grp, voicegroup103 + .equ mus_vs_gym_leader_pri, 1 + .equ mus_vs_gym_leader_rev, reverb_set+50 + .equ mus_vs_gym_leader_mvl, 127 + .equ mus_vs_gym_leader_key, 0 + .equ mus_vs_gym_leader_tbs, 1 + .equ mus_vs_gym_leader_exg, 0 + .equ mus_vs_gym_leader_cmp, 1 .section .rodata - .global bgm_battle32 + .global mus_vs_gym_leader .align 2 @********************** Track 1 **********************@ -bgm_battle32_1: - .byte KEYSH , bgm_battle32_key+0 - .byte TEMPO , 196*bgm_battle32_tbs/2 +mus_vs_gym_leader_1: + .byte KEYSH , mus_vs_gym_leader_key+0 + .byte TEMPO , 196*mus_vs_gym_leader_tbs/2 .byte VOICE , 48 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte LFOS , 18 .byte PAN , c_v-10 .byte N06 , Cn5 , v092 @@ -132,7 +132,7 @@ bgm_battle32_1: .byte W24 .byte Cs4 .byte W24 -bgm_battle32_1_B1: +mus_vs_gym_leader_1_B1: .byte PAN , c_v+10 .byte N48 , Gn3 , v100 .byte W48 @@ -263,17 +263,17 @@ bgm_battle32_1_B1: .byte W30 .byte MOD , 6 .byte W03 - .byte VOL , 76*bgm_battle32_mvl/mxv + .byte VOL , 76*mus_vs_gym_leader_mvl/mxv .byte W06 - .byte 71*bgm_battle32_mvl/mxv + .byte 71*mus_vs_gym_leader_mvl/mxv .byte W06 - .byte 64*bgm_battle32_mvl/mxv + .byte 64*mus_vs_gym_leader_mvl/mxv .byte W03 - .byte 49*bgm_battle32_mvl/mxv + .byte 49*mus_vs_gym_leader_mvl/mxv .byte W03 - .byte 33*bgm_battle32_mvl/mxv + .byte 33*mus_vs_gym_leader_mvl/mxv .byte W03 - .byte 17*bgm_battle32_mvl/mxv + .byte 17*mus_vs_gym_leader_mvl/mxv .byte W03 .byte VOICE , 48 .byte MOD , 0 @@ -281,7 +281,7 @@ bgm_battle32_1_B1: .byte PAN , c_v+20 .byte N12 , Gn3 , v092 .byte W03 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte W09 .byte N12 , Cn4 .byte W24 @@ -376,15 +376,15 @@ bgm_battle32_1_B1: .byte Cn3 .byte W96 .byte GOTO - .word bgm_battle32_1_B1 + .word mus_vs_gym_leader_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle32_2: - .byte KEYSH , bgm_battle32_key+0 +mus_vs_gym_leader_2: + .byte KEYSH , mus_vs_gym_leader_key+0 .byte VOICE , 1 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte LFOS , 18 .byte PAN , c_v+10 .byte N06 , Gn5 , v080 @@ -487,7 +487,7 @@ bgm_battle32_2: .byte W36 .byte N24 , Ds5 .byte W24 -bgm_battle32_2_B1: +mus_vs_gym_leader_2_B1: .byte VOICE , 48 .byte PAN , c_v+0 .byte N48 , Cn4 , v100 @@ -629,17 +629,17 @@ bgm_battle32_2_B1: .byte W30 .byte MOD , 6 .byte W03 - .byte VOL , 76*bgm_battle32_mvl/mxv + .byte VOL , 76*mus_vs_gym_leader_mvl/mxv .byte W06 - .byte 71*bgm_battle32_mvl/mxv + .byte 71*mus_vs_gym_leader_mvl/mxv .byte W06 - .byte 64*bgm_battle32_mvl/mxv + .byte 64*mus_vs_gym_leader_mvl/mxv .byte W03 - .byte 49*bgm_battle32_mvl/mxv + .byte 49*mus_vs_gym_leader_mvl/mxv .byte W03 - .byte 33*bgm_battle32_mvl/mxv + .byte 33*mus_vs_gym_leader_mvl/mxv .byte W03 - .byte 17*bgm_battle32_mvl/mxv + .byte 17*mus_vs_gym_leader_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 @@ -647,7 +647,7 @@ bgm_battle32_2_B1: .byte PAN , c_v+2 .byte N12 , Gn4 , v092 .byte W03 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte W09 .byte N12 , Cn5 .byte W24 @@ -741,15 +741,15 @@ bgm_battle32_2_B1: .byte En3 .byte W96 .byte GOTO - .word bgm_battle32_2_B1 + .word mus_vs_gym_leader_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle32_3: - .byte KEYSH , bgm_battle32_key+0 +mus_vs_gym_leader_3: + .byte KEYSH , mus_vs_gym_leader_key+0 .byte VOICE , 33 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte PAN , c_v+0 .byte N24 , Cn2 , v108 .byte W24 @@ -773,7 +773,7 @@ bgm_battle32_3: .byte W12 .byte Cs1 .byte W12 -bgm_battle32_3_000: +mus_vs_gym_leader_3_000: .byte N12 , Cn1 , v108 .byte W12 .byte Fs1 @@ -791,7 +791,7 @@ bgm_battle32_3_000: .byte Fn1 .byte W12 .byte PEND -bgm_battle32_3_001: +mus_vs_gym_leader_3_001: .byte N12 , Cn1 , v108 .byte W12 .byte Fs1 @@ -810,19 +810,19 @@ bgm_battle32_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle32_3_000 + .word mus_vs_gym_leader_3_000 .byte PATT - .word bgm_battle32_3_001 + .word mus_vs_gym_leader_3_001 .byte PATT - .word bgm_battle32_3_000 + .word mus_vs_gym_leader_3_000 .byte PATT - .word bgm_battle32_3_001 + .word mus_vs_gym_leader_3_001 .byte PATT - .word bgm_battle32_3_000 + .word mus_vs_gym_leader_3_000 .byte PATT - .word bgm_battle32_3_001 -bgm_battle32_3_B1: -bgm_battle32_3_002: + .word mus_vs_gym_leader_3_001 +mus_vs_gym_leader_3_B1: +mus_vs_gym_leader_3_002: .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -857,7 +857,7 @@ bgm_battle32_3_002: .byte Dn1 .byte W12 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -874,7 +874,7 @@ bgm_battle32_3_002: .byte W12 .byte Cn1 .byte W12 -bgm_battle32_3_003: +mus_vs_gym_leader_3_003: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -892,7 +892,7 @@ bgm_battle32_3_003: .byte Fn1 .byte W12 .byte PEND -bgm_battle32_3_004: +mus_vs_gym_leader_3_004: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -911,8 +911,8 @@ bgm_battle32_3_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle32_3_002 -bgm_battle32_3_005: + .word mus_vs_gym_leader_3_002 +mus_vs_gym_leader_3_005: .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -931,12 +931,12 @@ bgm_battle32_3_005: .byte W12 .byte PEND .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_002 -bgm_battle32_3_006: + .word mus_vs_gym_leader_3_002 +mus_vs_gym_leader_3_006: .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -955,11 +955,11 @@ bgm_battle32_3_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -975,11 +975,11 @@ bgm_battle32_3_006: .byte Cn1 .byte W12 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_004 + .word mus_vs_gym_leader_3_004 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -997,22 +997,22 @@ bgm_battle32_3_006: .byte Cn1 .byte W12 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_005 + .word mus_vs_gym_leader_3_005 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 -bgm_battle32_3_007: + .word mus_vs_gym_leader_3_002 +mus_vs_gym_leader_3_007: .byte N12 , Cs1 , v108 .byte W12 .byte Gs1 @@ -1030,7 +1030,7 @@ bgm_battle32_3_007: .byte Gs1 .byte W12 .byte PEND -bgm_battle32_3_008: +mus_vs_gym_leader_3_008: .byte N12 , Ds1 , v108 .byte W12 .byte As1 @@ -1049,60 +1049,60 @@ bgm_battle32_3_008: .byte W12 .byte PEND .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_007 + .word mus_vs_gym_leader_3_007 .byte PATT - .word bgm_battle32_3_008 + .word mus_vs_gym_leader_3_008 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_007 + .word mus_vs_gym_leader_3_007 .byte PATT - .word bgm_battle32_3_008 + .word mus_vs_gym_leader_3_008 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_003 + .word mus_vs_gym_leader_3_003 .byte PATT - .word bgm_battle32_3_002 + .word mus_vs_gym_leader_3_002 .byte PATT - .word bgm_battle32_3_006 + .word mus_vs_gym_leader_3_006 .byte GOTO - .word bgm_battle32_3_B1 + .word mus_vs_gym_leader_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle32_4: - .byte KEYSH , bgm_battle32_key+0 +mus_vs_gym_leader_4: + .byte KEYSH , mus_vs_gym_leader_key+0 .byte VOICE , 80 .byte LFOS , 18 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte PAN , c_v-48 @@ -1251,7 +1251,7 @@ bgm_battle32_4: .byte W36 .byte N24 .byte W24 -bgm_battle32_4_B1: +mus_vs_gym_leader_4_B1: .byte VOICE , 84 .byte PAN , c_v+0 .byte N12 , En4 , v040 @@ -1289,7 +1289,7 @@ bgm_battle32_4_B1: .byte W24 .byte MOD , 7 .byte W36 -bgm_battle32_4_000: +mus_vs_gym_leader_4_000: .byte VOICE , 80 .byte MOD , 0 .byte N48 , As3 , v060 @@ -1297,7 +1297,7 @@ bgm_battle32_4_000: .byte An3 .byte W48 .byte PEND -bgm_battle32_4_001: +mus_vs_gym_leader_4_001: .byte N24 , Gn3 , v060 .byte W24 .byte An3 @@ -1307,13 +1307,13 @@ bgm_battle32_4_001: .byte Fn3 .byte W24 .byte PEND -bgm_battle32_4_002: +mus_vs_gym_leader_4_002: .byte N72 , En3 , v060 .byte W72 .byte N24 , Cn3 .byte W24 .byte PEND -bgm_battle32_4_003: +mus_vs_gym_leader_4_003: .byte N60 , Gn3 , v060 .byte W60 .byte VOICE , 6 @@ -1456,13 +1456,13 @@ bgm_battle32_4_003: .byte W32 .byte W01 .byte PATT - .word bgm_battle32_4_000 + .word mus_vs_gym_leader_4_000 .byte PATT - .word bgm_battle32_4_001 + .word mus_vs_gym_leader_4_001 .byte PATT - .word bgm_battle32_4_002 + .word mus_vs_gym_leader_4_002 .byte PATT - .word bgm_battle32_4_003 + .word mus_vs_gym_leader_4_003 .byte N12 , Fn2 , v072 .byte W12 .byte As2 @@ -1594,7 +1594,7 @@ bgm_battle32_4_003: .byte W12 .byte N12 .byte W12 -bgm_battle32_4_004: +mus_vs_gym_leader_4_004: .byte N12 , Fn2 , v072 .byte W12 .byte N12 @@ -1613,9 +1613,9 @@ bgm_battle32_4_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle32_4_004 + .word mus_vs_gym_leader_4_004 .byte PATT - .word bgm_battle32_4_004 + .word mus_vs_gym_leader_4_004 .byte VOICE , 6 .byte N12 , Gn3 , v060 .byte W12 @@ -1671,7 +1671,7 @@ bgm_battle32_4_004: .byte W12 .byte Cn4 .byte W12 -bgm_battle32_4_005: +mus_vs_gym_leader_4_005: .byte PAN , c_v+0 .byte N12 , Gn3 , v060 .byte W12 @@ -1748,20 +1748,20 @@ bgm_battle32_4_005: .byte Cn4 .byte W12 .byte PATT - .word bgm_battle32_4_005 + .word mus_vs_gym_leader_4_005 .byte GOTO - .word bgm_battle32_4_B1 + .word mus_vs_gym_leader_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle32_5: - .byte KEYSH , bgm_battle32_key+0 +mus_vs_gym_leader_5: + .byte KEYSH , mus_vs_gym_leader_key+0 .byte VOICE , 82 .byte LFOS , 18 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte PAN , c_v+46 .byte BEND , c_v-2 .byte N06 , Gn3 , v052 @@ -1881,7 +1881,7 @@ bgm_battle32_5: .byte W36 .byte N24 , Ds3 .byte W24 -bgm_battle32_5_B1: +mus_vs_gym_leader_5_B1: .byte W96 .byte W96 .byte W96 @@ -2022,7 +2022,7 @@ bgm_battle32_5_B1: .byte W12 .byte N09 .byte W12 -bgm_battle32_5_000: +mus_vs_gym_leader_5_000: .byte VOICE , 4 .byte N09 , Cn4 , v060 .byte W12 @@ -2037,7 +2037,7 @@ bgm_battle32_5_000: .byte N09 .byte W12 .byte PEND -bgm_battle32_5_001: +mus_vs_gym_leader_5_001: .byte N09 , Cn4 , v060 .byte W12 .byte N09 @@ -2077,19 +2077,19 @@ bgm_battle32_5_001: .byte N09 .byte W12 .byte PATT - .word bgm_battle32_5_000 + .word mus_vs_gym_leader_5_000 .byte PATT - .word bgm_battle32_5_001 + .word mus_vs_gym_leader_5_001 .byte GOTO - .word bgm_battle32_5_B1 + .word mus_vs_gym_leader_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle32_6: - .byte KEYSH , bgm_battle32_key+0 +mus_vs_gym_leader_6: + .byte KEYSH , mus_vs_gym_leader_key+0 .byte VOICE , 90 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte W24 .byte N06 , Gn2 , v080 .byte W06 @@ -2168,7 +2168,7 @@ bgm_battle32_6: .byte W48 .byte Ds2 .byte W48 -bgm_battle32_6_B1: +mus_vs_gym_leader_6_B1: .byte W96 .byte W96 .byte W96 @@ -2177,13 +2177,13 @@ bgm_battle32_6_B1: .byte W96 .byte W96 .byte W96 -bgm_battle32_6_000: +mus_vs_gym_leader_6_000: .byte N48 , Fn4 , v064 .byte W48 .byte En4 .byte W48 .byte PEND -bgm_battle32_6_001: +mus_vs_gym_leader_6_001: .byte N24 , Fn4 , v064 .byte W24 .byte En4 @@ -2212,9 +2212,9 @@ bgm_battle32_6_001: .byte Gn4 .byte W24 .byte PATT - .word bgm_battle32_6_000 + .word mus_vs_gym_leader_6_000 .byte PATT - .word bgm_battle32_6_001 + .word mus_vs_gym_leader_6_001 .byte N72 , Cn5 , v064 .byte W72 .byte N24 , En4 @@ -2275,21 +2275,21 @@ bgm_battle32_6_001: .byte W96 .byte W96 .byte GOTO - .word bgm_battle32_6_B1 + .word mus_vs_gym_leader_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle32_7: - .byte KEYSH , bgm_battle32_key+0 +mus_vs_gym_leader_7: + .byte KEYSH , mus_vs_gym_leader_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte PAN , c_v+0 .byte W96 .byte W84 .byte N12 , Dn1 , v112 .byte W12 -bgm_battle32_7_000: +mus_vs_gym_leader_7_000: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2297,18 +2297,18 @@ bgm_battle32_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 -bgm_battle32_7_001: + .word mus_vs_gym_leader_7_000 +mus_vs_gym_leader_7_001: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2317,121 +2317,121 @@ bgm_battle32_7_001: .byte N12 .byte W12 .byte PEND -bgm_battle32_7_B1: +mus_vs_gym_leader_7_B1: .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_001 + .word mus_vs_gym_leader_7_001 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_001 + .word mus_vs_gym_leader_7_001 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_000 + .word mus_vs_gym_leader_7_000 .byte PATT - .word bgm_battle32_7_001 + .word mus_vs_gym_leader_7_001 .byte GOTO - .word bgm_battle32_7_B1 + .word mus_vs_gym_leader_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle32_8: - .byte KEYSH , bgm_battle32_key+0 +mus_vs_gym_leader_8: + .byte KEYSH , mus_vs_gym_leader_key+0 .byte VOICE , 47 - .byte VOL , 80*bgm_battle32_mvl/mxv + .byte VOL , 80*mus_vs_gym_leader_mvl/mxv .byte PAN , c_v-10 .byte N12 , Cn2 , v112 .byte W36 @@ -2446,28 +2446,28 @@ bgm_battle32_8: .byte W24 .byte Gn1 .byte W24 -bgm_battle32_8_000: +mus_vs_gym_leader_8_000: .byte N12 , Cn2 , v112 .byte W36 .byte N12 .byte W60 .byte PEND .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_000 -bgm_battle32_8_B1: -bgm_battle32_8_001: + .word mus_vs_gym_leader_8_000 +mus_vs_gym_leader_8_B1: +mus_vs_gym_leader_8_001: .byte N12 , Cn2 , v112 .byte W36 .byte N12 @@ -2476,92 +2476,92 @@ bgm_battle32_8_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_000 + .word mus_vs_gym_leader_8_000 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 + .word mus_vs_gym_leader_8_001 .byte PATT - .word bgm_battle32_8_001 -bgm_battle32_8_002: + .word mus_vs_gym_leader_8_001 +mus_vs_gym_leader_8_002: .byte N12 , Cn2 , v112 .byte W48 .byte N12 @@ -2572,15 +2572,15 @@ bgm_battle32_8_002: .byte W12 .byte PEND .byte PATT - .word bgm_battle32_8_002 + .word mus_vs_gym_leader_8_002 .byte PATT - .word bgm_battle32_8_002 + .word mus_vs_gym_leader_8_002 .byte PATT - .word bgm_battle32_8_002 + .word mus_vs_gym_leader_8_002 .byte PATT - .word bgm_battle32_8_002 + .word mus_vs_gym_leader_8_002 .byte PATT - .word bgm_battle32_8_002 + .word mus_vs_gym_leader_8_002 .byte W24 .byte N12 , Cn2 , v112 .byte W24 @@ -2597,27 +2597,27 @@ bgm_battle32_8_002: .byte N12 .byte W36 .byte GOTO - .word bgm_battle32_8_B1 + .word mus_vs_gym_leader_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle32: +mus_vs_gym_leader: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle32_pri @ Priority - .byte bgm_battle32_rev @ Reverb. + .byte mus_vs_gym_leader_pri @ Priority + .byte mus_vs_gym_leader_rev @ Reverb. - .word bgm_battle32_grp + .word mus_vs_gym_leader_grp - .word bgm_battle32_1 - .word bgm_battle32_2 - .word bgm_battle32_3 - .word bgm_battle32_4 - .word bgm_battle32_5 - .word bgm_battle32_6 - .word bgm_battle32_7 - .word bgm_battle32_8 + .word mus_vs_gym_leader_1 + .word mus_vs_gym_leader_2 + .word mus_vs_gym_leader_3 + .word mus_vs_gym_leader_4 + .word mus_vs_gym_leader_5 + .word mus_vs_gym_leader_6 + .word mus_vs_gym_leader_7 + .word mus_vs_gym_leader_8 .end diff --git a/sound/songs/bgm_battle34.s b/sound/songs/mus_vs_kyogre_groudon.s index bb83efda3..f51f45ac8 100644 --- a/sound/songs/bgm_battle34.s +++ b/sound/songs/mus_vs_kyogre_groudon.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ bgm_battle34_grp, voicegroup106 - .equ bgm_battle34_pri, 1 - .equ bgm_battle34_rev, reverb_set+50 - .equ bgm_battle34_mvl, 127 - .equ bgm_battle34_key, 0 - .equ bgm_battle34_tbs, 1 - .equ bgm_battle34_exg, 0 - .equ bgm_battle34_cmp, 1 + .equ mus_vs_kyogre_groudon_grp, voicegroup106 + .equ mus_vs_kyogre_groudon_pri, 1 + .equ mus_vs_kyogre_groudon_rev, reverb_set+50 + .equ mus_vs_kyogre_groudon_mvl, 127 + .equ mus_vs_kyogre_groudon_key, 0 + .equ mus_vs_kyogre_groudon_tbs, 1 + .equ mus_vs_kyogre_groudon_exg, 0 + .equ mus_vs_kyogre_groudon_cmp, 1 .section .rodata - .global bgm_battle34 + .global mus_vs_kyogre_groudon .align 2 @********************** Track 1 **********************@ -bgm_battle34_1: - .byte KEYSH , bgm_battle34_key+0 - .byte TEMPO , 196*bgm_battle34_tbs/2 +mus_vs_kyogre_groudon_1: + .byte KEYSH , mus_vs_kyogre_groudon_key+0 + .byte TEMPO , 196*mus_vs_kyogre_groudon_tbs/2 .byte VOICE , 14 .byte LFOS , 18 .byte PAN , c_v+16 - .byte VOL , 80*bgm_battle34_mvl/mxv + .byte VOL , 80*mus_vs_kyogre_groudon_mvl/mxv .byte N48 , Cn2 , v112 .byte W96 .byte N48 @@ -30,7 +30,7 @@ bgm_battle34_1: .byte W96 .byte N48 .byte W96 -bgm_battle34_1_000: +mus_vs_kyogre_groudon_1_000: .byte VOICE , 47 .byte PAN , c_v-32 .byte N24 , Gn1 , v096 @@ -44,7 +44,7 @@ bgm_battle34_1_000: .byte N24 .byte W24 .byte PEND -bgm_battle34_1_001: +mus_vs_kyogre_groudon_1_001: .byte N36 , Gn1 , v096 .byte W36 .byte N24 @@ -54,7 +54,7 @@ bgm_battle34_1_001: .byte N12 .byte W12 .byte PEND -bgm_battle34_1_002: +mus_vs_kyogre_groudon_1_002: .byte N12 , Gn1 , v096 .byte W12 .byte N24 @@ -66,7 +66,7 @@ bgm_battle34_1_002: .byte N24 .byte W24 .byte PEND -bgm_battle34_1_003: +mus_vs_kyogre_groudon_1_003: .byte N24 , Gn1 , v096 .byte W24 .byte N12 @@ -78,7 +78,7 @@ bgm_battle34_1_003: .byte N24 .byte W24 .byte PEND -bgm_battle34_1_B1: +mus_vs_kyogre_groudon_1_B1: .byte VOICE , 56 .byte PAN , c_v+10 .byte N12 , Cn4 , v100 @@ -87,14 +87,14 @@ bgm_battle34_1_B1: .byte W24 .byte N12 , Cs4 .byte W24 -bgm_battle34_1_004: +mus_vs_kyogre_groudon_1_004: .byte W24 .byte N72 , Gn3 , v100 .byte W24 .byte MOD , 7 .byte W48 .byte PEND -bgm_battle34_1_005: +mus_vs_kyogre_groudon_1_005: .byte MOD , 0 .byte N12 , Cn4 , v100 .byte W48 @@ -109,11 +109,11 @@ bgm_battle34_1_005: .byte MOD , 7 .byte W48 .byte PATT - .word bgm_battle34_1_005 + .word mus_vs_kyogre_groudon_1_005 .byte PATT - .word bgm_battle34_1_004 + .word mus_vs_kyogre_groudon_1_004 .byte PATT - .word bgm_battle34_1_005 + .word mus_vs_kyogre_groudon_1_005 .byte W24 .byte N72 , En4 , v100 .byte W24 @@ -139,7 +139,7 @@ bgm_battle34_1_005: .byte W24 .byte N72 , Gs4 .byte W72 -bgm_battle34_1_006: +mus_vs_kyogre_groudon_1_006: .byte N48 , Gn3 , v096 .byte W48 .byte Cn4 @@ -148,15 +148,15 @@ bgm_battle34_1_006: .byte N96 , Gs3 .byte W96 .byte PATT - .word bgm_battle34_1_006 + .word mus_vs_kyogre_groudon_1_006 .byte N96 , Gs4 , v096 .byte W96 .byte PATT - .word bgm_battle34_1_006 + .word mus_vs_kyogre_groudon_1_006 .byte N96 , Gs3 , v096 .byte W96 .byte PATT - .word bgm_battle34_1_006 + .word mus_vs_kyogre_groudon_1_006 .byte N96 , Gs4 , v096 .byte W96 .byte VOICE , 60 @@ -173,33 +173,33 @@ bgm_battle34_1_006: .byte N96 , Bn4 .byte W96 .byte PATT - .word bgm_battle34_1_000 + .word mus_vs_kyogre_groudon_1_000 .byte PATT - .word bgm_battle34_1_001 + .word mus_vs_kyogre_groudon_1_001 .byte PATT - .word bgm_battle34_1_002 + .word mus_vs_kyogre_groudon_1_002 .byte PATT - .word bgm_battle34_1_003 + .word mus_vs_kyogre_groudon_1_003 .byte PATT - .word bgm_battle34_1_003 + .word mus_vs_kyogre_groudon_1_003 .byte PATT - .word bgm_battle34_1_001 + .word mus_vs_kyogre_groudon_1_001 .byte PATT - .word bgm_battle34_1_002 + .word mus_vs_kyogre_groudon_1_002 .byte PATT - .word bgm_battle34_1_003 + .word mus_vs_kyogre_groudon_1_003 .byte GOTO - .word bgm_battle34_1_B1 + .word mus_vs_kyogre_groudon_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle34_2: - .byte KEYSH , bgm_battle34_key+0 +mus_vs_kyogre_groudon_2: + .byte KEYSH , mus_vs_kyogre_groudon_key+0 .byte VOICE , 14 .byte LFOS , 18 .byte PAN , c_v-16 - .byte VOL , 80*bgm_battle34_mvl/mxv + .byte VOL , 80*mus_vs_kyogre_groudon_mvl/mxv .byte N48 , Cn3 , v108 .byte W96 .byte N48 @@ -212,7 +212,7 @@ bgm_battle34_2: .byte W96 .byte W96 .byte W96 -bgm_battle34_2_B1: +mus_vs_kyogre_groudon_2_B1: .byte VOICE , 56 .byte PAN , c_v-10 .byte N12 , Gn4 , v100 @@ -221,14 +221,14 @@ bgm_battle34_2_B1: .byte W24 .byte N12 , Gs4 .byte W24 -bgm_battle34_2_000: +mus_vs_kyogre_groudon_2_000: .byte W24 .byte N72 , Dn4 , v100 .byte W24 .byte MOD , 7 .byte W48 .byte PEND -bgm_battle34_2_001: +mus_vs_kyogre_groudon_2_001: .byte MOD , 0 .byte N12 , Gn4 , v100 .byte W48 @@ -243,11 +243,11 @@ bgm_battle34_2_001: .byte MOD , 7 .byte W48 .byte PATT - .word bgm_battle34_2_001 + .word mus_vs_kyogre_groudon_2_001 .byte PATT - .word bgm_battle34_2_000 + .word mus_vs_kyogre_groudon_2_000 .byte PATT - .word bgm_battle34_2_001 + .word mus_vs_kyogre_groudon_2_001 .byte W24 .byte N72 , Bn4 , v100 .byte W24 @@ -286,13 +286,13 @@ bgm_battle34_2_001: .byte 0 .byte N24 , Fs4 .byte W24 -bgm_battle34_2_002: +mus_vs_kyogre_groudon_2_002: .byte N96 , Cs4 , v108 .byte W36 .byte MOD , 8 .byte W60 .byte PEND -bgm_battle34_2_003: +mus_vs_kyogre_groudon_2_003: .byte MOD , 0 .byte N36 , Cn5 , v108 .byte W18 @@ -307,7 +307,7 @@ bgm_battle34_2_003: .byte N24 , Fn4 .byte W24 .byte PEND -bgm_battle34_2_004: +mus_vs_kyogre_groudon_2_004: .byte N96 , Cs5 , v108 .byte W36 .byte MOD , 8 @@ -328,11 +328,11 @@ bgm_battle34_2_004: .byte N24 , Fs4 .byte W24 .byte PATT - .word bgm_battle34_2_002 + .word mus_vs_kyogre_groudon_2_002 .byte PATT - .word bgm_battle34_2_003 + .word mus_vs_kyogre_groudon_2_003 .byte PATT - .word bgm_battle34_2_004 + .word mus_vs_kyogre_groudon_2_004 .byte VOICE , 48 .byte MOD , 0 .byte N36 , Gn4 , v108 @@ -358,7 +358,7 @@ bgm_battle34_2_004: .byte VOICE , 47 .byte N48 , En1 , v100 .byte W48 -bgm_battle34_2_005: +mus_vs_kyogre_groudon_2_005: .byte VOICE , 14 .byte N24 , Cn4 , v108 .byte W48 @@ -373,7 +373,7 @@ bgm_battle34_2_005: .byte N48 , En1 , v100 .byte W48 .byte PATT - .word bgm_battle34_2_005 + .word mus_vs_kyogre_groudon_2_005 .byte N24 , En1 , v100 .byte W24 .byte An1 @@ -419,15 +419,15 @@ bgm_battle34_2_005: .byte N12 .byte W12 .byte GOTO - .word bgm_battle34_2_B1 + .word mus_vs_kyogre_groudon_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle34_3: - .byte KEYSH , bgm_battle34_key+0 +mus_vs_kyogre_groudon_3: + .byte KEYSH , mus_vs_kyogre_groudon_key+0 .byte VOICE , 33 - .byte VOL , 80*bgm_battle34_mvl/mxv + .byte VOL , 80*mus_vs_kyogre_groudon_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -436,14 +436,14 @@ bgm_battle34_3: .byte W96 .byte W96 .byte W96 -bgm_battle34_3_B1: -bgm_battle34_3_000: +mus_vs_kyogre_groudon_3_B1: +mus_vs_kyogre_groudon_3_000: .byte N12 , Gn0 , v112 .byte W48 .byte N12 .byte W48 .byte PEND -bgm_battle34_3_001: +mus_vs_kyogre_groudon_3_001: .byte N12 , Gn0 , v112 .byte W48 .byte N12 @@ -452,22 +452,22 @@ bgm_battle34_3_001: .byte W24 .byte PEND .byte PATT - .word bgm_battle34_3_000 + .word mus_vs_kyogre_groudon_3_000 .byte PATT - .word bgm_battle34_3_000 + .word mus_vs_kyogre_groudon_3_000 .byte PATT - .word bgm_battle34_3_000 + .word mus_vs_kyogre_groudon_3_000 .byte PATT - .word bgm_battle34_3_001 + .word mus_vs_kyogre_groudon_3_001 .byte PATT - .word bgm_battle34_3_000 + .word mus_vs_kyogre_groudon_3_000 .byte N12 , Gn0 , v112 .byte W48 .byte N12 .byte W24 .byte N24 , Bn0 .byte W24 -bgm_battle34_3_002: +mus_vs_kyogre_groudon_3_002: .byte N12 , Cn1 , v112 .byte W48 .byte N12 @@ -480,7 +480,7 @@ bgm_battle34_3_002: .byte N24 , Bn0 .byte W24 .byte PATT - .word bgm_battle34_3_002 + .word mus_vs_kyogre_groudon_3_002 .byte N12 , Cn1 , v112 .byte W48 .byte N12 @@ -488,20 +488,20 @@ bgm_battle34_3_002: .byte N24 , Cs1 .byte W24 .byte PATT - .word bgm_battle34_3_002 + .word mus_vs_kyogre_groudon_3_002 .byte N12 , Cs1 , v112 .byte W48 .byte N12 .byte W48 .byte PATT - .word bgm_battle34_3_002 + .word mus_vs_kyogre_groudon_3_002 .byte N12 , Cs1 , v112 .byte W48 .byte N12 .byte W24 .byte N24 , Bn0 .byte W24 -bgm_battle34_3_003: +mus_vs_kyogre_groudon_3_003: .byte N12 , Cn1 , v112 .byte W12 .byte Gn1 @@ -519,7 +519,7 @@ bgm_battle34_3_003: .byte Gn1 .byte W12 .byte PEND -bgm_battle34_3_004: +mus_vs_kyogre_groudon_3_004: .byte N12 , Cs1 , v112 .byte W12 .byte Gs1 @@ -538,10 +538,10 @@ bgm_battle34_3_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle34_3_003 + .word mus_vs_kyogre_groudon_3_003 .byte PATT - .word bgm_battle34_3_004 -bgm_battle34_3_005: + .word mus_vs_kyogre_groudon_3_004 +mus_vs_kyogre_groudon_3_005: .byte N12 , Ds1 , v112 .byte W12 .byte As1 @@ -559,7 +559,7 @@ bgm_battle34_3_005: .byte As1 .byte W12 .byte PEND -bgm_battle34_3_006: +mus_vs_kyogre_groudon_3_006: .byte N12 , En1 , v112 .byte W12 .byte Bn1 @@ -578,19 +578,19 @@ bgm_battle34_3_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle34_3_005 + .word mus_vs_kyogre_groudon_3_005 .byte PATT - .word bgm_battle34_3_006 + .word mus_vs_kyogre_groudon_3_006 .byte PATT - .word bgm_battle34_3_002 -bgm_battle34_3_007: + .word mus_vs_kyogre_groudon_3_002 +mus_vs_kyogre_groudon_3_007: .byte N12 , Cn1 , v112 .byte W48 .byte N48 , Bn0 .byte W48 .byte PEND .byte PATT - .word bgm_battle34_3_002 + .word mus_vs_kyogre_groudon_3_002 .byte N12 , Cn1 , v112 .byte W48 .byte N36 , Gs1 @@ -600,11 +600,11 @@ bgm_battle34_3_007: .byte Fn1 .byte W06 .byte PATT - .word bgm_battle34_3_002 + .word mus_vs_kyogre_groudon_3_002 .byte PATT - .word bgm_battle34_3_007 + .word mus_vs_kyogre_groudon_3_007 .byte PATT - .word bgm_battle34_3_002 + .word mus_vs_kyogre_groudon_3_002 .byte N12 , Cn1 , v112 .byte W48 .byte Gn0 @@ -616,17 +616,17 @@ bgm_battle34_3_007: .byte Fn0 .byte W12 .byte GOTO - .word bgm_battle34_3_B1 + .word mus_vs_kyogre_groudon_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle34_4: - .byte KEYSH , bgm_battle34_key+0 +mus_vs_kyogre_groudon_4: + .byte KEYSH , mus_vs_kyogre_groudon_key+0 .byte VOICE , 127 .byte LFOS , 18 .byte PAN , c_v+4 - .byte VOL , 80*bgm_battle34_mvl/mxv + .byte VOL , 80*mus_vs_kyogre_groudon_mvl/mxv .byte N96 , An2 , v096 .byte W96 .byte N96 @@ -639,7 +639,7 @@ bgm_battle34_4: .byte W96 .byte W96 .byte W96 -bgm_battle34_4_B1: +mus_vs_kyogre_groudon_4_B1: .byte VOICE , 80 .byte PAN , c_v-48 .byte XCMD , xIECV , 10 @@ -650,14 +650,14 @@ bgm_battle34_4_B1: .byte W24 .byte N12 , Gs3 .byte W24 -bgm_battle34_4_000: +mus_vs_kyogre_groudon_4_000: .byte W24 .byte N72 , Dn3 , v052 .byte W24 .byte MOD , 7 .byte W48 .byte PEND -bgm_battle34_4_001: +mus_vs_kyogre_groudon_4_001: .byte MOD , 0 .byte N12 , Gn3 , v052 .byte W48 @@ -672,17 +672,17 @@ bgm_battle34_4_001: .byte MOD , 7 .byte W48 .byte PATT - .word bgm_battle34_4_001 + .word mus_vs_kyogre_groudon_4_001 .byte PATT - .word bgm_battle34_4_000 + .word mus_vs_kyogre_groudon_4_000 .byte PATT - .word bgm_battle34_4_001 + .word mus_vs_kyogre_groudon_4_001 .byte W24 .byte N72 , Bn3 , v052 .byte W24 .byte MOD , 7 .byte W48 -bgm_battle34_4_002: +mus_vs_kyogre_groudon_4_002: .byte MOD , 0 .byte N12 , Cn4 , v052 .byte W48 @@ -697,7 +697,7 @@ bgm_battle34_4_002: .byte MOD , 7 .byte W48 .byte PATT - .word bgm_battle34_4_002 + .word mus_vs_kyogre_groudon_4_002 .byte W24 .byte N72 , Ds4 , v052 .byte W24 @@ -743,15 +743,15 @@ bgm_battle34_4_002: .byte W96 .byte W96 .byte GOTO - .word bgm_battle34_4_B1 + .word mus_vs_kyogre_groudon_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle34_5: - .byte KEYSH , bgm_battle34_key+0 +mus_vs_kyogre_groudon_5: + .byte KEYSH , mus_vs_kyogre_groudon_key+0 .byte LFOS , 18 - .byte VOL , 80*bgm_battle34_mvl/mxv + .byte VOL , 80*mus_vs_kyogre_groudon_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -760,7 +760,7 @@ bgm_battle34_5: .byte W96 .byte W96 .byte W96 -bgm_battle34_5_B1: +mus_vs_kyogre_groudon_5_B1: .byte VOICE , 82 .byte XCMD , xIECV , 10 .byte xIECL , 8 @@ -771,7 +771,7 @@ bgm_battle34_5_B1: .byte W24 .byte N12 , Cs3 .byte W24 -bgm_battle34_5_000: +mus_vs_kyogre_groudon_5_000: .byte W24 .byte N12 , Gn2 , v052 .byte W12 @@ -788,7 +788,7 @@ bgm_battle34_5_000: .byte N12 .byte W12 .byte PEND -bgm_battle34_5_001: +mus_vs_kyogre_groudon_5_001: .byte VOICE , 82 .byte MOD , 0 .byte N12 , Cn3 , v052 @@ -814,11 +814,11 @@ bgm_battle34_5_001: .byte N12 .byte W12 .byte PATT - .word bgm_battle34_5_001 + .word mus_vs_kyogre_groudon_5_001 .byte PATT - .word bgm_battle34_5_000 + .word mus_vs_kyogre_groudon_5_000 .byte PATT - .word bgm_battle34_5_001 + .word mus_vs_kyogre_groudon_5_001 .byte W24 .byte N12 , En3 , v052 .byte W12 @@ -834,7 +834,7 @@ bgm_battle34_5_001: .byte W12 .byte N12 .byte W12 -bgm_battle34_5_002: +mus_vs_kyogre_groudon_5_002: .byte VOICE , 82 .byte MOD , 0 .byte N12 , Fn3 , v052 @@ -860,7 +860,7 @@ bgm_battle34_5_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle34_5_002 + .word mus_vs_kyogre_groudon_5_002 .byte W24 .byte N12 , Gs3 , v052 .byte W12 @@ -919,16 +919,16 @@ bgm_battle34_5_002: .byte W96 .byte W96 .byte GOTO - .word bgm_battle34_5_B1 + .word mus_vs_kyogre_groudon_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle34_6: - .byte KEYSH , bgm_battle34_key+0 +mus_vs_kyogre_groudon_6: + .byte KEYSH , mus_vs_kyogre_groudon_key+0 .byte VOICE , 47 .byte PAN , c_v-4 - .byte VOL , 80*bgm_battle34_mvl/mxv + .byte VOL , 80*mus_vs_kyogre_groudon_mvl/mxv .byte N96 , Gn1 , v112 .byte W96 .byte N96 @@ -937,7 +937,7 @@ bgm_battle34_6: .byte W96 .byte Cn1 .byte W96 -bgm_battle34_6_000: +mus_vs_kyogre_groudon_6_000: .byte PAN , c_v+32 .byte W12 .byte N36 , Cn2 , v096 @@ -947,7 +947,7 @@ bgm_battle34_6_000: .byte N24 .byte W12 .byte PEND -bgm_battle34_6_001: +mus_vs_kyogre_groudon_6_001: .byte W12 .byte N12 , Cn2 , v096 .byte W12 @@ -958,7 +958,7 @@ bgm_battle34_6_001: .byte N48 .byte W24 .byte PEND -bgm_battle34_6_002: +mus_vs_kyogre_groudon_6_002: .byte W24 .byte N24 , Cn2 , v096 .byte W24 @@ -967,7 +967,7 @@ bgm_battle34_6_002: .byte N24 .byte W12 .byte PEND -bgm_battle34_6_003: +mus_vs_kyogre_groudon_6_003: .byte W12 .byte N36 , Cn2 , v096 .byte W36 @@ -976,8 +976,8 @@ bgm_battle34_6_003: .byte N12 .byte W12 .byte PEND -bgm_battle34_6_B1: -bgm_battle34_6_004: +mus_vs_kyogre_groudon_6_B1: +mus_vs_kyogre_groudon_6_004: .byte PAN , c_v-16 .byte N12 , Gn1 , v112 .byte W12 @@ -1003,7 +1003,7 @@ bgm_battle34_6_004: .byte N12 , Cn2 .byte W12 .byte PEND -bgm_battle34_6_005: +mus_vs_kyogre_groudon_6_005: .byte PAN , c_v-16 .byte N12 , Gn1 , v112 .byte W12 @@ -1029,7 +1029,7 @@ bgm_battle34_6_005: .byte N12 , Gn1 .byte W12 .byte PEND -bgm_battle34_6_006: +mus_vs_kyogre_groudon_6_006: .byte PAN , c_v-16 .byte N12 , Gn1 , v112 .byte W12 @@ -1056,40 +1056,40 @@ bgm_battle34_6_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle34_6_004 + .word mus_vs_kyogre_groudon_6_004 .byte PATT - .word bgm_battle34_6_004 + .word mus_vs_kyogre_groudon_6_004 .byte PATT - .word bgm_battle34_6_005 + .word mus_vs_kyogre_groudon_6_005 .byte PATT - .word bgm_battle34_6_006 + .word mus_vs_kyogre_groudon_6_006 .byte PATT - .word bgm_battle34_6_004 + .word mus_vs_kyogre_groudon_6_004 .byte PATT - .word bgm_battle34_6_004 + .word mus_vs_kyogre_groudon_6_004 .byte PATT - .word bgm_battle34_6_005 + .word mus_vs_kyogre_groudon_6_005 .byte PATT - .word bgm_battle34_6_006 + .word mus_vs_kyogre_groudon_6_006 .byte PATT - .word bgm_battle34_6_004 + .word mus_vs_kyogre_groudon_6_004 .byte PATT - .word bgm_battle34_6_004 + .word mus_vs_kyogre_groudon_6_004 .byte PATT - .word bgm_battle34_6_005 + .word mus_vs_kyogre_groudon_6_005 .byte PATT - .word bgm_battle34_6_006 + .word mus_vs_kyogre_groudon_6_006 .byte PATT - .word bgm_battle34_6_004 + .word mus_vs_kyogre_groudon_6_004 .byte PATT - .word bgm_battle34_6_004 + .word mus_vs_kyogre_groudon_6_004 .byte PATT - .word bgm_battle34_6_005 + .word mus_vs_kyogre_groudon_6_005 .byte PATT - .word bgm_battle34_6_006 + .word mus_vs_kyogre_groudon_6_006 .byte PATT - .word bgm_battle34_6_004 -bgm_battle34_6_007: + .word mus_vs_kyogre_groudon_6_004 +mus_vs_kyogre_groudon_6_007: .byte PAN , c_v-16 .byte N12 , As1 , v112 .byte W12 @@ -1164,14 +1164,14 @@ bgm_battle34_6_007: .byte N12 , Ds2 .byte W12 .byte PATT - .word bgm_battle34_6_007 + .word mus_vs_kyogre_groudon_6_007 .byte PATT - .word bgm_battle34_6_000 + .word mus_vs_kyogre_groudon_6_000 .byte PATT - .word bgm_battle34_6_001 + .word mus_vs_kyogre_groudon_6_001 .byte PATT - .word bgm_battle34_6_002 -bgm_battle34_6_008: + .word mus_vs_kyogre_groudon_6_002 +mus_vs_kyogre_groudon_6_008: .byte W12 .byte N36 , Cn2 , v096 .byte W36 @@ -1181,33 +1181,33 @@ bgm_battle34_6_008: .byte W12 .byte PEND .byte PATT - .word bgm_battle34_6_008 + .word mus_vs_kyogre_groudon_6_008 .byte PATT - .word bgm_battle34_6_001 + .word mus_vs_kyogre_groudon_6_001 .byte PATT - .word bgm_battle34_6_002 + .word mus_vs_kyogre_groudon_6_002 .byte PATT - .word bgm_battle34_6_003 + .word mus_vs_kyogre_groudon_6_003 .byte GOTO - .word bgm_battle34_6_B1 + .word mus_vs_kyogre_groudon_6_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle34: +mus_vs_kyogre_groudon: .byte 6 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle34_pri @ Priority - .byte bgm_battle34_rev @ Reverb. + .byte mus_vs_kyogre_groudon_pri @ Priority + .byte mus_vs_kyogre_groudon_rev @ Reverb. - .word bgm_battle34_grp + .word mus_vs_kyogre_groudon_grp - .word bgm_battle34_1 - .word bgm_battle34_2 - .word bgm_battle34_3 - .word bgm_battle34_4 - .word bgm_battle34_5 - .word bgm_battle34_6 + .word mus_vs_kyogre_groudon_1 + .word mus_vs_kyogre_groudon_2 + .word mus_vs_kyogre_groudon_3 + .word mus_vs_kyogre_groudon_4 + .word mus_vs_kyogre_groudon_5 + .word mus_vs_kyogre_groudon_6 .end diff --git a/sound/songs/bgm_battle36.s b/sound/songs/mus_vs_regi.s index 75080c72d..23686bfc2 100644 --- a/sound/songs/bgm_battle36.s +++ b/sound/songs/mus_vs_regi.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_battle36_grp, voicegroup105 - .equ bgm_battle36_pri, 1 - .equ bgm_battle36_rev, reverb_set+50 - .equ bgm_battle36_mvl, 127 - .equ bgm_battle36_key, 0 - .equ bgm_battle36_tbs, 1 - .equ bgm_battle36_exg, 0 - .equ bgm_battle36_cmp, 1 + .equ mus_vs_regi_grp, voicegroup105 + .equ mus_vs_regi_pri, 1 + .equ mus_vs_regi_rev, reverb_set+50 + .equ mus_vs_regi_mvl, 127 + .equ mus_vs_regi_key, 0 + .equ mus_vs_regi_tbs, 1 + .equ mus_vs_regi_exg, 0 + .equ mus_vs_regi_cmp, 1 .section .rodata - .global bgm_battle36 + .global mus_vs_regi .align 2 @********************** Track 1 **********************@ -bgm_battle36_1: - .byte KEYSH , bgm_battle36_key+0 - .byte TEMPO , 160*bgm_battle36_tbs/2 +mus_vs_regi_1: + .byte KEYSH , mus_vs_regi_key+0 + .byte TEMPO , 160*mus_vs_regi_tbs/2 .byte VOICE , 48 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte PAN , c_v+0 .byte N08 , Cs4 , v112 .byte W08 @@ -166,7 +166,7 @@ bgm_battle36_1: .byte W08 .byte N96 , Bn3 .byte W96 -bgm_battle36_1_000: +mus_vs_regi_1_000: .byte N64 , An3 , v100 .byte W64 .byte N08 , Gs3 @@ -180,7 +180,7 @@ bgm_battle36_1_000: .byte W96 .byte Cs3 .byte W96 -bgm_battle36_1_B1: +mus_vs_regi_1_B1: .byte PAN , c_v-10 .byte TIE , Dn3 , v100 .byte W96 @@ -204,69 +204,69 @@ bgm_battle36_1_B1: .byte W96 .byte Dn4 .byte W96 -bgm_battle36_1_001: - .byte VOL , 54*bgm_battle36_mvl/mxv +mus_vs_regi_1_001: + .byte VOL , 54*mus_vs_regi_mvl/mxv .byte N96 , As2 , v100 .byte W08 - .byte VOL , 57*bgm_battle36_mvl/mxv + .byte VOL , 57*mus_vs_regi_mvl/mxv .byte W08 - .byte 59*bgm_battle36_mvl/mxv + .byte 59*mus_vs_regi_mvl/mxv .byte W08 - .byte 62*bgm_battle36_mvl/mxv + .byte 62*mus_vs_regi_mvl/mxv .byte W08 - .byte 65*bgm_battle36_mvl/mxv + .byte 65*mus_vs_regi_mvl/mxv .byte W08 - .byte 68*bgm_battle36_mvl/mxv + .byte 68*mus_vs_regi_mvl/mxv .byte W08 - .byte 72*bgm_battle36_mvl/mxv + .byte 72*mus_vs_regi_mvl/mxv .byte W08 - .byte 75*bgm_battle36_mvl/mxv + .byte 75*mus_vs_regi_mvl/mxv .byte W08 - .byte 80*bgm_battle36_mvl/mxv + .byte 80*mus_vs_regi_mvl/mxv .byte W32 .byte PEND - .byte 54*bgm_battle36_mvl/mxv + .byte 54*mus_vs_regi_mvl/mxv .byte N96 , Gn2 .byte W08 - .byte VOL , 57*bgm_battle36_mvl/mxv + .byte VOL , 57*mus_vs_regi_mvl/mxv .byte W08 - .byte 59*bgm_battle36_mvl/mxv + .byte 59*mus_vs_regi_mvl/mxv .byte W08 - .byte 62*bgm_battle36_mvl/mxv + .byte 62*mus_vs_regi_mvl/mxv .byte W08 - .byte 65*bgm_battle36_mvl/mxv + .byte 65*mus_vs_regi_mvl/mxv .byte W08 - .byte 68*bgm_battle36_mvl/mxv + .byte 68*mus_vs_regi_mvl/mxv .byte W08 - .byte 72*bgm_battle36_mvl/mxv + .byte 72*mus_vs_regi_mvl/mxv .byte W08 - .byte 75*bgm_battle36_mvl/mxv + .byte 75*mus_vs_regi_mvl/mxv .byte W08 - .byte 80*bgm_battle36_mvl/mxv + .byte 80*mus_vs_regi_mvl/mxv .byte W32 .byte N12 , Fs2 , v108 .byte W96 .byte W96 .byte PATT - .word bgm_battle36_1_001 - .byte VOL , 54*bgm_battle36_mvl/mxv + .word mus_vs_regi_1_001 + .byte VOL , 54*mus_vs_regi_mvl/mxv .byte N96 , Ds3 , v100 .byte W08 - .byte VOL , 57*bgm_battle36_mvl/mxv + .byte VOL , 57*mus_vs_regi_mvl/mxv .byte W08 - .byte 59*bgm_battle36_mvl/mxv + .byte 59*mus_vs_regi_mvl/mxv .byte W08 - .byte 62*bgm_battle36_mvl/mxv + .byte 62*mus_vs_regi_mvl/mxv .byte W08 - .byte 65*bgm_battle36_mvl/mxv + .byte 65*mus_vs_regi_mvl/mxv .byte W08 - .byte 68*bgm_battle36_mvl/mxv + .byte 68*mus_vs_regi_mvl/mxv .byte W08 - .byte 72*bgm_battle36_mvl/mxv + .byte 72*mus_vs_regi_mvl/mxv .byte W08 - .byte 75*bgm_battle36_mvl/mxv + .byte 75*mus_vs_regi_mvl/mxv .byte W08 - .byte 80*bgm_battle36_mvl/mxv + .byte 80*mus_vs_regi_mvl/mxv .byte W32 .byte N12 , Dn3 , v108 .byte W96 @@ -282,21 +282,21 @@ bgm_battle36_1_001: .byte N96 , Bn3 .byte W96 .byte PATT - .word bgm_battle36_1_000 + .word mus_vs_regi_1_000 .byte N96 , Gs3 , v100 .byte W96 .byte Cs3 .byte W96 .byte GOTO - .word bgm_battle36_1_B1 + .word mus_vs_regi_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle36_2: - .byte KEYSH , bgm_battle36_key+0 +mus_vs_regi_2: + .byte KEYSH , mus_vs_regi_key+0 .byte VOICE , 56 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte PAN , c_v-16 .byte N24 , Gs4 , v076 .byte W48 @@ -389,7 +389,7 @@ bgm_battle36_2: .byte W08 .byte N96 , Bn2 .byte W96 -bgm_battle36_2_000: +mus_vs_regi_2_000: .byte N64 , An2 , v100 .byte W64 .byte N08 , Gs2 @@ -403,7 +403,7 @@ bgm_battle36_2_000: .byte W96 .byte Cs2 .byte W96 -bgm_battle36_2_B1: +mus_vs_regi_2_B1: .byte PAN , c_v+0 .byte TIE , Dn2 , v100 .byte W96 @@ -427,69 +427,69 @@ bgm_battle36_2_B1: .byte W96 .byte Dn3 .byte W96 -bgm_battle36_2_001: - .byte VOL , 54*bgm_battle36_mvl/mxv +mus_vs_regi_2_001: + .byte VOL , 54*mus_vs_regi_mvl/mxv .byte N96 , Ds3 , v100 .byte W08 - .byte VOL , 57*bgm_battle36_mvl/mxv + .byte VOL , 57*mus_vs_regi_mvl/mxv .byte W08 - .byte 59*bgm_battle36_mvl/mxv + .byte 59*mus_vs_regi_mvl/mxv .byte W08 - .byte 62*bgm_battle36_mvl/mxv + .byte 62*mus_vs_regi_mvl/mxv .byte W08 - .byte 65*bgm_battle36_mvl/mxv + .byte 65*mus_vs_regi_mvl/mxv .byte W08 - .byte 68*bgm_battle36_mvl/mxv + .byte 68*mus_vs_regi_mvl/mxv .byte W08 - .byte 72*bgm_battle36_mvl/mxv + .byte 72*mus_vs_regi_mvl/mxv .byte W08 - .byte 75*bgm_battle36_mvl/mxv + .byte 75*mus_vs_regi_mvl/mxv .byte W08 - .byte 80*bgm_battle36_mvl/mxv + .byte 80*mus_vs_regi_mvl/mxv .byte W32 .byte PEND - .byte 54*bgm_battle36_mvl/mxv + .byte 54*mus_vs_regi_mvl/mxv .byte N96 , Cn3 .byte W08 - .byte VOL , 57*bgm_battle36_mvl/mxv + .byte VOL , 57*mus_vs_regi_mvl/mxv .byte W08 - .byte 59*bgm_battle36_mvl/mxv + .byte 59*mus_vs_regi_mvl/mxv .byte W08 - .byte 62*bgm_battle36_mvl/mxv + .byte 62*mus_vs_regi_mvl/mxv .byte W08 - .byte 65*bgm_battle36_mvl/mxv + .byte 65*mus_vs_regi_mvl/mxv .byte W08 - .byte 68*bgm_battle36_mvl/mxv + .byte 68*mus_vs_regi_mvl/mxv .byte W08 - .byte 72*bgm_battle36_mvl/mxv + .byte 72*mus_vs_regi_mvl/mxv .byte W08 - .byte 75*bgm_battle36_mvl/mxv + .byte 75*mus_vs_regi_mvl/mxv .byte W08 - .byte 80*bgm_battle36_mvl/mxv + .byte 80*mus_vs_regi_mvl/mxv .byte W32 .byte N12 , Dn3 , v108 .byte W96 .byte W96 .byte PATT - .word bgm_battle36_2_001 - .byte VOL , 54*bgm_battle36_mvl/mxv + .word mus_vs_regi_2_001 + .byte VOL , 54*mus_vs_regi_mvl/mxv .byte N96 , Gn3 , v100 .byte W08 - .byte VOL , 57*bgm_battle36_mvl/mxv + .byte VOL , 57*mus_vs_regi_mvl/mxv .byte W08 - .byte 59*bgm_battle36_mvl/mxv + .byte 59*mus_vs_regi_mvl/mxv .byte W08 - .byte 62*bgm_battle36_mvl/mxv + .byte 62*mus_vs_regi_mvl/mxv .byte W08 - .byte 65*bgm_battle36_mvl/mxv + .byte 65*mus_vs_regi_mvl/mxv .byte W08 - .byte 68*bgm_battle36_mvl/mxv + .byte 68*mus_vs_regi_mvl/mxv .byte W08 - .byte 72*bgm_battle36_mvl/mxv + .byte 72*mus_vs_regi_mvl/mxv .byte W08 - .byte 75*bgm_battle36_mvl/mxv + .byte 75*mus_vs_regi_mvl/mxv .byte W08 - .byte 80*bgm_battle36_mvl/mxv + .byte 80*mus_vs_regi_mvl/mxv .byte W32 .byte N12 , Fs3 , v108 .byte W96 @@ -505,21 +505,21 @@ bgm_battle36_2_001: .byte N96 , Bn2 .byte W96 .byte PATT - .word bgm_battle36_2_000 + .word mus_vs_regi_2_000 .byte N96 , Gs2 , v100 .byte W96 .byte Cs2 .byte W96 .byte GOTO - .word bgm_battle36_2_B1 + .word mus_vs_regi_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle36_3: - .byte KEYSH , bgm_battle36_key+0 +mus_vs_regi_3: + .byte KEYSH , mus_vs_regi_key+0 .byte VOICE , 36 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte N08 , Cs0 , v116 .byte W16 .byte N08 @@ -562,7 +562,7 @@ bgm_battle36_3: .byte W08 .byte Cn1 .byte W08 -bgm_battle36_3_000: +mus_vs_regi_3_000: .byte N08 , Cs1 , v116 .byte W16 .byte N08 @@ -584,7 +584,7 @@ bgm_battle36_3_000: .byte Gs1 .byte W08 .byte PEND -bgm_battle36_3_001: +mus_vs_regi_3_001: .byte N08 , Cs1 , v116 .byte W16 .byte N08 @@ -609,14 +609,14 @@ bgm_battle36_3_001: .byte W08 .byte PEND .byte PATT - .word bgm_battle36_3_000 + .word mus_vs_regi_3_000 .byte PATT - .word bgm_battle36_3_001 + .word mus_vs_regi_3_001 .byte PATT - .word bgm_battle36_3_000 + .word mus_vs_regi_3_000 .byte PATT - .word bgm_battle36_3_001 -bgm_battle36_3_002: + .word mus_vs_regi_3_001 +mus_vs_regi_3_002: .byte N08 , Dn1 , v116 .byte W16 .byte N08 @@ -638,7 +638,7 @@ bgm_battle36_3_002: .byte An1 .byte W08 .byte PEND -bgm_battle36_3_003: +mus_vs_regi_3_003: .byte N08 , Dn1 , v116 .byte W16 .byte N08 @@ -663,11 +663,11 @@ bgm_battle36_3_003: .byte W08 .byte PEND .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte PATT - .word bgm_battle36_3_003 + .word mus_vs_regi_3_003 .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte N08 , Dn1 , v116 .byte W16 .byte N08 @@ -691,68 +691,68 @@ bgm_battle36_3_003: .byte Cs2 .byte W08 .byte PATT - .word bgm_battle36_3_000 + .word mus_vs_regi_3_000 .byte PATT - .word bgm_battle36_3_001 + .word mus_vs_regi_3_001 .byte PATT - .word bgm_battle36_3_000 + .word mus_vs_regi_3_000 .byte PATT - .word bgm_battle36_3_001 + .word mus_vs_regi_3_001 .byte PATT - .word bgm_battle36_3_000 + .word mus_vs_regi_3_000 .byte PATT - .word bgm_battle36_3_001 -bgm_battle36_3_B1: + .word mus_vs_regi_3_001 +mus_vs_regi_3_B1: .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte PATT - .word bgm_battle36_3_003 + .word mus_vs_regi_3_003 .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte PATT - .word bgm_battle36_3_003 + .word mus_vs_regi_3_003 .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte PATT - .word bgm_battle36_3_003 + .word mus_vs_regi_3_003 .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte PATT - .word bgm_battle36_3_003 + .word mus_vs_regi_3_003 .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte PATT - .word bgm_battle36_3_003 + .word mus_vs_regi_3_003 .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte PATT - .word bgm_battle36_3_003 + .word mus_vs_regi_3_003 .byte PATT - .word bgm_battle36_3_002 + .word mus_vs_regi_3_002 .byte PATT - .word bgm_battle36_3_003 + .word mus_vs_regi_3_003 .byte PATT - .word bgm_battle36_3_000 + .word mus_vs_regi_3_000 .byte PATT - .word bgm_battle36_3_001 + .word mus_vs_regi_3_001 .byte PATT - .word bgm_battle36_3_000 + .word mus_vs_regi_3_000 .byte PATT - .word bgm_battle36_3_001 + .word mus_vs_regi_3_001 .byte PATT - .word bgm_battle36_3_000 + .word mus_vs_regi_3_000 .byte PATT - .word bgm_battle36_3_001 + .word mus_vs_regi_3_001 .byte GOTO - .word bgm_battle36_3_B1 + .word mus_vs_regi_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle36_4: - .byte KEYSH , bgm_battle36_key+0 +mus_vs_regi_4: + .byte KEYSH , mus_vs_regi_key+0 .byte VOICE , 6 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte PAN , c_v+0 .byte XCMD , xIECV , 10 .byte xIECL , 8 @@ -772,7 +772,7 @@ bgm_battle36_4: .byte W08 .byte Gs3 .byte W08 -bgm_battle36_4_000: +mus_vs_regi_4_000: .byte N08 , Cs4 , v060 .byte W16 .byte N08 @@ -791,8 +791,8 @@ bgm_battle36_4_000: .byte W08 .byte PEND .byte PATT - .word bgm_battle36_4_000 -bgm_battle36_4_001: + .word mus_vs_regi_4_000 +mus_vs_regi_4_001: .byte N08 , Cs4 , v060 .byte W16 .byte N08 @@ -811,14 +811,14 @@ bgm_battle36_4_001: .byte W08 .byte PEND .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 -bgm_battle36_4_002: + .word mus_vs_regi_4_001 +mus_vs_regi_4_002: .byte N08 , Dn4 , v060 .byte W16 .byte N08 @@ -837,52 +837,52 @@ bgm_battle36_4_002: .byte W08 .byte PEND .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 -bgm_battle36_4_B1: + .word mus_vs_regi_4_001 +mus_vs_regi_4_B1: .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte PATT - .word bgm_battle36_4_002 + .word mus_vs_regi_4_002 .byte VOICE , 5 .byte PAN , c_v+48 .byte N08 , Dn3 , v060 @@ -952,25 +952,25 @@ bgm_battle36_4_B1: .byte Gs4 .byte W08 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte PATT - .word bgm_battle36_4_001 + .word mus_vs_regi_4_001 .byte GOTO - .word bgm_battle36_4_B1 + .word mus_vs_regi_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle36_5: - .byte KEYSH , bgm_battle36_key+0 +mus_vs_regi_5: + .byte KEYSH , mus_vs_regi_key+0 .byte VOICE , 7 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte PAN , c_v+48 .byte XCMD , xIECV , 10 .byte xIECL , 8 @@ -1038,7 +1038,7 @@ bgm_battle36_5: .byte W16 .byte An4 .byte W08 -bgm_battle36_5_000: +mus_vs_regi_5_000: .byte N08 , Gs4 , v032 .byte W08 .byte Cs4 @@ -1057,12 +1057,12 @@ bgm_battle36_5_000: .byte W08 .byte PEND .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 -bgm_battle36_5_001: + .word mus_vs_regi_5_000 +mus_vs_regi_5_001: .byte N08 , Gs4 , v032 .byte W08 .byte Dn4 @@ -1080,7 +1080,7 @@ bgm_battle36_5_001: .byte As4 .byte W08 .byte PEND -bgm_battle36_5_002: +mus_vs_regi_5_002: .byte N08 , An4 , v032 .byte W08 .byte Dn4 @@ -1099,13 +1099,13 @@ bgm_battle36_5_002: .byte W08 .byte PEND .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte N08 , An4 , v032 .byte W08 .byte Cs4 @@ -1123,26 +1123,26 @@ bgm_battle36_5_002: .byte An4 .byte W08 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 -bgm_battle36_5_B1: + .word mus_vs_regi_5_000 +mus_vs_regi_5_B1: .byte PATT - .word bgm_battle36_5_001 + .word mus_vs_regi_5_001 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte N08 , An4 , v032 .byte W08 .byte N12 , Dn4 @@ -1160,43 +1160,43 @@ bgm_battle36_5_B1: .byte As4 .byte W08 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte PATT - .word bgm_battle36_5_002 + .word mus_vs_regi_5_002 .byte VOICE , 82 - .byte VOL , 54*bgm_battle36_mvl/mxv + .byte VOL , 54*mus_vs_regi_mvl/mxv .byte N12 , As2 , v072 .byte W08 - .byte VOL , 57*bgm_battle36_mvl/mxv + .byte VOL , 57*mus_vs_regi_mvl/mxv .byte W04 .byte VOICE , 83 .byte N12 .byte W04 - .byte VOL , 59*bgm_battle36_mvl/mxv + .byte VOL , 59*mus_vs_regi_mvl/mxv .byte W08 - .byte 62*bgm_battle36_mvl/mxv + .byte 62*mus_vs_regi_mvl/mxv .byte N12 .byte W08 - .byte VOL , 65*bgm_battle36_mvl/mxv + .byte VOL , 65*mus_vs_regi_mvl/mxv .byte W04 .byte N12 .byte W04 - .byte VOL , 68*bgm_battle36_mvl/mxv + .byte VOL , 68*mus_vs_regi_mvl/mxv .byte W08 - .byte 72*bgm_battle36_mvl/mxv + .byte 72*mus_vs_regi_mvl/mxv .byte N12 .byte W08 - .byte VOL , 75*bgm_battle36_mvl/mxv + .byte VOL , 75*mus_vs_regi_mvl/mxv .byte W04 .byte N12 .byte W04 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte W08 .byte N12 .byte W12 @@ -1270,25 +1270,25 @@ bgm_battle36_5_B1: .byte An4 .byte W08 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte PATT - .word bgm_battle36_5_000 + .word mus_vs_regi_5_000 .byte GOTO - .word bgm_battle36_5_B1 + .word mus_vs_regi_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle36_6: - .byte KEYSH , bgm_battle36_key+0 +mus_vs_regi_6: + .byte KEYSH , mus_vs_regi_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-1 .byte N06 , Gs4 , v048 @@ -1368,7 +1368,7 @@ bgm_battle36_6: .byte W96 .byte W96 .byte W96 -bgm_battle36_6_B1: +mus_vs_regi_6_B1: .byte W96 .byte W96 .byte W96 @@ -1390,16 +1390,16 @@ bgm_battle36_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_battle36_6_B1 + .word mus_vs_regi_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle36_7: - .byte KEYSH , bgm_battle36_key+0 +mus_vs_regi_7: + .byte KEYSH , mus_vs_regi_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte N24 , Cn2 , v120 .byte W24 .byte N24 @@ -1408,7 +1408,7 @@ bgm_battle36_7: .byte W24 .byte Bn1 .byte W24 -bgm_battle36_7_000: +mus_vs_regi_7_000: .byte N24 , Cn2 , v120 .byte W24 .byte N24 @@ -1419,7 +1419,7 @@ bgm_battle36_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle36_7_000 + .word mus_vs_regi_7_000 .byte N24 , Cn2 , v120 .byte W24 .byte N24 @@ -1446,8 +1446,8 @@ bgm_battle36_7_000: .byte W16 .byte N08 .byte W08 -bgm_battle36_7_B1: -bgm_battle36_7_001: +mus_vs_regi_7_B1: +mus_vs_regi_7_001: .byte W24 .byte N24 , Dn1 , v112 .byte W48 @@ -1455,10 +1455,10 @@ bgm_battle36_7_001: .byte W24 .byte PEND .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 -bgm_battle36_7_002: + .word mus_vs_regi_7_001 +mus_vs_regi_7_002: .byte W24 .byte N24 , Dn1 , v112 .byte W48 @@ -1468,15 +1468,15 @@ bgm_battle36_7_002: .byte W08 .byte PEND .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte W24 .byte N24 , Dn1 , v112 .byte W40 @@ -1485,41 +1485,41 @@ bgm_battle36_7_002: .byte N16 .byte W16 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte W96 .byte W72 .byte N24 , Dn1 , v112 .byte W24 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_002 + .word mus_vs_regi_7_002 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte PATT - .word bgm_battle36_7_001 + .word mus_vs_regi_7_001 .byte GOTO - .word bgm_battle36_7_B1 + .word mus_vs_regi_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle36_8: - .byte KEYSH , bgm_battle36_key+0 +mus_vs_regi_8: + .byte KEYSH , mus_vs_regi_key+0 .byte VOICE , 47 .byte PAN , c_v+10 - .byte VOL , 80*bgm_battle36_mvl/mxv + .byte VOL , 80*mus_vs_regi_mvl/mxv .byte W96 .byte W96 .byte W96 .byte W96 -bgm_battle36_8_000: +mus_vs_regi_8_000: .byte N24 , Cn2 , v112 .byte W24 .byte N24 @@ -1529,7 +1529,7 @@ bgm_battle36_8_000: .byte Bn1 .byte W24 .byte PEND -bgm_battle36_8_001: +mus_vs_regi_8_001: .byte N24 , Cn2 , v112 .byte W24 .byte N24 @@ -1540,23 +1540,23 @@ bgm_battle36_8_001: .byte W24 .byte PEND .byte PATT - .word bgm_battle36_8_000 + .word mus_vs_regi_8_000 .byte PATT - .word bgm_battle36_8_001 -bgm_battle36_8_002: + .word mus_vs_regi_8_001 +mus_vs_regi_8_002: .byte N48 , Cn2 , v112 .byte W48 .byte N48 .byte W48 .byte PEND .byte PATT - .word bgm_battle36_8_002 + .word mus_vs_regi_8_002 .byte PATT - .word bgm_battle36_8_002 + .word mus_vs_regi_8_002 .byte PATT - .word bgm_battle36_8_002 + .word mus_vs_regi_8_002 .byte PATT - .word bgm_battle36_8_002 + .word mus_vs_regi_8_002 .byte N48 , Cn2 , v112 .byte W48 .byte N24 @@ -1566,92 +1566,92 @@ bgm_battle36_8_002: .byte As1 .byte W08 .byte PATT - .word bgm_battle36_8_000 + .word mus_vs_regi_8_000 .byte PATT - .word bgm_battle36_8_000 + .word mus_vs_regi_8_000 .byte PATT - .word bgm_battle36_8_000 + .word mus_vs_regi_8_000 .byte PATT - .word bgm_battle36_8_000 + .word mus_vs_regi_8_000 .byte PATT - .word bgm_battle36_8_000 + .word mus_vs_regi_8_000 .byte N24 , Cn2 , v112 .byte W24 .byte N24 .byte W24 .byte N24 .byte W48 -bgm_battle36_8_B1: -bgm_battle36_8_003: +mus_vs_regi_8_B1: +mus_vs_regi_8_003: .byte N24 , Cn2 , v112 .byte W48 .byte N24 .byte W48 .byte PEND .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte N24 , Cn2 , v112 .byte W48 .byte N16 .byte W48 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_002 + .word mus_vs_regi_8_002 .byte N48 , Cn2 , v112 .byte W48 .byte N24 .byte W48 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte PATT - .word bgm_battle36_8_003 + .word mus_vs_regi_8_003 .byte GOTO - .word bgm_battle36_8_B1 + .word mus_vs_regi_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle36: +mus_vs_regi: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle36_pri @ Priority - .byte bgm_battle36_rev @ Reverb. + .byte mus_vs_regi_pri @ Priority + .byte mus_vs_regi_rev @ Reverb. - .word bgm_battle36_grp + .word mus_vs_regi_grp - .word bgm_battle36_1 - .word bgm_battle36_2 - .word bgm_battle36_3 - .word bgm_battle36_4 - .word bgm_battle36_5 - .word bgm_battle36_6 - .word bgm_battle36_7 - .word bgm_battle36_8 + .word mus_vs_regi_1 + .word mus_vs_regi_2 + .word mus_vs_regi_3 + .word mus_vs_regi_4 + .word mus_vs_regi_5 + .word mus_vs_regi_6 + .word mus_vs_regi_7 + .word mus_vs_regi_8 .end diff --git a/sound/songs/bgm_battle35.s b/sound/songs/mus_vs_rival.s index 178d04844..3bb6cb74e 100644 --- a/sound/songs/bgm_battle35.s +++ b/sound/songs/mus_vs_rival.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_battle35_grp, voicegroup107 - .equ bgm_battle35_pri, 1 - .equ bgm_battle35_rev, reverb_set+50 - .equ bgm_battle35_mvl, 127 - .equ bgm_battle35_key, 0 - .equ bgm_battle35_tbs, 1 - .equ bgm_battle35_exg, 0 - .equ bgm_battle35_cmp, 1 + .equ mus_vs_rival_grp, voicegroup107 + .equ mus_vs_rival_pri, 1 + .equ mus_vs_rival_rev, reverb_set+50 + .equ mus_vs_rival_mvl, 127 + .equ mus_vs_rival_key, 0 + .equ mus_vs_rival_tbs, 1 + .equ mus_vs_rival_exg, 0 + .equ mus_vs_rival_cmp, 1 .section .rodata - .global bgm_battle35 + .global mus_vs_rival .align 2 @********************** Track 1 **********************@ -bgm_battle35_1: - .byte KEYSH , bgm_battle35_key+0 - .byte TEMPO , 196*bgm_battle35_tbs/2 +mus_vs_rival_1: + .byte KEYSH , mus_vs_rival_key+0 + .byte TEMPO , 196*mus_vs_rival_tbs/2 .byte VOICE , 56 .byte LFOS , 16 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte PAN , c_v+8 .byte BEND , c_v+0 .byte N06 , Fn4 , v108 @@ -122,7 +122,7 @@ bgm_battle35_1: .byte W36 .byte N24 , Gn4 .byte W24 -bgm_battle35_1_B1: +mus_vs_rival_1_B1: .byte VOICE , 48 .byte N36 , An2 , v096 .byte W36 @@ -210,7 +210,7 @@ bgm_battle35_1_B1: .byte W12 .byte Fn3 .byte W12 -bgm_battle35_1_000: +mus_vs_rival_1_000: .byte N24 , Ds4 , v096 .byte W24 .byte Cn4 @@ -237,7 +237,7 @@ bgm_battle35_1_000: .byte Fn3 .byte W12 .byte PATT - .word bgm_battle35_1_000 + .word mus_vs_rival_1_000 .byte N12 , Cn3 , v096 .byte W12 .byte Dn3 @@ -300,7 +300,7 @@ bgm_battle35_1_000: .byte W24 .byte N12 , Fn3 .byte W12 -bgm_battle35_1_001: +mus_vs_rival_1_001: .byte N12 , Ds3 , v096 .byte W48 .byte N48 , Fs3 @@ -319,7 +319,7 @@ bgm_battle35_1_001: .byte N12 , Fn3 .byte W12 .byte PATT - .word bgm_battle35_1_001 + .word mus_vs_rival_1_001 .byte VOICE , 56 .byte W12 .byte PAN , c_v+32 @@ -410,16 +410,16 @@ bgm_battle35_1_001: .byte Ds2 , v096 .byte W48 .byte GOTO - .word bgm_battle35_1_B1 + .word mus_vs_rival_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle35_2: - .byte KEYSH , bgm_battle35_key+0 +mus_vs_rival_2: + .byte KEYSH , mus_vs_rival_key+0 .byte VOICE , 1 .byte LFOS , 16 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte PAN , c_v-16 .byte N06 , Cn5 , v060 .byte W06 @@ -524,10 +524,10 @@ bgm_battle35_2: .byte W12 .byte MOD , 6 .byte W12 -bgm_battle35_2_B1: +mus_vs_rival_2_B1: .byte VOICE , 48 .byte MOD , 0 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte N36 , Cn4 , v100 .byte W36 .byte Fn3 @@ -554,25 +554,25 @@ bgm_battle35_2_B1: .byte W96 .byte W32 .byte W01 - .byte VOL , 77*bgm_battle35_mvl/mxv + .byte VOL , 77*mus_vs_rival_mvl/mxv .byte W09 - .byte 74*bgm_battle35_mvl/mxv + .byte 74*mus_vs_rival_mvl/mxv .byte W09 - .byte 71*bgm_battle35_mvl/mxv + .byte 71*mus_vs_rival_mvl/mxv .byte W06 - .byte 67*bgm_battle35_mvl/mxv + .byte 67*mus_vs_rival_mvl/mxv .byte W09 - .byte 62*bgm_battle35_mvl/mxv + .byte 62*mus_vs_rival_mvl/mxv .byte W09 - .byte 56*bgm_battle35_mvl/mxv + .byte 56*mus_vs_rival_mvl/mxv .byte W06 - .byte 47*bgm_battle35_mvl/mxv + .byte 47*mus_vs_rival_mvl/mxv .byte W06 - .byte 39*bgm_battle35_mvl/mxv + .byte 39*mus_vs_rival_mvl/mxv .byte W06 .byte EOT .byte W03 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte N36 , Dn4 .byte W36 .byte Fn4 @@ -618,7 +618,7 @@ bgm_battle35_2_B1: .byte PAN , c_v+32 .byte N48 , As3 .byte W48 -bgm_battle35_2_000: +mus_vs_rival_2_000: .byte VOICE , 56 .byte PAN , c_v+0 .byte N24 , Gn4 , v112 @@ -643,7 +643,7 @@ bgm_battle35_2_000: .byte N48 , Cn4 .byte W48 .byte PATT - .word bgm_battle35_2_000 + .word mus_vs_rival_2_000 .byte VOICE , 46 .byte MOD , 0 .byte PAN , c_v+32 @@ -694,7 +694,7 @@ bgm_battle35_2_000: .byte W24 .byte MOD , 6 .byte W24 -bgm_battle35_2_001: +mus_vs_rival_2_001: .byte MOD , 0 .byte N72 , Fn3 , v108 .byte W36 @@ -708,7 +708,7 @@ bgm_battle35_2_001: .byte Fn3 .byte W12 .byte PEND -bgm_battle35_2_002: +mus_vs_rival_2_002: .byte MOD , 0 .byte N48 , Fs3 , v108 .byte W24 @@ -721,9 +721,9 @@ bgm_battle35_2_002: .byte W24 .byte PEND .byte PATT - .word bgm_battle35_2_001 + .word mus_vs_rival_2_001 .byte PATT - .word bgm_battle35_2_002 + .word mus_vs_rival_2_002 .byte MOD , 0 .byte N72 , Fn3 , v108 .byte W36 @@ -754,55 +754,55 @@ bgm_battle35_2_002: .byte W06 .byte 5 .byte W03 - .byte VOL , 76*bgm_battle35_mvl/mxv + .byte VOL , 76*mus_vs_rival_mvl/mxv .byte W15 - .byte 73*bgm_battle35_mvl/mxv + .byte 73*mus_vs_rival_mvl/mxv .byte W15 .byte MOD , 6 - .byte VOL , 69*bgm_battle35_mvl/mxv + .byte VOL , 69*mus_vs_rival_mvl/mxv .byte W12 - .byte 66*bgm_battle35_mvl/mxv + .byte 66*mus_vs_rival_mvl/mxv .byte W09 - .byte 62*bgm_battle35_mvl/mxv + .byte 62*mus_vs_rival_mvl/mxv .byte W03 .byte MOD , 7 .byte W06 - .byte VOL , 57*bgm_battle35_mvl/mxv + .byte VOL , 57*mus_vs_rival_mvl/mxv .byte W09 - .byte 46*bgm_battle35_mvl/mxv + .byte 46*mus_vs_rival_mvl/mxv .byte W06 - .byte 40*bgm_battle35_mvl/mxv + .byte 40*mus_vs_rival_mvl/mxv .byte W06 - .byte 28*bgm_battle35_mvl/mxv + .byte 28*mus_vs_rival_mvl/mxv .byte W03 .byte EOT .byte W03 .byte VOICE , 48 .byte MOD , 0 - .byte VOL , 64*bgm_battle35_mvl/mxv + .byte VOL , 64*mus_vs_rival_mvl/mxv .byte TIE , As4 , v092 .byte W09 - .byte VOL , 62*bgm_battle35_mvl/mxv + .byte VOL , 62*mus_vs_rival_mvl/mxv .byte W12 - .byte 60*bgm_battle35_mvl/mxv + .byte 60*mus_vs_rival_mvl/mxv .byte W12 - .byte 58*bgm_battle35_mvl/mxv + .byte 58*mus_vs_rival_mvl/mxv .byte W12 - .byte 60*bgm_battle35_mvl/mxv + .byte 60*mus_vs_rival_mvl/mxv .byte W09 - .byte 62*bgm_battle35_mvl/mxv + .byte 62*mus_vs_rival_mvl/mxv .byte W09 - .byte 66*bgm_battle35_mvl/mxv + .byte 66*mus_vs_rival_mvl/mxv .byte W09 - .byte 69*bgm_battle35_mvl/mxv + .byte 69*mus_vs_rival_mvl/mxv .byte W09 - .byte 71*bgm_battle35_mvl/mxv + .byte 71*mus_vs_rival_mvl/mxv .byte W06 - .byte 74*bgm_battle35_mvl/mxv + .byte 74*mus_vs_rival_mvl/mxv .byte W09 - .byte 76*bgm_battle35_mvl/mxv + .byte 76*mus_vs_rival_mvl/mxv .byte W09 - .byte 80*bgm_battle35_mvl/mxv + .byte 80*mus_vs_rival_mvl/mxv .byte W36 .byte W03 .byte EOT @@ -861,40 +861,40 @@ bgm_battle35_2_002: .byte PAN , c_v+0 .byte TIE , Cn4 , v108 .byte W96 -bgm_battle35_2_003: +mus_vs_rival_2_003: .byte MOD , 7 .byte W36 - .byte VOL , 75*bgm_battle35_mvl/mxv + .byte VOL , 75*mus_vs_rival_mvl/mxv .byte W09 - .byte 71*bgm_battle35_mvl/mxv + .byte 71*mus_vs_rival_mvl/mxv .byte W09 - .byte 67*bgm_battle35_mvl/mxv + .byte 67*mus_vs_rival_mvl/mxv .byte W06 - .byte 62*bgm_battle35_mvl/mxv + .byte 62*mus_vs_rival_mvl/mxv .byte W06 - .byte 55*bgm_battle35_mvl/mxv + .byte 55*mus_vs_rival_mvl/mxv .byte W06 - .byte 49*bgm_battle35_mvl/mxv + .byte 49*mus_vs_rival_mvl/mxv .byte W06 - .byte 42*bgm_battle35_mvl/mxv + .byte 42*mus_vs_rival_mvl/mxv .byte W06 - .byte 35*bgm_battle35_mvl/mxv + .byte 35*mus_vs_rival_mvl/mxv .byte W06 - .byte 27*bgm_battle35_mvl/mxv + .byte 27*mus_vs_rival_mvl/mxv .byte W03 .byte PEND .byte EOT , Cn4 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte TIE , Fn3 , v108 .byte W96 .byte PATT - .word bgm_battle35_2_003 + .word mus_vs_rival_2_003 .byte EOT , Fn3 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte N96 , Cn4 , v108 .byte W48 .byte MOD , 7 @@ -942,46 +942,46 @@ bgm_battle35_2_003: .byte MOD , 5 .byte W32 .byte W01 - .byte VOL , 76*bgm_battle35_mvl/mxv + .byte VOL , 76*mus_vs_rival_mvl/mxv .byte W09 .byte MOD , 6 - .byte VOL , 74*bgm_battle35_mvl/mxv + .byte VOL , 74*mus_vs_rival_mvl/mxv .byte W09 - .byte 71*bgm_battle35_mvl/mxv + .byte 71*mus_vs_rival_mvl/mxv .byte W09 - .byte 69*bgm_battle35_mvl/mxv + .byte 69*mus_vs_rival_mvl/mxv .byte W06 - .byte 64*bgm_battle35_mvl/mxv + .byte 64*mus_vs_rival_mvl/mxv .byte W09 - .byte 60*bgm_battle35_mvl/mxv + .byte 60*mus_vs_rival_mvl/mxv .byte W06 .byte MOD , 7 .byte W03 - .byte VOL , 56*bgm_battle35_mvl/mxv + .byte VOL , 56*mus_vs_rival_mvl/mxv .byte W06 - .byte 51*bgm_battle35_mvl/mxv + .byte 51*mus_vs_rival_mvl/mxv .byte W09 - .byte 45*bgm_battle35_mvl/mxv + .byte 45*mus_vs_rival_mvl/mxv .byte W09 - .byte 40*bgm_battle35_mvl/mxv + .byte 40*mus_vs_rival_mvl/mxv .byte W09 - .byte 31*bgm_battle35_mvl/mxv + .byte 31*mus_vs_rival_mvl/mxv .byte W06 - .byte 18*bgm_battle35_mvl/mxv + .byte 18*mus_vs_rival_mvl/mxv .byte W03 .byte EOT .byte MOD , 0 .byte W03 .byte GOTO - .word bgm_battle35_2_B1 + .word mus_vs_rival_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle35_3: - .byte KEYSH , bgm_battle35_key+0 +mus_vs_rival_3: + .byte KEYSH , mus_vs_rival_key+0 .byte VOICE , 33 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte PAN , c_v+0 .byte N96 , Cn2 , v108 .byte W96 @@ -991,7 +991,7 @@ bgm_battle35_3: .byte W24 .byte En1 .byte W24 -bgm_battle35_3_000: +mus_vs_rival_3_000: .byte N12 , Cn1 , v108 .byte W12 .byte Fn1 @@ -1007,7 +1007,7 @@ bgm_battle35_3_000: .byte Cs1 .byte W12 .byte PEND -bgm_battle35_3_001: +mus_vs_rival_3_001: .byte N12 , Cn1 , v108 .byte W12 .byte Fn1 @@ -1024,7 +1024,7 @@ bgm_battle35_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_3_000 + .word mus_vs_rival_3_000 .byte N12 , Cn1 , v108 .byte W12 .byte Fn1 @@ -1040,11 +1040,11 @@ bgm_battle35_3_001: .byte Gn1 .byte W12 .byte PATT - .word bgm_battle35_3_000 + .word mus_vs_rival_3_000 .byte PATT - .word bgm_battle35_3_001 + .word mus_vs_rival_3_001 .byte PATT - .word bgm_battle35_3_000 + .word mus_vs_rival_3_000 .byte N12 , Cn1 , v108 .byte W12 .byte Fn1 @@ -1059,8 +1059,8 @@ bgm_battle35_3_001: .byte W12 .byte An1 .byte W12 -bgm_battle35_3_B1: -bgm_battle35_3_002: +mus_vs_rival_3_B1: +mus_vs_rival_3_002: .byte N12 , Cn1 , v108 .byte W12 .byte Fn1 @@ -1078,7 +1078,7 @@ bgm_battle35_3_002: .byte Fn1 .byte W12 .byte PEND -bgm_battle35_3_003: +mus_vs_rival_3_003: .byte N12 , Cn1 , v108 .byte W12 .byte Fn1 @@ -1096,7 +1096,7 @@ bgm_battle35_3_003: .byte Fn1 .byte W12 .byte PEND -bgm_battle35_3_004: +mus_vs_rival_3_004: .byte N12 , Ds1 , v108 .byte W12 .byte Gs1 @@ -1114,7 +1114,7 @@ bgm_battle35_3_004: .byte Gs1 .byte W12 .byte PEND -bgm_battle35_3_005: +mus_vs_rival_3_005: .byte N12 , Ds1 , v108 .byte W12 .byte Gs1 @@ -1132,7 +1132,7 @@ bgm_battle35_3_005: .byte Gs1 .byte W12 .byte PEND -bgm_battle35_3_006: +mus_vs_rival_3_006: .byte N12 , Fn1 , v108 .byte W12 .byte As1 @@ -1151,9 +1151,9 @@ bgm_battle35_3_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_3_006 + .word mus_vs_rival_3_006 .byte PATT - .word bgm_battle35_3_004 + .word mus_vs_rival_3_004 .byte N12 , Ds1 , v108 .byte W12 .byte Gs1 @@ -1202,7 +1202,7 @@ bgm_battle35_3_006: .byte W12 .byte Fn1 .byte W12 -bgm_battle35_3_007: +mus_vs_rival_3_007: .byte N12 , Ds1 , v108 .byte W12 .byte Gn1 @@ -1220,7 +1220,7 @@ bgm_battle35_3_007: .byte Gn1 .byte W12 .byte PEND -bgm_battle35_3_008: +mus_vs_rival_3_008: .byte N12 , Ds1 , v108 .byte W12 .byte Gn1 @@ -1239,9 +1239,9 @@ bgm_battle35_3_008: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_3_007 + .word mus_vs_rival_3_007 .byte PATT - .word bgm_battle35_3_008 + .word mus_vs_rival_3_008 .byte N12 , Fn1 , v108 .byte W12 .byte N24 , An1 @@ -1272,7 +1272,7 @@ bgm_battle35_3_008: .byte W12 .byte An1 .byte W12 -bgm_battle35_3_009: +mus_vs_rival_3_009: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -1290,7 +1290,7 @@ bgm_battle35_3_009: .byte Fn1 .byte W12 .byte PEND -bgm_battle35_3_010: +mus_vs_rival_3_010: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -1309,21 +1309,21 @@ bgm_battle35_3_010: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_3_009 + .word mus_vs_rival_3_009 .byte PATT - .word bgm_battle35_3_010 + .word mus_vs_rival_3_010 .byte PATT - .word bgm_battle35_3_010 + .word mus_vs_rival_3_010 .byte PATT - .word bgm_battle35_3_010 + .word mus_vs_rival_3_010 .byte PATT - .word bgm_battle35_3_010 + .word mus_vs_rival_3_010 .byte PATT - .word bgm_battle35_3_009 + .word mus_vs_rival_3_009 .byte PATT - .word bgm_battle35_3_009 + .word mus_vs_rival_3_009 .byte PATT - .word bgm_battle35_3_009 + .word mus_vs_rival_3_009 .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -1341,11 +1341,11 @@ bgm_battle35_3_010: .byte Gs1 .byte W12 .byte PATT - .word bgm_battle35_3_009 + .word mus_vs_rival_3_009 .byte PATT - .word bgm_battle35_3_009 + .word mus_vs_rival_3_009 .byte PATT - .word bgm_battle35_3_009 + .word mus_vs_rival_3_009 .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -1363,11 +1363,11 @@ bgm_battle35_3_010: .byte Bn0 .byte W12 .byte PATT - .word bgm_battle35_3_002 + .word mus_vs_rival_3_002 .byte PATT - .word bgm_battle35_3_002 + .word mus_vs_rival_3_002 .byte PATT - .word bgm_battle35_3_007 + .word mus_vs_rival_3_007 .byte N12 , Ds1 , v108 .byte W12 .byte Gn1 @@ -1385,19 +1385,19 @@ bgm_battle35_3_010: .byte As1 .byte W12 .byte PATT - .word bgm_battle35_3_002 + .word mus_vs_rival_3_002 .byte PATT - .word bgm_battle35_3_003 + .word mus_vs_rival_3_003 .byte PATT - .word bgm_battle35_3_004 + .word mus_vs_rival_3_004 .byte PATT - .word bgm_battle35_3_005 + .word mus_vs_rival_3_005 .byte PATT - .word bgm_battle35_3_006 + .word mus_vs_rival_3_006 .byte PATT - .word bgm_battle35_3_006 + .word mus_vs_rival_3_006 .byte PATT - .word bgm_battle35_3_004 + .word mus_vs_rival_3_004 .byte N12 , Ds1 , v108 .byte W12 .byte Gs1 @@ -1415,16 +1415,16 @@ bgm_battle35_3_010: .byte Gs1 .byte W12 .byte GOTO - .word bgm_battle35_3_B1 + .word mus_vs_rival_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle35_4: - .byte KEYSH , bgm_battle35_key+0 +mus_vs_rival_4: + .byte KEYSH , mus_vs_rival_key+0 .byte VOICE , 4 .byte LFOS , 16 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte PAN , c_v+48 @@ -1479,7 +1479,7 @@ bgm_battle35_4: .byte W36 .byte N24 , Cn4 .byte W24 -bgm_battle35_4_B1: +mus_vs_rival_4_B1: .byte VOICE , 80 .byte PAN , c_v-48 .byte N36 , Fn3 , v060 @@ -1561,7 +1561,7 @@ bgm_battle35_4_B1: .byte As2 .byte W24 .byte W96 -bgm_battle35_4_000: +mus_vs_rival_4_000: .byte W12 .byte N12 , Cn3 , v060 .byte W24 @@ -1582,7 +1582,7 @@ bgm_battle35_4_000: .byte Gn2 .byte W12 .byte PATT - .word bgm_battle35_4_000 + .word mus_vs_rival_4_000 .byte W36 .byte VOICE , 80 .byte N24 , Cn3 , v060 @@ -1645,7 +1645,7 @@ bgm_battle35_4_000: .byte W24 .byte N12 , As2 .byte W12 -bgm_battle35_4_001: +mus_vs_rival_4_001: .byte N12 , Gs2 , v052 .byte W48 .byte N48 , Bn2 @@ -1664,7 +1664,7 @@ bgm_battle35_4_001: .byte N12 , As2 .byte W12 .byte PATT - .word bgm_battle35_4_001 + .word mus_vs_rival_4_001 .byte W96 .byte W96 .byte W96 @@ -1739,18 +1739,18 @@ bgm_battle35_4_001: .byte N48 , Gs2 , v060 .byte W48 .byte GOTO - .word bgm_battle35_4_B1 + .word mus_vs_rival_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle35_5: - .byte KEYSH , bgm_battle35_key+0 +mus_vs_rival_5: + .byte KEYSH , mus_vs_rival_key+0 .byte VOICE , 82 .byte LFOS , 16 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte PAN , c_v-48 .byte N06 , Cn3 , v052 .byte W12 @@ -1821,7 +1821,7 @@ bgm_battle35_5: .byte W36 .byte 0 .byte W24 -bgm_battle35_5_B1: +mus_vs_rival_5_B1: .byte W96 .byte W96 .byte W96 @@ -1886,7 +1886,7 @@ bgm_battle35_5_B1: .byte W12 .byte Cn3 .byte W12 -bgm_battle35_5_000: +mus_vs_rival_5_000: .byte N12 , As1 , v052 .byte W12 .byte Ds2 @@ -1905,7 +1905,7 @@ bgm_battle35_5_000: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_5_000 + .word mus_vs_rival_5_000 .byte W96 .byte W96 .byte W96 @@ -1915,15 +1915,15 @@ bgm_battle35_5_000: .byte W96 .byte W96 .byte GOTO - .word bgm_battle35_5_B1 + .word mus_vs_rival_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle35_6: - .byte KEYSH , bgm_battle35_key+0 +mus_vs_rival_6: + .byte KEYSH , mus_vs_rival_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte BEND , c_v-2 .byte W96 .byte W96 @@ -1935,7 +1935,7 @@ bgm_battle35_6: .byte W96 .byte W96 .byte W96 -bgm_battle35_6_B1: +mus_vs_rival_6_B1: .byte PAN , c_v+48 .byte N12 , Cn2 , v064 .byte W12 @@ -1969,7 +1969,7 @@ bgm_battle35_6_B1: .byte W12 .byte Cn3 .byte W12 -bgm_battle35_6_000: +mus_vs_rival_6_000: .byte N12 , Ds2 , v064 .byte W12 .byte Gs2 @@ -1988,8 +1988,8 @@ bgm_battle35_6_000: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_6_000 -bgm_battle35_6_001: + .word mus_vs_rival_6_000 +mus_vs_rival_6_001: .byte N12 , Fn2 , v064 .byte W12 .byte As2 @@ -2008,11 +2008,11 @@ bgm_battle35_6_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_6_001 + .word mus_vs_rival_6_001 .byte PATT - .word bgm_battle35_6_000 + .word mus_vs_rival_6_000 .byte PATT - .word bgm_battle35_6_000 + .word mus_vs_rival_6_000 .byte W96 .byte W96 .byte W96 @@ -2049,23 +2049,23 @@ bgm_battle35_6_001: .byte W96 .byte W96 .byte GOTO - .word bgm_battle35_6_B1 + .word mus_vs_rival_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle35_7: - .byte KEYSH , bgm_battle35_key+0 +mus_vs_rival_7: + .byte KEYSH , mus_vs_rival_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte W96 .byte W72 .byte N12 , Dn1 , v112 .byte W12 .byte N12 .byte W12 -bgm_battle35_7_000: +mus_vs_rival_7_000: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2073,27 +2073,27 @@ bgm_battle35_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 -bgm_battle35_7_B1: + .word mus_vs_rival_7_000 +mus_vs_rival_7_B1: .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 -bgm_battle35_7_001: + .word mus_vs_rival_7_000 +mus_vs_rival_7_001: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2103,25 +2103,25 @@ bgm_battle35_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_001 + .word mus_vs_rival_7_001 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_001 + .word mus_vs_rival_7_001 .byte N12 , Dn1 , v112 .byte W24 .byte N12 @@ -2129,10 +2129,10 @@ bgm_battle35_7_001: .byte N12 .byte W12 .byte PATT - .word bgm_battle35_7_001 + .word mus_vs_rival_7_001 .byte PATT - .word bgm_battle35_7_000 -bgm_battle35_7_002: + .word mus_vs_rival_7_000 +mus_vs_rival_7_002: .byte W36 .byte N12 , Dn1 , v112 .byte W48 @@ -2140,18 +2140,18 @@ bgm_battle35_7_002: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_002 + .word mus_vs_rival_7_002 .byte PATT - .word bgm_battle35_7_001 + .word mus_vs_rival_7_001 .byte PATT - .word bgm_battle35_7_002 + .word mus_vs_rival_7_002 .byte PATT - .word bgm_battle35_7_001 + .word mus_vs_rival_7_001 .byte PATT - .word bgm_battle35_7_000 -bgm_battle35_7_003: + .word mus_vs_rival_7_000 +mus_vs_rival_7_003: .byte W12 .byte N12 , Dn1 , v112 .byte W36 @@ -2161,17 +2161,17 @@ bgm_battle35_7_003: .byte W12 .byte PEND .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_003 + .word mus_vs_rival_7_003 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_003 + .word mus_vs_rival_7_003 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_003 + .word mus_vs_rival_7_003 .byte N96 , An2 , v096 .byte W96 .byte W96 @@ -2186,35 +2186,35 @@ bgm_battle35_7_003: .byte N12 .byte W12 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_000 + .word mus_vs_rival_7_000 .byte PATT - .word bgm_battle35_7_001 + .word mus_vs_rival_7_001 .byte GOTO - .word bgm_battle35_7_B1 + .word mus_vs_rival_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle35_8: - .byte KEYSH , bgm_battle35_key+0 +mus_vs_rival_8: + .byte KEYSH , mus_vs_rival_key+0 .byte VOICE , 47 .byte PAN , c_v-8 - .byte VOL , 80*bgm_battle35_mvl/mxv + .byte VOL , 80*mus_vs_rival_mvl/mxv .byte W96 .byte W96 -bgm_battle35_8_000: +mus_vs_rival_8_000: .byte N12 , Cn2 , v124 .byte W48 .byte N12 @@ -2223,21 +2223,21 @@ bgm_battle35_8_000: .byte W36 .byte PEND .byte PATT - .word bgm_battle35_8_000 + .word mus_vs_rival_8_000 .byte PATT - .word bgm_battle35_8_000 + .word mus_vs_rival_8_000 .byte PATT - .word bgm_battle35_8_000 + .word mus_vs_rival_8_000 .byte PATT - .word bgm_battle35_8_000 + .word mus_vs_rival_8_000 .byte PATT - .word bgm_battle35_8_000 + .word mus_vs_rival_8_000 .byte PATT - .word bgm_battle35_8_000 + .word mus_vs_rival_8_000 .byte PATT - .word bgm_battle35_8_000 -bgm_battle35_8_B1: -bgm_battle35_8_001: + .word mus_vs_rival_8_000 +mus_vs_rival_8_B1: +mus_vs_rival_8_001: .byte N12 , Cn2 , v112 .byte W48 .byte N12 @@ -2246,31 +2246,31 @@ bgm_battle35_8_001: .byte W36 .byte PEND .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte W12 .byte N12 , Cn2 , v112 .byte W24 @@ -2287,8 +2287,8 @@ bgm_battle35_8_001: .byte N12 .byte W36 .byte PATT - .word bgm_battle35_8_001 -bgm_battle35_8_002: + .word mus_vs_rival_8_001 +mus_vs_rival_8_002: .byte N12 , Cn2 , v112 .byte W24 .byte N12 @@ -2299,18 +2299,18 @@ bgm_battle35_8_002: .byte W36 .byte PEND .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_002 + .word mus_vs_rival_8_002 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_002 + .word mus_vs_rival_8_002 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 -bgm_battle35_8_003: + .word mus_vs_rival_8_001 +mus_vs_rival_8_003: .byte N12 , Cn2 , v112 .byte W24 .byte N12 @@ -2323,59 +2323,59 @@ bgm_battle35_8_003: .byte W24 .byte PEND .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_003 + .word mus_vs_rival_8_003 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_003 + .word mus_vs_rival_8_003 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_003 + .word mus_vs_rival_8_003 .byte W96 .byte W96 .byte W96 .byte W96 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte PATT - .word bgm_battle35_8_001 + .word mus_vs_rival_8_001 .byte GOTO - .word bgm_battle35_8_B1 + .word mus_vs_rival_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle35: +mus_vs_rival: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle35_pri @ Priority - .byte bgm_battle35_rev @ Reverb. + .byte mus_vs_rival_pri @ Priority + .byte mus_vs_rival_rev @ Reverb. - .word bgm_battle35_grp + .word mus_vs_rival_grp - .word bgm_battle35_1 - .word bgm_battle35_2 - .word bgm_battle35_3 - .word bgm_battle35_4 - .word bgm_battle35_5 - .word bgm_battle35_6 - .word bgm_battle35_7 - .word bgm_battle35_8 + .word mus_vs_rival_1 + .word mus_vs_rival_2 + .word mus_vs_rival_3 + .word mus_vs_rival_4 + .word mus_vs_rival_5 + .word mus_vs_rival_6 + .word mus_vs_rival_7 + .word mus_vs_rival_8 .end diff --git a/sound/songs/bgm_battle20.s b/sound/songs/mus_vs_trainer.s index a058feaf6..2ad0a0ba3 100644 --- a/sound/songs/bgm_battle20.s +++ b/sound/songs/mus_vs_trainer.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ bgm_battle20_grp, voicegroup102 - .equ bgm_battle20_pri, 1 - .equ bgm_battle20_rev, reverb_set+50 - .equ bgm_battle20_mvl, 127 - .equ bgm_battle20_key, 0 - .equ bgm_battle20_tbs, 1 - .equ bgm_battle20_exg, 0 - .equ bgm_battle20_cmp, 1 + .equ mus_vs_trainer_grp, voicegroup102 + .equ mus_vs_trainer_pri, 1 + .equ mus_vs_trainer_rev, reverb_set+50 + .equ mus_vs_trainer_mvl, 127 + .equ mus_vs_trainer_key, 0 + .equ mus_vs_trainer_tbs, 1 + .equ mus_vs_trainer_exg, 0 + .equ mus_vs_trainer_cmp, 1 .section .rodata - .global bgm_battle20 + .global mus_vs_trainer .align 2 @********************** Track 1 **********************@ -bgm_battle20_1: - .byte KEYSH , bgm_battle20_key+0 - .byte TEMPO , 198*bgm_battle20_tbs/2 +mus_vs_trainer_1: + .byte KEYSH , mus_vs_trainer_key+0 + .byte TEMPO , 198*mus_vs_trainer_tbs/2 .byte VOICE , 1 .byte PAN , c_v+15 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte N06 , Cn5 , v076 .byte W06 .byte Bn4 @@ -144,9 +144,9 @@ bgm_battle20_1: .byte W36 .byte N24 , Gn4 .byte W24 -bgm_battle20_1_B1: +mus_vs_trainer_1_B1: .byte VOICE , 48 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte N36 , Cn3 , v096 .byte W36 .byte Gn3 @@ -215,23 +215,23 @@ bgm_battle20_1_B1: .byte W24 .byte N92 , Cn4 .byte W48 - .byte VOL , 75*bgm_battle20_mvl/mxv + .byte VOL , 75*mus_vs_trainer_mvl/mxv .byte W06 - .byte 71*bgm_battle20_mvl/mxv + .byte 71*mus_vs_trainer_mvl/mxv .byte W06 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 60*bgm_battle20_mvl/mxv + .byte 60*mus_vs_trainer_mvl/mxv .byte W06 - .byte 53*bgm_battle20_mvl/mxv + .byte 53*mus_vs_trainer_mvl/mxv .byte W06 - .byte 45*bgm_battle20_mvl/mxv + .byte 45*mus_vs_trainer_mvl/mxv .byte W06 - .byte 35*bgm_battle20_mvl/mxv + .byte 35*mus_vs_trainer_mvl/mxv .byte W06 - .byte 24*bgm_battle20_mvl/mxv + .byte 24*mus_vs_trainer_mvl/mxv .byte W06 - .byte 80*bgm_battle20_mvl/mxv + .byte 80*mus_vs_trainer_mvl/mxv .byte N48 , En2 .byte W48 .byte N36 , Fn2 @@ -458,26 +458,26 @@ bgm_battle20_1_B1: .byte TIE , Cn3 , v076 .byte W96 .byte W48 - .byte VOL , 75*bgm_battle20_mvl/mxv + .byte VOL , 75*mus_vs_trainer_mvl/mxv .byte W06 - .byte 71*bgm_battle20_mvl/mxv + .byte 71*mus_vs_trainer_mvl/mxv .byte W06 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 60*bgm_battle20_mvl/mxv + .byte 60*mus_vs_trainer_mvl/mxv .byte W06 - .byte 53*bgm_battle20_mvl/mxv + .byte 53*mus_vs_trainer_mvl/mxv .byte W06 - .byte 45*bgm_battle20_mvl/mxv + .byte 45*mus_vs_trainer_mvl/mxv .byte W06 - .byte 35*bgm_battle20_mvl/mxv + .byte 35*mus_vs_trainer_mvl/mxv .byte W06 - .byte 24*bgm_battle20_mvl/mxv + .byte 24*mus_vs_trainer_mvl/mxv .byte W03 .byte EOT .byte W03 .byte VOICE , 60 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte PAN , c_v+16 .byte N96 , Fn2 , v096 .byte W96 @@ -485,27 +485,27 @@ bgm_battle20_1_B1: .byte W96 .byte Gn2 .byte W96 -bgm_battle20_1_000: +mus_vs_trainer_1_000: .byte N92 , En2 , v096 .byte W48 - .byte VOL , 75*bgm_battle20_mvl/mxv + .byte VOL , 75*mus_vs_trainer_mvl/mxv .byte W06 - .byte 71*bgm_battle20_mvl/mxv + .byte 71*mus_vs_trainer_mvl/mxv .byte W06 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 60*bgm_battle20_mvl/mxv + .byte 60*mus_vs_trainer_mvl/mxv .byte W06 - .byte 53*bgm_battle20_mvl/mxv + .byte 53*mus_vs_trainer_mvl/mxv .byte W06 - .byte 45*bgm_battle20_mvl/mxv + .byte 45*mus_vs_trainer_mvl/mxv .byte W06 - .byte 35*bgm_battle20_mvl/mxv + .byte 35*mus_vs_trainer_mvl/mxv .byte W06 - .byte 24*bgm_battle20_mvl/mxv + .byte 24*mus_vs_trainer_mvl/mxv .byte W06 .byte PEND - .byte 80*bgm_battle20_mvl/mxv + .byte 80*mus_vs_trainer_mvl/mxv .byte N96 , Fn2 .byte W96 .byte As2 @@ -513,9 +513,9 @@ bgm_battle20_1_000: .byte Gn2 .byte W96 .byte PATT - .word bgm_battle20_1_000 + .word mus_vs_trainer_1_000 .byte VOICE , 17 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte PAN , c_v+15 .byte N12 , Gn3 , v088 .byte W36 @@ -560,17 +560,17 @@ bgm_battle20_1_000: .byte Cs3 .byte W48 .byte GOTO - .word bgm_battle20_1_B1 + .word mus_vs_trainer_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle20_2: - .byte KEYSH , bgm_battle20_key+0 +mus_vs_trainer_2: + .byte KEYSH , mus_vs_trainer_key+0 .byte VOICE , 48 .byte LFOS , 20 .byte PAN , c_v-14 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte N06 , Gn5 , v064 .byte W06 .byte Fs5 @@ -677,9 +677,9 @@ bgm_battle20_2: .byte W36 .byte N24 , Gn5 , v076 .byte W24 -bgm_battle20_2_B1: +mus_vs_trainer_2_B1: .byte VOICE , 60 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte PAN , c_v+0 .byte N48 , Cn4 , v100 .byte W48 @@ -767,26 +767,26 @@ bgm_battle20_2_B1: .byte W36 .byte MOD , 7 .byte W12 - .byte VOL , 75*bgm_battle20_mvl/mxv + .byte VOL , 75*mus_vs_trainer_mvl/mxv .byte W06 - .byte 71*bgm_battle20_mvl/mxv + .byte 71*mus_vs_trainer_mvl/mxv .byte W06 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 60*bgm_battle20_mvl/mxv + .byte 60*mus_vs_trainer_mvl/mxv .byte W06 - .byte 53*bgm_battle20_mvl/mxv + .byte 53*mus_vs_trainer_mvl/mxv .byte W06 - .byte 45*bgm_battle20_mvl/mxv + .byte 45*mus_vs_trainer_mvl/mxv .byte W06 - .byte 35*bgm_battle20_mvl/mxv + .byte 35*mus_vs_trainer_mvl/mxv .byte W06 - .byte 24*bgm_battle20_mvl/mxv + .byte 24*mus_vs_trainer_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 .byte VOICE , 48 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte PAN , c_v+0 .byte N48 , As2 .byte W48 @@ -828,20 +828,20 @@ bgm_battle20_2_B1: .byte W24 .byte N92 , Cn5 .byte W54 - .byte VOL , 73*bgm_battle20_mvl/mxv + .byte VOL , 73*mus_vs_trainer_mvl/mxv .byte W09 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 59*bgm_battle20_mvl/mxv + .byte 59*mus_vs_trainer_mvl/mxv .byte W09 - .byte 50*bgm_battle20_mvl/mxv + .byte 50*mus_vs_trainer_mvl/mxv .byte W06 - .byte 40*bgm_battle20_mvl/mxv + .byte 40*mus_vs_trainer_mvl/mxv .byte W06 - .byte 26*bgm_battle20_mvl/mxv + .byte 26*mus_vs_trainer_mvl/mxv .byte W06 .byte VOICE , 17 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte PAN , c_v+0 .byte N36 , Cn4 , v100 .byte W36 @@ -857,7 +857,7 @@ bgm_battle20_2_B1: .byte W24 .byte N36 , Dn4 .byte W36 -bgm_battle20_2_000: +mus_vs_trainer_2_000: .byte N36 , Fn4 , v100 .byte W36 .byte N24 , As4 @@ -886,7 +886,7 @@ bgm_battle20_2_000: .byte N60 , As4 .byte W60 .byte PATT - .word bgm_battle20_2_000 + .word mus_vs_trainer_2_000 .byte N36 , En4 , v100 .byte W36 .byte N60 , Cn4 @@ -950,7 +950,7 @@ bgm_battle20_2_000: .byte PAN , c_v+0 .byte N96 , Cn3 , v104 .byte W96 -bgm_battle20_2_001: +mus_vs_trainer_2_001: .byte N84 , Cn2 , v104 .byte W84 .byte N12 , Cn3 @@ -965,7 +965,7 @@ bgm_battle20_2_001: .byte N96 , Cn3 .byte W96 .byte PATT - .word bgm_battle20_2_001 + .word mus_vs_trainer_2_001 .byte N96 , As2 , v104 .byte W96 .byte Dn3 @@ -985,26 +985,26 @@ bgm_battle20_2_001: .byte TIE , En3 , v096 .byte W96 .byte W48 - .byte VOL , 75*bgm_battle20_mvl/mxv + .byte VOL , 75*mus_vs_trainer_mvl/mxv .byte W06 - .byte 71*bgm_battle20_mvl/mxv + .byte 71*mus_vs_trainer_mvl/mxv .byte W06 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 60*bgm_battle20_mvl/mxv + .byte 60*mus_vs_trainer_mvl/mxv .byte W06 - .byte 53*bgm_battle20_mvl/mxv + .byte 53*mus_vs_trainer_mvl/mxv .byte W06 - .byte 45*bgm_battle20_mvl/mxv + .byte 45*mus_vs_trainer_mvl/mxv .byte W06 - .byte 35*bgm_battle20_mvl/mxv + .byte 35*mus_vs_trainer_mvl/mxv .byte W06 - .byte 24*bgm_battle20_mvl/mxv + .byte 24*mus_vs_trainer_mvl/mxv .byte W03 .byte EOT .byte W03 .byte VOICE , 60 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte PAN , c_v+0 .byte N24 , Cn3 , v100 .byte W24 @@ -1030,24 +1030,24 @@ bgm_battle20_2_001: .byte W12 .byte N92 , Gn3 .byte W48 - .byte VOL , 75*bgm_battle20_mvl/mxv + .byte VOL , 75*mus_vs_trainer_mvl/mxv .byte W06 - .byte 71*bgm_battle20_mvl/mxv + .byte 71*mus_vs_trainer_mvl/mxv .byte W06 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 60*bgm_battle20_mvl/mxv + .byte 60*mus_vs_trainer_mvl/mxv .byte W06 - .byte 53*bgm_battle20_mvl/mxv + .byte 53*mus_vs_trainer_mvl/mxv .byte W06 - .byte 45*bgm_battle20_mvl/mxv + .byte 45*mus_vs_trainer_mvl/mxv .byte W06 - .byte 35*bgm_battle20_mvl/mxv + .byte 35*mus_vs_trainer_mvl/mxv .byte W06 - .byte 24*bgm_battle20_mvl/mxv + .byte 24*mus_vs_trainer_mvl/mxv .byte W06 .byte VOICE , 56 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte N24 , Cn3 , v104 .byte W24 .byte N36 , Fn3 @@ -1087,26 +1087,26 @@ bgm_battle20_2_001: .byte W01 .byte MOD , 7 .byte W15 - .byte VOL , 75*bgm_battle20_mvl/mxv + .byte VOL , 75*mus_vs_trainer_mvl/mxv .byte W06 - .byte 71*bgm_battle20_mvl/mxv + .byte 71*mus_vs_trainer_mvl/mxv .byte W06 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 60*bgm_battle20_mvl/mxv + .byte 60*mus_vs_trainer_mvl/mxv .byte W06 - .byte 53*bgm_battle20_mvl/mxv + .byte 53*mus_vs_trainer_mvl/mxv .byte W06 - .byte 45*bgm_battle20_mvl/mxv + .byte 45*mus_vs_trainer_mvl/mxv .byte W06 - .byte 35*bgm_battle20_mvl/mxv + .byte 35*mus_vs_trainer_mvl/mxv .byte W06 - .byte 24*bgm_battle20_mvl/mxv + .byte 24*mus_vs_trainer_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 .byte VOICE , 17 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte PAN , c_v-14 .byte N12 , Cn4 , v096 .byte W36 @@ -1159,15 +1159,15 @@ bgm_battle20_2_001: .byte N24 , As4 .byte W24 .byte GOTO - .word bgm_battle20_2_B1 + .word mus_vs_trainer_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle20_3: - .byte KEYSH , bgm_battle20_key+0 +mus_vs_trainer_3: + .byte KEYSH , mus_vs_trainer_key+0 .byte VOICE , 33 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte PAN , c_v-6 .byte N96 , Cn1 , v108 .byte W96 @@ -1179,7 +1179,7 @@ bgm_battle20_3: .byte W12 .byte Cs1 .byte W12 -bgm_battle20_3_000: +mus_vs_trainer_3_000: .byte N12 , Cn1 , v108 .byte W12 .byte Fs1 @@ -1197,7 +1197,7 @@ bgm_battle20_3_000: .byte Fn1 .byte W12 .byte PEND -bgm_battle20_3_001: +mus_vs_trainer_3_001: .byte N12 , Cn1 , v108 .byte W12 .byte Fs1 @@ -1216,19 +1216,19 @@ bgm_battle20_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_3_000 + .word mus_vs_trainer_3_000 .byte PATT - .word bgm_battle20_3_001 + .word mus_vs_trainer_3_001 .byte PATT - .word bgm_battle20_3_000 + .word mus_vs_trainer_3_000 .byte PATT - .word bgm_battle20_3_001 + .word mus_vs_trainer_3_001 .byte PATT - .word bgm_battle20_3_000 + .word mus_vs_trainer_3_000 .byte PATT - .word bgm_battle20_3_001 -bgm_battle20_3_B1: -bgm_battle20_3_002: + .word mus_vs_trainer_3_001 +mus_vs_trainer_3_B1: +mus_vs_trainer_3_002: .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -1262,7 +1262,7 @@ bgm_battle20_3_002: .byte W12 .byte En1 .byte W12 -bgm_battle20_3_003: +mus_vs_trainer_3_003: .byte N12 , Cs1 , v108 .byte W12 .byte Gs1 @@ -1297,7 +1297,7 @@ bgm_battle20_3_003: .byte Fn1 .byte W12 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -1315,14 +1315,14 @@ bgm_battle20_3_003: .byte Gn1 .byte W12 .byte PATT - .word bgm_battle20_3_003 + .word mus_vs_trainer_3_003 .byte PATT - .word bgm_battle20_3_003 + .word mus_vs_trainer_3_003 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 -bgm_battle20_3_004: + .word mus_vs_trainer_3_002 +mus_vs_trainer_3_004: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -1341,20 +1341,20 @@ bgm_battle20_3_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_3_004 + .word mus_vs_trainer_3_004 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_004 + .word mus_vs_trainer_3_004 .byte PATT - .word bgm_battle20_3_004 + .word mus_vs_trainer_3_004 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 -bgm_battle20_3_005: + .word mus_vs_trainer_3_002 +mus_vs_trainer_3_005: .byte N12 , Cn1 , v108 .byte W12 .byte En1 @@ -1372,7 +1372,7 @@ bgm_battle20_3_005: .byte En1 .byte W12 .byte PEND -bgm_battle20_3_006: +mus_vs_trainer_3_006: .byte N12 , Cn1 , v108 .byte W12 .byte Fn1 @@ -1391,11 +1391,11 @@ bgm_battle20_3_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_3_006 + .word mus_vs_trainer_3_006 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte As1 @@ -1413,46 +1413,46 @@ bgm_battle20_3_006: .byte As1 .byte W12 .byte PATT - .word bgm_battle20_3_006 + .word mus_vs_trainer_3_006 .byte PATT - .word bgm_battle20_3_005 + .word mus_vs_trainer_3_005 .byte PATT - .word bgm_battle20_3_005 + .word mus_vs_trainer_3_005 .byte PATT - .word bgm_battle20_3_006 + .word mus_vs_trainer_3_006 .byte PATT - .word bgm_battle20_3_006 + .word mus_vs_trainer_3_006 .byte PATT - .word bgm_battle20_3_005 + .word mus_vs_trainer_3_005 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_003 + .word mus_vs_trainer_3_003 .byte PATT - .word bgm_battle20_3_003 + .word mus_vs_trainer_3_003 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_004 + .word mus_vs_trainer_3_004 .byte PATT - .word bgm_battle20_3_004 + .word mus_vs_trainer_3_004 .byte PATT - .word bgm_battle20_3_004 + .word mus_vs_trainer_3_004 .byte PATT - .word bgm_battle20_3_004 -bgm_battle20_3_007: + .word mus_vs_trainer_3_004 +mus_vs_trainer_3_007: .byte N12 , Cn1 , v108 .byte W12 .byte Cn2 @@ -1471,9 +1471,9 @@ bgm_battle20_3_007: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_3_007 + .word mus_vs_trainer_3_007 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -1490,7 +1490,7 @@ bgm_battle20_3_007: .byte W12 .byte Gn1 .byte W12 -bgm_battle20_3_008: +mus_vs_trainer_3_008: .byte N12 , Fn1 , v108 .byte W12 .byte As1 @@ -1509,33 +1509,33 @@ bgm_battle20_3_008: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_3_008 + .word mus_vs_trainer_3_008 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_008 + .word mus_vs_trainer_3_008 .byte PATT - .word bgm_battle20_3_008 + .word mus_vs_trainer_3_008 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_002 + .word mus_vs_trainer_3_002 .byte PATT - .word bgm_battle20_3_000 + .word mus_vs_trainer_3_000 .byte PATT - .word bgm_battle20_3_001 + .word mus_vs_trainer_3_001 .byte PATT - .word bgm_battle20_3_000 + .word mus_vs_trainer_3_000 .byte PATT - .word bgm_battle20_3_001 + .word mus_vs_trainer_3_001 .byte PATT - .word bgm_battle20_3_000 + .word mus_vs_trainer_3_000 .byte PATT - .word bgm_battle20_3_001 + .word mus_vs_trainer_3_001 .byte PATT - .word bgm_battle20_3_000 + .word mus_vs_trainer_3_000 .byte N12 , Cn1 , v108 .byte W12 .byte Fs1 @@ -1553,16 +1553,16 @@ bgm_battle20_3_008: .byte Cs1 .byte W12 .byte GOTO - .word bgm_battle20_3_B1 + .word mus_vs_trainer_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle20_4: - .byte KEYSH , bgm_battle20_key+0 +mus_vs_trainer_4: + .byte KEYSH , mus_vs_trainer_key+0 .byte VOICE , 80 .byte LFOS , 20 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte W96 @@ -1575,7 +1575,7 @@ bgm_battle20_4: .byte PAN , c_v+0 .byte N24 , Gs3 , v052 .byte W24 -bgm_battle20_4_000: +mus_vs_trainer_4_000: .byte N12 , Gn3 , v052 .byte W12 .byte Cn3 @@ -1610,7 +1610,7 @@ bgm_battle20_4_000: .byte Fn3 .byte W12 .byte PATT - .word bgm_battle20_4_000 + .word mus_vs_trainer_4_000 .byte N12 , Gn3 , v052 .byte W12 .byte Cs3 @@ -1625,7 +1625,7 @@ bgm_battle20_4_000: .byte W12 .byte N24 , Cs4 .byte W24 -bgm_battle20_4_B1: +mus_vs_trainer_4_B1: .byte W96 .byte W96 .byte W96 @@ -1656,7 +1656,7 @@ bgm_battle20_4_B1: .byte W12 .byte N03 .byte W12 -bgm_battle20_4_001: +mus_vs_trainer_4_001: .byte N03 , Gn1 , v060 .byte W12 .byte N03 @@ -1672,7 +1672,7 @@ bgm_battle20_4_001: .byte N03 .byte W12 .byte PEND -bgm_battle20_4_002: +mus_vs_trainer_4_002: .byte N03 , Fn1 , v060 .byte W12 .byte N03 @@ -1688,7 +1688,7 @@ bgm_battle20_4_002: .byte N03 .byte W12 .byte PEND -bgm_battle20_4_003: +mus_vs_trainer_4_003: .byte N03 , As1 , v060 .byte W12 .byte N03 @@ -1705,15 +1705,15 @@ bgm_battle20_4_003: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_4_001 + .word mus_vs_trainer_4_001 .byte PATT - .word bgm_battle20_4_001 + .word mus_vs_trainer_4_001 .byte PATT - .word bgm_battle20_4_002 + .word mus_vs_trainer_4_002 .byte PATT - .word bgm_battle20_4_003 + .word mus_vs_trainer_4_003 .byte PATT - .word bgm_battle20_4_001 + .word mus_vs_trainer_4_001 .byte W96 .byte W96 .byte W96 @@ -1759,7 +1759,7 @@ bgm_battle20_4_003: .byte W12 .byte Cn4 .byte W12 -bgm_battle20_4_004: +mus_vs_trainer_4_004: .byte N12 , Fn4 , v040 .byte W12 .byte Cn4 @@ -1777,7 +1777,7 @@ bgm_battle20_4_004: .byte Cn4 .byte W12 .byte PEND -bgm_battle20_4_005: +mus_vs_trainer_4_005: .byte N12 , En4 , v040 .byte W12 .byte Cn4 @@ -1796,9 +1796,9 @@ bgm_battle20_4_005: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_4_005 + .word mus_vs_trainer_4_005 .byte PATT - .word bgm_battle20_4_004 + .word mus_vs_trainer_4_004 .byte N12 , Fn4 , v032 .byte W12 .byte Cn4 @@ -1916,19 +1916,19 @@ bgm_battle20_4_005: .byte N24 , Fn4 .byte W24 .byte GOTO - .word bgm_battle20_4_B1 + .word mus_vs_trainer_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle20_5: - .byte KEYSH , bgm_battle20_key+0 +mus_vs_trainer_5: + .byte KEYSH , mus_vs_trainer_key+0 .byte VOICE , 4 .byte LFOS , 20 .byte PAN , c_v+0 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte N06 , Gn3 , v060 .byte W12 .byte Cn3 @@ -2019,7 +2019,7 @@ bgm_battle20_5: .byte W36 .byte N24 , Cs5 .byte W24 -bgm_battle20_5_B1: +mus_vs_trainer_5_B1: .byte W96 .byte W96 .byte W96 @@ -2072,21 +2072,21 @@ bgm_battle20_5_B1: .byte W03 .byte MOD , 6 .byte W15 - .byte VOL , 73*bgm_battle20_mvl/mxv + .byte VOL , 73*mus_vs_trainer_mvl/mxv .byte W09 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte W06 - .byte 59*bgm_battle20_mvl/mxv + .byte 59*mus_vs_trainer_mvl/mxv .byte W09 - .byte 50*bgm_battle20_mvl/mxv + .byte 50*mus_vs_trainer_mvl/mxv .byte W06 - .byte 40*bgm_battle20_mvl/mxv + .byte 40*mus_vs_trainer_mvl/mxv .byte W06 - .byte 26*bgm_battle20_mvl/mxv + .byte 26*mus_vs_trainer_mvl/mxv .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -2099,7 +2099,7 @@ bgm_battle20_5_B1: .byte W12 .byte N03 .byte W12 -bgm_battle20_5_000: +mus_vs_trainer_5_000: .byte N03 , Gn2 , v072 .byte W12 .byte N03 @@ -2115,7 +2115,7 @@ bgm_battle20_5_000: .byte N03 .byte W12 .byte PEND -bgm_battle20_5_001: +mus_vs_trainer_5_001: .byte N03 , Fn2 , v072 .byte W12 .byte N03 @@ -2131,7 +2131,7 @@ bgm_battle20_5_001: .byte N03 .byte W12 .byte PEND -bgm_battle20_5_002: +mus_vs_trainer_5_002: .byte N03 , As2 , v072 .byte W12 .byte N03 @@ -2148,15 +2148,15 @@ bgm_battle20_5_002: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_5_000 + .word mus_vs_trainer_5_000 .byte PATT - .word bgm_battle20_5_000 + .word mus_vs_trainer_5_000 .byte PATT - .word bgm_battle20_5_001 + .word mus_vs_trainer_5_001 .byte PATT - .word bgm_battle20_5_002 + .word mus_vs_trainer_5_002 .byte PATT - .word bgm_battle20_5_000 + .word mus_vs_trainer_5_000 .byte VOICE , 4 .byte N36 , Cn4 , v072 .byte W36 @@ -2322,28 +2322,28 @@ bgm_battle20_5_002: .byte W12 .byte N12 .byte W12 - .byte VOL , 75*bgm_battle20_mvl/mxv + .byte VOL , 75*mus_vs_trainer_mvl/mxv .byte N12 .byte W06 - .byte VOL , 71*bgm_battle20_mvl/mxv + .byte VOL , 71*mus_vs_trainer_mvl/mxv .byte W06 - .byte 66*bgm_battle20_mvl/mxv + .byte 66*mus_vs_trainer_mvl/mxv .byte N12 .byte W06 - .byte VOL , 60*bgm_battle20_mvl/mxv + .byte VOL , 60*mus_vs_trainer_mvl/mxv .byte W06 - .byte 53*bgm_battle20_mvl/mxv + .byte 53*mus_vs_trainer_mvl/mxv .byte N12 .byte W06 - .byte VOL , 45*bgm_battle20_mvl/mxv + .byte VOL , 45*mus_vs_trainer_mvl/mxv .byte W06 - .byte 35*bgm_battle20_mvl/mxv + .byte 35*mus_vs_trainer_mvl/mxv .byte N09 .byte W06 - .byte VOL , 24*bgm_battle20_mvl/mxv + .byte VOL , 24*mus_vs_trainer_mvl/mxv .byte W06 .byte VOICE , 5 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte BEND , c_v-3 .byte W06 .byte N12 , Fn4 , v032 @@ -2362,7 +2362,7 @@ bgm_battle20_5_002: .byte W12 .byte Cn4 .byte W06 -bgm_battle20_5_003: +mus_vs_trainer_5_003: .byte W06 .byte N12 , Fn4 , v032 .byte W12 @@ -2381,7 +2381,7 @@ bgm_battle20_5_003: .byte Cn4 .byte W06 .byte PEND -bgm_battle20_5_004: +mus_vs_trainer_5_004: .byte W06 .byte N12 , En4 , v032 .byte W12 @@ -2401,9 +2401,9 @@ bgm_battle20_5_004: .byte W06 .byte PEND .byte PATT - .word bgm_battle20_5_004 + .word mus_vs_trainer_5_004 .byte PATT - .word bgm_battle20_5_003 + .word mus_vs_trainer_5_003 .byte W06 .byte N12 , Fn4 , v020 .byte W12 @@ -2487,15 +2487,15 @@ bgm_battle20_5_004: .byte N24 , As3 .byte W24 .byte GOTO - .word bgm_battle20_5_B1 + .word mus_vs_trainer_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle20_6: - .byte KEYSH , bgm_battle20_key+0 +mus_vs_trainer_6: + .byte KEYSH , mus_vs_trainer_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte W24 .byte N06 , Cn2 , v080 .byte W06 @@ -2553,7 +2553,7 @@ bgm_battle20_6: .byte W96 .byte W96 .byte W96 -bgm_battle20_6_B1: +mus_vs_trainer_6_B1: .byte W96 .byte W96 .byte W96 @@ -2624,21 +2624,21 @@ bgm_battle20_6_B1: .byte W96 .byte W96 .byte GOTO - .word bgm_battle20_6_B1 + .word mus_vs_trainer_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle20_7: - .byte KEYSH , bgm_battle20_key+0 +mus_vs_trainer_7: + .byte KEYSH , mus_vs_trainer_key+0 .byte VOICE , 0 .byte PAN , c_v+0 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte W96 .byte W84 .byte N12 , Dn1 , v112 .byte W12 -bgm_battle20_7_000: +mus_vs_trainer_7_000: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2646,24 +2646,24 @@ bgm_battle20_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 -bgm_battle20_7_B1: + .word mus_vs_trainer_7_000 +mus_vs_trainer_7_B1: .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W72 @@ -2671,9 +2671,9 @@ bgm_battle20_7_B1: .byte N12 .byte W72 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W72 @@ -2681,8 +2681,8 @@ bgm_battle20_7_B1: .byte N12 .byte W72 .byte PATT - .word bgm_battle20_7_000 -bgm_battle20_7_001: + .word mus_vs_trainer_7_000 +mus_vs_trainer_7_001: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -2692,44 +2692,44 @@ bgm_battle20_7_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_001 + .word mus_vs_trainer_7_001 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 -bgm_battle20_7_002: + .word mus_vs_trainer_7_000 +mus_vs_trainer_7_002: .byte W24 .byte N12 , Dn1 , v112 .byte W12 @@ -2741,13 +2741,13 @@ bgm_battle20_7_002: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_001 + .word mus_vs_trainer_7_001 .byte W96 .byte W96 .byte W96 @@ -2763,11 +2763,11 @@ bgm_battle20_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte W24 .byte N48 , An2 , v100 .byte W48 @@ -2776,48 +2776,48 @@ bgm_battle20_7_002: .byte N12 .byte W12 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_001 + .word mus_vs_trainer_7_001 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_000 + .word mus_vs_trainer_7_000 .byte PATT - .word bgm_battle20_7_002 + .word mus_vs_trainer_7_002 .byte GOTO - .word bgm_battle20_7_B1 + .word mus_vs_trainer_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle20_8: - .byte KEYSH , bgm_battle20_key+0 +mus_vs_trainer_8: + .byte KEYSH , mus_vs_trainer_key+0 .byte VOICE , 47 .byte PAN , c_v+0 - .byte VOL , 80*bgm_battle20_mvl/mxv + .byte VOL , 80*mus_vs_trainer_mvl/mxv .byte N12 , Cn2 , v112 .byte W36 .byte N12 @@ -2833,22 +2833,22 @@ bgm_battle20_8: .byte PAN , c_v+32 .byte N12 .byte W24 -bgm_battle20_8_000: +mus_vs_trainer_8_000: .byte PAN , c_v+0 .byte N12 , Cn2 , v112 .byte W36 .byte N12 .byte W60 .byte PEND -bgm_battle20_8_001: +mus_vs_trainer_8_001: .byte N12 , Cn2 , v112 .byte W36 .byte N12 .byte W60 .byte PEND .byte PATT - .word bgm_battle20_8_001 -bgm_battle20_8_002: + .word mus_vs_trainer_8_001 +mus_vs_trainer_8_002: .byte N12 , Cn2 , v112 .byte W36 .byte N12 @@ -2857,19 +2857,19 @@ bgm_battle20_8_002: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_002 + .word mus_vs_trainer_8_002 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_002 -bgm_battle20_8_B1: + .word mus_vs_trainer_8_002 +mus_vs_trainer_8_B1: .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_002 -bgm_battle20_8_003: + .word mus_vs_trainer_8_002 +mus_vs_trainer_8_003: .byte N12 , Cn2 , v112 .byte W36 .byte N12 @@ -2878,7 +2878,7 @@ bgm_battle20_8_003: .byte N12 , Cn2 , v127 .byte W24 .byte PEND -bgm_battle20_8_004: +mus_vs_trainer_8_004: .byte VOICE , 47 .byte W12 .byte N12 , Cn2 , v112 @@ -2895,11 +2895,11 @@ bgm_battle20_8_004: .byte N12 .byte W60 .byte PATT - .word bgm_battle20_8_002 + .word mus_vs_trainer_8_002 .byte PATT - .word bgm_battle20_8_003 + .word mus_vs_trainer_8_003 .byte PATT - .word bgm_battle20_8_004 + .word mus_vs_trainer_8_004 .byte VOICE , 47 .byte N12 , Cn2 , v112 .byte W36 @@ -2907,7 +2907,7 @@ bgm_battle20_8_004: .byte W48 .byte An1 .byte W12 -bgm_battle20_8_005: +mus_vs_trainer_8_005: .byte N12 , Cn2 , v112 .byte W36 .byte N12 @@ -2916,19 +2916,19 @@ bgm_battle20_8_005: .byte W36 .byte PEND .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_002 + .word mus_vs_trainer_8_002 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_002 + .word mus_vs_trainer_8_002 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_002 + .word mus_vs_trainer_8_002 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte N12 , Cn2 , v112 .byte W36 .byte N12 @@ -2937,7 +2937,7 @@ bgm_battle20_8_005: .byte W06 .byte Cn2 .byte W06 -bgm_battle20_8_006: +mus_vs_trainer_8_006: .byte N12 , Cn2 , v112 .byte W48 .byte N12 @@ -2946,10 +2946,10 @@ bgm_battle20_8_006: .byte W36 .byte PEND .byte PATT - .word bgm_battle20_8_006 + .word mus_vs_trainer_8_006 .byte PATT - .word bgm_battle20_8_006 -bgm_battle20_8_007: + .word mus_vs_trainer_8_006 +mus_vs_trainer_8_007: .byte N12 , Cn2 , v112 .byte W48 .byte N12 @@ -2960,22 +2960,22 @@ bgm_battle20_8_007: .byte W12 .byte PEND .byte PATT - .word bgm_battle20_8_006 + .word mus_vs_trainer_8_006 .byte PATT - .word bgm_battle20_8_006 + .word mus_vs_trainer_8_006 .byte PATT - .word bgm_battle20_8_006 + .word mus_vs_trainer_8_006 .byte PATT - .word bgm_battle20_8_006 + .word mus_vs_trainer_8_006 .byte PATT - .word bgm_battle20_8_006 + .word mus_vs_trainer_8_006 .byte PATT - .word bgm_battle20_8_007 + .word mus_vs_trainer_8_007 .byte PATT - .word bgm_battle20_8_006 + .word mus_vs_trainer_8_006 .byte PATT - .word bgm_battle20_8_006 -bgm_battle20_8_008: + .word mus_vs_trainer_8_006 +mus_vs_trainer_8_008: .byte N12 , Cn2 , v112 .byte W12 .byte N12 @@ -2984,9 +2984,9 @@ bgm_battle20_8_008: .byte W48 .byte PEND .byte PATT - .word bgm_battle20_8_008 + .word mus_vs_trainer_8_008 .byte PATT - .word bgm_battle20_8_008 + .word mus_vs_trainer_8_008 .byte N12 , Cn2 , v112 .byte W12 .byte N12 @@ -3106,9 +3106,9 @@ bgm_battle20_8_008: .byte N12 .byte W36 .byte PATT - .word bgm_battle20_8_000 + .word mus_vs_trainer_8_000 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte N09 , Cn2 , v112 .byte W36 .byte N12 @@ -3116,61 +3116,61 @@ bgm_battle20_8_008: .byte N12 .byte W96 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_002 + .word mus_vs_trainer_8_002 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_002 + .word mus_vs_trainer_8_002 .byte PATT - .word bgm_battle20_8_005 + .word mus_vs_trainer_8_005 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte PATT - .word bgm_battle20_8_001 + .word mus_vs_trainer_8_001 .byte N12 , Cn2 , v112 .byte W48 .byte N12 .byte W48 .byte GOTO - .word bgm_battle20_8_B1 + .word mus_vs_trainer_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle20: +mus_vs_trainer: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle20_pri @ Priority - .byte bgm_battle20_rev @ Reverb. + .byte mus_vs_trainer_pri @ Priority + .byte mus_vs_trainer_rev @ Reverb. - .word bgm_battle20_grp + .word mus_vs_trainer_grp - .word bgm_battle20_1 - .word bgm_battle20_2 - .word bgm_battle20_3 - .word bgm_battle20_4 - .word bgm_battle20_5 - .word bgm_battle20_6 - .word bgm_battle20_7 - .word bgm_battle20_8 + .word mus_vs_trainer_1 + .word mus_vs_trainer_2 + .word mus_vs_trainer_3 + .word mus_vs_trainer_4 + .word mus_vs_trainer_5 + .word mus_vs_trainer_6 + .word mus_vs_trainer_7 + .word mus_vs_trainer_8 .end diff --git a/sound/songs/bgm_battle27.s b/sound/songs/mus_vs_wild.s index 9960267d8..635204135 100644 --- a/sound/songs/bgm_battle27.s +++ b/sound/songs/mus_vs_wild.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ bgm_battle27_grp, voicegroup100 - .equ bgm_battle27_pri, 1 - .equ bgm_battle27_rev, reverb_set+50 - .equ bgm_battle27_mvl, 127 - .equ bgm_battle27_key, 0 - .equ bgm_battle27_tbs, 1 - .equ bgm_battle27_exg, 0 - .equ bgm_battle27_cmp, 1 + .equ mus_vs_wild_grp, voicegroup100 + .equ mus_vs_wild_pri, 1 + .equ mus_vs_wild_rev, reverb_set+50 + .equ mus_vs_wild_mvl, 127 + .equ mus_vs_wild_key, 0 + .equ mus_vs_wild_tbs, 1 + .equ mus_vs_wild_exg, 0 + .equ mus_vs_wild_cmp, 1 .section .rodata - .global bgm_battle27 + .global mus_vs_wild .align 2 @********************** Track 1 **********************@ -bgm_battle27_1: - .byte KEYSH , bgm_battle27_key+0 - .byte TEMPO , 196*bgm_battle27_tbs/2 +mus_vs_wild_1: + .byte KEYSH , mus_vs_wild_key+0 + .byte TEMPO , 196*mus_vs_wild_tbs/2 .byte VOICE , 48 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte LFOS , 18 .byte PAN , c_v+0 .byte N06 , Cn5 , v108 @@ -112,7 +112,7 @@ bgm_battle27_1: .byte W36 .byte N24 , Bn3 .byte W24 -bgm_battle27_1_000: +mus_vs_wild_1_000: .byte VOICE , 56 .byte N12 , Gn4 , v092 .byte W36 @@ -121,7 +121,7 @@ bgm_battle27_1_000: .byte Gn4 .byte W24 .byte PEND -bgm_battle27_1_001: +mus_vs_wild_1_001: .byte N12 , Gs4 , v092 .byte W36 .byte Fn4 @@ -129,7 +129,7 @@ bgm_battle27_1_001: .byte Gs4 .byte W24 .byte PEND -bgm_battle27_1_002: +mus_vs_wild_1_002: .byte N12 , Gn4 , v092 .byte W36 .byte Cn4 @@ -145,7 +145,7 @@ bgm_battle27_1_002: .byte W12 .byte MOD , 5 .byte W12 -bgm_battle27_1_003: +mus_vs_wild_1_003: .byte VOICE , 48 .byte MOD , 0 .byte N12 , Cn3 , v092 @@ -161,7 +161,7 @@ bgm_battle27_1_003: .byte N24 , En3 .byte W24 .byte PEND -bgm_battle27_1_B1: +mus_vs_wild_1_B1: .byte N12 , Fn3 , v092 .byte W12 .byte En3 @@ -176,7 +176,7 @@ bgm_battle27_1_B1: .byte W12 .byte En3 .byte W12 -bgm_battle27_1_004: +mus_vs_wild_1_004: .byte VOICE , 56 .byte N48 , Fn3 , v092 .byte W24 @@ -233,7 +233,7 @@ bgm_battle27_1_004: .byte Fn3 .byte W12 .byte PATT - .word bgm_battle27_1_004 + .word mus_vs_wild_1_004 .byte MOD , 0 .byte N36 , Dn4 , v092 .byte W18 @@ -284,7 +284,7 @@ bgm_battle27_1_004: .byte W24 .byte N96 , En4 .byte W96 -bgm_battle27_1_005: +mus_vs_wild_1_005: .byte N72 , Cn4 , v092 .byte W72 .byte N24 , Gn3 @@ -292,16 +292,16 @@ bgm_battle27_1_005: .byte PEND .byte N60 , En4 .byte W30 - .byte VOL , 76*bgm_battle27_mvl/mxv + .byte VOL , 76*mus_vs_wild_mvl/mxv .byte W09 - .byte 72*bgm_battle27_mvl/mxv + .byte 72*mus_vs_wild_mvl/mxv .byte W06 - .byte 61*bgm_battle27_mvl/mxv + .byte 61*mus_vs_wild_mvl/mxv .byte W09 - .byte 49*bgm_battle27_mvl/mxv + .byte 49*mus_vs_wild_mvl/mxv .byte W06 .byte VOICE , 56 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte N12 .byte W12 .byte Fn4 @@ -320,23 +320,23 @@ bgm_battle27_1_005: .byte Bn3 .byte W24 .byte PATT - .word bgm_battle27_1_005 + .word mus_vs_wild_1_005 .byte N60 , En4 , v092 .byte W21 - .byte VOL , 76*bgm_battle27_mvl/mxv + .byte VOL , 76*mus_vs_wild_mvl/mxv .byte W09 - .byte 73*bgm_battle27_mvl/mxv + .byte 73*mus_vs_wild_mvl/mxv .byte W06 - .byte 68*bgm_battle27_mvl/mxv + .byte 68*mus_vs_wild_mvl/mxv .byte W06 - .byte 59*bgm_battle27_mvl/mxv + .byte 59*mus_vs_wild_mvl/mxv .byte W06 - .byte 45*bgm_battle27_mvl/mxv + .byte 45*mus_vs_wild_mvl/mxv .byte W06 - .byte 30*bgm_battle27_mvl/mxv + .byte 30*mus_vs_wild_mvl/mxv .byte W06 .byte VOICE , 56 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte N12 .byte W12 .byte Gn4 @@ -387,11 +387,11 @@ bgm_battle27_1_005: .byte N24 , Bn2 .byte W24 .byte PATT - .word bgm_battle27_1_000 + .word mus_vs_wild_1_000 .byte PATT - .word bgm_battle27_1_001 + .word mus_vs_wild_1_001 .byte PATT - .word bgm_battle27_1_002 + .word mus_vs_wild_1_002 .byte N12 , Gs4 , v092 .byte W36 .byte Fn4 @@ -401,17 +401,17 @@ bgm_battle27_1_005: .byte MOD , 5 .byte W12 .byte PATT - .word bgm_battle27_1_003 + .word mus_vs_wild_1_003 .byte GOTO - .word bgm_battle27_1_B1 + .word mus_vs_wild_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_battle27_2: - .byte KEYSH , bgm_battle27_key+0 +mus_vs_wild_2: + .byte KEYSH , mus_vs_wild_key+0 .byte VOICE , 46 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte LFOS , 18 .byte PAN , c_v-16 .byte N06 , Gn5 , v100 @@ -495,7 +495,7 @@ bgm_battle27_2: .byte W36 .byte N24 , Fn4 .byte W24 -bgm_battle27_2_000: +mus_vs_wild_2_000: .byte VOICE , 56 .byte N12 , Cn5 , v100 .byte W36 @@ -504,7 +504,7 @@ bgm_battle27_2_000: .byte Cn5 .byte W24 .byte PEND -bgm_battle27_2_001: +mus_vs_wild_2_001: .byte N12 , Cs5 , v100 .byte W36 .byte Ds5 @@ -512,7 +512,7 @@ bgm_battle27_2_001: .byte Cs5 .byte W24 .byte PEND -bgm_battle27_2_002: +mus_vs_wild_2_002: .byte N12 , Cn5 , v100 .byte W36 .byte Gn4 @@ -520,7 +520,7 @@ bgm_battle27_2_002: .byte Cn5 .byte W24 .byte PEND -bgm_battle27_2_003: +mus_vs_wild_2_003: .byte N12 , Cs5 , v100 .byte W36 .byte Ds5 @@ -530,7 +530,7 @@ bgm_battle27_2_003: .byte MOD , 5 .byte W12 .byte PEND -bgm_battle27_2_004: +mus_vs_wild_2_004: .byte PAN , c_v+0 .byte MOD , 0 .byte N36 , Cn4 , v100 @@ -548,7 +548,7 @@ bgm_battle27_2_004: .byte MOD , 5 .byte W09 .byte PEND -bgm_battle27_2_B1: +mus_vs_wild_2_B1: .byte MOD , 0 .byte N12 , Fn4 , v100 .byte W12 @@ -566,7 +566,7 @@ bgm_battle27_2_B1: .byte W12 .byte Gn3 .byte W12 -bgm_battle27_2_005: +mus_vs_wild_2_005: .byte N48 , As3 , v100 .byte W24 .byte MOD , 5 @@ -628,7 +628,7 @@ bgm_battle27_2_005: .byte Cn4 .byte W12 .byte PATT - .word bgm_battle27_2_005 + .word mus_vs_wild_2_005 .byte MOD , 0 .byte N36 , Fn4 , v100 .byte W18 @@ -653,38 +653,38 @@ bgm_battle27_2_005: .byte W24 .byte N96 , Gn4 .byte W48 - .byte VOL , 76*bgm_battle27_mvl/mxv + .byte VOL , 76*mus_vs_wild_mvl/mxv .byte W09 - .byte 72*bgm_battle27_mvl/mxv + .byte 72*mus_vs_wild_mvl/mxv .byte W09 - .byte 66*bgm_battle27_mvl/mxv + .byte 66*mus_vs_wild_mvl/mxv .byte W09 - .byte 57*bgm_battle27_mvl/mxv + .byte 57*mus_vs_wild_mvl/mxv .byte W09 - .byte 39*bgm_battle27_mvl/mxv + .byte 39*mus_vs_wild_mvl/mxv .byte W06 - .byte 20*bgm_battle27_mvl/mxv + .byte 20*mus_vs_wild_mvl/mxv .byte W06 - .byte 80*bgm_battle27_mvl/mxv + .byte 80*mus_vs_wild_mvl/mxv .byte N72 , Dn4 .byte W72 .byte N24 , As3 .byte W24 .byte N96 , Fn4 .byte W48 - .byte VOL , 76*bgm_battle27_mvl/mxv + .byte VOL , 76*mus_vs_wild_mvl/mxv .byte W09 - .byte 72*bgm_battle27_mvl/mxv + .byte 72*mus_vs_wild_mvl/mxv .byte W09 - .byte 66*bgm_battle27_mvl/mxv + .byte 66*mus_vs_wild_mvl/mxv .byte W09 - .byte 57*bgm_battle27_mvl/mxv + .byte 57*mus_vs_wild_mvl/mxv .byte W09 - .byte 39*bgm_battle27_mvl/mxv + .byte 39*mus_vs_wild_mvl/mxv .byte W06 - .byte 20*bgm_battle27_mvl/mxv + .byte 20*mus_vs_wild_mvl/mxv .byte W06 - .byte 80*bgm_battle27_mvl/mxv + .byte 80*mus_vs_wild_mvl/mxv .byte N72 , En4 .byte W72 .byte N24 , Cn4 @@ -692,42 +692,42 @@ bgm_battle27_2_005: .byte TIE , Gn4 .byte W96 .byte W48 - .byte VOL , 76*bgm_battle27_mvl/mxv + .byte VOL , 76*mus_vs_wild_mvl/mxv .byte W09 - .byte 72*bgm_battle27_mvl/mxv + .byte 72*mus_vs_wild_mvl/mxv .byte W09 - .byte 66*bgm_battle27_mvl/mxv + .byte 66*mus_vs_wild_mvl/mxv .byte W09 - .byte 57*bgm_battle27_mvl/mxv + .byte 57*mus_vs_wild_mvl/mxv .byte W09 - .byte 39*bgm_battle27_mvl/mxv + .byte 39*mus_vs_wild_mvl/mxv .byte W06 - .byte 20*bgm_battle27_mvl/mxv + .byte 20*mus_vs_wild_mvl/mxv .byte W06 .byte EOT .byte W60 .byte VOICE , 56 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte N12 , Gn4 , v100 .byte W12 .byte An4 .byte W24 .byte N96 , As4 .byte W48 - .byte VOL , 76*bgm_battle27_mvl/mxv + .byte VOL , 76*mus_vs_wild_mvl/mxv .byte MOD , 5 .byte W09 - .byte VOL , 72*bgm_battle27_mvl/mxv + .byte VOL , 72*mus_vs_wild_mvl/mxv .byte W09 - .byte 66*bgm_battle27_mvl/mxv + .byte 66*mus_vs_wild_mvl/mxv .byte W09 - .byte 57*bgm_battle27_mvl/mxv + .byte 57*mus_vs_wild_mvl/mxv .byte W09 - .byte 39*bgm_battle27_mvl/mxv + .byte 39*mus_vs_wild_mvl/mxv .byte W06 - .byte 20*bgm_battle27_mvl/mxv + .byte 20*mus_vs_wild_mvl/mxv .byte W06 - .byte 80*bgm_battle27_mvl/mxv + .byte 80*mus_vs_wild_mvl/mxv .byte MOD , 0 .byte N24 .byte W12 @@ -751,20 +751,20 @@ bgm_battle27_2_005: .byte W24 .byte N60 , Gn4 .byte W21 - .byte VOL , 76*bgm_battle27_mvl/mxv + .byte VOL , 76*mus_vs_wild_mvl/mxv .byte W09 - .byte 73*bgm_battle27_mvl/mxv + .byte 73*mus_vs_wild_mvl/mxv .byte MOD , 5 .byte W06 - .byte VOL , 68*bgm_battle27_mvl/mxv + .byte VOL , 68*mus_vs_wild_mvl/mxv .byte W06 - .byte 59*bgm_battle27_mvl/mxv + .byte 59*mus_vs_wild_mvl/mxv .byte W06 - .byte 45*bgm_battle27_mvl/mxv + .byte 45*mus_vs_wild_mvl/mxv .byte W06 - .byte 30*bgm_battle27_mvl/mxv + .byte 30*mus_vs_wild_mvl/mxv .byte W06 - .byte 80*bgm_battle27_mvl/mxv + .byte 80*mus_vs_wild_mvl/mxv .byte MOD , 0 .byte N12 .byte W12 @@ -823,32 +823,32 @@ bgm_battle27_2_005: .byte N24 , Fn3 .byte W24 .byte PATT - .word bgm_battle27_2_000 + .word mus_vs_wild_2_000 .byte PATT - .word bgm_battle27_2_001 + .word mus_vs_wild_2_001 .byte PATT - .word bgm_battle27_2_002 + .word mus_vs_wild_2_002 .byte PATT - .word bgm_battle27_2_003 + .word mus_vs_wild_2_003 .byte PATT - .word bgm_battle27_2_004 + .word mus_vs_wild_2_004 .byte GOTO - .word bgm_battle27_2_B1 + .word mus_vs_wild_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_battle27_3: - .byte KEYSH , bgm_battle27_key+0 +mus_vs_wild_3: + .byte KEYSH , mus_vs_wild_key+0 .byte VOICE , 33 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte N96 , Gn0 , v108 .byte W96 .byte N48 , As0 .byte W48 .byte Bn0 .byte W48 -bgm_battle27_3_000: +mus_vs_wild_3_000: .byte N12 , Cn1 , v108 .byte W12 .byte Gn0 @@ -864,7 +864,7 @@ bgm_battle27_3_000: .byte Cs1 .byte W12 .byte PEND -bgm_battle27_3_001: +mus_vs_wild_3_001: .byte N12 , Cn1 , v108 .byte W12 .byte Gn0 @@ -881,15 +881,15 @@ bgm_battle27_3_001: .byte W12 .byte PEND .byte PATT - .word bgm_battle27_3_000 + .word mus_vs_wild_3_000 .byte PATT - .word bgm_battle27_3_001 + .word mus_vs_wild_3_001 .byte PATT - .word bgm_battle27_3_000 + .word mus_vs_wild_3_000 .byte PATT - .word bgm_battle27_3_001 + .word mus_vs_wild_3_001 .byte PATT - .word bgm_battle27_3_000 + .word mus_vs_wild_3_000 .byte N12 , Cn1 , v108 .byte W12 .byte Fn1 @@ -904,7 +904,7 @@ bgm_battle27_3_001: .byte W12 .byte Bn0 .byte W12 -bgm_battle27_3_002: +mus_vs_wild_3_002: .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -922,7 +922,7 @@ bgm_battle27_3_002: .byte Gn1 .byte W12 .byte PEND -bgm_battle27_3_B1: +mus_vs_wild_3_B1: .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -937,7 +937,7 @@ bgm_battle27_3_B1: .byte W12 .byte Gn1 .byte W12 -bgm_battle27_3_003: +mus_vs_wild_3_003: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -955,7 +955,7 @@ bgm_battle27_3_003: .byte Fn1 .byte W12 .byte PEND -bgm_battle27_3_004: +mus_vs_wild_3_004: .byte N12 , As0 , v108 .byte W12 .byte Fn1 @@ -972,7 +972,7 @@ bgm_battle27_3_004: .byte W12 .byte PEND .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Gn1 @@ -988,9 +988,9 @@ bgm_battle27_3_004: .byte Cn1 .byte W12 .byte PATT - .word bgm_battle27_3_003 + .word mus_vs_wild_3_003 .byte PATT - .word bgm_battle27_3_004 + .word mus_vs_wild_3_004 .byte N12 , En1 , v108 .byte W12 .byte Gn1 @@ -1008,7 +1008,7 @@ bgm_battle27_3_004: .byte Gn1 .byte W12 .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte N12 , Dn1 , v108 .byte W12 .byte Fn1 @@ -1039,7 +1039,7 @@ bgm_battle27_3_004: .byte W12 .byte Bn0 .byte W12 -bgm_battle27_3_005: +mus_vs_wild_3_005: .byte N12 , Cn1 , v108 .byte W12 .byte En1 @@ -1070,7 +1070,7 @@ bgm_battle27_3_005: .byte En1 .byte W36 .byte PATT - .word bgm_battle27_3_005 + .word mus_vs_wild_3_005 .byte N12 , Cn1 , v108 .byte W12 .byte Gn0 @@ -1119,7 +1119,7 @@ bgm_battle27_3_005: .byte W12 .byte As1 .byte W12 -bgm_battle27_3_006: +mus_vs_wild_3_006: .byte N12 , Gn1 , v108 .byte W12 .byte Cn2 @@ -1138,8 +1138,8 @@ bgm_battle27_3_006: .byte W12 .byte PEND .byte PATT - .word bgm_battle27_3_006 -bgm_battle27_3_007: + .word mus_vs_wild_3_006 +mus_vs_wild_3_007: .byte N12 , Gs1 , v108 .byte W12 .byte Cs2 @@ -1158,9 +1158,9 @@ bgm_battle27_3_007: .byte W12 .byte PEND .byte PATT - .word bgm_battle27_3_007 + .word mus_vs_wild_3_007 .byte PATT - .word bgm_battle27_3_006 + .word mus_vs_wild_3_006 .byte N12 , Gn1 , v108 .byte W12 .byte Cn2 @@ -1178,11 +1178,11 @@ bgm_battle27_3_007: .byte Cn2 .byte W12 .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Ds1 @@ -1198,11 +1198,11 @@ bgm_battle27_3_007: .byte Bn0 .byte W12 .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte N12 , Cn1 , v108 .byte W12 .byte Ds1 @@ -1218,17 +1218,17 @@ bgm_battle27_3_007: .byte Gn1 .byte W12 .byte PATT - .word bgm_battle27_3_002 + .word mus_vs_wild_3_002 .byte GOTO - .word bgm_battle27_3_B1 + .word mus_vs_wild_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_battle27_4: - .byte KEYSH , bgm_battle27_key+0 +mus_vs_wild_4: + .byte KEYSH , mus_vs_wild_key+0 .byte VOICE , 4 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte LFOS , 18 .byte XCMD , xIECV , 10 .byte xIECL , 8 @@ -1283,7 +1283,7 @@ bgm_battle27_4: .byte W36 .byte N24 , Fn3 .byte W24 -bgm_battle27_4_000: +mus_vs_wild_4_000: .byte N12 , Cn4 , v060 .byte W36 .byte Gn3 @@ -1298,14 +1298,14 @@ bgm_battle27_4_000: .byte Cs4 .byte W24 .byte PATT - .word bgm_battle27_4_000 + .word mus_vs_wild_4_000 .byte N12 , Cs4 , v060 .byte W36 .byte Ds4 .byte W36 .byte N24 , Fn4 .byte W24 -bgm_battle27_4_001: +mus_vs_wild_4_001: .byte VOICE , 80 .byte PAN , c_v+48 .byte N12 , Gn2 , v060 @@ -1315,8 +1315,8 @@ bgm_battle27_4_001: .byte N12 .byte W24 .byte PEND -bgm_battle27_4_B1: -bgm_battle27_4_002: +mus_vs_wild_4_B1: +mus_vs_wild_4_002: .byte N12 , Gn2 , v060 .byte W24 .byte N36 @@ -1337,7 +1337,7 @@ bgm_battle27_4_002: .byte N24 , Fn2 .byte W24 .byte PATT - .word bgm_battle27_4_002 + .word mus_vs_wild_4_002 .byte N12 , Gn2 , v060 .byte W24 .byte N36 @@ -1425,7 +1425,7 @@ bgm_battle27_4_002: .byte W12 .byte N24 , Bn3 .byte W24 -bgm_battle27_4_003: +mus_vs_wild_4_003: .byte N12 , Cn4 , v072 .byte W12 .byte Gn3 @@ -1456,7 +1456,7 @@ bgm_battle27_4_003: .byte Bn3 .byte W12 .byte PATT - .word bgm_battle27_4_003 + .word mus_vs_wild_4_003 .byte N12 , Cn4 , v072 .byte W12 .byte Gn3 @@ -1472,17 +1472,17 @@ bgm_battle27_4_003: .byte Bn3 .byte W12 .byte PATT - .word bgm_battle27_4_001 + .word mus_vs_wild_4_001 .byte GOTO - .word bgm_battle27_4_B1 + .word mus_vs_wild_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_battle27_5: - .byte KEYSH , bgm_battle27_key+0 +mus_vs_wild_5: + .byte KEYSH , mus_vs_wild_key+0 .byte VOICE , 81 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cn3 , v064 .byte W12 @@ -1527,7 +1527,7 @@ bgm_battle27_5: .byte PAN , c_v+0 .byte N12 , Gn5 , v048 .byte W96 -bgm_battle27_5_B1: +mus_vs_wild_5_B1: .byte PAN , c_v-48 .byte W96 .byte N48 , Dn3 , v064 @@ -1598,7 +1598,7 @@ bgm_battle27_5_B1: .byte W24 .byte Cn3 .byte W24 -bgm_battle27_5_000: +mus_vs_wild_5_000: .byte N24 , En3 , v064 .byte W24 .byte Gn2 @@ -1633,7 +1633,7 @@ bgm_battle27_5_000: .byte Fn3 .byte W24 .byte PATT - .word bgm_battle27_5_000 + .word mus_vs_wild_5_000 .byte N48 , Gn3 , v064 .byte W48 .byte Cn4 @@ -1649,14 +1649,14 @@ bgm_battle27_5_000: .byte PAN , c_v+0 .byte W96 .byte GOTO - .word bgm_battle27_5_B1 + .word mus_vs_wild_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_battle27_6: - .byte KEYSH , bgm_battle27_key+0 - .byte VOL , 80*bgm_battle27_mvl/mxv +mus_vs_wild_6: + .byte KEYSH , mus_vs_wild_key+0 + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte W96 .byte W96 .byte W96 @@ -1668,7 +1668,7 @@ bgm_battle27_6: .byte W96 .byte W96 .byte W96 -bgm_battle27_6_B1: +mus_vs_wild_6_B1: .byte W96 .byte W96 .byte W96 @@ -1784,22 +1784,22 @@ bgm_battle27_6_B1: .byte W12 .byte W96 .byte GOTO - .word bgm_battle27_6_B1 + .word mus_vs_wild_6_B1 .byte FINE @********************** Track 7 **********************@ -bgm_battle27_7: - .byte KEYSH , bgm_battle27_key+0 +mus_vs_wild_7: + .byte KEYSH , mus_vs_wild_key+0 .byte VOICE , 0 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte W96 .byte W72 .byte N12 , Dn1 , v112 .byte W12 .byte N12 .byte W12 -bgm_battle27_7_000: +mus_vs_wild_7_000: .byte W24 .byte N12 , Dn1 , v112 .byte W48 @@ -1807,50 +1807,50 @@ bgm_battle27_7_000: .byte W24 .byte PEND .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 -bgm_battle27_7_B1: + .word mus_vs_wild_7_000 +mus_vs_wild_7_B1: .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte W24 .byte N12 , Dn1 , v112 .byte W24 @@ -1861,49 +1861,49 @@ bgm_battle27_7_B1: .byte N12 .byte W12 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte PATT - .word bgm_battle27_7_000 + .word mus_vs_wild_7_000 .byte GOTO - .word bgm_battle27_7_B1 + .word mus_vs_wild_7_B1 .byte FINE @********************** Track 8 **********************@ -bgm_battle27_8: - .byte KEYSH , bgm_battle27_key+0 +mus_vs_wild_8: + .byte KEYSH , mus_vs_wild_key+0 .byte VOICE , 47 - .byte VOL , 80*bgm_battle27_mvl/mxv + .byte VOL , 80*mus_vs_wild_mvl/mxv .byte PAN , c_v-10 .byte W96 .byte N12 , Cn2 , v112 @@ -1912,7 +1912,7 @@ bgm_battle27_8: .byte W24 .byte N12 .byte W48 -bgm_battle27_8_000: +mus_vs_wild_8_000: .byte N12 , Cn2 , v112 .byte W48 .byte N12 @@ -1921,110 +1921,110 @@ bgm_battle27_8_000: .byte W36 .byte PEND .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 -bgm_battle27_8_B1: + .word mus_vs_wild_8_000 +mus_vs_wild_8_B1: .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte N12 , Cn2 , v112 .byte W60 .byte N12 .byte W36 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte PATT - .word bgm_battle27_8_000 + .word mus_vs_wild_8_000 .byte GOTO - .word bgm_battle27_8_B1 + .word mus_vs_wild_8_B1 .byte FINE @******************************************************@ .align 2 -bgm_battle27: +mus_vs_wild: .byte 8 @ NumTrks .byte 0 @ NumBlks - .byte bgm_battle27_pri @ Priority - .byte bgm_battle27_rev @ Reverb. + .byte mus_vs_wild_pri @ Priority + .byte mus_vs_wild_rev @ Reverb. - .word bgm_battle27_grp + .word mus_vs_wild_grp - .word bgm_battle27_1 - .word bgm_battle27_2 - .word bgm_battle27_3 - .word bgm_battle27_4 - .word bgm_battle27_5 - .word bgm_battle27_6 - .word bgm_battle27_7 - .word bgm_battle27_8 + .word mus_vs_wild_1 + .word mus_vs_wild_2 + .word mus_vs_wild_3 + .word mus_vs_wild_4 + .word mus_vs_wild_5 + .word mus_vs_wild_6 + .word mus_vs_wild_7 + .word mus_vs_wild_8 .end diff --git a/sound/songs/bgm_hideri.s b/sound/songs/mus_weather_groudon.s index fee95288a..88d63ff0c 100644 --- a/sound/songs/bgm_hideri.s +++ b/sound/songs/mus_weather_groudon.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ bgm_hideri_grp, voicegroup087 - .equ bgm_hideri_pri, 0 - .equ bgm_hideri_rev, reverb_set+50 - .equ bgm_hideri_mvl, 127 - .equ bgm_hideri_key, 0 - .equ bgm_hideri_tbs, 1 - .equ bgm_hideri_exg, 0 - .equ bgm_hideri_cmp, 1 + .equ mus_weather_groudon_grp, voicegroup087 + .equ mus_weather_groudon_pri, 0 + .equ mus_weather_groudon_rev, reverb_set+50 + .equ mus_weather_groudon_mvl, 127 + .equ mus_weather_groudon_key, 0 + .equ mus_weather_groudon_tbs, 1 + .equ mus_weather_groudon_exg, 0 + .equ mus_weather_groudon_cmp, 1 .section .rodata - .global bgm_hideri + .global mus_weather_groudon .align 2 @********************** Track 1 **********************@ -bgm_hideri_1: - .byte KEYSH , bgm_hideri_key+0 -bgm_hideri_1_B1: - .byte TEMPO , 78*bgm_hideri_tbs/2 +mus_weather_groudon_1: + .byte KEYSH , mus_weather_groudon_key+0 +mus_weather_groudon_1_B1: + .byte TEMPO , 78*mus_weather_groudon_tbs/2 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-64 - .byte VOL , 39*bgm_hideri_mvl/mxv + .byte VOL , 39*mus_weather_groudon_mvl/mxv .byte BEND , c_v+2 .byte N03 , Ds6 , v112 .byte W12 @@ -43,7 +43,7 @@ bgm_hideri_1_B1: .byte W12 .byte Fs5 .byte W12 -bgm_hideri_1_000: +mus_weather_groudon_1_000: .byte N03 , Ds6 , v096 .byte W12 .byte Fs5 , v064 @@ -61,7 +61,7 @@ bgm_hideri_1_000: .byte Fs5 .byte W12 .byte PEND -bgm_hideri_1_001: +mus_weather_groudon_1_001: .byte N03 , Fn6 , v096 .byte W12 .byte Gs5 , v064 @@ -80,16 +80,16 @@ bgm_hideri_1_001: .byte W12 .byte PEND .byte PATT - .word bgm_hideri_1_001 + .word mus_weather_groudon_1_001 .byte PATT - .word bgm_hideri_1_000 + .word mus_weather_groudon_1_000 .byte PATT - .word bgm_hideri_1_000 + .word mus_weather_groudon_1_000 .byte PATT - .word bgm_hideri_1_001 + .word mus_weather_groudon_1_001 .byte PATT - .word bgm_hideri_1_001 -bgm_hideri_1_002: + .word mus_weather_groudon_1_001 +mus_weather_groudon_1_002: .byte N03 , Ds6 , v096 .byte W09 .byte Ds6 , v064 @@ -124,8 +124,8 @@ bgm_hideri_1_002: .byte W03 .byte PEND .byte PATT - .word bgm_hideri_1_002 -bgm_hideri_1_003: + .word mus_weather_groudon_1_002 +mus_weather_groudon_1_003: .byte N03 , Fn6 , v096 .byte W09 .byte Fn6 , v064 @@ -160,31 +160,31 @@ bgm_hideri_1_003: .byte W03 .byte PEND .byte PATT - .word bgm_hideri_1_003 + .word mus_weather_groudon_1_003 .byte PATT - .word bgm_hideri_1_002 + .word mus_weather_groudon_1_002 .byte PATT - .word bgm_hideri_1_002 + .word mus_weather_groudon_1_002 .byte PATT - .word bgm_hideri_1_003 + .word mus_weather_groudon_1_003 .byte PATT - .word bgm_hideri_1_003 + .word mus_weather_groudon_1_003 .byte GOTO - .word bgm_hideri_1_B1 + .word mus_weather_groudon_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_hideri_2: - .byte KEYSH , bgm_hideri_key+0 -bgm_hideri_2_B1: +mus_weather_groudon_2: + .byte KEYSH , mus_weather_groudon_key+0 +mus_weather_groudon_2_B1: .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+63 - .byte VOL , 39*bgm_hideri_mvl/mxv + .byte VOL , 39*mus_weather_groudon_mvl/mxv .byte N03 , Ds6 , v112 .byte W12 .byte Fs5 , v064 @@ -201,7 +201,7 @@ bgm_hideri_2_B1: .byte W12 .byte Fs5 .byte W12 -bgm_hideri_2_000: +mus_weather_groudon_2_000: .byte N03 , Ds6 , v096 .byte W12 .byte Fs5 , v064 @@ -219,7 +219,7 @@ bgm_hideri_2_000: .byte Fs5 .byte W12 .byte PEND -bgm_hideri_2_001: +mus_weather_groudon_2_001: .byte N03 , Fn6 , v096 .byte W12 .byte Gs5 , v064 @@ -238,7 +238,7 @@ bgm_hideri_2_001: .byte W12 .byte PEND .byte PATT - .word bgm_hideri_2_001 + .word mus_weather_groudon_2_001 .byte BEND , c_v-2 .byte N03 , Ds6 , v096 .byte W12 @@ -257,12 +257,12 @@ bgm_hideri_2_001: .byte Fs5 .byte W12 .byte PATT - .word bgm_hideri_2_000 + .word mus_weather_groudon_2_000 .byte PATT - .word bgm_hideri_2_001 + .word mus_weather_groudon_2_001 .byte PATT - .word bgm_hideri_2_001 -bgm_hideri_2_002: + .word mus_weather_groudon_2_001 +mus_weather_groudon_2_002: .byte N03 , Ds6 , v096 .byte W09 .byte Ds6 , v064 @@ -297,8 +297,8 @@ bgm_hideri_2_002: .byte W03 .byte PEND .byte PATT - .word bgm_hideri_2_002 -bgm_hideri_2_003: + .word mus_weather_groudon_2_002 +mus_weather_groudon_2_003: .byte N03 , Fn6 , v096 .byte W09 .byte Fn6 , v064 @@ -333,8 +333,8 @@ bgm_hideri_2_003: .byte W03 .byte PEND .byte PATT - .word bgm_hideri_2_003 -bgm_hideri_2_004: + .word mus_weather_groudon_2_003 +mus_weather_groudon_2_004: .byte W02 .byte N03 , Ds6 , v096 .byte W09 @@ -370,7 +370,7 @@ bgm_hideri_2_004: .byte W01 .byte PEND .byte PATT - .word bgm_hideri_2_004 + .word mus_weather_groudon_2_004 .byte W02 .byte N03 , Fn6 , v096 .byte W09 @@ -436,21 +436,21 @@ bgm_hideri_2_004: .byte Gs5 .byte W10 .byte GOTO - .word bgm_hideri_2_B1 + .word mus_weather_groudon_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_hideri_3: - .byte KEYSH , bgm_hideri_key+0 -bgm_hideri_3_B1: +mus_weather_groudon_3: + .byte KEYSH , mus_weather_groudon_key+0 +mus_weather_groudon_3_B1: .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 50*bgm_hideri_mvl/mxv + .byte VOL , 50*mus_weather_groudon_mvl/mxv .byte N92 , Dn1 , v064 .byte W48 .byte MOD , 6 @@ -461,7 +461,7 @@ bgm_hideri_3_B1: .byte W02 .byte Cs1 .byte W02 -bgm_hideri_3_000: +mus_weather_groudon_3_000: .byte MOD , 0 .byte N92 , Dn1 , v064 .byte W48 @@ -473,7 +473,7 @@ bgm_hideri_3_000: .byte N04 , Ds1 .byte W04 .byte PEND -bgm_hideri_3_001: +mus_weather_groudon_3_001: .byte MOD , 0 .byte N92 , En1 , v064 .byte W48 @@ -487,7 +487,7 @@ bgm_hideri_3_001: .byte Fn1 .byte W02 .byte PEND -bgm_hideri_3_002: +mus_weather_groudon_3_002: .byte MOD , 0 .byte N44 , En1 , v064 .byte W24 @@ -504,7 +504,7 @@ bgm_hideri_3_002: .byte MOD , 6 .byte W24 .byte PEND -bgm_hideri_3_003: +mus_weather_groudon_3_003: .byte MOD , 0 .byte N92 , Dn1 , v064 .byte W48 @@ -518,45 +518,45 @@ bgm_hideri_3_003: .byte W02 .byte PEND .byte PATT - .word bgm_hideri_3_000 + .word mus_weather_groudon_3_000 .byte PATT - .word bgm_hideri_3_001 + .word mus_weather_groudon_3_001 .byte PATT - .word bgm_hideri_3_002 + .word mus_weather_groudon_3_002 .byte PATT - .word bgm_hideri_3_003 + .word mus_weather_groudon_3_003 .byte PATT - .word bgm_hideri_3_000 + .word mus_weather_groudon_3_000 .byte PATT - .word bgm_hideri_3_001 + .word mus_weather_groudon_3_001 .byte PATT - .word bgm_hideri_3_002 + .word mus_weather_groudon_3_002 .byte PATT - .word bgm_hideri_3_003 + .word mus_weather_groudon_3_003 .byte PATT - .word bgm_hideri_3_000 + .word mus_weather_groudon_3_000 .byte PATT - .word bgm_hideri_3_001 + .word mus_weather_groudon_3_001 .byte PATT - .word bgm_hideri_3_002 + .word mus_weather_groudon_3_002 .byte GOTO - .word bgm_hideri_3_B1 + .word mus_weather_groudon_3_B1 .byte MOD , 0 .byte FINE @******************************************************@ .align 2 -bgm_hideri: +mus_weather_groudon: .byte 3 @ NumTrks .byte 0 @ NumBlks - .byte bgm_hideri_pri @ Priority - .byte bgm_hideri_rev @ Reverb. + .byte mus_weather_groudon_pri @ Priority + .byte mus_weather_groudon_rev @ Reverb. - .word bgm_hideri_grp + .word mus_weather_groudon_grp - .word bgm_hideri_1 - .word bgm_hideri_2 - .word bgm_hideri_3 + .word mus_weather_groudon_1 + .word mus_weather_groudon_2 + .word mus_weather_groudon_3 .end diff --git a/sound/songs/bgm_ooame.s b/sound/songs/mus_weather_kyogre.s index aa7bf51c4..96a4d931b 100644 --- a/sound/songs/bgm_ooame.s +++ b/sound/songs/mus_weather_kyogre.s @@ -1,67 +1,67 @@ .include "MPlayDef.s" - .equ bgm_ooame_grp, voicegroup086 - .equ bgm_ooame_pri, 0 - .equ bgm_ooame_rev, reverb_set+50 - .equ bgm_ooame_mvl, 127 - .equ bgm_ooame_key, 0 - .equ bgm_ooame_tbs, 1 - .equ bgm_ooame_exg, 0 - .equ bgm_ooame_cmp, 1 + .equ mus_weather_kyogre_grp, voicegroup086 + .equ mus_weather_kyogre_pri, 0 + .equ mus_weather_kyogre_rev, reverb_set+50 + .equ mus_weather_kyogre_mvl, 127 + .equ mus_weather_kyogre_key, 0 + .equ mus_weather_kyogre_tbs, 1 + .equ mus_weather_kyogre_exg, 0 + .equ mus_weather_kyogre_cmp, 1 .section .rodata - .global bgm_ooame + .global mus_weather_kyogre .align 2 @********************** Track 1 **********************@ -bgm_ooame_1: - .byte KEYSH , bgm_ooame_key+0 - .byte TEMPO , 128*bgm_ooame_tbs/2 +mus_weather_kyogre_1: + .byte KEYSH , mus_weather_kyogre_key+0 + .byte TEMPO , 128*mus_weather_kyogre_tbs/2 .byte VOICE , 73 .byte LFOS , 44 .byte BENDR , 12 .byte W24 -bgm_ooame_1_B1: -bgm_ooame_1_000: +mus_weather_kyogre_1_B1: +mus_weather_kyogre_1_000: .byte PAN , c_v+0 - .byte VOL , 10*bgm_ooame_mvl/mxv + .byte VOL , 10*mus_weather_kyogre_mvl/mxv .byte TIE , As3 , v112 .byte W48 - .byte VOL , 10*bgm_ooame_mvl/mxv + .byte VOL , 10*mus_weather_kyogre_mvl/mxv .byte W32 - .byte 11*bgm_ooame_mvl/mxv + .byte 11*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 12*bgm_ooame_mvl/mxv + .byte 12*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 13*bgm_ooame_mvl/mxv + .byte 13*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 14*bgm_ooame_mvl/mxv + .byte 14*mus_weather_kyogre_mvl/mxv .byte W04 .byte PEND - .byte 15*bgm_ooame_mvl/mxv + .byte 15*mus_weather_kyogre_mvl/mxv .byte W08 - .byte 17*bgm_ooame_mvl/mxv + .byte 17*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 18*bgm_ooame_mvl/mxv + .byte 18*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 21*bgm_ooame_mvl/mxv + .byte 21*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 25*bgm_ooame_mvl/mxv + .byte 25*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 26*bgm_ooame_mvl/mxv + .byte 26*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 29*bgm_ooame_mvl/mxv + .byte 29*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 31*bgm_ooame_mvl/mxv + .byte 31*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 32*bgm_ooame_mvl/mxv + .byte 32*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 35*bgm_ooame_mvl/mxv + .byte 35*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 39*bgm_ooame_mvl/mxv + .byte 39*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 41*bgm_ooame_mvl/mxv + .byte 41*mus_weather_kyogre_mvl/mxv .byte MOD , 5 .byte W48 .byte EOT @@ -70,151 +70,151 @@ bgm_ooame_1_000: .byte W96 .byte MOD , 9 .byte W12 - .byte VOL , 40*bgm_ooame_mvl/mxv + .byte VOL , 40*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 38*bgm_ooame_mvl/mxv + .byte 38*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 36*bgm_ooame_mvl/mxv + .byte 36*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 34*bgm_ooame_mvl/mxv + .byte 34*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 31*bgm_ooame_mvl/mxv + .byte 31*mus_weather_kyogre_mvl/mxv .byte W08 - .byte 28*bgm_ooame_mvl/mxv + .byte 28*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 26*bgm_ooame_mvl/mxv + .byte 26*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 24*bgm_ooame_mvl/mxv + .byte 24*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 22*bgm_ooame_mvl/mxv + .byte 22*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 20*bgm_ooame_mvl/mxv + .byte 20*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 18*bgm_ooame_mvl/mxv + .byte 18*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 16*bgm_ooame_mvl/mxv + .byte 16*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 14*bgm_ooame_mvl/mxv + .byte 14*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 12*bgm_ooame_mvl/mxv + .byte 12*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 10*bgm_ooame_mvl/mxv + .byte 10*mus_weather_kyogre_mvl/mxv .byte W24 .byte EOT .byte PAN , c_v+0 - .byte VOL , 10*bgm_ooame_mvl/mxv + .byte VOL , 10*mus_weather_kyogre_mvl/mxv .byte MOD , 0 .byte TIE , As3 .byte W48 - .byte VOL , 10*bgm_ooame_mvl/mxv + .byte VOL , 10*mus_weather_kyogre_mvl/mxv .byte W32 - .byte 11*bgm_ooame_mvl/mxv + .byte 11*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 12*bgm_ooame_mvl/mxv + .byte 12*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 13*bgm_ooame_mvl/mxv + .byte 13*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 14*bgm_ooame_mvl/mxv + .byte 14*mus_weather_kyogre_mvl/mxv .byte W04 -bgm_ooame_1_001: - .byte VOL , 15*bgm_ooame_mvl/mxv +mus_weather_kyogre_1_001: + .byte VOL , 15*mus_weather_kyogre_mvl/mxv .byte W08 - .byte 17*bgm_ooame_mvl/mxv + .byte 17*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 18*bgm_ooame_mvl/mxv + .byte 18*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 21*bgm_ooame_mvl/mxv + .byte 21*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 25*bgm_ooame_mvl/mxv + .byte 25*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 26*bgm_ooame_mvl/mxv + .byte 26*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 29*bgm_ooame_mvl/mxv + .byte 29*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 31*bgm_ooame_mvl/mxv + .byte 31*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 32*bgm_ooame_mvl/mxv + .byte 32*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 35*bgm_ooame_mvl/mxv + .byte 35*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 39*bgm_ooame_mvl/mxv + .byte 39*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 41*bgm_ooame_mvl/mxv + .byte 41*mus_weather_kyogre_mvl/mxv .byte W48 .byte PEND .byte EOT , As3 .byte TIE , Bn3 , v112 .byte W96 -bgm_ooame_1_002: +mus_weather_kyogre_1_002: .byte W12 - .byte VOL , 40*bgm_ooame_mvl/mxv + .byte VOL , 40*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 38*bgm_ooame_mvl/mxv + .byte 38*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 36*bgm_ooame_mvl/mxv + .byte 36*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 34*bgm_ooame_mvl/mxv + .byte 34*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 31*bgm_ooame_mvl/mxv + .byte 31*mus_weather_kyogre_mvl/mxv .byte W08 - .byte 28*bgm_ooame_mvl/mxv + .byte 28*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 26*bgm_ooame_mvl/mxv + .byte 26*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 24*bgm_ooame_mvl/mxv + .byte 24*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 22*bgm_ooame_mvl/mxv + .byte 22*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 20*bgm_ooame_mvl/mxv + .byte 20*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 18*bgm_ooame_mvl/mxv + .byte 18*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 16*bgm_ooame_mvl/mxv + .byte 16*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 14*bgm_ooame_mvl/mxv + .byte 14*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 12*bgm_ooame_mvl/mxv + .byte 12*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 10*bgm_ooame_mvl/mxv + .byte 10*mus_weather_kyogre_mvl/mxv .byte W24 .byte PEND .byte EOT , Bn3 .byte PATT - .word bgm_ooame_1_000 + .word mus_weather_kyogre_1_000 .byte PATT - .word bgm_ooame_1_001 + .word mus_weather_kyogre_1_001 .byte EOT , As3 .byte TIE , Bn3 , v112 .byte W96 .byte PATT - .word bgm_ooame_1_002 + .word mus_weather_kyogre_1_002 .byte EOT , Bn3 .byte PATT - .word bgm_ooame_1_000 + .word mus_weather_kyogre_1_000 .byte PATT - .word bgm_ooame_1_001 + .word mus_weather_kyogre_1_001 .byte EOT , As3 .byte TIE , Bn3 , v112 .byte W96 .byte PATT - .word bgm_ooame_1_002 + .word mus_weather_kyogre_1_002 .byte EOT , Bn3 .byte GOTO - .word bgm_ooame_1_B1 + .word mus_weather_kyogre_1_B1 .byte FINE @********************** Track 2 **********************@ -bgm_ooame_2: - .byte KEYSH , bgm_ooame_key+0 +mus_weather_kyogre_2: + .byte KEYSH , mus_weather_kyogre_key+0 .byte VOICE , 127 .byte LFOS , 44 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 45*bgm_ooame_mvl/mxv + .byte VOL , 45*mus_weather_kyogre_mvl/mxv .byte W24 -bgm_ooame_2_B1: -bgm_ooame_2_000: +mus_weather_kyogre_2_B1: +mus_weather_kyogre_2_000: .byte N02 , Gn5 , v112 .byte W08 .byte Gn5 , v072 @@ -241,63 +241,63 @@ bgm_ooame_2_000: .byte W08 .byte PEND .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte PATT - .word bgm_ooame_2_000 + .word mus_weather_kyogre_2_000 .byte GOTO - .word bgm_ooame_2_B1 + .word mus_weather_kyogre_2_B1 .byte FINE @********************** Track 3 **********************@ -bgm_ooame_3: - .byte KEYSH , bgm_ooame_key+0 +mus_weather_kyogre_3: + .byte KEYSH , mus_weather_kyogre_key+0 .byte VOICE , 80 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v-63 - .byte VOL , 42*bgm_ooame_mvl/mxv + .byte VOL , 42*mus_weather_kyogre_mvl/mxv .byte N24 , An1 , v112 .byte W04 - .byte VOL , 47*bgm_ooame_mvl/mxv + .byte VOL , 47*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 53*bgm_ooame_mvl/mxv + .byte 53*mus_weather_kyogre_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 61*bgm_ooame_mvl/mxv + .byte VOL , 61*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 71*bgm_ooame_mvl/mxv + .byte 71*mus_weather_kyogre_mvl/mxv .byte W08 -bgm_ooame_3_B1: - .byte VOL , 60*bgm_ooame_mvl/mxv +mus_weather_kyogre_3_B1: + .byte VOL , 60*mus_weather_kyogre_mvl/mxv .byte PAN , c_v+0 .byte MOD , 0 .byte N08 , Dn1 , v112 @@ -320,7 +320,7 @@ bgm_ooame_3_B1: .byte W08 .byte N04 , Dn1 .byte W08 -bgm_ooame_3_000: +mus_weather_kyogre_3_000: .byte N08 , Ds1 , v112 .byte W08 .byte N04 , Ds1 , v056 @@ -348,7 +348,7 @@ bgm_ooame_3_000: .byte N04 .byte W08 .byte PEND -bgm_ooame_3_001: +mus_weather_kyogre_3_001: .byte N08 , Ds1 , v112 .byte W08 .byte N04 , En1 , v076 @@ -391,19 +391,19 @@ bgm_ooame_3_001: .byte N04 .byte W08 .byte PAN , c_v-62 - .byte VOL , 42*bgm_ooame_mvl/mxv + .byte VOL , 42*mus_weather_kyogre_mvl/mxv .byte N24 .byte W04 - .byte VOL , 47*bgm_ooame_mvl/mxv + .byte VOL , 47*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 53*bgm_ooame_mvl/mxv + .byte 53*mus_weather_kyogre_mvl/mxv .byte W04 .byte MOD , 13 - .byte VOL , 61*bgm_ooame_mvl/mxv + .byte VOL , 61*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 71*bgm_ooame_mvl/mxv + .byte 71*mus_weather_kyogre_mvl/mxv .byte W08 - .byte 60*bgm_ooame_mvl/mxv + .byte 60*mus_weather_kyogre_mvl/mxv .byte PAN , c_v+0 .byte MOD , 2 .byte N08 , Dn1 @@ -427,10 +427,10 @@ bgm_ooame_3_001: .byte N04 , Dn1 .byte W08 .byte PATT - .word bgm_ooame_3_000 + .word mus_weather_kyogre_3_000 .byte PATT - .word bgm_ooame_3_001 -bgm_ooame_3_002: + .word mus_weather_kyogre_3_001 +mus_weather_kyogre_3_002: .byte N08 , En1 , v112 .byte W08 .byte N04 , En1 , v056 @@ -452,20 +452,20 @@ bgm_ooame_3_002: .byte N04 .byte W08 .byte PAN , c_v-62 - .byte VOL , 42*bgm_ooame_mvl/mxv + .byte VOL , 42*mus_weather_kyogre_mvl/mxv .byte N24 .byte W04 - .byte VOL , 47*bgm_ooame_mvl/mxv + .byte VOL , 47*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 53*bgm_ooame_mvl/mxv + .byte 53*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 61*bgm_ooame_mvl/mxv + .byte 61*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 71*bgm_ooame_mvl/mxv + .byte 71*mus_weather_kyogre_mvl/mxv .byte W08 .byte PEND -bgm_ooame_3_003: - .byte VOL , 60*bgm_ooame_mvl/mxv +mus_weather_kyogre_3_003: + .byte VOL , 60*mus_weather_kyogre_mvl/mxv .byte PAN , c_v+0 .byte N08 , Dn1 , v112 .byte W08 @@ -489,231 +489,231 @@ bgm_ooame_3_003: .byte W08 .byte PEND .byte PATT - .word bgm_ooame_3_000 + .word mus_weather_kyogre_3_000 .byte PATT - .word bgm_ooame_3_001 + .word mus_weather_kyogre_3_001 .byte PATT - .word bgm_ooame_3_002 + .word mus_weather_kyogre_3_002 .byte PATT - .word bgm_ooame_3_003 + .word mus_weather_kyogre_3_003 .byte PATT - .word bgm_ooame_3_000 + .word mus_weather_kyogre_3_000 .byte PATT - .word bgm_ooame_3_001 + .word mus_weather_kyogre_3_001 .byte PATT - .word bgm_ooame_3_002 + .word mus_weather_kyogre_3_002 .byte GOTO - .word bgm_ooame_3_B1 + .word mus_weather_kyogre_3_B1 .byte FINE @********************** Track 4 **********************@ -bgm_ooame_4: - .byte KEYSH , bgm_ooame_key+0 +mus_weather_kyogre_4: + .byte KEYSH , mus_weather_kyogre_key+0 .byte VOICE , 81 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 - .byte VOL , 40*bgm_ooame_mvl/mxv + .byte VOL , 40*mus_weather_kyogre_mvl/mxv .byte PAN , c_v+63 .byte N24 , En1 , v112 .byte W04 - .byte VOL , 42*bgm_ooame_mvl/mxv + .byte VOL , 42*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 47*bgm_ooame_mvl/mxv + .byte 47*mus_weather_kyogre_mvl/mxv .byte W04 .byte MOD , 8 - .byte VOL , 53*bgm_ooame_mvl/mxv + .byte VOL , 53*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 61*bgm_ooame_mvl/mxv + .byte 61*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 71*bgm_ooame_mvl/mxv + .byte 71*mus_weather_kyogre_mvl/mxv .byte W04 -bgm_ooame_4_B1: +mus_weather_kyogre_4_B1: .byte PAN , c_v+0 - .byte VOL , 10*bgm_ooame_mvl/mxv + .byte VOL , 10*mus_weather_kyogre_mvl/mxv .byte MOD , 0 .byte TIE , Ds3 , v112 .byte W48 - .byte VOL , 13*bgm_ooame_mvl/mxv + .byte VOL , 13*mus_weather_kyogre_mvl/mxv .byte W48 -bgm_ooame_4_000: - .byte VOL , 20*bgm_ooame_mvl/mxv +mus_weather_kyogre_4_000: + .byte VOL , 20*mus_weather_kyogre_mvl/mxv .byte W24 - .byte 30*bgm_ooame_mvl/mxv + .byte 30*mus_weather_kyogre_mvl/mxv .byte W24 - .byte 40*bgm_ooame_mvl/mxv + .byte 40*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 51*bgm_ooame_mvl/mxv + .byte 51*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 60*bgm_ooame_mvl/mxv + .byte 60*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 73*bgm_ooame_mvl/mxv + .byte 73*mus_weather_kyogre_mvl/mxv .byte W12 .byte PEND .byte EOT , Ds3 - .byte VOL , 40*bgm_ooame_mvl/mxv + .byte VOL , 40*mus_weather_kyogre_mvl/mxv .byte TIE , Ds3 , v112 .byte W48 .byte MOD , 3 .byte W12 - .byte VOL , 36*bgm_ooame_mvl/mxv + .byte VOL , 36*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 31*bgm_ooame_mvl/mxv + .byte 31*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 27*bgm_ooame_mvl/mxv + .byte 27*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 23*bgm_ooame_mvl/mxv + .byte 23*mus_weather_kyogre_mvl/mxv .byte MOD , 5 .byte W12 - .byte VOL , 19*bgm_ooame_mvl/mxv + .byte VOL , 19*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 15*bgm_ooame_mvl/mxv + .byte 15*mus_weather_kyogre_mvl/mxv .byte MOD , 9 .byte W12 - .byte VOL , 11*bgm_ooame_mvl/mxv + .byte VOL , 11*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 10*bgm_ooame_mvl/mxv + .byte 10*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 10*bgm_ooame_mvl/mxv + .byte 10*mus_weather_kyogre_mvl/mxv .byte W12 .byte EOT .byte PAN , c_v+63 - .byte VOL , 27*bgm_ooame_mvl/mxv + .byte VOL , 27*mus_weather_kyogre_mvl/mxv .byte MOD , 2 .byte N24 , Bn1 .byte W04 - .byte VOL , 42*bgm_ooame_mvl/mxv + .byte VOL , 42*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 47*bgm_ooame_mvl/mxv + .byte 47*mus_weather_kyogre_mvl/mxv .byte W04 .byte MOD , 13 - .byte VOL , 53*bgm_ooame_mvl/mxv + .byte VOL , 53*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 61*bgm_ooame_mvl/mxv + .byte 61*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 71*bgm_ooame_mvl/mxv + .byte 71*mus_weather_kyogre_mvl/mxv .byte W04 .byte PAN , c_v+0 - .byte VOL , 10*bgm_ooame_mvl/mxv + .byte VOL , 10*mus_weather_kyogre_mvl/mxv .byte MOD , 2 .byte TIE , Ds3 .byte W48 - .byte VOL , 13*bgm_ooame_mvl/mxv + .byte VOL , 13*mus_weather_kyogre_mvl/mxv .byte W48 .byte PATT - .word bgm_ooame_4_000 + .word mus_weather_kyogre_4_000 .byte EOT , Ds3 -bgm_ooame_4_001: - .byte VOL , 40*bgm_ooame_mvl/mxv +mus_weather_kyogre_4_001: + .byte VOL , 40*mus_weather_kyogre_mvl/mxv .byte TIE , Ds3 , v112 .byte W60 - .byte VOL , 36*bgm_ooame_mvl/mxv + .byte VOL , 36*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 31*bgm_ooame_mvl/mxv + .byte 31*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 27*bgm_ooame_mvl/mxv + .byte 27*mus_weather_kyogre_mvl/mxv .byte W12 .byte PEND -bgm_ooame_4_002: - .byte VOL , 23*bgm_ooame_mvl/mxv +mus_weather_kyogre_4_002: + .byte VOL , 23*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 19*bgm_ooame_mvl/mxv + .byte 19*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 15*bgm_ooame_mvl/mxv + .byte 15*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 11*bgm_ooame_mvl/mxv + .byte 11*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 10*bgm_ooame_mvl/mxv + .byte 10*mus_weather_kyogre_mvl/mxv .byte W12 - .byte 10*bgm_ooame_mvl/mxv + .byte 10*mus_weather_kyogre_mvl/mxv .byte W12 .byte PEND .byte EOT , Ds3 .byte PAN , c_v+63 - .byte VOL , 27*bgm_ooame_mvl/mxv + .byte VOL , 27*mus_weather_kyogre_mvl/mxv .byte N24 , Bn1 , v112 .byte W04 - .byte VOL , 42*bgm_ooame_mvl/mxv + .byte VOL , 42*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 47*bgm_ooame_mvl/mxv + .byte 47*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 53*bgm_ooame_mvl/mxv + .byte 53*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 61*bgm_ooame_mvl/mxv + .byte 61*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 71*bgm_ooame_mvl/mxv + .byte 71*mus_weather_kyogre_mvl/mxv .byte W04 -bgm_ooame_4_003: +mus_weather_kyogre_4_003: .byte PAN , c_v+0 - .byte VOL , 10*bgm_ooame_mvl/mxv + .byte VOL , 10*mus_weather_kyogre_mvl/mxv .byte TIE , Ds3 , v112 .byte W48 - .byte VOL , 13*bgm_ooame_mvl/mxv + .byte VOL , 13*mus_weather_kyogre_mvl/mxv .byte W48 .byte PEND .byte PATT - .word bgm_ooame_4_000 + .word mus_weather_kyogre_4_000 .byte EOT , Ds3 .byte PATT - .word bgm_ooame_4_001 + .word mus_weather_kyogre_4_001 .byte PATT - .word bgm_ooame_4_002 + .word mus_weather_kyogre_4_002 .byte EOT , Ds3 .byte PAN , c_v+63 - .byte VOL , 27*bgm_ooame_mvl/mxv + .byte VOL , 27*mus_weather_kyogre_mvl/mxv .byte N24 , Bn1 , v112 .byte W04 - .byte VOL , 42*bgm_ooame_mvl/mxv + .byte VOL , 42*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 47*bgm_ooame_mvl/mxv + .byte 47*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 53*bgm_ooame_mvl/mxv + .byte 53*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 61*bgm_ooame_mvl/mxv + .byte 61*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 71*bgm_ooame_mvl/mxv + .byte 71*mus_weather_kyogre_mvl/mxv .byte W04 .byte PATT - .word bgm_ooame_4_003 + .word mus_weather_kyogre_4_003 .byte PATT - .word bgm_ooame_4_000 + .word mus_weather_kyogre_4_000 .byte EOT , Ds3 .byte PATT - .word bgm_ooame_4_001 + .word mus_weather_kyogre_4_001 .byte PATT - .word bgm_ooame_4_002 + .word mus_weather_kyogre_4_002 .byte EOT , Ds3 .byte PAN , c_v+63 - .byte VOL , 27*bgm_ooame_mvl/mxv + .byte VOL , 27*mus_weather_kyogre_mvl/mxv .byte N24 , Bn1 , v112 .byte W04 - .byte VOL , 42*bgm_ooame_mvl/mxv + .byte VOL , 42*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 47*bgm_ooame_mvl/mxv + .byte 47*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 53*bgm_ooame_mvl/mxv + .byte 53*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 61*bgm_ooame_mvl/mxv + .byte 61*mus_weather_kyogre_mvl/mxv .byte W04 - .byte 71*bgm_ooame_mvl/mxv + .byte 71*mus_weather_kyogre_mvl/mxv .byte W04 .byte GOTO - .word bgm_ooame_4_B1 + .word mus_weather_kyogre_4_B1 .byte FINE @********************** Track 5 **********************@ -bgm_ooame_5: - .byte KEYSH , bgm_ooame_key+0 +mus_weather_kyogre_5: + .byte KEYSH , mus_weather_kyogre_key+0 .byte VOICE , 0 .byte PAN , c_v+0 .byte MOD , 64 - .byte VOL , 80*bgm_ooame_mvl/mxv + .byte VOL , 80*mus_weather_kyogre_mvl/mxv .byte W24 -bgm_ooame_5_B1: -bgm_ooame_5_000: +mus_weather_kyogre_5_B1: +mus_weather_kyogre_5_000: .byte N04 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -725,7 +725,7 @@ bgm_ooame_5_000: .byte Cn1 , v088 .byte W08 .byte PEND -bgm_ooame_5_001: +mus_weather_kyogre_5_001: .byte N04 , Cn1 , v127 .byte W24 .byte Cn1 , v112 @@ -740,54 +740,54 @@ bgm_ooame_5_001: .byte W08 .byte PEND .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_000 + .word mus_weather_kyogre_5_000 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_000 + .word mus_weather_kyogre_5_000 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_000 + .word mus_weather_kyogre_5_000 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte PATT - .word bgm_ooame_5_001 + .word mus_weather_kyogre_5_001 .byte GOTO - .word bgm_ooame_5_B1 + .word mus_weather_kyogre_5_B1 .byte FINE @********************** Track 6 **********************@ -bgm_ooame_6: - .byte KEYSH , bgm_ooame_key+0 +mus_weather_kyogre_6: + .byte KEYSH , mus_weather_kyogre_key+0 .byte VOICE , 82 .byte LFOS , 44 .byte XCMD , xIECV , 18 .byte xIECV , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 40*bgm_ooame_mvl/mxv + .byte VOL , 40*mus_weather_kyogre_mvl/mxv .byte BEND , c_v+1 .byte N24 , An1 , v112 .byte W12 .byte MOD , 8 .byte W12 -bgm_ooame_6_B1: +mus_weather_kyogre_6_B1: .byte VOICE , 82 .byte MOD , 0 .byte N08 , Dn1 , v112 @@ -810,7 +810,7 @@ bgm_ooame_6_B1: .byte W08 .byte N04 , Dn1 .byte W08 -bgm_ooame_6_000: +mus_weather_kyogre_6_000: .byte N08 , Ds1 , v112 .byte W08 .byte N04 , Ds1 , v056 @@ -838,7 +838,7 @@ bgm_ooame_6_000: .byte N04 .byte W08 .byte PEND -bgm_ooame_6_001: +mus_weather_kyogre_6_001: .byte N08 , Ds1 , v112 .byte W08 .byte N04 , En1 , v076 @@ -987,9 +987,9 @@ bgm_ooame_6_001: .byte N04 , Dn1 .byte W08 .byte PATT - .word bgm_ooame_6_000 + .word mus_weather_kyogre_6_000 .byte PATT - .word bgm_ooame_6_001 + .word mus_weather_kyogre_6_001 .byte N08 , En1 , v112 .byte W08 .byte N04 , En1 , v056 @@ -1092,26 +1092,26 @@ bgm_ooame_6_001: .byte MOD , 7 .byte W10 .byte GOTO - .word bgm_ooame_6_B1 + .word mus_weather_kyogre_6_B1 .byte MOD , 0 .byte FINE @******************************************************@ .align 2 -bgm_ooame: +mus_weather_kyogre: .byte 6 @ NumTrks .byte 0 @ NumBlks - .byte bgm_ooame_pri @ Priority - .byte bgm_ooame_rev @ Reverb. + .byte mus_weather_kyogre_pri @ Priority + .byte mus_weather_kyogre_rev @ Reverb. - .word bgm_ooame_grp + .word mus_weather_kyogre_grp - .word bgm_ooame_1 - .word bgm_ooame_2 - .word bgm_ooame_3 - .word bgm_ooame_4 - .word bgm_ooame_5 - .word bgm_ooame_6 + .word mus_weather_kyogre_1 + .word mus_weather_kyogre_2 + .word mus_weather_kyogre_3 + .word mus_weather_kyogre_4 + .word mus_weather_kyogre_5 + .word mus_weather_kyogre_6 .end diff --git a/sound/songs/se_dendou.s b/sound/songs/se_applause.s index 211779af2..57e84c1f1 100644 --- a/sound/songs/se_dendou.s +++ b/sound/songs/se_applause.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_dendou_grp, voicegroup111 - .equ se_dendou_pri, 5 - .equ se_dendou_rev, reverb_set+50 - .equ se_dendou_mvl, 127 - .equ se_dendou_key, 0 - .equ se_dendou_tbs, 1 - .equ se_dendou_exg, 0 - .equ se_dendou_cmp, 1 + .equ se_applause_grp, voicegroup111 + .equ se_applause_pri, 5 + .equ se_applause_rev, reverb_set+50 + .equ se_applause_mvl, 127 + .equ se_applause_key, 0 + .equ se_applause_tbs, 1 + .equ se_applause_exg, 0 + .equ se_applause_cmp, 1 .section .rodata - .global se_dendou + .global se_applause .align 2 @********************** Track 1 **********************@ -se_dendou_1: - .byte KEYSH , se_dendou_key+0 - .byte TEMPO , 150*se_dendou_tbs/2 +se_applause_1: + .byte KEYSH , se_applause_key+0 + .byte TEMPO , 150*se_applause_tbs/2 .byte VOICE , 60 .byte BENDR , 12 - .byte VOL , 25*se_dendou_mvl/mxv + .byte VOL , 25*se_applause_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte TIE , Bn2 , v127 @@ -29,18 +29,18 @@ se_dendou_1: .byte W01 .byte c_v+5 .byte W01 - .byte VOL , 34*se_dendou_mvl/mxv + .byte VOL , 34*se_applause_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 46*se_dendou_mvl/mxv + .byte VOL , 46*se_applause_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 56*se_dendou_mvl/mxv + .byte VOL , 56*se_applause_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v+0 @@ -49,30 +49,30 @@ se_dendou_1: .byte W01 .byte c_v+5 .byte W01 - .byte VOL , 70*se_dendou_mvl/mxv + .byte VOL , 70*se_applause_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 80*se_dendou_mvl/mxv + .byte VOL , 80*se_applause_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 88*se_dendou_mvl/mxv + .byte VOL , 88*se_applause_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_dendou_mvl/mxv + .byte VOL , 96*se_applause_mvl/mxv .byte PAN , c_v+5 .byte W02 .byte c_v+2 .byte W02 - .byte VOL , 100*se_dendou_mvl/mxv + .byte VOL , 100*se_applause_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v-2 @@ -81,7 +81,7 @@ se_dendou_1: .byte W02 .byte c_v-2 .byte W02 -se_dendou_1_000: +se_applause_1_000: .byte PAN , c_v+0 .byte W01 .byte c_v+2 @@ -100,82 +100,82 @@ se_dendou_1_000: .byte W02 .byte PEND .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 + .word se_applause_1_000 .byte PATT - .word se_dendou_1_000 - .byte VOL , 96*se_dendou_mvl/mxv + .word se_applause_1_000 + .byte VOL , 96*se_applause_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_dendou_mvl/mxv + .byte VOL , 92*se_applause_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 84*se_dendou_mvl/mxv + .byte VOL , 84*se_applause_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 72*se_dendou_mvl/mxv + .byte VOL , 72*se_applause_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_dendou_mvl/mxv + .byte VOL , 63*se_applause_mvl/mxv .byte PAN , c_v+5 .byte W02 - .byte VOL , 52*se_dendou_mvl/mxv + .byte VOL , 52*se_applause_mvl/mxv .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 37*se_dendou_mvl/mxv + .byte VOL , 37*se_applause_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W01 - .byte VOL , 22*se_dendou_mvl/mxv + .byte VOL , 22*se_applause_mvl/mxv .byte W01 - .byte 12*se_dendou_mvl/mxv + .byte 12*se_applause_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte EOT , Bn2 @@ -184,14 +184,14 @@ se_dendou_1_000: @******************************************************@ .align 2 -se_dendou: +se_applause: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_dendou_pri @ Priority - .byte se_dendou_rev @ Reverb. + .byte se_applause_pri @ Priority + .byte se_applause_rev @ Reverb. - .word se_dendou_grp + .word se_applause_grp - .word se_dendou_1 + .word se_applause_1 .end diff --git a/sound/songs/se_ball.s b/sound/songs/se_ball.s new file mode 100644 index 000000000..64ef33eb9 --- /dev/null +++ b/sound/songs/se_ball.s @@ -0,0 +1,45 @@ + .include "MPlayDef.s" + + .equ se_ball_grp, voicegroup110 + .equ se_ball_pri, 4 + .equ se_ball_rev, reverb_set+50 + .equ se_ball_mvl, 127 + .equ se_ball_key, 0 + .equ se_ball_tbs, 1 + .equ se_ball_exg, 0 + .equ se_ball_cmp, 1 + + .section .rodata + .global se_ball + .align 2 + +@********************** Track 1 **********************@ + +se_ball_1: + .byte KEYSH , se_ball_key+0 + .byte TEMPO , 128*se_ball_tbs/2 + .byte VOICE , 7 + .byte BENDR , 12 + .byte VOL , 70*se_ball_mvl/mxv + .byte BEND , c_v+2 + .byte N04 , Fn2 , v127 + .byte W04 + .byte N01 , Dn3 + .byte W02 + .byte VOICE , 8 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_pri @ Priority + .byte se_ball_rev @ Reverb. + + .word se_ball_grp + + .word se_ball_1 + + .end diff --git a/sound/songs/se_ball_bounce_1.s b/sound/songs/se_ball_bounce_1.s new file mode 100644 index 000000000..365f3d721 --- /dev/null +++ b/sound/songs/se_ball_bounce_1.s @@ -0,0 +1,53 @@ + .include "MPlayDef.s" + + .equ se_ball_bounce_1_grp, voicegroup111 + .equ se_ball_bounce_1_pri, 4 + .equ se_ball_bounce_1_rev, reverb_set+50 + .equ se_ball_bounce_1_mvl, 127 + .equ se_ball_bounce_1_key, 0 + .equ se_ball_bounce_1_tbs, 1 + .equ se_ball_bounce_1_exg, 0 + .equ se_ball_bounce_1_cmp, 1 + + .section .rodata + .global se_ball_bounce_1 + .align 2 + +@********************** Track 1 **********************@ + +se_ball_bounce_1_1: + .byte KEYSH , se_ball_bounce_1_key+0 + .byte TEMPO , 150*se_ball_bounce_1_tbs/2 + .byte VOICE , 16 + .byte VOL , 100*se_ball_bounce_1_mvl/mxv + .byte BEND , c_v+1 + .byte N12 , Fn4 , v112 + .byte W12 + .byte FINE + +@********************** Track 2 **********************@ + +se_ball_bounce_1_2: + .byte KEYSH , se_ball_bounce_1_key+0 + .byte VOICE , 17 + .byte VOL , 100*se_ball_bounce_1_mvl/mxv + .byte BEND , c_v+0 + .byte N09 , Fn4 , v100 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_bounce_1: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_bounce_1_pri @ Priority + .byte se_ball_bounce_1_rev @ Reverb. + + .word se_ball_bounce_1_grp + + .word se_ball_bounce_1_1 + .word se_ball_bounce_1_2 + + .end diff --git a/sound/songs/se_ball_bounce_2.s b/sound/songs/se_ball_bounce_2.s new file mode 100644 index 000000000..7809df443 --- /dev/null +++ b/sound/songs/se_ball_bounce_2.s @@ -0,0 +1,53 @@ + .include "MPlayDef.s" + + .equ se_ball_bounce_2_grp, voicegroup111 + .equ se_ball_bounce_2_pri, 4 + .equ se_ball_bounce_2_rev, reverb_set+50 + .equ se_ball_bounce_2_mvl, 127 + .equ se_ball_bounce_2_key, 0 + .equ se_ball_bounce_2_tbs, 1 + .equ se_ball_bounce_2_exg, 0 + .equ se_ball_bounce_2_cmp, 1 + + .section .rodata + .global se_ball_bounce_2 + .align 2 + +@********************** Track 1 **********************@ + +se_ball_bounce_2_1: + .byte KEYSH , se_ball_bounce_2_key+0 + .byte TEMPO , 150*se_ball_bounce_2_tbs/2 + .byte VOICE , 16 + .byte VOL , 100*se_ball_bounce_2_mvl/mxv + .byte BEND , c_v+1 + .byte N12 , Fn4 , v100 + .byte W12 + .byte FINE + +@********************** Track 2 **********************@ + +se_ball_bounce_2_2: + .byte KEYSH , se_ball_bounce_2_key+0 + .byte VOICE , 17 + .byte VOL , 100*se_ball_bounce_2_mvl/mxv + .byte BEND , c_v+0 + .byte N09 , Fn4 , v088 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_bounce_2: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_bounce_2_pri @ Priority + .byte se_ball_bounce_2_rev @ Reverb. + + .word se_ball_bounce_2_grp + + .word se_ball_bounce_2_1 + .word se_ball_bounce_2_2 + + .end diff --git a/sound/songs/se_ball_bounce_3.s b/sound/songs/se_ball_bounce_3.s new file mode 100644 index 000000000..73904aa46 --- /dev/null +++ b/sound/songs/se_ball_bounce_3.s @@ -0,0 +1,53 @@ + .include "MPlayDef.s" + + .equ se_ball_bounce_3_grp, voicegroup111 + .equ se_ball_bounce_3_pri, 4 + .equ se_ball_bounce_3_rev, reverb_set+50 + .equ se_ball_bounce_3_mvl, 127 + .equ se_ball_bounce_3_key, 0 + .equ se_ball_bounce_3_tbs, 1 + .equ se_ball_bounce_3_exg, 0 + .equ se_ball_bounce_3_cmp, 1 + + .section .rodata + .global se_ball_bounce_3 + .align 2 + +@********************** Track 1 **********************@ + +se_ball_bounce_3_1: + .byte KEYSH , se_ball_bounce_3_key+0 + .byte TEMPO , 150*se_ball_bounce_3_tbs/2 + .byte VOICE , 16 + .byte VOL , 100*se_ball_bounce_3_mvl/mxv + .byte BEND , c_v+1 + .byte N12 , Fn4 , v088 + .byte W12 + .byte FINE + +@********************** Track 2 **********************@ + +se_ball_bounce_3_2: + .byte KEYSH , se_ball_bounce_3_key+0 + .byte VOICE , 17 + .byte VOL , 100*se_ball_bounce_3_mvl/mxv + .byte BEND , c_v+0 + .byte N09 , Fn4 , v072 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_bounce_3: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_bounce_3_pri @ Priority + .byte se_ball_bounce_3_rev @ Reverb. + + .word se_ball_bounce_3_grp + + .word se_ball_bounce_3_1 + .word se_ball_bounce_3_2 + + .end diff --git a/sound/songs/se_ball_bounce_4.s b/sound/songs/se_ball_bounce_4.s new file mode 100644 index 000000000..c56ffcd00 --- /dev/null +++ b/sound/songs/se_ball_bounce_4.s @@ -0,0 +1,53 @@ + .include "MPlayDef.s" + + .equ se_ball_bounce_4_grp, voicegroup111 + .equ se_ball_bounce_4_pri, 4 + .equ se_ball_bounce_4_rev, reverb_set+50 + .equ se_ball_bounce_4_mvl, 127 + .equ se_ball_bounce_4_key, 0 + .equ se_ball_bounce_4_tbs, 1 + .equ se_ball_bounce_4_exg, 0 + .equ se_ball_bounce_4_cmp, 1 + + .section .rodata + .global se_ball_bounce_4 + .align 2 + +@********************** Track 1 **********************@ + +se_ball_bounce_4_1: + .byte KEYSH , se_ball_bounce_4_key+0 + .byte TEMPO , 150*se_ball_bounce_4_tbs/2 + .byte VOICE , 16 + .byte VOL , 100*se_ball_bounce_4_mvl/mxv + .byte BEND , c_v+1 + .byte N12 , Fn4 , v076 + .byte W12 + .byte FINE + +@********************** Track 2 **********************@ + +se_ball_bounce_4_2: + .byte KEYSH , se_ball_bounce_4_key+0 + .byte VOICE , 17 + .byte VOL , 100*se_ball_bounce_4_mvl/mxv + .byte BEND , c_v+0 + .byte N09 , Fn4 , v056 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_bounce_4: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_bounce_4_pri @ Priority + .byte se_ball_bounce_4_rev @ Reverb. + + .word se_ball_bounce_4_grp + + .word se_ball_bounce_4_1 + .word se_ball_bounce_4_2 + + .end diff --git a/sound/songs/se_bowa2.s b/sound/songs/se_ball_open.s index 02cfb9084..534587901 100644 --- a/sound/songs/se_bowa2.s +++ b/sound/songs/se_ball_open.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_bowa2_grp, voicegroup110 - .equ se_bowa2_pri, 5 - .equ se_bowa2_rev, reverb_set+50 - .equ se_bowa2_mvl, 127 - .equ se_bowa2_key, 0 - .equ se_bowa2_tbs, 1 - .equ se_bowa2_exg, 0 - .equ se_bowa2_cmp, 1 + .equ se_ball_open_grp, voicegroup110 + .equ se_ball_open_pri, 5 + .equ se_ball_open_rev, reverb_set+50 + .equ se_ball_open_mvl, 127 + .equ se_ball_open_key, 0 + .equ se_ball_open_tbs, 1 + .equ se_ball_open_exg, 0 + .equ se_ball_open_cmp, 1 .section .rodata - .global se_bowa2 + .global se_ball_open .align 2 @********************** Track 1 **********************@ -se_bowa2_1: - .byte KEYSH , se_bowa2_key+0 - .byte TEMPO , 90*se_bowa2_tbs/2 +se_ball_open_1: + .byte KEYSH , se_ball_open_key+0 + .byte TEMPO , 90*se_ball_open_tbs/2 .byte VOICE , 86 - .byte VOL , 100*se_bowa2_mvl/mxv + .byte VOL , 100*se_ball_open_mvl/mxv .byte BEND , c_v+0 .byte N02 , Gn1 , v100 .byte W03 @@ -33,10 +33,10 @@ se_bowa2_1: @********************** Track 2 **********************@ -se_bowa2_2: - .byte KEYSH , se_bowa2_key+0 +se_ball_open_2: + .byte KEYSH , se_ball_open_key+0 .byte VOICE , 0 - .byte VOL , 100*se_bowa2_mvl/mxv + .byte VOL , 100*se_ball_open_mvl/mxv .byte BENDR , 12 .byte BEND , c_v+0 .byte N03 , Gn3 , v052 @@ -51,10 +51,10 @@ se_bowa2_2: @********************** Track 3 **********************@ -se_bowa2_3: - .byte KEYSH , se_bowa2_key+0 +se_ball_open_3: + .byte KEYSH , se_ball_open_key+0 .byte VOICE , 124 - .byte VOL , 100*se_bowa2_mvl/mxv + .byte VOL , 100*se_ball_open_mvl/mxv .byte N03 , Gn3 , v052 .byte W03 .byte N06 , Gs4 @@ -68,16 +68,16 @@ se_bowa2_3: @******************************************************@ .align 2 -se_bowa2: +se_ball_open: .byte 3 @ NumTrks .byte 0 @ NumBlks - .byte se_bowa2_pri @ Priority - .byte se_bowa2_rev @ Reverb. + .byte se_ball_open_pri @ Priority + .byte se_ball_open_rev @ Reverb. - .word se_bowa2_grp + .word se_ball_open_grp - .word se_bowa2_1 - .word se_bowa2_2 - .word se_bowa2_3 + .word se_ball_open_1 + .word se_ball_open_2 + .word se_ball_open_3 .end diff --git a/sound/songs/se_ball_throw.s b/sound/songs/se_ball_throw.s new file mode 100644 index 000000000..b6129e36f --- /dev/null +++ b/sound/songs/se_ball_throw.s @@ -0,0 +1,64 @@ + .include "MPlayDef.s" + + .equ se_ball_throw_grp, voicegroup111 + .equ se_ball_throw_pri, 5 + .equ se_ball_throw_rev, reverb_set+50 + .equ se_ball_throw_mvl, 127 + .equ se_ball_throw_key, 0 + .equ se_ball_throw_tbs, 1 + .equ se_ball_throw_exg, 0 + .equ se_ball_throw_cmp, 1 + + .section .rodata + .global se_ball_throw + .align 2 + +@********************** Track 1 **********************@ + +se_ball_throw_1: + .byte KEYSH , se_ball_throw_key+0 + .byte TEMPO , 150*se_ball_throw_tbs/2 + .byte VOICE , 22 + .byte BENDR , 12 + .byte VOL , 120*se_ball_throw_mvl/mxv + .byte BEND , c_v+12 + .byte N06 , An2 , v127 + .byte W03 + .byte VOL , 78*se_ball_throw_mvl/mxv + .byte BEND , c_v+20 + .byte W03 + .byte VOL , 120*se_ball_throw_mvl/mxv + .byte BEND , c_v+36 + .byte N18 , Cn3 + .byte W02 + .byte BEND , c_v+35 + .byte W03 + .byte c_v+32 + .byte W02 + .byte c_v+26 + .byte W03 + .byte VOL , 102*se_ball_throw_mvl/mxv + .byte BEND , c_v+18 + .byte W02 + .byte VOL , 68*se_ball_throw_mvl/mxv + .byte BEND , c_v+7 + .byte W03 + .byte VOL , 34*se_ball_throw_mvl/mxv + .byte BEND , c_v-9 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_throw: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_throw_pri @ Priority + .byte se_ball_throw_rev @ Reverb. + + .word se_ball_throw_grp + + .word se_ball_throw_1 + + .end diff --git a/sound/songs/se_ball_trade.s b/sound/songs/se_ball_trade.s new file mode 100644 index 000000000..54fb71440 --- /dev/null +++ b/sound/songs/se_ball_trade.s @@ -0,0 +1,78 @@ + .include "MPlayDef.s" + + .equ se_ball_trade_grp, voicegroup110 + .equ se_ball_trade_pri, 5 + .equ se_ball_trade_rev, reverb_set+50 + .equ se_ball_trade_mvl, 127 + .equ se_ball_trade_key, 0 + .equ se_ball_trade_tbs, 1 + .equ se_ball_trade_exg, 0 + .equ se_ball_trade_cmp, 1 + + .section .rodata + .global se_ball_trade + .align 2 + +@********************** Track 1 **********************@ + +se_ball_trade_1: + .byte KEYSH , se_ball_trade_key+0 + .byte VOICE , 13 + .byte BENDR , 12 + .byte VOL , 12*se_ball_trade_mvl/mxv + .byte BEND , c_v+49 + .byte N06 , Gn4 , v080 + .byte W01 + .byte VOL , 44*se_ball_trade_mvl/mxv + .byte BEND , c_v+22 + .byte W01 + .byte VOL , 75*se_ball_trade_mvl/mxv + .byte BEND , c_v+20 + .byte W01 + .byte VOL , 87*se_ball_trade_mvl/mxv + .byte BEND , c_v+33 + .byte W01 + .byte VOL , 100*se_ball_trade_mvl/mxv + .byte BEND , c_v+54 + .byte W01 + .byte c_v+63 + .byte W01 + .byte W03 + .byte N03 , Gn4 , v040 + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_ball_trade_2: + .byte KEYSH , se_ball_trade_key+0 + .byte VOICE , 123 + .byte VOL , 59*se_ball_trade_mvl/mxv + .byte N06 , Gs4 , v052 + .byte W01 + .byte VOL , 72*se_ball_trade_mvl/mxv + .byte W01 + .byte 90*se_ball_trade_mvl/mxv + .byte W01 + .byte 100*se_ball_trade_mvl/mxv + .byte W03 + .byte W03 + .byte N03 , Gs4 , v024 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_trade: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_trade_pri @ Priority + .byte se_ball_trade_rev @ Reverb. + + .word se_ball_trade_grp + + .word se_ball_trade_1 + .word se_ball_trade_2 + + .end diff --git a/sound/songs/se_ball_tray_ball.s b/sound/songs/se_ball_tray_ball.s new file mode 100644 index 000000000..4c774f9fb --- /dev/null +++ b/sound/songs/se_ball_tray_ball.s @@ -0,0 +1,48 @@ + .include "MPlayDef.s" + + .equ se_ball_tray_ball_grp, voicegroup111 + .equ se_ball_tray_ball_pri, 5 + .equ se_ball_tray_ball_rev, reverb_set+50 + .equ se_ball_tray_ball_mvl, 127 + .equ se_ball_tray_ball_key, 0 + .equ se_ball_tray_ball_tbs, 1 + .equ se_ball_tray_ball_exg, 0 + .equ se_ball_tray_ball_cmp, 1 + + .section .rodata + .global se_ball_tray_ball + .align 2 + +@********************** Track 1 **********************@ + +se_ball_tray_ball_1: + .byte KEYSH , se_ball_tray_ball_key+0 + .byte TEMPO , 150*se_ball_tray_ball_tbs/2 + .byte VOICE , 16 + .byte VOL , 110*se_ball_tray_ball_mvl/mxv + .byte BEND , c_v+1 + .byte N03 , Gs4 , v072 + .byte W01 + .byte BEND , c_v-2 + .byte W01 + .byte VOL , 58*se_ball_tray_ball_mvl/mxv + .byte BEND , c_v-10 + .byte W01 + .byte VOL , 28*se_ball_tray_ball_mvl/mxv + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_tray_ball: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_tray_ball_pri @ Priority + .byte se_ball_tray_ball_rev @ Reverb. + + .word se_ball_tray_ball_grp + + .word se_ball_tray_ball_1 + + .end diff --git a/sound/songs/se_ball_tray_enter.s b/sound/songs/se_ball_tray_enter.s new file mode 100644 index 000000000..24be1acce --- /dev/null +++ b/sound/songs/se_ball_tray_enter.s @@ -0,0 +1,75 @@ + .include "MPlayDef.s" + + .equ se_ball_tray_enter_grp, voicegroup111 + .equ se_ball_tray_enter_pri, 5 + .equ se_ball_tray_enter_rev, reverb_set+50 + .equ se_ball_tray_enter_mvl, 127 + .equ se_ball_tray_enter_key, 0 + .equ se_ball_tray_enter_tbs, 1 + .equ se_ball_tray_enter_exg, 0 + .equ se_ball_tray_enter_cmp, 1 + + .section .rodata + .global se_ball_tray_enter + .align 2 + +@********************** Track 1 **********************@ + +se_ball_tray_enter_1: + .byte KEYSH , se_ball_tray_enter_key+0 + .byte TEMPO , 150*se_ball_tray_enter_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v-32 + .byte VOL , 16*se_ball_tray_enter_mvl/mxv + .byte BEND , c_v+1 + .byte N09 , Gn5 , v032 + .byte W01 + .byte VOL , 63*se_ball_tray_enter_mvl/mxv + .byte W01 + .byte 98*se_ball_tray_enter_mvl/mxv + .byte W01 + .byte 110*se_ball_tray_enter_mvl/mxv + .byte W01 + .byte 99*se_ball_tray_enter_mvl/mxv + .byte BEND , c_v+5 + .byte W02 + .byte VOL , 63*se_ball_tray_enter_mvl/mxv + .byte BEND , c_v+13 + .byte W01 + .byte VOL , 22*se_ball_tray_enter_mvl/mxv + .byte BEND , c_v+21 + .byte W01 + .byte VOL , 9*se_ball_tray_enter_mvl/mxv + .byte BEND , c_v+33 + .byte W04 + .byte FINE + +@********************** Track 2 **********************@ + +se_ball_tray_enter_2: + .byte KEYSH , se_ball_tray_enter_key+0 + .byte VOICE , 71 + .byte PAN , c_v+32 + .byte VOL , 110*se_ball_tray_enter_mvl/mxv + .byte BEND , c_v+1 + .byte N09 , Fs4 , v060 + .byte W06 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_tray_enter: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_tray_enter_pri @ Priority + .byte se_ball_tray_enter_rev @ Reverb. + + .word se_ball_tray_enter_grp + + .word se_ball_tray_enter_1 + .word se_ball_tray_enter_2 + + .end diff --git a/sound/songs/se_ball_tray_exit.s b/sound/songs/se_ball_tray_exit.s new file mode 100644 index 000000000..f540ffb2b --- /dev/null +++ b/sound/songs/se_ball_tray_exit.s @@ -0,0 +1,43 @@ + .include "MPlayDef.s" + + .equ se_ball_tray_exit_grp, voicegroup110 + .equ se_ball_tray_exit_pri, 5 + .equ se_ball_tray_exit_rev, reverb_set+50 + .equ se_ball_tray_exit_mvl, 127 + .equ se_ball_tray_exit_key, 0 + .equ se_ball_tray_exit_tbs, 1 + .equ se_ball_tray_exit_exg, 0 + .equ se_ball_tray_exit_cmp, 1 + + .section .rodata + .global se_ball_tray_exit + .align 2 + +@********************** Track 1 **********************@ + +se_ball_tray_exit_1: + .byte KEYSH , se_ball_tray_exit_key+0 + .byte TEMPO , 150*se_ball_tray_exit_tbs/2 + .byte VOICE , 119 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 100*se_ball_tray_exit_mvl/mxv + .byte BEND , c_v+1 + .byte N02 , Gs4 , v040 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_ball_tray_exit: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_ball_tray_exit_pri @ Priority + .byte se_ball_tray_exit_rev @ Reverb. + + .word se_ball_tray_exit_grp + + .word se_ball_tray_exit_1 + + .end diff --git a/sound/songs/se_balloon_blue.s b/sound/songs/se_balloon_blue.s new file mode 100644 index 000000000..a70316a91 --- /dev/null +++ b/sound/songs/se_balloon_blue.s @@ -0,0 +1,52 @@ + .include "MPlayDef.s" + + .equ se_balloon_blue_grp, voicegroup111 + .equ se_balloon_blue_pri, 4 + .equ se_balloon_blue_rev, reverb_set+50 + .equ se_balloon_blue_mvl, 127 + .equ se_balloon_blue_key, 0 + .equ se_balloon_blue_tbs, 1 + .equ se_balloon_blue_exg, 0 + .equ se_balloon_blue_cmp, 1 + + .section .rodata + .global se_balloon_blue + .align 2 + +@********************** Track 1 **********************@ + +se_balloon_blue_1: + .byte KEYSH , se_balloon_blue_key+0 + .byte TEMPO , 240*se_balloon_blue_tbs/2 + .byte VOICE , 2 + .byte BENDR , 12 + .byte VOL , 105*se_balloon_blue_mvl/mxv + .byte BEND , c_v+0 + .byte N03 , Gn4 , v127 + .byte W04 + .byte N01 , Gn4 , v112 + .byte W02 + .byte W02 + .byte Gs3 , v052 + .byte W04 + .byte VOICE , 23 + .byte N02 , Fn3 , v112 + .byte W04 + .byte N01 , Cn4 , v072 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_balloon_blue: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_balloon_blue_pri @ Priority + .byte se_balloon_blue_rev @ Reverb. + + .word se_balloon_blue_grp + + .word se_balloon_blue_1 + + .end diff --git a/sound/songs/se_balloon_red.s b/sound/songs/se_balloon_red.s new file mode 100644 index 000000000..d9ab9589f --- /dev/null +++ b/sound/songs/se_balloon_red.s @@ -0,0 +1,53 @@ + .include "MPlayDef.s" + + .equ se_balloon_red_grp, voicegroup111 + .equ se_balloon_red_pri, 4 + .equ se_balloon_red_rev, reverb_set+50 + .equ se_balloon_red_mvl, 127 + .equ se_balloon_red_key, 0 + .equ se_balloon_red_tbs, 1 + .equ se_balloon_red_exg, 0 + .equ se_balloon_red_cmp, 1 + + .section .rodata + .global se_balloon_red + .align 2 + +@********************** Track 1 **********************@ + +se_balloon_red_1: + .byte KEYSH , se_balloon_red_key+0 + .byte TEMPO , 240*se_balloon_red_tbs/2 + .byte VOICE , 2 + .byte BENDR , 12 + .byte VOL , 105*se_balloon_red_mvl/mxv + .byte BEND , c_v+0 + .byte N06 , Cn4 , v127 + .byte W06 + .byte VOICE , 23 + .byte N02 , Cn3 , v112 + .byte W07 + .byte N01 , Cn4 + .byte W05 + .byte Cn3 , v100 + .byte W02 + .byte Gn3 , v092 + .byte W02 + .byte Cn3 , v072 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_balloon_red: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_balloon_red_pri @ Priority + .byte se_balloon_red_rev @ Reverb. + + .word se_balloon_red_grp + + .word se_balloon_red_1 + + .end diff --git a/sound/songs/se_fuusen3.s b/sound/songs/se_balloon_yellow.s index 40c993e00..3855cbf35 100644 --- a/sound/songs/se_fuusen3.s +++ b/sound/songs/se_balloon_yellow.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_fuusen3_grp, voicegroup111 - .equ se_fuusen3_pri, 4 - .equ se_fuusen3_rev, reverb_set+50 - .equ se_fuusen3_mvl, 127 - .equ se_fuusen3_key, 0 - .equ se_fuusen3_tbs, 1 - .equ se_fuusen3_exg, 0 - .equ se_fuusen3_cmp, 1 + .equ se_balloon_yellow_grp, voicegroup111 + .equ se_balloon_yellow_pri, 4 + .equ se_balloon_yellow_rev, reverb_set+50 + .equ se_balloon_yellow_mvl, 127 + .equ se_balloon_yellow_key, 0 + .equ se_balloon_yellow_tbs, 1 + .equ se_balloon_yellow_exg, 0 + .equ se_balloon_yellow_cmp, 1 .section .rodata - .global se_fuusen3 + .global se_balloon_yellow .align 2 @********************** Track 1 **********************@ -se_fuusen3_1: - .byte KEYSH , se_fuusen3_key+0 - .byte TEMPO , 240*se_fuusen3_tbs/2 +se_balloon_yellow_1: + .byte KEYSH , se_balloon_yellow_key+0 + .byte TEMPO , 240*se_balloon_yellow_tbs/2 .byte VOICE , 2 .byte BENDR , 12 - .byte VOL , 105*se_fuusen3_mvl/mxv + .byte VOL , 105*se_balloon_yellow_mvl/mxv .byte BEND , c_v+0 .byte N02 , Fn3 , v127 .byte W02 @@ -47,14 +47,14 @@ se_fuusen3_1: @******************************************************@ .align 2 -se_fuusen3: +se_balloon_yellow: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_fuusen3_pri @ Priority - .byte se_fuusen3_rev @ Reverb. + .byte se_balloon_yellow_pri @ Priority + .byte se_balloon_yellow_rev @ Reverb. - .word se_fuusen3_grp + .word se_balloon_yellow_grp - .word se_fuusen3_1 + .word se_balloon_yellow_1 .end diff --git a/sound/songs/se_ban.s b/sound/songs/se_ban.s deleted file mode 100644 index 7481f2cf1..000000000 --- a/sound/songs/se_ban.s +++ /dev/null @@ -1,70 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ban_grp, voicegroup111 - .equ se_ban_pri, 4 - .equ se_ban_rev, reverb_set+50 - .equ se_ban_mvl, 127 - .equ se_ban_key, 0 - .equ se_ban_tbs, 1 - .equ se_ban_exg, 0 - .equ se_ban_cmp, 1 - - .section .rodata - .global se_ban - .align 2 - -@********************** Track 1 **********************@ - -se_ban_1: - .byte KEYSH , se_ban_key+0 - .byte TEMPO , 240*se_ban_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 110*se_ban_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , En2 , v127 - .byte W03 - .byte Dn2 - .byte W03 - .byte N06 , Gn1 - .byte W06 - .byte N60 , An2 - .byte W12 - .byte W24 - .byte VOL , 94*se_ban_mvl/mxv - .byte BEND , c_v-5 - .byte W03 - .byte VOL , 81*se_ban_mvl/mxv - .byte W03 - .byte 71*se_ban_mvl/mxv - .byte BEND , c_v-12 - .byte W03 - .byte VOL , 47*se_ban_mvl/mxv - .byte W03 - .byte 32*se_ban_mvl/mxv - .byte BEND , c_v-19 - .byte W03 - .byte VOL , 20*se_ban_mvl/mxv - .byte W03 - .byte 7*se_ban_mvl/mxv - .byte BEND , c_v-28 - .byte W03 - .byte VOL , 0*se_ban_mvl/mxv - .byte BEND , c_v-37 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_ban: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_ban_pri @ Priority - .byte se_ban_rev @ Reverb. - - .word se_ban_grp - - .word se_ban_1 - - .end diff --git a/sound/songs/se_bang.s b/sound/songs/se_bang.s new file mode 100644 index 000000000..baca31e18 --- /dev/null +++ b/sound/songs/se_bang.s @@ -0,0 +1,70 @@ + .include "MPlayDef.s" + + .equ se_bang_grp, voicegroup111 + .equ se_bang_pri, 4 + .equ se_bang_rev, reverb_set+50 + .equ se_bang_mvl, 127 + .equ se_bang_key, 0 + .equ se_bang_tbs, 1 + .equ se_bang_exg, 0 + .equ se_bang_cmp, 1 + + .section .rodata + .global se_bang + .align 2 + +@********************** Track 1 **********************@ + +se_bang_1: + .byte KEYSH , se_bang_key+0 + .byte TEMPO , 240*se_bang_tbs/2 + .byte VOICE , 2 + .byte BENDR , 12 + .byte VOL , 110*se_bang_mvl/mxv + .byte BEND , c_v+0 + .byte N03 , En2 , v127 + .byte W03 + .byte Dn2 + .byte W03 + .byte N06 , Gn1 + .byte W06 + .byte N60 , An2 + .byte W12 + .byte W24 + .byte VOL , 94*se_bang_mvl/mxv + .byte BEND , c_v-5 + .byte W03 + .byte VOL , 81*se_bang_mvl/mxv + .byte W03 + .byte 71*se_bang_mvl/mxv + .byte BEND , c_v-12 + .byte W03 + .byte VOL , 47*se_bang_mvl/mxv + .byte W03 + .byte 32*se_bang_mvl/mxv + .byte BEND , c_v-19 + .byte W03 + .byte VOL , 20*se_bang_mvl/mxv + .byte W03 + .byte 7*se_bang_mvl/mxv + .byte BEND , c_v-28 + .byte W03 + .byte VOL , 0*se_bang_mvl/mxv + .byte BEND , c_v-37 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_bang: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_bang_pri @ Priority + .byte se_bang_rev @ Reverb. + + .word se_bang_grp + + .word se_bang_1 + + .end diff --git a/sound/songs/se_basabasa.s b/sound/songs/se_basabasa.s deleted file mode 100644 index b95cca124..000000000 --- a/sound/songs/se_basabasa.s +++ /dev/null @@ -1,123 +0,0 @@ - .include "MPlayDef.s" - - .equ se_basabasa_grp, voicegroup111 - .equ se_basabasa_pri, 5 - .equ se_basabasa_rev, reverb_set+50 - .equ se_basabasa_mvl, 127 - .equ se_basabasa_key, 0 - .equ se_basabasa_tbs, 1 - .equ se_basabasa_exg, 0 - .equ se_basabasa_cmp, 1 - - .section .rodata - .global se_basabasa - .align 2 - -@********************** Track 1 **********************@ - -se_basabasa_1: - .byte KEYSH , se_basabasa_key+0 -se_basabasa_1_B1: - .byte TEMPO , 220*se_basabasa_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 40*se_basabasa_mvl/mxv - .byte BEND , c_v-32 - .byte N07 , An1 , v127 - .byte W01 - .byte VOL , 52*se_basabasa_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 68*se_basabasa_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 82*se_basabasa_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 105*se_basabasa_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+37 - .byte W02 - .byte PAN , c_v+10 - .byte BEND , c_v+63 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 40*se_basabasa_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v+1 - .byte N06 - .byte W02 - .byte VOL , 52*se_basabasa_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+38 - .byte W01 - .byte VOL , 79*se_basabasa_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+48 - .byte W01 - .byte VOL , 105*se_basabasa_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W10 - .byte W12 - .byte W12 - .byte GOTO - .word se_basabasa_1_B1 - .byte FINE - -@********************** Track 2 **********************@ - -se_basabasa_2: - .byte KEYSH , se_basabasa_key+0 -se_basabasa_2_B1: - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 52*se_basabasa_mvl/mxv - .byte N07 , Gn2 , v040 - .byte W01 - .byte VOL , 69*se_basabasa_mvl/mxv - .byte W01 - .byte 83*se_basabasa_mvl/mxv - .byte W01 - .byte 105*se_basabasa_mvl/mxv - .byte W01 - .byte 67*se_basabasa_mvl/mxv - .byte W02 - .byte 23*se_basabasa_mvl/mxv - .byte W04 - .byte VOICE , 25 - .byte VOL , 52*se_basabasa_mvl/mxv - .byte N06 , Gs4 - .byte W02 - .byte VOL , 81*se_basabasa_mvl/mxv - .byte W01 - .byte 105*se_basabasa_mvl/mxv - .byte W02 - .byte 52*se_basabasa_mvl/mxv - .byte W09 - .byte W12 - .byte W12 - .byte GOTO - .word se_basabasa_2_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_basabasa: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_basabasa_pri @ Priority - .byte se_basabasa_rev @ Reverb. - - .word se_basabasa_grp - - .word se_basabasa_1 - .word se_basabasa_2 - - .end diff --git a/sound/songs/se_berry_blender.s b/sound/songs/se_berry_blender.s new file mode 100644 index 000000000..b0d740ab6 --- /dev/null +++ b/sound/songs/se_berry_blender.s @@ -0,0 +1,49 @@ + .include "MPlayDef.s" + + .equ se_berry_blender_grp, voicegroup111 + .equ se_berry_blender_pri, 4 + .equ se_berry_blender_rev, reverb_set+50 + .equ se_berry_blender_mvl, 127 + .equ se_berry_blender_key, 0 + .equ se_berry_blender_tbs, 1 + .equ se_berry_blender_exg, 0 + .equ se_berry_blender_cmp, 1 + + .section .rodata + .global se_berry_blender + .align 2 + +@********************** Track 1 **********************@ + +se_berry_blender_1: + .byte KEYSH , se_berry_blender_key+0 +se_berry_blender_1_B1: + .byte TEMPO , 150*se_berry_blender_tbs/2 + .byte VOICE , 15 + .byte VOL , 90*se_berry_blender_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte TIE , Gn2 , v100 + .byte W96 + .byte W96 + .byte W48 + .byte EOT + .byte GOTO + .word se_berry_blender_1_B1 + .byte W48 + .byte FINE + +@******************************************************@ + .align 2 + +se_berry_blender: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_berry_blender_pri @ Priority + .byte se_berry_blender_rev @ Reverb. + + .word se_berry_blender_grp + + .word se_berry_blender_1 + + .end diff --git a/sound/songs/se_bidoro.s b/sound/songs/se_bidoro.s deleted file mode 100644 index 5e7fce2f7..000000000 --- a/sound/songs/se_bidoro.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_bidoro_grp, voicegroup111 - .equ se_bidoro_pri, 5 - .equ se_bidoro_rev, reverb_set+50 - .equ se_bidoro_mvl, 127 - .equ se_bidoro_key, 0 - .equ se_bidoro_tbs, 1 - .equ se_bidoro_exg, 0 - .equ se_bidoro_cmp, 1 - - .section .rodata - .global se_bidoro - .align 2 - -@********************** Track 1 **********************@ - -se_bidoro_1: - .byte KEYSH , se_bidoro_key+0 - .byte TEMPO , 120*se_bidoro_tbs/2 - .byte VOICE , 28 - .byte VOL , 26*se_bidoro_mvl/mxv - .byte BENDR , 8 - .byte BEND , c_v+0 - .byte N01 , En3 , v116 - .byte W01 - .byte VOL , 105*se_bidoro_mvl/mxv - .byte BEND , c_v-4 - .byte N01 , Bn2 - .byte W01 - .byte BEND , c_v+3 - .byte N01 , Cn3 - .byte W04 - .byte W04 - .byte BEND , c_v+0 - .byte N04 , Bn3 - .byte W02 - .byte VOL , 26*se_bidoro_mvl/mxv - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 105*se_bidoro_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte c_v-23 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_bidoro: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_bidoro_pri @ Priority - .byte se_bidoro_rev @ Reverb. - - .word se_bidoro_grp - - .word se_bidoro_1 - - .end diff --git a/sound/songs/se_bike_bell.s b/sound/songs/se_bike_bell.s new file mode 100644 index 000000000..3bc3470ba --- /dev/null +++ b/sound/songs/se_bike_bell.s @@ -0,0 +1,40 @@ + .include "MPlayDef.s" + + .equ se_bike_bell_grp, voicegroup111 + .equ se_bike_bell_pri, 4 + .equ se_bike_bell_rev, reverb_set+50 + .equ se_bike_bell_mvl, 127 + .equ se_bike_bell_key, 0 + .equ se_bike_bell_tbs, 1 + .equ se_bike_bell_exg, 0 + .equ se_bike_bell_cmp, 1 + + .section .rodata + .global se_bike_bell + .align 2 + +@********************** Track 1 **********************@ + +se_bike_bell_1: + .byte KEYSH , se_bike_bell_key+0 + .byte TEMPO , 120*se_bike_bell_tbs/2 + .byte VOICE , 0 + .byte VOL , 90*se_bike_bell_mvl/mxv + .byte N96 , Cn3 , v127 + .byte W96 + .byte FINE + +@******************************************************@ + .align 2 + +se_bike_bell: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_bike_bell_pri @ Priority + .byte se_bike_bell_rev @ Reverb. + + .word se_bike_bell_grp + + .word se_bike_bell_1 + + .end diff --git a/sound/songs/se_bike_hop.s b/sound/songs/se_bike_hop.s new file mode 100644 index 000000000..632597381 --- /dev/null +++ b/sound/songs/se_bike_hop.s @@ -0,0 +1,45 @@ + .include "MPlayDef.s" + + .equ se_bike_hop_grp, voicegroup110 + .equ se_bike_hop_pri, 4 + .equ se_bike_hop_rev, reverb_set+50 + .equ se_bike_hop_mvl, 127 + .equ se_bike_hop_key, 0 + .equ se_bike_hop_tbs, 1 + .equ se_bike_hop_exg, 0 + .equ se_bike_hop_cmp, 1 + + .section .rodata + .global se_bike_hop + .align 2 + +@********************** Track 1 **********************@ + +se_bike_hop_1: + .byte KEYSH , se_bike_hop_key+0 + .byte TEMPO , 180*se_bike_hop_tbs/2 + .byte VOICE , 85 + .byte VOL , 90*se_bike_hop_mvl/mxv + .byte BEND , c_v-6 + .byte N02 , Cn3 , v080 + .byte W02 + .byte VOICE , 86 + .byte N03 , Cn4 , v127 + .byte W01 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_bike_hop: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_bike_hop_pri @ Priority + .byte se_bike_hop_rev @ Reverb. + + .word se_bike_hop_grp + + .word se_bike_hop_1 + + .end diff --git a/sound/songs/se_bowa.s b/sound/songs/se_bowa.s deleted file mode 100644 index c918a99b9..000000000 --- a/sound/songs/se_bowa.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_bowa_grp, voicegroup110 - .equ se_bowa_pri, 4 - .equ se_bowa_rev, reverb_set+50 - .equ se_bowa_mvl, 127 - .equ se_bowa_key, 0 - .equ se_bowa_tbs, 1 - .equ se_bowa_exg, 0 - .equ se_bowa_cmp, 1 - - .section .rodata - .global se_bowa - .align 2 - -@********************** Track 1 **********************@ - -se_bowa_1: - .byte KEYSH , se_bowa_key+0 - .byte TEMPO , 128*se_bowa_tbs/2 - .byte VOICE , 7 - .byte BENDR , 12 - .byte VOL , 70*se_bowa_mvl/mxv - .byte BEND , c_v+2 - .byte N04 , Fn2 , v127 - .byte W04 - .byte N01 , Dn3 - .byte W02 - .byte VOICE , 8 - .byte FINE - -@******************************************************@ - .align 2 - -se_bowa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_bowa_pri @ Priority - .byte se_bowa_rev @ Reverb. - - .word se_bowa_grp - - .word se_bowa_1 - - .end diff --git a/sound/songs/se_breakable_door.s b/sound/songs/se_breakable_door.s new file mode 100644 index 000000000..6abc0810a --- /dev/null +++ b/sound/songs/se_breakable_door.s @@ -0,0 +1,75 @@ + .include "MPlayDef.s" + + .equ se_breakable_door_grp, voicegroup111 + .equ se_breakable_door_pri, 4 + .equ se_breakable_door_rev, reverb_set+50 + .equ se_breakable_door_mvl, 127 + .equ se_breakable_door_key, 0 + .equ se_breakable_door_tbs, 1 + .equ se_breakable_door_exg, 0 + .equ se_breakable_door_cmp, 1 + + .section .rodata + .global se_breakable_door + .align 2 + +@********************** Track 1 **********************@ + +se_breakable_door_1: + .byte KEYSH , se_breakable_door_key+0 + .byte TEMPO , 240*se_breakable_door_tbs/2 + .byte VOICE , 41 + .byte BENDR , 12 + .byte VOL , 110*se_breakable_door_mvl/mxv + .byte BEND , c_v+0 + .byte N03 , Fs4 , v127 + .byte W01 + .byte BEND , c_v-8 + .byte W01 + .byte c_v-23 + .byte W01 + .byte W01 + .byte c_v+0 + .byte N10 , Cn4 + .byte W02 + .byte W03 + .byte W01 + .byte VOL , 96*se_breakable_door_mvl/mxv + .byte W02 + .byte 82*se_breakable_door_mvl/mxv + .byte W01 + .byte 45*se_breakable_door_mvl/mxv + .byte W01 + .byte 20*se_breakable_door_mvl/mxv + .byte W01 + .byte W03 + .byte W01 + .byte 110*se_breakable_door_mvl/mxv + .byte N10 , Cn4 , v040 + .byte W02 + .byte W03 + .byte W01 + .byte VOL , 96*se_breakable_door_mvl/mxv + .byte W01 + .byte 82*se_breakable_door_mvl/mxv + .byte W01 + .byte 45*se_breakable_door_mvl/mxv + .byte W01 + .byte 20*se_breakable_door_mvl/mxv + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_breakable_door: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_breakable_door_pri @ Priority + .byte se_breakable_door_rev @ Reverb. + + .word se_breakable_door_grp + + .word se_breakable_door_1 + + .end diff --git a/sound/songs/se_bridge_walk.s b/sound/songs/se_bridge_walk.s new file mode 100644 index 000000000..d4a8a8be3 --- /dev/null +++ b/sound/songs/se_bridge_walk.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_bridge_walk_grp, voicegroup111 + .equ se_bridge_walk_pri, 4 + .equ se_bridge_walk_rev, reverb_set+50 + .equ se_bridge_walk_mvl, 127 + .equ se_bridge_walk_key, 0 + .equ se_bridge_walk_tbs, 1 + .equ se_bridge_walk_exg, 0 + .equ se_bridge_walk_cmp, 1 + + .section .rodata + .global se_bridge_walk + .align 2 + +@********************** Track 1 **********************@ + +se_bridge_walk_1: + .byte KEYSH , se_bridge_walk_key+0 + .byte TEMPO , 150*se_bridge_walk_tbs/2 + .byte VOICE , 26 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 95*se_bridge_walk_mvl/mxv + .byte BEND , c_v+0 + .byte N01 , Cn3 , v127 + .byte W03 + .byte W03 + .byte Gn3 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_bridge_walk: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_bridge_walk_pri @ Priority + .byte se_bridge_walk_rev @ Reverb. + + .word se_bridge_walk_grp + + .word se_bridge_walk_1 + + .end diff --git a/sound/songs/se_c_gaji.s b/sound/songs/se_c_gaji.s deleted file mode 100644 index e0e412f39..000000000 --- a/sound/songs/se_c_gaji.s +++ /dev/null @@ -1,44 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_gaji_grp, voicegroup111 - .equ se_c_gaji_pri, 5 - .equ se_c_gaji_rev, reverb_set+50 - .equ se_c_gaji_mvl, 127 - .equ se_c_gaji_key, 0 - .equ se_c_gaji_tbs, 1 - .equ se_c_gaji_exg, 0 - .equ se_c_gaji_cmp, 1 - - .section .rodata - .global se_c_gaji - .align 2 - -@********************** Track 1 **********************@ - -se_c_gaji_1: - .byte KEYSH , se_c_gaji_key+0 - .byte TEMPO , 150*se_c_gaji_tbs/2 - .byte VOICE , 14 - .byte VOL , 90*se_c_gaji_mvl/mxv - .byte BEND , c_v-7 - .byte N02 , Cn5 , v112 - .byte W02 - .byte N09 , Gn4 - .byte W04 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_gaji: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_gaji_pri @ Priority - .byte se_c_gaji_rev @ Reverb. - - .word se_c_gaji_grp - - .word se_c_gaji_1 - - .end diff --git a/sound/songs/se_c_maku_d.s b/sound/songs/se_c_maku_d.s deleted file mode 100644 index 1ce08606a..000000000 --- a/sound/songs/se_c_maku_d.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_maku_d_grp, voicegroup111 - .equ se_c_maku_d_pri, 5 - .equ se_c_maku_d_rev, reverb_set+50 - .equ se_c_maku_d_mvl, 127 - .equ se_c_maku_d_key, 0 - .equ se_c_maku_d_tbs, 1 - .equ se_c_maku_d_exg, 0 - .equ se_c_maku_d_cmp, 1 - - .section .rodata - .global se_c_maku_d - .align 2 - -@********************** Track 1 **********************@ - -se_c_maku_d_1: - .byte KEYSH , se_c_maku_d_key+0 - .byte TEMPO , 150*se_c_maku_d_tbs/2 - .byte VOICE , 25 - .byte VOL , 12*se_c_maku_d_mvl/mxv - .byte BEND , c_v+0 - .byte N12 , Gs4 , v060 - .byte W01 - .byte VOL , 22*se_c_maku_d_mvl/mxv - .byte W01 - .byte 33*se_c_maku_d_mvl/mxv - .byte W01 - .byte 46*se_c_maku_d_mvl/mxv - .byte W01 - .byte 58*se_c_maku_d_mvl/mxv - .byte W02 - .byte 70*se_c_maku_d_mvl/mxv - .byte W02 - .byte 60*se_c_maku_d_mvl/mxv - .byte W01 - .byte 42*se_c_maku_d_mvl/mxv - .byte W01 - .byte 22*se_c_maku_d_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_c_maku_d_2: - .byte KEYSH , se_c_maku_d_key+0 - .byte VOICE , 15 - .byte VOL , 12*se_c_maku_d_mvl/mxv - .byte BEND , c_v+0 - .byte N12 , Fn3 , v100 - .byte W01 - .byte VOL , 22*se_c_maku_d_mvl/mxv - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 33*se_c_maku_d_mvl/mxv - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 46*se_c_maku_d_mvl/mxv - .byte BEND , c_v-10 - .byte W01 - .byte VOL , 58*se_c_maku_d_mvl/mxv - .byte BEND , c_v-15 - .byte W02 - .byte VOL , 70*se_c_maku_d_mvl/mxv - .byte BEND , c_v-23 - .byte W01 - .byte c_v-31 - .byte W01 - .byte VOL , 60*se_c_maku_d_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte VOL , 42*se_c_maku_d_mvl/mxv - .byte BEND , c_v-48 - .byte W01 - .byte VOL , 22*se_c_maku_d_mvl/mxv - .byte BEND , c_v-55 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_maku_d: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_maku_d_pri @ Priority - .byte se_c_maku_d_rev @ Reverb. - - .word se_c_maku_d_grp - - .word se_c_maku_d_1 - .word se_c_maku_d_2 - - .end diff --git a/sound/songs/se_c_maku_u.s b/sound/songs/se_c_maku_u.s deleted file mode 100644 index c7dcfabc5..000000000 --- a/sound/songs/se_c_maku_u.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_maku_u_grp, voicegroup111 - .equ se_c_maku_u_pri, 5 - .equ se_c_maku_u_rev, reverb_set+50 - .equ se_c_maku_u_mvl, 127 - .equ se_c_maku_u_key, 0 - .equ se_c_maku_u_tbs, 1 - .equ se_c_maku_u_exg, 0 - .equ se_c_maku_u_cmp, 1 - - .section .rodata - .global se_c_maku_u - .align 2 - -@********************** Track 1 **********************@ - -se_c_maku_u_1: - .byte KEYSH , se_c_maku_u_key+0 - .byte TEMPO , 150*se_c_maku_u_tbs/2 - .byte VOICE , 25 - .byte VOL , 12*se_c_maku_u_mvl/mxv - .byte BEND , c_v+0 - .byte N12 , Gs4 , v060 - .byte W01 - .byte VOL , 22*se_c_maku_u_mvl/mxv - .byte W01 - .byte 33*se_c_maku_u_mvl/mxv - .byte W01 - .byte 46*se_c_maku_u_mvl/mxv - .byte W01 - .byte 58*se_c_maku_u_mvl/mxv - .byte W02 - .byte 70*se_c_maku_u_mvl/mxv - .byte W02 - .byte 60*se_c_maku_u_mvl/mxv - .byte W01 - .byte 42*se_c_maku_u_mvl/mxv - .byte W01 - .byte 22*se_c_maku_u_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_c_maku_u_2: - .byte KEYSH , se_c_maku_u_key+0 - .byte VOICE , 15 - .byte VOL , 12*se_c_maku_u_mvl/mxv - .byte BEND , c_v+0 - .byte N12 , Fn3 , v100 - .byte W01 - .byte VOL , 22*se_c_maku_u_mvl/mxv - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 33*se_c_maku_u_mvl/mxv - .byte BEND , c_v+6 - .byte W01 - .byte VOL , 46*se_c_maku_u_mvl/mxv - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 58*se_c_maku_u_mvl/mxv - .byte BEND , c_v+12 - .byte W02 - .byte VOL , 70*se_c_maku_u_mvl/mxv - .byte BEND , c_v+17 - .byte W01 - .byte c_v+20 - .byte W01 - .byte VOL , 60*se_c_maku_u_mvl/mxv - .byte BEND , c_v+25 - .byte W01 - .byte VOL , 42*se_c_maku_u_mvl/mxv - .byte BEND , c_v+32 - .byte W01 - .byte VOL , 22*se_c_maku_u_mvl/mxv - .byte BEND , c_v+38 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_maku_u: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_maku_u_pri @ Priority - .byte se_c_maku_u_rev @ Reverb. - - .word se_c_maku_u_grp - - .word se_c_maku_u_1 - .word se_c_maku_u_2 - - .end diff --git a/sound/songs/se_c_pasi.s b/sound/songs/se_c_pasi.s deleted file mode 100644 index 3767debf7..000000000 --- a/sound/songs/se_c_pasi.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_pasi_grp, voicegroup111 - .equ se_c_pasi_pri, 5 - .equ se_c_pasi_rev, reverb_set+50 - .equ se_c_pasi_mvl, 127 - .equ se_c_pasi_key, 0 - .equ se_c_pasi_tbs, 1 - .equ se_c_pasi_exg, 0 - .equ se_c_pasi_cmp, 1 - - .section .rodata - .global se_c_pasi - .align 2 - -@********************** Track 1 **********************@ - -se_c_pasi_1: - .byte KEYSH , se_c_pasi_key+0 - .byte TEMPO , 150*se_c_pasi_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 110*se_c_pasi_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Gn3 , v112 - .byte W04 - .byte Gn4 , v064 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_pasi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_pasi_pri @ Priority - .byte se_c_pasi_rev @ Reverb. - - .word se_c_pasi_grp - - .word se_c_pasi_1 - - .end diff --git a/sound/songs/se_c_pikon.s b/sound/songs/se_c_pikon.s deleted file mode 100644 index 404f419bf..000000000 --- a/sound/songs/se_c_pikon.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_pikon_grp, voicegroup111 - .equ se_c_pikon_pri, 5 - .equ se_c_pikon_rev, reverb_set+50 - .equ se_c_pikon_mvl, 127 - .equ se_c_pikon_key, 0 - .equ se_c_pikon_tbs, 1 - .equ se_c_pikon_exg, 0 - .equ se_c_pikon_cmp, 1 - - .section .rodata - .global se_c_pikon - .align 2 - -@********************** Track 1 **********************@ - -se_c_pikon_1: - .byte KEYSH , se_c_pikon_key+0 - .byte TEMPO , 150*se_c_pikon_tbs/2 - .byte VOICE , 14 - .byte VOL , 90*se_c_pikon_mvl/mxv - .byte BEND , c_v-7 - .byte N02 , Cn5 , v112 - .byte W02 - .byte Cn6 - .byte W04 - .byte W01 - .byte Cn6 , v060 - .byte W05 - .byte W02 - .byte Cn5 , v112 - .byte W02 - .byte Cn6 - .byte W02 - .byte W03 - .byte Cn6 , v060 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_pikon: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_pikon_pri @ Priority - .byte se_c_pikon_rev @ Reverb. - - .word se_c_pikon_grp - - .word se_c_pikon_1 - - .end diff --git a/sound/songs/se_c_syu.s b/sound/songs/se_c_syu.s deleted file mode 100644 index d0432b343..000000000 --- a/sound/songs/se_c_syu.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_syu_grp, voicegroup111 - .equ se_c_syu_pri, 5 - .equ se_c_syu_rev, reverb_set+50 - .equ se_c_syu_mvl, 127 - .equ se_c_syu_key, 0 - .equ se_c_syu_tbs, 1 - .equ se_c_syu_exg, 0 - .equ se_c_syu_cmp, 1 - - .section .rodata - .global se_c_syu - .align 2 - -@********************** Track 1 **********************@ - -se_c_syu_1: - .byte KEYSH , se_c_syu_key+0 - .byte TEMPO , 150*se_c_syu_tbs/2 - .byte VOICE , 36 - .byte VOL , 49*se_c_syu_mvl/mxv - .byte BEND , c_v-64 - .byte N03 , Cn6 , v112 - .byte W01 - .byte VOL , 68*se_c_syu_mvl/mxv - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 90*se_c_syu_mvl/mxv - .byte BEND , c_v+63 - .byte W01 - .byte VOL , 69*se_c_syu_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Cn6 , v040 - .byte W01 - .byte VOL , 90*se_c_syu_mvl/mxv - .byte BEND , c_v+63 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_syu: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_syu_pri @ Priority - .byte se_c_syu_rev @ Reverb. - - .word se_c_syu_grp - - .word se_c_syu_1 - - .end diff --git a/sound/songs/se_click.s b/sound/songs/se_click.s new file mode 100644 index 000000000..cacbe6317 --- /dev/null +++ b/sound/songs/se_click.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_click_grp, voicegroup110 + .equ se_click_pri, 4 + .equ se_click_rev, reverb_set+50 + .equ se_click_mvl, 127 + .equ se_click_key, 0 + .equ se_click_tbs, 1 + .equ se_click_exg, 0 + .equ se_click_cmp, 1 + + .section .rodata + .global se_click + .align 2 + +@********************** Track 1 **********************@ + +se_click_1: + .byte KEYSH , se_click_key+0 + .byte TEMPO , 150*se_click_tbs/2 + .byte VOICE , 126 + .byte VOL , 110*se_click_mvl/mxv + .byte N01 , Gs3 , v127 + .byte W01 + .byte Cn4 , v068 + .byte W02 + .byte W02 + .byte N03 , Gs4 , v127 + .byte W01 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_click: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_click_pri @ Priority + .byte se_click_rev @ Reverb. + + .word se_click_grp + + .word se_click_1 + + .end diff --git a/sound/songs/se_contest_condition_lose.s b/sound/songs/se_contest_condition_lose.s new file mode 100644 index 000000000..a86cbad75 --- /dev/null +++ b/sound/songs/se_contest_condition_lose.s @@ -0,0 +1,48 @@ + .include "MPlayDef.s" + + .equ se_contest_condition_lose_grp, voicegroup110 + .equ se_contest_condition_lose_pri, 4 + .equ se_contest_condition_lose_rev, reverb_set+50 + .equ se_contest_condition_lose_mvl, 127 + .equ se_contest_condition_lose_key, 0 + .equ se_contest_condition_lose_tbs, 1 + .equ se_contest_condition_lose_exg, 0 + .equ se_contest_condition_lose_cmp, 1 + + .section .rodata + .global se_contest_condition_lose + .align 2 + +@********************** Track 1 **********************@ + +se_contest_condition_lose_1: + .byte KEYSH , se_contest_condition_lose_key+0 + .byte TEMPO , 150*se_contest_condition_lose_tbs/2 + .byte VOICE , 126 + .byte VOL , 110*se_contest_condition_lose_mvl/mxv + .byte N01 , An2 , v112 + .byte W01 + .byte En3 + .byte W01 + .byte Gn3 + .byte W01 + .byte W02 + .byte N02 , Cn3 , v092 + .byte W01 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_contest_condition_lose: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_contest_condition_lose_pri @ Priority + .byte se_contest_condition_lose_rev @ Reverb. + + .word se_contest_condition_lose_grp + + .word se_contest_condition_lose_1 + + .end diff --git a/sound/songs/se_contest_curtain_fall.s b/sound/songs/se_contest_curtain_fall.s new file mode 100644 index 000000000..567ebcf90 --- /dev/null +++ b/sound/songs/se_contest_curtain_fall.s @@ -0,0 +1,95 @@ + .include "MPlayDef.s" + + .equ se_contest_curtain_fall_grp, voicegroup111 + .equ se_contest_curtain_fall_pri, 5 + .equ se_contest_curtain_fall_rev, reverb_set+50 + .equ se_contest_curtain_fall_mvl, 127 + .equ se_contest_curtain_fall_key, 0 + .equ se_contest_curtain_fall_tbs, 1 + .equ se_contest_curtain_fall_exg, 0 + .equ se_contest_curtain_fall_cmp, 1 + + .section .rodata + .global se_contest_curtain_fall + .align 2 + +@********************** Track 1 **********************@ + +se_contest_curtain_fall_1: + .byte KEYSH , se_contest_curtain_fall_key+0 + .byte TEMPO , 150*se_contest_curtain_fall_tbs/2 + .byte VOICE , 25 + .byte VOL , 12*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v+0 + .byte N12 , Gs4 , v060 + .byte W01 + .byte VOL , 22*se_contest_curtain_fall_mvl/mxv + .byte W01 + .byte 33*se_contest_curtain_fall_mvl/mxv + .byte W01 + .byte 46*se_contest_curtain_fall_mvl/mxv + .byte W01 + .byte 58*se_contest_curtain_fall_mvl/mxv + .byte W02 + .byte 70*se_contest_curtain_fall_mvl/mxv + .byte W02 + .byte 60*se_contest_curtain_fall_mvl/mxv + .byte W01 + .byte 42*se_contest_curtain_fall_mvl/mxv + .byte W01 + .byte 22*se_contest_curtain_fall_mvl/mxv + .byte W02 + .byte FINE + +@********************** Track 2 **********************@ + +se_contest_curtain_fall_2: + .byte KEYSH , se_contest_curtain_fall_key+0 + .byte VOICE , 15 + .byte VOL , 12*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v+0 + .byte N12 , Fn3 , v100 + .byte W01 + .byte VOL , 22*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v-4 + .byte W01 + .byte VOL , 33*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v-7 + .byte W01 + .byte VOL , 46*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v-10 + .byte W01 + .byte VOL , 58*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v-15 + .byte W02 + .byte VOL , 70*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v-23 + .byte W01 + .byte c_v-31 + .byte W01 + .byte VOL , 60*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte VOL , 42*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v-48 + .byte W01 + .byte VOL , 22*se_contest_curtain_fall_mvl/mxv + .byte BEND , c_v-55 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_contest_curtain_fall: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_contest_curtain_fall_pri @ Priority + .byte se_contest_curtain_fall_rev @ Reverb. + + .word se_contest_curtain_fall_grp + + .word se_contest_curtain_fall_1 + .word se_contest_curtain_fall_2 + + .end diff --git a/sound/songs/se_contest_curtain_rise.s b/sound/songs/se_contest_curtain_rise.s new file mode 100644 index 000000000..b76634aad --- /dev/null +++ b/sound/songs/se_contest_curtain_rise.s @@ -0,0 +1,95 @@ + .include "MPlayDef.s" + + .equ se_contest_curtain_rise_grp, voicegroup111 + .equ se_contest_curtain_rise_pri, 5 + .equ se_contest_curtain_rise_rev, reverb_set+50 + .equ se_contest_curtain_rise_mvl, 127 + .equ se_contest_curtain_rise_key, 0 + .equ se_contest_curtain_rise_tbs, 1 + .equ se_contest_curtain_rise_exg, 0 + .equ se_contest_curtain_rise_cmp, 1 + + .section .rodata + .global se_contest_curtain_rise + .align 2 + +@********************** Track 1 **********************@ + +se_contest_curtain_rise_1: + .byte KEYSH , se_contest_curtain_rise_key+0 + .byte TEMPO , 150*se_contest_curtain_rise_tbs/2 + .byte VOICE , 25 + .byte VOL , 12*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+0 + .byte N12 , Gs4 , v060 + .byte W01 + .byte VOL , 22*se_contest_curtain_rise_mvl/mxv + .byte W01 + .byte 33*se_contest_curtain_rise_mvl/mxv + .byte W01 + .byte 46*se_contest_curtain_rise_mvl/mxv + .byte W01 + .byte 58*se_contest_curtain_rise_mvl/mxv + .byte W02 + .byte 70*se_contest_curtain_rise_mvl/mxv + .byte W02 + .byte 60*se_contest_curtain_rise_mvl/mxv + .byte W01 + .byte 42*se_contest_curtain_rise_mvl/mxv + .byte W01 + .byte 22*se_contest_curtain_rise_mvl/mxv + .byte W02 + .byte FINE + +@********************** Track 2 **********************@ + +se_contest_curtain_rise_2: + .byte KEYSH , se_contest_curtain_rise_key+0 + .byte VOICE , 15 + .byte VOL , 12*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+0 + .byte N12 , Fn3 , v100 + .byte W01 + .byte VOL , 22*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+3 + .byte W01 + .byte VOL , 33*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+6 + .byte W01 + .byte VOL , 46*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+9 + .byte W01 + .byte VOL , 58*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+12 + .byte W02 + .byte VOL , 70*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+17 + .byte W01 + .byte c_v+20 + .byte W01 + .byte VOL , 60*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+25 + .byte W01 + .byte VOL , 42*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+32 + .byte W01 + .byte VOL , 22*se_contest_curtain_rise_mvl/mxv + .byte BEND , c_v+38 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_contest_curtain_rise: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_contest_curtain_rise_pri @ Priority + .byte se_contest_curtain_rise_rev @ Reverb. + + .word se_contest_curtain_rise_grp + + .word se_contest_curtain_rise_1 + .word se_contest_curtain_rise_2 + + .end diff --git a/sound/songs/se_contest_heart.s b/sound/songs/se_contest_heart.s new file mode 100644 index 000000000..480428d1e --- /dev/null +++ b/sound/songs/se_contest_heart.s @@ -0,0 +1,44 @@ + .include "MPlayDef.s" + + .equ se_contest_heart_grp, voicegroup111 + .equ se_contest_heart_pri, 5 + .equ se_contest_heart_rev, reverb_set+50 + .equ se_contest_heart_mvl, 127 + .equ se_contest_heart_key, 0 + .equ se_contest_heart_tbs, 1 + .equ se_contest_heart_exg, 0 + .equ se_contest_heart_cmp, 1 + + .section .rodata + .global se_contest_heart + .align 2 + +@********************** Track 1 **********************@ + +se_contest_heart_1: + .byte KEYSH , se_contest_heart_key+0 + .byte TEMPO , 150*se_contest_heart_tbs/2 + .byte VOICE , 14 + .byte VOL , 90*se_contest_heart_mvl/mxv + .byte BEND , c_v-7 + .byte N02 , Cn5 , v112 + .byte W02 + .byte N09 , Gn4 + .byte W04 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_contest_heart: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_contest_heart_pri @ Priority + .byte se_contest_heart_rev @ Reverb. + + .word se_contest_heart_grp + + .word se_contest_heart_1 + + .end diff --git a/sound/songs/se_contest_icon_change.s b/sound/songs/se_contest_icon_change.s new file mode 100644 index 000000000..08cd95e44 --- /dev/null +++ b/sound/songs/se_contest_icon_change.s @@ -0,0 +1,45 @@ + .include "MPlayDef.s" + + .equ se_contest_icon_change_grp, voicegroup111 + .equ se_contest_icon_change_pri, 5 + .equ se_contest_icon_change_rev, reverb_set+50 + .equ se_contest_icon_change_mvl, 127 + .equ se_contest_icon_change_key, 0 + .equ se_contest_icon_change_tbs, 1 + .equ se_contest_icon_change_exg, 0 + .equ se_contest_icon_change_cmp, 1 + + .section .rodata + .global se_contest_icon_change + .align 2 + +@********************** Track 1 **********************@ + +se_contest_icon_change_1: + .byte KEYSH , se_contest_icon_change_key+0 + .byte TEMPO , 150*se_contest_icon_change_tbs/2 + .byte VOICE , 2 + .byte BENDR , 12 + .byte VOL , 110*se_contest_icon_change_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N02 , Gn3 , v112 + .byte W04 + .byte Gn4 , v064 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_contest_icon_change: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_contest_icon_change_pri @ Priority + .byte se_contest_icon_change_rev @ Reverb. + + .word se_contest_icon_change_grp + + .word se_contest_icon_change_1 + + .end diff --git a/sound/songs/se_contest_icon_clear.s b/sound/songs/se_contest_icon_clear.s new file mode 100644 index 000000000..248db19ed --- /dev/null +++ b/sound/songs/se_contest_icon_clear.s @@ -0,0 +1,54 @@ + .include "MPlayDef.s" + + .equ se_contest_icon_clear_grp, voicegroup111 + .equ se_contest_icon_clear_pri, 5 + .equ se_contest_icon_clear_rev, reverb_set+50 + .equ se_contest_icon_clear_mvl, 127 + .equ se_contest_icon_clear_key, 0 + .equ se_contest_icon_clear_tbs, 1 + .equ se_contest_icon_clear_exg, 0 + .equ se_contest_icon_clear_cmp, 1 + + .section .rodata + .global se_contest_icon_clear + .align 2 + +@********************** Track 1 **********************@ + +se_contest_icon_clear_1: + .byte KEYSH , se_contest_icon_clear_key+0 + .byte TEMPO , 150*se_contest_icon_clear_tbs/2 + .byte VOICE , 36 + .byte VOL , 49*se_contest_icon_clear_mvl/mxv + .byte BEND , c_v-64 + .byte N03 , Cn6 , v112 + .byte W01 + .byte VOL , 68*se_contest_icon_clear_mvl/mxv + .byte BEND , c_v-1 + .byte W01 + .byte VOL , 90*se_contest_icon_clear_mvl/mxv + .byte BEND , c_v+63 + .byte W01 + .byte VOL , 69*se_contest_icon_clear_mvl/mxv + .byte BEND , c_v+0 + .byte N02 , Cn6 , v040 + .byte W01 + .byte VOL , 90*se_contest_icon_clear_mvl/mxv + .byte BEND , c_v+63 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_contest_icon_clear: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_contest_icon_clear_pri @ Priority + .byte se_contest_icon_clear_rev @ Reverb. + + .word se_contest_icon_clear_grp + + .word se_contest_icon_clear_1 + + .end diff --git a/sound/songs/se_contest_mons_turn.s b/sound/songs/se_contest_mons_turn.s new file mode 100644 index 000000000..c8407b392 --- /dev/null +++ b/sound/songs/se_contest_mons_turn.s @@ -0,0 +1,54 @@ + .include "MPlayDef.s" + + .equ se_contest_mons_turn_grp, voicegroup111 + .equ se_contest_mons_turn_pri, 5 + .equ se_contest_mons_turn_rev, reverb_set+50 + .equ se_contest_mons_turn_mvl, 127 + .equ se_contest_mons_turn_key, 0 + .equ se_contest_mons_turn_tbs, 1 + .equ se_contest_mons_turn_exg, 0 + .equ se_contest_mons_turn_cmp, 1 + + .section .rodata + .global se_contest_mons_turn + .align 2 + +@********************** Track 1 **********************@ + +se_contest_mons_turn_1: + .byte KEYSH , se_contest_mons_turn_key+0 + .byte TEMPO , 150*se_contest_mons_turn_tbs/2 + .byte VOICE , 14 + .byte VOL , 90*se_contest_mons_turn_mvl/mxv + .byte BEND , c_v-7 + .byte N02 , Cn5 , v112 + .byte W02 + .byte Cn6 + .byte W04 + .byte W01 + .byte Cn6 , v060 + .byte W05 + .byte W02 + .byte Cn5 , v112 + .byte W02 + .byte Cn6 + .byte W02 + .byte W03 + .byte Cn6 , v060 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_contest_mons_turn: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_contest_mons_turn_pri @ Priority + .byte se_contest_mons_turn_rev @ Reverb. + + .word se_contest_mons_turn_grp + + .word se_contest_mons_turn_1 + + .end diff --git a/sound/songs/se_contest_place.s b/sound/songs/se_contest_place.s new file mode 100644 index 000000000..e666309e1 --- /dev/null +++ b/sound/songs/se_contest_place.s @@ -0,0 +1,127 @@ + .include "MPlayDef.s" + + .equ se_contest_place_grp, voicegroup110 + .equ se_contest_place_pri, 4 + .equ se_contest_place_rev, reverb_set+50 + .equ se_contest_place_mvl, 127 + .equ se_contest_place_key, 0 + .equ se_contest_place_tbs, 1 + .equ se_contest_place_exg, 0 + .equ se_contest_place_cmp, 1 + + .section .rodata + .global se_contest_place + .align 2 + +@********************** Track 1 **********************@ + +se_contest_place_1: + .byte KEYSH , se_contest_place_key+0 + .byte TEMPO , 144*se_contest_place_tbs/2 + .byte VOICE , 48 + .byte PAN , c_v+1 + .byte VOL , 110*se_contest_place_mvl/mxv + .byte N06 , Cn3 , v060 + .byte W06 + .byte N13 , Gn3 + .byte W06 + .byte W01 + .byte VOL , 105*se_contest_place_mvl/mxv + .byte W01 + .byte 100*se_contest_place_mvl/mxv + .byte W01 + .byte 89*se_contest_place_mvl/mxv + .byte W01 + .byte 72*se_contest_place_mvl/mxv + .byte W02 + .byte 55*se_contest_place_mvl/mxv + .byte W01 + .byte 38*se_contest_place_mvl/mxv + .byte W01 + .byte 22*se_contest_place_mvl/mxv + .byte W01 + .byte 110*se_contest_place_mvl/mxv + .byte N12 , Gn3 , v032 + .byte W03 + .byte W01 + .byte VOL , 100*se_contest_place_mvl/mxv + .byte W01 + .byte 91*se_contest_place_mvl/mxv + .byte W01 + .byte 75*se_contest_place_mvl/mxv + .byte W01 + .byte 43*se_contest_place_mvl/mxv + .byte W02 + .byte 24*se_contest_place_mvl/mxv + .byte W01 + .byte 9*se_contest_place_mvl/mxv + .byte W05 + .byte FINE + +@********************** Track 2 **********************@ + +se_contest_place_2: + .byte KEYSH , se_contest_place_key+0 + .byte VOICE , 80 + .byte VOL , 110*se_contest_place_mvl/mxv + .byte PAN , c_v+0 + .byte N06 , Cn3 , v060 + .byte W06 + .byte N13 , Gn3 + .byte W06 + .byte W09 + .byte PAN , c_v-48 + .byte N12 , Gn3 , v032 + .byte W03 + .byte W12 + .byte FINE + +@********************** Track 3 **********************@ + +se_contest_place_3: + .byte KEYSH , se_contest_place_key+0 + .byte VOICE , 81 + .byte VOL , 110*se_contest_place_mvl/mxv + .byte PAN , c_v+0 + .byte N06 , Gn2 , v060 + .byte W06 + .byte N13 , Cn3 + .byte W06 + .byte W09 + .byte PAN , c_v+48 + .byte N12 , Cn3 , v032 + .byte W03 + .byte W12 + .byte FINE + +@********************** Track 4 **********************@ + +se_contest_place_4: + .byte KEYSH , se_contest_place_key+0 + .byte VOICE , 47 + .byte VOL , 110*se_contest_place_mvl/mxv + .byte N06 , Gn1 , v127 + .byte W06 + .byte N13 , Cn2 + .byte W06 + .byte W12 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_contest_place: + .byte 4 @ NumTrks + .byte 0 @ NumBlks + .byte se_contest_place_pri @ Priority + .byte se_contest_place_rev @ Reverb. + + .word se_contest_place_grp + + .word se_contest_place_1 + .word se_contest_place_2 + .word se_contest_place_3 + .word se_contest_place_4 + + .end diff --git a/sound/songs/se_dansa.s b/sound/songs/se_dansa.s deleted file mode 100644 index 14677b51f..000000000 --- a/sound/songs/se_dansa.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_dansa_grp, voicegroup110 - .equ se_dansa_pri, 4 - .equ se_dansa_rev, reverb_set+50 - .equ se_dansa_mvl, 127 - .equ se_dansa_key, 0 - .equ se_dansa_tbs, 1 - .equ se_dansa_exg, 0 - .equ se_dansa_cmp, 1 - - .section .rodata - .global se_dansa - .align 2 - -@********************** Track 1 **********************@ - -se_dansa_1: - .byte KEYSH , se_dansa_key+0 - .byte TEMPO , 120*se_dansa_tbs/2 - .byte VOICE , 85 - .byte VOL , 100*se_dansa_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Ds2 , v052 - .byte W02 - .byte VOICE , 86 - .byte N06 , Gn3 , v092 - .byte W01 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_dansa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_dansa_pri @ Priority - .byte se_dansa_rev @ Reverb. - - .word se_dansa_grp - - .word se_dansa_1 - - .end diff --git a/sound/songs/se_z_page.s b/sound/songs/se_dex_page.s index 30347bbd2..b30270481 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, voicegroup110 - .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, voicegroup110 + .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..0dfeb01b8 --- /dev/null +++ b/sound/songs/se_dex_scroll.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_dex_scroll_grp, voicegroup110 + .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_z_search.s b/sound/songs/se_dex_search.s index 89603ec88..ad9976510 100644 --- a/sound/songs/se_z_search.s +++ b/sound/songs/se_dex_search.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_z_search_grp, voicegroup110 - .equ se_z_search_pri, 5 - .equ se_z_search_rev, reverb_set+50 - .equ se_z_search_mvl, 127 - .equ se_z_search_key, 0 - .equ se_z_search_tbs, 1 - .equ se_z_search_exg, 0 - .equ se_z_search_cmp, 1 + .equ se_dex_search_grp, voicegroup110 + .equ se_dex_search_pri, 5 + .equ se_dex_search_rev, reverb_set+50 + .equ se_dex_search_mvl, 127 + .equ se_dex_search_key, 0 + .equ se_dex_search_tbs, 1 + .equ se_dex_search_exg, 0 + .equ se_dex_search_cmp, 1 .section .rodata - .global se_z_search + .global se_dex_search .align 2 @********************** Track 1 **********************@ -se_z_search_1: - .byte KEYSH , se_z_search_key+0 - .byte TEMPO , 144*se_z_search_tbs/2 +se_dex_search_1: + .byte KEYSH , se_dex_search_key+0 + .byte TEMPO , 144*se_dex_search_tbs/2 .byte VOICE , 4 .byte XCMD , xIECV , 12 .byte xIECL , 10 - .byte VOL , 100*se_z_search_mvl/mxv + .byte VOL , 100*se_dex_search_mvl/mxv .byte BEND , c_v-6 .byte N02 , Ds5 , v060 .byte W02 @@ -144,10 +144,10 @@ se_z_search_1: @********************** Track 2 **********************@ -se_z_search_2: - .byte KEYSH , se_z_search_key+0 +se_dex_search_2: + .byte KEYSH , se_dex_search_key+0 .byte VOICE , 14 - .byte VOL , 50*se_z_search_mvl/mxv + .byte VOL , 50*se_dex_search_mvl/mxv .byte BEND , c_v-8 .byte W01 .byte N02 , Ds5 , v060 @@ -290,15 +290,15 @@ se_z_search_2: @******************************************************@ .align 2 -se_z_search: +se_dex_search: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_z_search_pri @ Priority - .byte se_z_search_rev @ Reverb. + .byte se_dex_search_pri @ Priority + .byte se_dex_search_rev @ Reverb. - .word se_z_search_grp + .word se_dex_search_grp - .word se_z_search_1 - .word se_z_search_2 + .word se_dex_search_1 + .word se_dex_search_2 .end diff --git a/sound/songs/se_pinpon.s b/sound/songs/se_ding_dong.s index dd2d8eb3e..8da300f04 100644 --- a/sound/songs/se_pinpon.s +++ b/sound/songs/se_ding_dong.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_pinpon_grp, voicegroup110 - .equ se_pinpon_pri, 5 - .equ se_pinpon_rev, reverb_set+50 - .equ se_pinpon_mvl, 127 - .equ se_pinpon_key, 0 - .equ se_pinpon_tbs, 1 - .equ se_pinpon_exg, 0 - .equ se_pinpon_cmp, 1 + .equ se_ding_dong_grp, voicegroup110 + .equ se_ding_dong_pri, 5 + .equ se_ding_dong_rev, reverb_set+50 + .equ se_ding_dong_mvl, 127 + .equ se_ding_dong_key, 0 + .equ se_ding_dong_tbs, 1 + .equ se_ding_dong_exg, 0 + .equ se_ding_dong_cmp, 1 .section .rodata - .global se_pinpon + .global se_ding_dong .align 2 @********************** Track 1 **********************@ -se_pinpon_1: - .byte KEYSH , se_pinpon_key+0 - .byte TEMPO , 150*se_pinpon_tbs/2 +se_ding_dong_1: + .byte KEYSH , se_ding_dong_key+0 + .byte TEMPO , 150*se_ding_dong_tbs/2 .byte VOICE , 15 .byte BENDR , 2 - .byte VOL , 90*se_pinpon_mvl/mxv + .byte VOL , 90*se_ding_dong_mvl/mxv .byte BEND , c_v+1 .byte N24 , Ds4 , v092 .byte W03 @@ -50,10 +50,10 @@ se_pinpon_1: @********************** Track 2 **********************@ -se_pinpon_2: - .byte KEYSH , se_pinpon_key+0 +se_ding_dong_2: + .byte KEYSH , se_ding_dong_key+0 .byte VOICE , 14 - .byte VOL , 90*se_pinpon_mvl/mxv + .byte VOL , 90*se_ding_dong_mvl/mxv .byte BEND , c_v+1 .byte N24 , Ds4 , v072 .byte W03 @@ -84,15 +84,15 @@ se_pinpon_2: @******************************************************@ .align 2 -se_pinpon: +se_ding_dong: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_pinpon_pri @ Priority - .byte se_pinpon_rev @ Reverb. + .byte se_ding_dong_pri @ Priority + .byte se_ding_dong_rev @ Reverb. - .word se_pinpon_grp + .word se_ding_dong_grp - .word se_pinpon_1 - .word se_pinpon_2 + .word se_ding_dong_1 + .word se_ding_dong_2 .end diff --git a/sound/songs/se_doku.s b/sound/songs/se_doku.s deleted file mode 100644 index b3f56d47f..000000000 --- a/sound/songs/se_doku.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "MPlayDef.s" - - .equ se_doku_grp, voicegroup110 - .equ se_doku_pri, 5 - .equ se_doku_rev, reverb_set+50 - .equ se_doku_mvl, 127 - .equ se_doku_key, 0 - .equ se_doku_tbs, 1 - .equ se_doku_exg, 0 - .equ se_doku_cmp, 1 - - .section .rodata - .global se_doku - .align 2 - -@********************** Track 1 **********************@ - -se_doku_1: - .byte KEYSH , se_doku_key+0 - .byte TEMPO , 150*se_doku_tbs/2 - .byte VOICE , 16 - .byte BENDR , 12 - .byte VOL , 110*se_doku_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Ds3 , v100 - .byte W04 - .byte N02 - .byte W05 - .byte N02 - .byte W05 - .byte N02 - .byte W05 - .byte N02 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_doku: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_doku_pri @ Priority - .byte se_doku_rev @ Reverb. - - .word se_doku_grp - - .word se_doku_1 - - .end diff --git a/sound/songs/se_downpour.s b/sound/songs/se_downpour.s new file mode 100644 index 000000000..0d453d230 --- /dev/null +++ b/sound/songs/se_downpour.s @@ -0,0 +1,64 @@ + .include "MPlayDef.s" + + .equ se_downpour_grp, voicegroup111 + .equ se_downpour_pri, 2 + .equ se_downpour_rev, reverb_set+50 + .equ se_downpour_mvl, 127 + .equ se_downpour_key, 0 + .equ se_downpour_tbs, 1 + .equ se_downpour_stopxg, 0 + .equ se_downpour_cmp, 1 + + .section .rodata + .global se_downpour + .align 2 + +@********************** Track 1 **********************@ + +se_downpour_1: + .byte KEYSH , se_downpour_key+0 + .byte TEMPO , 220*se_downpour_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 18*se_downpour_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Cn3 , v060 + .byte W03 + .byte VOL , 33*se_downpour_mvl/mxv + .byte W03 + .byte 48*se_downpour_mvl/mxv + .byte W03 + .byte 55*se_downpour_mvl/mxv + .byte W03 + .byte 65*se_downpour_mvl/mxv + .byte W03 + .byte 74*se_downpour_mvl/mxv + .byte W03 + .byte 85*se_downpour_mvl/mxv + .byte W03 + .byte 100*se_downpour_mvl/mxv + .byte W03 +se_downpour_1_B1: + .byte N36 , Cn3 , v060 + .byte W24 + .byte W12 + .byte GOTO + .word se_downpour_1_B1 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_downpour: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_downpour_pri @ Priority + .byte se_downpour_rev @ Reverb. + + .word se_downpour_grp + + .word se_downpour_1 + + .end diff --git a/sound/songs/se_downpour_stop.s b/sound/songs/se_downpour_stop.s new file mode 100644 index 000000000..c2d39973b --- /dev/null +++ b/sound/songs/se_downpour_stop.s @@ -0,0 +1,74 @@ + .include "MPlayDef.s" + + .equ se_downpour_stop_grp, voicegroup111 + .equ se_downpour_stop_pri, 2 + .equ se_downpour_stop_rev, reverb_set+50 + .equ se_downpour_stop_mvl, 127 + .equ se_downpour_stop_key, 0 + .equ se_downpour_stop_tbs, 1 + .equ se_downpour_stop_exg, 0 + .equ se_downpour_stop_cmp, 1 + + .section .rodata + .global se_downpour_stop + .align 2 + +@********************** Track 1 **********************@ + +se_downpour_stop_1: + .byte KEYSH , se_downpour_stop_key+0 + .byte TEMPO , 220*se_downpour_stop_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 100*se_downpour_stop_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Cn3 , v060 + .byte W03 + .byte VOL , 96*se_downpour_stop_mvl/mxv + .byte W03 + .byte 93*se_downpour_stop_mvl/mxv + .byte W03 + .byte 90*se_downpour_stop_mvl/mxv + .byte W03 + .byte 85*se_downpour_stop_mvl/mxv + .byte W03 + .byte 81*se_downpour_stop_mvl/mxv + .byte W03 + .byte 73*se_downpour_stop_mvl/mxv + .byte W03 + .byte 62*se_downpour_stop_mvl/mxv + .byte W03 + .byte 55*se_downpour_stop_mvl/mxv + .byte N24 + .byte W03 + .byte VOL , 48*se_downpour_stop_mvl/mxv + .byte W03 + .byte 42*se_downpour_stop_mvl/mxv + .byte W03 + .byte 33*se_downpour_stop_mvl/mxv + .byte W03 + .byte 25*se_downpour_stop_mvl/mxv + .byte W03 + .byte 18*se_downpour_stop_mvl/mxv + .byte W03 + .byte 12*se_downpour_stop_mvl/mxv + .byte W03 + .byte 7*se_downpour_stop_mvl/mxv + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_downpour_stop: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_downpour_stop_pri @ Priority + .byte se_downpour_stop_rev @ Reverb. + + .word se_downpour_stop_grp + + .word se_downpour_stop_1 + + .end diff --git a/sound/songs/se_kouka_m.s b/sound/songs/se_effective.s index ee6e66e9a..688803ce6 100644 --- a/sound/songs/se_kouka_m.s +++ b/sound/songs/se_effective.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_kouka_m_grp, voicegroup110 - .equ se_kouka_m_pri, 5 - .equ se_kouka_m_rev, reverb_set+50 - .equ se_kouka_m_mvl, 127 - .equ se_kouka_m_key, 0 - .equ se_kouka_m_tbs, 1 - .equ se_kouka_m_exg, 0 - .equ se_kouka_m_cmp, 1 + .equ se_effective_grp, voicegroup110 + .equ se_effective_pri, 5 + .equ se_effective_rev, reverb_set+50 + .equ se_effective_mvl, 127 + .equ se_effective_key, 0 + .equ se_effective_tbs, 1 + .equ se_effective_exg, 0 + .equ se_effective_cmp, 1 .section .rodata - .global se_kouka_m + .global se_effective .align 2 @********************** Track 1 **********************@ -se_kouka_m_1: - .byte KEYSH , se_kouka_m_key+0 - .byte TEMPO , 90*se_kouka_m_tbs/2 +se_effective_1: + .byte KEYSH , se_effective_key+0 + .byte TEMPO , 90*se_effective_tbs/2 .byte VOICE , 125 - .byte VOL , 110*se_kouka_m_mvl/mxv + .byte VOL , 110*se_effective_mvl/mxv .byte BEND , c_v+0 .byte N03 , As2 , v100 .byte W03 @@ -43,10 +43,10 @@ se_kouka_m_1: @********************** Track 2 **********************@ -se_kouka_m_2: - .byte KEYSH , se_kouka_m_key+0 +se_effective_2: + .byte KEYSH , se_effective_key+0 .byte VOICE , 0 - .byte VOL , 110*se_kouka_m_mvl/mxv + .byte VOL , 110*se_effective_mvl/mxv .byte N03 , Cn3 , v127 .byte W03 .byte N18 @@ -68,15 +68,15 @@ se_kouka_m_2: @******************************************************@ .align 2 -se_kouka_m: +se_effective: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_kouka_m_pri @ Priority - .byte se_kouka_m_rev @ Reverb. + .byte se_effective_pri @ Priority + .byte se_effective_rev @ Reverb. - .word se_kouka_m_grp + .word se_effective_grp - .word se_kouka_m_1 - .word se_kouka_m_2 + .word se_effective_1 + .word se_effective_2 .end diff --git a/sound/songs/se_tamago.s b/sound/songs/se_egg_hatch.s index 670710bd2..16297bf0a 100644 --- a/sound/songs/se_tamago.s +++ b/sound/songs/se_egg_hatch.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_tamago_grp, voicegroup111 - .equ se_tamago_pri, 5 - .equ se_tamago_rev, reverb_set+50 - .equ se_tamago_mvl, 127 - .equ se_tamago_key, 0 - .equ se_tamago_tbs, 1 - .equ se_tamago_exg, 0 - .equ se_tamago_cmp, 1 + .equ se_egg_hatch_grp, voicegroup111 + .equ se_egg_hatch_pri, 5 + .equ se_egg_hatch_rev, reverb_set+50 + .equ se_egg_hatch_mvl, 127 + .equ se_egg_hatch_key, 0 + .equ se_egg_hatch_tbs, 1 + .equ se_egg_hatch_exg, 0 + .equ se_egg_hatch_cmp, 1 .section .rodata - .global se_tamago + .global se_egg_hatch .align 2 @********************** Track 1 **********************@ -se_tamago_1: - .byte KEYSH , se_tamago_key+0 - .byte TEMPO , 150*se_tamago_tbs/2 +se_egg_hatch_1: + .byte KEYSH , se_egg_hatch_key+0 + .byte TEMPO , 150*se_egg_hatch_tbs/2 .byte VOICE , 21 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 120*se_tamago_mvl/mxv + .byte VOL , 120*se_egg_hatch_mvl/mxv .byte BEND , c_v+1 .byte N01 , Bn5 , v127 .byte W01 @@ -33,41 +33,41 @@ se_tamago_1: .byte VOICE , 36 .byte N19 , Cn6 , v040 .byte W02 - .byte VOL , 63*se_tamago_mvl/mxv + .byte VOL , 63*se_egg_hatch_mvl/mxv .byte BEND , c_v+5 .byte W01 - .byte VOL , 77*se_tamago_mvl/mxv + .byte VOL , 77*se_egg_hatch_mvl/mxv .byte BEND , c_v+13 .byte W01 - .byte VOL , 91*se_tamago_mvl/mxv + .byte VOL , 91*se_egg_hatch_mvl/mxv .byte BEND , c_v+21 .byte W01 - .byte VOL , 106*se_tamago_mvl/mxv + .byte VOL , 106*se_egg_hatch_mvl/mxv .byte BEND , c_v+33 .byte W01 - .byte VOL , 120*se_tamago_mvl/mxv + .byte VOL , 120*se_egg_hatch_mvl/mxv .byte W05 - .byte 109*se_tamago_mvl/mxv + .byte 109*se_egg_hatch_mvl/mxv .byte W01 - .byte 102*se_tamago_mvl/mxv + .byte 102*se_egg_hatch_mvl/mxv .byte W02 - .byte 84*se_tamago_mvl/mxv + .byte 84*se_egg_hatch_mvl/mxv .byte W01 - .byte 68*se_tamago_mvl/mxv + .byte 68*se_egg_hatch_mvl/mxv .byte W01 - .byte 56*se_tamago_mvl/mxv + .byte 56*se_egg_hatch_mvl/mxv .byte W01 - .byte 24*se_tamago_mvl/mxv + .byte 24*se_egg_hatch_mvl/mxv .byte W01 - .byte 10*se_tamago_mvl/mxv + .byte 10*se_egg_hatch_mvl/mxv .byte W02 .byte FINE @********************** Track 2 **********************@ -se_tamago_2: - .byte KEYSH , se_tamago_key+0 - .byte VOL , 120*se_tamago_mvl/mxv +se_egg_hatch_2: + .byte KEYSH , se_egg_hatch_key+0 + .byte VOL , 120*se_egg_hatch_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+1 .byte W07 @@ -97,15 +97,15 @@ se_tamago_2: @******************************************************@ .align 2 -se_tamago: +se_egg_hatch: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_tamago_pri @ Priority - .byte se_tamago_rev @ Reverb. + .byte se_egg_hatch_pri @ Priority + .byte se_egg_hatch_rev @ Reverb. - .word se_tamago_grp + .word se_egg_hatch_grp - .word se_tamago_1 - .word se_tamago_2 + .word se_egg_hatch_1 + .word se_egg_hatch_2 .end diff --git a/sound/songs/se_elebeta.s b/sound/songs/se_elevator.s index ae0916a4b..c70ce78db 100644 --- a/sound/songs/se_elebeta.s +++ b/sound/songs/se_elevator.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_elebeta_grp, voicegroup111 - .equ se_elebeta_pri, 4 - .equ se_elebeta_rev, reverb_set+50 - .equ se_elebeta_mvl, 127 - .equ se_elebeta_key, 0 - .equ se_elebeta_tbs, 1 - .equ se_elebeta_exg, 0 - .equ se_elebeta_cmp, 1 + .equ se_elevator_grp, voicegroup111 + .equ se_elevator_pri, 4 + .equ se_elevator_rev, reverb_set+50 + .equ se_elevator_mvl, 127 + .equ se_elevator_key, 0 + .equ se_elevator_tbs, 1 + .equ se_elevator_exg, 0 + .equ se_elevator_cmp, 1 .section .rodata - .global se_elebeta + .global se_elevator .align 2 @********************** Track 1 **********************@ -se_elebeta_1: - .byte KEYSH , se_elebeta_key+0 - .byte TEMPO , 150*se_elebeta_tbs/2 +se_elevator_1: + .byte KEYSH , se_elevator_key+0 + .byte TEMPO , 150*se_elevator_tbs/2 .byte VOICE , 38 .byte BENDR , 2 - .byte VOL , 100*se_elebeta_mvl/mxv + .byte VOL , 100*se_elevator_mvl/mxv .byte BEND , c_v+0 .byte TIE , Fs4 , v080 .byte W24 @@ -37,10 +37,10 @@ se_elebeta_1: @********************** Track 2 **********************@ -se_elebeta_2: - .byte KEYSH , se_elebeta_key+0 +se_elevator_2: + .byte KEYSH , se_elevator_key+0 .byte VOICE , 27 - .byte VOL , 100*se_elebeta_mvl/mxv + .byte VOL , 100*se_elevator_mvl/mxv .byte TIE , Fn3 , v032 .byte W24 .byte W24 @@ -57,15 +57,15 @@ se_elebeta_2: @******************************************************@ .align 2 -se_elebeta: +se_elevator: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_elebeta_pri @ Priority - .byte se_elebeta_rev @ Reverb. + .byte se_elevator_pri @ Priority + .byte se_elevator_rev @ Reverb. - .word se_elebeta_grp + .word se_elevator_grp - .word se_elebeta_1 - .word se_elebeta_2 + .word se_elevator_1 + .word se_elevator_2 .end diff --git a/sound/songs/se_escalator.s b/sound/songs/se_escalator.s new file mode 100644 index 000000000..fa8a6712b --- /dev/null +++ b/sound/songs/se_escalator.s @@ -0,0 +1,93 @@ + .include "MPlayDef.s" + + .equ se_escalator_grp, voicegroup111 + .equ se_escalator_pri, 4 + .equ se_escalator_rev, reverb_set+50 + .equ se_escalator_mvl, 127 + .equ se_escalator_key, 0 + .equ se_escalator_tbs, 1 + .equ se_escalator_exg, 0 + .equ se_escalator_cmp, 1 + + .section .rodata + .global se_escalator + .align 2 + +@********************** Track 1 **********************@ + +se_escalator_1: + .byte KEYSH , se_escalator_key+0 + .byte TEMPO , 150*se_escalator_tbs/2 + .byte VOICE , 38 + .byte BENDR , 2 + .byte VOL , 51*se_escalator_mvl/mxv + .byte BEND , c_v-32 + .byte TIE , En5 , v080 + .byte W01 + .byte BEND , c_v-26 + .byte W01 + .byte VOL , 56*se_escalator_mvl/mxv + .byte W01 + .byte BEND , c_v-21 + .byte W01 + .byte VOL , 62*se_escalator_mvl/mxv + .byte W02 + .byte BEND , c_v-15 + .byte W01 + .byte VOL , 69*se_escalator_mvl/mxv + .byte W01 + .byte BEND , c_v-7 + .byte W01 + .byte VOL , 75*se_escalator_mvl/mxv + .byte W01 + .byte BEND , c_v+0 + .byte W02 + .byte VOL , 85*se_escalator_mvl/mxv + .byte W02 + .byte 92*se_escalator_mvl/mxv + .byte W02 + .byte 100*se_escalator_mvl/mxv + .byte W08 + .byte W24 + .byte W24 + .byte W24 + .byte W03 + .byte 96*se_escalator_mvl/mxv + .byte W03 + .byte 88*se_escalator_mvl/mxv + .byte W03 + .byte 81*se_escalator_mvl/mxv + .byte BEND , c_v-5 + .byte W03 + .byte VOL , 74*se_escalator_mvl/mxv + .byte BEND , c_v-8 + .byte W02 + .byte VOL , 62*se_escalator_mvl/mxv + .byte BEND , c_v-12 + .byte W02 + .byte VOL , 49*se_escalator_mvl/mxv + .byte BEND , c_v-21 + .byte W03 + .byte VOL , 39*se_escalator_mvl/mxv + .byte BEND , c_v-26 + .byte W02 + .byte VOL , 25*se_escalator_mvl/mxv + .byte BEND , c_v-32 + .byte W03 + .byte EOT + .byte FINE + +@******************************************************@ + .align 2 + +se_escalator: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_escalator_pri @ Priority + .byte se_escalator_rev @ Reverb. + + .word se_escalator_grp + + .word se_escalator_1 + + .end diff --git a/sound/songs/se_esuka.s b/sound/songs/se_esuka.s deleted file mode 100644 index a3e649077..000000000 --- a/sound/songs/se_esuka.s +++ /dev/null @@ -1,93 +0,0 @@ - .include "MPlayDef.s" - - .equ se_esuka_grp, voicegroup111 - .equ se_esuka_pri, 4 - .equ se_esuka_rev, reverb_set+50 - .equ se_esuka_mvl, 127 - .equ se_esuka_key, 0 - .equ se_esuka_tbs, 1 - .equ se_esuka_exg, 0 - .equ se_esuka_cmp, 1 - - .section .rodata - .global se_esuka - .align 2 - -@********************** Track 1 **********************@ - -se_esuka_1: - .byte KEYSH , se_esuka_key+0 - .byte TEMPO , 150*se_esuka_tbs/2 - .byte VOICE , 38 - .byte BENDR , 2 - .byte VOL , 51*se_esuka_mvl/mxv - .byte BEND , c_v-32 - .byte TIE , En5 , v080 - .byte W01 - .byte BEND , c_v-26 - .byte W01 - .byte VOL , 56*se_esuka_mvl/mxv - .byte W01 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 62*se_esuka_mvl/mxv - .byte W02 - .byte BEND , c_v-15 - .byte W01 - .byte VOL , 69*se_esuka_mvl/mxv - .byte W01 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 75*se_esuka_mvl/mxv - .byte W01 - .byte BEND , c_v+0 - .byte W02 - .byte VOL , 85*se_esuka_mvl/mxv - .byte W02 - .byte 92*se_esuka_mvl/mxv - .byte W02 - .byte 100*se_esuka_mvl/mxv - .byte W08 - .byte W24 - .byte W24 - .byte W24 - .byte W03 - .byte 96*se_esuka_mvl/mxv - .byte W03 - .byte 88*se_esuka_mvl/mxv - .byte W03 - .byte 81*se_esuka_mvl/mxv - .byte BEND , c_v-5 - .byte W03 - .byte VOL , 74*se_esuka_mvl/mxv - .byte BEND , c_v-8 - .byte W02 - .byte VOL , 62*se_esuka_mvl/mxv - .byte BEND , c_v-12 - .byte W02 - .byte VOL , 49*se_esuka_mvl/mxv - .byte BEND , c_v-21 - .byte W03 - .byte VOL , 39*se_esuka_mvl/mxv - .byte BEND , c_v-26 - .byte W02 - .byte VOL , 25*se_esuka_mvl/mxv - .byte BEND , c_v-32 - .byte W03 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_esuka: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_esuka_pri @ Priority - .byte se_esuka_rev @ Reverb. - - .word se_esuka_grp - - .word se_esuka_1 - - .end diff --git a/sound/songs/se_kaidan.s b/sound/songs/se_exit.s index 4c0a42c06..d0f788a59 100644 --- a/sound/songs/se_kaidan.s +++ b/sound/songs/se_exit.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_kaidan_grp, voicegroup110 - .equ se_kaidan_pri, 5 - .equ se_kaidan_rev, reverb_set+50 - .equ se_kaidan_mvl, 127 - .equ se_kaidan_key, 0 - .equ se_kaidan_tbs, 1 - .equ se_kaidan_exg, 0 - .equ se_kaidan_cmp, 1 + .equ se_exit_grp, voicegroup110 + .equ se_exit_pri, 5 + .equ se_exit_rev, reverb_set+50 + .equ se_exit_mvl, 127 + .equ se_exit_key, 0 + .equ se_exit_tbs, 1 + .equ se_exit_exg, 0 + .equ se_exit_cmp, 1 .section .rodata - .global se_kaidan + .global se_exit .align 2 @********************** Track 1 **********************@ -se_kaidan_1: - .byte KEYSH , se_kaidan_key+0 - .byte TEMPO , 120*se_kaidan_tbs/2 +se_exit_1: + .byte KEYSH , se_exit_key+0 + .byte TEMPO , 120*se_exit_tbs/2 .byte VOICE , 126 - .byte VOL , 120*se_kaidan_mvl/mxv + .byte VOL , 120*se_exit_mvl/mxv .byte N02 , An2 , v068 .byte W02 .byte Cn3 , v127 @@ -48,14 +48,14 @@ se_kaidan_1: @******************************************************@ .align 2 -se_kaidan: +se_exit: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_kaidan_pri @ Priority - .byte se_kaidan_rev @ Reverb. + .byte se_exit_pri @ Priority + .byte se_exit_rev @ Reverb. - .word se_kaidan_grp + .word se_exit_grp - .word se_kaidan_1 + .word se_exit_1 .end diff --git a/sound/songs/se_expmax.s b/sound/songs/se_exp_max.s index f106ff6cb..4f12464f8 100644 --- a/sound/songs/se_expmax.s +++ b/sound/songs/se_exp_max.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_expmax_grp, voicegroup111 - .equ se_expmax_pri, 5 - .equ se_expmax_rev, reverb_set+50 - .equ se_expmax_mvl, 127 - .equ se_expmax_key, 0 - .equ se_expmax_tbs, 1 - .equ se_expmax_exg, 0 - .equ se_expmax_cmp, 1 + .equ se_exp_max_grp, voicegroup111 + .equ se_exp_max_pri, 5 + .equ se_exp_max_rev, reverb_set+50 + .equ se_exp_max_mvl, 127 + .equ se_exp_max_key, 0 + .equ se_exp_max_tbs, 1 + .equ se_exp_max_exg, 0 + .equ se_exp_max_cmp, 1 .section .rodata - .global se_expmax + .global se_exp_max .align 2 @********************** Track 1 **********************@ -se_expmax_1: - .byte KEYSH , se_expmax_key+0 - .byte TEMPO , 150*se_expmax_tbs/2 +se_exp_max_1: + .byte KEYSH , se_exp_max_key+0 + .byte TEMPO , 150*se_exp_max_tbs/2 .byte VOICE , 46 - .byte VOL , 94*se_expmax_mvl/mxv + .byte VOL , 94*se_exp_max_mvl/mxv .byte BENDR , 2 .byte LFOS , 40 .byte PAN , c_v+0 @@ -41,11 +41,11 @@ se_expmax_1: @********************** Track 2 **********************@ -se_expmax_2: - .byte KEYSH , se_expmax_key+0 +se_exp_max_2: + .byte KEYSH , se_exp_max_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_expmax_mvl/mxv + .byte VOL , 43*se_exp_max_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+15 .byte N06 , An4 , v108 @@ -62,15 +62,15 @@ se_expmax_2: @******************************************************@ .align 2 -se_expmax: +se_exp_max: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_expmax_pri @ Priority - .byte se_expmax_rev @ Reverb. + .byte se_exp_max_pri @ Priority + .byte se_exp_max_rev @ Reverb. - .word se_expmax_grp + .word se_exp_max_grp - .word se_expmax_1 - .word se_expmax_2 + .word se_exp_max_1 + .word se_exp_max_2 .end diff --git a/sound/songs/se_hazure.s b/sound/songs/se_failure.s index 5a12618a0..ea3904800 100644 --- a/sound/songs/se_hazure.s +++ b/sound/songs/se_failure.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_hazure_grp, voicegroup110 - .equ se_hazure_pri, 4 - .equ se_hazure_rev, reverb_set+50 - .equ se_hazure_mvl, 127 - .equ se_hazure_key, 0 - .equ se_hazure_tbs, 1 - .equ se_hazure_exg, 0 - .equ se_hazure_cmp, 1 + .equ se_failure_grp, voicegroup110 + .equ se_failure_pri, 4 + .equ se_failure_rev, reverb_set+50 + .equ se_failure_mvl, 127 + .equ se_failure_key, 0 + .equ se_failure_tbs, 1 + .equ se_failure_exg, 0 + .equ se_failure_cmp, 1 .section .rodata - .global se_hazure + .global se_failure .align 2 @********************** Track 1 **********************@ -se_hazure_1: - .byte KEYSH , se_hazure_key+0 - .byte TEMPO , 240*se_hazure_tbs/2 +se_failure_1: + .byte KEYSH , se_failure_key+0 + .byte TEMPO , 240*se_failure_tbs/2 .byte VOICE , 92 .byte BENDR , 12 - .byte VOL , 120*se_hazure_mvl/mxv + .byte VOL , 120*se_failure_mvl/mxv .byte BEND , c_v+0 .byte N03 , Cn2 , v127 .byte W03 @@ -42,14 +42,14 @@ se_hazure_1: @******************************************************@ .align 2 -se_hazure: +se_failure: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_hazure_pri @ Priority - .byte se_hazure_rev @ Reverb. + .byte se_failure_pri @ Priority + .byte se_failure_rev @ Reverb. - .word se_hazure_grp + .word se_failure_grp - .word se_hazure_1 + .word se_failure_1 .end diff --git a/sound/songs/se_faint.s b/sound/songs/se_faint.s new file mode 100644 index 000000000..ab19a3dd2 --- /dev/null +++ b/sound/songs/se_faint.s @@ -0,0 +1,84 @@ + .include "MPlayDef.s" + + .equ se_faint_grp, voicegroup110 + .equ se_faint_pri, 5 + .equ se_faint_rev, reverb_set+50 + .equ se_faint_mvl, 127 + .equ se_faint_key, 0 + .equ se_faint_tbs, 1 + .equ se_faint_exg, 0 + .equ se_faint_cmp, 1 + + .section .rodata + .global se_faint + .align 2 + +@********************** Track 1 **********************@ + +se_faint_1: + .byte KEYSH , se_faint_key+0 + .byte TEMPO , 90*se_faint_tbs/2 + .byte VOICE , 90 + .byte VOL , 110*se_faint_mvl/mxv + .byte BEND , c_v+0 + .byte N09 , Cn4 , v100 + .byte W06 + .byte W06 + .byte W06 + .byte W06 + .byte W06 + .byte FINE + +@********************** Track 2 **********************@ + +se_faint_2: + .byte KEYSH , se_faint_key+0 + .byte VOICE , 124 + .byte BENDR , 12 + .byte VOL , 82*se_faint_mvl/mxv + .byte BEND , c_v+0 + .byte N05 , Gs4 , v060 + .byte W03 + .byte VOL , 94*se_faint_mvl/mxv + .byte W03 + .byte 103*se_faint_mvl/mxv + .byte N22 + .byte W03 + .byte VOL , 110*se_faint_mvl/mxv + .byte W03 + .byte W06 + .byte W06 + .byte W06 + .byte FINE + +@********************** Track 3 **********************@ + +se_faint_3: + .byte KEYSH , se_faint_key+0 + .byte VOICE , 0 + .byte VOL , 110*se_faint_mvl/mxv + .byte N06 , Cn3 , v080 + .byte W06 + .byte N18 , Cn3 , v092 + .byte W06 + .byte W06 + .byte W06 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_faint: + .byte 3 @ NumTrks + .byte 0 @ NumBlks + .byte se_faint_pri @ Priority + .byte se_faint_rev @ Reverb. + + .word se_faint_grp + + .word se_faint_1 + .word se_faint_2 + .word se_faint_3 + + .end diff --git a/sound/songs/se_ru_hyuu.s b/sound/songs/se_fall.s index 7edb6ed5b..bb3a1f9fa 100644 --- a/sound/songs/se_ru_hyuu.s +++ b/sound/songs/se_fall.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_ru_hyuu_grp, voicegroup111 - .equ se_ru_hyuu_pri, 4 - .equ se_ru_hyuu_rev, reverb_set+50 - .equ se_ru_hyuu_mvl, 127 - .equ se_ru_hyuu_key, 0 - .equ se_ru_hyuu_tbs, 1 - .equ se_ru_hyuu_exg, 0 - .equ se_ru_hyuu_cmp, 1 + .equ se_fall_grp, voicegroup111 + .equ se_fall_pri, 4 + .equ se_fall_rev, reverb_set+50 + .equ se_fall_mvl, 127 + .equ se_fall_key, 0 + .equ se_fall_tbs, 1 + .equ se_fall_exg, 0 + .equ se_fall_cmp, 1 .section .rodata - .global se_ru_hyuu + .global se_fall .align 2 @********************** Track 1 **********************@ -se_ru_hyuu_1: - .byte KEYSH , se_ru_hyuu_key+0 - .byte TEMPO , 170*se_ru_hyuu_tbs/2 +se_fall_1: + .byte KEYSH , se_fall_key+0 + .byte TEMPO , 170*se_fall_tbs/2 .byte VOICE , 22 - .byte VOL , 110*se_ru_hyuu_mvl/mxv + .byte VOL , 110*se_fall_mvl/mxv .byte BEND , c_v+60 .byte N44 , Gn3 , v080 .byte W03 @@ -37,44 +37,44 @@ se_ru_hyuu_1: .byte W03 .byte c_v+16 .byte W03 - .byte VOL , 104*se_ru_hyuu_mvl/mxv + .byte VOL , 104*se_fall_mvl/mxv .byte BEND , c_v+11 .byte W03 - .byte VOL , 90*se_ru_hyuu_mvl/mxv + .byte VOL , 90*se_fall_mvl/mxv .byte BEND , c_v+3 .byte W03 - .byte VOL , 82*se_ru_hyuu_mvl/mxv + .byte VOL , 82*se_fall_mvl/mxv .byte BEND , c_v-8 .byte W03 - .byte VOL , 71*se_ru_hyuu_mvl/mxv + .byte VOL , 71*se_fall_mvl/mxv .byte BEND , c_v-16 .byte W03 - .byte VOL , 58*se_ru_hyuu_mvl/mxv + .byte VOL , 58*se_fall_mvl/mxv .byte BEND , c_v-24 .byte W03 - .byte VOL , 45*se_ru_hyuu_mvl/mxv + .byte VOL , 45*se_fall_mvl/mxv .byte BEND , c_v-36 .byte W03 - .byte VOL , 36*se_ru_hyuu_mvl/mxv + .byte VOL , 36*se_fall_mvl/mxv .byte BEND , c_v-50 .byte W03 - .byte VOL , 11*se_ru_hyuu_mvl/mxv + .byte VOL , 11*se_fall_mvl/mxv .byte BEND , c_v-63 .byte W03 - .byte VOL , 3*se_ru_hyuu_mvl/mxv + .byte VOL , 3*se_fall_mvl/mxv .byte FINE @******************************************************@ .align 2 -se_ru_hyuu: +se_fall: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_ru_hyuu_pri @ Priority - .byte se_ru_hyuu_rev @ Reverb. + .byte se_fall_pri @ Priority + .byte se_fall_rev @ Reverb. - .word se_ru_hyuu_grp + .word se_fall_grp - .word se_ru_hyuu_1 + .word se_fall_1 .end diff --git a/sound/songs/se_field_poison.s b/sound/songs/se_field_poison.s new file mode 100644 index 000000000..86b24c2d2 --- /dev/null +++ b/sound/songs/se_field_poison.s @@ -0,0 +1,50 @@ + .include "MPlayDef.s" + + .equ se_field_poison_grp, voicegroup110 + .equ se_field_poison_pri, 5 + .equ se_field_poison_rev, reverb_set+50 + .equ se_field_poison_mvl, 127 + .equ se_field_poison_key, 0 + .equ se_field_poison_tbs, 1 + .equ se_field_poison_exg, 0 + .equ se_field_poison_cmp, 1 + + .section .rodata + .global se_field_poison + .align 2 + +@********************** Track 1 **********************@ + +se_field_poison_1: + .byte KEYSH , se_field_poison_key+0 + .byte TEMPO , 150*se_field_poison_tbs/2 + .byte VOICE , 16 + .byte BENDR , 12 + .byte VOL , 110*se_field_poison_mvl/mxv + .byte BEND , c_v+0 + .byte N02 , Ds3 , v100 + .byte W04 + .byte N02 + .byte W05 + .byte N02 + .byte W05 + .byte N02 + .byte W05 + .byte N02 + .byte W05 + .byte FINE + +@******************************************************@ + .align 2 + +se_field_poison: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_field_poison_pri @ Priority + .byte se_field_poison_rev @ Reverb. + + .word se_field_poison_grp + + .word se_field_poison_1 + + .end diff --git a/sound/songs/se_nigeru.s b/sound/songs/se_flee.s index d52af188b..d2048f264 100644 --- a/sound/songs/se_nigeru.s +++ b/sound/songs/se_flee.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_nigeru_grp, voicegroup110 - .equ se_nigeru_pri, 5 - .equ se_nigeru_rev, reverb_set+50 - .equ se_nigeru_mvl, 127 - .equ se_nigeru_key, 0 - .equ se_nigeru_tbs, 1 - .equ se_nigeru_exg, 0 - .equ se_nigeru_cmp, 1 + .equ se_flee_grp, voicegroup110 + .equ se_flee_pri, 5 + .equ se_flee_rev, reverb_set+50 + .equ se_flee_mvl, 127 + .equ se_flee_key, 0 + .equ se_flee_tbs, 1 + .equ se_flee_exg, 0 + .equ se_flee_cmp, 1 .section .rodata - .global se_nigeru + .global se_flee .align 2 @********************** Track 1 **********************@ -se_nigeru_1: - .byte KEYSH , se_nigeru_key+0 - .byte TEMPO , 150*se_nigeru_tbs/2 +se_flee_1: + .byte KEYSH , se_flee_key+0 + .byte TEMPO , 150*se_flee_tbs/2 .byte VOICE , 126 - .byte VOL , 90*se_nigeru_mvl/mxv + .byte VOL , 90*se_flee_mvl/mxv .byte N03 , Fn4 , v120 .byte W03 .byte Gs4 , v112 @@ -51,14 +51,14 @@ se_nigeru_1: @******************************************************@ .align 2 -se_nigeru: +se_flee: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_nigeru_pri @ Priority - .byte se_nigeru_rev @ Reverb. + .byte se_flee_pri @ Priority + .byte se_flee_rev @ Reverb. - .word se_nigeru_grp + .word se_flee_grp - .word se_nigeru_1 + .word se_flee_1 .end diff --git a/sound/songs/se_fu_zaku2.s b/sound/songs/se_fu_zaku2.s deleted file mode 100644 index 92313a3ad..000000000 --- a/sound/songs/se_fu_zaku2.s +++ /dev/null @@ -1,48 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fu_zaku2_grp, voicegroup110 - .equ se_fu_zaku2_pri, 4 - .equ se_fu_zaku2_rev, reverb_set+50 - .equ se_fu_zaku2_mvl, 127 - .equ se_fu_zaku2_key, 0 - .equ se_fu_zaku2_tbs, 1 - .equ se_fu_zaku2_exg, 0 - .equ se_fu_zaku2_cmp, 1 - - .section .rodata - .global se_fu_zaku2 - .align 2 - -@********************** Track 1 **********************@ - -se_fu_zaku2_1: - .byte KEYSH , se_fu_zaku2_key+0 - .byte TEMPO , 150*se_fu_zaku2_tbs/2 - .byte VOICE , 126 - .byte VOL , 110*se_fu_zaku2_mvl/mxv - .byte N01 , An2 , v112 - .byte W01 - .byte En3 - .byte W01 - .byte Gn3 - .byte W01 - .byte W02 - .byte N02 , Cn3 , v092 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_fu_zaku2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fu_zaku2_pri @ Priority - .byte se_fu_zaku2_rev @ Reverb. - - .word se_fu_zaku2_grp - - .word se_fu_zaku2_1 - - .end diff --git a/sound/songs/se_fuusen1.s b/sound/songs/se_fuusen1.s deleted file mode 100644 index e496a6661..000000000 --- a/sound/songs/se_fuusen1.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fuusen1_grp, voicegroup111 - .equ se_fuusen1_pri, 4 - .equ se_fuusen1_rev, reverb_set+50 - .equ se_fuusen1_mvl, 127 - .equ se_fuusen1_key, 0 - .equ se_fuusen1_tbs, 1 - .equ se_fuusen1_exg, 0 - .equ se_fuusen1_cmp, 1 - - .section .rodata - .global se_fuusen1 - .align 2 - -@********************** Track 1 **********************@ - -se_fuusen1_1: - .byte KEYSH , se_fuusen1_key+0 - .byte TEMPO , 240*se_fuusen1_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 105*se_fuusen1_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Cn4 , v127 - .byte W06 - .byte VOICE , 23 - .byte N02 , Cn3 , v112 - .byte W07 - .byte N01 , Cn4 - .byte W05 - .byte Cn3 , v100 - .byte W02 - .byte Gn3 , v092 - .byte W02 - .byte Cn3 , v072 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_fuusen1: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fuusen1_pri @ Priority - .byte se_fuusen1_rev @ Reverb. - - .word se_fuusen1_grp - - .word se_fuusen1_1 - - .end diff --git a/sound/songs/se_fuusen2.s b/sound/songs/se_fuusen2.s deleted file mode 100644 index c47ba5206..000000000 --- a/sound/songs/se_fuusen2.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fuusen2_grp, voicegroup111 - .equ se_fuusen2_pri, 4 - .equ se_fuusen2_rev, reverb_set+50 - .equ se_fuusen2_mvl, 127 - .equ se_fuusen2_key, 0 - .equ se_fuusen2_tbs, 1 - .equ se_fuusen2_exg, 0 - .equ se_fuusen2_cmp, 1 - - .section .rodata - .global se_fuusen2 - .align 2 - -@********************** Track 1 **********************@ - -se_fuusen2_1: - .byte KEYSH , se_fuusen2_key+0 - .byte TEMPO , 240*se_fuusen2_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 105*se_fuusen2_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 , v127 - .byte W04 - .byte N01 , Gn4 , v112 - .byte W02 - .byte W02 - .byte Gs3 , v052 - .byte W04 - .byte VOICE , 23 - .byte N02 , Fn3 , v112 - .byte W04 - .byte N01 , Cn4 , v072 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_fuusen2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fuusen2_pri @ Priority - .byte se_fuusen2_rev @ Reverb. - - .word se_fuusen2_grp - - .word se_fuusen2_1 - - .end diff --git a/sound/songs/se_glass_flute.s b/sound/songs/se_glass_flute.s new file mode 100644 index 000000000..b89f427a2 --- /dev/null +++ b/sound/songs/se_glass_flute.s @@ -0,0 +1,61 @@ + .include "MPlayDef.s" + + .equ se_glass_flute_grp, voicegroup111 + .equ se_glass_flute_pri, 5 + .equ se_glass_flute_rev, reverb_set+50 + .equ se_glass_flute_mvl, 127 + .equ se_glass_flute_key, 0 + .equ se_glass_flute_tbs, 1 + .equ se_glass_flute_exg, 0 + .equ se_glass_flute_cmp, 1 + + .section .rodata + .global se_glass_flute + .align 2 + +@********************** Track 1 **********************@ + +se_glass_flute_1: + .byte KEYSH , se_glass_flute_key+0 + .byte TEMPO , 120*se_glass_flute_tbs/2 + .byte VOICE , 28 + .byte VOL , 26*se_glass_flute_mvl/mxv + .byte BENDR , 8 + .byte BEND , c_v+0 + .byte N01 , En3 , v116 + .byte W01 + .byte VOL , 105*se_glass_flute_mvl/mxv + .byte BEND , c_v-4 + .byte N01 , Bn2 + .byte W01 + .byte BEND , c_v+3 + .byte N01 , Cn3 + .byte W04 + .byte W04 + .byte BEND , c_v+0 + .byte N04 , Bn3 + .byte W02 + .byte VOL , 26*se_glass_flute_mvl/mxv + .byte BEND , c_v-7 + .byte W01 + .byte VOL , 105*se_glass_flute_mvl/mxv + .byte BEND , c_v-13 + .byte W01 + .byte c_v-23 + .byte W04 + .byte FINE + +@******************************************************@ + .align 2 + +se_glass_flute: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_glass_flute_pri @ Priority + .byte se_glass_flute_rev @ Reverb. + + .word se_glass_flute_grp + + .word se_glass_flute_1 + + .end diff --git a/sound/songs/se_hashi.s b/sound/songs/se_hashi.s deleted file mode 100644 index 6a1556cad..000000000 --- a/sound/songs/se_hashi.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hashi_grp, voicegroup111 - .equ se_hashi_pri, 4 - .equ se_hashi_rev, reverb_set+50 - .equ se_hashi_mvl, 127 - .equ se_hashi_key, 0 - .equ se_hashi_tbs, 1 - .equ se_hashi_exg, 0 - .equ se_hashi_cmp, 1 - - .section .rodata - .global se_hashi - .align 2 - -@********************** Track 1 **********************@ - -se_hashi_1: - .byte KEYSH , se_hashi_key+0 - .byte TEMPO , 150*se_hashi_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 95*se_hashi_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn3 , v127 - .byte W03 - .byte W03 - .byte Gn3 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_hashi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hashi_pri @ Priority - .byte se_hashi_rev @ Reverb. - - .word se_hashi_grp - - .word se_hashi_1 - - .end diff --git a/sound/songs/se_hi_turun.s b/sound/songs/se_hi_turun.s deleted file mode 100644 index 6c7917e5d..000000000 --- a/sound/songs/se_hi_turun.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hi_turun_grp, voicegroup111 - .equ se_hi_turun_pri, 4 - .equ se_hi_turun_rev, reverb_set+50 - .equ se_hi_turun_mvl, 127 - .equ se_hi_turun_key, 0 - .equ se_hi_turun_tbs, 1 - .equ se_hi_turun_exg, 0 - .equ se_hi_turun_cmp, 1 - - .section .rodata - .global se_hi_turun - .align 2 - -@********************** Track 1 **********************@ - -se_hi_turun_1: - .byte KEYSH , se_hi_turun_key+0 - .byte TEMPO , 220*se_hi_turun_tbs/2 - .byte VOICE , 9 - .byte VOL , 90*se_hi_turun_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 , v112 - .byte W03 - .byte Dn4 - .byte W03 - .byte Gn4 - .byte W03 - .byte N21 , Gn5 - .byte W03 - .byte W03 - .byte VOL , 81*se_hi_turun_mvl/mxv - .byte BEND , c_v+6 - .byte W03 - .byte VOL , 72*se_hi_turun_mvl/mxv - .byte BEND , c_v+20 - .byte W03 - .byte VOL , 46*se_hi_turun_mvl/mxv - .byte BEND , c_v+37 - .byte W03 - .byte VOL , 24*se_hi_turun_mvl/mxv - .byte BEND , c_v+63 - .byte W03 - .byte VOL , 7*se_hi_turun_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_hi_turun: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hi_turun_pri @ Priority - .byte se_hi_turun_rev @ Reverb. - - .word se_hi_turun_grp - - .word se_hi_turun_1 - - .end diff --git a/sound/songs/se_hinsi.s b/sound/songs/se_hinsi.s deleted file mode 100644 index fa209245a..000000000 --- a/sound/songs/se_hinsi.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hinsi_grp, voicegroup110 - .equ se_hinsi_pri, 3 - .equ se_hinsi_rev, reverb_set+50 - .equ se_hinsi_mvl, 127 - .equ se_hinsi_key, 0 - .equ se_hinsi_tbs, 1 - .equ se_hinsi_exg, 0 - .equ se_hinsi_cmp, 1 - - .section .rodata - .global se_hinsi - .align 2 - -@********************** Track 1 **********************@ - -se_hinsi_1: - .byte KEYSH , se_hinsi_key+0 -se_hinsi_1_B1: - .byte TEMPO , 150*se_hinsi_tbs/2 - .byte VOICE , 15 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 100*se_hinsi_mvl/mxv - .byte BEND , c_v+17 - .byte N12 , Dn4 , v080 - .byte W12 - .byte BEND , c_v+31 - .byte N12 , An3 - .byte W12 - .byte W12 - .byte GOTO - .word se_hinsi_1_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_hinsi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hinsi_pri @ Priority - .byte se_hinsi_rev @ Reverb. - - .word se_hinsi_grp - - .word se_hinsi_1 - - .end diff --git a/sound/songs/se_ru_gasyan.s b/sound/songs/se_ice_break.s index ddcd2f8b3..8e68428b8 100644 --- a/sound/songs/se_ru_gasyan.s +++ b/sound/songs/se_ice_break.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_ru_gasyan_grp, voicegroup111 - .equ se_ru_gasyan_pri, 4 - .equ se_ru_gasyan_rev, reverb_set+50 - .equ se_ru_gasyan_mvl, 127 - .equ se_ru_gasyan_key, 0 - .equ se_ru_gasyan_tbs, 1 - .equ se_ru_gasyan_exg, 0 - .equ se_ru_gasyan_cmp, 1 + .equ se_ice_break_grp, voicegroup111 + .equ se_ice_break_pri, 4 + .equ se_ice_break_rev, reverb_set+50 + .equ se_ice_break_mvl, 127 + .equ se_ice_break_key, 0 + .equ se_ice_break_tbs, 1 + .equ se_ice_break_exg, 0 + .equ se_ice_break_cmp, 1 .section .rodata - .global se_ru_gasyan + .global se_ice_break .align 2 @********************** Track 1 **********************@ -se_ru_gasyan_1: - .byte KEYSH , se_ru_gasyan_key+0 - .byte TEMPO , 120*se_ru_gasyan_tbs/2 +se_ice_break_1: + .byte KEYSH , se_ice_break_key+0 + .byte TEMPO , 120*se_ice_break_tbs/2 .byte VOICE , 3 - .byte VOL , 100*se_ru_gasyan_mvl/mxv + .byte VOL , 100*se_ice_break_mvl/mxv .byte BEND , c_v+0 .byte N01 , Gn3 , v120 .byte W03 @@ -49,10 +49,10 @@ se_ru_gasyan_1: @********************** Track 2 **********************@ -se_ru_gasyan_2: - .byte KEYSH , se_ru_gasyan_key+0 +se_ice_break_2: + .byte KEYSH , se_ice_break_key+0 .byte VOICE , 4 - .byte VOL , 100*se_ru_gasyan_mvl/mxv + .byte VOL , 100*se_ice_break_mvl/mxv .byte N01 , Gs3 , v064 .byte W03 .byte W01 @@ -69,15 +69,15 @@ se_ru_gasyan_2: @******************************************************@ .align 2 -se_ru_gasyan: +se_ice_break: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_ru_gasyan_pri @ Priority - .byte se_ru_gasyan_rev @ Reverb. + .byte se_ice_break_pri @ Priority + .byte se_ice_break_rev @ Reverb. - .word se_ru_gasyan_grp + .word se_ice_break_grp - .word se_ru_gasyan_1 - .word se_ru_gasyan_2 + .word se_ice_break_1 + .word se_ice_break_2 .end diff --git a/sound/songs/se_ru_bari.s b/sound/songs/se_ice_crack.s index d3a72147d..ee1d78503 100644 --- a/sound/songs/se_ru_bari.s +++ b/sound/songs/se_ice_crack.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_ru_bari_grp, voicegroup110 - .equ se_ru_bari_pri, 4 - .equ se_ru_bari_rev, reverb_set+50 - .equ se_ru_bari_mvl, 127 - .equ se_ru_bari_key, 0 - .equ se_ru_bari_tbs, 1 - .equ se_ru_bari_exg, 0 - .equ se_ru_bari_cmp, 1 + .equ se_ice_crack_grp, voicegroup110 + .equ se_ice_crack_pri, 4 + .equ se_ice_crack_rev, reverb_set+50 + .equ se_ice_crack_mvl, 127 + .equ se_ice_crack_key, 0 + .equ se_ice_crack_tbs, 1 + .equ se_ice_crack_exg, 0 + .equ se_ice_crack_cmp, 1 .section .rodata - .global se_ru_bari + .global se_ice_crack .align 2 @********************** Track 1 **********************@ -se_ru_bari_1: - .byte KEYSH , se_ru_bari_key+0 - .byte TEMPO , 150*se_ru_bari_tbs/2 +se_ice_crack_1: + .byte KEYSH , se_ice_crack_key+0 + .byte TEMPO , 150*se_ice_crack_tbs/2 .byte VOICE , 9 - .byte VOL , 100*se_ru_bari_mvl/mxv + .byte VOL , 100*se_ice_crack_mvl/mxv .byte BEND , c_v+0 .byte N01 , Gn5 , v088 .byte W01 @@ -33,10 +33,10 @@ se_ru_bari_1: @********************** Track 2 **********************@ -se_ru_bari_2: - .byte KEYSH , se_ru_bari_key+0 +se_ice_crack_2: + .byte KEYSH , se_ice_crack_key+0 .byte VOICE , 122 - .byte VOL , 100*se_ru_bari_mvl/mxv + .byte VOL , 100*se_ice_crack_mvl/mxv .byte N01 , Gn2 , v112 .byte W02 .byte VOICE , 123 @@ -50,15 +50,15 @@ se_ru_bari_2: @******************************************************@ .align 2 -se_ru_bari: +se_ice_crack: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_ru_bari_pri @ Priority - .byte se_ru_bari_rev @ Reverb. + .byte se_ice_crack_pri @ Priority + .byte se_ice_crack_rev @ Reverb. - .word se_ru_bari_grp + .word se_ice_crack_grp - .word se_ru_bari_1 - .word se_ru_bari_2 + .word se_ice_crack_1 + .word se_ice_crack_2 .end diff --git a/sound/songs/se_ice_stairs.s b/sound/songs/se_ice_stairs.s new file mode 100644 index 000000000..812a69ef3 --- /dev/null +++ b/sound/songs/se_ice_stairs.s @@ -0,0 +1,64 @@ + .include "MPlayDef.s" + + .equ se_ice_stairs_grp, voicegroup111 + .equ se_ice_stairs_pri, 4 + .equ se_ice_stairs_rev, reverb_set+50 + .equ se_ice_stairs_mvl, 127 + .equ se_ice_stairs_key, 0 + .equ se_ice_stairs_tbs, 1 + .equ se_ice_stairs_exg, 0 + .equ se_ice_stairs_cmp, 1 + + .section .rodata + .global se_ice_stairs + .align 2 + +@********************** Track 1 **********************@ + +se_ice_stairs_1: + .byte KEYSH , se_ice_stairs_key+0 + .byte TEMPO , 150*se_ice_stairs_tbs/2 + .byte VOICE , 3 + .byte VOL , 90*se_ice_stairs_mvl/mxv + .byte BEND , c_v+16 + .byte N03 , En3 , v112 + .byte W01 + .byte BEND , c_v+38 + .byte W01 + .byte c_v+62 + .byte W02 + .byte N12 , En4 + .byte W02 + .byte W06 + .byte W06 + .byte FINE + +@********************** Track 2 **********************@ + +se_ice_stairs_2: + .byte KEYSH , se_ice_stairs_key+0 + .byte VOICE , 4 + .byte VOL , 90*se_ice_stairs_mvl/mxv + .byte N03 , Gs3 , v096 + .byte W04 + .byte N12 , Gs4 + .byte W02 + .byte W06 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_ice_stairs: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_ice_stairs_pri @ Priority + .byte se_ice_stairs_rev @ Reverb. + + .word se_ice_stairs_grp + + .word se_ice_stairs_1 + .word se_ice_stairs_2 + + .end diff --git a/sound/songs/se_op_basyu.s b/sound/songs/se_intro_blast.s index a285cf558..825c5e950 100644 --- a/sound/songs/se_op_basyu.s +++ b/sound/songs/se_intro_blast.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_op_basyu_grp, voicegroup110 - .equ se_op_basyu_pri, 5 - .equ se_op_basyu_rev, reverb_set+50 - .equ se_op_basyu_mvl, 127 - .equ se_op_basyu_key, 0 - .equ se_op_basyu_tbs, 1 - .equ se_op_basyu_exg, 0 - .equ se_op_basyu_cmp, 1 + .equ se_intro_blast_grp, voicegroup110 + .equ se_intro_blast_pri, 5 + .equ se_intro_blast_rev, reverb_set+50 + .equ se_intro_blast_mvl, 127 + .equ se_intro_blast_key, 0 + .equ se_intro_blast_tbs, 1 + .equ se_intro_blast_exg, 0 + .equ se_intro_blast_cmp, 1 .section .rodata - .global se_op_basyu + .global se_intro_blast .align 2 @********************** Track 1 **********************@ -se_op_basyu_1: - .byte KEYSH , se_op_basyu_key+0 - .byte TEMPO , 110*se_op_basyu_tbs/2 +se_intro_blast_1: + .byte KEYSH , se_intro_blast_key+0 + .byte TEMPO , 110*se_intro_blast_tbs/2 .byte VOICE , 123 .byte BENDR , 12 - .byte VOL , 100*se_op_basyu_mvl/mxv + .byte VOL , 100*se_intro_blast_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N60 , Gs2 , v052 @@ -90,85 +90,85 @@ se_op_basyu_1: .byte W02 .byte c_v+9 .byte W02 - .byte VOL , 98*se_op_basyu_mvl/mxv + .byte VOL , 98*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+11 .byte W01 - .byte VOL , 96*se_op_basyu_mvl/mxv + .byte VOL , 96*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+13 .byte W01 - .byte VOL , 92*se_op_basyu_mvl/mxv + .byte VOL , 92*se_intro_blast_mvl/mxv .byte W02 .byte BEND , c_v+15 .byte W01 - .byte VOL , 92*se_op_basyu_mvl/mxv + .byte VOL , 92*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+17 .byte W01 - .byte VOL , 85*se_op_basyu_mvl/mxv + .byte VOL , 85*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+19 .byte W02 - .byte VOL , 81*se_op_basyu_mvl/mxv + .byte VOL , 81*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+24 .byte W01 - .byte VOL , 74*se_op_basyu_mvl/mxv + .byte VOL , 74*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+27 .byte W01 - .byte VOL , 66*se_op_basyu_mvl/mxv + .byte VOL , 66*se_intro_blast_mvl/mxv .byte W02 .byte BEND , c_v+30 .byte W01 - .byte VOL , 62*se_op_basyu_mvl/mxv + .byte VOL , 62*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+38 .byte W01 - .byte VOL , 56*se_op_basyu_mvl/mxv + .byte VOL , 56*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+43 .byte W02 - .byte VOL , 50*se_op_basyu_mvl/mxv + .byte VOL , 50*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+56 .byte W01 - .byte VOL , 42*se_op_basyu_mvl/mxv + .byte VOL , 42*se_intro_blast_mvl/mxv .byte W01 .byte BEND , c_v+63 .byte W01 - .byte VOL , 34*se_op_basyu_mvl/mxv + .byte VOL , 34*se_intro_blast_mvl/mxv .byte W02 .byte W01 - .byte 29*se_op_basyu_mvl/mxv + .byte 29*se_intro_blast_mvl/mxv .byte W02 - .byte 25*se_op_basyu_mvl/mxv + .byte 25*se_intro_blast_mvl/mxv .byte W03 - .byte 23*se_op_basyu_mvl/mxv + .byte 23*se_intro_blast_mvl/mxv .byte W02 - .byte 19*se_op_basyu_mvl/mxv + .byte 19*se_intro_blast_mvl/mxv .byte W02 - .byte 14*se_op_basyu_mvl/mxv + .byte 14*se_intro_blast_mvl/mxv .byte W02 .byte W01 - .byte 11*se_op_basyu_mvl/mxv + .byte 11*se_intro_blast_mvl/mxv .byte W02 - .byte 5*se_op_basyu_mvl/mxv + .byte 5*se_intro_blast_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_op_basyu: +se_intro_blast: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_op_basyu_pri @ Priority - .byte se_op_basyu_rev @ Reverb. + .byte se_intro_blast_pri @ Priority + .byte se_intro_blast_rev @ Reverb. - .word se_op_basyu_grp + .word se_intro_blast_grp - .word se_op_basyu_1 + .word se_intro_blast_1 .end diff --git a/sound/songs/se_daugi.s b/sound/songs/se_itemfinder.s index 22c9d0257..267bc774a 100644 --- a/sound/songs/se_daugi.s +++ b/sound/songs/se_itemfinder.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_daugi_grp, voicegroup110 - .equ se_daugi_pri, 5 - .equ se_daugi_rev, reverb_set+50 - .equ se_daugi_mvl, 127 - .equ se_daugi_key, 0 - .equ se_daugi_tbs, 1 - .equ se_daugi_exg, 0 - .equ se_daugi_cmp, 1 + .equ se_itemfinder_grp, voicegroup110 + .equ se_itemfinder_pri, 5 + .equ se_itemfinder_rev, reverb_set+50 + .equ se_itemfinder_mvl, 127 + .equ se_itemfinder_key, 0 + .equ se_itemfinder_tbs, 1 + .equ se_itemfinder_exg, 0 + .equ se_itemfinder_cmp, 1 .section .rodata - .global se_daugi + .global se_itemfinder .align 2 @********************** Track 1 **********************@ -se_daugi_1: - .byte KEYSH , se_daugi_key+0 - .byte TEMPO , 128*se_daugi_tbs/2 +se_itemfinder_1: + .byte KEYSH , se_itemfinder_key+0 + .byte TEMPO , 128*se_itemfinder_tbs/2 .byte VOICE , 89 .byte BENDR , 12 - .byte VOL , 90*se_daugi_mvl/mxv + .byte VOL , 90*se_itemfinder_mvl/mxv .byte BEND , c_v-1 .byte N03 , Fs2 , v127 .byte W03 @@ -42,10 +42,10 @@ se_daugi_1: @********************** Track 2 **********************@ -se_daugi_2: - .byte KEYSH , se_daugi_key+0 +se_itemfinder_2: + .byte KEYSH , se_itemfinder_key+0 .byte VOICE , 14 - .byte VOL , 90*se_daugi_mvl/mxv + .byte VOL , 90*se_itemfinder_mvl/mxv .byte BEND , c_v-8 .byte N03 , Gs3 , v100 .byte W03 @@ -66,15 +66,15 @@ se_daugi_2: @******************************************************@ .align 2 -se_daugi: +se_itemfinder: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_daugi_pri @ Priority - .byte se_daugi_rev @ Reverb. + .byte se_itemfinder_pri @ Priority + .byte se_itemfinder_rev @ Reverb. - .word se_daugi_grp + .word se_itemfinder_grp - .word se_daugi_1 - .word se_daugi_2 + .word se_itemfinder_1 + .word se_itemfinder_2 .end diff --git a/sound/songs/se_jido_doa.s b/sound/songs/se_jido_doa.s deleted file mode 100644 index 4dd946566..000000000 --- a/sound/songs/se_jido_doa.s +++ /dev/null @@ -1,41 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jido_doa_grp, voicegroup111 - .equ se_jido_doa_pri, 4 - .equ se_jido_doa_rev, reverb_set+50 - .equ se_jido_doa_mvl, 127 - .equ se_jido_doa_key, 0 - .equ se_jido_doa_tbs, 1 - .equ se_jido_doa_exg, 0 - .equ se_jido_doa_cmp, 1 - - .section .rodata - .global se_jido_doa - .align 2 - -@********************** Track 1 **********************@ - -se_jido_doa_1: - .byte KEYSH , se_jido_doa_key+0 - .byte TEMPO , 120*se_jido_doa_tbs/2 - .byte VOICE , 1 - .byte VOL , 95*se_jido_doa_mvl/mxv - .byte N12 , Cn2 , v127 - .byte W12 - .byte VOL , 0*se_jido_doa_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_jido_doa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jido_doa_pri @ Priority - .byte se_jido_doa_rev @ Reverb. - - .word se_jido_doa_grp - - .word se_jido_doa_1 - - .end diff --git a/sound/songs/se_jihanki.s b/sound/songs/se_jihanki.s deleted file mode 100644 index dd739a407..000000000 --- a/sound/songs/se_jihanki.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jihanki_grp, voicegroup111 - .equ se_jihanki_pri, 4 - .equ se_jihanki_rev, reverb_set+50 - .equ se_jihanki_mvl, 127 - .equ se_jihanki_key, 0 - .equ se_jihanki_tbs, 1 - .equ se_jihanki_exg, 0 - .equ se_jihanki_cmp, 1 - - .section .rodata - .global se_jihanki - .align 2 - -@********************** Track 1 **********************@ - -se_jihanki_1: - .byte KEYSH , se_jihanki_key+0 - .byte TEMPO , 150*se_jihanki_tbs/2 - .byte VOICE , 8 - .byte VOL , 110*se_jihanki_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn4 , v092 - .byte W03 - .byte Cn5 - .byte W03 - .byte W03 - .byte N02 , En3 , v127 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_jihanki: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jihanki_pri @ Priority - .byte se_jihanki_rev @ Reverb. - - .word se_jihanki_grp - - .word se_jihanki_1 - - .end diff --git a/sound/songs/se_jite_pyoko.s b/sound/songs/se_jite_pyoko.s deleted file mode 100644 index bea4ba251..000000000 --- a/sound/songs/se_jite_pyoko.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jite_pyoko_grp, voicegroup110 - .equ se_jite_pyoko_pri, 4 - .equ se_jite_pyoko_rev, reverb_set+50 - .equ se_jite_pyoko_mvl, 127 - .equ se_jite_pyoko_key, 0 - .equ se_jite_pyoko_tbs, 1 - .equ se_jite_pyoko_exg, 0 - .equ se_jite_pyoko_cmp, 1 - - .section .rodata - .global se_jite_pyoko - .align 2 - -@********************** Track 1 **********************@ - -se_jite_pyoko_1: - .byte KEYSH , se_jite_pyoko_key+0 - .byte TEMPO , 180*se_jite_pyoko_tbs/2 - .byte VOICE , 85 - .byte VOL , 90*se_jite_pyoko_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Cn3 , v080 - .byte W02 - .byte VOICE , 86 - .byte N03 , Cn4 , v127 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_jite_pyoko: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jite_pyoko_pri @ Priority - .byte se_jite_pyoko_rev @ Reverb. - - .word se_jite_pyoko_grp - - .word se_jite_pyoko_1 - - .end diff --git a/sound/songs/se_jitensya.s b/sound/songs/se_jitensya.s deleted file mode 100644 index eb447f59f..000000000 --- a/sound/songs/se_jitensya.s +++ /dev/null @@ -1,40 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jitensya_grp, voicegroup111 - .equ se_jitensya_pri, 4 - .equ se_jitensya_rev, reverb_set+50 - .equ se_jitensya_mvl, 127 - .equ se_jitensya_key, 0 - .equ se_jitensya_tbs, 1 - .equ se_jitensya_exg, 0 - .equ se_jitensya_cmp, 1 - - .section .rodata - .global se_jitensya - .align 2 - -@********************** Track 1 **********************@ - -se_jitensya_1: - .byte KEYSH , se_jitensya_key+0 - .byte TEMPO , 120*se_jitensya_tbs/2 - .byte VOICE , 0 - .byte VOL , 90*se_jitensya_mvl/mxv - .byte N96 , Cn3 , v127 - .byte W96 - .byte FINE - -@******************************************************@ - .align 2 - -se_jitensya: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jitensya_pri @ Priority - .byte se_jitensya_rev @ Reverb. - - .word se_jitensya_grp - - .word se_jitensya_1 - - .end diff --git a/sound/songs/se_jyuni.s b/sound/songs/se_jyuni.s deleted file mode 100644 index 3587b107c..000000000 --- a/sound/songs/se_jyuni.s +++ /dev/null @@ -1,127 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jyuni_grp, voicegroup110 - .equ se_jyuni_pri, 4 - .equ se_jyuni_rev, reverb_set+50 - .equ se_jyuni_mvl, 127 - .equ se_jyuni_key, 0 - .equ se_jyuni_tbs, 1 - .equ se_jyuni_exg, 0 - .equ se_jyuni_cmp, 1 - - .section .rodata - .global se_jyuni - .align 2 - -@********************** Track 1 **********************@ - -se_jyuni_1: - .byte KEYSH , se_jyuni_key+0 - .byte TEMPO , 144*se_jyuni_tbs/2 - .byte VOICE , 48 - .byte PAN , c_v+1 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte N06 , Cn3 , v060 - .byte W06 - .byte N13 , Gn3 - .byte W06 - .byte W01 - .byte VOL , 105*se_jyuni_mvl/mxv - .byte W01 - .byte 100*se_jyuni_mvl/mxv - .byte W01 - .byte 89*se_jyuni_mvl/mxv - .byte W01 - .byte 72*se_jyuni_mvl/mxv - .byte W02 - .byte 55*se_jyuni_mvl/mxv - .byte W01 - .byte 38*se_jyuni_mvl/mxv - .byte W01 - .byte 22*se_jyuni_mvl/mxv - .byte W01 - .byte 110*se_jyuni_mvl/mxv - .byte N12 , Gn3 , v032 - .byte W03 - .byte W01 - .byte VOL , 100*se_jyuni_mvl/mxv - .byte W01 - .byte 91*se_jyuni_mvl/mxv - .byte W01 - .byte 75*se_jyuni_mvl/mxv - .byte W01 - .byte 43*se_jyuni_mvl/mxv - .byte W02 - .byte 24*se_jyuni_mvl/mxv - .byte W01 - .byte 9*se_jyuni_mvl/mxv - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_jyuni_2: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 80 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte PAN , c_v+0 - .byte N06 , Cn3 , v060 - .byte W06 - .byte N13 , Gn3 - .byte W06 - .byte W09 - .byte PAN , c_v-48 - .byte N12 , Gn3 , v032 - .byte W03 - .byte W12 - .byte FINE - -@********************** Track 3 **********************@ - -se_jyuni_3: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 81 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte PAN , c_v+0 - .byte N06 , Gn2 , v060 - .byte W06 - .byte N13 , Cn3 - .byte W06 - .byte W09 - .byte PAN , c_v+48 - .byte N12 , Cn3 , v032 - .byte W03 - .byte W12 - .byte FINE - -@********************** Track 4 **********************@ - -se_jyuni_4: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 47 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte N06 , Gn1 , v127 - .byte W06 - .byte N13 , Cn2 - .byte W06 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_jyuni: - .byte 4 @ NumTrks - .byte 0 @ NumBlks - .byte se_jyuni_pri @ Priority - .byte se_jyuni_rev @ Reverb. - - .word se_jyuni_grp - - .word se_jyuni_1 - .word se_jyuni_2 - .word se_jyuni_3 - .word se_jyuni_4 - - .end diff --git a/sound/songs/se_kaifuku.s b/sound/songs/se_kaifuku.s deleted file mode 100644 index 8fef0a0d2..000000000 --- a/sound/songs/se_kaifuku.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kaifuku_grp, voicegroup110 - .equ se_kaifuku_pri, 5 - .equ se_kaifuku_rev, reverb_set+50 - .equ se_kaifuku_mvl, 127 - .equ se_kaifuku_key, 0 - .equ se_kaifuku_tbs, 1 - .equ se_kaifuku_exg, 0 - .equ se_kaifuku_cmp, 1 - - .section .rodata - .global se_kaifuku - .align 2 - -@********************** Track 1 **********************@ - -se_kaifuku_1: - .byte KEYSH , se_kaifuku_key+0 - .byte TEMPO , 132*se_kaifuku_tbs/2 - .byte VOICE , 91 - .byte VOL , 100*se_kaifuku_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Cn3 , v112 - .byte W04 - .byte N02 - .byte W04 - .byte VOICE , 90 - .byte N15 - .byte W16 - .byte FINE - -@******************************************************@ - .align 2 - -se_kaifuku: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_kaifuku_pri @ Priority - .byte se_kaifuku_rev @ Reverb. - - .word se_kaifuku_grp - - .word se_kaifuku_1 - - .end diff --git a/sound/songs/se_ki_gasyan.s b/sound/songs/se_ki_gasyan.s deleted file mode 100644 index 97a59487b..000000000 --- a/sound/songs/se_ki_gasyan.s +++ /dev/null @@ -1,76 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ki_gasyan_grp, voicegroup111 - .equ se_ki_gasyan_pri, 4 - .equ se_ki_gasyan_rev, reverb_set+50 - .equ se_ki_gasyan_mvl, 127 - .equ se_ki_gasyan_key, 0 - .equ se_ki_gasyan_tbs, 1 - .equ se_ki_gasyan_exg, 0 - .equ se_ki_gasyan_cmp, 1 - - .section .rodata - .global se_ki_gasyan - .align 2 - -@********************** Track 1 **********************@ - -se_ki_gasyan_1: - .byte KEYSH , se_ki_gasyan_key+0 - .byte TEMPO , 150*se_ki_gasyan_tbs/2 - .byte VOICE , 8 - .byte VOL , 100*se_ki_gasyan_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn3 , v127 - .byte W02 - .byte N02 , Gn2 - .byte W04 - .byte N17 , Cn3 - .byte W06 - .byte VOL , 98*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 91*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 81*se_ki_gasyan_mvl/mxv - .byte W02 - .byte 75*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 60*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 42*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 25*se_ki_gasyan_mvl/mxv - .byte W02 - .byte 10*se_ki_gasyan_mvl/mxv - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_ki_gasyan_2: - .byte VOL , 100*se_ki_gasyan_mvl/mxv - .byte KEYSH , se_ki_gasyan_key+0 - .byte VOICE , 4 - .byte N01 , Cn3 , v064 - .byte W02 - .byte N02 - .byte W04 - .byte N02 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_ki_gasyan: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_ki_gasyan_pri @ Priority - .byte se_ki_gasyan_rev @ Reverb. - - .word se_ki_gasyan_grp - - .word se_ki_gasyan_1 - .word se_ki_gasyan_2 - - .end diff --git a/sound/songs/se_kon.s b/sound/songs/se_kon.s deleted file mode 100644 index dae80e70d..000000000 --- a/sound/songs/se_kon.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon_grp, voicegroup111 - .equ se_kon_pri, 4 - .equ se_kon_rev, reverb_set+50 - .equ se_kon_mvl, 127 - .equ se_kon_key, 0 - .equ se_kon_tbs, 1 - .equ se_kon_exg, 0 - .equ se_kon_cmp, 1 - - .section .rodata - .global se_kon - .align 2 - -@********************** Track 1 **********************@ - -se_kon_1: - .byte KEYSH , se_kon_key+0 - .byte TEMPO , 150*se_kon_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v112 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon_2: - .byte KEYSH , se_kon_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v100 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon_pri @ Priority - .byte se_kon_rev @ Reverb. - - .word se_kon_grp - - .word se_kon_1 - .word se_kon_2 - - .end diff --git a/sound/songs/se_kon2.s b/sound/songs/se_kon2.s deleted file mode 100644 index 16c353497..000000000 --- a/sound/songs/se_kon2.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon2_grp, voicegroup111 - .equ se_kon2_pri, 4 - .equ se_kon2_rev, reverb_set+50 - .equ se_kon2_mvl, 127 - .equ se_kon2_key, 0 - .equ se_kon2_tbs, 1 - .equ se_kon2_exg, 0 - .equ se_kon2_cmp, 1 - - .section .rodata - .global se_kon2 - .align 2 - -@********************** Track 1 **********************@ - -se_kon2_1: - .byte KEYSH , se_kon2_key+0 - .byte TEMPO , 150*se_kon2_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon2_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v100 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon2_2: - .byte KEYSH , se_kon2_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon2_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v088 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon2_pri @ Priority - .byte se_kon2_rev @ Reverb. - - .word se_kon2_grp - - .word se_kon2_1 - .word se_kon2_2 - - .end diff --git a/sound/songs/se_kon3.s b/sound/songs/se_kon3.s deleted file mode 100644 index 756ffe67b..000000000 --- a/sound/songs/se_kon3.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon3_grp, voicegroup111 - .equ se_kon3_pri, 4 - .equ se_kon3_rev, reverb_set+50 - .equ se_kon3_mvl, 127 - .equ se_kon3_key, 0 - .equ se_kon3_tbs, 1 - .equ se_kon3_exg, 0 - .equ se_kon3_cmp, 1 - - .section .rodata - .global se_kon3 - .align 2 - -@********************** Track 1 **********************@ - -se_kon3_1: - .byte KEYSH , se_kon3_key+0 - .byte TEMPO , 150*se_kon3_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon3_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v088 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon3_2: - .byte KEYSH , se_kon3_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon3_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v072 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon3: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon3_pri @ Priority - .byte se_kon3_rev @ Reverb. - - .word se_kon3_grp - - .word se_kon3_1 - .word se_kon3_2 - - .end diff --git a/sound/songs/se_kon4.s b/sound/songs/se_kon4.s deleted file mode 100644 index 162b8513d..000000000 --- a/sound/songs/se_kon4.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon4_grp, voicegroup111 - .equ se_kon4_pri, 4 - .equ se_kon4_rev, reverb_set+50 - .equ se_kon4_mvl, 127 - .equ se_kon4_key, 0 - .equ se_kon4_tbs, 1 - .equ se_kon4_exg, 0 - .equ se_kon4_cmp, 1 - - .section .rodata - .global se_kon4 - .align 2 - -@********************** Track 1 **********************@ - -se_kon4_1: - .byte KEYSH , se_kon4_key+0 - .byte TEMPO , 150*se_kon4_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon4_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v076 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon4_2: - .byte KEYSH , se_kon4_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon4_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v056 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon4: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon4_pri @ Priority - .byte se_kon4_rev @ Reverb. - - .word se_kon4_grp - - .word se_kon4_1 - .word se_kon4_2 - - .end diff --git a/sound/songs/se_kouka_l.s b/sound/songs/se_kouka_l.s deleted file mode 100644 index 79c6fcdc9..000000000 --- a/sound/songs/se_kouka_l.s +++ /dev/null @@ -1,56 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kouka_l_grp, voicegroup110 - .equ se_kouka_l_pri, 5 - .equ se_kouka_l_rev, reverb_set+50 - .equ se_kouka_l_mvl, 127 - .equ se_kouka_l_key, 0 - .equ se_kouka_l_tbs, 1 - .equ se_kouka_l_exg, 0 - .equ se_kouka_l_cmp, 1 - - .section .rodata - .global se_kouka_l - .align 2 - -@********************** Track 1 **********************@ - -se_kouka_l_1: - .byte KEYSH , se_kouka_l_key+0 - .byte TEMPO , 90*se_kouka_l_tbs/2 - .byte VOICE , 127 - .byte VOL , 110*se_kouka_l_mvl/mxv - .byte N03 , Gn2 , v100 - .byte W03 - .byte N06 , As2 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_kouka_l_2: - .byte KEYSH , se_kouka_l_key+0 - .byte VOICE , 0 - .byte VOL , 110*se_kouka_l_mvl/mxv - .byte N09 , As1 , v127 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_kouka_l: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kouka_l_pri @ Priority - .byte se_kouka_l_rev @ Reverb. - - .word se_kouka_l_grp - - .word se_kouka_l_1 - .word se_kouka_l_2 - - .end diff --git a/sound/songs/se_fu_zuzuzu.s b/sound/songs/se_lavaridge_fall_warp.s index 5afa89731..223669bc5 100644 --- a/sound/songs/se_fu_zuzuzu.s +++ b/sound/songs/se_lavaridge_fall_warp.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_fu_zuzuzu_grp, voicegroup110 - .equ se_fu_zuzuzu_pri, 4 - .equ se_fu_zuzuzu_rev, reverb_set+50 - .equ se_fu_zuzuzu_mvl, 127 - .equ se_fu_zuzuzu_key, 0 - .equ se_fu_zuzuzu_tbs, 1 - .equ se_fu_zuzuzu_exg, 0 - .equ se_fu_zuzuzu_cmp, 1 + .equ se_lavaridge_fall_warp_grp, voicegroup110 + .equ se_lavaridge_fall_warp_pri, 4 + .equ se_lavaridge_fall_warp_rev, reverb_set+50 + .equ se_lavaridge_fall_warp_mvl, 127 + .equ se_lavaridge_fall_warp_key, 0 + .equ se_lavaridge_fall_warp_tbs, 1 + .equ se_lavaridge_fall_warp_exg, 0 + .equ se_lavaridge_fall_warp_cmp, 1 .section .rodata - .global se_fu_zuzuzu + .global se_lavaridge_fall_warp .align 2 @********************** Track 1 **********************@ -se_fu_zuzuzu_1: - .byte KEYSH , se_fu_zuzuzu_key+0 - .byte TEMPO , 120*se_fu_zuzuzu_tbs/2 +se_lavaridge_fall_warp_1: + .byte KEYSH , se_lavaridge_fall_warp_key+0 + .byte TEMPO , 120*se_lavaridge_fall_warp_tbs/2 .byte VOICE , 126 - .byte VOL , 127*se_fu_zuzuzu_mvl/mxv + .byte VOL , 127*se_lavaridge_fall_warp_mvl/mxv .byte N08 , An2 , v112 .byte W03 .byte W03 @@ -60,14 +60,14 @@ se_fu_zuzuzu_1: @******************************************************@ .align 2 -se_fu_zuzuzu: +se_lavaridge_fall_warp: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_fu_zuzuzu_pri @ Priority - .byte se_fu_zuzuzu_rev @ Reverb. + .byte se_lavaridge_fall_warp_pri @ Priority + .byte se_lavaridge_fall_warp_rev @ Reverb. - .word se_fu_zuzuzu_grp + .word se_lavaridge_fall_warp_grp - .word se_fu_zuzuzu_1 + .word se_lavaridge_fall_warp_1 .end diff --git a/sound/songs/se_ledge.s b/sound/songs/se_ledge.s new file mode 100644 index 000000000..691b45681 --- /dev/null +++ b/sound/songs/se_ledge.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_ledge_grp, voicegroup110 + .equ se_ledge_pri, 4 + .equ se_ledge_rev, reverb_set+50 + .equ se_ledge_mvl, 127 + .equ se_ledge_key, 0 + .equ se_ledge_tbs, 1 + .equ se_ledge_exg, 0 + .equ se_ledge_cmp, 1 + + .section .rodata + .global se_ledge + .align 2 + +@********************** Track 1 **********************@ + +se_ledge_1: + .byte KEYSH , se_ledge_key+0 + .byte TEMPO , 120*se_ledge_tbs/2 + .byte VOICE , 85 + .byte VOL , 100*se_ledge_mvl/mxv + .byte BEND , c_v-6 + .byte N02 , Ds2 , v052 + .byte W02 + .byte VOICE , 86 + .byte N06 , Gn3 , v092 + .byte W01 + .byte W03 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_ledge: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_ledge_pri @ Priority + .byte se_ledge_rev @ Reverb. + + .word se_ledge_grp + + .word se_ledge_1 + + .end diff --git a/sound/songs/se_low_health.s b/sound/songs/se_low_health.s new file mode 100644 index 000000000..f28278a01 --- /dev/null +++ b/sound/songs/se_low_health.s @@ -0,0 +1,50 @@ + .include "MPlayDef.s" + + .equ se_low_health_grp, voicegroup110 + .equ se_low_health_pri, 3 + .equ se_low_health_rev, reverb_set+50 + .equ se_low_health_mvl, 127 + .equ se_low_health_key, 0 + .equ se_low_health_tbs, 1 + .equ se_low_health_exg, 0 + .equ se_low_health_cmp, 1 + + .section .rodata + .global se_low_health + .align 2 + +@********************** Track 1 **********************@ + +se_low_health_1: + .byte KEYSH , se_low_health_key+0 +se_low_health_1_B1: + .byte TEMPO , 150*se_low_health_tbs/2 + .byte VOICE , 15 + .byte XCMD , xIECV , 10 + .byte xIECL , 8 + .byte VOL , 100*se_low_health_mvl/mxv + .byte BEND , c_v+17 + .byte N12 , Dn4 , v080 + .byte W12 + .byte BEND , c_v+31 + .byte N12 , An3 + .byte W12 + .byte W12 + .byte GOTO + .word se_low_health_1_B1 + .byte FINE + +@******************************************************@ + .align 2 + +se_low_health: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_low_health_pri @ Priority + .byte se_low_health_rev @ Reverb. + + .word se_low_health_grp + + .word se_low_health_1 + + .end diff --git a/sound/songs/se_w071.s b/sound/songs/se_m_absorb.s index 4907eff95..98595ab4a 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, voicegroup111 - .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, voicegroup111 + .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 68c8466f1..43071e645 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, voicegroup111 - .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, voicegroup111 + .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 7344a95c5..8b1211579 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, voicegroup111 - .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, voicegroup111 + .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 fa16e6d13..65846946a 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, voicegroup111 - .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, voicegroup111 + .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 488e3e580..6851d1b39 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, voicegroup111 - .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, voicegroup111 + .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..2f892538c --- /dev/null +++ b/sound/songs/se_m_barrier.s @@ -0,0 +1,276 @@ + .include "MPlayDef.s" + + .equ se_m_barrier_grp, voicegroup111 + .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 c802ade78..be34ebb3e 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, voicegroup111 - .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, voicegroup111 + .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..ad84ffa68 --- /dev/null +++ b/sound/songs/se_m_belly_drum.s @@ -0,0 +1,72 @@ + .include "MPlayDef.s" + + .equ se_m_belly_drum_grp, voicegroup111 + .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_w020.s b/sound/songs/se_m_bind.s index 48faac8e9..9776232ec 100644 --- a/sound/songs/se_w020.s +++ b/sound/songs/se_m_bind.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w020_grp, voicegroup111 - .equ se_w020_pri, 4 - .equ se_w020_rev, reverb_set+50 - .equ se_w020_mvl, 127 - .equ se_w020_key, 0 - .equ se_w020_tbs, 1 - .equ se_w020_exg, 0 - .equ se_w020_cmp, 1 + .equ se_m_bind_grp, voicegroup111 + .equ se_m_bind_pri, 4 + .equ se_m_bind_rev, reverb_set+50 + .equ se_m_bind_mvl, 127 + .equ se_m_bind_key, 0 + .equ se_m_bind_tbs, 1 + .equ se_m_bind_exg, 0 + .equ se_m_bind_cmp, 1 .section .rodata - .global se_w020 + .global se_m_bind .align 2 @********************** Track 1 **********************@ -se_w020_1: - .byte KEYSH , se_w020_key+0 - .byte TEMPO , 150*se_w020_tbs/2 +se_m_bind_1: + .byte KEYSH , se_m_bind_key+0 + .byte TEMPO , 150*se_m_bind_tbs/2 .byte VOICE , 38 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 100*se_w020_mvl/mxv + .byte VOL , 100*se_m_bind_mvl/mxv .byte BEND , c_v+0 .byte N05 , Fs2 , v127 .byte W01 @@ -68,14 +68,14 @@ se_w020_1: @******************************************************@ .align 2 -se_w020: +se_m_bind: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w020_pri @ Priority - .byte se_w020_rev @ Reverb. + .byte se_m_bind_pri @ Priority + .byte se_m_bind_rev @ Reverb. - .word se_w020_grp + .word se_m_bind_grp - .word se_w020_1 + .word se_m_bind_1 .end diff --git a/sound/songs/se_w044.s b/sound/songs/se_m_bite.s index c4855b4ae..8533f574f 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, voicegroup111 - .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, voicegroup111 + .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 cb2aa5c82..635a1f3d8 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, voicegroup111 - .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, voicegroup111 + .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..4e97374c2 --- /dev/null +++ b/sound/songs/se_m_blizzard2.s @@ -0,0 +1,72 @@ + .include "MPlayDef.s" + + .equ se_m_blizzard2_grp, voicegroup111 + .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 aaf0c7990..e747dc499 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, voicegroup111 - .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, voicegroup111 + .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 459690ad2..e9cc7004c 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, voicegroup111 - .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, voicegroup111 + .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 15570d08f..5fe45373b 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, voicegroup111 - .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, voicegroup111 + .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..a8b9302ce --- /dev/null +++ b/sound/songs/se_m_bubble2.s @@ -0,0 +1,60 @@ + .include "MPlayDef.s" + + .equ se_m_bubble2_grp, voicegroup111 + .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 bae0686a9..81e9e1166 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, voicegroup111 - .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, voicegroup111 + .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 d40a0100c..64a7f53fa 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, voicegroup111 - .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, voicegroup111 + .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..1a5adc9e7 --- /dev/null +++ b/sound/songs/se_m_bubble_beam2.s @@ -0,0 +1,131 @@ + .include "MPlayDef.s" + + .equ se_m_bubble_beam2_grp, voicegroup111 + .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 3f0004eed..f8bb8f511 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, voicegroup111 - .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, voicegroup111 + .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 51f9e50d8..94537bb44 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, voicegroup111 - .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, voicegroup111 + .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_w004.s b/sound/songs/se_m_comet_punch.s index 4ba8de97d..707b4ece8 100644 --- a/sound/songs/se_w004.s +++ b/sound/songs/se_m_comet_punch.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w004_grp, voicegroup111 - .equ se_w004_pri, 4 - .equ se_w004_rev, reverb_set+50 - .equ se_w004_mvl, 127 - .equ se_w004_key, 0 - .equ se_w004_tbs, 1 - .equ se_w004_exg, 0 - .equ se_w004_cmp, 1 + .equ se_m_comet_punch_grp, voicegroup111 + .equ se_m_comet_punch_pri, 4 + .equ se_m_comet_punch_rev, reverb_set+50 + .equ se_m_comet_punch_mvl, 127 + .equ se_m_comet_punch_key, 0 + .equ se_m_comet_punch_tbs, 1 + .equ se_m_comet_punch_exg, 0 + .equ se_m_comet_punch_cmp, 1 .section .rodata - .global se_w004 + .global se_m_comet_punch .align 2 @********************** Track 1 **********************@ -se_w004_1: - .byte KEYSH , se_w004_key+0 - .byte TEMPO , 150*se_w004_tbs/2 +se_m_comet_punch_1: + .byte KEYSH , se_m_comet_punch_key+0 + .byte TEMPO , 150*se_m_comet_punch_tbs/2 .byte VOICE , 6 - .byte VOL , 120*se_w004_mvl/mxv + .byte VOL , 120*se_m_comet_punch_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -43,12 +43,12 @@ se_w004_1: @********************** Track 2 **********************@ -se_w004_2: - .byte KEYSH , se_w004_key+0 +se_m_comet_punch_2: + .byte KEYSH , se_m_comet_punch_key+0 .byte VOICE , 5 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 120*se_w004_mvl/mxv + .byte VOL , 120*se_m_comet_punch_mvl/mxv .byte PAN , c_v+9 .byte N03 , An2 , v052 .byte W04 @@ -61,15 +61,15 @@ se_w004_2: @******************************************************@ .align 2 -se_w004: +se_m_comet_punch: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w004_pri @ Priority - .byte se_w004_rev @ Reverb. + .byte se_m_comet_punch_pri @ Priority + .byte se_m_comet_punch_rev @ Reverb. - .word se_w004_grp + .word se_m_comet_punch_grp - .word se_w004_1 - .word se_w004_2 + .word se_m_comet_punch_1 + .word se_m_comet_punch_2 .end diff --git a/sound/songs/se_w109.s b/sound/songs/se_m_confuse_ray.s index f971262a5..e3b1aa6f2 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, voicegroup111 - .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, voicegroup111 + .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 23506e2b3..66a45eca3 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, voicegroup111 - .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, voicegroup111 + .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 ca4f6d745..694243944 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, voicegroup111 - .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, voicegroup111 + .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_w015.s b/sound/songs/se_m_cut.s index d5af31577..c6eb50f22 100644 --- a/sound/songs/se_w015.s +++ b/sound/songs/se_m_cut.s @@ -1,44 +1,44 @@ .include "MPlayDef.s" - .equ se_w015_grp, voicegroup111 - .equ se_w015_pri, 4 - .equ se_w015_rev, reverb_set+50 - .equ se_w015_mvl, 127 - .equ se_w015_key, 0 - .equ se_w015_tbs, 1 - .equ se_w015_exg, 0 - .equ se_w015_cmp, 1 + .equ se_m_cut_grp, voicegroup111 + .equ se_m_cut_pri, 4 + .equ se_m_cut_rev, reverb_set+50 + .equ se_m_cut_mvl, 127 + .equ se_m_cut_key, 0 + .equ se_m_cut_tbs, 1 + .equ se_m_cut_exg, 0 + .equ se_m_cut_cmp, 1 .section .rodata - .global se_w015 + .global se_m_cut .align 2 @********************** Track 1 **********************@ -se_w015_1: - .byte KEYSH , se_w015_key+0 - .byte TEMPO , 220*se_w015_tbs/2 +se_m_cut_1: + .byte KEYSH , se_m_cut_key+0 + .byte TEMPO , 220*se_m_cut_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 120*se_w015_mvl/mxv + .byte VOL , 120*se_m_cut_mvl/mxv .byte BEND , c_v+0 .byte N15 , Cn3 , v108 .byte W03 - .byte VOL , 102*se_w015_mvl/mxv + .byte VOL , 102*se_m_cut_mvl/mxv .byte BEND , c_v+22 .byte W02 .byte c_v+8 .byte W01 - .byte VOL , 88*se_w015_mvl/mxv + .byte VOL , 88*se_m_cut_mvl/mxv .byte W03 - .byte 75*se_w015_mvl/mxv + .byte 75*se_m_cut_mvl/mxv .byte BEND , c_v-13 .byte W03 - .byte VOL , 55*se_w015_mvl/mxv + .byte VOL , 55*se_m_cut_mvl/mxv .byte W03 .byte VOICE , 18 - .byte VOL , 120*se_w015_mvl/mxv + .byte VOL , 120*se_m_cut_mvl/mxv .byte PAN , c_v+14 .byte BEND , c_v+0 .byte N09 , Cn5 , v092 @@ -74,11 +74,11 @@ se_w015_1: @********************** Track 2 **********************@ -se_w015_2: - .byte KEYSH , se_w015_key+0 +se_m_cut_2: + .byte KEYSH , se_m_cut_key+0 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 120*se_w015_mvl/mxv + .byte VOL , 120*se_m_cut_mvl/mxv .byte N15 , Cn2 , v040 .byte W15 .byte N06 , Fs3 @@ -90,15 +90,15 @@ se_w015_2: @******************************************************@ .align 2 -se_w015: +se_m_cut: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w015_pri @ Priority - .byte se_w015_rev @ Reverb. + .byte se_m_cut_pri @ Priority + .byte se_m_cut_rev @ Reverb. - .word se_w015_grp + .word se_m_cut_grp - .word se_w015_1 - .word se_w015_2 + .word se_m_cut_1 + .word se_m_cut_2 .end diff --git a/sound/songs/se_w197.s b/sound/songs/se_m_detect.s index 41b8482c6..5f371c486 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, voicegroup111 - .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, voicegroup111 + .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 977252d0d..07e1b998f 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, voicegroup111 - .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, voicegroup111 + .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 d5807e60f..d86f3b4b6 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, voicegroup111 - .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, voicegroup111 + .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..f53571d38 --- /dev/null +++ b/sound/songs/se_m_dizzy_punch.s @@ -0,0 +1,79 @@ + .include "MPlayDef.s" + + .equ se_m_dizzy_punch_grp, voicegroup111 + .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_slap.s b/sound/songs/se_m_double_slap.s new file mode 100644 index 000000000..7ec6b1a71 --- /dev/null +++ b/sound/songs/se_m_double_slap.s @@ -0,0 +1,52 @@ + .include "MPlayDef.s" + + .equ se_m_double_slap_grp, voicegroup111 + .equ se_m_double_slap_pri, 4 + .equ se_m_double_slap_rev, reverb_set+50 + .equ se_m_double_slap_mvl, 127 + .equ se_m_double_slap_key, 0 + .equ se_m_double_slap_tbs, 1 + .equ se_m_double_slap_exg, 0 + .equ se_m_double_slap_cmp, 1 + + .section .rodata + .global se_m_double_slap + .align 2 + +@********************** Track 1 **********************@ + +se_m_double_slap_1: + .byte KEYSH , se_m_double_slap_key+0 + .byte TEMPO , 150*se_m_double_slap_tbs/2 + .byte VOICE , 2 + .byte BENDR , 12 + .byte VOL , 110*se_m_double_slap_mvl/mxv + .byte PAN , c_v+9 + .byte BEND , c_v+0 + .byte N02 , Bn3 , v112 + .byte W04 + .byte PAN , c_v-9 + .byte N02 , Fn5 , v064 + .byte W02 + .byte PAN , c_v+0 + .byte N02 , Bn3 , v036 + .byte W03 + .byte VOICE , 18 + .byte N02 , Cn6 , v096 + .byte W15 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_double_slap: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_double_slap_pri @ Priority + .byte se_m_double_slap_rev @ Reverb. + + .word se_m_double_slap_grp + + .word se_m_double_slap_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..f13786aeb --- /dev/null +++ b/sound/songs/se_m_double_team.s @@ -0,0 +1,71 @@ + .include "MPlayDef.s" + + .equ se_m_double_team_grp, voicegroup111 + .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..6a93fd84d --- /dev/null +++ b/sound/songs/se_m_dragon_rage.s @@ -0,0 +1,150 @@ + .include "MPlayDef.s" + + .equ se_m_dragon_rage_grp, voicegroup111 + .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 f6d4d3bd2..bee124394 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, voicegroup111 - .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, voicegroup111 + .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..c4b8ee67c --- /dev/null +++ b/sound/songs/se_m_ember.s @@ -0,0 +1,61 @@ + .include "MPlayDef.s" + + .equ se_m_ember_grp, voicegroup111 + .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 c326cb1ee..ecb70e562 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, voicegroup111 - .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, voicegroup111 + .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 95d32ba7b..242ab3fbd 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, voicegroup111 - .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, voicegroup111 + .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 b38d8f8a9..56c766bad 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, voicegroup111 - .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, voicegroup111 + .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 2b5189af0..db586601a 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, voicegroup111 - .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, voicegroup111 + .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_w007.s b/sound/songs/se_m_fire_punch.s index 6eb9d5d9b..a49c537ca 100644 --- a/sound/songs/se_w007.s +++ b/sound/songs/se_m_fire_punch.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w007_grp, voicegroup111 - .equ se_w007_pri, 4 - .equ se_w007_rev, reverb_set+50 - .equ se_w007_mvl, 127 - .equ se_w007_key, 0 - .equ se_w007_tbs, 1 - .equ se_w007_exg, 0 - .equ se_w007_cmp, 1 + .equ se_m_fire_punch_grp, voicegroup111 + .equ se_m_fire_punch_pri, 4 + .equ se_m_fire_punch_rev, reverb_set+50 + .equ se_m_fire_punch_mvl, 127 + .equ se_m_fire_punch_key, 0 + .equ se_m_fire_punch_tbs, 1 + .equ se_m_fire_punch_exg, 0 + .equ se_m_fire_punch_cmp, 1 .section .rodata - .global se_w007 + .global se_m_fire_punch .align 2 @********************** Track 1 **********************@ -se_w007_1: - .byte KEYSH , se_w007_key+0 - .byte TEMPO , 220*se_w007_tbs/2 +se_m_fire_punch_1: + .byte KEYSH , se_m_fire_punch_key+0 + .byte TEMPO , 220*se_m_fire_punch_tbs/2 .byte VOICE , 6 - .byte VOL , 110*se_w007_mvl/mxv + .byte VOL , 110*se_m_fire_punch_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -57,20 +57,20 @@ se_w007_1: .byte W01 .byte c_v-29 .byte W01 - .byte VOL , 86*se_w007_mvl/mxv + .byte VOL , 86*se_m_fire_punch_mvl/mxv .byte BEND , c_v-39 .byte W02 - .byte VOL , 69*se_w007_mvl/mxv + .byte VOL , 69*se_m_fire_punch_mvl/mxv .byte BEND , c_v-45 .byte W01 - .byte VOL , 53*se_w007_mvl/mxv + .byte VOL , 53*se_m_fire_punch_mvl/mxv .byte BEND , c_v-56 .byte W01 - .byte VOL , 20*se_w007_mvl/mxv + .byte VOL , 20*se_m_fire_punch_mvl/mxv .byte BEND , c_v-64 .byte W01 .byte VOICE , 29 - .byte VOL , 110*se_w007_mvl/mxv + .byte VOL , 110*se_m_fire_punch_mvl/mxv .byte BEND , c_v+0 .byte N48 .byte W03 @@ -86,28 +86,28 @@ se_w007_1: .byte c_v-3 .byte W08 .byte W03 - .byte VOL , 78*se_w007_mvl/mxv + .byte VOL , 78*se_m_fire_punch_mvl/mxv .byte W04 - .byte 64*se_w007_mvl/mxv + .byte 64*se_m_fire_punch_mvl/mxv .byte W03 - .byte 51*se_w007_mvl/mxv + .byte 51*se_m_fire_punch_mvl/mxv .byte W04 - .byte 38*se_w007_mvl/mxv + .byte 38*se_m_fire_punch_mvl/mxv .byte W04 - .byte 25*se_w007_mvl/mxv + .byte 25*se_m_fire_punch_mvl/mxv .byte W03 - .byte 12*se_w007_mvl/mxv + .byte 12*se_m_fire_punch_mvl/mxv .byte W03 .byte FINE @********************** Track 2 **********************@ -se_w007_2: - .byte KEYSH , se_w007_key+0 +se_m_fire_punch_2: + .byte KEYSH , se_m_fire_punch_key+0 .byte VOICE , 5 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 110*se_w007_mvl/mxv + .byte VOL , 110*se_m_fire_punch_mvl/mxv .byte PAN , c_v+9 .byte N03 , Gs2 , v052 .byte W06 @@ -124,15 +124,15 @@ se_w007_2: @******************************************************@ .align 2 -se_w007: +se_m_fire_punch: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w007_pri @ Priority - .byte se_w007_rev @ Reverb. + .byte se_m_fire_punch_pri @ Priority + .byte se_m_fire_punch_rev @ Reverb. - .word se_w007_grp + .word se_m_fire_punch_grp - .word se_w007_1 - .word se_w007_2 + .word se_m_fire_punch_1 + .word se_m_fire_punch_2 .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..de851f3e7 --- /dev/null +++ b/sound/songs/se_m_flame_wheel.s @@ -0,0 +1,124 @@ + .include "MPlayDef.s" + + .equ se_m_flame_wheel_grp, voicegroup111 + .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..0072fecbb --- /dev/null +++ b/sound/songs/se_m_flame_wheel2.s @@ -0,0 +1,99 @@ + .include "MPlayDef.s" + + .equ se_m_flame_wheel2_grp, voicegroup111 + .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 772ca9741..494b36f26 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, voicegroup111 - .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, voicegroup111 + .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..6a70c6a0f --- /dev/null +++ b/sound/songs/se_m_flatter.s @@ -0,0 +1,67 @@ + .include "MPlayDef.s" + + .equ se_m_flatter_grp, voicegroup111 + .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_w019.s b/sound/songs/se_m_fly.s index 0820f7c2b..e6006d628 100644 --- a/sound/songs/se_w019.s +++ b/sound/songs/se_m_fly.s @@ -1,44 +1,44 @@ .include "MPlayDef.s" - .equ se_w019_grp, voicegroup111 - .equ se_w019_pri, 4 - .equ se_w019_rev, reverb_set+50 - .equ se_w019_mvl, 127 - .equ se_w019_key, 0 - .equ se_w019_tbs, 1 - .equ se_w019_exg, 0 - .equ se_w019_cmp, 1 + .equ se_m_fly_grp, voicegroup111 + .equ se_m_fly_pri, 4 + .equ se_m_fly_rev, reverb_set+50 + .equ se_m_fly_mvl, 127 + .equ se_m_fly_key, 0 + .equ se_m_fly_tbs, 1 + .equ se_m_fly_exg, 0 + .equ se_m_fly_cmp, 1 .section .rodata - .global se_w019 + .global se_m_fly .align 2 @********************** Track 1 **********************@ -se_w019_1: - .byte KEYSH , se_w019_key+0 - .byte TEMPO , 220*se_w019_tbs/2 +se_m_fly_1: + .byte KEYSH , se_m_fly_key+0 + .byte TEMPO , 220*se_m_fly_tbs/2 .byte VOICE , 2 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 90*se_w019_mvl/mxv + .byte VOL , 90*se_m_fly_mvl/mxv .byte BEND , c_v+0 .byte N01 , En2 , v127 .byte W01 - .byte VOL , 55*se_w019_mvl/mxv + .byte VOL , 55*se_m_fly_mvl/mxv .byte PAN , c_v+10 .byte BEND , c_v-16 .byte N07 , An1 .byte W01 - .byte VOL , 71*se_w019_mvl/mxv + .byte VOL , 71*se_m_fly_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W01 - .byte VOL , 86*se_w019_mvl/mxv + .byte VOL , 86*se_m_fly_mvl/mxv .byte PAN , c_v-9 .byte BEND , c_v+17 .byte W01 - .byte VOL , 110*se_w019_mvl/mxv + .byte VOL , 110*se_m_fly_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+33 .byte W02 @@ -48,42 +48,42 @@ se_w019_1: .byte PAN , c_v+0 .byte BEND , c_v+63 .byte W02 - .byte VOL , 90*se_w019_mvl/mxv + .byte VOL , 90*se_m_fly_mvl/mxv .byte PAN , c_v+10 .byte BEND , c_v+1 .byte N04 .byte W01 - .byte VOL , 54*se_w019_mvl/mxv + .byte VOL , 54*se_m_fly_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+38 .byte W02 - .byte VOL , 83*se_w019_mvl/mxv + .byte VOL , 83*se_m_fly_mvl/mxv .byte PAN , c_v-9 .byte BEND , c_v+48 .byte W01 - .byte VOL , 110*se_w019_mvl/mxv + .byte VOL , 110*se_m_fly_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+63 .byte W03 - .byte VOL , 90*se_w019_mvl/mxv + .byte VOL , 90*se_m_fly_mvl/mxv .byte BEND , c_v+0 .byte N01 , Ds2 , v104 .byte W02 .byte PAN , c_v+10 - .byte VOL , 55*se_w019_mvl/mxv + .byte VOL , 55*se_m_fly_mvl/mxv .byte BEND , c_v-16 .byte N07 , Gs1 , v100 .byte W01 .byte PAN , c_v+0 - .byte VOL , 71*se_w019_mvl/mxv + .byte VOL , 71*se_m_fly_mvl/mxv .byte BEND , c_v+0 .byte W01 .byte PAN , c_v-9 - .byte VOL , 86*se_w019_mvl/mxv + .byte VOL , 86*se_m_fly_mvl/mxv .byte BEND , c_v+17 .byte W01 .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv + .byte VOL , 110*se_m_fly_mvl/mxv .byte BEND , c_v+33 .byte W01 .byte PAN , c_v+10 @@ -93,41 +93,41 @@ se_w019_1: .byte BEND , c_v+63 .byte W02 .byte PAN , c_v+10 - .byte VOL , 90*se_w019_mvl/mxv + .byte VOL , 90*se_m_fly_mvl/mxv .byte BEND , c_v+1 .byte N04 .byte W01 .byte PAN , c_v+0 - .byte VOL , 54*se_w019_mvl/mxv + .byte VOL , 54*se_m_fly_mvl/mxv .byte BEND , c_v+38 .byte W01 .byte PAN , c_v-9 - .byte VOL , 83*se_w019_mvl/mxv + .byte VOL , 83*se_m_fly_mvl/mxv .byte BEND , c_v+48 .byte W02 .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv + .byte VOL , 110*se_m_fly_mvl/mxv .byte BEND , c_v+63 .byte W03 - .byte VOL , 90*se_w019_mvl/mxv + .byte VOL , 90*se_m_fly_mvl/mxv .byte BEND , c_v+0 .byte N01 , Dn2 , v088 .byte W01 .byte PAN , c_v+10 - .byte VOL , 55*se_w019_mvl/mxv + .byte VOL , 55*se_m_fly_mvl/mxv .byte BEND , c_v-16 .byte N07 , Gn1 , v060 .byte W02 .byte PAN , c_v+0 - .byte VOL , 71*se_w019_mvl/mxv + .byte VOL , 71*se_m_fly_mvl/mxv .byte BEND , c_v+0 .byte W01 .byte PAN , c_v-9 - .byte VOL , 86*se_w019_mvl/mxv + .byte VOL , 86*se_m_fly_mvl/mxv .byte BEND , c_v+17 .byte W01 .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv + .byte VOL , 110*se_m_fly_mvl/mxv .byte BEND , c_v+33 .byte W01 .byte PAN , c_v+10 @@ -137,115 +137,115 @@ se_w019_1: .byte BEND , c_v+63 .byte W03 .byte PAN , c_v+10 - .byte VOL , 90*se_w019_mvl/mxv + .byte VOL , 90*se_m_fly_mvl/mxv .byte BEND , c_v+1 .byte N04 .byte W01 .byte PAN , c_v+0 - .byte VOL , 54*se_w019_mvl/mxv + .byte VOL , 54*se_m_fly_mvl/mxv .byte BEND , c_v+38 .byte W01 .byte PAN , c_v-9 - .byte VOL , 83*se_w019_mvl/mxv + .byte VOL , 83*se_m_fly_mvl/mxv .byte BEND , c_v+48 .byte W01 .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv + .byte VOL , 110*se_m_fly_mvl/mxv .byte BEND , c_v+63 .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w019_2: - .byte KEYSH , se_w019_key+0 +se_m_fly_2: + .byte KEYSH , se_m_fly_key+0 .byte VOICE , 25 .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv + .byte VOL , 110*se_m_fly_mvl/mxv .byte N08 , Cn2 , v040 .byte W01 - .byte VOL , 72*se_w019_mvl/mxv + .byte VOL , 72*se_m_fly_mvl/mxv .byte W01 - .byte 87*se_w019_mvl/mxv + .byte 87*se_m_fly_mvl/mxv .byte W01 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte W01 - .byte 89*se_w019_mvl/mxv + .byte 89*se_m_fly_mvl/mxv .byte W02 - .byte 49*se_w019_mvl/mxv + .byte 49*se_m_fly_mvl/mxv .byte W01 - .byte 14*se_w019_mvl/mxv + .byte 14*se_m_fly_mvl/mxv .byte W02 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte N04 , Gn4 .byte W01 - .byte VOL , 84*se_w019_mvl/mxv + .byte VOL , 84*se_m_fly_mvl/mxv .byte W02 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte W02 - .byte 55*se_w019_mvl/mxv + .byte 55*se_m_fly_mvl/mxv .byte W02 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte N08 , Cn2 , v032 .byte W02 - .byte VOL , 72*se_w019_mvl/mxv + .byte VOL , 72*se_m_fly_mvl/mxv .byte W01 - .byte 87*se_w019_mvl/mxv + .byte 87*se_m_fly_mvl/mxv .byte W01 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte W01 - .byte 89*se_w019_mvl/mxv + .byte 89*se_m_fly_mvl/mxv .byte W01 - .byte 49*se_w019_mvl/mxv + .byte 49*se_m_fly_mvl/mxv .byte W02 - .byte 14*se_w019_mvl/mxv + .byte 14*se_m_fly_mvl/mxv .byte W02 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte N04 , Gn4 .byte W01 - .byte VOL , 84*se_w019_mvl/mxv + .byte VOL , 84*se_m_fly_mvl/mxv .byte W01 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte W03 - .byte 55*se_w019_mvl/mxv + .byte 55*se_m_fly_mvl/mxv .byte W02 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte N08 , Cn2 , v020 .byte W01 - .byte VOL , 72*se_w019_mvl/mxv + .byte VOL , 72*se_m_fly_mvl/mxv .byte W02 - .byte 87*se_w019_mvl/mxv + .byte 87*se_m_fly_mvl/mxv .byte W01 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte W01 - .byte 89*se_w019_mvl/mxv + .byte 89*se_m_fly_mvl/mxv .byte W01 - .byte 49*se_w019_mvl/mxv + .byte 49*se_m_fly_mvl/mxv .byte W01 - .byte 14*se_w019_mvl/mxv + .byte 14*se_m_fly_mvl/mxv .byte W03 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte N04 , Gn4 .byte W01 - .byte VOL , 84*se_w019_mvl/mxv + .byte VOL , 84*se_m_fly_mvl/mxv .byte W01 - .byte 110*se_w019_mvl/mxv + .byte 110*se_m_fly_mvl/mxv .byte W03 - .byte 55*se_w019_mvl/mxv + .byte 55*se_m_fly_mvl/mxv .byte FINE @******************************************************@ .align 2 -se_w019: +se_m_fly: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w019_pri @ Priority - .byte se_w019_rev @ Reverb. + .byte se_m_fly_pri @ Priority + .byte se_m_fly_rev @ Reverb. - .word se_w019_grp + .word se_m_fly_grp - .word se_w019_1 - .word se_w019_2 + .word se_m_fly_1 + .word se_m_fly_2 .end diff --git a/sound/songs/se_w202.s b/sound/songs/se_m_giga_drain.s index db0cb40ff..814e7b440 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, voicegroup111 - .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, voicegroup111 + .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 e8b24d3f4..8f79ecc0d 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, voicegroup111 - .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, voicegroup111 + .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_w016.s b/sound/songs/se_m_gust.s index 7b1f27026..da77363b5 100644 --- a/sound/songs/se_w016.s +++ b/sound/songs/se_m_gust.s @@ -1,49 +1,49 @@ .include "MPlayDef.s" - .equ se_w016_grp, voicegroup111 - .equ se_w016_pri, 4 - .equ se_w016_rev, reverb_set+50 - .equ se_w016_mvl, 127 - .equ se_w016_key, 0 - .equ se_w016_tbs, 1 - .equ se_w016_exg, 0 - .equ se_w016_cmp, 1 + .equ se_m_gust_grp, voicegroup111 + .equ se_m_gust_pri, 4 + .equ se_m_gust_rev, reverb_set+50 + .equ se_m_gust_mvl, 127 + .equ se_m_gust_key, 0 + .equ se_m_gust_tbs, 1 + .equ se_m_gust_exg, 0 + .equ se_m_gust_cmp, 1 .section .rodata - .global se_w016 + .global se_m_gust .align 2 @********************** Track 1 **********************@ -se_w016_1: - .byte KEYSH , se_w016_key+0 - .byte TEMPO , 150*se_w016_tbs/2 +se_m_gust_1: + .byte KEYSH , se_m_gust_key+0 + .byte TEMPO , 150*se_m_gust_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 64*se_w016_mvl/mxv + .byte VOL , 64*se_m_gust_mvl/mxv .byte BEND , c_v+0 .byte N24 , Cn3 , v108 .byte W03 - .byte VOL , 79*se_w016_mvl/mxv + .byte VOL , 79*se_m_gust_mvl/mxv .byte BEND , c_v+22 .byte W02 .byte c_v+8 .byte W01 - .byte VOL , 84*se_w016_mvl/mxv + .byte VOL , 84*se_m_gust_mvl/mxv .byte PAN , c_v-4 .byte W03 - .byte VOL , 91*se_w016_mvl/mxv + .byte VOL , 91*se_m_gust_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 100*se_w016_mvl/mxv + .byte VOL , 100*se_m_gust_mvl/mxv .byte PAN , c_v-8 .byte W03 - .byte VOL , 110*se_w016_mvl/mxv + .byte VOL , 110*se_m_gust_mvl/mxv .byte W03 .byte PAN , c_v-12 .byte W06 -se_w016_1_B1: +se_m_gust_1_B1: .byte PAN , c_v-17 .byte BEND , c_v+0 .byte N48 , Cn3 , v108 @@ -84,20 +84,20 @@ se_w016_1_B1: .byte PAN , c_v-11 .byte W03 .byte GOTO - .word se_w016_1_B1 + .word se_m_gust_1_B1 .byte FINE @******************************************************@ .align 2 -se_w016: +se_m_gust: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w016_pri @ Priority - .byte se_w016_rev @ Reverb. + .byte se_m_gust_pri @ Priority + .byte se_m_gust_rev @ Reverb. - .word se_w016_grp + .word se_m_gust_grp - .word se_w016_1 + .word se_m_gust_1 .end diff --git a/sound/songs/se_m_gust2.s b/sound/songs/se_m_gust2.s new file mode 100644 index 000000000..074d24b3d --- /dev/null +++ b/sound/songs/se_m_gust2.s @@ -0,0 +1,72 @@ + .include "MPlayDef.s" + + .equ se_m_gust2_grp, voicegroup111 + .equ se_m_gust2_pri, 4 + .equ se_m_gust2_rev, reverb_set+50 + .equ se_m_gust2_mvl, 127 + .equ se_m_gust2_key, 0 + .equ se_m_gust2_tbs, 1 + .equ se_m_gust2_exg, 0 + .equ se_m_gust2_cmp, 1 + + .section .rodata + .global se_m_gust2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_gust2_1: + .byte KEYSH , se_m_gust2_key+0 + .byte TEMPO , 150*se_m_gust2_tbs/2 + .byte VOICE , 22 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_gust2_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Cn3 , v108 + .byte W02 + .byte PAN , c_v-19 + .byte W04 + .byte c_v+0 + .byte W01 + .byte VOL , 97*se_m_gust2_mvl/mxv + .byte W01 + .byte PAN , c_v+16 + .byte W01 + .byte VOL , 84*se_m_gust2_mvl/mxv + .byte W03 + .byte 76*se_m_gust2_mvl/mxv + .byte PAN , c_v+2 + .byte W02 + .byte VOL , 55*se_m_gust2_mvl/mxv + .byte PAN , c_v-8 + .byte W02 + .byte VOL , 39*se_m_gust2_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 25*se_m_gust2_mvl/mxv + .byte W01 + .byte PAN , c_v+8 + .byte W01 + .byte VOL , 13*se_m_gust2_mvl/mxv + .byte W03 + .byte 7*se_m_gust2_mvl/mxv + .byte PAN , c_v+0 + .byte W24 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_gust2: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_gust2_pri @ Priority + .byte se_m_gust2_rev @ Reverb. + + .word se_m_gust2_grp + + .word se_m_gust2_1 + + .end diff --git a/sound/songs/se_w258.s b/sound/songs/se_m_hail.s index 36fef253f..3a8e3b67c 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, voicegroup111 - .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, voicegroup111 + .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 7acb85288..d9762aaf7 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, voicegroup111 - .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, voicegroup111 + .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 f784ffadf..9020e1e53 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, voicegroup111 - .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, voicegroup111 + .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_w029.s b/sound/songs/se_m_headbutt.s index 59f85da16..6ca5d90a4 100644 --- a/sound/songs/se_w029.s +++ b/sound/songs/se_m_headbutt.s @@ -1,64 +1,64 @@ .include "MPlayDef.s" - .equ se_w029_grp, voicegroup111 - .equ se_w029_pri, 4 - .equ se_w029_rev, reverb_set+50 - .equ se_w029_mvl, 127 - .equ se_w029_key, 0 - .equ se_w029_tbs, 1 - .equ se_w029_exg, 0 - .equ se_w029_cmp, 1 + .equ se_m_headbutt_grp, voicegroup111 + .equ se_m_headbutt_pri, 4 + .equ se_m_headbutt_rev, reverb_set+50 + .equ se_m_headbutt_mvl, 127 + .equ se_m_headbutt_key, 0 + .equ se_m_headbutt_tbs, 1 + .equ se_m_headbutt_exg, 0 + .equ se_m_headbutt_cmp, 1 .section .rodata - .global se_w029 + .global se_m_headbutt .align 2 @********************** Track 1 **********************@ -se_w029_1: - .byte KEYSH , se_w029_key+0 - .byte TEMPO , 150*se_w029_tbs/2 +se_m_headbutt_1: + .byte KEYSH , se_m_headbutt_key+0 + .byte TEMPO , 150*se_m_headbutt_tbs/2 .byte VOICE , 2 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 25*se_w029_mvl/mxv + .byte VOL , 25*se_m_headbutt_mvl/mxv .byte BEND , c_v-48 .byte N07 , Cn1 , v127 .byte W01 - .byte VOL , 41*se_w029_mvl/mxv + .byte VOL , 41*se_m_headbutt_mvl/mxv .byte BEND , c_v-31 .byte W01 .byte PAN , c_v+7 - .byte VOL , 57*se_w029_mvl/mxv + .byte VOL , 57*se_m_headbutt_mvl/mxv .byte BEND , c_v-16 .byte W01 - .byte VOL , 79*se_w029_mvl/mxv + .byte VOL , 79*se_m_headbutt_mvl/mxv .byte BEND , c_v+0 .byte W01 .byte PAN , c_v+11 - .byte VOL , 110*se_w029_mvl/mxv + .byte VOL , 110*se_m_headbutt_mvl/mxv .byte BEND , c_v+14 .byte W02 .byte c_v+32 .byte W01 .byte PAN , c_v+14 .byte W01 - .byte VOL , 25*se_w029_mvl/mxv + .byte VOL , 25*se_m_headbutt_mvl/mxv .byte BEND , c_v-48 .byte N07 , Dn1 .byte W01 .byte PAN , c_v+19 - .byte VOL , 41*se_w029_mvl/mxv + .byte VOL , 41*se_m_headbutt_mvl/mxv .byte BEND , c_v-31 .byte W01 - .byte VOL , 57*se_w029_mvl/mxv + .byte VOL , 57*se_m_headbutt_mvl/mxv .byte BEND , c_v-16 .byte W02 .byte PAN , c_v+0 - .byte VOL , 79*se_w029_mvl/mxv + .byte VOL , 79*se_m_headbutt_mvl/mxv .byte BEND , c_v+0 .byte W01 - .byte VOL , 110*se_w029_mvl/mxv + .byte VOL , 110*se_m_headbutt_mvl/mxv .byte BEND , c_v+14 .byte W01 .byte PAN , c_v-8 @@ -68,20 +68,20 @@ se_w029_1: .byte W03 .byte c_v-15 .byte W05 - .byte VOL , 110*se_w029_mvl/mxv + .byte VOL , 110*se_m_headbutt_mvl/mxv .byte FINE @******************************************************@ .align 2 -se_w029: +se_m_headbutt: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w029_pri @ Priority - .byte se_w029_rev @ Reverb. + .byte se_m_headbutt_pri @ Priority + .byte se_m_headbutt_rev @ Reverb. - .word se_w029_grp + .word se_m_headbutt_grp - .word se_w029_1 + .word se_m_headbutt_1 .end diff --git a/sound/songs/se_w215.s b/sound/songs/se_m_heal_bell.s index 9861f142d..62804d963 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, voicegroup111 - .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, voicegroup111 + .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 c0183715a..4b0a5abd6 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, voicegroup111 - .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, voicegroup111 + .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_m_horn_attack.s b/sound/songs/se_m_horn_attack.s new file mode 100644 index 000000000..be5e3d9bc --- /dev/null +++ b/sound/songs/se_m_horn_attack.s @@ -0,0 +1,67 @@ + .include "MPlayDef.s" + + .equ se_m_horn_attack_grp, voicegroup111 + .equ se_m_horn_attack_pri, 4 + .equ se_m_horn_attack_rev, reverb_set+50 + .equ se_m_horn_attack_mvl, 127 + .equ se_m_horn_attack_key, 0 + .equ se_m_horn_attack_tbs, 1 + .equ se_m_horn_attack_exg, 0 + .equ se_m_horn_attack_cmp, 1 + + .section .rodata + .global se_m_horn_attack + .align 2 + +@********************** Track 1 **********************@ + +se_m_horn_attack_1: + .byte KEYSH , se_m_horn_attack_key+0 + .byte TEMPO , 150*se_m_horn_attack_tbs/2 + .byte VOICE , 21 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_horn_attack_mvl/mxv + .byte BEND , c_v+1 + .byte N01 , Bn5 , v127 + .byte W02 + .byte VOICE , 18 + .byte N01 , Cn4 + .byte W02 + .byte VOICE , 36 + .byte N06 , Gn5 , v040 + .byte W02 + .byte VOL , 58*se_m_horn_attack_mvl/mxv + .byte PAN , c_v+16 + .byte BEND , c_v+5 + .byte W01 + .byte VOL , 71*se_m_horn_attack_mvl/mxv + .byte PAN , c_v-14 + .byte BEND , c_v+13 + .byte W01 + .byte VOL , 84*se_m_horn_attack_mvl/mxv + .byte PAN , c_v+16 + .byte BEND , c_v+21 + .byte W01 + .byte VOL , 97*se_m_horn_attack_mvl/mxv + .byte PAN , c_v-14 + .byte BEND , c_v+33 + .byte W01 + .byte VOL , 110*se_m_horn_attack_mvl/mxv + .byte W14 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_horn_attack: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_horn_attack_pri @ Priority + .byte se_m_horn_attack_rev @ Reverb. + + .word se_m_horn_attack_grp + + .word se_m_horn_attack_1 + + .end diff --git a/sound/songs/se_w056.s b/sound/songs/se_m_hydro_pump.s index cbbee4b57..c193b20d3 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, voicegroup111 - .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, voicegroup111 + .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 6e9b971cf..66dea3020 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, voicegroup111 - .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, voicegroup111 + .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 9bdd874e9..8be2ec761 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, voicegroup111 - .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, voicegroup111 + .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 c532f5095..906e7a307 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, voicegroup111 - .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, voicegroup111 + .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_m_jump_kick.s b/sound/songs/se_m_jump_kick.s new file mode 100644 index 000000000..325dcb6a7 --- /dev/null +++ b/sound/songs/se_m_jump_kick.s @@ -0,0 +1,71 @@ + .include "MPlayDef.s" + + .equ se_m_jump_kick_grp, voicegroup111 + .equ se_m_jump_kick_pri, 4 + .equ se_m_jump_kick_rev, reverb_set+50 + .equ se_m_jump_kick_mvl, 127 + .equ se_m_jump_kick_key, 0 + .equ se_m_jump_kick_tbs, 1 + .equ se_m_jump_kick_exg, 0 + .equ se_m_jump_kick_cmp, 1 + + .section .rodata + .global se_m_jump_kick + .align 2 + +@********************** Track 1 **********************@ + +se_m_jump_kick_1: + .byte KEYSH , se_m_jump_kick_key+0 + .byte TEMPO , 180*se_m_jump_kick_tbs/2 + .byte VOICE , 22 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_jump_kick_mvl/mxv + .byte BEND , c_v-12 + .byte N19 , Gn3 , v108 + .byte W02 + .byte BEND , c_v-5 + .byte W01 + .byte VOL , 101*se_m_jump_kick_mvl/mxv + .byte W01 + .byte PAN , c_v-9 + .byte BEND , c_v+8 + .byte W02 + .byte VOL , 84*se_m_jump_kick_mvl/mxv + .byte BEND , c_v+4 + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 64*se_m_jump_kick_mvl/mxv + .byte BEND , c_v-13 + .byte W01 + .byte PAN , c_v+8 + .byte W02 + .byte VOL , 45*se_m_jump_kick_mvl/mxv + .byte BEND , c_v-31 + .byte W02 + .byte VOL , 32*se_m_jump_kick_mvl/mxv + .byte PAN , c_v+0 + .byte W01 + .byte VOICE , 2 + .byte W01 + .byte VOL , 13*se_m_jump_kick_mvl/mxv + .byte BEND , c_v-52 + .byte W08 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_jump_kick: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_jump_kick_pri @ Priority + .byte se_m_jump_kick_rev @ Reverb. + + .word se_m_jump_kick_grp + + .word se_m_jump_kick_1 + + .end diff --git a/sound/songs/se_w043.s b/sound/songs/se_m_leer.s index e965526e3..e3403119b 100644 --- a/sound/songs/se_w043.s +++ b/sound/songs/se_m_leer.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w043_grp, voicegroup111 - .equ se_w043_pri, 4 - .equ se_w043_rev, reverb_set+50 - .equ se_w043_mvl, 127 - .equ se_w043_key, 0 - .equ se_w043_tbs, 1 - .equ se_w043_exg, 0 - .equ se_w043_cmp, 1 + .equ se_m_leer_grp, voicegroup111 + .equ se_m_leer_pri, 4 + .equ se_m_leer_rev, reverb_set+50 + .equ se_m_leer_mvl, 127 + .equ se_m_leer_key, 0 + .equ se_m_leer_tbs, 1 + .equ se_m_leer_exg, 0 + .equ se_m_leer_cmp, 1 .section .rodata - .global se_w043 + .global se_m_leer .align 2 @********************** Track 1 **********************@ -se_w043_1: - .byte KEYSH , se_w043_key+0 - .byte TEMPO , 150*se_w043_tbs/2 +se_m_leer_1: + .byte KEYSH , se_m_leer_key+0 + .byte TEMPO , 150*se_m_leer_tbs/2 .byte VOICE , 18 - .byte VOL , 110*se_w043_mvl/mxv + .byte VOL , 110*se_m_leer_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -67,10 +67,10 @@ se_w043_1: @********************** Track 2 **********************@ -se_w043_2: - .byte KEYSH , se_w043_key+0 +se_m_leer_2: + .byte KEYSH , se_m_leer_key+0 .byte VOICE , 5 - .byte VOL , 110*se_w043_mvl/mxv + .byte VOL , 110*se_m_leer_mvl/mxv .byte N01 , Cn3 , v040 .byte W03 .byte En3 @@ -91,15 +91,15 @@ se_w043_2: @******************************************************@ .align 2 -se_w043: +se_m_leer: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w043_pri @ Priority - .byte se_w043_rev @ Reverb. + .byte se_m_leer_pri @ Priority + .byte se_m_leer_rev @ Reverb. - .word se_w043_grp + .word se_m_leer_grp - .word se_w043_1 - .word se_w043_2 + .word se_m_leer_1 + .word se_m_leer_2 .end diff --git a/sound/songs/se_w122.s b/sound/songs/se_m_lick.s index 96ecf729f..df597d658 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, voicegroup111 - .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, voicegroup111 + .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 1808670a0..5e47ff2eb 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, voicegroup111 - .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, voicegroup111 + .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_w025.s b/sound/songs/se_m_mega_kick.s index d091bc26f..07e55602b 100644 --- a/sound/songs/se_w025.s +++ b/sound/songs/se_m_mega_kick.s @@ -1,31 +1,31 @@ .include "MPlayDef.s" - .equ se_w025_grp, voicegroup111 - .equ se_w025_pri, 4 - .equ se_w025_rev, reverb_set+50 - .equ se_w025_mvl, 127 - .equ se_w025_key, 0 - .equ se_w025_tbs, 1 - .equ se_w025_exg, 0 - .equ se_w025_cmp, 1 + .equ se_m_mega_kick_grp, voicegroup111 + .equ se_m_mega_kick_pri, 4 + .equ se_m_mega_kick_rev, reverb_set+50 + .equ se_m_mega_kick_mvl, 127 + .equ se_m_mega_kick_key, 0 + .equ se_m_mega_kick_tbs, 1 + .equ se_m_mega_kick_exg, 0 + .equ se_m_mega_kick_cmp, 1 .section .rodata - .global se_w025 + .global se_m_mega_kick .align 2 @********************** Track 1 **********************@ -se_w025_1: - .byte KEYSH , se_w025_key+0 - .byte TEMPO , 150*se_w025_tbs/2 +se_m_mega_kick_1: + .byte KEYSH , se_m_mega_kick_key+0 + .byte TEMPO , 150*se_m_mega_kick_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 63*se_w025_mvl/mxv + .byte VOL , 63*se_m_mega_kick_mvl/mxv .byte BEND , c_v-48 .byte N72 , Fn4 , v108 .byte W02 - .byte VOL , 68*se_w025_mvl/mxv + .byte VOL , 68*se_m_mega_kick_mvl/mxv .byte BEND , c_v-43 .byte W01 .byte PAN , c_v+5 @@ -33,31 +33,31 @@ se_w025_1: .byte BEND , c_v-38 .byte W02 .byte PAN , c_v+15 - .byte VOL , 70*se_w025_mvl/mxv + .byte VOL , 70*se_m_mega_kick_mvl/mxv .byte W01 .byte BEND , c_v-34 .byte W02 .byte PAN , c_v+6 - .byte VOL , 75*se_w025_mvl/mxv + .byte VOL , 75*se_m_mega_kick_mvl/mxv .byte BEND , c_v-30 .byte W03 .byte PAN , c_v-1 .byte BEND , c_v-28 .byte W01 - .byte VOL , 78*se_w025_mvl/mxv + .byte VOL , 78*se_m_mega_kick_mvl/mxv .byte W01 .byte BEND , c_v-24 .byte W01 .byte PAN , c_v-9 .byte W01 - .byte VOL , 85*se_w025_mvl/mxv + .byte VOL , 85*se_m_mega_kick_mvl/mxv .byte BEND , c_v-21 .byte W02 .byte PAN , c_v-15 .byte W01 .byte BEND , c_v-16 .byte W01 - .byte VOL , 90*se_w025_mvl/mxv + .byte VOL , 90*se_m_mega_kick_mvl/mxv .byte W01 .byte PAN , c_v-9 .byte BEND , c_v-12 @@ -103,32 +103,32 @@ se_w025_1: .byte W01 .byte BEND , c_v+35 .byte W02 - .byte VOL , 74*se_w025_mvl/mxv + .byte VOL , 74*se_m_mega_kick_mvl/mxv .byte PAN , c_v+15 .byte W01 .byte BEND , c_v+38 .byte W02 - .byte VOL , 58*se_w025_mvl/mxv + .byte VOL , 58*se_m_mega_kick_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+42 .byte W03 - .byte VOL , 47*se_w025_mvl/mxv + .byte VOL , 47*se_m_mega_kick_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v+45 .byte W02 .byte c_v+48 .byte W01 - .byte VOL , 34*se_w025_mvl/mxv + .byte VOL , 34*se_m_mega_kick_mvl/mxv .byte PAN , c_v-9 .byte W01 .byte BEND , c_v+50 .byte W02 - .byte VOL , 22*se_w025_mvl/mxv + .byte VOL , 22*se_m_mega_kick_mvl/mxv .byte PAN , c_v-15 .byte W01 .byte BEND , c_v+54 .byte W02 - .byte VOL , 6*se_w025_mvl/mxv + .byte VOL , 6*se_m_mega_kick_mvl/mxv .byte PAN , c_v-9 .byte BEND , c_v+58 .byte W03 @@ -137,14 +137,14 @@ se_w025_1: @******************************************************@ .align 2 -se_w025: +se_m_mega_kick: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w025_pri @ Priority - .byte se_w025_rev @ Reverb. + .byte se_m_mega_kick_pri @ Priority + .byte se_m_mega_kick_rev @ Reverb. - .word se_w025_grp + .word se_m_mega_kick_grp - .word se_w025_1 + .word se_m_mega_kick_1 .end diff --git a/sound/songs/se_w025b.s b/sound/songs/se_m_mega_kick2.s index 751be3773..f743d554e 100644 --- a/sound/songs/se_w025b.s +++ b/sound/songs/se_m_mega_kick2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w025b_grp, voicegroup111 - .equ se_w025b_pri, 4 - .equ se_w025b_rev, reverb_set+50 - .equ se_w025b_mvl, 127 - .equ se_w025b_key, 0 - .equ se_w025b_tbs, 1 - .equ se_w025b_exg, 0 - .equ se_w025b_cmp, 1 + .equ se_m_mega_kick2_grp, voicegroup111 + .equ se_m_mega_kick2_pri, 4 + .equ se_m_mega_kick2_rev, reverb_set+50 + .equ se_m_mega_kick2_mvl, 127 + .equ se_m_mega_kick2_key, 0 + .equ se_m_mega_kick2_tbs, 1 + .equ se_m_mega_kick2_exg, 0 + .equ se_m_mega_kick2_cmp, 1 .section .rodata - .global se_w025b + .global se_m_mega_kick2 .align 2 @********************** Track 1 **********************@ -se_w025b_1: - .byte KEYSH , se_w025b_key+0 - .byte TEMPO , 220*se_w025b_tbs/2 +se_m_mega_kick2_1: + .byte KEYSH , se_m_mega_kick2_key+0 + .byte TEMPO , 220*se_m_mega_kick2_tbs/2 .byte VOICE , 6 - .byte VOL , 110*se_w025b_mvl/mxv + .byte VOL , 110*se_m_mega_kick2_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -57,37 +57,37 @@ se_w025b_1: .byte W01 .byte BEND , c_v-8 .byte W01 - .byte VOL , 101*se_w025b_mvl/mxv + .byte VOL , 101*se_m_mega_kick2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v-15 .byte W02 .byte c_v-20 .byte W01 - .byte VOL , 83*se_w025b_mvl/mxv + .byte VOL , 83*se_m_mega_kick2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v-24 .byte W01 .byte c_v-30 .byte W01 - .byte VOL , 58*se_w025b_mvl/mxv + .byte VOL , 58*se_m_mega_kick2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-39 .byte W01 .byte c_v-53 .byte W02 - .byte VOL , 25*se_w025b_mvl/mxv + .byte VOL , 25*se_m_mega_kick2_mvl/mxv .byte BEND , c_v-64 .byte W24 .byte FINE @********************** Track 2 **********************@ -se_w025b_2: - .byte KEYSH , se_w025b_key+0 +se_m_mega_kick2_2: + .byte KEYSH , se_m_mega_kick2_key+0 .byte VOICE , 5 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 110*se_w025b_mvl/mxv + .byte VOL , 110*se_m_mega_kick2_mvl/mxv .byte PAN , c_v+9 .byte N03 , Gs2 , v092 .byte W06 @@ -100,29 +100,29 @@ se_w025b_2: .byte PAN , c_v+0 .byte N13 .byte W04 - .byte VOL , 101*se_w025b_mvl/mxv + .byte VOL , 101*se_m_mega_kick2_mvl/mxv .byte W02 - .byte 83*se_w025b_mvl/mxv + .byte 83*se_m_mega_kick2_mvl/mxv .byte W02 - .byte 58*se_w025b_mvl/mxv + .byte 58*se_m_mega_kick2_mvl/mxv .byte W02 .byte W01 - .byte 25*se_w025b_mvl/mxv + .byte 25*se_m_mega_kick2_mvl/mxv .byte W23 .byte FINE @******************************************************@ .align 2 -se_w025b: +se_m_mega_kick2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w025b_pri @ Priority - .byte se_w025b_rev @ Reverb. + .byte se_m_mega_kick2_pri @ Priority + .byte se_m_mega_kick2_rev @ Reverb. - .word se_w025b_grp + .word se_m_mega_kick2_grp - .word se_w025b_1 - .word se_w025b_2 + .word se_m_mega_kick2_1 + .word se_m_mega_kick2_2 .end diff --git a/sound/songs/se_w118.s b/sound/songs/se_m_metronome.s index dd9ccc783..7646adac9 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, voicegroup111 - .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, voicegroup111 + .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 ee77f93bd..7192d62df 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, voicegroup111 - .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, voicegroup111 + .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 1ff5e8ceb..6de977c01 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, voicegroup111 - .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, voicegroup111 + .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 9a747aef8..57a751101 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, voicegroup111 - .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, voicegroup111 + .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 c238c9094..fede198ef 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, voicegroup111 - .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, voicegroup111 + .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 0455028ce..e4790850e 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, voicegroup111 - .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, voicegroup111 + .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 189b5a842..224184a10 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, voicegroup111 - .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, voicegroup111 + .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_w006.s b/sound/songs/se_m_pay_day.s index 01d8c9ce9..af55dcb0e 100644 --- a/sound/songs/se_w006.s +++ b/sound/songs/se_m_pay_day.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w006_grp, voicegroup111 - .equ se_w006_pri, 4 - .equ se_w006_rev, reverb_set+50 - .equ se_w006_mvl, 127 - .equ se_w006_key, 0 - .equ se_w006_tbs, 1 - .equ se_w006_exg, 0 - .equ se_w006_cmp, 1 + .equ se_m_pay_day_grp, voicegroup111 + .equ se_m_pay_day_pri, 4 + .equ se_m_pay_day_rev, reverb_set+50 + .equ se_m_pay_day_mvl, 127 + .equ se_m_pay_day_key, 0 + .equ se_m_pay_day_tbs, 1 + .equ se_m_pay_day_exg, 0 + .equ se_m_pay_day_cmp, 1 .section .rodata - .global se_w006 + .global se_m_pay_day .align 2 @********************** Track 1 **********************@ -se_w006_1: - .byte KEYSH , se_w006_key+0 - .byte TEMPO , 150*se_w006_tbs/2 +se_m_pay_day_1: + .byte KEYSH , se_m_pay_day_key+0 + .byte TEMPO , 150*se_m_pay_day_tbs/2 .byte VOICE , 39 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 95*se_w006_mvl/mxv + .byte VOL , 95*se_m_pay_day_mvl/mxv .byte BEND , c_v+0 .byte N01 , An5 , v100 .byte W01 @@ -29,19 +29,19 @@ se_w006_1: .byte W01 .byte N06 , Gn5 , v100 .byte W01 - .byte VOL , 85*se_w006_mvl/mxv + .byte VOL , 85*se_m_pay_day_mvl/mxv .byte PAN , c_v-13 .byte W01 - .byte VOL , 59*se_w006_mvl/mxv + .byte VOL , 59*se_m_pay_day_mvl/mxv .byte PAN , c_v+11 .byte W02 - .byte VOL , 33*se_w006_mvl/mxv + .byte VOL , 33*se_m_pay_day_mvl/mxv .byte PAN , c_v-14 .byte W01 - .byte VOL , 5*se_w006_mvl/mxv + .byte VOL , 5*se_m_pay_day_mvl/mxv .byte PAN , c_v+11 .byte W03 - .byte VOL , 95*se_w006_mvl/mxv + .byte VOL , 95*se_m_pay_day_mvl/mxv .byte PAN , c_v+1 .byte N01 , An5 .byte W02 @@ -60,33 +60,33 @@ se_w006_1: .byte c_v-13 .byte W01 .byte c_v+11 - .byte VOL , 85*se_w006_mvl/mxv + .byte VOL , 85*se_m_pay_day_mvl/mxv .byte W01 .byte PAN , c_v-14 - .byte VOL , 77*se_w006_mvl/mxv + .byte VOL , 77*se_m_pay_day_mvl/mxv .byte W01 .byte PAN , c_v+11 - .byte VOL , 69*se_w006_mvl/mxv + .byte VOL , 69*se_m_pay_day_mvl/mxv .byte W02 .byte PAN , c_v-13 - .byte VOL , 59*se_w006_mvl/mxv + .byte VOL , 59*se_m_pay_day_mvl/mxv .byte W01 .byte PAN , c_v+11 - .byte VOL , 52*se_w006_mvl/mxv + .byte VOL , 52*se_m_pay_day_mvl/mxv .byte W01 .byte PAN , c_v-14 - .byte VOL , 41*se_w006_mvl/mxv + .byte VOL , 41*se_m_pay_day_mvl/mxv .byte W01 - .byte 33*se_w006_mvl/mxv + .byte 33*se_m_pay_day_mvl/mxv .byte PAN , c_v+11 .byte W01 - .byte VOL , 23*se_w006_mvl/mxv + .byte VOL , 23*se_m_pay_day_mvl/mxv .byte PAN , c_v-14 .byte W02 - .byte VOL , 14*se_w006_mvl/mxv + .byte VOL , 14*se_m_pay_day_mvl/mxv .byte PAN , c_v+11 .byte W01 - .byte VOL , 5*se_w006_mvl/mxv + .byte VOL , 5*se_m_pay_day_mvl/mxv .byte PAN , c_v-13 .byte W05 .byte FINE @@ -94,14 +94,14 @@ se_w006_1: @******************************************************@ .align 2 -se_w006: +se_m_pay_day: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w006_pri @ Priority - .byte se_w006_rev @ Reverb. + .byte se_m_pay_day_pri @ Priority + .byte se_m_pay_day_rev @ Reverb. - .word se_w006_grp + .word se_m_pay_day_grp - .word se_w006_1 + .word se_m_pay_day_1 .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..f18ad5cf7 --- /dev/null +++ b/sound/songs/se_m_perish_song.s @@ -0,0 +1,221 @@ + .include "MPlayDef.s" + + .equ se_m_perish_song_grp, voicegroup111 + .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 fdfda4f4a..7da1292a2 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, voicegroup111 - .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, voicegroup111 + .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..4b8dc46eb --- /dev/null +++ b/sound/songs/se_m_poison_powder.s @@ -0,0 +1,58 @@ + .include "MPlayDef.s" + + .equ se_m_poison_powder_grp, voicegroup111 + .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 bedbdaab9..6b877a246 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, voicegroup111 - .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, voicegroup111 + .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 a22bf1eed..8ba41214e 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, voicegroup111 - .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, voicegroup111 + .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..ee893ad90 --- /dev/null +++ b/sound/songs/se_m_rain_dance.s @@ -0,0 +1,116 @@ + .include "MPlayDef.s" + + .equ se_m_rain_dance_grp, voicegroup111 + .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_w013.s b/sound/songs/se_m_razor_wind.s index 332205c9c..2761a2b0b 100644 --- a/sound/songs/se_w013.s +++ b/sound/songs/se_m_razor_wind.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w013_grp, voicegroup111 - .equ se_w013_pri, 4 - .equ se_w013_rev, reverb_set+50 - .equ se_w013_mvl, 127 - .equ se_w013_key, 0 - .equ se_w013_tbs, 1 - .equ se_w013_exg, 0 - .equ se_w013_cmp, 1 + .equ se_m_razor_wind_grp, voicegroup111 + .equ se_m_razor_wind_pri, 4 + .equ se_m_razor_wind_rev, reverb_set+50 + .equ se_m_razor_wind_mvl, 127 + .equ se_m_razor_wind_key, 0 + .equ se_m_razor_wind_tbs, 1 + .equ se_m_razor_wind_exg, 0 + .equ se_m_razor_wind_cmp, 1 .section .rodata - .global se_w013 + .global se_m_razor_wind .align 2 @********************** Track 1 **********************@ -se_w013_1: - .byte KEYSH , se_w013_key+0 - .byte TEMPO , 220*se_w013_tbs/2 +se_m_razor_wind_1: + .byte KEYSH , se_m_razor_wind_key+0 + .byte TEMPO , 220*se_m_razor_wind_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w013_mvl/mxv + .byte VOL , 110*se_m_razor_wind_mvl/mxv .byte PAN , c_v+14 .byte BEND , c_v+0 .byte N09 , Cn5 , v092 @@ -57,11 +57,11 @@ se_w013_1: @********************** Track 2 **********************@ -se_w013_2: - .byte KEYSH , se_w013_key+0 +se_m_razor_wind_2: + .byte KEYSH , se_m_razor_wind_key+0 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 110*se_w013_mvl/mxv + .byte VOL , 110*se_m_razor_wind_mvl/mxv .byte N06 , Fn3 , v040 .byte W09 .byte N24 , Gn3 @@ -72,15 +72,15 @@ se_w013_2: @******************************************************@ .align 2 -se_w013: +se_m_razor_wind: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w013_pri @ Priority - .byte se_w013_rev @ Reverb. + .byte se_m_razor_wind_pri @ Priority + .byte se_m_razor_wind_rev @ Reverb. - .word se_w013_grp + .word se_m_razor_wind_grp - .word se_w013_1 - .word se_w013_2 + .word se_m_razor_wind_1 + .word se_m_razor_wind_2 .end diff --git a/sound/songs/se_m_razor_wind2.s b/sound/songs/se_m_razor_wind2.s new file mode 100644 index 000000000..b707fd612 --- /dev/null +++ b/sound/songs/se_m_razor_wind2.s @@ -0,0 +1,62 @@ + .include "MPlayDef.s" + + .equ se_m_razor_wind2_grp, voicegroup111 + .equ se_m_razor_wind2_pri, 4 + .equ se_m_razor_wind2_rev, reverb_set+50 + .equ se_m_razor_wind2_mvl, 127 + .equ se_m_razor_wind2_key, 0 + .equ se_m_razor_wind2_tbs, 1 + .equ se_m_razor_wind2_exg, 0 + .equ se_m_razor_wind2_cmp, 1 + + .section .rodata + .global se_m_razor_wind2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_razor_wind2_1: + .byte KEYSH , se_m_razor_wind2_key+0 + .byte TEMPO , 250*se_m_razor_wind2_tbs/2 + .byte VOICE , 22 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 90*se_m_razor_wind2_mvl/mxv + .byte BEND , c_v+0 + .byte N14 , An4 , v108 + .byte W03 + .byte PAN , c_v+5 + .byte BEND , c_v+6 + .byte W01 + .byte VOL , 80*se_m_razor_wind2_mvl/mxv + .byte W02 + .byte PAN , c_v+15 + .byte BEND , c_v+1 + .byte W01 + .byte VOL , 64*se_m_razor_wind2_mvl/mxv + .byte W02 + .byte PAN , c_v+6 + .byte VOL , 38*se_m_razor_wind2_mvl/mxv + .byte BEND , c_v-9 + .byte W02 + .byte c_v-34 + .byte W01 + .byte PAN , c_v-1 + .byte VOL , 11*se_m_razor_wind2_mvl/mxv + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_razor_wind2: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_razor_wind2_pri @ Priority + .byte se_m_razor_wind2_rev @ Reverb. + + .word se_m_razor_wind2_grp + + .word se_m_razor_wind2_1 + + .end diff --git a/sound/songs/se_w115.s b/sound/songs/se_m_reflect.s index 2b522c738..cdee688a0 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, voicegroup111 - .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, voicegroup111 + .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 cc451e1ec..e66a9602e 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, voicegroup111 - .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, voicegroup111 + .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 6176f8059..6c6146835 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, voicegroup111 - .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, voicegroup111 + .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..d73cb6040 --- /dev/null +++ b/sound/songs/se_m_sacred_fire.s @@ -0,0 +1,105 @@ + .include "MPlayDef.s" + + .equ se_m_sacred_fire_grp, voicegroup111 + .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..8f47c1233 --- /dev/null +++ b/sound/songs/se_m_sacred_fire2.s @@ -0,0 +1,180 @@ + .include "MPlayDef.s" + + .equ se_m_sacred_fire2_grp, voicegroup111 + .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_w028.s b/sound/songs/se_m_sand_attack.s index 7232ba420..dfc844e68 100644 --- a/sound/songs/se_w028.s +++ b/sound/songs/se_m_sand_attack.s @@ -1,34 +1,34 @@ .include "MPlayDef.s" - .equ se_w028_grp, voicegroup111 - .equ se_w028_pri, 4 - .equ se_w028_rev, reverb_set+50 - .equ se_w028_mvl, 127 - .equ se_w028_key, 0 - .equ se_w028_tbs, 1 - .equ se_w028_exg, 0 - .equ se_w028_cmp, 1 + .equ se_m_sand_attack_grp, voicegroup111 + .equ se_m_sand_attack_pri, 4 + .equ se_m_sand_attack_rev, reverb_set+50 + .equ se_m_sand_attack_mvl, 127 + .equ se_m_sand_attack_key, 0 + .equ se_m_sand_attack_tbs, 1 + .equ se_m_sand_attack_exg, 0 + .equ se_m_sand_attack_cmp, 1 .section .rodata - .global se_w028 + .global se_m_sand_attack .align 2 @********************** Track 1 **********************@ -se_w028_1: - .byte KEYSH , se_w028_key+0 - .byte TEMPO , 150*se_w028_tbs/2 +se_m_sand_attack_1: + .byte KEYSH , se_m_sand_attack_key+0 + .byte TEMPO , 150*se_m_sand_attack_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w028_mvl/mxv + .byte VOL , 110*se_m_sand_attack_mvl/mxv .byte BEND , c_v+0 .byte N02 , Gn5 , v092 .byte W02 .byte Cn5 .byte W04 .byte VOICE , 36 - .byte VOL , 84*se_w028_mvl/mxv + .byte VOL , 84*se_m_sand_attack_mvl/mxv .byte PAN , c_v+5 .byte N15 , Gn5 , v040 .byte W01 @@ -38,7 +38,7 @@ se_w028_1: .byte W01 .byte c_v-10 .byte W01 - .byte VOL , 94*se_w028_mvl/mxv + .byte VOL , 94*se_m_sand_attack_mvl/mxv .byte PAN , c_v+5 .byte W02 .byte c_v-10 @@ -47,18 +47,18 @@ se_w028_1: .byte W01 .byte c_v-10 .byte W01 - .byte VOL , 110*se_w028_mvl/mxv + .byte VOL , 110*se_m_sand_attack_mvl/mxv .byte PAN , c_v+5 .byte W01 .byte c_v-10 .byte W02 - .byte VOL , 96*se_w028_mvl/mxv + .byte VOL , 96*se_m_sand_attack_mvl/mxv .byte PAN , c_v+5 .byte W01 - .byte VOL , 68*se_w028_mvl/mxv + .byte VOL , 68*se_m_sand_attack_mvl/mxv .byte PAN , c_v-10 .byte W01 - .byte VOL , 15*se_w028_mvl/mxv + .byte VOL , 15*se_m_sand_attack_mvl/mxv .byte PAN , c_v+5 .byte W01 .byte c_v-10 @@ -67,10 +67,10 @@ se_w028_1: @********************** Track 2 **********************@ -se_w028_2: - .byte KEYSH , se_w028_key+0 +se_m_sand_attack_2: + .byte KEYSH , se_m_sand_attack_key+0 .byte VOICE , 25 - .byte VOL , 110*se_w028_mvl/mxv + .byte VOL , 110*se_m_sand_attack_mvl/mxv .byte PAN , c_v+0 .byte N01 , Cn3 , v040 .byte W02 @@ -81,15 +81,15 @@ se_w028_2: @******************************************************@ .align 2 -se_w028: +se_m_sand_attack: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w028_pri @ Priority - .byte se_w028_rev @ Reverb. + .byte se_m_sand_attack_pri @ Priority + .byte se_m_sand_attack_rev @ Reverb. - .word se_w028_grp + .word se_m_sand_attack_grp - .word se_w028_1 - .word se_w028_2 + .word se_m_sand_attack_1 + .word se_m_sand_attack_2 .end diff --git a/sound/songs/se_w328.s b/sound/songs/se_m_sand_tomb.s index 4395ea733..91fec5f09 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, voicegroup111 - .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, voicegroup111 + .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 debba1c75..1fad80418 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, voicegroup111 - .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, voicegroup111 + .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_w010.s b/sound/songs/se_m_scratch.s index f0c12048d..a69ab05f2 100644 --- a/sound/songs/se_w010.s +++ b/sound/songs/se_m_scratch.s @@ -1,40 +1,40 @@ .include "MPlayDef.s" - .equ se_w010_grp, voicegroup111 - .equ se_w010_pri, 4 - .equ se_w010_rev, reverb_set+50 - .equ se_w010_mvl, 127 - .equ se_w010_key, 0 - .equ se_w010_tbs, 1 - .equ se_w010_exg, 0 - .equ se_w010_cmp, 1 + .equ se_m_scratch_grp, voicegroup111 + .equ se_m_scratch_pri, 4 + .equ se_m_scratch_rev, reverb_set+50 + .equ se_m_scratch_mvl, 127 + .equ se_m_scratch_key, 0 + .equ se_m_scratch_tbs, 1 + .equ se_m_scratch_exg, 0 + .equ se_m_scratch_cmp, 1 .section .rodata - .global se_w010 + .global se_m_scratch .align 2 @********************** Track 1 **********************@ -se_w010_1: - .byte KEYSH , se_w010_key+0 - .byte TEMPO , 220*se_w010_tbs/2 +se_m_scratch_1: + .byte KEYSH , se_m_scratch_key+0 + .byte TEMPO , 220*se_m_scratch_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+14 - .byte VOL , 42*se_w010_mvl/mxv + .byte VOL , 42*se_m_scratch_mvl/mxv .byte BEND , c_v+39 .byte N10 , Gn5 , v092 .byte W01 - .byte VOL , 55*se_w010_mvl/mxv + .byte VOL , 55*se_m_scratch_mvl/mxv .byte W01 - .byte 71*se_w010_mvl/mxv + .byte 71*se_m_scratch_mvl/mxv .byte BEND , c_v+23 .byte W01 .byte PAN , c_v-15 - .byte VOL , 86*se_w010_mvl/mxv + .byte VOL , 86*se_m_scratch_mvl/mxv .byte BEND , c_v+0 .byte W01 - .byte VOL , 110*se_w010_mvl/mxv + .byte VOL , 110*se_m_scratch_mvl/mxv .byte BEND , c_v-23 .byte W02 .byte PAN , c_v+0 @@ -57,14 +57,14 @@ se_w010_1: @******************************************************@ .align 2 -se_w010: +se_m_scratch: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w010_pri @ Priority - .byte se_w010_rev @ Reverb. + .byte se_m_scratch_pri @ Priority + .byte se_m_scratch_rev @ Reverb. - .word se_w010_grp + .word se_m_scratch_grp - .word se_w010_1 + .word se_m_scratch_1 .end diff --git a/sound/songs/se_w103.s b/sound/songs/se_m_screech.s index 010c02a41..e7f5d73fb 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, voicegroup111 - .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, voicegroup111 + .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..6be8d1326 --- /dev/null +++ b/sound/songs/se_m_self_destruct.s @@ -0,0 +1,74 @@ + .include "MPlayDef.s" + + .equ se_m_self_destruct_grp, voicegroup111 + .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 16d8c2fdb..ed7ab25ce 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, voicegroup111 - .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, voicegroup111 + .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..34c197d7b --- /dev/null +++ b/sound/songs/se_m_sketch.s @@ -0,0 +1,68 @@ + .include "MPlayDef.s" + + .equ se_m_sketch_grp, voicegroup111 + .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..ef55a7eda --- /dev/null +++ b/sound/songs/se_m_sky_uppercut.s @@ -0,0 +1,103 @@ + .include "MPlayDef.s" + + .equ se_m_sky_uppercut_grp, voicegroup111 + .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 86f01dc56..1e6395eaa 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, voicegroup111 - .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, voicegroup111 + .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 ac0d8cf09..b50d353ee 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, voicegroup111 - .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, voicegroup111 + .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 00e1617b6..f841afb38 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, voicegroup111 - .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, voicegroup111 + .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 f4164d724..9099534d8 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, voicegroup111 - .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, voicegroup111 + .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 61297bcd6..d3da1ac1e 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, voicegroup111 - .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, voicegroup111 + .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 5e1cfc5f2..505ce2a1d 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, voicegroup111 - .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, voicegroup111 + .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 248ca6f1f..0ef1cde27 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, voicegroup111 - .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, voicegroup111 + .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 18eef9015..467d7a2bd 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, voicegroup111 - .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, voicegroup111 + .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 268f706ca..08e3760fb 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, voicegroup111 - .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, voicegroup111 + .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 4d6225c29..6f548bb46 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, voicegroup111 - .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, voicegroup111 + .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..4d4f53bfc --- /dev/null +++ b/sound/songs/se_m_swagger.s @@ -0,0 +1,77 @@ + .include "MPlayDef.s" + + .equ se_m_swagger_grp, voicegroup111 + .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 8d80ac30d..4f308e6a7 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, voicegroup111 - .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, voicegroup111 + .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 0d9bd6712..1e2d93342 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, voicegroup111 - .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, voicegroup111 + .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 47930cc7f..bfc881799 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, voicegroup111 - .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, voicegroup111 + .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_w014.s b/sound/songs/se_m_swords_dance.s index 796aecee4..8db47fec0 100644 --- a/sound/songs/se_w014.s +++ b/sound/songs/se_m_swords_dance.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w014_grp, voicegroup111 - .equ se_w014_pri, 4 - .equ se_w014_rev, reverb_set+50 - .equ se_w014_mvl, 127 - .equ se_w014_key, 0 - .equ se_w014_tbs, 1 - .equ se_w014_exg, 0 - .equ se_w014_cmp, 1 + .equ se_m_swords_dance_grp, voicegroup111 + .equ se_m_swords_dance_pri, 4 + .equ se_m_swords_dance_rev, reverb_set+50 + .equ se_m_swords_dance_mvl, 127 + .equ se_m_swords_dance_key, 0 + .equ se_m_swords_dance_tbs, 1 + .equ se_m_swords_dance_exg, 0 + .equ se_m_swords_dance_cmp, 1 .section .rodata - .global se_w014 + .global se_m_swords_dance .align 2 @********************** Track 1 **********************@ -se_w014_1: - .byte KEYSH , se_w014_key+0 - .byte TEMPO , 150*se_w014_tbs/2 +se_m_swords_dance_1: + .byte KEYSH , se_m_swords_dance_key+0 + .byte TEMPO , 150*se_m_swords_dance_tbs/2 .byte VOICE , 28 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 100*se_w014_mvl/mxv + .byte VOL , 100*se_m_swords_dance_mvl/mxv .byte BEND , c_v+0 .byte N01 , Fn5 , v100 .byte W01 @@ -46,25 +46,25 @@ se_w014_1: .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 95*se_w014_mvl/mxv + .byte VOL , 95*se_m_swords_dance_mvl/mxv .byte PAN , c_v+0 .byte W01 - .byte VOL , 92*se_w014_mvl/mxv + .byte VOL , 92*se_m_swords_dance_mvl/mxv .byte PAN , c_v+5 .byte W01 - .byte VOL , 87*se_w014_mvl/mxv + .byte VOL , 87*se_m_swords_dance_mvl/mxv .byte PAN , c_v+0 .byte W01 - .byte VOL , 79*se_w014_mvl/mxv + .byte VOL , 79*se_m_swords_dance_mvl/mxv .byte PAN , c_v-4 .byte W01 - .byte VOL , 66*se_w014_mvl/mxv + .byte VOL , 66*se_m_swords_dance_mvl/mxv .byte PAN , c_v+0 .byte W02 - .byte VOL , 58*se_w014_mvl/mxv + .byte VOL , 58*se_m_swords_dance_mvl/mxv .byte W01 .byte VOICE , 22 - .byte VOL , 100*se_w014_mvl/mxv + .byte VOL , 100*se_m_swords_dance_mvl/mxv .byte N10 , Cn4 , v092 .byte W01 .byte BEND , c_v+3 @@ -74,24 +74,24 @@ se_w014_1: .byte PAN , c_v-1 .byte BEND , c_v+7 .byte W02 - .byte VOL , 96*se_w014_mvl/mxv + .byte VOL , 96*se_m_swords_dance_mvl/mxv .byte BEND , c_v+12 .byte W01 - .byte VOL , 90*se_w014_mvl/mxv + .byte VOL , 90*se_m_swords_dance_mvl/mxv .byte PAN , c_v-3 .byte BEND , c_v+16 .byte W01 - .byte VOL , 84*se_w014_mvl/mxv + .byte VOL , 84*se_m_swords_dance_mvl/mxv .byte BEND , c_v+20 .byte W01 - .byte VOL , 70*se_w014_mvl/mxv + .byte VOL , 70*se_m_swords_dance_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+26 .byte W01 - .byte VOL , 61*se_w014_mvl/mxv + .byte VOL , 61*se_m_swords_dance_mvl/mxv .byte BEND , c_v+32 .byte W03 - .byte VOL , 100*se_w014_mvl/mxv + .byte VOL , 100*se_m_swords_dance_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N10 @@ -103,24 +103,24 @@ se_w014_1: .byte PAN , c_v+2 .byte BEND , c_v+7 .byte W02 - .byte VOL , 96*se_w014_mvl/mxv + .byte VOL , 96*se_m_swords_dance_mvl/mxv .byte BEND , c_v+12 .byte W01 - .byte VOL , 90*se_w014_mvl/mxv + .byte VOL , 90*se_m_swords_dance_mvl/mxv .byte PAN , c_v+5 .byte BEND , c_v+16 .byte W01 - .byte VOL , 84*se_w014_mvl/mxv + .byte VOL , 84*se_m_swords_dance_mvl/mxv .byte BEND , c_v+20 .byte W01 - .byte VOL , 70*se_w014_mvl/mxv + .byte VOL , 70*se_m_swords_dance_mvl/mxv .byte PAN , c_v+7 .byte BEND , c_v+26 .byte W01 - .byte VOL , 61*se_w014_mvl/mxv + .byte VOL , 61*se_m_swords_dance_mvl/mxv .byte BEND , c_v+32 .byte W03 - .byte VOL , 100*se_w014_mvl/mxv + .byte VOL , 100*se_m_swords_dance_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N16 @@ -132,38 +132,38 @@ se_w014_1: .byte PAN , c_v+3 .byte BEND , c_v+7 .byte W02 - .byte VOL , 96*se_w014_mvl/mxv + .byte VOL , 96*se_m_swords_dance_mvl/mxv .byte BEND , c_v+12 .byte W01 - .byte VOL , 90*se_w014_mvl/mxv + .byte VOL , 90*se_m_swords_dance_mvl/mxv .byte PAN , c_v-2 .byte BEND , c_v+16 .byte W01 - .byte VOL , 84*se_w014_mvl/mxv + .byte VOL , 84*se_m_swords_dance_mvl/mxv .byte BEND , c_v+20 .byte W01 - .byte VOL , 70*se_w014_mvl/mxv + .byte VOL , 70*se_m_swords_dance_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+26 .byte W01 - .byte VOL , 61*se_w014_mvl/mxv + .byte VOL , 61*se_m_swords_dance_mvl/mxv .byte BEND , c_v+32 .byte W02 - .byte VOL , 56*se_w014_mvl/mxv + .byte VOL , 56*se_m_swords_dance_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+36 .byte W01 - .byte VOL , 48*se_w014_mvl/mxv + .byte VOL , 48*se_m_swords_dance_mvl/mxv .byte BEND , c_v+42 .byte W01 - .byte VOL , 37*se_w014_mvl/mxv + .byte VOL , 37*se_m_swords_dance_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v+48 .byte W01 - .byte VOL , 25*se_w014_mvl/mxv + .byte VOL , 25*se_m_swords_dance_mvl/mxv .byte BEND , c_v+56 .byte W01 - .byte VOL , 11*se_w014_mvl/mxv + .byte VOL , 11*se_m_swords_dance_mvl/mxv .byte PAN , c_v-11 .byte BEND , c_v+63 .byte W02 @@ -171,23 +171,23 @@ se_w014_1: @********************** Track 2 **********************@ -se_w014_2: - .byte KEYSH , se_w014_key+0 +se_m_swords_dance_2: + .byte KEYSH , se_m_swords_dance_key+0 .byte VOICE , 25 - .byte VOL , 100*se_w014_mvl/mxv + .byte VOL , 100*se_m_swords_dance_mvl/mxv .byte N04 , Cn3 , v040 .byte W04 .byte N14 , Gs4 .byte W08 - .byte VOL , 89*se_w014_mvl/mxv + .byte VOL , 89*se_m_swords_dance_mvl/mxv .byte W01 - .byte 72*se_w014_mvl/mxv + .byte 72*se_m_swords_dance_mvl/mxv .byte W01 - .byte 46*se_w014_mvl/mxv + .byte 46*se_m_swords_dance_mvl/mxv .byte W01 - .byte 25*se_w014_mvl/mxv + .byte 25*se_m_swords_dance_mvl/mxv .byte W01 - .byte 11*se_w014_mvl/mxv + .byte 11*se_m_swords_dance_mvl/mxv .byte W08 .byte W12 .byte W12 @@ -197,15 +197,15 @@ se_w014_2: @******************************************************@ .align 2 -se_w014: +se_m_swords_dance: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w014_pri @ Priority - .byte se_w014_rev @ Reverb. + .byte se_m_swords_dance_pri @ Priority + .byte se_m_swords_dance_rev @ Reverb. - .word se_w014_grp + .word se_m_swords_dance_grp - .word se_w014_1 - .word se_w014_2 + .word se_m_swords_dance_1 + .word se_m_swords_dance_2 .end diff --git a/sound/songs/se_m_tail_whip.s b/sound/songs/se_m_tail_whip.s new file mode 100644 index 000000000..b9a979a6c --- /dev/null +++ b/sound/songs/se_m_tail_whip.s @@ -0,0 +1,63 @@ + .include "MPlayDef.s" + + .equ se_m_tail_whip_grp, voicegroup111 + .equ se_m_tail_whip_pri, 4 + .equ se_m_tail_whip_rev, reverb_set+50 + .equ se_m_tail_whip_mvl, 127 + .equ se_m_tail_whip_key, 0 + .equ se_m_tail_whip_tbs, 1 + .equ se_m_tail_whip_exg, 0 + .equ se_m_tail_whip_cmp, 1 + + .section .rodata + .global se_m_tail_whip + .align 2 + +@********************** Track 1 **********************@ + +se_m_tail_whip_1: + .byte KEYSH , se_m_tail_whip_key+0 + .byte TEMPO , 150*se_m_tail_whip_tbs/2 + .byte VOICE , 15 + .byte BENDR , 12 + .byte PAN , c_v+18 + .byte VOL , 48*se_m_tail_whip_mvl/mxv + .byte BEND , c_v-48 + .byte N04 , Gn2 , v127 + .byte W01 + .byte VOL , 81*se_m_tail_whip_mvl/mxv + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 110*se_m_tail_whip_mvl/mxv + .byte BEND , c_v+16 + .byte W01 + .byte c_v+0 + .byte W04 + .byte VOL , 48*se_m_tail_whip_mvl/mxv + .byte PAN , c_v-16 + .byte BEND , c_v-48 + .byte N04 , An2 + .byte W01 + .byte VOL , 81*se_m_tail_whip_mvl/mxv + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 110*se_m_tail_whip_mvl/mxv + .byte BEND , c_v+16 + .byte W15 + .byte VOL , 110*se_m_tail_whip_mvl/mxv + .byte FINE + +@******************************************************@ + .align 2 + +se_m_tail_whip: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_tail_whip_pri @ Priority + .byte se_m_tail_whip_rev @ Reverb. + + .word se_m_tail_whip_grp + + .word se_m_tail_whip_1 + + .end diff --git a/sound/songs/se_w036.s b/sound/songs/se_m_take_down.s index ace942b7d..2beb3ad58 100644 --- a/sound/songs/se_w036.s +++ b/sound/songs/se_m_take_down.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w036_grp, voicegroup111 - .equ se_w036_pri, 4 - .equ se_w036_rev, reverb_set+50 - .equ se_w036_mvl, 127 - .equ se_w036_key, 0 - .equ se_w036_tbs, 1 - .equ se_w036_exg, 0 - .equ se_w036_cmp, 1 + .equ se_m_take_down_grp, voicegroup111 + .equ se_m_take_down_pri, 4 + .equ se_m_take_down_rev, reverb_set+50 + .equ se_m_take_down_mvl, 127 + .equ se_m_take_down_key, 0 + .equ se_m_take_down_tbs, 1 + .equ se_m_take_down_exg, 0 + .equ se_m_take_down_cmp, 1 .section .rodata - .global se_w036 + .global se_m_take_down .align 2 @********************** Track 1 **********************@ -se_w036_1: - .byte KEYSH , se_w036_key+0 - .byte TEMPO , 150*se_w036_tbs/2 +se_m_take_down_1: + .byte KEYSH , se_m_take_down_key+0 + .byte TEMPO , 150*se_m_take_down_tbs/2 .byte VOICE , 2 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 105*se_w036_mvl/mxv + .byte VOL , 105*se_m_take_down_mvl/mxv .byte BEND , c_v-48 .byte N10 , Gn0 , v127 .byte W02 @@ -42,7 +42,7 @@ se_w036_1: .byte PAN , c_v+19 .byte W03 .byte c_v+0 - .byte VOL , 105*se_w036_mvl/mxv + .byte VOL , 105*se_m_take_down_mvl/mxv .byte BEND , c_v-32 .byte N10 .byte W02 @@ -63,7 +63,7 @@ se_w036_1: .byte PAN , c_v-20 .byte W03 .byte c_v+0 - .byte VOL , 105*se_w036_mvl/mxv + .byte VOL , 105*se_m_take_down_mvl/mxv .byte BEND , c_v-16 .byte N10 .byte W02 @@ -82,14 +82,14 @@ se_w036_1: @******************************************************@ .align 2 -se_w036: +se_m_take_down: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w036_pri @ Priority - .byte se_w036_rev @ Reverb. + .byte se_m_take_down_pri @ Priority + .byte se_m_take_down_rev @ Reverb. - .word se_w036_grp + .word se_m_take_down_grp - .word se_w036_1 + .word se_m_take_down_1 .end diff --git a/sound/songs/se_w298.s b/sound/songs/se_m_teeter_dance.s index 0add056de..3a5b904b8 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, voicegroup111 - .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, voicegroup111 + .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 df2b316e1..b8703231d 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, voicegroup111 - .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, voicegroup111 + .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 a52693608..a4670878e 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, voicegroup111 - .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, voicegroup111 + .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 3fc4960a8..ac1757f50 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, voicegroup111 - .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, voicegroup111 + .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 c660825a6..74ad17c44 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, voicegroup111 - .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, voicegroup111 + .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 badb9a746..6dd5423f5 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, voicegroup111 - .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, voicegroup111 + .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 ccc4724bd..07a9feaba 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, voicegroup111 - .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, voicegroup111 + .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 1971de63d..9967184c9 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, voicegroup111 - .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, voicegroup111 + .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 8b3782b97..22c0625d4 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, voicegroup111 - .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, voicegroup111 + .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 086a60a58..cbf96647e 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, voicegroup111 - .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, voicegroup111 + .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_w011.s b/sound/songs/se_m_vicegrip.s index bc5c16716..1c2397486 100644 --- a/sound/songs/se_w011.s +++ b/sound/songs/se_m_vicegrip.s @@ -1,41 +1,41 @@ .include "MPlayDef.s" - .equ se_w011_grp, voicegroup111 - .equ se_w011_pri, 4 - .equ se_w011_rev, reverb_set+50 - .equ se_w011_mvl, 127 - .equ se_w011_key, 0 - .equ se_w011_tbs, 1 - .equ se_w011_exg, 0 - .equ se_w011_cmp, 1 + .equ se_m_vicegrip_grp, voicegroup111 + .equ se_m_vicegrip_pri, 4 + .equ se_m_vicegrip_rev, reverb_set+50 + .equ se_m_vicegrip_mvl, 127 + .equ se_m_vicegrip_key, 0 + .equ se_m_vicegrip_tbs, 1 + .equ se_m_vicegrip_exg, 0 + .equ se_m_vicegrip_cmp, 1 .section .rodata - .global se_w011 + .global se_m_vicegrip .align 2 @********************** Track 1 **********************@ -se_w011_1: - .byte KEYSH , se_w011_key+0 - .byte TEMPO , 220*se_w011_tbs/2 +se_m_vicegrip_1: + .byte KEYSH , se_m_vicegrip_key+0 + .byte TEMPO , 220*se_m_vicegrip_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+4 - .byte VOL , 42*se_w011_mvl/mxv + .byte VOL , 42*se_m_vicegrip_mvl/mxv .byte BEND , c_v+39 .byte N06 , Cn5 , v084 .byte W01 - .byte VOL , 55*se_w011_mvl/mxv + .byte VOL , 55*se_m_vicegrip_mvl/mxv .byte BEND , c_v+18 .byte W01 - .byte VOL , 71*se_w011_mvl/mxv + .byte VOL , 71*se_m_vicegrip_mvl/mxv .byte BEND , c_v+0 .byte W01 .byte PAN , c_v-4 - .byte VOL , 86*se_w011_mvl/mxv + .byte VOL , 86*se_m_vicegrip_mvl/mxv .byte BEND , c_v-18 .byte W01 - .byte VOL , 110*se_w011_mvl/mxv + .byte VOL , 110*se_m_vicegrip_mvl/mxv .byte BEND , c_v-50 .byte W02 .byte PAN , c_v+0 @@ -61,10 +61,10 @@ se_w011_1: @********************** Track 2 **********************@ -se_w011_2: - .byte KEYSH , se_w011_key+0 +se_m_vicegrip_2: + .byte KEYSH , se_m_vicegrip_key+0 .byte VOICE , 27 - .byte VOL , 110*se_w011_mvl/mxv + .byte VOL , 110*se_m_vicegrip_mvl/mxv .byte PAN , c_v+0 .byte N06 , Cn2 , v040 .byte W10 @@ -75,15 +75,15 @@ se_w011_2: @******************************************************@ .align 2 -se_w011: +se_m_vicegrip: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w011_pri @ Priority - .byte se_w011_rev @ Reverb. + .byte se_m_vicegrip_pri @ Priority + .byte se_m_vicegrip_rev @ Reverb. - .word se_w011_grp + .word se_m_vicegrip_grp - .word se_w011_1 - .word se_w011_2 + .word se_m_vicegrip_1 + .word se_m_vicegrip_2 .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..7a36b2a15 --- /dev/null +++ b/sound/songs/se_m_vital_throw.s @@ -0,0 +1,75 @@ + .include "MPlayDef.s" + + .equ se_m_vital_throw_grp, voicegroup111 + .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 05713b161..951194cbc 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, voicegroup111 - .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, voicegroup111 + .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 cff01289a..2e40a7d61 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, voicegroup111 - .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, voicegroup111 + .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 372bde412..7c1626514 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, voicegroup111 - .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, voicegroup111 + .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_m_wing_attack.s b/sound/songs/se_m_wing_attack.s new file mode 100644 index 000000000..90a852640 --- /dev/null +++ b/sound/songs/se_m_wing_attack.s @@ -0,0 +1,125 @@ + .include "MPlayDef.s" + + .equ se_m_wing_attack_grp, voicegroup111 + .equ se_m_wing_attack_pri, 4 + .equ se_m_wing_attack_rev, reverb_set+50 + .equ se_m_wing_attack_mvl, 127 + .equ se_m_wing_attack_key, 0 + .equ se_m_wing_attack_tbs, 1 + .equ se_m_wing_attack_exg, 0 + .equ se_m_wing_attack_cmp, 1 + + .section .rodata + .global se_m_wing_attack + .align 2 + +@********************** Track 1 **********************@ + +se_m_wing_attack_1: + .byte KEYSH , se_m_wing_attack_key+0 + .byte TEMPO , 220*se_m_wing_attack_tbs/2 + .byte VOICE , 2 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 40*se_m_wing_attack_mvl/mxv + .byte BEND , c_v-32 + .byte N10 , An1 , v127 + .byte W01 + .byte VOL , 52*se_m_wing_attack_mvl/mxv + .byte PAN , c_v+10 + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 68*se_m_wing_attack_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte W01 + .byte VOL , 82*se_m_wing_attack_mvl/mxv + .byte PAN , c_v-9 + .byte BEND , c_v+8 + .byte W01 + .byte VOL , 105*se_m_wing_attack_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+19 + .byte W02 + .byte PAN , c_v+10 + .byte BEND , c_v+28 + .byte W01 + .byte PAN , c_v+0 + .byte BEND , c_v+38 + .byte W01 + .byte PAN , c_v-9 + .byte BEND , c_v+49 + .byte W01 + .byte PAN , c_v+0 + .byte BEND , c_v+63 + .byte W05 + .byte VOL , 40*se_m_wing_attack_mvl/mxv + .byte BEND , c_v+1 + .byte N06 + .byte W01 + .byte VOL , 52*se_m_wing_attack_mvl/mxv + .byte PAN , c_v+10 + .byte BEND , c_v+38 + .byte W01 + .byte VOL , 79*se_m_wing_attack_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+48 + .byte W02 + .byte VOL , 105*se_m_wing_attack_mvl/mxv + .byte PAN , c_v-9 + .byte BEND , c_v+63 + .byte W01 + .byte PAN , c_v+0 + .byte W05 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_wing_attack_2: + .byte KEYSH , se_m_wing_attack_key+0 + .byte VOICE , 27 + .byte PAN , c_v+0 + .byte VOL , 52*se_m_wing_attack_mvl/mxv + .byte N10 , Gn2 , v040 + .byte W01 + .byte VOL , 69*se_m_wing_attack_mvl/mxv + .byte W01 + .byte 83*se_m_wing_attack_mvl/mxv + .byte W01 + .byte 105*se_m_wing_attack_mvl/mxv + .byte W01 + .byte 85*se_m_wing_attack_mvl/mxv + .byte W02 + .byte 52*se_m_wing_attack_mvl/mxv + .byte W01 + .byte 29*se_m_wing_attack_mvl/mxv + .byte W01 + .byte 12*se_m_wing_attack_mvl/mxv + .byte W06 + .byte VOICE , 25 + .byte VOL , 52*se_m_wing_attack_mvl/mxv + .byte N06 , Gs4 + .byte W01 + .byte VOL , 81*se_m_wing_attack_mvl/mxv + .byte W01 + .byte 105*se_m_wing_attack_mvl/mxv + .byte W03 + .byte 52*se_m_wing_attack_mvl/mxv + .byte W05 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_wing_attack: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_wing_attack_pri @ Priority + .byte se_m_wing_attack_rev @ Reverb. + + .word se_m_wing_attack_grp + + .word se_m_wing_attack_1 + .word se_m_wing_attack_2 + + .end diff --git a/sound/songs/se_w281.s b/sound/songs/se_m_yawn.s index b8ba1a3e5..71ad771d0 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, voicegroup111 - .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, voicegroup111 + .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_moter.s b/sound/songs/se_moter.s deleted file mode 100644 index 62f5234c7..000000000 --- a/sound/songs/se_moter.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "MPlayDef.s" - - .equ se_moter_grp, voicegroup111 - .equ se_moter_pri, 4 - .equ se_moter_rev, reverb_set+50 - .equ se_moter_mvl, 127 - .equ se_moter_key, 0 - .equ se_moter_tbs, 1 - .equ se_moter_exg, 0 - .equ se_moter_cmp, 1 - - .section .rodata - .global se_moter - .align 2 - -@********************** Track 1 **********************@ - -se_moter_1: - .byte KEYSH , se_moter_key+0 -se_moter_1_B1: - .byte TEMPO , 150*se_moter_tbs/2 - .byte VOICE , 15 - .byte VOL , 90*se_moter_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte TIE , Gn2 , v100 - .byte W96 - .byte W96 - .byte W48 - .byte EOT - .byte GOTO - .word se_moter_1_B1 - .byte W48 - .byte FINE - -@******************************************************@ - .align 2 - -se_moter: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_moter_pri @ Priority - .byte se_moter_rev @ Reverb. - - .word se_moter_grp - - .word se_moter_1 - - .end diff --git a/sound/songs/se_mu_pachi.s b/sound/songs/se_mu_pachi.s deleted file mode 100644 index 4dc86c869..000000000 --- a/sound/songs/se_mu_pachi.s +++ /dev/null @@ -1,47 +0,0 @@ - .include "MPlayDef.s" - - .equ se_mu_pachi_grp, voicegroup110 - .equ se_mu_pachi_pri, 4 - .equ se_mu_pachi_rev, reverb_set+50 - .equ se_mu_pachi_mvl, 127 - .equ se_mu_pachi_key, 0 - .equ se_mu_pachi_tbs, 1 - .equ se_mu_pachi_exg, 0 - .equ se_mu_pachi_cmp, 1 - - .section .rodata - .global se_mu_pachi - .align 2 - -@********************** Track 1 **********************@ - -se_mu_pachi_1: - .byte KEYSH , se_mu_pachi_key+0 - .byte TEMPO , 150*se_mu_pachi_tbs/2 - .byte VOICE , 122 - .byte VOL , 100*se_mu_pachi_mvl/mxv - .byte N01 , Ds3 , v127 - .byte W02 - .byte VOICE , 126 - .byte N01 , Gs4 - .byte W01 - .byte W03 - .byte W01 - .byte Gs4 , v088 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_mu_pachi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_mu_pachi_pri @ Priority - .byte se_mu_pachi_rev @ Reverb. - - .word se_mu_pachi_grp - - .word se_mu_pachi_1 - - .end diff --git a/sound/songs/se_mud_ball.s b/sound/songs/se_mud_ball.s new file mode 100644 index 000000000..e4860eb8b --- /dev/null +++ b/sound/songs/se_mud_ball.s @@ -0,0 +1,52 @@ + .include "MPlayDef.s" + + .equ se_mud_ball_grp, voicegroup111 + .equ se_mud_ball_pri, 4 + .equ se_mud_ball_rev, reverb_set+50 + .equ se_mud_ball_mvl, 127 + .equ se_mud_ball_key, 0 + .equ se_mud_ball_tbs, 1 + .equ se_mud_ball_exg, 0 + .equ se_mud_ball_cmp, 1 + + .section .rodata + .global se_mud_ball + .align 2 + +@********************** Track 1 **********************@ + +se_mud_ball_1: + .byte KEYSH , se_mud_ball_key+0 + .byte TEMPO , 150*se_mud_ball_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_mud_ball_mvl/mxv + .byte BEND , c_v+0 + .byte N01 , Cn4 , v112 + .byte W01 + .byte VOICE , 26 + .byte W01 + .byte N01 , Fn4 , v127 + .byte W01 + .byte W01 + .byte VOICE , 36 + .byte W02 + .byte N01 , Cn3 , v056 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_mud_ball: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_mud_ball_pri @ Priority + .byte se_mud_ball_rev @ Reverb. + + .word se_mud_ball_grp + + .word se_mud_ball_1 + + .end diff --git a/sound/songs/se_bt_start.s b/sound/songs/se_mugshot.s index 92404bbf2..8c68537ba 100644 --- a/sound/songs/se_bt_start.s +++ b/sound/songs/se_mugshot.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_bt_start_grp, voicegroup111 - .equ se_bt_start_pri, 5 - .equ se_bt_start_rev, reverb_set+50 - .equ se_bt_start_mvl, 127 - .equ se_bt_start_key, 0 - .equ se_bt_start_tbs, 1 - .equ se_bt_start_exg, 0 - .equ se_bt_start_cmp, 1 + .equ se_mugshot_grp, voicegroup111 + .equ se_mugshot_pri, 5 + .equ se_mugshot_rev, reverb_set+50 + .equ se_mugshot_mvl, 127 + .equ se_mugshot_key, 0 + .equ se_mugshot_tbs, 1 + .equ se_mugshot_exg, 0 + .equ se_mugshot_cmp, 1 .section .rodata - .global se_bt_start + .global se_mugshot .align 2 @********************** Track 1 **********************@ -se_bt_start_1: - .byte KEYSH , se_bt_start_key+0 - .byte TEMPO , 110*se_bt_start_tbs/2 +se_mugshot_1: + .byte KEYSH , se_mugshot_key+0 + .byte TEMPO , 110*se_mugshot_tbs/2 .byte VOICE , 66 .byte BENDR , 12 - .byte VOL , 90*se_bt_start_mvl/mxv + .byte VOL , 90*se_mugshot_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N90 , Gs3 , v040 @@ -57,23 +57,23 @@ se_bt_start_1: .byte c_v+63 .byte W03 .byte W03 - .byte VOL , 83*se_bt_start_mvl/mxv + .byte VOL , 83*se_mugshot_mvl/mxv .byte W03 - .byte 75*se_bt_start_mvl/mxv + .byte 75*se_mugshot_mvl/mxv .byte W04 - .byte 68*se_bt_start_mvl/mxv + .byte 68*se_mugshot_mvl/mxv .byte W02 .byte W01 - .byte 55*se_bt_start_mvl/mxv + .byte 55*se_mugshot_mvl/mxv .byte W04 - .byte 42*se_bt_start_mvl/mxv + .byte 42*se_mugshot_mvl/mxv .byte W01 .byte W03 - .byte 29*se_bt_start_mvl/mxv + .byte 29*se_mugshot_mvl/mxv .byte W03 - .byte 17*se_bt_start_mvl/mxv + .byte 17*se_mugshot_mvl/mxv .byte W03 - .byte 8*se_bt_start_mvl/mxv + .byte 8*se_mugshot_mvl/mxv .byte W03 .byte W06 .byte W06 @@ -82,45 +82,45 @@ se_bt_start_1: @********************** Track 2 **********************@ -se_bt_start_2: - .byte KEYSH , se_bt_start_key+0 +se_mugshot_2: + .byte KEYSH , se_mugshot_key+0 .byte VOICE , 2 - .byte VOL , 14*se_bt_start_mvl/mxv + .byte VOL , 14*se_mugshot_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v+0 .byte TIE , Gn3 , v100 .byte W01 - .byte VOL , 19*se_bt_start_mvl/mxv + .byte VOL , 19*se_mugshot_mvl/mxv .byte W01 - .byte 30*se_bt_start_mvl/mxv + .byte 30*se_mugshot_mvl/mxv .byte W02 - .byte 37*se_bt_start_mvl/mxv + .byte 37*se_mugshot_mvl/mxv .byte W02 .byte W02 - .byte 44*se_bt_start_mvl/mxv + .byte 44*se_mugshot_mvl/mxv .byte W04 - .byte 49*se_bt_start_mvl/mxv + .byte 49*se_mugshot_mvl/mxv .byte W04 - .byte 53*se_bt_start_mvl/mxv + .byte 53*se_mugshot_mvl/mxv .byte W02 .byte W03 - .byte 58*se_bt_start_mvl/mxv + .byte 58*se_mugshot_mvl/mxv .byte W03 .byte W02 - .byte 64*se_bt_start_mvl/mxv + .byte 64*se_mugshot_mvl/mxv .byte W04 - .byte 68*se_bt_start_mvl/mxv + .byte 68*se_mugshot_mvl/mxv .byte W03 - .byte 74*se_bt_start_mvl/mxv + .byte 74*se_mugshot_mvl/mxv .byte W03 .byte W01 .byte BEND , c_v+1 .byte W01 - .byte VOL , 81*se_bt_start_mvl/mxv + .byte VOL , 81*se_mugshot_mvl/mxv .byte W04 .byte BEND , c_v+2 .byte W01 - .byte VOL , 90*se_bt_start_mvl/mxv + .byte VOL , 90*se_mugshot_mvl/mxv .byte W03 .byte BEND , c_v+4 .byte W02 @@ -156,41 +156,41 @@ se_bt_start_2: .byte W01 .byte c_v+63 .byte W01 - .byte VOL , 87*se_bt_start_mvl/mxv + .byte VOL , 87*se_mugshot_mvl/mxv .byte W03 - .byte 85*se_bt_start_mvl/mxv + .byte 85*se_mugshot_mvl/mxv .byte PAN , c_v-4 .byte W02 - .byte VOL , 78*se_bt_start_mvl/mxv + .byte VOL , 78*se_mugshot_mvl/mxv .byte PAN , c_v+4 .byte W02 - .byte VOL , 75*se_bt_start_mvl/mxv + .byte VOL , 75*se_mugshot_mvl/mxv .byte PAN , c_v-6 .byte W02 .byte W01 - .byte VOL , 69*se_bt_start_mvl/mxv + .byte VOL , 69*se_mugshot_mvl/mxv .byte PAN , c_v+6 .byte W02 - .byte VOL , 59*se_bt_start_mvl/mxv + .byte VOL , 59*se_mugshot_mvl/mxv .byte PAN , c_v-20 .byte W03 - .byte VOL , 49*se_bt_start_mvl/mxv + .byte VOL , 49*se_mugshot_mvl/mxv .byte PAN , c_v+22 .byte W02 - .byte VOL , 41*se_bt_start_mvl/mxv + .byte VOL , 41*se_mugshot_mvl/mxv .byte PAN , c_v-37 .byte W02 - .byte VOL , 30*se_bt_start_mvl/mxv + .byte VOL , 30*se_mugshot_mvl/mxv .byte PAN , c_v+37 .byte W02 .byte W01 - .byte VOL , 19*se_bt_start_mvl/mxv + .byte VOL , 19*se_mugshot_mvl/mxv .byte PAN , c_v-48 .byte W02 - .byte VOL , 10*se_bt_start_mvl/mxv + .byte VOL , 10*se_mugshot_mvl/mxv .byte PAN , c_v+48 .byte W01 - .byte VOL , 4*se_bt_start_mvl/mxv + .byte VOL , 4*se_mugshot_mvl/mxv .byte W02 .byte EOT .byte FINE @@ -198,15 +198,15 @@ se_bt_start_2: @******************************************************@ .align 2 -se_bt_start: +se_mugshot: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_bt_start_pri @ Priority - .byte se_bt_start_rev @ Reverb. + .byte se_mugshot_pri @ Priority + .byte se_mugshot_rev @ Reverb. - .word se_bt_start_grp + .word se_mugshot_grp - .word se_bt_start_1 - .word se_bt_start_2 + .word se_mugshot_1 + .word se_mugshot_2 .end diff --git a/sound/songs/se_nageru.s b/sound/songs/se_nageru.s deleted file mode 100644 index 81ae6e313..000000000 --- a/sound/songs/se_nageru.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "MPlayDef.s" - - .equ se_nageru_grp, voicegroup111 - .equ se_nageru_pri, 5 - .equ se_nageru_rev, reverb_set+50 - .equ se_nageru_mvl, 127 - .equ se_nageru_key, 0 - .equ se_nageru_tbs, 1 - .equ se_nageru_exg, 0 - .equ se_nageru_cmp, 1 - - .section .rodata - .global se_nageru - .align 2 - -@********************** Track 1 **********************@ - -se_nageru_1: - .byte KEYSH , se_nageru_key+0 - .byte TEMPO , 150*se_nageru_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte VOL , 120*se_nageru_mvl/mxv - .byte BEND , c_v+12 - .byte N06 , An2 , v127 - .byte W03 - .byte VOL , 78*se_nageru_mvl/mxv - .byte BEND , c_v+20 - .byte W03 - .byte VOL , 120*se_nageru_mvl/mxv - .byte BEND , c_v+36 - .byte N18 , Cn3 - .byte W02 - .byte BEND , c_v+35 - .byte W03 - .byte c_v+32 - .byte W02 - .byte c_v+26 - .byte W03 - .byte VOL , 102*se_nageru_mvl/mxv - .byte BEND , c_v+18 - .byte W02 - .byte VOL , 68*se_nageru_mvl/mxv - .byte BEND , c_v+7 - .byte W03 - .byte VOL , 34*se_nageru_mvl/mxv - .byte BEND , c_v-9 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_nageru: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_nageru_pri @ Priority - .byte se_nageru_rev @ Reverb. - - .word se_nageru_grp - - .word se_nageru_1 - - .end diff --git a/sound/songs/se_naminori.s b/sound/songs/se_naminori.s deleted file mode 100644 index ea129e279..000000000 --- a/sound/songs/se_naminori.s +++ /dev/null @@ -1,94 +0,0 @@ - .include "MPlayDef.s" - - .equ se_naminori_grp, voicegroup110 - .equ se_naminori_pri, 4 - .equ se_naminori_rev, reverb_set+50 - .equ se_naminori_mvl, 127 - .equ se_naminori_key, 0 - .equ se_naminori_tbs, 1 - .equ se_naminori_exg, 0 - .equ se_naminori_cmp, 1 - - .section .rodata - .global se_naminori - .align 2 - -@********************** Track 1 **********************@ - -se_naminori_1: - .byte KEYSH , se_naminori_key+0 - .byte TEMPO , 220*se_naminori_tbs/2 - .byte VOICE , 123 - .byte VOL , 75*se_naminori_mvl/mxv - .byte N03 , Ds3 , v127 - .byte W03 - .byte TIE , Cn4 - .byte W21 - .byte W24 - .byte W18 - .byte VOL , 75*se_naminori_mvl/mxv - .byte W06 - .byte 71*se_naminori_mvl/mxv - .byte W05 - .byte 67*se_naminori_mvl/mxv - .byte W03 - .byte 62*se_naminori_mvl/mxv - .byte W04 - .byte 59*se_naminori_mvl/mxv - .byte W05 - .byte 57*se_naminori_mvl/mxv - .byte W03 - .byte 54*se_naminori_mvl/mxv - .byte W04 - .byte W02 - .byte 50*se_naminori_mvl/mxv - .byte W03 - .byte 49*se_naminori_mvl/mxv - .byte W03 - .byte 44*se_naminori_mvl/mxv - .byte W04 - .byte 41*se_naminori_mvl/mxv - .byte W02 - .byte 38*se_naminori_mvl/mxv - .byte W03 - .byte 35*se_naminori_mvl/mxv - .byte W03 - .byte 32*se_naminori_mvl/mxv - .byte W04 - .byte 28*se_naminori_mvl/mxv - .byte W02 - .byte 24*se_naminori_mvl/mxv - .byte W03 - .byte 21*se_naminori_mvl/mxv - .byte W03 - .byte 18*se_naminori_mvl/mxv - .byte W04 - .byte 14*se_naminori_mvl/mxv - .byte W02 - .byte 11*se_naminori_mvl/mxv - .byte W03 - .byte 9*se_naminori_mvl/mxv - .byte W03 - .byte 6*se_naminori_mvl/mxv - .byte W04 - .byte 3*se_naminori_mvl/mxv - .byte W02 - .byte 1*se_naminori_mvl/mxv - .byte W22 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_naminori: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_naminori_pri @ Priority - .byte se_naminori_rev @ Reverb. - - .word se_naminori_grp - - .word se_naminori_1 - - .end diff --git a/sound/songs/se_not_effective.s b/sound/songs/se_not_effective.s new file mode 100644 index 000000000..4d2971773 --- /dev/null +++ b/sound/songs/se_not_effective.s @@ -0,0 +1,56 @@ + .include "MPlayDef.s" + + .equ se_not_effective_grp, voicegroup110 + .equ se_not_effective_pri, 5 + .equ se_not_effective_rev, reverb_set+50 + .equ se_not_effective_mvl, 127 + .equ se_not_effective_key, 0 + .equ se_not_effective_tbs, 1 + .equ se_not_effective_exg, 0 + .equ se_not_effective_cmp, 1 + + .section .rodata + .global se_not_effective + .align 2 + +@********************** Track 1 **********************@ + +se_not_effective_1: + .byte KEYSH , se_not_effective_key+0 + .byte TEMPO , 90*se_not_effective_tbs/2 + .byte VOICE , 127 + .byte VOL , 110*se_not_effective_mvl/mxv + .byte N03 , Gn2 , v100 + .byte W03 + .byte N06 , As2 + .byte W03 + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_not_effective_2: + .byte KEYSH , se_not_effective_key+0 + .byte VOICE , 0 + .byte VOL , 110*se_not_effective_mvl/mxv + .byte N09 , As1 , v127 + .byte W03 + .byte W03 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_not_effective: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_not_effective_pri @ Priority + .byte se_not_effective_rev @ Reverb. + + .word se_not_effective_grp + + .word se_not_effective_1 + .word se_not_effective_2 + + .end diff --git a/sound/songs/se_toy_a.s b/sound/songs/se_note_a.s index 53067b62c..6e4e745b4 100644 --- a/sound/songs/se_toy_a.s +++ b/sound/songs/se_note_a.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_toy_a_grp, voicegroup111 - .equ se_toy_a_pri, 4 - .equ se_toy_a_rev, reverb_set+50 - .equ se_toy_a_mvl, 127 - .equ se_toy_a_key, 0 - .equ se_toy_a_tbs, 1 - .equ se_toy_a_exg, 0 - .equ se_toy_a_cmp, 1 + .equ se_note_a_grp, voicegroup111 + .equ se_note_a_pri, 4 + .equ se_note_a_rev, reverb_set+50 + .equ se_note_a_mvl, 127 + .equ se_note_a_key, 0 + .equ se_note_a_tbs, 1 + .equ se_note_a_exg, 0 + .equ se_note_a_cmp, 1 .section .rodata - .global se_toy_a + .global se_note_a .align 2 @********************** Track 1 **********************@ -se_toy_a_1: - .byte KEYSH , se_toy_a_key+0 - .byte TEMPO , 150*se_toy_a_tbs/2 +se_note_a_1: + .byte KEYSH , se_note_a_key+0 + .byte TEMPO , 150*se_note_a_tbs/2 .byte VOICE , 48 - .byte VOL , 110*se_toy_a_mvl/mxv + .byte VOL , 110*se_note_a_mvl/mxv .byte BEND , c_v-7 .byte N12 , An5 , v112 .byte W06 @@ -30,10 +30,10 @@ se_toy_a_1: @********************** Track 2 **********************@ -se_toy_a_2: - .byte KEYSH , se_toy_a_key+0 +se_note_a_2: + .byte KEYSH , se_note_a_key+0 .byte VOICE , 17 - .byte VOL , 110*se_toy_a_mvl/mxv + .byte VOL , 110*se_note_a_mvl/mxv .byte BEND , c_v-7 .byte N12 , En6 , v060 .byte W06 @@ -45,15 +45,15 @@ se_toy_a_2: @******************************************************@ .align 2 -se_toy_a: +se_note_a: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_toy_a_pri @ Priority - .byte se_toy_a_rev @ Reverb. + .byte se_note_a_pri @ Priority + .byte se_note_a_rev @ Reverb. - .word se_toy_a_grp + .word se_note_a_grp - .word se_toy_a_1 - .word se_toy_a_2 + .word se_note_a_1 + .word se_note_a_2 .end diff --git a/sound/songs/se_toy_b.s b/sound/songs/se_note_b.s index 0ed76d9bd..1050de3fb 100644 --- a/sound/songs/se_toy_b.s +++ b/sound/songs/se_note_b.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_toy_b_grp, voicegroup111 - .equ se_toy_b_pri, 4 - .equ se_toy_b_rev, reverb_set+50 - .equ se_toy_b_mvl, 127 - .equ se_toy_b_key, 0 - .equ se_toy_b_tbs, 1 - .equ se_toy_b_exg, 0 - .equ se_toy_b_cmp, 1 + .equ se_note_b_grp, voicegroup111 + .equ se_note_b_pri, 4 + .equ se_note_b_rev, reverb_set+50 + .equ se_note_b_mvl, 127 + .equ se_note_b_key, 0 + .equ se_note_b_tbs, 1 + .equ se_note_b_exg, 0 + .equ se_note_b_cmp, 1 .section .rodata - .global se_toy_b + .global se_note_b .align 2 @********************** Track 1 **********************@ -se_toy_b_1: - .byte KEYSH , se_toy_b_key+0 - .byte TEMPO , 150*se_toy_b_tbs/2 +se_note_b_1: + .byte KEYSH , se_note_b_key+0 + .byte TEMPO , 150*se_note_b_tbs/2 .byte VOICE , 48 - .byte VOL , 110*se_toy_b_mvl/mxv + .byte VOL , 110*se_note_b_mvl/mxv .byte BEND , c_v-7 .byte N12 , Bn5 , v112 .byte W06 @@ -30,10 +30,10 @@ se_toy_b_1: @********************** Track 2 **********************@ -se_toy_b_2: - .byte KEYSH , se_toy_b_key+0 +se_note_b_2: + .byte KEYSH , se_note_b_key+0 .byte VOICE , 17 - .byte VOL , 110*se_toy_b_mvl/mxv + .byte VOL , 110*se_note_b_mvl/mxv .byte BEND , c_v-7 .byte N12 , Fs6 , v060 .byte W06 @@ -45,15 +45,15 @@ se_toy_b_2: @******************************************************@ .align 2 -se_toy_b: +se_note_b: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_toy_b_pri @ Priority - .byte se_toy_b_rev @ Reverb. + .byte se_note_b_pri @ Priority + .byte se_note_b_rev @ Reverb. - .word se_toy_b_grp + .word se_note_b_grp - .word se_toy_b_1 - .word se_toy_b_2 + .word se_note_b_1 + .word se_note_b_2 .end diff --git a/sound/songs/se_toy_c.s b/sound/songs/se_note_c.s index 6341fd96e..6a837ebab 100644 --- a/sound/songs/se_toy_c.s +++ b/sound/songs/se_note_c.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_toy_c_grp, voicegroup111 - .equ se_toy_c_pri, 4 - .equ se_toy_c_rev, reverb_set+50 - .equ se_toy_c_mvl, 127 - .equ se_toy_c_key, 0 - .equ se_toy_c_tbs, 1 - .equ se_toy_c_exg, 0 - .equ se_toy_c_cmp, 1 + .equ se_note_c_grp, voicegroup111 + .equ se_note_c_pri, 4 + .equ se_note_c_rev, reverb_set+50 + .equ se_note_c_mvl, 127 + .equ se_note_c_key, 0 + .equ se_note_c_tbs, 1 + .equ se_note_c_exg, 0 + .equ se_note_c_cmp, 1 .section .rodata - .global se_toy_c + .global se_note_c .align 2 @********************** Track 1 **********************@ -se_toy_c_1: - .byte KEYSH , se_toy_c_key+0 - .byte TEMPO , 150*se_toy_c_tbs/2 +se_note_c_1: + .byte KEYSH , se_note_c_key+0 + .byte TEMPO , 150*se_note_c_tbs/2 .byte VOICE , 48 - .byte VOL , 110*se_toy_c_mvl/mxv + .byte VOL , 110*se_note_c_mvl/mxv .byte BEND , c_v-7 .byte N12 , Cn5 , v112 .byte W06 @@ -30,10 +30,10 @@ se_toy_c_1: @********************** Track 2 **********************@ -se_toy_c_2: - .byte KEYSH , se_toy_c_key+0 +se_note_c_2: + .byte KEYSH , se_note_c_key+0 .byte VOICE , 17 - .byte VOL , 110*se_toy_c_mvl/mxv + .byte VOL , 110*se_note_c_mvl/mxv .byte BEND , c_v-7 .byte N12 , Gn5 , v060 .byte W06 @@ -45,15 +45,15 @@ se_toy_c_2: @******************************************************@ .align 2 -se_toy_c: +se_note_c: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_toy_c_pri @ Priority - .byte se_toy_c_rev @ Reverb. + .byte se_note_c_pri @ Priority + .byte se_note_c_rev @ Reverb. - .word se_toy_c_grp + .word se_note_c_grp - .word se_toy_c_1 - .word se_toy_c_2 + .word se_note_c_1 + .word se_note_c_2 .end diff --git a/sound/songs/se_note_c_high.s b/sound/songs/se_note_c_high.s new file mode 100644 index 000000000..9bc436593 --- /dev/null +++ b/sound/songs/se_note_c_high.s @@ -0,0 +1,59 @@ + .include "MPlayDef.s" + + .equ se_note_c_high_grp, voicegroup111 + .equ se_note_c_high_pri, 4 + .equ se_note_c_high_rev, reverb_set+50 + .equ se_note_c_high_mvl, 127 + .equ se_note_c_high_key, 0 + .equ se_note_c_high_tbs, 1 + .equ se_note_c_high_exg, 0 + .equ se_note_c_high_cmp, 1 + + .section .rodata + .global se_note_c_high + .align 2 + +@********************** Track 1 **********************@ + +se_note_c_high_1: + .byte KEYSH , se_note_c_high_key+0 + .byte TEMPO , 150*se_note_c_high_tbs/2 + .byte VOICE , 48 + .byte VOL , 110*se_note_c_high_mvl/mxv + .byte BEND , c_v-7 + .byte N12 , Cn6 , v112 + .byte W06 + .byte W06 + .byte N06 , Cn6 , v040 + .byte W06 + .byte FINE + +@********************** Track 2 **********************@ + +se_note_c_high_2: + .byte KEYSH , se_note_c_high_key+0 + .byte VOICE , 17 + .byte VOL , 110*se_note_c_high_mvl/mxv + .byte BEND , c_v-7 + .byte N12 , Gn6 , v060 + .byte W06 + .byte W06 + .byte N06 , Gn6 , v032 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_note_c_high: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_note_c_high_pri @ Priority + .byte se_note_c_high_rev @ Reverb. + + .word se_note_c_high_grp + + .word se_note_c_high_1 + .word se_note_c_high_2 + + .end diff --git a/sound/songs/se_toy_d.s b/sound/songs/se_note_d.s index 9d75f98e8..334613e3a 100644 --- a/sound/songs/se_toy_d.s +++ b/sound/songs/se_note_d.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_toy_d_grp, voicegroup111 - .equ se_toy_d_pri, 4 - .equ se_toy_d_rev, reverb_set+50 - .equ se_toy_d_mvl, 127 - .equ se_toy_d_key, 0 - .equ se_toy_d_tbs, 1 - .equ se_toy_d_exg, 0 - .equ se_toy_d_cmp, 1 + .equ se_note_d_grp, voicegroup111 + .equ se_note_d_pri, 4 + .equ se_note_d_rev, reverb_set+50 + .equ se_note_d_mvl, 127 + .equ se_note_d_key, 0 + .equ se_note_d_tbs, 1 + .equ se_note_d_exg, 0 + .equ se_note_d_cmp, 1 .section .rodata - .global se_toy_d + .global se_note_d .align 2 @********************** Track 1 **********************@ -se_toy_d_1: - .byte KEYSH , se_toy_d_key+0 - .byte TEMPO , 150*se_toy_d_tbs/2 +se_note_d_1: + .byte KEYSH , se_note_d_key+0 + .byte TEMPO , 150*se_note_d_tbs/2 .byte VOICE , 48 - .byte VOL , 110*se_toy_d_mvl/mxv + .byte VOL , 110*se_note_d_mvl/mxv .byte BEND , c_v-7 .byte N12 , Dn5 , v112 .byte W06 @@ -30,10 +30,10 @@ se_toy_d_1: @********************** Track 2 **********************@ -se_toy_d_2: - .byte KEYSH , se_toy_d_key+0 +se_note_d_2: + .byte KEYSH , se_note_d_key+0 .byte VOICE , 17 - .byte VOL , 110*se_toy_d_mvl/mxv + .byte VOL , 110*se_note_d_mvl/mxv .byte BEND , c_v-7 .byte N12 , An5 , v060 .byte W06 @@ -45,15 +45,15 @@ se_toy_d_2: @******************************************************@ .align 2 -se_toy_d: +se_note_d: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_toy_d_pri @ Priority - .byte se_toy_d_rev @ Reverb. + .byte se_note_d_pri @ Priority + .byte se_note_d_rev @ Reverb. - .word se_toy_d_grp + .word se_note_d_grp - .word se_toy_d_1 - .word se_toy_d_2 + .word se_note_d_1 + .word se_note_d_2 .end diff --git a/sound/songs/se_toy_e.s b/sound/songs/se_note_e.s index bee25515c..6909c5a29 100644 --- a/sound/songs/se_toy_e.s +++ b/sound/songs/se_note_e.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_toy_e_grp, voicegroup111 - .equ se_toy_e_pri, 4 - .equ se_toy_e_rev, reverb_set+50 - .equ se_toy_e_mvl, 127 - .equ se_toy_e_key, 0 - .equ se_toy_e_tbs, 1 - .equ se_toy_e_exg, 0 - .equ se_toy_e_cmp, 1 + .equ se_note_e_grp, voicegroup111 + .equ se_note_e_pri, 4 + .equ se_note_e_rev, reverb_set+50 + .equ se_note_e_mvl, 127 + .equ se_note_e_key, 0 + .equ se_note_e_tbs, 1 + .equ se_note_e_exg, 0 + .equ se_note_e_cmp, 1 .section .rodata - .global se_toy_e + .global se_note_e .align 2 @********************** Track 1 **********************@ -se_toy_e_1: - .byte KEYSH , se_toy_e_key+0 - .byte TEMPO , 150*se_toy_e_tbs/2 +se_note_e_1: + .byte KEYSH , se_note_e_key+0 + .byte TEMPO , 150*se_note_e_tbs/2 .byte VOICE , 48 - .byte VOL , 110*se_toy_e_mvl/mxv + .byte VOL , 110*se_note_e_mvl/mxv .byte BEND , c_v-7 .byte N12 , En5 , v112 .byte W06 @@ -30,10 +30,10 @@ se_toy_e_1: @********************** Track 2 **********************@ -se_toy_e_2: - .byte KEYSH , se_toy_e_key+0 +se_note_e_2: + .byte KEYSH , se_note_e_key+0 .byte VOICE , 17 - .byte VOL , 110*se_toy_e_mvl/mxv + .byte VOL , 110*se_note_e_mvl/mxv .byte BEND , c_v-7 .byte N12 , Bn5 , v060 .byte W06 @@ -45,15 +45,15 @@ se_toy_e_2: @******************************************************@ .align 2 -se_toy_e: +se_note_e: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_toy_e_pri @ Priority - .byte se_toy_e_rev @ Reverb. + .byte se_note_e_pri @ Priority + .byte se_note_e_rev @ Reverb. - .word se_toy_e_grp + .word se_note_e_grp - .word se_toy_e_1 - .word se_toy_e_2 + .word se_note_e_1 + .word se_note_e_2 .end diff --git a/sound/songs/se_toy_f.s b/sound/songs/se_note_f.s index 90ee9e99f..2124aa823 100644 --- a/sound/songs/se_toy_f.s +++ b/sound/songs/se_note_f.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_toy_f_grp, voicegroup111 - .equ se_toy_f_pri, 4 - .equ se_toy_f_rev, reverb_set+50 - .equ se_toy_f_mvl, 127 - .equ se_toy_f_key, 0 - .equ se_toy_f_tbs, 1 - .equ se_toy_f_exg, 0 - .equ se_toy_f_cmp, 1 + .equ se_note_f_grp, voicegroup111 + .equ se_note_f_pri, 4 + .equ se_note_f_rev, reverb_set+50 + .equ se_note_f_mvl, 127 + .equ se_note_f_key, 0 + .equ se_note_f_tbs, 1 + .equ se_note_f_exg, 0 + .equ se_note_f_cmp, 1 .section .rodata - .global se_toy_f + .global se_note_f .align 2 @********************** Track 1 **********************@ -se_toy_f_1: - .byte KEYSH , se_toy_f_key+0 - .byte TEMPO , 150*se_toy_f_tbs/2 +se_note_f_1: + .byte KEYSH , se_note_f_key+0 + .byte TEMPO , 150*se_note_f_tbs/2 .byte VOICE , 48 - .byte VOL , 110*se_toy_f_mvl/mxv + .byte VOL , 110*se_note_f_mvl/mxv .byte BEND , c_v-7 .byte N12 , Fn5 , v112 .byte W06 @@ -30,10 +30,10 @@ se_toy_f_1: @********************** Track 2 **********************@ -se_toy_f_2: - .byte KEYSH , se_toy_f_key+0 +se_note_f_2: + .byte KEYSH , se_note_f_key+0 .byte VOICE , 17 - .byte VOL , 110*se_toy_f_mvl/mxv + .byte VOL , 110*se_note_f_mvl/mxv .byte BEND , c_v-7 .byte N12 , Cn6 , v060 .byte W06 @@ -45,15 +45,15 @@ se_toy_f_2: @******************************************************@ .align 2 -se_toy_f: +se_note_f: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_toy_f_pri @ Priority - .byte se_toy_f_rev @ Reverb. + .byte se_note_f_pri @ Priority + .byte se_note_f_rev @ Reverb. - .word se_toy_f_grp + .word se_note_f_grp - .word se_toy_f_1 - .word se_toy_f_2 + .word se_note_f_1 + .word se_note_f_2 .end diff --git a/sound/songs/se_toy_g.s b/sound/songs/se_note_g.s index 272017429..1aff7a636 100644 --- a/sound/songs/se_toy_g.s +++ b/sound/songs/se_note_g.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_toy_g_grp, voicegroup111 - .equ se_toy_g_pri, 4 - .equ se_toy_g_rev, reverb_set+50 - .equ se_toy_g_mvl, 127 - .equ se_toy_g_key, 0 - .equ se_toy_g_tbs, 1 - .equ se_toy_g_exg, 0 - .equ se_toy_g_cmp, 1 + .equ se_note_g_grp, voicegroup111 + .equ se_note_g_pri, 4 + .equ se_note_g_rev, reverb_set+50 + .equ se_note_g_mvl, 127 + .equ se_note_g_key, 0 + .equ se_note_g_tbs, 1 + .equ se_note_g_exg, 0 + .equ se_note_g_cmp, 1 .section .rodata - .global se_toy_g + .global se_note_g .align 2 @********************** Track 1 **********************@ -se_toy_g_1: - .byte KEYSH , se_toy_g_key+0 - .byte TEMPO , 150*se_toy_g_tbs/2 +se_note_g_1: + .byte KEYSH , se_note_g_key+0 + .byte TEMPO , 150*se_note_g_tbs/2 .byte VOICE , 48 - .byte VOL , 110*se_toy_g_mvl/mxv + .byte VOL , 110*se_note_g_mvl/mxv .byte BEND , c_v-7 .byte N12 , Gn5 , v112 .byte W06 @@ -30,10 +30,10 @@ se_toy_g_1: @********************** Track 2 **********************@ -se_toy_g_2: - .byte KEYSH , se_toy_g_key+0 +se_note_g_2: + .byte KEYSH , se_note_g_key+0 .byte VOICE , 17 - .byte VOL , 110*se_toy_g_mvl/mxv + .byte VOL , 110*se_note_g_mvl/mxv .byte BEND , c_v-7 .byte N12 , Dn6 , v060 .byte W06 @@ -45,15 +45,15 @@ se_toy_g_2: @******************************************************@ .align 2 -se_toy_g: +se_note_g: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_toy_g_pri @ Priority - .byte se_toy_g_rev @ Reverb. + .byte se_note_g_pri @ Priority + .byte se_note_g_rev @ Reverb. - .word se_toy_g_grp + .word se_note_g_grp - .word se_toy_g_1 - .word se_toy_g_2 + .word se_note_g_1 + .word se_note_g_2 .end diff --git a/sound/songs/se_tama.s b/sound/songs/se_orb.s index 897b8d3d4..bc30d315d 100644 --- a/sound/songs/se_tama.s +++ b/sound/songs/se_orb.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_tama_grp, voicegroup111 - .equ se_tama_pri, 5 - .equ se_tama_rev, reverb_set+50 - .equ se_tama_mvl, 127 - .equ se_tama_key, 0 - .equ se_tama_tbs, 1 - .equ se_tama_exg, 0 - .equ se_tama_cmp, 1 + .equ se_orb_grp, voicegroup111 + .equ se_orb_pri, 5 + .equ se_orb_rev, reverb_set+50 + .equ se_orb_mvl, 127 + .equ se_orb_key, 0 + .equ se_orb_tbs, 1 + .equ se_orb_exg, 0 + .equ se_orb_cmp, 1 .section .rodata - .global se_tama + .global se_orb .align 2 @********************** Track 1 **********************@ -se_tama_1: - .byte KEYSH , se_tama_key+0 - .byte TEMPO , 110*se_tama_tbs/2 +se_orb_1: + .byte KEYSH , se_orb_key+0 + .byte TEMPO , 110*se_orb_tbs/2 .byte VOICE , 15 .byte BENDR , 12 - .byte VOL , 100*se_tama_mvl/mxv + .byte VOL , 100*se_orb_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+30 .byte TIE , Cn4 , v100 @@ -75,88 +75,88 @@ se_tama_1: .byte W06 .byte c_v+20 .byte W06 - .byte VOL , 98*se_tama_mvl/mxv + .byte VOL , 98*se_orb_mvl/mxv .byte BEND , c_v+22 .byte W03 - .byte VOL , 97*se_tama_mvl/mxv + .byte VOL , 97*se_orb_mvl/mxv .byte W03 .byte BEND , c_v+24 .byte W01 - .byte VOL , 94*se_tama_mvl/mxv + .byte VOL , 94*se_orb_mvl/mxv .byte W03 - .byte 91*se_tama_mvl/mxv + .byte 91*se_orb_mvl/mxv .byte W02 .byte BEND , c_v+26 .byte W02 - .byte VOL , 88*se_tama_mvl/mxv + .byte VOL , 88*se_orb_mvl/mxv .byte W02 - .byte 85*se_tama_mvl/mxv + .byte 85*se_orb_mvl/mxv .byte W02 .byte BEND , c_v+28 .byte W02 - .byte VOL , 80*se_tama_mvl/mxv + .byte VOL , 80*se_orb_mvl/mxv .byte W02 - .byte 73*se_tama_mvl/mxv + .byte 73*se_orb_mvl/mxv .byte W02 .byte BEND , c_v+30 .byte W01 - .byte VOL , 68*se_tama_mvl/mxv + .byte VOL , 68*se_orb_mvl/mxv .byte W02 - .byte 62*se_tama_mvl/mxv + .byte 62*se_orb_mvl/mxv .byte W03 - .byte 55*se_tama_mvl/mxv + .byte 55*se_orb_mvl/mxv .byte BEND , c_v+32 .byte W02 - .byte VOL , 47*se_tama_mvl/mxv + .byte VOL , 47*se_orb_mvl/mxv .byte W02 - .byte 37*se_tama_mvl/mxv + .byte 37*se_orb_mvl/mxv .byte W02 .byte BEND , c_v+36 .byte W01 - .byte VOL , 30*se_tama_mvl/mxv + .byte VOL , 30*se_orb_mvl/mxv .byte W01 - .byte 20*se_tama_mvl/mxv + .byte 20*se_orb_mvl/mxv .byte W01 - .byte 13*se_tama_mvl/mxv + .byte 13*se_orb_mvl/mxv .byte W01 - .byte 4*se_tama_mvl/mxv + .byte 4*se_orb_mvl/mxv .byte W02 .byte EOT .byte FINE @********************** Track 2 **********************@ -se_tama_2: - .byte KEYSH , se_tama_key+0 +se_orb_2: + .byte KEYSH , se_orb_key+0 .byte VOICE , 25 - .byte VOL , 15*se_tama_mvl/mxv + .byte VOL , 15*se_orb_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte TIE , Gs2 , v060 .byte W01 - .byte VOL , 21*se_tama_mvl/mxv + .byte VOL , 21*se_orb_mvl/mxv .byte W01 - .byte 33*se_tama_mvl/mxv + .byte 33*se_orb_mvl/mxv .byte W01 - .byte 41*se_tama_mvl/mxv + .byte 41*se_orb_mvl/mxv .byte W01 - .byte 49*se_tama_mvl/mxv + .byte 49*se_orb_mvl/mxv .byte W02 - .byte 55*se_tama_mvl/mxv + .byte 55*se_orb_mvl/mxv .byte W01 - .byte 61*se_tama_mvl/mxv + .byte 61*se_orb_mvl/mxv .byte W01 - .byte 69*se_tama_mvl/mxv + .byte 69*se_orb_mvl/mxv .byte W01 - .byte 76*se_tama_mvl/mxv + .byte 76*se_orb_mvl/mxv .byte W01 - .byte 80*se_tama_mvl/mxv + .byte 80*se_orb_mvl/mxv .byte W02 - .byte 86*se_tama_mvl/mxv + .byte 86*se_orb_mvl/mxv .byte W01 - .byte 90*se_tama_mvl/mxv + .byte 90*se_orb_mvl/mxv .byte W01 - .byte 100*se_tama_mvl/mxv + .byte 100*se_orb_mvl/mxv .byte W04 .byte W06 .byte W06 @@ -185,45 +185,45 @@ se_tama_2: .byte W05 .byte c_v+5 .byte W03 - .byte VOL , 97*se_tama_mvl/mxv + .byte VOL , 97*se_orb_mvl/mxv .byte BEND , c_v+6 .byte W03 - .byte VOL , 94*se_tama_mvl/mxv + .byte VOL , 94*se_orb_mvl/mxv .byte W01 .byte BEND , c_v+6 .byte W01 - .byte VOL , 87*se_tama_mvl/mxv + .byte VOL , 87*se_orb_mvl/mxv .byte W02 - .byte 83*se_tama_mvl/mxv + .byte 83*se_orb_mvl/mxv .byte BEND , c_v+8 .byte W02 .byte W01 - .byte VOL , 77*se_tama_mvl/mxv + .byte VOL , 77*se_orb_mvl/mxv .byte BEND , c_v+10 .byte W02 - .byte VOL , 66*se_tama_mvl/mxv + .byte VOL , 66*se_orb_mvl/mxv .byte BEND , c_v+14 .byte W03 - .byte VOL , 55*se_tama_mvl/mxv + .byte VOL , 55*se_orb_mvl/mxv .byte BEND , c_v+17 .byte W02 - .byte VOL , 45*se_tama_mvl/mxv + .byte VOL , 45*se_orb_mvl/mxv .byte BEND , c_v+24 .byte W02 - .byte VOL , 33*se_tama_mvl/mxv + .byte VOL , 33*se_orb_mvl/mxv .byte BEND , c_v+30 .byte W02 .byte c_v+41 .byte W01 - .byte VOL , 21*se_tama_mvl/mxv + .byte VOL , 21*se_orb_mvl/mxv .byte BEND , c_v+46 .byte W01 .byte c_v+55 .byte W01 - .byte VOL , 11*se_tama_mvl/mxv + .byte VOL , 11*se_orb_mvl/mxv .byte BEND , c_v+60 .byte W01 - .byte VOL , 5*se_tama_mvl/mxv + .byte VOL , 5*se_orb_mvl/mxv .byte BEND , c_v+63 .byte W02 .byte EOT @@ -232,15 +232,15 @@ se_tama_2: @******************************************************@ .align 2 -se_tama: +se_orb: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_tama_pri @ Priority - .byte se_tama_rev @ Reverb. + .byte se_orb_pri @ Priority + .byte se_orb_rev @ Reverb. - .word se_tama_grp + .word se_orb_grp - .word se_tama_1 - .word se_tama_2 + .word se_orb_1 + .word se_orb_2 .end diff --git a/sound/songs/se_pc_login.s b/sound/songs/se_pc_login.s new file mode 100644 index 000000000..9a8c72fdc --- /dev/null +++ b/sound/songs/se_pc_login.s @@ -0,0 +1,49 @@ + .include "MPlayDef.s" + + .equ se_pc_login_grp, voicegroup110 + .equ se_pc_login_pri, 5 + .equ se_pc_login_rev, reverb_set+50 + .equ se_pc_login_mvl, 127 + .equ se_pc_login_key, 0 + .equ se_pc_login_tbs, 1 + .equ se_pc_login_exg, 0 + .equ se_pc_login_cmp, 1 + + .section .rodata + .global se_pc_login + .align 2 + +@********************** Track 1 **********************@ + +se_pc_login_1: + .byte KEYSH , se_pc_login_key+0 + .byte TEMPO , 144*se_pc_login_tbs/2 + .byte VOICE , 4 + .byte XCMD , xIECV , 10 + .byte xIECL , 8 + .byte VOL , 100*se_pc_login_mvl/mxv + .byte BEND , c_v-6 + .byte N08 , Cn4 , v112 + .byte W08 + .byte N04 , Cn4 , v028 + .byte W04 + .byte N08 , Cn4 , v112 + .byte W08 + .byte N04 , Cn4 , v024 + .byte W04 + .byte FINE + +@******************************************************@ + .align 2 + +se_pc_login: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_pc_login_pri @ Priority + .byte se_pc_login_rev @ Reverb. + + .word se_pc_login_grp + + .word se_pc_login_1 + + .end diff --git a/sound/songs/se_pc_logon.s b/sound/songs/se_pc_logon.s deleted file mode 100644 index a1bffea83..000000000 --- a/sound/songs/se_pc_logon.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "MPlayDef.s" - - .equ se_pc_logon_grp, voicegroup110 - .equ se_pc_logon_pri, 5 - .equ se_pc_logon_rev, reverb_set+50 - .equ se_pc_logon_mvl, 127 - .equ se_pc_logon_key, 0 - .equ se_pc_logon_tbs, 1 - .equ se_pc_logon_exg, 0 - .equ se_pc_logon_cmp, 1 - - .section .rodata - .global se_pc_logon - .align 2 - -@********************** Track 1 **********************@ - -se_pc_logon_1: - .byte KEYSH , se_pc_logon_key+0 - .byte TEMPO , 144*se_pc_logon_tbs/2 - .byte VOICE , 4 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 100*se_pc_logon_mvl/mxv - .byte BEND , c_v-6 - .byte N08 , Cn4 , v112 - .byte W08 - .byte N04 , Cn4 , v028 - .byte W04 - .byte N08 , Cn4 , v112 - .byte W08 - .byte N04 , Cn4 , v024 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_pc_logon: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_pc_logon_pri @ Priority - .byte se_pc_logon_rev @ Reverb. - - .word se_pc_logon_grp - - .word se_pc_logon_1 - - .end diff --git a/sound/songs/se_poke_dead.s b/sound/songs/se_poke_dead.s deleted file mode 100644 index c571eabf3..000000000 --- a/sound/songs/se_poke_dead.s +++ /dev/null @@ -1,84 +0,0 @@ - .include "MPlayDef.s" - - .equ se_poke_dead_grp, voicegroup110 - .equ se_poke_dead_pri, 5 - .equ se_poke_dead_rev, reverb_set+50 - .equ se_poke_dead_mvl, 127 - .equ se_poke_dead_key, 0 - .equ se_poke_dead_tbs, 1 - .equ se_poke_dead_exg, 0 - .equ se_poke_dead_cmp, 1 - - .section .rodata - .global se_poke_dead - .align 2 - -@********************** Track 1 **********************@ - -se_poke_dead_1: - .byte KEYSH , se_poke_dead_key+0 - .byte TEMPO , 90*se_poke_dead_tbs/2 - .byte VOICE , 90 - .byte VOL , 110*se_poke_dead_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Cn4 , v100 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_poke_dead_2: - .byte KEYSH , se_poke_dead_key+0 - .byte VOICE , 124 - .byte BENDR , 12 - .byte VOL , 82*se_poke_dead_mvl/mxv - .byte BEND , c_v+0 - .byte N05 , Gs4 , v060 - .byte W03 - .byte VOL , 94*se_poke_dead_mvl/mxv - .byte W03 - .byte 103*se_poke_dead_mvl/mxv - .byte N22 - .byte W03 - .byte VOL , 110*se_poke_dead_mvl/mxv - .byte W03 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 3 **********************@ - -se_poke_dead_3: - .byte KEYSH , se_poke_dead_key+0 - .byte VOICE , 0 - .byte VOL , 110*se_poke_dead_mvl/mxv - .byte N06 , Cn3 , v080 - .byte W06 - .byte N18 , Cn3 , v092 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_poke_dead: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_poke_dead_pri @ Priority - .byte se_poke_dead_rev @ Reverb. - - .word se_poke_dead_grp - - .word se_poke_dead_1 - .word se_poke_dead_2 - .word se_poke_dead_3 - - .end diff --git a/sound/songs/se_pn_off.s b/sound/songs/se_pokenav_off.s index a9c5437bc..8332c497e 100644 --- a/sound/songs/se_pn_off.s +++ b/sound/songs/se_pokenav_off.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_pn_off_grp, voicegroup110 - .equ se_pn_off_pri, 5 - .equ se_pn_off_rev, reverb_set+50 - .equ se_pn_off_mvl, 127 - .equ se_pn_off_key, 0 - .equ se_pn_off_tbs, 1 - .equ se_pn_off_exg, 0 - .equ se_pn_off_cmp, 1 + .equ se_pokenav_off_grp, voicegroup110 + .equ se_pokenav_off_pri, 5 + .equ se_pokenav_off_rev, reverb_set+50 + .equ se_pokenav_off_mvl, 127 + .equ se_pokenav_off_key, 0 + .equ se_pokenav_off_tbs, 1 + .equ se_pokenav_off_exg, 0 + .equ se_pokenav_off_cmp, 1 .section .rodata - .global se_pn_off + .global se_pokenav_off .align 2 @********************** Track 1 **********************@ -se_pn_off_1: - .byte KEYSH , se_pn_off_key+0 - .byte TEMPO , 144*se_pn_off_tbs/2 +se_pokenav_off_1: + .byte KEYSH , se_pokenav_off_key+0 + .byte TEMPO , 144*se_pokenav_off_tbs/2 .byte VOICE , 4 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 100*se_pn_off_mvl/mxv + .byte VOL , 100*se_pokenav_off_mvl/mxv .byte BEND , c_v-6 .byte N02 , Gn4 , v060 .byte W02 @@ -43,10 +43,10 @@ se_pn_off_1: @********************** Track 2 **********************@ -se_pn_off_2: - .byte KEYSH , se_pn_off_key+0 +se_pokenav_off_2: + .byte KEYSH , se_pokenav_off_key+0 .byte VOICE , 14 - .byte VOL , 50*se_pn_off_mvl/mxv + .byte VOL , 50*se_pokenav_off_mvl/mxv .byte BEND , c_v-2 .byte W01 .byte N02 , Gn4 , v060 @@ -72,15 +72,15 @@ se_pn_off_2: @******************************************************@ .align 2 -se_pn_off: +se_pokenav_off: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_pn_off_pri @ Priority - .byte se_pn_off_rev @ Reverb. + .byte se_pokenav_off_pri @ Priority + .byte se_pokenav_off_rev @ Reverb. - .word se_pn_off_grp + .word se_pokenav_off_grp - .word se_pn_off_1 - .word se_pn_off_2 + .word se_pokenav_off_1 + .word se_pokenav_off_2 .end diff --git a/sound/songs/se_pn_on.s b/sound/songs/se_pokenav_on.s index 753508303..84a512464 100644 --- a/sound/songs/se_pn_on.s +++ b/sound/songs/se_pokenav_on.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_pn_on_grp, voicegroup110 - .equ se_pn_on_pri, 5 - .equ se_pn_on_rev, reverb_set+50 - .equ se_pn_on_mvl, 127 - .equ se_pn_on_key, 0 - .equ se_pn_on_tbs, 1 - .equ se_pn_on_exg, 0 - .equ se_pn_on_cmp, 1 + .equ se_pokenav_on_grp, voicegroup110 + .equ se_pokenav_on_pri, 5 + .equ se_pokenav_on_rev, reverb_set+50 + .equ se_pokenav_on_mvl, 127 + .equ se_pokenav_on_key, 0 + .equ se_pokenav_on_tbs, 1 + .equ se_pokenav_on_exg, 0 + .equ se_pokenav_on_cmp, 1 .section .rodata - .global se_pn_on + .global se_pokenav_on .align 2 @********************** Track 1 **********************@ -se_pn_on_1: - .byte KEYSH , se_pn_on_key+0 - .byte TEMPO , 144*se_pn_on_tbs/2 +se_pokenav_on_1: + .byte KEYSH , se_pokenav_on_key+0 + .byte TEMPO , 144*se_pokenav_on_tbs/2 .byte VOICE , 4 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 100*se_pn_on_mvl/mxv + .byte VOL , 100*se_pokenav_on_mvl/mxv .byte BEND , c_v-6 .byte N02 , Cn4 , v060 .byte W02 @@ -43,10 +43,10 @@ se_pn_on_1: @********************** Track 2 **********************@ -se_pn_on_2: - .byte KEYSH , se_pn_on_key+0 +se_pokenav_on_2: + .byte KEYSH , se_pokenav_on_key+0 .byte VOICE , 14 - .byte VOL , 50*se_pn_on_mvl/mxv + .byte VOL , 50*se_pokenav_on_mvl/mxv .byte BEND , c_v-2 .byte W01 .byte N02 , Cn4 , v060 @@ -72,15 +72,15 @@ se_pn_on_2: @******************************************************@ .align 2 -se_pn_on: +se_pokenav_on: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_pn_on_pri @ Priority - .byte se_pn_on_rev @ Reverb. + .byte se_pokenav_on_pri @ Priority + .byte se_pokenav_on_rev @ Reverb. - .word se_pn_on_grp + .word se_pokenav_on_grp - .word se_pn_on_1 - .word se_pn_on_2 + .word se_pokenav_on_1 + .word se_pokenav_on_2 .end diff --git a/sound/songs/se_mizu.s b/sound/songs/se_puddle.s index 0d3a4a411..3973db99f 100644 --- a/sound/songs/se_mizu.s +++ b/sound/songs/se_puddle.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_mizu_grp, voicegroup111 - .equ se_mizu_pri, 4 - .equ se_mizu_rev, reverb_set+50 - .equ se_mizu_mvl, 127 - .equ se_mizu_key, 0 - .equ se_mizu_tbs, 1 - .equ se_mizu_exg, 0 - .equ se_mizu_cmp, 1 + .equ se_puddle_grp, voicegroup111 + .equ se_puddle_pri, 4 + .equ se_puddle_rev, reverb_set+50 + .equ se_puddle_mvl, 127 + .equ se_puddle_key, 0 + .equ se_puddle_tbs, 1 + .equ se_puddle_exg, 0 + .equ se_puddle_cmp, 1 .section .rodata - .global se_mizu + .global se_puddle .align 2 @********************** Track 1 **********************@ -se_mizu_1: - .byte KEYSH , se_mizu_key+0 - .byte TEMPO , 150*se_mizu_tbs/2 +se_puddle_1: + .byte KEYSH , se_puddle_key+0 + .byte TEMPO , 150*se_puddle_tbs/2 .byte VOICE , 23 - .byte VOL , 20*se_mizu_mvl/mxv + .byte VOL , 20*se_puddle_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v-25 @@ -30,7 +30,7 @@ se_mizu_1: .byte c_v+9 .byte W04 .byte W02 - .byte VOL , 17*se_mizu_mvl/mxv + .byte VOL , 17*se_puddle_mvl/mxv .byte BEND , c_v+18 .byte N02 , Gs4 , v127 .byte W01 @@ -41,14 +41,14 @@ se_mizu_1: @******************************************************@ .align 2 -se_mizu: +se_puddle: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_mizu_pri @ Priority - .byte se_mizu_rev @ Reverb. + .byte se_puddle_pri @ Priority + .byte se_puddle_rev @ Reverb. - .word se_mizu_grp + .word se_puddle_grp - .word se_mizu_1 + .word se_puddle_1 .end diff --git a/sound/songs/se_rain.s b/sound/songs/se_rain.s new file mode 100644 index 000000000..8cc5f582d --- /dev/null +++ b/sound/songs/se_rain.s @@ -0,0 +1,65 @@ + .include "MPlayDef.s" + + .equ se_rain_grp, voicegroup111 + .equ se_rain_pri, 2 + .equ se_rain_rev, reverb_set+50 + .equ se_rain_mvl, 127 + .equ se_rain_key, 0 + .equ se_rain_tbs, 1 + .equ se_rain_stopxg, 0 + .equ se_rain_cmp, 1 + + .section .rodata + .global se_rain + .align 2 + +@********************** Track 1 **********************@ + +se_rain_1: + .byte KEYSH , se_rain_key+0 + .byte TEMPO , 220*se_rain_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 15*se_rain_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Bn3 , v052 + .byte W03 + .byte VOL , 27*se_rain_mvl/mxv + .byte W03 + .byte 39*se_rain_mvl/mxv + .byte W03 + .byte 44*se_rain_mvl/mxv + .byte W03 + .byte 52*se_rain_mvl/mxv + .byte W03 + .byte 59*se_rain_mvl/mxv + .byte W03 + .byte 68*se_rain_mvl/mxv + .byte W03 + .byte 80*se_rain_mvl/mxv + .byte W03 +se_rain_1_B1: + .byte N60 , Bn3 , v052 + .byte W24 + .byte W24 + .byte W12 + .byte GOTO + .word se_rain_1_B1 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_rain: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_rain_pri @ Priority + .byte se_rain_rev @ Reverb. + + .word se_rain_grp + + .word se_rain_1 + + .end diff --git a/sound/songs/se_rain_stop.s b/sound/songs/se_rain_stop.s new file mode 100644 index 000000000..154424ab1 --- /dev/null +++ b/sound/songs/se_rain_stop.s @@ -0,0 +1,74 @@ + .include "MPlayDef.s" + + .equ se_rain_stop_grp, voicegroup111 + .equ se_rain_stop_pri, 2 + .equ se_rain_stop_rev, reverb_set+50 + .equ se_rain_stop_mvl, 127 + .equ se_rain_stop_key, 0 + .equ se_rain_stop_tbs, 1 + .equ se_rain_stop_exg, 0 + .equ se_rain_stop_cmp, 1 + + .section .rodata + .global se_rain_stop + .align 2 + +@********************** Track 1 **********************@ + +se_rain_stop_1: + .byte KEYSH , se_rain_stop_key+0 + .byte TEMPO , 220*se_rain_stop_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 80*se_rain_stop_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Bn3 , v052 + .byte W03 + .byte VOL , 76*se_rain_stop_mvl/mxv + .byte W03 + .byte 74*se_rain_stop_mvl/mxv + .byte W03 + .byte 72*se_rain_stop_mvl/mxv + .byte W03 + .byte 68*se_rain_stop_mvl/mxv + .byte W03 + .byte 64*se_rain_stop_mvl/mxv + .byte W03 + .byte 58*se_rain_stop_mvl/mxv + .byte W03 + .byte 50*se_rain_stop_mvl/mxv + .byte W03 + .byte 44*se_rain_stop_mvl/mxv + .byte N24 + .byte W03 + .byte VOL , 38*se_rain_stop_mvl/mxv + .byte W03 + .byte 34*se_rain_stop_mvl/mxv + .byte W03 + .byte 27*se_rain_stop_mvl/mxv + .byte W03 + .byte 20*se_rain_stop_mvl/mxv + .byte W03 + .byte 15*se_rain_stop_mvl/mxv + .byte W03 + .byte 10*se_rain_stop_mvl/mxv + .byte W03 + .byte 6*se_rain_stop_mvl/mxv + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_rain_stop: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_rain_stop_pri @ Priority + .byte se_rain_stop_rev @ Reverb. + + .word se_rain_stop_grp + + .word se_rain_stop_1 + + .end diff --git a/sound/songs/se_repel.s b/sound/songs/se_repel.s new file mode 100644 index 000000000..3d1699556 --- /dev/null +++ b/sound/songs/se_repel.s @@ -0,0 +1,55 @@ + .include "MPlayDef.s" + + .equ se_repel_grp, voicegroup110 + .equ se_repel_pri, 4 + .equ se_repel_rev, reverb_set+50 + .equ se_repel_mvl, 127 + .equ se_repel_key, 0 + .equ se_repel_tbs, 1 + .equ se_repel_exg, 0 + .equ se_repel_cmp, 1 + + .section .rodata + .global se_repel + .align 2 + +@********************** Track 1 **********************@ + +se_repel_1: + .byte KEYSH , se_repel_key+0 + .byte TEMPO , 220*se_repel_tbs/2 + .byte VOICE , 123 + .byte VOL , 90*se_repel_mvl/mxv + .byte N03 , Cn4 , v060 + .byte W03 + .byte VOL , 62*se_repel_mvl/mxv + .byte N32 , Gs4 + .byte W03 + .byte VOL , 68*se_repel_mvl/mxv + .byte W03 + .byte 72*se_repel_mvl/mxv + .byte W03 + .byte 78*se_repel_mvl/mxv + .byte W03 + .byte 85*se_repel_mvl/mxv + .byte W03 + .byte 90*se_repel_mvl/mxv + .byte W06 + .byte W06 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_repel: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_repel_pri @ Priority + .byte se_repel_rev @ Reverb. + + .word se_repel_grp + + .word se_repel_1 + + .end diff --git a/sound/songs/se_rotating_gate.s b/sound/songs/se_rotating_gate.s new file mode 100644 index 000000000..6945f90fd --- /dev/null +++ b/sound/songs/se_rotating_gate.s @@ -0,0 +1,62 @@ + .include "MPlayDef.s" + + .equ se_rotating_gate_grp, voicegroup111 + .equ se_rotating_gate_pri, 4 + .equ se_rotating_gate_rev, reverb_set+50 + .equ se_rotating_gate_mvl, 127 + .equ se_rotating_gate_key, 0 + .equ se_rotating_gate_tbs, 1 + .equ se_rotating_gate_exg, 0 + .equ se_rotating_gate_cmp, 1 + + .section .rodata + .global se_rotating_gate + .align 2 + +@********************** Track 1 **********************@ + +se_rotating_gate_1: + .byte KEYSH , se_rotating_gate_key+0 + .byte TEMPO , 220*se_rotating_gate_tbs/2 + .byte VOICE , 9 + .byte VOL , 90*se_rotating_gate_mvl/mxv + .byte BEND , c_v+0 + .byte N03 , Gn4 , v112 + .byte W03 + .byte Dn4 + .byte W03 + .byte Gn4 + .byte W03 + .byte N21 , Gn5 + .byte W03 + .byte W03 + .byte VOL , 81*se_rotating_gate_mvl/mxv + .byte BEND , c_v+6 + .byte W03 + .byte VOL , 72*se_rotating_gate_mvl/mxv + .byte BEND , c_v+20 + .byte W03 + .byte VOL , 46*se_rotating_gate_mvl/mxv + .byte BEND , c_v+37 + .byte W03 + .byte VOL , 24*se_rotating_gate_mvl/mxv + .byte BEND , c_v+63 + .byte W03 + .byte VOL , 7*se_rotating_gate_mvl/mxv + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_rotating_gate: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_rotating_gate_pri @ Priority + .byte se_rotating_gate_rev @ Reverb. + + .word se_rotating_gate_grp + + .word se_rotating_gate_1 + + .end diff --git a/sound/songs/se_roulette_ball.s b/sound/songs/se_roulette_ball.s new file mode 100644 index 000000000..025ca0f17 --- /dev/null +++ b/sound/songs/se_roulette_ball.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_roulette_ball_grp, voicegroup111 + .equ se_roulette_ball_pri, 2 + .equ se_roulette_ball_rev, reverb_set+50 + .equ se_roulette_ball_mvl, 127 + .equ se_roulette_ball_key, 0 + .equ se_roulette_ball_tbs, 1 + .equ se_roulette_ball2xg, 0 + .equ se_roulette_ball_cmp, 1 + + .section .rodata + .global se_roulette_ball + .align 2 + +@********************** Track 1 **********************@ + +se_roulette_ball_1: + .byte KEYSH , se_roulette_ball_key+0 + .byte TEMPO , 150*se_roulette_ball_tbs/2 + .byte VOICE , 63 + .byte VOL , 110*se_roulette_ball_mvl/mxv + .byte BEND , c_v+0 + .byte TIE , Dn3 , v127 + .byte W96 + .byte W96 + .byte W96 + .byte W96 + .byte W96 + .byte EOT + .byte FINE + +@******************************************************@ + .align 2 + +se_roulette_ball: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_roulette_ball_pri @ Priority + .byte se_roulette_ball_rev @ Reverb. + + .word se_roulette_ball_grp + + .word se_roulette_ball_1 + + .end diff --git a/sound/songs/se_roulette_ball2.s b/sound/songs/se_roulette_ball2.s new file mode 100644 index 000000000..f7edfd992 --- /dev/null +++ b/sound/songs/se_roulette_ball2.s @@ -0,0 +1,75 @@ + .include "MPlayDef.s" + + .equ se_roulette_ball2_grp, voicegroup111 + .equ se_roulette_ball2_pri, 2 + .equ se_roulette_ball2_rev, reverb_set+50 + .equ se_roulette_ball2_mvl, 127 + .equ se_roulette_ball2_key, 0 + .equ se_roulette_ball2_tbs, 1 + .equ se_roulette_ball2_exg, 0 + .equ se_roulette_ball2_cmp, 1 + + .section .rodata + .global se_roulette_ball2 + .align 2 + +@********************** Track 1 **********************@ + +se_roulette_ball2_1: + .byte KEYSH , se_roulette_ball2_key+0 + .byte TEMPO , 150*se_roulette_ball2_tbs/2 + .byte VOICE , 63 + .byte BENDR , 6 + .byte VOL , 110*se_roulette_ball2_mvl/mxv + .byte BEND , c_v+0 + .byte N72 , Dn3 , v127 + .byte W06 + .byte VOL , 107*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-3 + .byte W06 + .byte VOL , 106*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-5 + .byte W06 + .byte VOL , 104*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-7 + .byte W06 + .byte VOL , 102*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-10 + .byte W06 + .byte VOL , 97*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-12 + .byte W06 + .byte VOL , 90*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-14 + .byte W06 + .byte VOL , 73*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-19 + .byte W06 + .byte VOL , 58*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-24 + .byte W06 + .byte VOL , 40*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-29 + .byte W06 + .byte VOL , 25*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-35 + .byte W06 + .byte VOL , 12*se_roulette_ball2_mvl/mxv + .byte BEND , c_v-46 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_roulette_ball2: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_roulette_ball2_pri @ Priority + .byte se_roulette_ball2_rev @ Reverb. + + .word se_roulette_ball2_grp + + .word se_roulette_ball2_1 + + .end diff --git a/sound/songs/se_ru_gashin.s b/sound/songs/se_ru_gashin.s deleted file mode 100644 index 268713b27..000000000 --- a/sound/songs/se_ru_gashin.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ru_gashin_grp, voicegroup111 - .equ se_ru_gashin_pri, 4 - .equ se_ru_gashin_rev, reverb_set+50 - .equ se_ru_gashin_mvl, 127 - .equ se_ru_gashin_key, 0 - .equ se_ru_gashin_tbs, 1 - .equ se_ru_gashin_exg, 0 - .equ se_ru_gashin_cmp, 1 - - .section .rodata - .global se_ru_gashin - .align 2 - -@********************** Track 1 **********************@ - -se_ru_gashin_1: - .byte KEYSH , se_ru_gashin_key+0 - .byte TEMPO , 150*se_ru_gashin_tbs/2 - .byte VOICE , 3 - .byte VOL , 90*se_ru_gashin_mvl/mxv - .byte BEND , c_v+16 - .byte N03 , En3 , v112 - .byte W01 - .byte BEND , c_v+38 - .byte W01 - .byte c_v+62 - .byte W02 - .byte N12 , En4 - .byte W02 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_ru_gashin_2: - .byte KEYSH , se_ru_gashin_key+0 - .byte VOICE , 4 - .byte VOL , 90*se_ru_gashin_mvl/mxv - .byte N03 , Gs3 , v096 - .byte W04 - .byte N12 , Gs4 - .byte W02 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_ru_gashin: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_ru_gashin_pri @ Priority - .byte se_ru_gashin_rev @ Reverb. - - .word se_ru_gashin_grp - - .word se_ru_gashin_1 - .word se_ru_gashin_2 - - .end diff --git a/sound/songs/se_seikai.s b/sound/songs/se_seikai.s deleted file mode 100644 index 1487eb508..000000000 --- a/sound/songs/se_seikai.s +++ /dev/null @@ -1,44 +0,0 @@ - .include "MPlayDef.s" - - .equ se_seikai_grp, voicegroup110 - .equ se_seikai_pri, 4 - .equ se_seikai_rev, reverb_set+50 - .equ se_seikai_mvl, 127 - .equ se_seikai_key, 0 - .equ se_seikai_tbs, 1 - .equ se_seikai_exg, 0 - .equ se_seikai_cmp, 1 - - .section .rodata - .global se_seikai - .align 2 - -@********************** Track 1 **********************@ - -se_seikai_1: - .byte KEYSH , se_seikai_key+0 - .byte TEMPO , 240*se_seikai_tbs/2 - .byte VOICE , 5 - .byte BENDR , 12 - .byte VOL , 80*se_seikai_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Gn5 , v127 - .byte W06 - .byte N18 , Ds5 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_seikai: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_seikai_pri @ Priority - .byte se_seikai_rev @ Reverb. - - .word se_seikai_grp - - .word se_seikai_1 - - .end diff --git a/sound/songs/se_reapoke.s b/sound/songs/se_shiny.s index cd22622bd..b92c067f6 100644 --- a/sound/songs/se_reapoke.s +++ b/sound/songs/se_shiny.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_reapoke_grp, voicegroup111 - .equ se_reapoke_pri, 5 - .equ se_reapoke_rev, reverb_set+50 - .equ se_reapoke_mvl, 127 - .equ se_reapoke_key, 0 - .equ se_reapoke_tbs, 1 - .equ se_reapoke_exg, 0 - .equ se_reapoke_cmp, 1 + .equ se_shiny_grp, voicegroup111 + .equ se_shiny_pri, 5 + .equ se_shiny_rev, reverb_set+50 + .equ se_shiny_mvl, 127 + .equ se_shiny_key, 0 + .equ se_shiny_tbs, 1 + .equ se_shiny_exg, 0 + .equ se_shiny_cmp, 1 .section .rodata - .global se_reapoke + .global se_shiny .align 2 @********************** Track 1 **********************@ -se_reapoke_1: - .byte KEYSH , se_reapoke_key+0 - .byte TEMPO , 220*se_reapoke_tbs/2 +se_shiny_1: + .byte KEYSH , se_shiny_key+0 + .byte TEMPO , 220*se_shiny_tbs/2 .byte VOICE , 46 - .byte VOL , 95*se_reapoke_mvl/mxv + .byte VOL , 95*se_shiny_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+1 @@ -93,14 +93,14 @@ se_reapoke_1: @******************************************************@ .align 2 -se_reapoke: +se_shiny: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_reapoke_pri @ Priority - .byte se_reapoke_rev @ Reverb. + .byte se_shiny_pri @ Priority + .byte se_shiny_rev @ Reverb. - .word se_reapoke_grp + .word se_shiny_grp - .word se_reapoke_1 + .word se_shiny_1 .end diff --git a/sound/songs/se_ship.s b/sound/songs/se_ship.s new file mode 100644 index 000000000..a2f08daf5 --- /dev/null +++ b/sound/songs/se_ship.s @@ -0,0 +1,94 @@ + .include "MPlayDef.s" + + .equ se_ship_grp, voicegroup110 + .equ se_ship_pri, 4 + .equ se_ship_rev, reverb_set+50 + .equ se_ship_mvl, 127 + .equ se_ship_key, 0 + .equ se_ship_tbs, 1 + .equ se_ship_exg, 0 + .equ se_ship_cmp, 1 + + .section .rodata + .global se_ship + .align 2 + +@********************** Track 1 **********************@ + +se_ship_1: + .byte KEYSH , se_ship_key+0 + .byte TEMPO , 220*se_ship_tbs/2 + .byte VOICE , 123 + .byte VOL , 75*se_ship_mvl/mxv + .byte N03 , Ds3 , v127 + .byte W03 + .byte TIE , Cn4 + .byte W21 + .byte W24 + .byte W18 + .byte VOL , 75*se_ship_mvl/mxv + .byte W06 + .byte 71*se_ship_mvl/mxv + .byte W05 + .byte 67*se_ship_mvl/mxv + .byte W03 + .byte 62*se_ship_mvl/mxv + .byte W04 + .byte 59*se_ship_mvl/mxv + .byte W05 + .byte 57*se_ship_mvl/mxv + .byte W03 + .byte 54*se_ship_mvl/mxv + .byte W04 + .byte W02 + .byte 50*se_ship_mvl/mxv + .byte W03 + .byte 49*se_ship_mvl/mxv + .byte W03 + .byte 44*se_ship_mvl/mxv + .byte W04 + .byte 41*se_ship_mvl/mxv + .byte W02 + .byte 38*se_ship_mvl/mxv + .byte W03 + .byte 35*se_ship_mvl/mxv + .byte W03 + .byte 32*se_ship_mvl/mxv + .byte W04 + .byte 28*se_ship_mvl/mxv + .byte W02 + .byte 24*se_ship_mvl/mxv + .byte W03 + .byte 21*se_ship_mvl/mxv + .byte W03 + .byte 18*se_ship_mvl/mxv + .byte W04 + .byte 14*se_ship_mvl/mxv + .byte W02 + .byte 11*se_ship_mvl/mxv + .byte W03 + .byte 9*se_ship_mvl/mxv + .byte W03 + .byte 6*se_ship_mvl/mxv + .byte W04 + .byte 3*se_ship_mvl/mxv + .byte W02 + .byte 1*se_ship_mvl/mxv + .byte W22 + .byte EOT + .byte FINE + +@******************************************************@ + .align 2 + +se_ship: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_ship_pri @ Priority + .byte se_ship_rev @ Reverb. + + .word se_ship_grp + + .word se_ship_1 + + .end diff --git a/sound/songs/se_regi.s b/sound/songs/se_shop.s index d047f270f..d7b2a8b75 100644 --- a/sound/songs/se_regi.s +++ b/sound/songs/se_shop.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_regi_grp, voicegroup110 - .equ se_regi_pri, 5 - .equ se_regi_rev, reverb_set+50 - .equ se_regi_mvl, 127 - .equ se_regi_key, 0 - .equ se_regi_tbs, 1 - .equ se_regi_exg, 0 - .equ se_regi_cmp, 1 + .equ se_shop_grp, voicegroup110 + .equ se_shop_pri, 5 + .equ se_shop_rev, reverb_set+50 + .equ se_shop_mvl, 127 + .equ se_shop_key, 0 + .equ se_shop_tbs, 1 + .equ se_shop_exg, 0 + .equ se_shop_cmp, 1 .section .rodata - .global se_regi + .global se_shop .align 2 @********************** Track 1 **********************@ -se_regi_1: - .byte KEYSH , se_regi_key+0 - .byte TEMPO , 128*se_regi_tbs/2 +se_shop_1: + .byte KEYSH , se_shop_key+0 + .byte TEMPO , 128*se_shop_tbs/2 .byte VOICE , 6 .byte BENDR , 12 - .byte VOL , 90*se_regi_mvl/mxv + .byte VOL , 90*se_shop_mvl/mxv .byte BEND , c_v-1 .byte N01 , Ds3 , v127 .byte W02 @@ -33,10 +33,10 @@ se_regi_1: @********************** Track 2 **********************@ -se_regi_2: - .byte KEYSH , se_regi_key+0 +se_shop_2: + .byte KEYSH , se_shop_key+0 .byte VOICE , 14 - .byte VOL , 90*se_regi_mvl/mxv + .byte VOL , 90*se_shop_mvl/mxv .byte BEND , c_v-8 .byte W02 .byte N03 , Gs3 , v060 @@ -49,15 +49,15 @@ se_regi_2: @******************************************************@ .align 2 -se_regi: +se_shop: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_regi_pri @ Priority - .byte se_regi_rev @ Reverb. + .byte se_shop_pri @ Priority + .byte se_shop_rev @ Reverb. - .word se_regi_grp + .word se_shop_grp - .word se_regi_1 - .word se_regi_2 + .word se_shop_1 + .word se_shop_2 .end diff --git a/sound/songs/se_sliding_door.s b/sound/songs/se_sliding_door.s new file mode 100644 index 000000000..be5408e7a --- /dev/null +++ b/sound/songs/se_sliding_door.s @@ -0,0 +1,41 @@ + .include "MPlayDef.s" + + .equ se_sliding_door_grp, voicegroup111 + .equ se_sliding_door_pri, 4 + .equ se_sliding_door_rev, reverb_set+50 + .equ se_sliding_door_mvl, 127 + .equ se_sliding_door_key, 0 + .equ se_sliding_door_tbs, 1 + .equ se_sliding_door_exg, 0 + .equ se_sliding_door_cmp, 1 + + .section .rodata + .global se_sliding_door + .align 2 + +@********************** Track 1 **********************@ + +se_sliding_door_1: + .byte KEYSH , se_sliding_door_key+0 + .byte TEMPO , 120*se_sliding_door_tbs/2 + .byte VOICE , 1 + .byte VOL , 95*se_sliding_door_mvl/mxv + .byte N12 , Cn2 , v127 + .byte W12 + .byte VOL , 0*se_sliding_door_mvl/mxv + .byte FINE + +@******************************************************@ + .align 2 + +se_sliding_door: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_sliding_door_pri @ Priority + .byte se_sliding_door_rev @ Reverb. + + .word se_sliding_door_grp + + .word se_sliding_door_1 + + .end diff --git a/sound/songs/se_stop.s b/sound/songs/se_stop.s deleted file mode 100644 index f527ab84a..000000000 --- a/sound/songs/se_stop.s +++ /dev/null @@ -1,28 +0,0 @@ - .include "MPlayDef.s" - - .equ se_stop_grp, voicegroup000 - .equ se_stop_pri, 0 - .equ se_stop_rev, reverb_set+40 - .equ se_stop_mvl, 127 - .equ se_stop_key, 0 - .equ se_stop_tbs, 1 - .equ se_stop_exg, 0 - .equ se_stop_cmp, 1 - - .section .rodata - .global se_stop - .align 2 - -@******************************************************@ - .align 2 - -se_stop: - .byte 0 @ NumTrks - .byte 0 @ NumBlks - .byte se_stop_pri @ Priority - .byte se_stop_rev @ Reverb. - - .word se_stop_grp - - - .end diff --git a/sound/songs/se_success.s b/sound/songs/se_success.s new file mode 100644 index 000000000..2f6c10fde --- /dev/null +++ b/sound/songs/se_success.s @@ -0,0 +1,44 @@ + .include "MPlayDef.s" + + .equ se_success_grp, voicegroup110 + .equ se_success_pri, 4 + .equ se_success_rev, reverb_set+50 + .equ se_success_mvl, 127 + .equ se_success_key, 0 + .equ se_success_tbs, 1 + .equ se_success_exg, 0 + .equ se_success_cmp, 1 + + .section .rodata + .global se_success + .align 2 + +@********************** Track 1 **********************@ + +se_success_1: + .byte KEYSH , se_success_key+0 + .byte TEMPO , 240*se_success_tbs/2 + .byte VOICE , 5 + .byte BENDR , 12 + .byte VOL , 80*se_success_mvl/mxv + .byte BEND , c_v+0 + .byte N06 , Gn5 , v127 + .byte W06 + .byte N18 , Ds5 + .byte W18 + .byte FINE + +@******************************************************@ + .align 2 + +se_success: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_success_pri @ Priority + .byte se_success_rev @ Reverb. + + .word se_success_grp + + .word se_success_1 + + .end diff --git a/sound/songs/se_suikomu.s b/sound/songs/se_suikomu.s deleted file mode 100644 index ae8c72d77..000000000 --- a/sound/songs/se_suikomu.s +++ /dev/null @@ -1,78 +0,0 @@ - .include "MPlayDef.s" - - .equ se_suikomu_grp, voicegroup110 - .equ se_suikomu_pri, 5 - .equ se_suikomu_rev, reverb_set+50 - .equ se_suikomu_mvl, 127 - .equ se_suikomu_key, 0 - .equ se_suikomu_tbs, 1 - .equ se_suikomu_exg, 0 - .equ se_suikomu_cmp, 1 - - .section .rodata - .global se_suikomu - .align 2 - -@********************** Track 1 **********************@ - -se_suikomu_1: - .byte KEYSH , se_suikomu_key+0 - .byte VOICE , 13 - .byte BENDR , 12 - .byte VOL , 12*se_suikomu_mvl/mxv - .byte BEND , c_v+49 - .byte N06 , Gn4 , v080 - .byte W01 - .byte VOL , 44*se_suikomu_mvl/mxv - .byte BEND , c_v+22 - .byte W01 - .byte VOL , 75*se_suikomu_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 87*se_suikomu_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 100*se_suikomu_mvl/mxv - .byte BEND , c_v+54 - .byte W01 - .byte c_v+63 - .byte W01 - .byte W03 - .byte N03 , Gn4 , v040 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_suikomu_2: - .byte KEYSH , se_suikomu_key+0 - .byte VOICE , 123 - .byte VOL , 59*se_suikomu_mvl/mxv - .byte N06 , Gs4 , v052 - .byte W01 - .byte VOL , 72*se_suikomu_mvl/mxv - .byte W01 - .byte 90*se_suikomu_mvl/mxv - .byte W01 - .byte 100*se_suikomu_mvl/mxv - .byte W03 - .byte W03 - .byte N03 , Gs4 , v024 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_suikomu: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_suikomu_pri @ Priority - .byte se_suikomu_rev @ Reverb. - - .word se_suikomu_grp - - .word se_suikomu_1 - .word se_suikomu_2 - - .end diff --git a/sound/songs/se_kouka_h.s b/sound/songs/se_super_effective.s index ee667b618..3857ab127 100644 --- a/sound/songs/se_kouka_h.s +++ b/sound/songs/se_super_effective.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_kouka_h_grp, voicegroup110 - .equ se_kouka_h_pri, 5 - .equ se_kouka_h_rev, reverb_set+50 - .equ se_kouka_h_mvl, 127 - .equ se_kouka_h_key, 0 - .equ se_kouka_h_tbs, 1 - .equ se_kouka_h_exg, 0 - .equ se_kouka_h_cmp, 1 + .equ se_super_effective_grp, voicegroup110 + .equ se_super_effective_pri, 5 + .equ se_super_effective_rev, reverb_set+50 + .equ se_super_effective_mvl, 127 + .equ se_super_effective_key, 0 + .equ se_super_effective_tbs, 1 + .equ se_super_effective_exg, 0 + .equ se_super_effective_cmp, 1 .section .rodata - .global se_kouka_h + .global se_super_effective .align 2 @********************** Track 1 **********************@ -se_kouka_h_1: - .byte KEYSH , se_kouka_h_key+0 - .byte TEMPO , 90*se_kouka_h_tbs/2 +se_super_effective_1: + .byte KEYSH , se_super_effective_key+0 + .byte TEMPO , 90*se_super_effective_tbs/2 .byte VOICE , 125 - .byte VOL , 110*se_kouka_h_mvl/mxv + .byte VOL , 110*se_super_effective_mvl/mxv .byte N03 , Cn3 , v100 .byte W03 .byte An2 @@ -53,10 +53,10 @@ se_kouka_h_1: @********************** Track 2 **********************@ -se_kouka_h_2: - .byte KEYSH , se_kouka_h_key+0 +se_super_effective_2: + .byte KEYSH , se_super_effective_key+0 .byte VOICE , 0 - .byte VOL , 110*se_kouka_h_mvl/mxv + .byte VOL , 110*se_super_effective_mvl/mxv .byte N03 , Cn4 , v127 .byte W03 .byte Cn3 @@ -91,15 +91,15 @@ se_kouka_h_2: @******************************************************@ .align 2 -se_kouka_h: +se_super_effective: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_kouka_h_pri @ Priority - .byte se_kouka_h_rev @ Reverb. + .byte se_super_effective_pri @ Priority + .byte se_super_effective_rev @ Reverb. - .word se_kouka_h_grp + .word se_super_effective_grp - .word se_kouka_h_1 - .word se_kouka_h_2 + .word se_super_effective_1 + .word se_super_effective_2 .end diff --git a/sound/songs/se_switch.s b/sound/songs/se_switch.s new file mode 100644 index 000000000..02d3b2c5e --- /dev/null +++ b/sound/songs/se_switch.s @@ -0,0 +1,47 @@ + .include "MPlayDef.s" + + .equ se_switch_grp, voicegroup110 + .equ se_switch_pri, 4 + .equ se_switch_rev, reverb_set+50 + .equ se_switch_mvl, 127 + .equ se_switch_key, 0 + .equ se_switch_tbs, 1 + .equ se_switch_exg, 0 + .equ se_switch_cmp, 1 + + .section .rodata + .global se_switch + .align 2 + +@********************** Track 1 **********************@ + +se_switch_1: + .byte KEYSH , se_switch_key+0 + .byte TEMPO , 150*se_switch_tbs/2 + .byte VOICE , 122 + .byte VOL , 100*se_switch_mvl/mxv + .byte N01 , Ds3 , v127 + .byte W02 + .byte VOICE , 126 + .byte N01 , Gs4 + .byte W01 + .byte W03 + .byte W01 + .byte Gs4 , v088 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_switch: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_switch_pri @ Priority + .byte se_switch_rev @ Reverb. + + .word se_switch_grp + + .word se_switch_1 + + .end diff --git a/sound/songs/se_t_ame.s b/sound/songs/se_t_ame.s deleted file mode 100644 index 35cee7692..000000000 --- a/sound/songs/se_t_ame.s +++ /dev/null @@ -1,65 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_ame_grp, voicegroup111 - .equ se_t_ame_pri, 2 - .equ se_t_ame_rev, reverb_set+50 - .equ se_t_ame_mvl, 127 - .equ se_t_ame_key, 0 - .equ se_t_ame_tbs, 1 - .equ se_t_ame_exg, 0 - .equ se_t_ame_cmp, 1 - - .section .rodata - .global se_t_ame - .align 2 - -@********************** Track 1 **********************@ - -se_t_ame_1: - .byte KEYSH , se_t_ame_key+0 - .byte TEMPO , 220*se_t_ame_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 15*se_t_ame_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v060 - .byte W03 - .byte VOL , 27*se_t_ame_mvl/mxv - .byte W03 - .byte 39*se_t_ame_mvl/mxv - .byte W03 - .byte 44*se_t_ame_mvl/mxv - .byte W03 - .byte 52*se_t_ame_mvl/mxv - .byte W03 - .byte 59*se_t_ame_mvl/mxv - .byte W03 - .byte 68*se_t_ame_mvl/mxv - .byte W03 - .byte 80*se_t_ame_mvl/mxv - .byte W03 -se_t_ame_1_B1: - .byte N60 , Gn3 , v060 - .byte W24 - .byte W24 - .byte W12 - .byte GOTO - .word se_t_ame_1_B1 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_ame: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_ame_pri @ Priority - .byte se_t_ame_rev @ Reverb. - - .word se_t_ame_grp - - .word se_t_ame_1 - - .end diff --git a/sound/songs/se_t_ame_e.s b/sound/songs/se_t_ame_e.s deleted file mode 100644 index 8511f55d0..000000000 --- a/sound/songs/se_t_ame_e.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_ame_e_grp, voicegroup111 - .equ se_t_ame_e_pri, 2 - .equ se_t_ame_e_rev, reverb_set+50 - .equ se_t_ame_e_mvl, 127 - .equ se_t_ame_e_key, 0 - .equ se_t_ame_e_tbs, 1 - .equ se_t_ame_e_exg, 0 - .equ se_t_ame_e_cmp, 1 - - .section .rodata - .global se_t_ame_e - .align 2 - -@********************** Track 1 **********************@ - -se_t_ame_e_1: - .byte KEYSH , se_t_ame_e_key+0 - .byte TEMPO , 220*se_t_ame_e_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 80*se_t_ame_e_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v060 - .byte W03 - .byte VOL , 76*se_t_ame_e_mvl/mxv - .byte W03 - .byte 74*se_t_ame_e_mvl/mxv - .byte W03 - .byte 72*se_t_ame_e_mvl/mxv - .byte W03 - .byte 68*se_t_ame_e_mvl/mxv - .byte W03 - .byte 64*se_t_ame_e_mvl/mxv - .byte W03 - .byte 58*se_t_ame_e_mvl/mxv - .byte W03 - .byte 50*se_t_ame_e_mvl/mxv - .byte W03 - .byte 44*se_t_ame_e_mvl/mxv - .byte N24 - .byte W03 - .byte VOL , 38*se_t_ame_e_mvl/mxv - .byte W03 - .byte 34*se_t_ame_e_mvl/mxv - .byte W03 - .byte 27*se_t_ame_e_mvl/mxv - .byte W03 - .byte 20*se_t_ame_e_mvl/mxv - .byte W03 - .byte 15*se_t_ame_e_mvl/mxv - .byte W03 - .byte 10*se_t_ame_e_mvl/mxv - .byte W03 - .byte 6*se_t_ame_e_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_ame_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_ame_e_pri @ Priority - .byte se_t_ame_e_rev @ Reverb. - - .word se_t_ame_e_grp - - .word se_t_ame_e_1 - - .end diff --git a/sound/songs/se_t_koame.s b/sound/songs/se_t_koame.s deleted file mode 100644 index 3dbcc7559..000000000 --- a/sound/songs/se_t_koame.s +++ /dev/null @@ -1,65 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_koame_grp, voicegroup111 - .equ se_t_koame_pri, 2 - .equ se_t_koame_rev, reverb_set+50 - .equ se_t_koame_mvl, 127 - .equ se_t_koame_key, 0 - .equ se_t_koame_tbs, 1 - .equ se_t_koame_exg, 0 - .equ se_t_koame_cmp, 1 - - .section .rodata - .global se_t_koame - .align 2 - -@********************** Track 1 **********************@ - -se_t_koame_1: - .byte KEYSH , se_t_koame_key+0 - .byte TEMPO , 220*se_t_koame_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 15*se_t_koame_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Bn3 , v052 - .byte W03 - .byte VOL , 27*se_t_koame_mvl/mxv - .byte W03 - .byte 39*se_t_koame_mvl/mxv - .byte W03 - .byte 44*se_t_koame_mvl/mxv - .byte W03 - .byte 52*se_t_koame_mvl/mxv - .byte W03 - .byte 59*se_t_koame_mvl/mxv - .byte W03 - .byte 68*se_t_koame_mvl/mxv - .byte W03 - .byte 80*se_t_koame_mvl/mxv - .byte W03 -se_t_koame_1_B1: - .byte N60 , Bn3 , v052 - .byte W24 - .byte W24 - .byte W12 - .byte GOTO - .word se_t_koame_1_B1 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_koame: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_koame_pri @ Priority - .byte se_t_koame_rev @ Reverb. - - .word se_t_koame_grp - - .word se_t_koame_1 - - .end diff --git a/sound/songs/se_t_koame_e.s b/sound/songs/se_t_koame_e.s deleted file mode 100644 index fc9b1ee72..000000000 --- a/sound/songs/se_t_koame_e.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_koame_e_grp, voicegroup111 - .equ se_t_koame_e_pri, 2 - .equ se_t_koame_e_rev, reverb_set+50 - .equ se_t_koame_e_mvl, 127 - .equ se_t_koame_e_key, 0 - .equ se_t_koame_e_tbs, 1 - .equ se_t_koame_e_exg, 0 - .equ se_t_koame_e_cmp, 1 - - .section .rodata - .global se_t_koame_e - .align 2 - -@********************** Track 1 **********************@ - -se_t_koame_e_1: - .byte KEYSH , se_t_koame_e_key+0 - .byte TEMPO , 220*se_t_koame_e_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 80*se_t_koame_e_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Bn3 , v052 - .byte W03 - .byte VOL , 76*se_t_koame_e_mvl/mxv - .byte W03 - .byte 74*se_t_koame_e_mvl/mxv - .byte W03 - .byte 72*se_t_koame_e_mvl/mxv - .byte W03 - .byte 68*se_t_koame_e_mvl/mxv - .byte W03 - .byte 64*se_t_koame_e_mvl/mxv - .byte W03 - .byte 58*se_t_koame_e_mvl/mxv - .byte W03 - .byte 50*se_t_koame_e_mvl/mxv - .byte W03 - .byte 44*se_t_koame_e_mvl/mxv - .byte N24 - .byte W03 - .byte VOL , 38*se_t_koame_e_mvl/mxv - .byte W03 - .byte 34*se_t_koame_e_mvl/mxv - .byte W03 - .byte 27*se_t_koame_e_mvl/mxv - .byte W03 - .byte 20*se_t_koame_e_mvl/mxv - .byte W03 - .byte 15*se_t_koame_e_mvl/mxv - .byte W03 - .byte 10*se_t_koame_e_mvl/mxv - .byte W03 - .byte 6*se_t_koame_e_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_koame_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_koame_e_pri @ Priority - .byte se_t_koame_e_rev @ Reverb. - - .word se_t_koame_e_grp - - .word se_t_koame_e_1 - - .end diff --git a/sound/songs/se_t_ooame.s b/sound/songs/se_t_ooame.s deleted file mode 100644 index eb2b6374d..000000000 --- a/sound/songs/se_t_ooame.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_ooame_grp, voicegroup111 - .equ se_t_ooame_pri, 2 - .equ se_t_ooame_rev, reverb_set+50 - .equ se_t_ooame_mvl, 127 - .equ se_t_ooame_key, 0 - .equ se_t_ooame_tbs, 1 - .equ se_t_ooame_exg, 0 - .equ se_t_ooame_cmp, 1 - - .section .rodata - .global se_t_ooame - .align 2 - -@********************** Track 1 **********************@ - -se_t_ooame_1: - .byte KEYSH , se_t_ooame_key+0 - .byte TEMPO , 220*se_t_ooame_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 18*se_t_ooame_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Cn3 , v060 - .byte W03 - .byte VOL , 33*se_t_ooame_mvl/mxv - .byte W03 - .byte 48*se_t_ooame_mvl/mxv - .byte W03 - .byte 55*se_t_ooame_mvl/mxv - .byte W03 - .byte 65*se_t_ooame_mvl/mxv - .byte W03 - .byte 74*se_t_ooame_mvl/mxv - .byte W03 - .byte 85*se_t_ooame_mvl/mxv - .byte W03 - .byte 100*se_t_ooame_mvl/mxv - .byte W03 -se_t_ooame_1_B1: - .byte N36 , Cn3 , v060 - .byte W24 - .byte W12 - .byte GOTO - .word se_t_ooame_1_B1 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_ooame: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_ooame_pri @ Priority - .byte se_t_ooame_rev @ Reverb. - - .word se_t_ooame_grp - - .word se_t_ooame_1 - - .end diff --git a/sound/songs/se_t_ooame_e.s b/sound/songs/se_t_ooame_e.s deleted file mode 100644 index 43a2b6f26..000000000 --- a/sound/songs/se_t_ooame_e.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_ooame_e_grp, voicegroup111 - .equ se_t_ooame_e_pri, 2 - .equ se_t_ooame_e_rev, reverb_set+50 - .equ se_t_ooame_e_mvl, 127 - .equ se_t_ooame_e_key, 0 - .equ se_t_ooame_e_tbs, 1 - .equ se_t_ooame_e_exg, 0 - .equ se_t_ooame_e_cmp, 1 - - .section .rodata - .global se_t_ooame_e - .align 2 - -@********************** Track 1 **********************@ - -se_t_ooame_e_1: - .byte KEYSH , se_t_ooame_e_key+0 - .byte TEMPO , 220*se_t_ooame_e_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_t_ooame_e_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Cn3 , v060 - .byte W03 - .byte VOL , 96*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 93*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 90*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 85*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 81*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 73*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 62*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 55*se_t_ooame_e_mvl/mxv - .byte N24 - .byte W03 - .byte VOL , 48*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 42*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 33*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 25*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 18*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 12*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 7*se_t_ooame_e_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_ooame_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_ooame_e_pri @ Priority - .byte se_t_ooame_e_rev @ Reverb. - - .word se_t_ooame_e_grp - - .word se_t_ooame_e_1 - - .end diff --git a/sound/songs/se_taillow_wing_flap.s b/sound/songs/se_taillow_wing_flap.s new file mode 100644 index 000000000..7b122818f --- /dev/null +++ b/sound/songs/se_taillow_wing_flap.s @@ -0,0 +1,123 @@ + .include "MPlayDef.s" + + .equ se_taillow_wing_flap_grp, voicegroup111 + .equ se_taillow_wing_flap_pri, 5 + .equ se_taillow_wing_flap_rev, reverb_set+50 + .equ se_taillow_wing_flap_mvl, 127 + .equ se_taillow_wing_flap_key, 0 + .equ se_taillow_wing_flap_tbs, 1 + .equ se_taillow_wing_flap_exg, 0 + .equ se_taillow_wing_flap_cmp, 1 + + .section .rodata + .global se_taillow_wing_flap + .align 2 + +@********************** Track 1 **********************@ + +se_taillow_wing_flap_1: + .byte KEYSH , se_taillow_wing_flap_key+0 +se_taillow_wing_flap_1_B1: + .byte TEMPO , 220*se_taillow_wing_flap_tbs/2 + .byte VOICE , 2 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 40*se_taillow_wing_flap_mvl/mxv + .byte BEND , c_v-32 + .byte N07 , An1 , v127 + .byte W01 + .byte VOL , 52*se_taillow_wing_flap_mvl/mxv + .byte PAN , c_v+10 + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 68*se_taillow_wing_flap_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte W01 + .byte VOL , 82*se_taillow_wing_flap_mvl/mxv + .byte PAN , c_v-9 + .byte BEND , c_v+17 + .byte W01 + .byte VOL , 105*se_taillow_wing_flap_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+37 + .byte W02 + .byte PAN , c_v+10 + .byte BEND , c_v+63 + .byte W03 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 40*se_taillow_wing_flap_mvl/mxv + .byte PAN , c_v+10 + .byte BEND , c_v+1 + .byte N06 + .byte W02 + .byte VOL , 52*se_taillow_wing_flap_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+38 + .byte W01 + .byte VOL , 79*se_taillow_wing_flap_mvl/mxv + .byte PAN , c_v-9 + .byte BEND , c_v+48 + .byte W01 + .byte VOL , 105*se_taillow_wing_flap_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+63 + .byte W10 + .byte W12 + .byte W12 + .byte GOTO + .word se_taillow_wing_flap_1_B1 + .byte FINE + +@********************** Track 2 **********************@ + +se_taillow_wing_flap_2: + .byte KEYSH , se_taillow_wing_flap_key+0 +se_taillow_wing_flap_2_B1: + .byte VOICE , 27 + .byte PAN , c_v+0 + .byte VOL , 52*se_taillow_wing_flap_mvl/mxv + .byte N07 , Gn2 , v040 + .byte W01 + .byte VOL , 69*se_taillow_wing_flap_mvl/mxv + .byte W01 + .byte 83*se_taillow_wing_flap_mvl/mxv + .byte W01 + .byte 105*se_taillow_wing_flap_mvl/mxv + .byte W01 + .byte 67*se_taillow_wing_flap_mvl/mxv + .byte W02 + .byte 23*se_taillow_wing_flap_mvl/mxv + .byte W04 + .byte VOICE , 25 + .byte VOL , 52*se_taillow_wing_flap_mvl/mxv + .byte N06 , Gs4 + .byte W02 + .byte VOL , 81*se_taillow_wing_flap_mvl/mxv + .byte W01 + .byte 105*se_taillow_wing_flap_mvl/mxv + .byte W02 + .byte 52*se_taillow_wing_flap_mvl/mxv + .byte W09 + .byte W12 + .byte W12 + .byte GOTO + .word se_taillow_wing_flap_2_B1 + .byte FINE + +@******************************************************@ + .align 2 + +se_taillow_wing_flap: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_taillow_wing_flap_pri @ Priority + .byte se_taillow_wing_flap_rev @ Reverb. + + .word se_taillow_wing_flap_grp + + .word se_taillow_wing_flap_1 + .word se_taillow_wing_flap_2 + + .end diff --git a/sound/songs/se_tamakoro.s b/sound/songs/se_tamakoro.s deleted file mode 100644 index 4950c81a8..000000000 --- a/sound/songs/se_tamakoro.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tamakoro_grp, voicegroup111 - .equ se_tamakoro_pri, 2 - .equ se_tamakoro_rev, reverb_set+50 - .equ se_tamakoro_mvl, 127 - .equ se_tamakoro_key, 0 - .equ se_tamakoro_tbs, 1 - .equ se_tamakoro_exg, 0 - .equ se_tamakoro_cmp, 1 - - .section .rodata - .global se_tamakoro - .align 2 - -@********************** Track 1 **********************@ - -se_tamakoro_1: - .byte KEYSH , se_tamakoro_key+0 - .byte TEMPO , 150*se_tamakoro_tbs/2 - .byte VOICE , 63 - .byte VOL , 110*se_tamakoro_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Dn3 , v127 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_tamakoro: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tamakoro_pri @ Priority - .byte se_tamakoro_rev @ Reverb. - - .word se_tamakoro_grp - - .word se_tamakoro_1 - - .end diff --git a/sound/songs/se_tamakoro_e.s b/sound/songs/se_tamakoro_e.s deleted file mode 100644 index 17c5db1fe..000000000 --- a/sound/songs/se_tamakoro_e.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tamakoro_e_grp, voicegroup111 - .equ se_tamakoro_e_pri, 2 - .equ se_tamakoro_e_rev, reverb_set+50 - .equ se_tamakoro_e_mvl, 127 - .equ se_tamakoro_e_key, 0 - .equ se_tamakoro_e_tbs, 1 - .equ se_tamakoro_e_exg, 0 - .equ se_tamakoro_e_cmp, 1 - - .section .rodata - .global se_tamakoro_e - .align 2 - -@********************** Track 1 **********************@ - -se_tamakoro_e_1: - .byte KEYSH , se_tamakoro_e_key+0 - .byte TEMPO , 150*se_tamakoro_e_tbs/2 - .byte VOICE , 63 - .byte BENDR , 6 - .byte VOL , 110*se_tamakoro_e_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Dn3 , v127 - .byte W06 - .byte VOL , 107*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-3 - .byte W06 - .byte VOL , 106*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-5 - .byte W06 - .byte VOL , 104*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-7 - .byte W06 - .byte VOL , 102*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-10 - .byte W06 - .byte VOL , 97*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-12 - .byte W06 - .byte VOL , 90*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-14 - .byte W06 - .byte VOL , 73*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-19 - .byte W06 - .byte VOL , 58*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-24 - .byte W06 - .byte VOL , 40*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-29 - .byte W06 - .byte VOL , 25*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-35 - .byte W06 - .byte VOL , 12*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-46 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_tamakoro_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tamakoro_e_pri @ Priority - .byte se_tamakoro_e_rev @ Reverb. - - .word se_tamakoro_e_grp - - .word se_tamakoro_e_1 - - .end diff --git a/sound/songs/se_tb_kara.s b/sound/songs/se_tb_kara.s deleted file mode 100644 index 4f5a44de8..000000000 --- a/sound/songs/se_tb_kara.s +++ /dev/null @@ -1,43 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tb_kara_grp, voicegroup110 - .equ se_tb_kara_pri, 5 - .equ se_tb_kara_rev, reverb_set+50 - .equ se_tb_kara_mvl, 127 - .equ se_tb_kara_key, 0 - .equ se_tb_kara_tbs, 1 - .equ se_tb_kara_exg, 0 - .equ se_tb_kara_cmp, 1 - - .section .rodata - .global se_tb_kara - .align 2 - -@********************** Track 1 **********************@ - -se_tb_kara_1: - .byte KEYSH , se_tb_kara_key+0 - .byte TEMPO , 150*se_tb_kara_tbs/2 - .byte VOICE , 119 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_tb_kara_mvl/mxv - .byte BEND , c_v+1 - .byte N02 , Gs4 , v040 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tb_kara: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tb_kara_pri @ Priority - .byte se_tb_kara_rev @ Reverb. - - .word se_tb_kara_grp - - .word se_tb_kara_1 - - .end diff --git a/sound/songs/se_tb_kon.s b/sound/songs/se_tb_kon.s deleted file mode 100644 index 920f48ba8..000000000 --- a/sound/songs/se_tb_kon.s +++ /dev/null @@ -1,48 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tb_kon_grp, voicegroup111 - .equ se_tb_kon_pri, 5 - .equ se_tb_kon_rev, reverb_set+50 - .equ se_tb_kon_mvl, 127 - .equ se_tb_kon_key, 0 - .equ se_tb_kon_tbs, 1 - .equ se_tb_kon_exg, 0 - .equ se_tb_kon_cmp, 1 - - .section .rodata - .global se_tb_kon - .align 2 - -@********************** Track 1 **********************@ - -se_tb_kon_1: - .byte KEYSH , se_tb_kon_key+0 - .byte TEMPO , 150*se_tb_kon_tbs/2 - .byte VOICE , 16 - .byte VOL , 110*se_tb_kon_mvl/mxv - .byte BEND , c_v+1 - .byte N03 , Gs4 , v072 - .byte W01 - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 58*se_tb_kon_mvl/mxv - .byte BEND , c_v-10 - .byte W01 - .byte VOL , 28*se_tb_kon_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tb_kon: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tb_kon_pri @ Priority - .byte se_tb_kon_rev @ Reverb. - - .word se_tb_kon_grp - - .word se_tb_kon_1 - - .end diff --git a/sound/songs/se_tb_start.s b/sound/songs/se_tb_start.s deleted file mode 100644 index 54795b6e3..000000000 --- a/sound/songs/se_tb_start.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tb_start_grp, voicegroup111 - .equ se_tb_start_pri, 5 - .equ se_tb_start_rev, reverb_set+50 - .equ se_tb_start_mvl, 127 - .equ se_tb_start_key, 0 - .equ se_tb_start_tbs, 1 - .equ se_tb_start_exg, 0 - .equ se_tb_start_cmp, 1 - - .section .rodata - .global se_tb_start - .align 2 - -@********************** Track 1 **********************@ - -se_tb_start_1: - .byte KEYSH , se_tb_start_key+0 - .byte TEMPO , 150*se_tb_start_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v-32 - .byte VOL , 16*se_tb_start_mvl/mxv - .byte BEND , c_v+1 - .byte N09 , Gn5 , v032 - .byte W01 - .byte VOL , 63*se_tb_start_mvl/mxv - .byte W01 - .byte 98*se_tb_start_mvl/mxv - .byte W01 - .byte 110*se_tb_start_mvl/mxv - .byte W01 - .byte 99*se_tb_start_mvl/mxv - .byte BEND , c_v+5 - .byte W02 - .byte VOL , 63*se_tb_start_mvl/mxv - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 22*se_tb_start_mvl/mxv - .byte BEND , c_v+21 - .byte W01 - .byte VOL , 9*se_tb_start_mvl/mxv - .byte BEND , c_v+33 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_tb_start_2: - .byte KEYSH , se_tb_start_key+0 - .byte VOICE , 71 - .byte PAN , c_v+32 - .byte VOL , 110*se_tb_start_mvl/mxv - .byte BEND , c_v+1 - .byte N09 , Fs4 , v060 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_tb_start: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_tb_start_pri @ Priority - .byte se_tb_start_rev @ Reverb. - - .word se_tb_start_grp - - .word se_tb_start_1 - .word se_tb_start_2 - - .end diff --git a/sound/songs/se_t_kami.s b/sound/songs/se_thunder.s index c5997261f..844de7382 100644 --- a/sound/songs/se_t_kami.s +++ b/sound/songs/se_thunder.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_t_kami_grp, voicegroup111 - .equ se_t_kami_pri, 3 - .equ se_t_kami_rev, reverb_set+50 - .equ se_t_kami_mvl, 127 - .equ se_t_kami_key, 0 - .equ se_t_kami_tbs, 1 - .equ se_t_kami_exg, 0 - .equ se_t_kami_cmp, 1 + .equ se_thunder_grp, voicegroup111 + .equ se_thunder_pri, 3 + .equ se_thunder_rev, reverb_set+50 + .equ se_thunder_mvl, 127 + .equ se_thunder_key, 0 + .equ se_thunder_tbs, 1 + .equ se_thunder_exg, 0 + .equ se_thunder_cmp, 1 .section .rodata - .global se_t_kami + .global se_thunder .align 2 @********************** Track 1 **********************@ -se_t_kami_1: - .byte KEYSH , se_t_kami_key+0 - .byte TEMPO , 220*se_t_kami_tbs/2 +se_thunder_1: + .byte KEYSH , se_thunder_key+0 + .byte TEMPO , 220*se_thunder_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_t_kami_mvl/mxv + .byte VOL , 110*se_thunder_mvl/mxv .byte BEND , c_v+0 .byte N09 , En3 , v112 .byte W03 @@ -57,27 +57,27 @@ se_t_kami_1: .byte W09 .byte c_v-32 .byte W06 - .byte VOL , 102*se_t_kami_mvl/mxv + .byte VOL , 102*se_thunder_mvl/mxv .byte BEND , c_v-38 .byte W09 - .byte VOL , 97*se_t_kami_mvl/mxv + .byte VOL , 97*se_thunder_mvl/mxv .byte W09 - .byte 92*se_t_kami_mvl/mxv + .byte 92*se_thunder_mvl/mxv .byte BEND , c_v-45 .byte W06 .byte W03 - .byte VOL , 83*se_t_kami_mvl/mxv + .byte VOL , 83*se_thunder_mvl/mxv .byte W06 .byte BEND , c_v-52 .byte W03 - .byte VOL , 72*se_t_kami_mvl/mxv + .byte VOL , 72*se_thunder_mvl/mxv .byte W09 - .byte 63*se_t_kami_mvl/mxv + .byte 63*se_thunder_mvl/mxv .byte W03 .byte W06 - .byte 57*se_t_kami_mvl/mxv + .byte 57*se_thunder_mvl/mxv .byte W06 - .byte 46*se_t_kami_mvl/mxv + .byte 46*se_thunder_mvl/mxv .byte W12 .byte EOT .byte FINE @@ -85,14 +85,14 @@ se_t_kami_1: @******************************************************@ .align 2 -se_t_kami: +se_thunder: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_t_kami_pri @ Priority - .byte se_t_kami_rev @ Reverb. + .byte se_thunder_pri @ Priority + .byte se_thunder_rev @ Reverb. - .word se_t_kami_grp + .word se_thunder_grp - .word se_t_kami_1 + .word se_thunder_1 .end diff --git a/sound/songs/se_t_kami2.s b/sound/songs/se_thunder2.s index 951beeb4f..2d8ddea49 100644 --- a/sound/songs/se_t_kami2.s +++ b/sound/songs/se_thunder2.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_t_kami2_grp, voicegroup111 - .equ se_t_kami2_pri, 3 - .equ se_t_kami2_rev, reverb_set+50 - .equ se_t_kami2_mvl, 127 - .equ se_t_kami2_key, 0 - .equ se_t_kami2_tbs, 1 - .equ se_t_kami2_exg, 0 - .equ se_t_kami2_cmp, 1 + .equ se_thunder2_grp, voicegroup111 + .equ se_thunder2_pri, 3 + .equ se_thunder2_rev, reverb_set+50 + .equ se_thunder2_mvl, 127 + .equ se_thunder2_key, 0 + .equ se_thunder2_tbs, 1 + .equ se_thunder2_exg, 0 + .equ se_thunder2_cmp, 1 .section .rodata - .global se_t_kami2 + .global se_thunder2 .align 2 @********************** Track 1 **********************@ -se_t_kami2_1: - .byte KEYSH , se_t_kami2_key+0 - .byte TEMPO , 220*se_t_kami2_tbs/2 +se_thunder2_1: + .byte KEYSH , se_thunder2_key+0 + .byte TEMPO , 220*se_thunder2_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_t_kami2_mvl/mxv + .byte VOL , 110*se_thunder2_mvl/mxv .byte BEND , c_v+35 .byte TIE , Dn2 , v112 .byte W03 @@ -43,23 +43,23 @@ se_t_kami2_1: .byte W09 .byte c_v-18 .byte W09 - .byte VOL , 102*se_t_kami2_mvl/mxv + .byte VOL , 102*se_thunder2_mvl/mxv .byte BEND , c_v-25 .byte W09 - .byte VOL , 97*se_t_kami2_mvl/mxv + .byte VOL , 97*se_thunder2_mvl/mxv .byte BEND , c_v-38 .byte W09 - .byte VOL , 92*se_t_kami2_mvl/mxv + .byte VOL , 92*se_thunder2_mvl/mxv .byte BEND , c_v-45 .byte W06 .byte W03 - .byte VOL , 83*se_t_kami2_mvl/mxv + .byte VOL , 83*se_thunder2_mvl/mxv .byte W06 .byte BEND , c_v-52 .byte W03 - .byte VOL , 64*se_t_kami2_mvl/mxv + .byte VOL , 64*se_thunder2_mvl/mxv .byte W06 - .byte 47*se_t_kami2_mvl/mxv + .byte 47*se_thunder2_mvl/mxv .byte W06 .byte EOT .byte FINE @@ -67,14 +67,14 @@ se_t_kami2_1: @******************************************************@ .align 2 -se_t_kami2: +se_thunder2: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_t_kami2_pri @ Priority - .byte se_t_kami2_rev @ Reverb. + .byte se_thunder2_pri @ Priority + .byte se_thunder2_rev @ Reverb. - .word se_t_kami2_grp + .word se_thunder2_grp - .word se_t_kami2_1 + .word se_thunder2_1 .end diff --git a/sound/songs/se_thunderstorm.s b/sound/songs/se_thunderstorm.s new file mode 100644 index 000000000..1ec570b97 --- /dev/null +++ b/sound/songs/se_thunderstorm.s @@ -0,0 +1,65 @@ + .include "MPlayDef.s" + + .equ se_thunderstorm_grp, voicegroup111 + .equ se_thunderstorm_pri, 2 + .equ se_thunderstorm_rev, reverb_set+50 + .equ se_thunderstorm_mvl, 127 + .equ se_thunderstorm_key, 0 + .equ se_thunderstorm_tbs, 1 + .equ se_thunderstorm_stopxg, 0 + .equ se_thunderstorm_cmp, 1 + + .section .rodata + .global se_thunderstorm + .align 2 + +@********************** Track 1 **********************@ + +se_thunderstorm_1: + .byte KEYSH , se_thunderstorm_key+0 + .byte TEMPO , 220*se_thunderstorm_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 15*se_thunderstorm_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Gn3 , v060 + .byte W03 + .byte VOL , 27*se_thunderstorm_mvl/mxv + .byte W03 + .byte 39*se_thunderstorm_mvl/mxv + .byte W03 + .byte 44*se_thunderstorm_mvl/mxv + .byte W03 + .byte 52*se_thunderstorm_mvl/mxv + .byte W03 + .byte 59*se_thunderstorm_mvl/mxv + .byte W03 + .byte 68*se_thunderstorm_mvl/mxv + .byte W03 + .byte 80*se_thunderstorm_mvl/mxv + .byte W03 +se_thunderstorm_1_B1: + .byte N60 , Gn3 , v060 + .byte W24 + .byte W24 + .byte W12 + .byte GOTO + .word se_thunderstorm_1_B1 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_thunderstorm: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_thunderstorm_pri @ Priority + .byte se_thunderstorm_rev @ Reverb. + + .word se_thunderstorm_grp + + .word se_thunderstorm_1 + + .end diff --git a/sound/songs/se_thunderstorm_stop.s b/sound/songs/se_thunderstorm_stop.s new file mode 100644 index 000000000..937be861f --- /dev/null +++ b/sound/songs/se_thunderstorm_stop.s @@ -0,0 +1,74 @@ + .include "MPlayDef.s" + + .equ se_thunderstorm_stop_grp, voicegroup111 + .equ se_thunderstorm_stop_pri, 2 + .equ se_thunderstorm_stop_rev, reverb_set+50 + .equ se_thunderstorm_stop_mvl, 127 + .equ se_thunderstorm_stop_key, 0 + .equ se_thunderstorm_stop_tbs, 1 + .equ se_thunderstorm_stop_exg, 0 + .equ se_thunderstorm_stop_cmp, 1 + + .section .rodata + .global se_thunderstorm_stop + .align 2 + +@********************** Track 1 **********************@ + +se_thunderstorm_stop_1: + .byte KEYSH , se_thunderstorm_stop_key+0 + .byte TEMPO , 220*se_thunderstorm_stop_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 80*se_thunderstorm_stop_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Gn3 , v060 + .byte W03 + .byte VOL , 76*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 74*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 72*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 68*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 64*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 58*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 50*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 44*se_thunderstorm_stop_mvl/mxv + .byte N24 + .byte W03 + .byte VOL , 38*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 34*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 27*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 20*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 15*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 10*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte 6*se_thunderstorm_stop_mvl/mxv + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_thunderstorm_stop: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_thunderstorm_stop_pri @ Priority + .byte se_thunderstorm_stop_rev @ Reverb. + + .word se_thunderstorm_stop_grp + + .word se_thunderstorm_stop_1 + + .end diff --git a/sound/songs/se_tk_kasya.s b/sound/songs/se_tk_kasya.s deleted file mode 100644 index ff5f48561..000000000 --- a/sound/songs/se_tk_kasya.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tk_kasya_grp, voicegroup110 - .equ se_tk_kasya_pri, 4 - .equ se_tk_kasya_rev, reverb_set+50 - .equ se_tk_kasya_mvl, 127 - .equ se_tk_kasya_key, 0 - .equ se_tk_kasya_tbs, 1 - .equ se_tk_kasya_exg, 0 - .equ se_tk_kasya_cmp, 1 - - .section .rodata - .global se_tk_kasya - .align 2 - -@********************** Track 1 **********************@ - -se_tk_kasya_1: - .byte KEYSH , se_tk_kasya_key+0 - .byte TEMPO , 150*se_tk_kasya_tbs/2 - .byte VOICE , 126 - .byte VOL , 110*se_tk_kasya_mvl/mxv - .byte N01 , Gs3 , v127 - .byte W01 - .byte Cn4 , v068 - .byte W02 - .byte W02 - .byte N03 , Gs4 , v127 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tk_kasya: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tk_kasya_pri @ Priority - .byte se_tk_kasya_rev @ Reverb. - - .word se_tk_kasya_grp - - .word se_tk_kasya_1 - - .end diff --git a/sound/songs/se_toy_c1.s b/sound/songs/se_toy_c1.s deleted file mode 100644 index 02c595b68..000000000 --- a/sound/songs/se_toy_c1.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_c1_grp, voicegroup111 - .equ se_toy_c1_pri, 4 - .equ se_toy_c1_rev, reverb_set+50 - .equ se_toy_c1_mvl, 127 - .equ se_toy_c1_key, 0 - .equ se_toy_c1_tbs, 1 - .equ se_toy_c1_exg, 0 - .equ se_toy_c1_cmp, 1 - - .section .rodata - .global se_toy_c1 - .align 2 - -@********************** Track 1 **********************@ - -se_toy_c1_1: - .byte KEYSH , se_toy_c1_key+0 - .byte TEMPO , 150*se_toy_c1_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_c1_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Cn6 , v112 - .byte W06 - .byte W06 - .byte N06 , Cn6 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_c1_2: - .byte KEYSH , se_toy_c1_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_c1_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Gn6 , v060 - .byte W06 - .byte W06 - .byte N06 , Gn6 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_c1: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_c1_pri @ Priority - .byte se_toy_c1_rev @ Reverb. - - .word se_toy_c1_grp - - .word se_toy_c1_1 - .word se_toy_c1_2 - - .end diff --git a/sound/songs/se_toy_dango.s b/sound/songs/se_toy_dango.s deleted file mode 100644 index 28da6dfe3..000000000 --- a/sound/songs/se_toy_dango.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_dango_grp, voicegroup111 - .equ se_toy_dango_pri, 4 - .equ se_toy_dango_rev, reverb_set+50 - .equ se_toy_dango_mvl, 127 - .equ se_toy_dango_key, 0 - .equ se_toy_dango_tbs, 1 - .equ se_toy_dango_exg, 0 - .equ se_toy_dango_cmp, 1 - - .section .rodata - .global se_toy_dango - .align 2 - -@********************** Track 1 **********************@ - -se_toy_dango_1: - .byte KEYSH , se_toy_dango_key+0 - .byte TEMPO , 150*se_toy_dango_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_toy_dango_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn4 , v112 - .byte W01 - .byte VOICE , 26 - .byte W01 - .byte N01 , Fn4 , v127 - .byte W01 - .byte W01 - .byte VOICE , 36 - .byte W02 - .byte N01 , Cn3 , v056 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_dango: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_dango_pri @ Priority - .byte se_toy_dango_rev @ Reverb. - - .word se_toy_dango_grp - - .word se_toy_dango_1 - - .end diff --git a/sound/songs/se_toy_kabe.s b/sound/songs/se_toy_kabe.s deleted file mode 100644 index 9ed31f6bf..000000000 --- a/sound/songs/se_toy_kabe.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_kabe_grp, voicegroup111 - .equ se_toy_kabe_pri, 4 - .equ se_toy_kabe_rev, reverb_set+50 - .equ se_toy_kabe_mvl, 127 - .equ se_toy_kabe_key, 0 - .equ se_toy_kabe_tbs, 1 - .equ se_toy_kabe_exg, 0 - .equ se_toy_kabe_cmp, 1 - - .section .rodata - .global se_toy_kabe - .align 2 - -@********************** Track 1 **********************@ - -se_toy_kabe_1: - .byte KEYSH , se_toy_kabe_key+0 - .byte TEMPO , 240*se_toy_kabe_tbs/2 - .byte VOICE , 41 - .byte BENDR , 12 - .byte VOL , 110*se_toy_kabe_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Fs4 , v127 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte c_v-23 - .byte W01 - .byte W01 - .byte c_v+0 - .byte N10 , Cn4 - .byte W02 - .byte W03 - .byte W01 - .byte VOL , 96*se_toy_kabe_mvl/mxv - .byte W02 - .byte 82*se_toy_kabe_mvl/mxv - .byte W01 - .byte 45*se_toy_kabe_mvl/mxv - .byte W01 - .byte 20*se_toy_kabe_mvl/mxv - .byte W01 - .byte W03 - .byte W01 - .byte 110*se_toy_kabe_mvl/mxv - .byte N10 , Cn4 , v040 - .byte W02 - .byte W03 - .byte W01 - .byte VOL , 96*se_toy_kabe_mvl/mxv - .byte W01 - .byte 82*se_toy_kabe_mvl/mxv - .byte W01 - .byte 45*se_toy_kabe_mvl/mxv - .byte W01 - .byte 20*se_toy_kabe_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_kabe: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_kabe_pri @ Priority - .byte se_toy_kabe_rev @ Reverb. - - .word se_toy_kabe_grp - - .word se_toy_kabe_1 - - .end diff --git a/sound/songs/se_track_door.s b/sound/songs/se_track_door.s deleted file mode 100644 index 458028a1b..000000000 --- a/sound/songs/se_track_door.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_door_grp, voicegroup111 - .equ se_track_door_pri, 4 - .equ se_track_door_rev, reverb_set+50 - .equ se_track_door_mvl, 127 - .equ se_track_door_key, 0 - .equ se_track_door_tbs, 1 - .equ se_track_door_exg, 0 - .equ se_track_door_cmp, 1 - - .section .rodata - .global se_track_door - .align 2 - -@********************** Track 1 **********************@ - -se_track_door_1: - .byte KEYSH , se_track_door_key+0 - .byte TEMPO , 150*se_track_door_tbs/2 - .byte VOICE , 8 - .byte VOL , 110*se_track_door_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Cn2 , v092 - .byte W06 - .byte N01 , Cn3 - .byte W02 - .byte N02 , Cn4 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_track_door_2: - .byte VOL , 110*se_track_door_mvl/mxv - .byte KEYSH , se_track_door_key+0 - .byte VOICE , 4 - .byte N03 , Cn2 , v032 - .byte W05 - .byte N01 , Cn4 - .byte W01 - .byte W02 - .byte N02 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_door: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_door_pri @ Priority - .byte se_track_door_rev @ Reverb. - - .word se_track_door_grp - - .word se_track_door_1 - .word se_track_door_2 - - .end diff --git a/sound/songs/se_track_haik.s b/sound/songs/se_track_haik.s deleted file mode 100644 index 40aa10994..000000000 --- a/sound/songs/se_track_haik.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_haik_grp, voicegroup110 - .equ se_track_haik_pri, 4 - .equ se_track_haik_rev, reverb_set+50 - .equ se_track_haik_mvl, 127 - .equ se_track_haik_key, 0 - .equ se_track_haik_tbs, 1 - .equ se_track_haik_exg, 0 - .equ se_track_haik_cmp, 1 - - .section .rodata - .global se_track_haik - .align 2 - -@********************** Track 1 **********************@ - -se_track_haik_1: - .byte KEYSH , se_track_haik_key+0 - .byte TEMPO , 150*se_track_haik_tbs/2 - .byte VOICE , 120 - .byte VOL , 127*se_track_haik_mvl/mxv - .byte N06 , Bn3 , v028 - .byte W03 - .byte W03 - .byte N21 , Gs4 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_haik: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_haik_pri @ Priority - .byte se_track_haik_rev @ Reverb. - - .word se_track_haik_grp - - .word se_track_haik_1 - - .end diff --git a/sound/songs/se_track_stop.s b/sound/songs/se_track_stop.s deleted file mode 100644 index ec12865b7..000000000 --- a/sound/songs/se_track_stop.s +++ /dev/null @@ -1,123 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_stop_grp, voicegroup111 - .equ se_track_stop_pri, 4 - .equ se_track_stop_rev, reverb_set+50 - .equ se_track_stop_mvl, 127 - .equ se_track_stop_key, 0 - .equ se_track_stop_tbs, 1 - .equ se_track_stop_exg, 0 - .equ se_track_stop_cmp, 1 - - .section .rodata - .global se_track_stop - .align 2 - -@********************** Track 1 **********************@ - -se_track_stop_1: - .byte KEYSH , se_track_stop_key+0 - .byte TEMPO , 150*se_track_stop_tbs/2 - .byte VOICE , 10 - .byte VOL , 127*se_track_stop_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Cs3 , v127 - .byte W09 - .byte BEND , c_v-9 - .byte W09 - .byte c_v-18 - .byte W06 - .byte W09 - .byte c_v-26 - .byte W09 - .byte c_v-34 - .byte W06 - .byte W06 - .byte c_v-43 - .byte W05 - .byte VOL , 123*se_track_stop_mvl/mxv - .byte W04 - .byte BEND , c_v-54 - .byte W02 - .byte VOL , 117*se_track_stop_mvl/mxv - .byte W06 - .byte 110*se_track_stop_mvl/mxv - .byte W01 - .byte BEND , c_v-64 - .byte W08 - .byte VOL , 101*se_track_stop_mvl/mxv - .byte W06 - .byte 89*se_track_stop_mvl/mxv - .byte W09 - .byte 77*se_track_stop_mvl/mxv - .byte W01 - .byte W05 - .byte 60*se_track_stop_mvl/mxv - .byte W09 - .byte 48*se_track_stop_mvl/mxv - .byte W06 - .byte 36*se_track_stop_mvl/mxv - .byte W04 - .byte W03 - .byte 23*se_track_stop_mvl/mxv - .byte W06 - .byte 8*se_track_stop_mvl/mxv - .byte W09 - .byte 0*se_track_stop_mvl/mxv - .byte W01 - .byte EOT - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_track_stop_2: - .byte KEYSH , se_track_stop_key+0 - .byte VOICE , 13 - .byte VOL , 90*se_track_stop_mvl/mxv - .byte W06 - .byte N09 , Gs6 , v024 - .byte W18 - .byte W05 - .byte N15 - .byte W19 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@********************** Track 3 **********************@ - -se_track_stop_3: - .byte KEYSH , se_track_stop_key+0 - .byte VOICE , 12 - .byte VOL , 90*se_track_stop_mvl/mxv - .byte W06 - .byte N09 , An6 , v024 - .byte W18 - .byte W05 - .byte N15 - .byte W19 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_stop: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_stop_pri @ Priority - .byte se_track_stop_rev @ Reverb. - - .word se_track_stop_grp - - .word se_track_stop_1 - .word se_track_stop_2 - .word se_track_stop_3 - - .end diff --git a/sound/songs/se_truck_door.s b/sound/songs/se_truck_door.s new file mode 100644 index 000000000..4b3c7ffe1 --- /dev/null +++ b/sound/songs/se_truck_door.s @@ -0,0 +1,61 @@ + .include "MPlayDef.s" + + .equ se_truck_door_grp, voicegroup111 + .equ se_truck_door_pri, 4 + .equ se_truck_door_rev, reverb_set+50 + .equ se_truck_door_mvl, 127 + .equ se_truck_door_key, 0 + .equ se_truck_door_tbs, 1 + .equ se_truck_door_exg, 0 + .equ se_truck_door_cmp, 1 + + .section .rodata + .global se_truck_door + .align 2 + +@********************** Track 1 **********************@ + +se_truck_door_1: + .byte KEYSH , se_truck_door_key+0 + .byte TEMPO , 150*se_truck_door_tbs/2 + .byte VOICE , 8 + .byte VOL , 110*se_truck_door_mvl/mxv + .byte BEND , c_v+0 + .byte N03 , Cn2 , v092 + .byte W06 + .byte N01 , Cn3 + .byte W02 + .byte N02 , Cn4 + .byte W04 + .byte FINE + +@********************** Track 2 **********************@ + +se_truck_door_2: + .byte VOL , 110*se_truck_door_mvl/mxv + .byte KEYSH , se_truck_door_key+0 + .byte VOICE , 4 + .byte N03 , Cn2 , v032 + .byte W05 + .byte N01 , Cn4 + .byte W01 + .byte W02 + .byte N02 + .byte W04 + .byte FINE + +@******************************************************@ + .align 2 + +se_truck_door: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_truck_door_pri @ Priority + .byte se_truck_door_rev @ Reverb. + + .word se_truck_door_grp + + .word se_truck_door_1 + .word se_truck_door_2 + + .end diff --git a/sound/songs/se_track_move.s b/sound/songs/se_truck_move.s index bb88ef18f..19952baf9 100644 --- a/sound/songs/se_track_move.s +++ b/sound/songs/se_truck_move.s @@ -1,89 +1,89 @@ .include "MPlayDef.s" - .equ se_track_move_grp, voicegroup111 - .equ se_track_move_pri, 4 - .equ se_track_move_rev, reverb_set+50 - .equ se_track_move_mvl, 127 - .equ se_track_move_key, 0 - .equ se_track_move_tbs, 1 - .equ se_track_move_exg, 0 - .equ se_track_move_cmp, 1 + .equ se_truck_move_grp, voicegroup111 + .equ se_truck_move_pri, 4 + .equ se_truck_move_rev, reverb_set+50 + .equ se_truck_move_mvl, 127 + .equ se_truck_move_key, 0 + .equ se_truck_move_tbs, 1 + .equ se_truck_move_exg, 0 + .equ se_truck_move_cmp, 1 .section .rodata - .global se_track_move + .global se_truck_move .align 2 @********************** Track 1 **********************@ -se_track_move_1: - .byte KEYSH , se_track_move_key+0 - .byte TEMPO , 150*se_track_move_tbs/2 +se_truck_move_1: + .byte KEYSH , se_truck_move_key+0 + .byte TEMPO , 150*se_truck_move_tbs/2 .byte VOICE , 10 - .byte VOL , 18*se_track_move_mvl/mxv + .byte VOL , 18*se_truck_move_mvl/mxv .byte BEND , c_v+0 .byte N96 , Cs3 , v127 .byte W08 - .byte VOL , 31*se_track_move_mvl/mxv + .byte VOL , 31*se_truck_move_mvl/mxv .byte W08 - .byte 42*se_track_move_mvl/mxv + .byte 42*se_truck_move_mvl/mxv .byte W08 - .byte 59*se_track_move_mvl/mxv + .byte 59*se_truck_move_mvl/mxv .byte W08 - .byte 74*se_track_move_mvl/mxv + .byte 74*se_truck_move_mvl/mxv .byte W08 - .byte 88*se_track_move_mvl/mxv + .byte 88*se_truck_move_mvl/mxv .byte W08 - .byte 106*se_track_move_mvl/mxv + .byte 106*se_truck_move_mvl/mxv .byte W08 - .byte 118*se_track_move_mvl/mxv + .byte 118*se_truck_move_mvl/mxv .byte W08 - .byte 127*se_track_move_mvl/mxv + .byte 127*se_truck_move_mvl/mxv .byte W32 -se_track_move_1_B1: +se_truck_move_1_B1: .byte TIE , Cs3 , v127 .byte W96 .byte W96 .byte W96 .byte EOT .byte GOTO - .word se_track_move_1_B1 + .word se_truck_move_1_B1 .byte FINE @********************** Track 2 **********************@ -se_track_move_2: - .byte KEYSH , se_track_move_key+0 +se_truck_move_2: + .byte KEYSH , se_truck_move_key+0 .byte VOICE , 11 - .byte VOL , 18*se_track_move_mvl/mxv + .byte VOL , 18*se_truck_move_mvl/mxv .byte W08 - .byte 31*se_track_move_mvl/mxv + .byte 31*se_truck_move_mvl/mxv .byte W04 .byte N03 , Fn2 , v044 .byte W04 - .byte VOL , 42*se_track_move_mvl/mxv + .byte VOL , 42*se_truck_move_mvl/mxv .byte W02 .byte N03 , An2 .byte W06 - .byte VOL , 59*se_track_move_mvl/mxv + .byte VOL , 59*se_truck_move_mvl/mxv .byte W06 .byte N03 , Cs2 , v052 .byte W02 - .byte VOL , 74*se_track_move_mvl/mxv + .byte VOL , 74*se_truck_move_mvl/mxv .byte W08 - .byte 88*se_track_move_mvl/mxv + .byte 88*se_truck_move_mvl/mxv .byte W08 - .byte 106*se_track_move_mvl/mxv + .byte 106*se_truck_move_mvl/mxv .byte N03 , Gn2 , v044 .byte W08 - .byte VOL , 118*se_track_move_mvl/mxv + .byte VOL , 118*se_truck_move_mvl/mxv .byte W08 - .byte 127*se_track_move_mvl/mxv + .byte 127*se_truck_move_mvl/mxv .byte W08 .byte N01 , Bn2 , v032 .byte W12 .byte N03 , Fn2 , v044 .byte W12 -se_track_move_2_B1: +se_truck_move_2_B1: .byte W12 .byte N03 , Fn2 , v044 .byte W06 @@ -126,21 +126,21 @@ se_track_move_2_B1: .byte N03 , Fn2 , v044 .byte W12 .byte GOTO - .word se_track_move_2_B1 + .word se_truck_move_2_B1 .byte FINE @******************************************************@ .align 2 -se_track_move: +se_truck_move: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_track_move_pri @ Priority - .byte se_track_move_rev @ Reverb. + .byte se_truck_move_pri @ Priority + .byte se_truck_move_rev @ Reverb. - .word se_track_move_grp + .word se_truck_move_grp - .word se_track_move_1 - .word se_track_move_2 + .word se_truck_move_1 + .word se_truck_move_2 .end diff --git a/sound/songs/se_truck_stop.s b/sound/songs/se_truck_stop.s new file mode 100644 index 000000000..a6b0c7a85 --- /dev/null +++ b/sound/songs/se_truck_stop.s @@ -0,0 +1,123 @@ + .include "MPlayDef.s" + + .equ se_truck_stop_grp, voicegroup111 + .equ se_truck_stop_pri, 4 + .equ se_truck_stop_rev, reverb_set+50 + .equ se_truck_stop_mvl, 127 + .equ se_truck_stop_key, 0 + .equ se_truck_stop_tbs, 1 + .equ se_truck_stop_exg, 0 + .equ se_truck_stop_cmp, 1 + + .section .rodata + .global se_truck_stop + .align 2 + +@********************** Track 1 **********************@ + +se_truck_stop_1: + .byte KEYSH , se_truck_stop_key+0 + .byte TEMPO , 150*se_truck_stop_tbs/2 + .byte VOICE , 10 + .byte VOL , 127*se_truck_stop_mvl/mxv + .byte BEND , c_v+0 + .byte TIE , Cs3 , v127 + .byte W09 + .byte BEND , c_v-9 + .byte W09 + .byte c_v-18 + .byte W06 + .byte W09 + .byte c_v-26 + .byte W09 + .byte c_v-34 + .byte W06 + .byte W06 + .byte c_v-43 + .byte W05 + .byte VOL , 123*se_truck_stop_mvl/mxv + .byte W04 + .byte BEND , c_v-54 + .byte W02 + .byte VOL , 117*se_truck_stop_mvl/mxv + .byte W06 + .byte 110*se_truck_stop_mvl/mxv + .byte W01 + .byte BEND , c_v-64 + .byte W08 + .byte VOL , 101*se_truck_stop_mvl/mxv + .byte W06 + .byte 89*se_truck_stop_mvl/mxv + .byte W09 + .byte 77*se_truck_stop_mvl/mxv + .byte W01 + .byte W05 + .byte 60*se_truck_stop_mvl/mxv + .byte W09 + .byte 48*se_truck_stop_mvl/mxv + .byte W06 + .byte 36*se_truck_stop_mvl/mxv + .byte W04 + .byte W03 + .byte 23*se_truck_stop_mvl/mxv + .byte W06 + .byte 8*se_truck_stop_mvl/mxv + .byte W09 + .byte 0*se_truck_stop_mvl/mxv + .byte W01 + .byte EOT + .byte W05 + .byte FINE + +@********************** Track 2 **********************@ + +se_truck_stop_2: + .byte KEYSH , se_truck_stop_key+0 + .byte VOICE , 13 + .byte VOL , 90*se_truck_stop_mvl/mxv + .byte W06 + .byte N09 , Gs6 , v024 + .byte W18 + .byte W05 + .byte N15 + .byte W19 + .byte W24 + .byte W24 + .byte W24 + .byte W24 + .byte FINE + +@********************** Track 3 **********************@ + +se_truck_stop_3: + .byte KEYSH , se_truck_stop_key+0 + .byte VOICE , 12 + .byte VOL , 90*se_truck_stop_mvl/mxv + .byte W06 + .byte N09 , An6 , v024 + .byte W18 + .byte W05 + .byte N15 + .byte W19 + .byte W24 + .byte W24 + .byte W24 + .byte W24 + .byte FINE + +@******************************************************@ + .align 2 + +se_truck_stop: + .byte 3 @ NumTrks + .byte 0 @ NumBlks + .byte se_truck_stop_pri @ Priority + .byte se_truck_stop_rev @ Reverb. + + .word se_truck_stop_grp + + .word se_truck_stop_1 + .word se_truck_stop_2 + .word se_truck_stop_3 + + .end diff --git a/sound/songs/se_truck_unload.s b/sound/songs/se_truck_unload.s new file mode 100644 index 000000000..2234ae52a --- /dev/null +++ b/sound/songs/se_truck_unload.s @@ -0,0 +1,49 @@ + .include "MPlayDef.s" + + .equ se_truck_unload_grp, voicegroup110 + .equ se_truck_unload_pri, 4 + .equ se_truck_unload_rev, reverb_set+50 + .equ se_truck_unload_mvl, 127 + .equ se_truck_unload_key, 0 + .equ se_truck_unload_tbs, 1 + .equ se_truck_unload_exg, 0 + .equ se_truck_unload_cmp, 1 + + .section .rodata + .global se_truck_unload + .align 2 + +@********************** Track 1 **********************@ + +se_truck_unload_1: + .byte KEYSH , se_truck_unload_key+0 + .byte TEMPO , 150*se_truck_unload_tbs/2 + .byte VOICE , 120 + .byte VOL , 127*se_truck_unload_mvl/mxv + .byte N06 , Bn3 , v028 + .byte W03 + .byte W03 + .byte N21 , Gs4 + .byte W03 + .byte W03 + .byte W03 + .byte W03 + .byte W03 + .byte W03 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_truck_unload: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_truck_unload_pri @ Priority + .byte se_truck_unload_rev @ Reverb. + + .word se_truck_unload_grp + + .word se_truck_unload_1 + + .end diff --git a/sound/songs/se_tu_saa.s b/sound/songs/se_tu_saa.s deleted file mode 100644 index 8bbd09cdd..000000000 --- a/sound/songs/se_tu_saa.s +++ /dev/null @@ -1,55 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tu_saa_grp, voicegroup110 - .equ se_tu_saa_pri, 4 - .equ se_tu_saa_rev, reverb_set+50 - .equ se_tu_saa_mvl, 127 - .equ se_tu_saa_key, 0 - .equ se_tu_saa_tbs, 1 - .equ se_tu_saa_exg, 0 - .equ se_tu_saa_cmp, 1 - - .section .rodata - .global se_tu_saa - .align 2 - -@********************** Track 1 **********************@ - -se_tu_saa_1: - .byte KEYSH , se_tu_saa_key+0 - .byte TEMPO , 220*se_tu_saa_tbs/2 - .byte VOICE , 123 - .byte VOL , 90*se_tu_saa_mvl/mxv - .byte N03 , Cn4 , v060 - .byte W03 - .byte VOL , 62*se_tu_saa_mvl/mxv - .byte N32 , Gs4 - .byte W03 - .byte VOL , 68*se_tu_saa_mvl/mxv - .byte W03 - .byte 72*se_tu_saa_mvl/mxv - .byte W03 - .byte 78*se_tu_saa_mvl/mxv - .byte W03 - .byte 85*se_tu_saa_mvl/mxv - .byte W03 - .byte 90*se_tu_saa_mvl/mxv - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_tu_saa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tu_saa_pri @ Priority - .byte se_tu_saa_rev @ Reverb. - - .word se_tu_saa_grp - - .word se_tu_saa_1 - - .end diff --git a/sound/songs/se_unlock.s b/sound/songs/se_unlock.s new file mode 100644 index 000000000..13837b2b0 --- /dev/null +++ b/sound/songs/se_unlock.s @@ -0,0 +1,76 @@ + .include "MPlayDef.s" + + .equ se_unlock_grp, voicegroup111 + .equ se_unlock_pri, 4 + .equ se_unlock_rev, reverb_set+50 + .equ se_unlock_mvl, 127 + .equ se_unlock_key, 0 + .equ se_unlock_tbs, 1 + .equ se_unlock_exg, 0 + .equ se_unlock_cmp, 1 + + .section .rodata + .global se_unlock + .align 2 + +@********************** Track 1 **********************@ + +se_unlock_1: + .byte KEYSH , se_unlock_key+0 + .byte TEMPO , 150*se_unlock_tbs/2 + .byte VOICE , 8 + .byte VOL , 100*se_unlock_mvl/mxv + .byte BEND , c_v+0 + .byte N01 , Cn3 , v127 + .byte W02 + .byte N02 , Gn2 + .byte W04 + .byte N17 , Cn3 + .byte W06 + .byte VOL , 98*se_unlock_mvl/mxv + .byte W01 + .byte 91*se_unlock_mvl/mxv + .byte W01 + .byte 81*se_unlock_mvl/mxv + .byte W02 + .byte 75*se_unlock_mvl/mxv + .byte W01 + .byte 60*se_unlock_mvl/mxv + .byte W01 + .byte 42*se_unlock_mvl/mxv + .byte W01 + .byte 25*se_unlock_mvl/mxv + .byte W02 + .byte 10*se_unlock_mvl/mxv + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_unlock_2: + .byte VOL , 100*se_unlock_mvl/mxv + .byte KEYSH , se_unlock_key+0 + .byte VOICE , 4 + .byte N01 , Cn3 , v064 + .byte W02 + .byte N02 + .byte W04 + .byte N02 + .byte W18 + .byte FINE + +@******************************************************@ + .align 2 + +se_unlock: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_unlock_pri @ Priority + .byte se_unlock_rev @ Reverb. + + .word se_unlock_grp + + .word se_unlock_1 + .word se_unlock_2 + + .end diff --git a/sound/songs/se_use_item.s b/sound/songs/se_use_item.s new file mode 100644 index 000000000..c1bc80cc4 --- /dev/null +++ b/sound/songs/se_use_item.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_use_item_grp, voicegroup110 + .equ se_use_item_pri, 5 + .equ se_use_item_rev, reverb_set+50 + .equ se_use_item_mvl, 127 + .equ se_use_item_key, 0 + .equ se_use_item_tbs, 1 + .equ se_use_item_exg, 0 + .equ se_use_item_cmp, 1 + + .section .rodata + .global se_use_item + .align 2 + +@********************** Track 1 **********************@ + +se_use_item_1: + .byte KEYSH , se_use_item_key+0 + .byte TEMPO , 132*se_use_item_tbs/2 + .byte VOICE , 91 + .byte VOL , 100*se_use_item_mvl/mxv + .byte BEND , c_v-6 + .byte N02 , Cn3 , v112 + .byte W04 + .byte N02 + .byte W04 + .byte VOICE , 90 + .byte N15 + .byte W16 + .byte FINE + +@******************************************************@ + .align 2 + +se_use_item: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_use_item_pri @ Priority + .byte se_use_item_rev @ Reverb. + + .word se_use_item_grp + + .word se_use_item_1 + + .end diff --git a/sound/songs/se_vend.s b/sound/songs/se_vend.s new file mode 100644 index 000000000..b87849734 --- /dev/null +++ b/sound/songs/se_vend.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_vend_grp, voicegroup111 + .equ se_vend_pri, 4 + .equ se_vend_rev, reverb_set+50 + .equ se_vend_mvl, 127 + .equ se_vend_key, 0 + .equ se_vend_tbs, 1 + .equ se_vend_exg, 0 + .equ se_vend_cmp, 1 + + .section .rodata + .global se_vend + .align 2 + +@********************** Track 1 **********************@ + +se_vend_1: + .byte KEYSH , se_vend_key+0 + .byte TEMPO , 150*se_vend_tbs/2 + .byte VOICE , 8 + .byte VOL , 110*se_vend_mvl/mxv + .byte BEND , c_v+0 + .byte N01 , Cn4 , v092 + .byte W03 + .byte Cn5 + .byte W03 + .byte W03 + .byte N02 , En3 , v127 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_vend: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_vend_pri @ Priority + .byte se_vend_rev @ Reverb. + + .word se_vend_grp + + .word se_vend_1 + + .end diff --git a/sound/songs/se_w003.s b/sound/songs/se_w003.s deleted file mode 100644 index f85be9174..000000000 --- a/sound/songs/se_w003.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w003_grp, voicegroup111 - .equ se_w003_pri, 4 - .equ se_w003_rev, reverb_set+50 - .equ se_w003_mvl, 127 - .equ se_w003_key, 0 - .equ se_w003_tbs, 1 - .equ se_w003_exg, 0 - .equ se_w003_cmp, 1 - - .section .rodata - .global se_w003 - .align 2 - -@********************** Track 1 **********************@ - -se_w003_1: - .byte KEYSH , se_w003_key+0 - .byte TEMPO , 150*se_w003_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 110*se_w003_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v+0 - .byte N02 , Bn3 , v112 - .byte W04 - .byte PAN , c_v-9 - .byte N02 , Fn5 , v064 - .byte W02 - .byte PAN , c_v+0 - .byte N02 , Bn3 , v036 - .byte W03 - .byte VOICE , 18 - .byte N02 , Cn6 , v096 - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -se_w003: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w003_pri @ Priority - .byte se_w003_rev @ Reverb. - - .word se_w003_grp - - .word se_w003_1 - - .end diff --git a/sound/songs/se_w013b.s b/sound/songs/se_w013b.s deleted file mode 100644 index f2a13cd8d..000000000 --- a/sound/songs/se_w013b.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w013b_grp, voicegroup111 - .equ se_w013b_pri, 4 - .equ se_w013b_rev, reverb_set+50 - .equ se_w013b_mvl, 127 - .equ se_w013b_key, 0 - .equ se_w013b_tbs, 1 - .equ se_w013b_exg, 0 - .equ se_w013b_cmp, 1 - - .section .rodata - .global se_w013b - .align 2 - -@********************** Track 1 **********************@ - -se_w013b_1: - .byte KEYSH , se_w013b_key+0 - .byte TEMPO , 250*se_w013b_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 90*se_w013b_mvl/mxv - .byte BEND , c_v+0 - .byte N14 , An4 , v108 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+6 - .byte W01 - .byte VOL , 80*se_w013b_mvl/mxv - .byte W02 - .byte PAN , c_v+15 - .byte BEND , c_v+1 - .byte W01 - .byte VOL , 64*se_w013b_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 38*se_w013b_mvl/mxv - .byte BEND , c_v-9 - .byte W02 - .byte c_v-34 - .byte W01 - .byte PAN , c_v-1 - .byte VOL , 11*se_w013b_mvl/mxv - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_w013b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w013b_pri @ Priority - .byte se_w013b_rev @ Reverb. - - .word se_w013b_grp - - .word se_w013b_1 - - .end diff --git a/sound/songs/se_w016b.s b/sound/songs/se_w016b.s deleted file mode 100644 index e09bfd94e..000000000 --- a/sound/songs/se_w016b.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w016b_grp, voicegroup111 - .equ se_w016b_pri, 4 - .equ se_w016b_rev, reverb_set+50 - .equ se_w016b_mvl, 127 - .equ se_w016b_key, 0 - .equ se_w016b_tbs, 1 - .equ se_w016b_exg, 0 - .equ se_w016b_cmp, 1 - - .section .rodata - .global se_w016b - .align 2 - -@********************** Track 1 **********************@ - -se_w016b_1: - .byte KEYSH , se_w016b_key+0 - .byte TEMPO , 150*se_w016b_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w016b_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Cn3 , v108 - .byte W02 - .byte PAN , c_v-19 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 97*se_w016b_mvl/mxv - .byte W01 - .byte PAN , c_v+16 - .byte W01 - .byte VOL , 84*se_w016b_mvl/mxv - .byte W03 - .byte 76*se_w016b_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte VOL , 55*se_w016b_mvl/mxv - .byte PAN , c_v-8 - .byte W02 - .byte VOL , 39*se_w016b_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 25*se_w016b_mvl/mxv - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte VOL , 13*se_w016b_mvl/mxv - .byte W03 - .byte 7*se_w016b_mvl/mxv - .byte PAN , c_v+0 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w016b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w016b_pri @ Priority - .byte se_w016b_rev @ Reverb. - - .word se_w016b_grp - - .word se_w016b_1 - - .end diff --git a/sound/songs/se_w017.s b/sound/songs/se_w017.s deleted file mode 100644 index 91ec8431b..000000000 --- a/sound/songs/se_w017.s +++ /dev/null @@ -1,125 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w017_grp, voicegroup111 - .equ se_w017_pri, 4 - .equ se_w017_rev, reverb_set+50 - .equ se_w017_mvl, 127 - .equ se_w017_key, 0 - .equ se_w017_tbs, 1 - .equ se_w017_exg, 0 - .equ se_w017_cmp, 1 - - .section .rodata - .global se_w017 - .align 2 - -@********************** Track 1 **********************@ - -se_w017_1: - .byte KEYSH , se_w017_key+0 - .byte TEMPO , 220*se_w017_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 40*se_w017_mvl/mxv - .byte BEND , c_v-32 - .byte N10 , An1 , v127 - .byte W01 - .byte VOL , 52*se_w017_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 68*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 82*se_w017_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 105*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+19 - .byte W02 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+38 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+49 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W05 - .byte VOL , 40*se_w017_mvl/mxv - .byte BEND , c_v+1 - .byte N06 - .byte W01 - .byte VOL , 52*se_w017_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v+38 - .byte W01 - .byte VOL , 79*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+48 - .byte W02 - .byte VOL , 105*se_w017_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_w017_2: - .byte KEYSH , se_w017_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 52*se_w017_mvl/mxv - .byte N10 , Gn2 , v040 - .byte W01 - .byte VOL , 69*se_w017_mvl/mxv - .byte W01 - .byte 83*se_w017_mvl/mxv - .byte W01 - .byte 105*se_w017_mvl/mxv - .byte W01 - .byte 85*se_w017_mvl/mxv - .byte W02 - .byte 52*se_w017_mvl/mxv - .byte W01 - .byte 29*se_w017_mvl/mxv - .byte W01 - .byte 12*se_w017_mvl/mxv - .byte W06 - .byte VOICE , 25 - .byte VOL , 52*se_w017_mvl/mxv - .byte N06 , Gs4 - .byte W01 - .byte VOL , 81*se_w017_mvl/mxv - .byte W01 - .byte 105*se_w017_mvl/mxv - .byte W03 - .byte 52*se_w017_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_w017: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w017_pri @ Priority - .byte se_w017_rev @ Reverb. - - .word se_w017_grp - - .word se_w017_1 - .word se_w017_2 - - .end diff --git a/sound/songs/se_w026.s b/sound/songs/se_w026.s deleted file mode 100644 index 418e5febd..000000000 --- a/sound/songs/se_w026.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w026_grp, voicegroup111 - .equ se_w026_pri, 4 - .equ se_w026_rev, reverb_set+50 - .equ se_w026_mvl, 127 - .equ se_w026_key, 0 - .equ se_w026_tbs, 1 - .equ se_w026_exg, 0 - .equ se_w026_cmp, 1 - - .section .rodata - .global se_w026 - .align 2 - -@********************** Track 1 **********************@ - -se_w026_1: - .byte KEYSH , se_w026_key+0 - .byte TEMPO , 180*se_w026_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w026_mvl/mxv - .byte BEND , c_v-12 - .byte N19 , Gn3 , v108 - .byte W02 - .byte BEND , c_v-5 - .byte W01 - .byte VOL , 101*se_w026_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W02 - .byte VOL , 84*se_w026_mvl/mxv - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 64*se_w026_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+8 - .byte W02 - .byte VOL , 45*se_w026_mvl/mxv - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 32*se_w026_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOICE , 2 - .byte W01 - .byte VOL , 13*se_w026_mvl/mxv - .byte BEND , c_v-52 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_w026: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w026_pri @ Priority - .byte se_w026_rev @ Reverb. - - .word se_w026_grp - - .word se_w026_1 - - .end diff --git a/sound/songs/se_w030.s b/sound/songs/se_w030.s deleted file mode 100644 index 88efd2b75..000000000 --- a/sound/songs/se_w030.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w030_grp, voicegroup111 - .equ se_w030_pri, 4 - .equ se_w030_rev, reverb_set+50 - .equ se_w030_mvl, 127 - .equ se_w030_key, 0 - .equ se_w030_tbs, 1 - .equ se_w030_exg, 0 - .equ se_w030_cmp, 1 - - .section .rodata - .global se_w030 - .align 2 - -@********************** Track 1 **********************@ - -se_w030_1: - .byte KEYSH , se_w030_key+0 - .byte TEMPO , 150*se_w030_tbs/2 - .byte VOICE , 21 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w030_mvl/mxv - .byte BEND , c_v+1 - .byte N01 , Bn5 , v127 - .byte W02 - .byte VOICE , 18 - .byte N01 , Cn4 - .byte W02 - .byte VOICE , 36 - .byte N06 , Gn5 , v040 - .byte W02 - .byte VOL , 58*se_w030_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 71*se_w030_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 84*se_w030_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v+21 - .byte W01 - .byte VOL , 97*se_w030_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 110*se_w030_mvl/mxv - .byte W14 - .byte FINE - -@******************************************************@ - .align 2 - -se_w030: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w030_pri @ Priority - .byte se_w030_rev @ Reverb. - - .word se_w030_grp - - .word se_w030_1 - - .end diff --git a/sound/songs/se_w039.s b/sound/songs/se_w039.s deleted file mode 100644 index acab66c7f..000000000 --- a/sound/songs/se_w039.s +++ /dev/null @@ -1,63 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w039_grp, voicegroup111 - .equ se_w039_pri, 4 - .equ se_w039_rev, reverb_set+50 - .equ se_w039_mvl, 127 - .equ se_w039_key, 0 - .equ se_w039_tbs, 1 - .equ se_w039_exg, 0 - .equ se_w039_cmp, 1 - - .section .rodata - .global se_w039 - .align 2 - -@********************** Track 1 **********************@ - -se_w039_1: - .byte KEYSH , se_w039_key+0 - .byte TEMPO , 150*se_w039_tbs/2 - .byte VOICE , 15 - .byte BENDR , 12 - .byte PAN , c_v+18 - .byte VOL , 48*se_w039_mvl/mxv - .byte BEND , c_v-48 - .byte N04 , Gn2 , v127 - .byte W01 - .byte VOL , 81*se_w039_mvl/mxv - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 110*se_w039_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte c_v+0 - .byte W04 - .byte VOL , 48*se_w039_mvl/mxv - .byte PAN , c_v-16 - .byte BEND , c_v-48 - .byte N04 , An2 - .byte W01 - .byte VOL , 81*se_w039_mvl/mxv - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 110*se_w039_mvl/mxv - .byte BEND , c_v+16 - .byte W15 - .byte VOL , 110*se_w039_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_w039: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w039_pri @ Priority - .byte se_w039_rev @ Reverb. - - .word se_w039_grp - - .word se_w039_1 - - .end diff --git a/sound/songs/se_w052.s b/sound/songs/se_w052.s deleted file mode 100644 index 583791fb8..000000000 --- a/sound/songs/se_w052.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w052_grp, voicegroup111 - .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 ea58b07a0..000000000 --- a/sound/songs/se_w059b.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w059b_grp, voicegroup111 - .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 107ded25d..000000000 --- a/sound/songs/se_w062b.s +++ /dev/null @@ -1,131 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w062b_grp, voicegroup111 - .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 22deee477..000000000 --- a/sound/songs/se_w077.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w077_grp, voicegroup111 - .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 e84421803..000000000 --- a/sound/songs/se_w082.s +++ /dev/null @@ -1,150 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w082_grp, voicegroup111 - .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 eed30349c..000000000 --- a/sound/songs/se_w104.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w104_grp, voicegroup111 - .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 648e7006c..000000000 --- a/sound/songs/se_w112.s +++ /dev/null @@ -1,276 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w112_grp, voicegroup111 - .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 fd7e2e641..000000000 --- a/sound/songs/se_w120.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w120_grp, voicegroup111 - .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 a7da8b0bb..000000000 --- a/sound/songs/se_w145b.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w145b_grp, voicegroup111 - .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 4bae143ab..000000000 --- a/sound/songs/se_w146.s +++ /dev/null @@ -1,79 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w146_grp, voicegroup111 - .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 e9068bb2a..000000000 --- a/sound/songs/se_w166.s +++ /dev/null @@ -1,68 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w166_grp, voicegroup111 - .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 f8d8e3913..000000000 --- a/sound/songs/se_w172.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w172_grp, voicegroup111 - .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 04f576bf1..000000000 --- a/sound/songs/se_w172b.s +++ /dev/null @@ -1,99 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w172b_grp, voicegroup111 - .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 5e4de1a90..000000000 --- a/sound/songs/se_w187.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w187_grp, voicegroup111 - .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 27b09c5dd..000000000 --- a/sound/songs/se_w195.s +++ /dev/null @@ -1,221 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w195_grp, voicegroup111 - .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 5fd26245b..000000000 --- a/sound/songs/se_w207.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w207_grp, voicegroup111 - .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 0a3151d7c..000000000 --- a/sound/songs/se_w221.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w221_grp, voicegroup111 - .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 2994f2749..000000000 --- a/sound/songs/se_w221b.s +++ /dev/null @@ -1,180 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w221b_grp, voicegroup111 - .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 169f522a9..000000000 --- a/sound/songs/se_w233.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w233_grp, voicegroup111 - .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 50ff00605..000000000 --- a/sound/songs/se_w240.s +++ /dev/null @@ -1,116 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w240_grp, voicegroup111 - .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 7502b6fd0..000000000 --- a/sound/songs/se_w260.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w260_grp, voicegroup111 - .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 f2affbb1b..000000000 --- a/sound/songs/se_w327.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w327_grp, voicegroup111 - .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_tk_warpin.s b/sound/songs/se_warp_in.s index 00c7ee207..04101b33f 100644 --- a/sound/songs/se_tk_warpin.s +++ b/sound/songs/se_warp_in.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_tk_warpin_grp, voicegroup110 - .equ se_tk_warpin_pri, 4 - .equ se_tk_warpin_rev, reverb_set+50 - .equ se_tk_warpin_mvl, 127 - .equ se_tk_warpin_key, 0 - .equ se_tk_warpin_tbs, 1 - .equ se_tk_warpin_exg, 0 - .equ se_tk_warpin_cmp, 1 + .equ se_warp_in_grp, voicegroup110 + .equ se_warp_in_pri, 4 + .equ se_warp_in_rev, reverb_set+50 + .equ se_warp_in_mvl, 127 + .equ se_warp_in_key, 0 + .equ se_warp_in_tbs, 1 + .equ se_warp_in_exg, 0 + .equ se_warp_in_cmp, 1 .section .rodata - .global se_tk_warpin + .global se_warp_in .align 2 @********************** Track 1 **********************@ -se_tk_warpin_1: - .byte KEYSH , se_tk_warpin_key+0 - .byte TEMPO , 110*se_tk_warpin_tbs/2 +se_warp_in_1: + .byte KEYSH , se_warp_in_key+0 + .byte TEMPO , 110*se_warp_in_tbs/2 .byte VOICE , 90 - .byte VOL , 90*se_tk_warpin_mvl/mxv + .byte VOL , 90*se_warp_in_mvl/mxv .byte N06 , En4 , v127 .byte W03 .byte W03 @@ -43,14 +43,14 @@ se_tk_warpin_1: @******************************************************@ .align 2 -se_tk_warpin: +se_warp_in: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_tk_warpin_pri @ Priority - .byte se_tk_warpin_rev @ Reverb. + .byte se_warp_in_pri @ Priority + .byte se_warp_in_rev @ Reverb. - .word se_tk_warpin_grp + .word se_warp_in_grp - .word se_tk_warpin_1 + .word se_warp_in_1 .end diff --git a/sound/songs/se_tk_warpout.s b/sound/songs/se_warp_out.s index 622001349..98473e543 100644 --- a/sound/songs/se_tk_warpout.s +++ b/sound/songs/se_warp_out.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_tk_warpout_grp, voicegroup110 - .equ se_tk_warpout_pri, 4 - .equ se_tk_warpout_rev, reverb_set+50 - .equ se_tk_warpout_mvl, 127 - .equ se_tk_warpout_key, 0 - .equ se_tk_warpout_tbs, 1 - .equ se_tk_warpout_exg, 0 - .equ se_tk_warpout_cmp, 1 + .equ se_warp_out_grp, voicegroup110 + .equ se_warp_out_pri, 4 + .equ se_warp_out_rev, reverb_set+50 + .equ se_warp_out_mvl, 127 + .equ se_warp_out_key, 0 + .equ se_warp_out_tbs, 1 + .equ se_warp_out_exg, 0 + .equ se_warp_out_cmp, 1 .section .rodata - .global se_tk_warpout + .global se_warp_out .align 2 @********************** Track 1 **********************@ -se_tk_warpout_1: - .byte KEYSH , se_tk_warpout_key+0 - .byte TEMPO , 110*se_tk_warpout_tbs/2 +se_warp_out_1: + .byte KEYSH , se_warp_out_key+0 + .byte TEMPO , 110*se_warp_out_tbs/2 .byte VOICE , 93 .byte XCMD , xIECV , 9 .byte xIECL , 8 - .byte VOL , 90*se_tk_warpout_mvl/mxv + .byte VOL , 90*se_warp_out_mvl/mxv .byte N06 , En5 , v064 .byte W03 .byte W03 @@ -47,14 +47,14 @@ se_tk_warpout_1: @******************************************************@ .align 2 -se_tk_warpout: +se_warp_out: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_tk_warpout_pri @ Priority - .byte se_tk_warpout_rev @ Reverb. + .byte se_warp_out_pri @ Priority + .byte se_warp_out_rev @ Reverb. - .word se_tk_warpout_grp + .word se_warp_out_grp - .word se_tk_warpout_1 + .word se_warp_out_1 .end diff --git a/sound/songs/se_z_scroll.s b/sound/songs/se_z_scroll.s deleted file mode 100644 index 1806e4b77..000000000 --- a/sound/songs/se_z_scroll.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_z_scroll_grp, voicegroup110 - .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/cube.c b/src/battle/anim/cube.c index e807002b4..d45d6cd16 100644 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -72,7 +72,7 @@ static void sub_80CE000(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/current.c b/src/battle/anim/current.c index 165bded09..12da95fa8 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -1045,7 +1045,7 @@ static bool8 sub_80D7470(struct Task *task, u8 taskId) if (task->data[4] == 0 && task->data[5] > 0) { task->data[14] += task->data[15]; - PlaySE12WithPanning(SE_W085, task->data[14]); + PlaySE12WithPanning(SE_M_THUNDERBOLT, task->data[14]); } if ((task->data[5] < 0 && task->data[7] <= task->data[8]) diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index 4dea1ed1d..eddf4aac0 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -257,7 +257,7 @@ static void sub_80DDBD8(struct Sprite *sprite) return; if (r0 <= 0) return; - PlaySE12WithPanning(SE_W109, gUnknown_0202F7D2); + PlaySE12WithPanning(SE_M_CONFUSE_RAY, gUnknown_0202F7D2); } static void sub_80DDC4C(struct Sprite *sprite) @@ -276,7 +276,7 @@ static void sub_80DDC4C(struct Sprite *sprite) if (r2 == 0 || r2 > 196) { if (r0 > 0) - PlaySE(SE_W109); + PlaySE(SE_M_CONFUSE_RAY); } if (sprite->data[6] == 0) diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index ef7f50f00..40aaba4b8 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -1426,9 +1426,9 @@ static void sub_80E3338(u8 taskId) gTasks[taskId].func = sub_80E3704; if (taskData[0] == 0) - PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); else - PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); } static void sub_80E3704(u8 taskId) diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index c76e522f4..714f93030 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -1129,7 +1129,7 @@ void sub_80DC700(struct Sprite *sprite) case 1: if (sprite->affineAnimEnded) { - PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_TELEPORT, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); ChangeSpriteAffineAnim(sprite, 1); sprite->data[0]++; } diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index d97076e89..6f0ed4616 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -653,7 +653,7 @@ static void sub_80DD604(u8 taskId) task->data[0]++; } - PlaySE12WithPanning(SE_W029, task->data[13]); + PlaySE12WithPanning(SE_M_HEADBUTT, task->data[13]); break; case 1: if (--task->data[11] == 0) @@ -683,7 +683,7 @@ static void sub_80DD604(u8 taskId) task->data[9] = 0; sub_80DD774(task); task->data[13] += task->data[14]; - PlaySE12WithPanning(SE_W091, task->data[13]); + PlaySE12WithPanning(SE_M_DIG, task->data[13]); } if (--task->data[8] == 0) diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index d1f25c09d..1c430d923 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -142,7 +142,7 @@ static void sub_80D5C5C(struct Sprite *sprite) if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0) { - PlaySE12WithPanning(SE_W172, gUnknown_0202F7D2); + PlaySE12WithPanning(SE_M_FLAME_WHEEL, gUnknown_0202F7D2); } } else diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 56e348f20..d4589beb5 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -2421,7 +2421,7 @@ void sub_812DB84(u8 taskId) gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[0]++; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); break; case 1: if (gTasks[taskId].data[4]++ > 0) @@ -2456,7 +2456,7 @@ void sub_812DB84(u8 taskId) { gTasks[taskId].data[3] = 0; gTasks[taskId].data[0] = 1; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); } break; case 4: @@ -4710,7 +4710,7 @@ static void sub_8131408(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); gTasks[taskId].data[10] -= 0x800; gTasks[taskId].data[0]++; } @@ -4732,7 +4732,7 @@ static void sub_8131408(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); DestroyAnimVisualTask(taskId); } break; @@ -4767,7 +4767,7 @@ static void sub_81315C8(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]++; } @@ -4777,7 +4777,7 @@ static void sub_81315C8(struct Sprite *sprite) sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3); if (sprite->data[1] > 127) { - 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]++; @@ -4796,7 +4796,7 @@ static void sub_81315C8(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]++; } @@ -5744,7 +5744,7 @@ void sub_8131EB8(struct Sprite *sprite) case 0: if (gBattleAnimArgs[7] == -1) { - PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(63)); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16; sprite->data[0] = -32; sprite->data[7]++; diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 3c2a60077..d9cc2a477 100755 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -736,7 +736,7 @@ static void sub_813FCBC(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_813FD90; CreateTask(sub_813FD34, 10); gTasks[taskId].func = sub_813FB7C; @@ -824,7 +824,7 @@ static void sub_813FEC8(struct Sprite *sprite) taskId = sprite->data[5]; if (++gTasks[taskId].data[1] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); switch (gTasks[taskId].data[0]) { @@ -903,16 +903,16 @@ static void sub_8140058(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; } } @@ -956,7 +956,7 @@ static void sub_8140158(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 1); ewram17840.unkC = 0; sprite->callback = sub_81401A0; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } @@ -1098,7 +1098,7 @@ static void sub_81401A0(struct Sprite *sprite) else StartSpriteAffineAnim(sprite, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } @@ -1135,7 +1135,7 @@ static void sub_8140454(struct Sprite *sprite) gDoingBattleAnim = 0; UpdateOamPriorityInAllHealthboxes(1); m4aMPlayAllStop(); - PlaySE(MUS_FANFA5); + PlaySE(MUS_EVOLVED); } else if (sprite->data[4] == 315) { @@ -1307,7 +1307,7 @@ u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballInde gTasks[taskId].data[3] = priority; gTasks[taskId].data[4] = subpriority; gTasks[taskId].data[15] = ballIndex; - PlaySE(SE_BOWA2); + PlaySE(SE_BALL_OPEN); if (gMain.inBattle) ewram17840.unkA++; @@ -1950,7 +1950,7 @@ static void sub_814191C(u8 taskId) else pan = 63; - PlaySE12WithPanning(SE_REAPOKE, pan); + PlaySE12WithPanning(SE_SHINY, pan); } } diff --git a/src/battle_bg.c b/src/battle_bg.c index 29369958c..6aa22edf6 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -618,7 +618,7 @@ void sub_800DE30(u8 taskId) if (gTasks[taskId].data[5]) { PrintLinkBattleWinLossTie(); } - PlaySE(SE_W231); + PlaySE(SE_M_HARDEN); DestroyTask(taskId); gSprites[gBattleStruct->unk1608A].invisible = FALSE; gSprites[gBattleStruct->unk1608B].invisible = FALSE; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 445c6eac5..d781599e9 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -506,7 +506,7 @@ void sub_8037EF0(void) { if (gReceivedRemoteLinkPlayers == 0) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(c2_8011A1C); @@ -524,7 +524,7 @@ void sub_8037F34(void) } else { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -1290,7 +1290,7 @@ void LinkOpponentHandlecmd10(void) else if (!ewram17810[gActiveBattler].unk0_6) { ewram17810[gActiveBattler].unk4 = 0; - PlaySE12WithPanning(SE_POKE_DEAD, 63); + PlaySE12WithPanning(SE_FAINT, 63); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8010384; gBattlerControllerFuncs[gActiveBattler] = sub_8037B78; } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index acc35e2d2..67c46c59d 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1227,7 +1227,7 @@ void LinkPartnerHandlecmd10(void) { ewram17810[gActiveBattler].unk4 = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, -64); + PlaySE12WithPanning(SE_FAINT, -64); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80105EC; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 9fe69811e..b3685806d 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1294,7 +1294,7 @@ void OpponentHandlecmd10(void) else if (!ewram17810[gActiveBattler].unk0_6) { ewram17810[gActiveBattler].unk4 = 0; - PlaySE12WithPanning(SE_POKE_DEAD, 63); + PlaySE12WithPanning(SE_FAINT, 63); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8010384; gBattlerControllerFuncs[gActiveBattler] = sub_803311C; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index cf816f392..772728295 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -962,7 +962,7 @@ void sub_802D148(void) { if (gReceivedRemoteLinkPlayers == 0) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(c2_8011A1C); @@ -980,7 +980,7 @@ void sub_802D18C(void) } else { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -2470,7 +2470,7 @@ void PlayerHandlecmd10(void) { ewram17810[gActiveBattler].unk4 = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, -64); + PlaySE12WithPanning(SE_FAINT, -64); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80105EC; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index a2a48dd38..104a0eecf 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -795,7 +795,7 @@ void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b) if (!ewram17800[b].unk0_1) { if (!ewram17800[b ^ 2].unk0_1) - PlaySE(SE_HINSI); + PlaySE(SE_LOW_HEALTH); ewram17800[b].unk0_1 = 1; } } @@ -804,12 +804,12 @@ void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b) ewram17800[b].unk0_1 = 0; if (!IsDoubleBattle()) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); return; } if (IsDoubleBattle() && !ewram17800[b ^ 2].unk0_1) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); return; } } @@ -822,7 +822,7 @@ void BattleStopLowHpSound(void) ewram17800[r4].unk0_1 = 0; if (IsDoubleBattle()) ewram17800[r4 ^ 2].unk0_1 = 0; - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); } u8 unref_sub_8032604(struct Pokemon *pkmn) diff --git a/src/battle_interface.c b/src/battle_interface.c index 149e409cb..29775112a 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1688,7 +1688,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) for (i = 0; i < 6; i++) gTasks[taskId].data[3 + i] = sp[i]; gTasks[taskId].data[10] = d; - PlaySE12WithPanning(SE_TB_START, 0); + PlaySE12WithPanning(SE_BALL_TRAY_ENTER, 0); return taskId; } #else @@ -2455,9 +2455,9 @@ static void sub_804507C(struct Sprite *sprite) if (r3 != 0) pan = -64; 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 061d1f102..80e6167c3 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1189,7 +1189,7 @@ void sub_800FE20(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_800FDB0; - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); } void sub_800FE40(u8 taskId) @@ -4948,7 +4948,7 @@ void HandleEndTurn_BattleWon(void) { case TRAINER_CLASS_ELITE_FOUR: case TRAINER_CLASS_CHAMPION: - PlayBGM(MUS_KACHI5); + PlayBGM(MUS_VICTORY_LEAGUE); break; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: @@ -4956,13 +4956,13 @@ void HandleEndTurn_BattleWon(void) case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_ADMIN: case TRAINER_CLASS_MAGMA_LEADER: - PlayBGM(MUS_KACHI4); + PlayBGM(MUS_VICTORY_AQUA_MAGMA); break; case TRAINER_CLASS_LEADER: - PlayBGM(MUS_KACHI3); + PlayBGM(MUS_VICTORY_GYM_LEADER); break; default: - PlayBGM(MUS_KACHI1); + PlayBGM(MUS_VICTORY_TRAINER); break; } } @@ -5625,7 +5625,7 @@ void HandleAction_GoNear(void) void HandleAction_SafriZoneRun(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; - PlaySE(SE_NIGERU); + PlaySE(SE_FLEE); gCurrentTurnActionNumber = gBattlersCount; gBattleOutcome = B_OUTCOME_RAN; } diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index e758b7957..e0e455811 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -476,7 +476,7 @@ void HandleBattlePartyMenu(u8 taskId) if (gUnknown_02038473 == 3) { if (GetMonData(&gPlayerParty[sub_806CA38(taskId)], MON_DATA_IS_EGG)) - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); else { sub_806D5A4(); @@ -493,7 +493,7 @@ void HandleBattlePartyMenu(u8 taskId) break; case B_BUTTON: if (gUnknown_02038473 == 1) - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); else { PlaySE(SE_SELECT); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index db2e1af12..0cdcfe8f9 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2091,11 +2091,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: @@ -2108,17 +2108,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; @@ -5413,7 +5413,7 @@ static void atk23_getexp(void) if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); - PlayBGM(MUS_KACHI2); + PlayBGM(MUS_VICTORY_WILD); gBattleStruct->wildVictorySong++; } diff --git a/src/battle_setup.c b/src/battle_setup.c index cb07c5049..d8319e620 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -590,7 +590,7 @@ void ScrSpecial_StartRayquazaBattle(void) ScriptContext2_Enable(); gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE34); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_KYOGRE_GROUDON); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -601,9 +601,9 @@ void ScrSpecial_StartGroudonKyogreBattle(void) gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; if (gGameVersion == VERSION_RUBY) - CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON + CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_VS_KYOGRE_GROUDON); // GROUDON else - CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE + CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_VS_KYOGRE_GROUDON); // KYOGRE IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -613,7 +613,7 @@ void ScrSpecial_StartRegiBattle(void) ScriptContext2_Enable(); gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI; - CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_BATTLE36); + CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_REGI); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -1186,46 +1186,46 @@ void PlayTrainerEncounterMusic(void) switch (sub_803FC58(gTrainerBattleOpponent)) { case TRAINER_ENCOUNTER_MUSIC_MALE: - music = MUS_BOYEYE; + music = MUS_ENCOUNTER_MALE; break; case TRAINER_ENCOUNTER_MUSIC_FEMALE: - music = MUS_GIRLEYE; + music = MUS_ENCOUNTER_FEMALE; break; case TRAINER_ENCOUNTER_MUSIC_GIRL: - music = MUS_SYOUJOEYE; + music = MUS_ENCOUNTER_GIRL; break; case TRAINER_ENCOUNTER_MUSIC_INTENSE: - music = MUS_HAGESHII; + music = MUS_ENCOUNTER_INTENSE; break; case TRAINER_ENCOUNTER_MUSIC_COOL: - music = MUS_KAKKOII; + music = MUS_ENCOUNTER_COOL; break; case TRAINER_ENCOUNTER_MUSIC_AQUA: - music = MUS_AQA_0; + music = MUS_ENCOUNTER_AQUA; break; case TRAINER_ENCOUNTER_MUSIC_MAGMA: - music = MUS_MGM0; + music = MUS_ENCOUNTER_MAGMA; break; case TRAINER_ENCOUNTER_MUSIC_SWIMMER: - music = MUS_SWIMEYE; + music = MUS_ENCOUNTER_SWIMMER; break; case TRAINER_ENCOUNTER_MUSIC_TWINS: - music = MUS_HUTAGO; + music = MUS_ENCOUNTER_TWINS; break; case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR: - music = MUS_SITENNOU; + music = MUS_ENCOUNTER_ELITE_FOUR; break; case TRAINER_ENCOUNTER_MUSIC_HIKER: - music = MUS_YAMA_EYE; + music = MUS_ENCOUNTER_HIKER; break; case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER: - music = MUS_INTER_V; + music = MUS_ENCOUNTER_INTERVIEWER; break; case TRAINER_ENCOUNTER_MUSIC_RICH: - music = MUS_TEST; + music = MUS_ENCOUNTER_RICH; break; default: - music = MUS_AYASII; + music = MUS_ENCOUNTER_SUSPICIOUS; } PlayNewMapMusic(music); } diff --git a/src/battle_transition.c b/src/battle_transition.c index a0c94f713..b7aac2c65 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1580,7 +1580,7 @@ static bool8 Phase2_Mugshot_Func4(struct Task* task) sub_811CA10(task->tMugshotPlayerID, 1); sub_811CA28(task->tMugshotOpponentID); - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); TRANSITION_STRUCT.VBlank_DMA++; return FALSE; diff --git a/src/berry_blender.c b/src/berry_blender.c index c86b707b3..7955c1458 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -970,7 +970,7 @@ void sub_804E738(struct Sprite* sprite) if (++sprite->data[5] > 3) DestroySprite(sprite); else - PlaySE(SE_TB_KARA); + PlaySE(SE_BALL_TRAY_EXIT); } sprite->pos1.x = sprite->data[1]; sprite->pos1.y = sprite->data[2]; @@ -1451,7 +1451,7 @@ static void sub_804F378(void) case 13: gBerryBlenderData->field_0++; sub_804F238(); - PlaySE(SE_RU_HYUU); + PlaySE(SE_FALL); sub_8051414(&gBerryBlenderData->field_168); break; case 14: @@ -1465,7 +1465,7 @@ static void sub_804F378(void) gBerryBlenderData->arrowPos = gUnknown_082162F8[gUnknown_08216300[gBerryBlenderData->playersNo - 2]]; REG_BG2CNT = 0x4882; gBerryBlenderData->framesToWait = 0; - PlaySE(SE_TRACK_DOOR);; + PlaySE(SE_TRUCK_DOOR);; sub_804F2A8(); } sub_8051414(&gBerryBlenderData->field_168); @@ -1508,7 +1508,7 @@ static void sub_804F378(void) gBerryBlenderData->field_178 = GetCurrentMapMusic(); } PlayBGM(MUS_CYCLING); - PlaySE(SE_MOTER); + PlaySE(SE_BERRY_BLENDER); Blender_ControlHitPitch(); break; } @@ -1699,17 +1699,17 @@ static void sub_804FC48(u16 a0, u8 a1) { StartSpriteAnim(&gSprites[spriteID], 2); gSprites[spriteID].callback = sub_8051684; - PlaySE(SE_RU_GASHIN); + PlaySE(SE_ICE_STAIRS); } else if (a0 == 0x5432) { StartSpriteAnim(&gSprites[spriteID], 0); - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); } else if (a0 == 0x2345) { StartSpriteAnim(&gSprites[spriteID], 1); - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } sub_805156C(); } @@ -2770,7 +2770,7 @@ static void sub_805181C(struct Sprite* sprite) { sprite->data[1] = 88; sprite->data[0]++; - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); } break; case 1: @@ -3537,7 +3537,7 @@ static void sub_8052BD0(u8 taskID) { if (gTasks[taskID].data[0] == 0) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); gTasks[taskID].data[0]++; } if (IsFanfareTaskInactive()) diff --git a/src/bike.c b/src/bike.c index c03926168..75a5d2d41 100644 --- a/src/bike.c +++ b/src/bike.c @@ -678,7 +678,7 @@ static void AcroBikeTransition_SideJump(u8 direction) } } playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); playerObjEvent->facingDirectionLocked = 1; PlayerSetAnimId(GetJumpMovementAction(direction), 2); } diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 428d114c7..d00a86cd5 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -50,7 +50,7 @@ void DoBrailleDigEffect(void) MapGridSetMetatileIdAt(17, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); MapGridSetMetatileIdAt(18, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT)); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_BRAILLE_DIG); ScriptContext2_Disable(); } @@ -93,7 +93,7 @@ void DoBrailleStrengthEffect(void) MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT)); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_BRAILLE_STRENGTH); ScriptContext2_Disable(); } @@ -139,7 +139,7 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT)); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_BRAILLE_FLY); ScriptContext2_Disable(); } diff --git a/src/cable_car.c b/src/cable_car.c index 45e0a9cbc..3a661be34 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -386,7 +386,7 @@ static void CableCarMainCallback_Setup(void) break; case 7: BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0)); - FadeInNewBGM(MUS_ROPEWAY, 1); + FadeInNewBGM(MUS_CABLE_CAR, 1); sub_8123FBC(1); gMain.state++; break; diff --git a/src/cable_club.c b/src/cable_club.c index 78e227cef..115f02d81 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -766,9 +766,9 @@ static void sub_808382C(u8 taskId) break; case 5: if (gLinkPlayers[0].trainerId & 1) - current_map_music_set__default_for_battle(MUS_BATTLE32); + current_map_music_set__default_for_battle(MUS_VS_GYM_LEADER); else - current_map_music_set__default_for_battle(MUS_BATTLE20); + current_map_music_set__default_for_battle(MUS_VS_TRAINER); switch (gSpecialVar_0x8004) { diff --git a/src/choose_party.c b/src/choose_party.c index 305f9cd63..f1252f965 100644 --- a/src/choose_party.c +++ b/src/choose_party.c @@ -390,7 +390,7 @@ static void sub_81224A8(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintPartyMenuPromptText(14, 0); gTasks[taskId].func = sub_8122480; } @@ -460,7 +460,7 @@ static void BattleTowerEntryMenuCallback_Enter(u8 taskId) return; } } - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); Menu_EraseWindowRect(20, 10, 29, 19); Menu_DestroyCursor(); sub_806D5A4(); @@ -658,7 +658,7 @@ static void sub_8122AB8(u8 taskId) { gTasks[taskId].func = sub_8122B10; ewram1B000.unk261 = 2; - PlaySE(SE_W231); + PlaySE(SE_M_HARDEN); } } diff --git a/src/contest.c b/src/contest.c index 1a1c62023..58566e28d 100644 --- a/src/contest.c +++ b/src/contest.c @@ -566,7 +566,7 @@ void sub_80AB9A0(u8 taskId) if (gTasks[taskId].data[1]++ <= 60) break; gTasks[taskId].data[1] = 0; - PlaySE12WithPanning(SE_C_MAKU_U, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0); gTasks[taskId].data[0]++; break; case 1: @@ -1301,7 +1301,7 @@ void sub_80AC2CC(u8 taskId) return; case 50: if (sub_80AF038(r7)) - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); gTasks[taskId].data[0] = 25; return; case 25: @@ -1387,9 +1387,9 @@ void sub_80AC2CC(u8 taskId) break; } if (sub_80AF038(i)) - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); else - PlaySE(SE_C_SYU); + PlaySE(SE_CONTEST_ICON_CLEAR); if (sContestantStatus[i].judgesAttentionWasRemoved) { sub_80B03A8(i); @@ -1570,7 +1570,7 @@ void sub_80AC2CC(u8 taskId) { case 0: sub_80B1EA8(-1, 1); - PlayFanfare(MUS_ME_ZANNEN); + PlayFanfare(MUS_TOO_BAD); gTasks[taskId].data[10]++; break; case 1: @@ -1615,7 +1615,7 @@ void sub_80AC2CC(u8 taskId) if (!sContest.unk1920B_0) { sub_80B1DDC(); - PlaySE(SE_W227B); + PlaySE(SE_M_ENCORE2); sub_80B1CBC(1); gTasks[taskId].data[10]++; } @@ -1999,7 +1999,7 @@ void sub_80ADE54(u8 taskId) sub_80B2184(); gBattle_BG1_X = 0; gBattle_BG1_Y = 160; - PlaySE12WithPanning(SE_C_MAKU_D, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].func = sub_80ADEAC; } @@ -2673,7 +2673,7 @@ bool8 sub_80AEE54(u8 a, u8 b) } if (b != 0) { - PlaySE(SE_EXPMAX); + PlaySE(SE_EXP_MAX); sContestantStatus[a].conditionMod = 0; } } @@ -2688,7 +2688,7 @@ bool8 sub_80AEE54(u8 a, u8 b) } if (b != 0) { - PlaySE(SE_FU_ZAKU2); + PlaySE(SE_CONTEST_CONDITION_LOSE); sContestantStatus[a].conditionMod = 0; } } @@ -3365,7 +3365,7 @@ void sub_80AFC74(u8 taskId) CpuFill16(r6, (void *)(VRAM + 0xC000 + (0x56 + r5 + gUnknown_02038696[r7] * 160) * 2), 2); if (r1 > 0) { - PlaySE(SE_C_GAJI); + PlaySE(SE_CONTEST_HEART); m4aMPlayImmInit(&gMPlayInfo_SE1); m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256); } @@ -3578,7 +3578,7 @@ void sub_80B02A8(struct Sprite *sprite) StartSpriteAnim(sprite, sContestantStatus[sprite->data[0]].unkB_0); StartSpriteAffineAnim(sprite, 2); sprite->callback = sub_80B02F4; - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); } void sub_80B02F4(struct Sprite *sprite) @@ -4265,9 +4265,9 @@ void sub_80B0BC4(u8 a, bool8 b) gSprites[a].callback = sub_80B0C5C; gSprites[r5].callback = SpriteCallbackDummy; if (b == FALSE) - PlaySE(SE_C_PIKON); + PlaySE(SE_CONTEST_MONS_TURN); else - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); } void sub_80B0C5C(struct Sprite *sprite) @@ -4732,36 +4732,36 @@ void sub_80B1710(u8 a) case 0: case 1: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0]; - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); break; case 2: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 4; - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); break; case 3: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 8; - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); break; case 4: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case 5: // exactly the same as case 4 gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case 6: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 16; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case 8: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 24; - PlaySE(SE_W215); + PlaySE(SE_M_HEAL_BELL); break; case 7: default: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 20; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; } gSprites[spriteId].data[1] = 0; @@ -5089,7 +5089,7 @@ void sub_80B20C4(void) *(u16 *)(VRAM + 0xC000 + r4 * 64 + 0x2A) = r0 + 1; *(u16 *)(VRAM + 0xC000 + (r4 + 1) * 64 + 0x28) = r0 + 16; *(u16 *)(VRAM + 0xC000 + (r4 + 1) * 64 + 0x2A) = r0 + 17; - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); } } } @@ -5157,7 +5157,7 @@ void sub_80B237C(u8 taskId) { gBattle_BG1_X = 0; gBattle_BG1_Y = DISPLAY_HEIGHT; - PlaySE12WithPanning(SE_C_MAKU_D, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0); gTasks[taskId].func = sub_80B23BC; } @@ -5269,7 +5269,7 @@ void sub_80B25A4(u8 taskId) else { gTasks[taskId].data[2] = 0; - PlaySE12WithPanning(SE_C_MAKU_U, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0); gTasks[taskId].func = sub_80B2508; } } diff --git a/src/contest_link_80C2020.c b/src/contest_link_80C2020.c index f4203dd42..356c806f8 100644 --- a/src/contest_link_80C2020.c +++ b/src/contest_link_80C2020.c @@ -329,7 +329,7 @@ void sub_80C2358(void) gBattle_WIN1V = 0x80a0; CreateTask(sub_80C2F28, 20); sub_80C3F00(); - PlayBGM(MUS_CON_K); + PlayBGM(MUS_CONTEST_RESULTS); SetVBlankCallback(sub_80C2448); } @@ -1854,7 +1854,7 @@ void sub_80C3A5C(u8 taskId) *(vu16 *)((VRAM + 0xE184) + gTasks[taskId].data[1] * 192) = firstTileNum + 0x11; eContestLink80C2020Struct2018000.unk_05++; DestroyTask(taskId); - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); } } } diff --git a/src/credits.c b/src/credits.c index daf6d2b5c..1ab6ed859 100644 --- a/src/credits.c +++ b/src/credits.c @@ -497,7 +497,7 @@ void sub_81439D0(void) SetVBlankCallback(vblank_8143948); - m4aSongNumStart(MUS_THANKFOR); + m4aSongNumStart(MUS_CREDITS); SetMainCallback2(sub_814395C); gUnknown_02039325 = 0; diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index 951807252..4534516c1 100644 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -613,23 +613,23 @@ const u8 BattleText_StatNoHigher[] = _("{ATTACKING_MON}'s stats won't\ngo any hi const u8 BattleText_StatNoLower[] = _("{DEFENDING_MON}'s stats won't\ngo any lower!"); const u8 BattleText_Critical[] = _("A critical hit!"); const u8 BattleText_GrandSlam[] = _("It's a one-hit KO!"); -const u8 BattleText_MoveForget123[] = _("{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_KON}Poof!\p"); +const u8 BattleText_MoveForget123[] = _("{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p"); const u8 BattleText_MoveForgetAnd[] = _("And...\p"); const u8 BattleText_CantForgetHM[] = _("HM moves can't be\nforgotten now.\p"); const u8 BattleText_NotEffective[] = _("It's not very effective..."); const u8 BattleText_SuperEffective[] = _("It's super effective!"); -const u8 BattleText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p"); -const u8 BattleText_FledUsingItem[] = _("{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing its {STRING 19}!\p"); -const u8 BattleText_FledUsingOther[] = _("{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing {STRING 21}!\p"); -const u8 BattleText_FledWild[] = _("{PLAY_SE SE_NIGERU}Wild {STRING 0} fled!"); +const u8 BattleText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}Got away safely!\p"); +const u8 BattleText_FledUsingItem[] = _("{PLAY_SE SE_FLEE}{ATTACKING_MON} fled\nusing its {STRING 19}!\p"); +const u8 BattleText_FledUsingOther[] = _("{PLAY_SE SE_FLEE}{ATTACKING_MON} fled\nusing {STRING 21}!\p"); +const u8 BattleText_FledWild[] = _("{PLAY_SE SE_FLEE}Wild {STRING 0} fled!"); const u8 BattleText_PlayerDefeatedTrainer[] = _("Player defeated\n{STRING 29}!"); const u8 BattleText_PlayerDefeatedTrainers[] = _("Player beat {STRING 30}\nand {STRING 29}!"); const u8 BattleText_PlayerLostTrainer[] = _("Player lost against\n{STRING 29}!"); const u8 BattleText_PlayerLostTrainers[] = _("Player lost to {STRING 30}\nand {STRING 29}!"); const u8 BattleText_PlayerTiedTrainer[] = _("Player tied against\n{STRING 29}!"); const u8 BattleText_PlayerTiedTrainers[] = _("Player tied against {STRING 30}\nand {STRING 29}!"); -const u8 BattleText_FledSingle[] = _("{PLAY_SE SE_NIGERU}{STRING 29} fled!"); -const u8 BattleText_FledDouble[] = _("{PLAY_SE SE_NIGERU}{STRING 29} and\n{STRING 30} fled!"); +const u8 BattleText_FledSingle[] = _("{PLAY_SE SE_FLEE}{STRING 29} fled!"); +const u8 BattleText_FledDouble[] = _("{PLAY_SE SE_FLEE}{STRING 29} and\n{STRING 30} fled!"); const u8 BattleText_NoRunning[] = _("No! There's no running\nfrom a TRAINER battle!\p"); const u8 BattleText_CantEscape2[] = _("Can't escape!\p"); const u8 BattleText_BirchDontLeaveMe[] = _("PROF. BIRCH: D-don't leave\nme here like this!\p"); @@ -679,7 +679,7 @@ const u8 BattleText_CuriousAbout[] = _("{STRING 3} is curious about\nthe {STRING const u8 BattleText_EnthralledBy[] = _("{STRING 3} is enthralled by\nthe {STRING 0}!"); const u8 BattleText_IgnoredThing[] = _("{STRING 3} completely ignored\nthe {STRING 0}!"); const u8 BattleText_ThrewBlock[] = _("{STRING 32} threw a {POKEBLOCK}\nat the {STRING 3}!"); -const u8 BattleText_SafariOver[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); +const u8 BattleText_SafariOver[] = _("{PLAY_SE SE_DING_DONG}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); const u8 BattleText_WildAppeared1[] = _("Wild {STRING 3} appeared!\p"); const u8 BattleText_WildAppeared2[] = _("Wild {STRING 3} appeared!\p"); const u8 BattleText_WildAppeared3[] = _("Wild {STRING 3} appeared!{PAUSE 127}"); @@ -747,8 +747,8 @@ const u8 BattleText_BallBrokeOhNo[] = _("Oh, no!\nThe POKéMON broke free!"); const u8 BattleText_BallBrokeAppeared[] = _("Aww!\nIt appeared to be caught!"); const u8 BattleText_BallBrokeAlmost[] = _("Aargh!\nAlmost had it!"); const u8 BattleText_BallBrokeSoClose[] = _("Shoot!\nIt was so close, too!"); -const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}\p"); -const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}"); +const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_CAUGHT}\p"); +const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}"); const u8 BattleText_GiveNickname[] = _("Give a nickname to the\ncaptured {STRING 3}?"); const u8 BattleText_SentToPC[] = _("{STRING 3} was sent to\n{STRING 35} PC."); const u8 BattleText_Someone[] = _("someone's"); diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index dec9b4371..5b7a26f97 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -814,373 +814,373 @@ void sub_80BB1D4(void) #define SOUND_LIST_BGM \ X(MUS_STOP, "STOP") \ - X(MUS_TETSUJI, "TETSUJI") \ - X(MUS_FIELD13, "FIELD13") \ - X(MUS_KACHI22, "KACHI22") \ - X(MUS_KACHI2, "KACHI2") \ - X(MUS_KACHI3, "KACHI3") \ - X(MUS_KACHI5, "KACHI5") \ - X(MUS_PCC, "PCC") \ - X(MUS_NIBI, "NIBI") \ - X(MUS_SUIKUN, "SUIKUN") \ - X(MUS_DOORO1, "DOORO1") \ - X(MUS_DOORO_X1, "DOORO-X1") \ - X(MUS_DOORO_X3, "DOORO-X3") \ - X(MUS_MACHI_S2, "MACHI-S2") \ - X(MUS_MACHI_S4, "MACHI-S4") \ - X(MUS_GIM, "GIM") \ - X(MUS_NAMINORI, "NAMINORI") \ - X(MUS_DAN01, "DAN01") \ - X(MUS_FANFA1, "FANFA1") \ - X(MUS_ME_ASA, "ME-ASA") \ - X(MUS_ME_BACHI, "ME-BACHI") \ - X(MUS_FANFA4, "FANFA4") \ - X(MUS_FANFA5, "FANFA5") \ - X(MUS_ME_WAZA, "ME-WAZA") \ - X(MUS_BIJYUTU, "BIJYUTU") \ - X(MUS_DOORO_X4, "DOORO-X4") \ - X(MUS_FUNE_KAN, "FUNE-KAN") \ - X(MUS_ME_SHINKA, "ME-SHINKA") \ - X(MUS_SHINKA, "SHINKA") \ - X(MUS_ME_WASURE, "ME-WASURE") \ - X(MUS_SYOUJOEYE, "SYOUJOEYE") \ - X(MUS_BOYEYE, "BOYEYE") \ - X(MUS_DAN02, "DAN02") \ - X(MUS_MACHI_S3, "MACHI-S3") \ - X(MUS_ODAMAKI, "ODAMAKI") \ + X(MUS_LITTLEROOT_TEST, "TETSUJI") \ + X(MUS_GSC_ROUTE38, "FIELD13") \ + X(MUS_CAUGHT, "KACHI22") \ + X(MUS_VICTORY_WILD, "KACHI2") \ + X(MUS_VICTORY_GYM_LEADER, "KACHI3") \ + X(MUS_VICTORY_LEAGUE, "KACHI5") \ + X(MUS_C_COMM_CENTER, "PCC") \ + X(MUS_GSC_PEWTER, "NIBI") \ + X(MUS_C_VS_LEGEND_BEAST, "SUIKUN") \ + X(MUS_ROUTE101, "DOORO1") \ + X(MUS_ROUTE110, "DOORO-X1") \ + X(MUS_ROUTE120, "DOORO-X3") \ + X(MUS_PETALBURG, "MACHI-S2") \ + X(MUS_OLDALE, "MACHI-S4") \ + X(MUS_GYM, "GIM") \ + X(MUS_SURF, "NAMINORI") \ + X(MUS_PETALBURG_WOODS, "DAN01") \ + X(MUS_LEVEL_UP, "FANFA1") \ + X(MUS_HEAL, "ME-ASA") \ + X(MUS_OBTAIN_BADGE, "ME-BACHI") \ + X(MUS_OBTAIN_ITEM, "FANFA4") \ + X(MUS_EVOLVED, "FANFA5") \ + X(MUS_OBTAIN_TMHM, "ME-WAZA") \ + X(MUS_LILYCOVE_MUSEUM, "BIJYUTU") \ + X(MUS_ROUTE122, "DOORO-X4") \ + X(MUS_OCEANIC_MUSEUM, "FUNE-KAN") \ + X(MUS_EVOLUTION_INTRO, "ME-SHINKA") \ + X(MUS_EVOLUTION, "SHINKA") \ + X(MUS_MOVE_DELETED, "ME-WASURE") \ + X(MUS_ENCOUNTER_GIRL, "SYOUJOEYE") \ + X(MUS_ENCOUNTER_MALE, "BOYEYE") \ + X(MUS_ABANDONED_SHIP, "DAN02") \ + X(MUS_FORTREE, "MACHI-S3") \ + X(MUS_BIRCH_LAB, "ODAMAKI") \ X(MUS_B_TOWER, "B-TOWER") \ - X(MUS_SWIMEYE, "SWIMEYE") \ - X(MUS_DAN03, "DAN03") \ - X(MUS_ME_KINOMI, "ME-KINOMI") \ - X(MUS_ME_TAMA, "ME-TAMA") \ - X(MUS_ME_B_BIG, "ME-B-BIG") \ - X(MUS_ME_B_SMALL, "ME-B-SMALL") \ - X(MUS_ME_ZANNEN, "ME-ZANNEN") \ - X(MUS_BD_TIME, "BD-TIME") \ - X(MUS_TEST1, "TEST1") \ - X(MUS_TEST2, "TEST2") \ - X(MUS_TEST3, "TEST3") \ - X(MUS_TEST4, "TEST4") \ - X(MUS_TEST, "TEST") \ - X(MUS_GOMACHI0, "GOMACHI0") \ - X(MUS_GOTOWN, "GOTOWN") \ - X(MUS_POKECEN, "POKECEN") \ - X(MUS_NEXTROAD, "NEXTROAD") \ - X(MUS_GRANROAD, "GRANROAD") \ + X(MUS_ENCOUNTER_SWIMMER, "SWIMEYE") \ + X(MUS_CAVE_OF_ORIGIN, "DAN03") \ + X(MUS_OBTAIN_BERRY, "ME-KINOMI") \ + X(MUS_AWAKEN_LEGEND, "ME-TAMA") \ + X(MUS_SLOTS_JACKPOT, "ME-B-BIG") \ + X(MUS_SLOTS_WIN, "ME-B-SMALL") \ + X(MUS_TOO_BAD, "ME-ZANNEN") \ + X(MUS_ROULETTE, "BD-TIME") \ + X(MUS_LINK_CONTEST_P1, "TEST1") \ + X(MUS_LINK_CONTEST_P2, "TEST2") \ + X(MUS_LINK_CONTEST_P3, "TEST3") \ + X(MUS_LINK_CONTEST_P4, "TEST4") \ + X(MUS_ENCOUNTER_RICH, "TEST") \ + X(MUS_VERDANTURF, "GOMACHI0") \ + X(MUS_RUSTBORO, "GOTOWN") \ + X(MUS_POKE_CENTER, "POKECEN") \ + X(MUS_ROUTE104, "NEXTROAD") \ + X(MUS_ROUTE119, "GRANROAD") \ X(MUS_CYCLING, "CYCLING") \ - X(MUS_FRIENDLY, "FRIENDLY") \ - X(MUS_MISHIRO, "MISHIRO") \ - X(MUS_TOZAN, "TOZAN") \ - X(MUS_GIRLEYE, "GIRLEYE") \ - X(MUS_MINAMO, "MINAMO") \ - X(MUS_ASHROAD, "ASHROAD") \ - X(MUS_EVENT0, "EVENT0") \ - X(MUS_DEEPDEEP, "DEEPDEEP") \ - X(MUS_KACHI1, "KACHI1") \ - X(MUS_TITLE3, "TITLE3") \ - X(MUS_DEMO1, "DEMO1") \ - X(MUS_GIRL_SUP, "GIRL-SUP") \ - X(MUS_HAGESHII, "HAGESHII") \ - X(MUS_KAKKOII, "KAKKOII") \ - X(MUS_KAZANBAI, "KAZANBAI") \ - X(MUS_AQA_0, "AQA-0") \ - X(MUS_TSURETEK, "TSURETEK") \ - X(MUS_BOY_SUP, "BOY-SUP") \ - X(MUS_RAINBOW, "RAINBOW") \ - X(MUS_AYASII, "AYASII") \ - X(MUS_KACHI4, "KACHI4") \ - X(MUS_ROPEWAY, "ROPEWAY") \ - X(MUS_CASINO, "CASINO") \ - X(MUS_HIGHTOWN, "HIGHTOWN") \ - X(MUS_SAFARI, "SAFARI") \ - X(MUS_C_ROAD, "C-ROAD") \ - X(MUS_AJITO, "AJITO") \ - X(MUS_M_BOAT, "M-BOAT") \ - X(MUS_M_DUNGON, "M-DUNGON") \ - X(MUS_FINECITY, "FINECITY") \ - X(MUS_MACHUPI, "MACHUPI") \ - X(MUS_P_SCHOOL, "P-SCHOOL") \ - X(MUS_DENDOU, "DENDOU") \ - X(MUS_TONEKUSA, "TONEKUSA") \ - X(MUS_MABOROSI, "MABOROSI") \ - X(MUS_CON_FAN, "CON-FAN") \ - X(MUS_CONTEST0, "CONTEST0") \ - X(MUS_MGM0, "MGM0") \ - X(MUS_T_BATTLE, "T-BATTLE") \ - X(MUS_OOAME, "OOAME") \ - X(MUS_HIDERI, "HIDERI") \ - X(MUS_RUNECITY, "RUNECITY") \ - X(MUS_CON_K, "CON-K") \ - X(MUS_EIKOU_R, "EIKOU-R") \ - X(MUS_KARAKURI, "KARAKURI") \ - X(MUS_HUTAGO, "HUTAGO") \ - X(MUS_SITENNOU, "SITENNOU") \ - X(MUS_YAMA_EYE, "YAMA-EYE") \ - X(MUS_CONLOBBY, "CONLOBBY") \ - X(MUS_INTER_V, "INTER-V") \ - X(MUS_DAIGO, "DAIGO") \ - X(MUS_THANKFOR, "THANKFOR") \ + X(MUS_POKE_MART, "FRIENDLY") \ + X(MUS_LITTLEROOT, "MISHIRO") \ + X(MUS_MT_CHIMNEY, "TOZAN") \ + X(MUS_ENCOUNTER_FEMALE, "GIRLEYE") \ + X(MUS_LILYCOVE, "MINAMO") \ + X(MUS_ROUTE111, "ASHROAD") \ + X(MUS_HELP, "EVENT0") \ + X(MUS_UNDERWATER, "DEEPDEEP") \ + X(MUS_VICTORY_TRAINER, "KACHI1") \ + X(MUS_TITLE, "TITLE3") \ + X(MUS_INTRO, "DEMO1") \ + X(MUS_ENCOUNTER_MAY, "GIRL-SUP") \ + X(MUS_ENCOUNTER_INTENSE, "HAGESHII") \ + X(MUS_ENCOUNTER_COOL, "KAKKOII") \ + X(MUS_ROUTE113, "KAZANBAI") \ + X(MUS_ENCOUNTER_AQUA, "AQA-0") \ + X(MUS_FOLLOW_ME, "TSURETEK") \ + X(MUS_ENCOUNTER_BRENDAN, "BOY-SUP") \ + X(MUS_EVER_GRANDE, "RAINBOW") \ + X(MUS_ENCOUNTER_SUSPICIOUS, "AYASII") \ + X(MUS_VICTORY_AQUA_MAGMA, "KACHI4") \ + X(MUS_CABLE_CAR, "ROPEWAY") \ + X(MUS_GAME_CORNER, "CASINO") \ + X(MUS_DEWFORD, "HIGHTOWN") \ + X(MUS_SAFARI_ZONE, "SAFARI") \ + X(MUS_VICTORY_ROAD, "C-ROAD") \ + X(MUS_AQUA_MAGMA_HIDEOUT, "AJITO") \ + X(MUS_SAILING, "M-BOAT") \ + X(MUS_MT_PYRE, "M-DUNGON") \ + X(MUS_SLATEPORT, "FINECITY") \ + X(MUS_MT_PYRE_EXTERIOR, "MACHUPI") \ + X(MUS_SCHOOL, "P-SCHOOL") \ + X(MUS_HALL_OF_FAME, "DENDOU") \ + X(MUS_FALLARBOR, "TONEKUSA") \ + X(MUS_SEALED_CHAMBER, "MABOROSI") \ + X(MUS_CONTEST_WINNER, "CON-FAN") \ + X(MUS_CONTEST, "CONTEST0") \ + X(MUS_ENCOUNTER_MAGMA, "MGM0") \ + X(MUS_INTRO_BATTLE, "T-BATTLE") \ + X(MUS_WEATHER_KYOGRE, "OOAME") \ + X(MUS_WEATHER_GROUDON, "HIDERI") \ + X(MUS_SOOTOPOLIS, "RUNECITY") \ + X(MUS_CONTEST_RESULTS, "CON-K") \ + X(MUS_HALL_OF_FAME_ROOM, "EIKOU-R") \ + X(MUS_TRICK_HOUSE, "KARAKURI") \ + X(MUS_ENCOUNTER_TWINS, "HUTAGO") \ + X(MUS_ENCOUNTER_ELITE_FOUR, "SITENNOU") \ + X(MUS_ENCOUNTER_HIKER, "YAMA-EYE") \ + X(MUS_CONTEST_LOBBY, "CONLOBBY") \ + X(MUS_ENCOUNTER_INTERVIEWER, "INTER-V") \ + X(MUS_ENCOUNTER_CHAMPION, "DAIGO") \ + X(MUS_CREDITS, "THANKFOR") \ X(MUS_END, "END") \ - X(MUS_BATTLE27, "BATTLE27") \ - X(MUS_BATTLE31, "BATTLE31") \ - X(MUS_BATTLE20, "BATTLE20") \ - X(MUS_BATTLE32, "BATTLE32") \ - X(MUS_BATTLE33, "BATTLE33") \ - X(MUS_BATTLE36, "BATTLE36") \ - X(MUS_BATTLE34, "BATTLE34") \ - X(MUS_BATTLE35, "BATTLE35") \ - X(MUS_BATTLE38, "BATTLE38") \ - X(MUS_BATTLE30, "BATTLE30") + X(MUS_VS_WILD, "BATTLE27") \ + X(MUS_VS_AQUA_MAGMA, "BATTLE31") \ + X(MUS_VS_TRAINER, "BATTLE20") \ + X(MUS_VS_GYM_LEADER, "BATTLE32") \ + X(MUS_VS_CHAMPION, "BATTLE33") \ + X(MUS_VS_REGI, "BATTLE36") \ + X(MUS_VS_KYOGRE_GROUDON, "BATTLE34") \ + X(MUS_VS_RIVAL, "BATTLE35") \ + X(MUS_VS_ELITE_FOUR, "BATTLE38") \ + X(MUS_VS_AQUA_MAGMA_LEADER, "BATTLE30") #define SOUND_LIST_SE \ - X(SE_STOP, "STOP") \ - X(SE_KAIFUKU, "KAIFUKU") \ - X(SE_PC_LOGON, "PC-LOGON") \ + X(MUS_DUMMY, "STOP") \ + X(SE_USE_ITEM, "KAIFUKU") \ + X(SE_PC_LOGIN, "PC-LOGON") \ X(SE_PC_OFF, "PC-OFF") \ X(SE_PC_ON, "PC-ON") \ X(SE_SELECT, "SELECT") \ X(SE_WIN_OPEN, "WIN-OPEN") \ X(SE_WALL_HIT, "WALL-HIT") \ X(SE_DOOR, "DOOR") \ - X(SE_KAIDAN, "KAIDAN") \ - X(SE_DANSA, "DANSA") \ - X(SE_JITENSYA, "JITENSYA") \ - X(SE_KOUKA_L, "KOUKA-L") \ - X(SE_KOUKA_M, "KOUKA-M") \ - X(SE_KOUKA_H, "KOUKA-H") \ - X(SE_BOWA2, "BOWA2") \ - X(SE_POKE_DEAD, "POKE-DEAD") \ - X(SE_NIGERU, "NIGERU") \ - X(SE_JIDO_DOA, "JIDO-DOA") \ - X(SE_NAMINORI, "NAMINORI") \ - X(SE_BAN, "BAN") \ + X(SE_EXIT, "KAIDAN") \ + X(SE_LEDGE, "DANSA") \ + X(SE_BIKE_BELL, "JITENSYA") \ + X(SE_NOT_EFFECTIVE, "KOUKA-L") \ + X(SE_EFFECTIVE, "KOUKA-M") \ + X(SE_SUPER_EFFECTIVE, "KOUKA-H") \ + X(SE_BALL_OPEN, "BOWA2") \ + X(SE_FAINT, "POKE-DEAD") \ + X(SE_FLEE, "NIGERU") \ + X(SE_SLIDING_DOOR, "JIDO-DOA") \ + X(SE_SHIP, "NAMINORI") \ + X(SE_BANG, "BAN") \ X(SE_PIN, "PIN") \ X(SE_BOO, "BOO") \ - X(SE_BOWA, "BOWA") \ - X(SE_JYUNI, "JYUNI") \ + X(SE_BALL, "BOWA") \ + X(SE_CONTEST_PLACE, "JYUNI") \ X(SE_A, "A") \ X(SE_I, "I") \ X(SE_U, "U") \ X(SE_E, "E") \ X(SE_O, "O") \ X(SE_N, "N") \ - X(SE_SEIKAI, "SEIKAI") \ - X(SE_HAZURE, "HAZURE") \ + X(SE_SUCCESS, "SEIKAI") \ + X(SE_FAILURE, "HAZURE") \ X(SE_EXP, "EXP") \ - X(SE_JITE_PYOKO, "JITE-PYOKO") \ - X(SE_MU_PACHI, "MU-PACHI") \ - X(SE_TK_KASYA, "TK-KASYA") \ + X(SE_BIKE_HOP, "JITE-PYOKO") \ + X(SE_SWITCH, "MU-PACHI") \ + X(SE_CLICK, "TK-KASYA") \ X(SE_FU_ZAKU, "FU-ZAKU") \ - X(SE_FU_ZAKU2, "FU-ZAKU2") \ - X(SE_FU_ZUZUZU, "FU-ZUZUZU") \ - X(SE_RU_GASHIN, "RU-GASHIN") \ - X(SE_RU_GASYAN, "RU-GASYAN") \ - X(SE_RU_BARI, "RU-BARI") \ - X(SE_RU_HYUU, "RU-HYUU") \ - X(SE_KI_GASYAN, "KI-GASYAN") \ - X(SE_TK_WARPIN, "TK-WARPIN") \ - X(SE_TK_WARPOUT, "TK-WARPOUT") \ - X(SE_TU_SAA, "TU-SAA") \ - X(SE_HI_TURUN, "HI-TURUN") \ - X(SE_TRACK_MOVE, "TRACK-MOVE") \ - X(SE_TRACK_STOP, "TRACK-STOP") \ - X(SE_TRACK_HAIK, "TRACK-HAIK") \ - X(SE_TRACK_DOOR, "TRACK-DOOR") \ - X(SE_MOTER, "MOTER") \ + X(SE_CONTEST_CONDITION_LOSE, "FU-ZAKU2") \ + X(SE_LAVARIDGE_FALL_WARP, "FU-ZUZUZU") \ + X(SE_ICE_STAIRS, "RU-GASHIN") \ + X(SE_ICE_BREAK, "RU-GASYAN") \ + X(SE_ICE_CRACK, "RU-BARI") \ + X(SE_FALL, "RU-HYUU") \ + X(SE_UNLOCK, "KI-GASYAN") \ + X(SE_WARP_IN, "TK-WARPIN") \ + X(SE_WARP_OUT, "TK-WARPOUT") \ + X(SE_REPEL, "TU-SAA") \ + X(SE_ROTATING_GATE, "HI-TURUN") \ + X(SE_TRUCK_MOVE, "TRACK-MOVE") \ + X(SE_TRUCK_STOP, "TRACK-STOP") \ + X(SE_TRUCK_UNLOAD, "TRACK-HAIK") \ + X(SE_TRUCK_DOOR, "TRACK-DOOR") \ + X(SE_BERRY_BLENDER, "MOTER") \ X(SE_CARD, "CARD") \ X(SE_SAVE, "SAVE") \ - X(SE_KON, "KON") \ - X(SE_KON2, "KON2") \ - X(SE_KON3, "KON3") \ - X(SE_KON4, "KON4") \ - X(SE_SUIKOMU, "SUIKOMU") \ - X(SE_NAGERU, "NAGERU") \ - X(SE_TOY_C, "TOY-C") \ - X(SE_TOY_D, "TOY-D") \ - X(SE_TOY_E, "TOY-E") \ - X(SE_TOY_F, "TOY-F") \ - X(SE_TOY_G, "TOY-G") \ - X(SE_TOY_A, "TOY-A") \ - X(SE_TOY_B, "TOY-B") \ - X(SE_TOY_C1, "TOY-C1") \ - X(SE_MIZU, "MIZU") \ - X(SE_HASHI, "HASHI") \ - X(SE_DAUGI, "DAUGI") \ - X(SE_PINPON, "PINPON") \ - X(SE_FUUSEN1, "FUUSEN1") \ - X(SE_FUUSEN2, "FUUSEN2") \ - X(SE_FUUSEN3, "FUUSEN3") \ - X(SE_TOY_KABE, "TOY-KABE") \ - X(SE_TOY_DANGO, "TOY-DANGO") \ - X(SE_DOKU, "DOKU") \ - X(SE_ESUKA, "ESUKA") \ - X(SE_T_AME, "T-AME") \ - X(SE_T_AME_E, "T-AME-E") \ - X(SE_T_OOAME, "T-OOAME") \ - X(SE_T_OOAME_E, "T-OOAME-E") \ - X(SE_T_KOAME, "T-KOAME") \ - X(SE_T_KOAME_E, "T-KOAME-E") \ - X(SE_T_KAMI, "T-KAMI") \ - X(SE_T_KAMI2, "T-KAMI2") \ - X(SE_ELEBETA, "ELEBETA") \ - X(SE_HINSI, "HINSI") \ - X(SE_EXPMAX, "EXPMAX") \ - X(SE_TAMAKORO, "TAMAKORO") \ - X(SE_TAMAKORO_E, "TAMAKORO-E") \ - X(SE_BASABASA, "BASABASA") \ - X(SE_REGI, "REGI") \ - X(SE_C_GAJI, "C-GAJI") \ - X(SE_C_MAKU_U, "C-MAKU-U") \ - X(SE_C_MAKU_D, "C-MAKU-D") \ - X(SE_C_PASI, "C-PASI") \ - X(SE_C_SYU, "C-SYU") \ - X(SE_C_PIKON, "C-PIKON") \ - X(SE_REAPOKE, "REAPOKE") \ - X(SE_OP_BASYU, "OP-BASYU") \ - X(SE_BT_START, "BT-START") \ - X(SE_DENDOU, "DENDOU") \ - X(SE_JIHANKI, "JIHANKI") \ - X(SE_TAMA, "TAMA") \ - X(SE_Z_SCROLL, "Z-SCROLL") \ - X(SE_Z_PAGE, "Z-PAGE") \ - X(SE_PN_ON, "PN-ON") \ - X(SE_PN_OFF, "PN-OFF") \ - X(SE_Z_SEARCH, "Z-SEARCH") \ - X(SE_TAMAGO, "TAMAGO") \ - X(SE_TB_START, "TB-START") \ - X(SE_TB_KON, "TB-KON") \ - X(SE_TB_KARA, "TB-KARA") \ - X(SE_BIDORO, "BIDORO") \ - X(SE_W085, "W085") \ - X(SE_W085B, "W085B") \ - X(SE_W231, "W231") \ - X(SE_W171, "W171") \ - X(SE_W233, "W233") \ - X(SE_W233B, "W233B") \ - X(SE_W145, "W145") \ - X(SE_W145B, "W145B") \ - X(SE_W145C, "W145C") \ - X(SE_W240, "W240") \ - X(SE_W015, "W015") \ - X(SE_W081, "W081") \ - X(SE_W081B, "W081B") \ - X(SE_W088, "W088") \ - X(SE_W016, "W016") \ - X(SE_W016B, "W016B") \ - X(SE_W003, "W003") \ - X(SE_W104, "W104") \ - X(SE_W013, "W013") \ - X(SE_W196, "W196") \ - X(SE_W086, "W086") \ - X(SE_W004, "W004") \ - X(SE_W025, "W025") \ - X(SE_W025B, "W025B") \ - X(SE_W152, "W152") \ - X(SE_W026, "W026") \ - X(SE_W172, "W172") \ - X(SE_W172B, "W172B") \ - X(SE_W053, "W053") \ - X(SE_W007, "W007") \ - X(SE_W092, "W092") \ - X(SE_W221, "W221") \ - X(SE_W221B, "W221B") \ - X(SE_W052, "W052") \ - X(SE_W036, "W036") \ - X(SE_W059, "W059") \ - X(SE_W059B, "W059B") \ - X(SE_W010, "W010") \ - X(SE_W011, "W011") \ - X(SE_W017, "W017") \ - X(SE_W019, "W019") \ - X(SE_W028, "W028") \ - X(SE_W013B, "W013B") \ - X(SE_W044, "W044") \ - X(SE_W029, "W029") \ - X(SE_W057, "W057") \ - X(SE_W056, "W056") \ - X(SE_W250, "W250") \ - X(SE_W030, "W030") \ - X(SE_W039, "W039") \ - X(SE_W054, "W054") \ - X(SE_W077, "W077") \ - X(SE_W020, "W020") \ - X(SE_W082, "W082") \ - X(SE_W047, "W047") \ - X(SE_W195, "W195") \ - X(SE_W006, "W006") \ - X(SE_W091, "W091") \ - X(SE_W146, "W146") \ - X(SE_W120, "W120") \ - X(SE_W153, "W153") \ - X(SE_W071B, "W071B") \ - X(SE_W071, "W071") \ - X(SE_W103, "W103") \ - X(SE_W062, "W062") \ - X(SE_W062B, "W062B") \ - X(SE_W048, "W048") \ - X(SE_W187, "W187") \ - X(SE_W118, "W118") \ - X(SE_W155, "W155") \ - X(SE_W122, "W122") \ - X(SE_W060, "W060") \ - X(SE_W185, "W185") \ - X(SE_W014, "W014") \ - X(SE_W043, "W043") \ - X(SE_W207, "W207") \ - X(SE_W207B, "W207B") \ - X(SE_W215, "W215") \ - X(SE_W109, "W109") \ - X(SE_W173, "W173") \ - X(SE_W280, "W280") \ - X(SE_W202, "W202") \ - X(SE_W060B, "W060B") \ - X(SE_W076, "W076") \ - X(SE_W080, "W080") \ - X(SE_W100, "W100") \ - X(SE_W107, "W107") \ - X(SE_W166, "W166") \ - X(SE_W129, "W129") \ - X(SE_W115, "W115") \ - X(SE_W112, "W112") \ - X(SE_W197, "W197") \ - X(SE_W199, "W199") \ - X(SE_W236, "W236") \ - X(SE_W204, "W204") \ - X(SE_W268, "W268") \ - X(SE_W070, "W070") \ - X(SE_W063, "W063") \ - X(SE_W127, "W127") \ - X(SE_W179, "W179") \ - X(SE_W151, "W151") \ - X(SE_W201, "W201") \ - X(SE_W161, "W161") \ - X(SE_W161B, "W161B") \ - X(SE_W227, "W227") \ - X(SE_W227B, "W227B") \ - X(SE_W226, "W226") \ - X(SE_W208, "W208") \ - X(SE_W213, "W213") \ - X(SE_W213B, "W213B") \ - X(SE_W234, "W234") \ - X(SE_W260, "W260") \ - X(SE_W328, "W328") \ - X(SE_W320, "W320") \ - X(SE_W255, "W255") \ - X(SE_W291, "W291") \ - X(SE_W089, "W089") \ - X(SE_W239, "W239") \ - X(SE_W230, "W230") \ - X(SE_W281, "W281") \ - X(SE_W327, "W327") \ - X(SE_W287, "W287") \ - X(SE_W257, "W257") \ - X(SE_W253, "W253") \ - X(SE_W258, "W258") \ - X(SE_W322, "W322") \ - X(SE_W298, "W298") \ - X(SE_W287B, "W287B") \ - X(SE_W114, "W114") \ - X(SE_W063B, "W063B") + X(SE_BALL_BOUNCE_1, "KON") \ + X(SE_BALL_BOUNCE_2, "KON2") \ + X(SE_BALL_BOUNCE_3, "KON3") \ + X(SE_BALL_BOUNCE_4, "KON4") \ + X(SE_BALL_TRADE, "SUIKOMU") \ + X(SE_BALL_THROW, "NAGERU") \ + X(SE_NOTE_C, "TOY-C") \ + X(SE_NOTE_D, "TOY-D") \ + X(SE_NOTE_E, "TOY-E") \ + X(SE_NOTE_F, "TOY-F") \ + X(SE_NOTE_G, "TOY-G") \ + X(SE_NOTE_A, "TOY-A") \ + X(SE_NOTE_B, "TOY-B") \ + X(SE_NOTE_C_HIGH, "TOY-C1") \ + X(SE_PUDDLE, "MIZU") \ + X(SE_BRIDGE_WALK, "HASHI") \ + X(SE_ITEMFINDER, "DAUGI") \ + X(SE_DING_DONG, "PINPON") \ + X(SE_BALLOON_RED, "FUUSEN1") \ + X(SE_BALLOON_BLUE, "FUUSEN2") \ + X(SE_BALLOON_YELLOW, "FUUSEN3") \ + X(SE_BREAKABLE_DOOR, "TOY-KABE") \ + X(SE_MUD_BALL, "TOY-DANGO") \ + X(SE_FIELD_POISON, "DOKU") \ + X(SE_ESCALATOR, "ESUKA") \ + X(SE_THUNDERSTORM, "T-AME") \ + X(SE_THUNDERSTORM_STOP, "T-AME-E") \ + X(SE_DOWNPOUR, "T-OOAME") \ + X(SE_DOWNPOUR_STOP, "T-OOAME-E") \ + X(SE_RAIN, "T-KOAME") \ + X(SE_RAIN_STOP, "T-KOAME-E") \ + X(SE_THUNDER, "T-KAMI") \ + X(SE_THUNDER2, "T-KAMI2") \ + X(SE_ELEVATOR, "ELEBETA") \ + X(SE_LOW_HEALTH, "HINSI") \ + X(SE_EXP_MAX, "EXPMAX") \ + X(SE_ROULETTE_BALL, "TAMAKORO") \ + X(SE_ROULETTE_BALL2, "TAMAKORO-E") \ + X(SE_TAILLOW_WING_FLAP, "BASABASA") \ + X(SE_SHOP, "REGI") \ + X(SE_CONTEST_HEART, "C-GAJI") \ + X(SE_CONTEST_CURTAIN_RISE, "C-MAKU-U") \ + X(SE_CONTEST_CURTAIN_FALL, "C-MAKU-D") \ + X(SE_CONTEST_ICON_CHANGE, "C-PASI") \ + X(SE_CONTEST_ICON_CLEAR, "C-SYU") \ + X(SE_CONTEST_MONS_TURN, "C-PIKON") \ + X(SE_SHINY, "REAPOKE") \ + X(SE_INTRO_BLAST, "OP-BASYU") \ + X(SE_MUGSHOT, "BT-START") \ + X(SE_APPLAUSE, "DENDOU") \ + X(SE_VEND, "JIHANKI") \ + X(SE_ORB, "TAMA") \ + X(SE_DEX_SCROLL, "Z-SCROLL") \ + X(SE_DEX_PAGE, "Z-PAGE") \ + X(SE_POKENAV_ON, "PN-ON") \ + X(SE_POKENAV_OFF, "PN-OFF") \ + X(SE_DEX_SEARCH, "Z-SEARCH") \ + X(SE_EGG_HATCH, "TAMAGO") \ + X(SE_BALL_TRAY_ENTER, "TB-START") \ + X(SE_BALL_TRAY_BALL, "TB-KON") \ + X(SE_BALL_TRAY_EXIT, "TB-KARA") \ + X(SE_GLASS_FLUTE, "BIDORO") \ + X(SE_M_THUNDERBOLT, "W085") \ + X(SE_M_THUNDERBOLT2, "W085B") \ + X(SE_M_HARDEN, "W231") \ + X(SE_M_NIGHTMARE, "W171") \ + X(SE_M_VITAL_THROW, "W233") \ + X(SE_M_VITAL_THROW2, "W233B") \ + X(SE_M_BUBBLE, "W145") \ + X(SE_M_BUBBLE2, "W145B") \ + X(SE_M_BUBBLE3, "W145C") \ + X(SE_M_RAIN_DANCE, "W240") \ + X(SE_M_CUT, "W015") \ + X(SE_M_STRING_SHOT, "W081") \ + X(SE_M_STRING_SHOT2, "W081B") \ + X(SE_M_ROCK_THROW, "W088") \ + X(SE_M_GUST, "W016") \ + X(SE_M_GUST2, "W016B") \ + X(SE_M_DOUBLE_SLAP, "W003") \ + X(SE_M_DOUBLE_TEAM, "W104") \ + X(SE_M_RAZOR_WIND, "W013") \ + X(SE_M_ICY_WIND, "W196") \ + X(SE_M_THUNDER_WAVE, "W086") \ + X(SE_M_COMET_PUNCH, "W004") \ + X(SE_M_MEGA_KICK, "W025") \ + X(SE_M_MEGA_KICK2, "W025B") \ + X(SE_M_CRABHAMMER, "W152") \ + X(SE_M_JUMP_KICK, "W026") \ + X(SE_M_FLAME_WHEEL, "W172") \ + X(SE_M_FLAME_WHEEL2, "W172B") \ + X(SE_M_FLAMETHROWER, "W053") \ + X(SE_M_FIRE_PUNCH, "W007") \ + X(SE_M_TOXIC, "W092") \ + X(SE_M_SACRED_FIRE, "W221") \ + X(SE_M_SACRED_FIRE2, "W221B") \ + X(SE_M_EMBER, "W052") \ + X(SE_M_TAKE_DOWN, "W036") \ + X(SE_M_BLIZZARD, "W059") \ + X(SE_M_BLIZZARD2, "W059B") \ + X(SE_M_SCRATCH, "W010") \ + X(SE_M_VICEGRIP, "W011") \ + X(SE_M_WING_ATTACK, "W017") \ + X(SE_M_FLY, "W019") \ + X(SE_M_SAND_ATTACK, "W028") \ + X(SE_M_RAZOR_WIND2, "W013B") \ + X(SE_M_BITE, "W044") \ + X(SE_M_HEADBUTT, "W029") \ + X(SE_M_SURF, "W057") \ + X(SE_M_HYDRO_PUMP, "W056") \ + X(SE_M_WHIRLPOOL, "W250") \ + X(SE_M_HORN_ATTACK, "W030") \ + X(SE_M_TAIL_WHIP, "W039") \ + X(SE_M_MIST, "W054") \ + X(SE_M_POISON_POWDER, "W077") \ + X(SE_M_BIND, "W020") \ + X(SE_M_DRAGON_RAGE, "W082") \ + X(SE_M_SING, "W047") \ + X(SE_M_PERISH_SONG, "W195") \ + X(SE_M_PAY_DAY, "W006") \ + X(SE_M_DIG, "W091") \ + X(SE_M_DIZZY_PUNCH, "W146") \ + X(SE_M_SELF_DESTRUCT, "W120") \ + X(SE_M_EXPLOSION, "W153") \ + X(SE_M_ABSORB_2, "W071B") \ + X(SE_M_ABSORB, "W071") \ + X(SE_M_SCREECH, "W103") \ + X(SE_M_BUBBLE_BEAM, "W062") \ + X(SE_M_BUBBLE_BEAM2, "W062B") \ + X(SE_M_SUPERSONIC, "W048") \ + X(SE_M_BELLY_DRUM, "W187") \ + X(SE_M_METRONOME, "W118") \ + X(SE_M_BONEMERANG, "W155") \ + X(SE_M_LICK, "W122") \ + X(SE_M_PSYBEAM, "W060") \ + X(SE_M_FAINT_ATTACK, "W185") \ + X(SE_M_SWORDS_DANCE, "W014") \ + X(SE_M_LEER, "W043") \ + X(SE_M_SWAGGER, "W207") \ + X(SE_M_SWAGGER2, "W207B") \ + X(SE_M_HEAL_BELL, "W215") \ + X(SE_M_CONFUSE_RAY, "W109") \ + X(SE_M_SNORE, "W173") \ + X(SE_M_BRICK_BREAK, "W280") \ + X(SE_M_GIGA_DRAIN, "W202") \ + X(SE_M_PSYBEAM2, "W060B") \ + X(SE_M_SOLAR_BEAM, "W076") \ + X(SE_M_PETAL_DANCE, "W080") \ + X(SE_M_TELEPORT, "W100") \ + X(SE_M_MINIMIZE, "W107") \ + X(SE_M_SKETCH, "W166") \ + X(SE_M_SWIFT, "W129") \ + X(SE_M_REFLECT, "W115") \ + X(SE_M_BARRIER, "W112") \ + X(SE_M_DETECT, "W197") \ + X(SE_M_LOCK_ON, "W199") \ + X(SE_M_MOONLIGHT, "W236") \ + X(SE_M_CHARM, "W204") \ + X(SE_M_CHARGE, "W268") \ + X(SE_M_STRENGTH, "W070") \ + X(SE_M_HYPER_BEAM, "W063") \ + X(SE_M_WATERFALL, "W127") \ + X(SE_M_REVERSAL, "W179") \ + X(SE_M_ACID_ARMOR, "W151") \ + X(SE_M_SANDSTORM, "W201") \ + X(SE_M_TRI_ATTACK, "W161") \ + X(SE_M_TRI_ATTACK2, "W161B") \ + X(SE_M_ENCORE, "W227") \ + X(SE_M_ENCORE2, "W227B") \ + X(SE_M_BATON_PASS, "W226") \ + X(SE_M_MILK_DRINK, "W208") \ + X(SE_M_ATTRACT, "W213") \ + X(SE_M_ATTRACT2, "W213B") \ + X(SE_M_MORNING_SUN, "W234") \ + X(SE_M_FLATTER, "W260") \ + X(SE_M_SAND_TOMB, "W328") \ + X(SE_M_GRASSWHISTLE, "W320") \ + X(SE_M_SPIT_UP, "W255") \ + X(SE_M_DIVE, "W291") \ + X(SE_M_EARTHQUAKE, "W089") \ + X(SE_M_TWISTER, "W239") \ + X(SE_M_SWEET_SCENT, "W230") \ + X(SE_M_YAWN, "W281") \ + X(SE_M_SKY_UPPERCUT, "W327") \ + X(SE_M_STAT_INCREASE, "W287") \ + X(SE_M_HEAT_WAVE, "W257") \ + X(SE_M_UPROAR, "W253") \ + X(SE_M_HAIL, "W258") \ + X(SE_M_COSMIC_POWER, "W322") \ + X(SE_M_TEETER_DANCE, "W298") \ + X(SE_M_STAT_DECREASE, "W287B") \ + X(SE_M_HAZE, "W114") \ + X(SE_M_HYPER_BEAM2, "W063B") // Create BGM list #define X(songId, name) static const u8 sBGMName_##songId[] = _(name); diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index ef83fc3f0..2f100069d 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -610,7 +610,7 @@ void DebugMenu_8076E30(u8 taskId) Menu_DisplayDialogueFrame(); sub_813B79C(); Menu_PrintText(Str_839BD7D, 2, 15); - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); data[0]++; } else if (gMain.newKeys & B_BUTTON) @@ -1836,7 +1836,7 @@ void DebugMenu_8078310(u8 taskId) case 1: if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); *GetVarPointer(VAR_MIRAGE_RND_H) = data[1]; Menu_EraseScreen(); DestroyTask(taskId); @@ -2324,7 +2324,7 @@ void DebugMenu_8078AA4(u8 taskId) else if (gMain.newKeys & A_BUTTON) { gSaveBlock2.battleTower.curStreakChallengesNum[data[0]] = data[1]; - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); gTasks[taskId].func = DebugMenu_8078B38; } else if (gMain.newKeys & B_BUTTON) @@ -2424,7 +2424,7 @@ void DebugMenu_8078BD4(u8 taskId) case 1: if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); Menu_EraseScreen(); DestroyTask(taskId); ScriptContext2_Disable(); @@ -2631,7 +2631,7 @@ void DebugMenu_8078F68(u8 taskId) gSaveBlock2.playTimeHours = data[1]; gSaveBlock2.playTimeMinutes = data[2]; gSaveBlock2.playTimeSeconds = data[3]; - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); gTasks[taskId].func = DebugMenu_8079020; } else if (gMain.newKeys & B_BUTTON) diff --git a/src/decoration.c b/src/decoration.c index 1c6c4e18d..f999f4edd 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -2542,7 +2542,7 @@ void sub_8100038(u8 taskId) DisplayItemMessageOnField(taskId, gSecretBaseText_PlaceItHere, sub_81000A0, 0); } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayItemMessageOnField(taskId, gSecretBaseText_CantBePlacedHere, sub_81006A8, 0); } } diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 0c115ddfe..5071d1a75 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -595,7 +595,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(); } @@ -618,7 +618,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); } } @@ -645,13 +645,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); } } } @@ -678,7 +678,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) sprite->data[0]++; if (!gPaletteFade.active) { - PlaySE(SE_TAMAGO); + PlaySE(SE_EGG_HATCH); sprite->invisible = 1; sprite->callback = SpriteCB_Egg_5; sprite->data[0] = 0; diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index f585b2bee..3f197f74c 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -273,7 +273,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID) gTasks[taskID].tFrameCounter = 0; BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 10, 0, 16, RGB(31, 31, 31)); 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_BeginPreSparklesSet2(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; gTasks[taskID].func = EvoTask_CreatePreEvoSparklesSet2; - PlaySE(SE_W062B); + PlaySE(SE_M_BUBBLE_BEAM2); } static void EvoTask_CreatePreEvoSparklesSet2(u8 taskID) @@ -347,7 +347,7 @@ static void EvoTask_BeginPostSparklesSet1(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet1; - PlaySE(SE_REAPOKE); + PlaySE(SE_SHINY); } static void EvoTask_CreatePostEvoSparklesSet1(u8 taskID) @@ -391,7 +391,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID) CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); BeginNormalPaletteFade(0xFFF9001C, 0, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash; - PlaySE(SE_W080); + PlaySE(SE_M_PETAL_DANCE); } static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID) @@ -439,7 +439,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID) CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); BeginNormalPaletteFade(0xFFF90001, 0, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade; - PlaySE(SE_W080); + PlaySE(SE_M_PETAL_DANCE); } static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index ba136d1cc..60568ee87 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -563,14 +563,14 @@ static void Task_EvolutionScene(u8 taskID) case 3: // wait for cry, play tu du SE if (IsCryFinished()) { - 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, 16, RGB(0, 0, 0)); } @@ -638,7 +638,7 @@ static void Task_EvolutionScene(u8 taskID) { StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo); Text_InitWindow8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15); - PlayBGM(MUS_FANFA5); + PlayBGM(MUS_EVOLVED); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); CalculateMonStats(mon); @@ -715,7 +715,7 @@ static void Task_EvolutionScene(u8 taskID) if (gUnknown_03004210.state == 0 && !IsSEPlaying()) { sub_8024CEC(); - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]); Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter @@ -904,15 +904,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, 16, RGB(0, 0, 0)); } @@ -980,7 +980,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo); Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); CalculateMonStats(mon); @@ -1012,7 +1012,7 @@ static void Task_TradeEvolutionScene(u8 taskID) } else { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); Text_InitWindow8002EB0(&gUnknown_03004828->window, gOtherText_LinkStandby2, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tState++; } @@ -1029,7 +1029,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { sub_8024CEC(); - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]); Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 619c5ce9f..d33292e87 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -895,7 +895,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior) { StoreInitialPlayerAvatarState(); sp13E_warp_to_last_warp(); - PlaySE(SE_W291); + PlaySE(SE_M_DIVE); return TRUE; } } @@ -905,7 +905,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior) { StoreInitialPlayerAvatarState(); sp13E_warp_to_last_warp(); - PlaySE(SE_W291); + PlaySE(SE_M_DIVE); return TRUE; } } diff --git a/src/field_door.c b/src/field_door.c index db840e663..e7d68f546 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -599,5 +599,5 @@ u32 GetDoorSoundEffect(u32 x, u32 y) if (cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y) == 0) return SE_DOOR; else - return SE_JIDO_DOA; + return SE_SLIDING_DOOR; } diff --git a/src/field_effect.c b/src/field_effect.c index 7daa00bf1..9f53606c4 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -772,7 +772,7 @@ 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) { @@ -791,7 +791,7 @@ void PokeballGlowEffect_1(struct Sprite *sprite) sprite->data[3] = 0; if (sprite->data[5]) { - PlayFanfare(MUS_ME_ASA); + PlayFanfare(MUS_HEAL); } } } @@ -1081,7 +1081,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] task->data[1] = 1; task->data[2] = 0; gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; - PlaySE(SE_RU_HYUU); + PlaySE(SE_FALL); task->data[0]++; return FALSE; } @@ -1111,7 +1111,7 @@ bool8 sub_80868E4(struct Task *task) } if (sprite->pos2.y >= 0) { - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); objectEvent->triggerGroundEffectsOnStop = 1; objectEvent->landingJump = 1; sprite->pos2.y = 0; @@ -1210,7 +1210,7 @@ bool8 sub_8086AC0(struct Task *task) { task->data[0] = 4; } - PlaySE(SE_ESUKA); + PlaySE(SE_ESCALATOR); } return FALSE; } @@ -1588,7 +1588,7 @@ bool8 sub_8087298(struct Task *task, struct ObjectEvent *objectEvent, struct Spr 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; } @@ -1704,7 +1704,7 @@ bool8 sub_8087548(struct Task *task, struct ObjectEvent *objectEvent, struct Spr task->data[0]++; objectEvent->invisible = 0; CameraObjectReset1(); - PlaySE(SE_W091); + PlaySE(SE_M_DIG); ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; @@ -1781,7 +1781,7 @@ bool8 sub_80876F8(struct Task *task, struct ObjectEvent *objectEvent, struct Spr { task->data[1]++; ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); - PlaySE(SE_FU_ZUZUZU); + PlaySE(SE_LAVARIDGE_FALL_WARP); } } return FALSE; @@ -2009,7 +2009,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); } } @@ -2093,7 +2093,7 @@ void sub_8087E4C(struct Task *task) task->data[2] = 1; task->data[14] = sprite->subspriteMode; task->data[15] = GetPlayerFacingDirection(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } } @@ -2581,7 +2581,7 @@ u8 FldEff_UseSurf(void) taskId = CreateTask(sub_8088954, 0xff); gTasks[taskId].data[15] = gFieldEffectArguments[0]; Overworld_ClearSavedMusic(); - Overworld_ChangeMusicTo(MUS_NAMINORI); + Overworld_ChangeMusicTo(MUS_SURF); return FALSE; } @@ -2679,7 +2679,7 @@ u8 FldEff_NPCFlyOut(void) sprite->oam.priority = 1; sprite->callback = sub_8088BC4; sprite->data[1] = gFieldEffectArguments[0]; - PlaySE(SE_W019); + PlaySE(SE_M_FLY); return spriteId; } @@ -2799,7 +2799,7 @@ void sub_8088DD8(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_8088FC0(task->data[1]); } } diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index c757a4798..9ba7787e0 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -614,7 +614,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; } @@ -724,7 +724,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) sprite->data[4] = objectEvent->currentCoords.y; if (!sprite->invisible) { - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } } } @@ -1403,4 +1403,4 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) } } } -}
\ No newline at end of file +} diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index a4959703e..fea93f215 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -207,7 +207,7 @@ void sub_8080B78(void) { Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); CreateTask(task_map_chg_seq_0807E2CC, 10); ScriptContext2_Enable(); } @@ -379,7 +379,7 @@ void sub_8080E88(void) TryFadeOutOldMapMusic(); WarpFadeScreen(); PlayRainSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = mapldr_default; CreateTask(task0A_fade_n_map_maybe, 10); } @@ -430,7 +430,7 @@ void sub_8080F68(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); CreateTask(task0A_fade_n_map_maybe, 10); gFieldCallback = sub_8080B78; } @@ -470,7 +470,7 @@ void DoCableClubWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); CreateTask(WaitCableClubWarp, 10); } @@ -484,7 +484,7 @@ void sub_8081050(u8 taskId) ClearLinkCallback_2(); FadeScreen(FADE_TO_BLACK, 0); TryFadeOutOldMapMusic(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); data[0]++; break; case 1: @@ -637,7 +637,7 @@ void sub_8081334(void) TryFadeOutOldMapMusic(); WarpFadeScreen(); PlayRainSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = sub_8080B60; CreateTask(sub_80812C8, 10); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index cb0bf760f..c0c4aad5d 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -878,7 +878,7 @@ void PlayerTurnInPlace(u8 direction) void PlayerJumpLedge(u8 direction) { - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); PlayerSetAnimId(GetJump2MovementAction(direction), 8); } @@ -912,28 +912,28 @@ void PlayerEndWheelie(u8 direction) // wheelie hopping standing void PlayerStandingHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(a), 1); } // wheelie hopping moving void PlayerMovingHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(a), 2); } // wheelie hopping ledge void PlayerLedgeHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(a), 8); } // acro turn jump void PlayerAcroTurnJump(u8 direction) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1); } @@ -1302,7 +1302,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; @@ -1341,7 +1341,7 @@ static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent gPlayerAvatar.preventStep = TRUE; if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection)); task->data[1]++; if (task->data[1] > 1) @@ -1375,7 +1375,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_special_scene.c b/src/field_special_scene.c index 343830f25..0fb0ca097 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -196,7 +196,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1] = 0; // reset the timer. data[2] = CreateTask(Task_Truck1, 0xA); data[0] = 1; // run the next case. - PlaySE(SE_TRACK_MOVE); + PlaySE(SE_TRUCK_MOVE); } break; case 1: @@ -216,7 +216,7 @@ void Task_HandleTruckSequence(u8 taskId) DestroyTask(data[2]); data[3] = CreateTask(Task_Truck2, 0xA); data[0] = 3; - PlaySE(SE_TRACK_STOP); + PlaySE(SE_TRUCK_STOP); } break; case 3: @@ -231,7 +231,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1]++; if (data[1] == 90) { - PlaySE(SE_TRACK_HAIK); + PlaySE(SE_TRUCK_UNLOAD); data[1] = 0; data[0] = 5; } @@ -244,7 +244,7 @@ void Task_HandleTruckSequence(u8 taskId) MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, ExitLight_Mid)); MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, ExitLight_Bottom)); DrawWholeMapView(); - PlaySE(SE_TRACK_DOOR); + PlaySE(SE_TRUCK_DOOR); DestroyTask(taskId); ScriptContext2_Disable(); } diff --git a/src/field_specials.c b/src/field_specials.c index 38a0bd50b..4a2ddb180 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -218,7 +218,7 @@ void UpdateCyclingRoadState(void) { if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3) { VarSet(VAR_CYCLING_CHALLENGE_STATE, 0); - Overworld_SetSavedMusic(SE_STOP); + Overworld_SetSavedMusic(MUS_DUMMY); } } @@ -571,7 +571,7 @@ void PetalburgGymSlideOpenDoors(void) { gUnknown_02039258 = 0; gPetalburgGymSlidingDoorIndex = 0; - PlaySE(SE_KI_GASYAN); + PlaySE(SE_UNLOCK); CreateTask(Task_SlideOpenPetalburgGymDoors, 8); } @@ -1228,7 +1228,7 @@ void ShakeScreenInElevator(void) gTasks[taskId].data[5] = 3; SetCameraPanningCallback(NULL); sub_810ECFC(); - PlaySE(SE_ELEBETA); + PlaySE(SE_ELEVATOR); } void sub_810EC34(u8 taskId) @@ -1245,7 +1245,7 @@ void sub_810EC34(u8 taskId) SetCameraPanning(0, task->data[4]); if (task->data[2] == 23) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); sub_810EC9C(taskId); InstallCameraPanAheadCallback(); } @@ -1801,7 +1801,7 @@ void ShakeCamera(void) gTasks[taskId].data[4] = gSpecialVar_0x8004; gTasks[taskId].data[5] = 5; SetCameraPanningCallback(NULL); - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); } static void sub_810F7A8(u8 taskId) diff --git a/src/field_tasks.c b/src/field_tasks.c index abc4e1505..5709cb998 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -336,7 +336,7 @@ void PerStepCallback_8069864(u8 taskId) data[3] = y; if (MetatileBehavior_IsPacifidlogLog(MapGridGetMetatileBehaviorAt(x, y))) { - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } } break; @@ -427,7 +427,7 @@ void PerStepCallback_8069AA0(u8 taskId) } if (flag && (isFortreeBridgeCur == 1 || isFortreeBridgePrev == 1)) { - PlaySE(SE_HASHI); + PlaySE(SE_BRIDGE_WALK); } if (isFortreeBridgePrev) { @@ -603,7 +603,7 @@ void PerStepCallback_8069DD4(u8 taskId) { x = data[4]; y = data[5]; - PlaySE(SE_RU_BARI); + PlaySE(SE_ICE_CRACK); MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Cracked)); CurrentMapDrawMetatileAt(x, y); sub_8069CFC(x - 7, y - 7); @@ -619,7 +619,7 @@ void PerStepCallback_8069DD4(u8 taskId) { x = data[4]; y = data[5]; - PlaySE(SE_RU_GASYAN); + PlaySE(SE_ICE_BREAK); MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Broken)); CurrentMapDrawMetatileAt(x, y); data[1] = 1; diff --git a/src/field_weather.c b/src/field_weather.c index eb802ae84..c05fa3d3b 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -1194,13 +1194,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: @@ -1218,14 +1218,14 @@ void PlayRainSoundEffect(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 db67be4de..56b802b83 100644 --- a/src/field_weather_effects.c +++ b/src/field_weather_effects.c @@ -367,7 +367,7 @@ void LightRain_InitVars(void) gWeatherPtr->unknown_6D9 = 10; gWeatherPtr->gammaTargetIndex = 3; gWeatherPtr->gammaStepDelay = 20; - SetRainStrengthFromSoundEffect(SE_T_KOAME); + SetRainStrengthFromSoundEffect(SE_RAIN); } void LightRain_Main(void); @@ -1075,7 +1075,7 @@ void MedRain_InitVars(void) gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment gWeatherPtr->unknown_6ED = 0; - SetRainStrengthFromSoundEffect(SE_T_AME); + SetRainStrengthFromSoundEffect(SE_THUNDERSTORM); } void Rain_Main(void); @@ -1102,7 +1102,7 @@ void HeavyRain_InitVars(void) gWeatherPtr->gammaTargetIndex = 3; gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment - SetRainStrengthFromSoundEffect(SE_T_OOAME); + SetRainStrengthFromSoundEffect(SE_DOWNPOUR); } void HeavyRain_InitAll(void) @@ -1269,9 +1269,9 @@ void UpdateThunderSound(void) if (IsSEPlaying()) return; if (Random() & 1) - PlaySE(SE_T_KAMI); + PlaySE(SE_THUNDER); else - PlaySE(SE_T_KAMI2); + PlaySE(SE_THUNDER2); gWeatherPtr->unknown_6ED = 0; } else diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 567e75f2a..7b16a5a9c 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -211,7 +211,7 @@ bool8 FldEff_CutGrass(void) u8 tileBehavior; u8 i = 0, j; - PlaySE(SE_W015); + PlaySE(SE_M_CUT); PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); for (i = 0; i < 3; i++) { @@ -383,7 +383,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) static void StartCutTreeFieldEffect(void) { - PlaySE(SE_W015); + PlaySE(SE_M_CUT); FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE); EnableBothScriptContexts(); } diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c index 62e02df12..d9466dd7d 100644 --- a/src/fldeff_decoration.c +++ b/src/fldeff_decoration.c @@ -116,16 +116,16 @@ static void DoBalloonSoundEffect(s16 metatileId) switch (metatileId) { case 824: - PlaySE(SE_FUUSEN1); + PlaySE(SE_BALLOON_RED); break; case 828: - PlaySE(SE_FUUSEN2); + PlaySE(SE_BALLOON_BLUE); break; case 832: - PlaySE(SE_FUUSEN3); + PlaySE(SE_BALLOON_YELLOW); break; case 552: - PlaySE(SE_TOY_DANGO); + PlaySE(SE_MUD_BALL); break; } } @@ -142,7 +142,7 @@ bool8 FldEff_Nop48(void) static void sub_80C69C4(s16 x, s16 y) { - PlaySE(SE_TOY_KABE); + PlaySE(SE_BREAKABLE_DOOR); MapGridSetMetatileIdAt(x, y, 630); MapGridSetMetatileIdAt(x, y - 1, 622); CurrentMapDrawMetatileAt(x, y); @@ -185,28 +185,28 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId) switch (gTasks[taskId].data[0]) // metatileId { case 632: - PlaySE(SE_TOY_C); + PlaySE(SE_NOTE_C); break; case 633: - PlaySE(SE_TOY_D); + PlaySE(SE_NOTE_D); break; case 634: - PlaySE(SE_TOY_E); + PlaySE(SE_NOTE_E); break; case 635: - PlaySE(SE_TOY_F); + PlaySE(SE_NOTE_F); break; case 636: - PlaySE(SE_TOY_G); + PlaySE(SE_NOTE_G); break; case 637: - PlaySE(SE_TOY_A); + PlaySE(SE_NOTE_A); break; case 638: - PlaySE(SE_TOY_B); + PlaySE(SE_NOTE_B); break; case 691: - PlaySE(SE_TOY_C1); + PlaySE(SE_NOTE_C_HIGH); break; } @@ -229,7 +229,7 @@ void SpriteCB_GlitterMatSparkle(struct Sprite *sprite) { sprite->data[0]++; if (sprite->data[0] == 8) - PlaySE(SE_W215); + PlaySE(SE_M_HEAL_BELL); if (sprite->data[0] >= 32) DestroySprite(sprite); } @@ -298,7 +298,7 @@ bool8 FldEff_SandPillar(void) void SpriteCB_SandPillar_0(struct Sprite *sprite) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); if (MapGridGetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1) == 646) MapGridSetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1, 3586); else diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index a49802af1..cf739b395 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -106,7 +106,7 @@ static void sub_810CBFC(void) static void sub_810CC34(void) { - PlaySE(SE_W115); + PlaySE(SE_M_REFLECT); FlagSet(FLAG_SYS_USE_FLASH); ScriptContext1_SetupScript(gUnknown_081B694A); } diff --git a/src/fldeff_poison.c b/src/fldeff_poison.c index 52afc2516..62c182987 100644 --- a/src/fldeff_poison.c +++ b/src/fldeff_poison.c @@ -34,7 +34,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_secretpower.c b/src/fldeff_secretpower.c index 47a8bd608..bd16adbe8 100644 --- a/src/fldeff_secretpower.c +++ b/src/fldeff_secretpower.c @@ -360,7 +360,7 @@ bool8 FldEff_SecretPowerCave(void) static void CaveEntranceSpriteCallback1(struct Sprite *sprite) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); sprite->data[0] = 0; sprite->callback = CaveEntranceSpriteCallback2; } @@ -433,7 +433,7 @@ bool8 FldEff_SecretPowerTree(void) static void TreeEntranceSpriteCallback1(struct Sprite *sprite) { - PlaySE(SE_W010); + PlaySE(SE_M_SCRATCH); sprite->animNum = gFieldEffectArguments[7]; sprite->data[0] = 0; sprite->callback = TreeEntranceSpriteCallback2; @@ -494,7 +494,7 @@ bool8 FldEff_SecretPowerShrub(void) static void ShrubEntranceSpriteCallback1(struct Sprite *sprite) { - PlaySE(SE_W077); + PlaySE(SE_M_POISON_POWDER); sprite->data[0] = 0; sprite->callback = ShrubEntranceSpriteCallback2; } diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index 3c64ec520..1c1285ad9 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -100,7 +100,7 @@ static void sub_8133D50(u8 taskId) { return; } - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0]; diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 88069f6e9..a999aa47b 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -49,7 +49,7 @@ static void StartSweetScentFieldEffect(void) { u8 taskId; - PlaySE(SE_W230); + PlaySE(SE_M_SWEET_SCENT); BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0)); taskId = CreateTask(TrySweetScentEncounter, 0); gTasks[taskId].data[0] = 0; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 93532d396..2dd3266a3 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -451,7 +451,7 @@ static bool8 sub_8141E64(void) if (!gPaletteFade.active) { SetMainCallback2(CB2_HallOfFame); - PlayBGM(MUS_DENDOU); + PlayBGM(MUS_HALL_OF_FAME); return 0; } break; @@ -666,7 +666,7 @@ static void sub_8142570(u8 taskID) } Menu_EraseWindowRect(0, 14, 29, 19); sub_8143068(0, 15); - PlaySE(SE_DENDOU); + PlaySE(SE_APPLAUSE); gTasks[taskID].tFrameCount = 400; gTasks[taskID].func = sub_8142618; } diff --git a/src/intro.c b/src/intro.c index 818c4ec54..d1f3fa1ea 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1406,7 +1406,7 @@ static void Task_IntroPokemonBattle(u8 taskId) gSprites[spriteId].invisible = 1; } if (gIntroFrameCounter == 800) - PlaySE(SE_OP_BASYU); + PlaySE(SE_INTRO_BLAST); if (gIntroFrameCounter == 850) BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, FADE_COLOR_WHITE); if (gIntroFrameCounter == 946) diff --git a/src/item_menu.c b/src/item_menu.c index ea3faf49e..54ad4518b 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2853,7 +2853,7 @@ static void sub_80A6548(u8 taskId) static void sub_80A6574(u8 taskId) { - PlaySE(SE_REGI); + PlaySE(SE_SHOP); sub_80A6870(gSpecialVar_ItemId, gTasks[taskId].data[1]); gTasks[taskId].func = sub_80A6548; } diff --git a/src/item_use.c b/src/item_use.c index 348806e06..3920ae5bd 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -312,7 +312,7 @@ void RunItemfinderResults(u8 taskId) } return; } - PlaySE(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. + PlaySE(SE_ITEMFINDER); // play the itemfinder jingle 4 times before executing the itemfinder. data[4]++; } data[3] = (data[3] + 1) & 0x1F; @@ -744,7 +744,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId) static void BootTMHM(u8 taskId) { - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); gTasks[taskId].func = WaitButtonPressAndDisplayTMHMInfo; } @@ -803,7 +803,7 @@ static void PlayBlackWhiteFluteSound(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySE(SE_BIDORO); + PlaySE(SE_GLASS_FLUTE); DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1); } } @@ -896,7 +896,7 @@ void sub_80CA2BC(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(gSpecialVar_ItemId, 1); DisplayItemMessageOnField(taskId, sub_803F378(gSpecialVar_ItemId), sub_80CA294, 1); } diff --git a/src/main_menu.c b/src/main_menu.c index 33bffcb93..f271138d6 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -766,7 +766,7 @@ static void Task_NewGameSpeech1(u8 taskId) gTasks[taskId].data[3] = 0xFF; gTasks[taskId].tFrameCounter = 216; //Wait 3.6 seconds (216 frames) before starting speech - PlayBGM(MUS_DOORO_X4); + PlayBGM(MUS_ROUTE122); } static void Task_NewGameSpeech2(u8 taskId) diff --git a/src/mauville_man.c b/src/mauville_man.c index 96de37c79..a71ce5fe8 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -745,7 +745,7 @@ static void Task_BardSong(u8 taskId) case 3: if (gStringVar4[task->tCharIndex] == EOS) { - FadeInNewBGM(MUS_POKECEN, 6); + FadeInNewBGM(MUS_POKE_CENTER, 6); m4aMPlayFadeOutTemporarily(&gMPlayInfo_SE2, 2); EnableBothScriptContexts(); DestroyTask(taskId); diff --git a/src/move_tutor_menu.c b/src/move_tutor_menu.c index 666eec0da..e17a1d3ea 100644 --- a/src/move_tutor_menu.c +++ b/src/move_tutor_menu.c @@ -602,13 +602,13 @@ static void MoveTutorMain(void) PrintMainMoveTutorMenuText(gOtherText_ForgotOrDidNotLearnMove); #endif sMoveTutorMenu->state = 31; - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); } break; case 31: if (Menu_UpdateWindowText()) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); sMoveTutorMenu->state = 32; } break; diff --git a/src/naming_screen.c b/src/naming_screen.c index bfd9cd54f..eb0d5fd22 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1361,7 +1361,7 @@ static void DeleteTextCharacter(void) var2 = GetKeyRoleAtCursorPos(); if (var2 == 0 || var2 == 2) sub_80B6460(1, 0, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } static bool8 sub_80B7004(void) diff --git a/src/overworld.c b/src/overworld.c index 7265cf50a..a0e7939f5 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -51,9 +51,9 @@ #include "constants/species.h" #ifdef SAPPHIRE -#define LEGENDARY_MUSIC MUS_OOAME // Heavy Rain +#define LEGENDARY_MUSIC MUS_WEATHER_KYOGRE // Heavy Rain #else -#define LEGENDARY_MUSIC MUS_HIDERI // Drought +#define LEGENDARY_MUSIC MUS_WEATHER_GROUDON // Drought #endif extern u8 gUnknown_020297ED; @@ -845,7 +845,7 @@ static u16 GetLocationMusic(struct WarpData *warp) if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE) return LEGENDARY_MUSIC; else if (IsInfiltratedWeatherInstitute(warp) == TRUE) - return MUS_TOZAN; + return MUS_MT_CHIMNEY; else return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music; } @@ -858,7 +858,7 @@ u16 GetCurrLocationDefaultMusic(void) if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE111) && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE111) && GetSav1Weather() == 8) - return MUS_ASHROAD; + return MUS_ROUTE111; music = GetLocationMusic(&gSaveBlock1.location); if (music != 0x7FFF) @@ -868,9 +868,9 @@ u16 GetCurrLocationDefaultMusic(void) else { if (gSaveBlock1.pos.x < 24) - return MUS_DOORO_X1; + return MUS_ROUTE110; else - return MUS_GRANROAD; + return MUS_ROUTE119; } } @@ -885,9 +885,9 @@ u16 GetWarpDestinationMusic(void) { if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAUVILLE_CITY) && gSaveBlock1.location.mapNum == MAP_NUM(MAUVILLE_CITY)) - return MUS_DOORO_X1; + return MUS_ROUTE110; else - return MUS_GRANROAD; + return MUS_ROUTE119; } } @@ -905,9 +905,9 @@ void Overworld_PlaySpecialMapMusic(void) if (gSaveBlock1.savedMusic) music = gSaveBlock1.savedMusic; else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER) - music = MUS_DEEPDEEP; + music = MUS_UNDERWATER; else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - music = MUS_NAMINORI; + music = MUS_SURF; } if (music != GetCurrentMapMusic()) @@ -932,10 +932,10 @@ void sub_8053F0C(void) u16 currentMusic = GetCurrentMapMusic(); if (newMusic != LEGENDARY_MUSIC) { - if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI) + if (currentMusic == MUS_UNDERWATER || currentMusic == MUS_SURF) return; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - newMusic = MUS_NAMINORI; + newMusic = MUS_SURF; } if (newMusic != currentMusic) { diff --git a/src/party_menu.c b/src/party_menu.c index 343541ac1..f20f2ad16 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3903,7 +3903,7 @@ void Task_TeamMonTMMove3(u8 taskId) { if (gUnknown_0202E8F6 == 0) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); gTasks[taskId].func = Task_TeamMonTMMove4; } } @@ -4159,7 +4159,7 @@ void sub_806FA18(u8 taskId) ewram1B000.unk282 = sub_806F7E8(taskId, &sp0, 1); if (ewram1B000.unk282 == -1) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); ewram1C000.unkC = 0; gTasks[taskId].data[11] -= gTasks[taskId].data[12]; SetMonData(ewram1C000.pokemon, MON_DATA_HP, &gTasks[taskId].data[11]); @@ -4343,9 +4343,9 @@ void UseMedicine(u8 taskId, u16 item, TaskFunc func) gUnknown_0202E8F4 = 1; if (!IsBlueYellowRedFlute(item)) - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); else - PlaySE(SE_BIDORO); + PlaySE(SE_GLASS_FLUTE); statusAndPkrs = GetMonStatusAndPokerus(ewram1C000.pokemon); if (statusAndPkrs == STATUS_PRIMARY_POKERUS || statusAndPkrs == STATUS_PRIMARY_NONE) PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.primarySelectedMonIndex); @@ -4423,7 +4423,7 @@ void sub_8070088(u8 taskId) { gUnknown_0202E8F4 = 1; Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.primarySelectedMonIndex); task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + ewram1C000.primarySelectedMonIndex * 2], 9); ewram1B000.unk261 = 2; @@ -4575,7 +4575,7 @@ void DoRecoverPP(u8 taskId) else { gUnknown_0202E8F4 = 1; - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(ewram1C000.secondarySelectedIndex, 1); r5 = GetMonData(ewram1C000.pokemon, MON_DATA_MOVE1 + gTasks[taskId].data[11]); StringCopy(gStringVar1, gMoveNames[r5]); diff --git a/src/pokeball.c b/src/pokeball.c index 8a11440ff..58c1bbaa9 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -404,7 +404,7 @@ static void SendOutMonAnimation(u8 taskId) gSprites[spriteId].oam.affineParam = taskId; gTasks[taskId].data[4] = gBattlerTarget; gTasks[taskId].func = TaskDummy; - PlaySE(SE_NAGERU); + PlaySE(SE_BALL_THROW); } static void objc_0804ABD4(struct Sprite *sprite) @@ -455,7 +455,7 @@ static void sub_8046760(struct Sprite *sprite) { sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); if (gSprites[gBattlerSpriteIds[sprite->data[6]]].affineAnimEnded) { StartSpriteAnim(sprite, 2); @@ -505,16 +505,16 @@ static void sub_804684C(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; } } @@ -556,7 +556,7 @@ static void sub_8046944(struct Sprite *sprite) sprite->affineAnimPaused = TRUE; StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_8046984; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } @@ -625,7 +625,7 @@ static void sub_8046984(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 2); else StartSpriteAffineAnim(sprite, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } @@ -822,7 +822,7 @@ static void sub_8046FBC(struct Sprite *sprite) { gDoingBattleAnim = 0; m4aMPlayAllStop(); - PlaySE(MUS_FANFA5); + PlaySE(MUS_EVOLVED); } else if (sprite->data[4] == 315) { @@ -1074,7 +1074,7 @@ static void sub_80476E0(struct Sprite *sprite) sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); r1 = sprite->data[0]; if (gSprites[r1].affineAnimEnded) { diff --git a/src/pokedex.c b/src/pokedex.c index ea6c69478..7da931967 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1534,7 +1534,7 @@ void Task_PokedexMainScreen(u8 taskId) gPokedexView->unk614 = gPokedexView->dexMode; gPokedexView->unk618 = gPokedexView->dexOrder; gTasks[taskId].func = sub_808CB8C; - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); } else if (gMain.newKeys & B_BUTTON) { @@ -1725,7 +1725,7 @@ static void Task_PokedexResultsScreen(u8 taskId) gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gTasks[taskId].func = sub_808CB8C; - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); } else if (gMain.newKeys & B_BUTTON) { @@ -1784,7 +1784,7 @@ static void Task_PokedexResultsScreenMenu(u8 taskId) case 3: //BACK TO POKEDEX BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; - PlaySE(SE_TRACK_DOOR); + PlaySE(SE_TRUCK_DOOR); break; case 4: //CLOSE POKEDEX BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); @@ -3007,7 +3007,7 @@ static void Task_PageScreenProcessInput(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_808F888; - PlaySE(SE_Z_SCROLL); + PlaySE(SE_DEX_SCROLL); return; } if (gMain.newKeys & B_BUTTON) @@ -3037,7 +3037,7 @@ static void Task_PageScreenProcessInput(u8 taskId) case SIZE_SCREEN: if (!gUnknown_0202FFBC->owned) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } else { @@ -3055,7 +3055,7 @@ static void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen--; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } if (((gMain.newKeys & DPAD_RIGHT) @@ -3064,7 +3064,7 @@ static void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen++; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } } @@ -3268,7 +3268,7 @@ static void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlayInfo_BGM); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_808FFBC; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } if ((gMain.newKeys & DPAD_RIGHT) @@ -3276,7 +3276,7 @@ static void Task_CryScreenProcessInput(u8 taskId) { if (!gUnknown_0202FFBC->owned) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } else { @@ -3284,7 +3284,7 @@ static void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlayInfo_BGM); gPokedexView->unk64F = 3; gTasks[taskId].func = sub_808FFBC; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } return; } @@ -3428,7 +3428,7 @@ static void Task_SizeScreenProcessInput(u8 taskId) BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_8090498; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } } @@ -4810,13 +4810,13 @@ static void sub_809207C(u8 taskId) } if ((gMain.newKeys & DPAD_LEFT) && gTasks[taskId].data[0] > 0) { - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); gTasks[taskId].data[0]--; sub_8092AB0(gTasks[taskId].data[0]); } if ((gMain.newKeys & DPAD_RIGHT) && gTasks[taskId].data[0] < 2) { - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); gTasks[taskId].data[0]++; sub_8092AB0(gTasks[taskId].data[0]); } @@ -4850,7 +4850,7 @@ static void sub_80921B0(u8 taskId) if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); sub_8092EB0(taskId); gTasks[taskId].func = sub_809204C; return; @@ -4878,7 +4878,7 @@ static void sub_80921B0(u8 taskId) { sub_8091E20(gDexText_Searching); gTasks[taskId].func = sub_80923FC; - PlaySE(SE_Z_SEARCH); + PlaySE(SE_DEX_SEARCH); } } else @@ -4934,12 +4934,12 @@ static void sub_80924A4(u8 taskId) { if (gPokedexView->pokemonListCount != 0) { - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); sub_8091E20(gDexText_SearchComplete); } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); sub_8091E20(gDexText_NoMatching); } gTasks[taskId].func = sub_8092508; @@ -4961,7 +4961,7 @@ static void sub_8092508(u8 taskId) else { gTasks[taskId].func = sub_809217C; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } } @@ -5015,7 +5015,7 @@ static void sub_8092644(u8 taskId) if (gMain.newKeys & B_BUTTON) { sub_814ADC8(); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); Menu_EraseWindowRect(18, 1, 28, 12); sub_8092C8C(1); *p1 = gTasks[taskId].data[14]; diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index cd697270c..1dbfdf6aa 100644 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -1285,7 +1285,7 @@ static void Task_PokedexAreaScreen_1(u8 taskId) else if (gMain.newKeys & DPAD_RIGHT || (gMain.newKeys & R_BUTTON && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { gTasks[taskId].data[1] = 2; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } else return; diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 393d76dbc..16c2f3738 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1112,38 +1112,38 @@ void ClearBattleMonForms(void) u16 GetMUS_ForBattle(void) { if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) - return MUS_BATTLE34; + return MUS_VS_KYOGRE_GROUDON; if (gBattleTypeFlags & BATTLE_TYPE_REGI) - return MUS_BATTLE36; + return MUS_VS_REGI; if (gBattleTypeFlags & BATTLE_TYPE_LINK) - return MUS_BATTLE20; + return MUS_VS_TRAINER; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { switch (gTrainers[gTrainerBattleOpponent].trainerClass) { case 2: case 0x31: - return MUS_BATTLE30; + return MUS_VS_AQUA_MAGMA_LEADER; case 3: case 4: case 0x32: case 0x33: - return MUS_BATTLE31; + return MUS_VS_AQUA_MAGMA; case 0x19: - return MUS_BATTLE32; + return MUS_VS_GYM_LEADER; case 0x20: - return MUS_BATTLE33; + return MUS_VS_CHAMPION; case 0x2E: if (!StringCompare(gTrainers[gTrainerBattleOpponent].trainerName, BattleText_Wally)) - return MUS_BATTLE20; - return MUS_BATTLE35; + return MUS_VS_TRAINER; + return MUS_VS_RIVAL; case 0x18: - return MUS_BATTLE38; + return MUS_VS_ELITE_FOUR; default: - return MUS_BATTLE20; + return MUS_VS_TRAINER; } } - return MUS_BATTLE27; + return MUS_VS_WILD; } void sub_80408BC(void) diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c index 8f22586a2..78922e80f 100644 --- a/src/pokemon_menu.c +++ b/src/pokemon_menu.c @@ -1030,7 +1030,7 @@ void sub_808B0C0(u8 taskID) case A_BUTTON: gLastFieldPokeMenuOpened = sub_806CA38(taskID); if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_IS_EGG)) - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); else { sub_806D5A4(); diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 6ebb8ff8a..79ebc93ee 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -412,7 +412,7 @@ void sub_8096BF0(void) gPokemonStorageSystemPtr->unk_0004++; break; case 1: - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); gPokemonStorageSystemPtr->unk_000c.tileTag = 14; gPokemonStorageSystemPtr->unk_000c.paletteTag = 0xdad0; gPokemonStorageSystemPtr->unk_000c.unk04 = 0; @@ -586,12 +586,12 @@ void sub_8096C84(void) } break; case 4: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_LAST_POKE); gPokemonStorageSystemPtr->unk_0004 = 6; break; case 5: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); gPokemonStorageSystemPtr->unk_0004 = 6; break; @@ -751,17 +751,17 @@ void sub_8097078(void) } break; case 2: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_LAST_POKE); gPokemonStorageSystemPtr->unk_0004 = 5; break; case 4: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG); gPokemonStorageSystemPtr->unk_0004 = 5; break; case 3: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); gPokemonStorageSystemPtr->unk_0004 = 5; break; @@ -1305,7 +1305,7 @@ void sub_8097BA0(void) case 0: if (sub_809BF20()) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_HOLDING_POKE); gPokemonStorageSystemPtr->unk_0004 = 1; } @@ -1364,7 +1364,7 @@ void sub_8097CC0(void) case 0: if (sub_809BF20()) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_HOLDING_POKE); gPokemonStorageSystemPtr->unk_0004 = 1; } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index ef4ee6c9e..57626fc9d 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1010,7 +1010,7 @@ static void sub_809E260(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); sub_809F9D0(taskId, pssData.selectedMoveIndex); } } @@ -1043,7 +1043,7 @@ static void SummaryScreen_MoveSelect_HandleInput(u8 taskId) { if (!MonKnowsMultipleMoves(&pssData.loadedMon)) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } else { diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 2ff282458..4f29681ac 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -1176,7 +1176,7 @@ void sub_80EBA5C() break; case 14: gPokenavStructPtr->unk6DAB = 1; - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); SetMainCallback2(&sub_80EBD90); SetVBlankCallback(&sub_80EBD18); sub_80F1A74(); diff --git a/src/record_mixing.c b/src/record_mixing.c index 9a2d32837..1bf92bb41 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -100,7 +100,7 @@ void Task_RecordMixing_SoundEffect(u8 taskId) gTasks[taskId].tCounter++; if (gTasks[taskId].tCounter == 50) { - PlaySE(SE_W213); + PlaySE(SE_M_ATTRACT); gTasks[taskId].tCounter = 0; } } @@ -139,7 +139,7 @@ void Task_RecordMixing_Main(u8 taskId) case 2: data[10] = CreateTask(sub_80BA00C, 10); tState = 3; - PlaySE(SE_W226); + PlaySE(SE_M_BATON_PASS); break; case 3: // wait for sub_80BA00C if (!gTasks[data[10]].isActive) diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index e33caed82..71f3fa0c8 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -562,7 +562,7 @@ void Task_ResetRtcScreen(u8 taskId) if (Save_WriteData(0) == SAVE_STATUS_OK) { ResetRtcScreen_ShowMessage(gSystemText_SaveCompleted); - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); } else { diff --git a/src/rom6.c b/src/rom6.c index af823ae9c..32c12b502 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -167,7 +167,7 @@ int FldEff_RockSmash(void) static void sub_810B58C(void) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH); EnableBothScriptContexts(); } diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 2d2d4437d..16aac66be 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -790,7 +790,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) if (GetPlayerSpeed() != 1) affineAnimation += 8; - PlaySE(SE_HI_TURUN); + PlaySE(SE_ROTATING_GATE); StartSpriteAffineAnim(sprite, affineAnimation); } else if (rotationDirection == ROTATE_CLOCKWISE) @@ -800,7 +800,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) if (GetPlayerSpeed() != 1) affineAnimation += 8; - PlaySE(SE_HI_TURUN); + PlaySE(SE_ROTATING_GATE); StartSpriteAffineAnim(sprite, affineAnimation); } diff --git a/src/roulette.c b/src/roulette.c index 40acd41c8..d261e7e41 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -801,7 +801,7 @@ void sub_8115E14(u8 taskid) PlaySE(SE_BOO); else { - m4aSongNumStart(SE_REGI); + m4aSongNumStart(SE_SHOP); gTasks[taskid].func = sub_8115DA0; } } @@ -983,7 +983,7 @@ void sub_8116308(u8 taskid) gTasks[taskid].data[6]++; gTasks[taskid].data[8]++; sub_81182F8(6 - gTasks[taskid].data[6]); - m4aSongNumStart(SE_TAMAKORO); + m4aSongNumStart(SE_ROULETTE_BALL); gTasks[taskid].func = sub_811637C; } @@ -1100,20 +1100,20 @@ void sub_8116638(u8 taskid) case 2: if (gTasks[taskid].data[2] == 12) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); Menu_DrawStdWindowFrame(0, 14, 29, 19); Menu_PrintText(&gUnknown_081C41A5, 1, 15); } else { - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); Menu_DrawStdWindowFrame(0, 14, 29, 19); Menu_PrintText(&gUnknown_081C4199, 1, 15); } break; case 0: default: - m4aSongNumStart(SE_HAZURE); + m4aSongNumStart(SE_FAILURE); Menu_DrawStdWindowFrame(0, 14, 29, 19); Menu_PrintText(&gUnknown_081C41AE, 1, 15); } diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c index 46188123b..b94b18c9c 100644 --- a/src/roulette_gfx.c +++ b/src/roulette_gfx.c @@ -1200,7 +1200,7 @@ void sub_811889C(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); eRoulette->var9C = eRoulette->var98 = 0.0f; eRoulette->var8C = -1.0f; } @@ -1217,7 +1217,7 @@ void sub_811889C(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); eRoulette->var9C = eRoulette->var98 = 0.0f; eRoulette->var8C = -1.0f; } @@ -1286,7 +1286,7 @@ void sub_8118B30(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); eRoulette->var03_6 = TRUE; } } @@ -1322,7 +1322,7 @@ void sub_8118BD8(struct Sprite *sprite) sprite->animEnded = FALSE; sprite->data[2] = 0; sprite->callback = sub_8118B30; - m4aSongNumStart(SE_NAGERU); + m4aSongNumStart(SE_BALL_THROW); } } } @@ -1383,12 +1383,12 @@ void sub_8118D2C(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); } else { sprite->animPaused = TRUE; - m4aSongNumStart(SE_KON); + m4aSongNumStart(SE_BALL_BOUNCE_1); sub_811952C(sprite); } } @@ -1401,7 +1401,7 @@ void debug_sub_812E698(struct Sprite *sprite) sub_8118724(sprite); sprite->data[2] = 0; sub_81186B8(sprite); - m4aSongNumStart(SE_KON); + m4aSongNumStart(SE_BALL_BOUNCE_1); if (Random() & 1) { eRoulette->var8C = 0; @@ -1436,13 +1436,13 @@ void sub_8118DE4(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); } else { u8 t; u32 z; - m4aSongNumStart(SE_KON); + m4aSongNumStart(SE_BALL_BOUNCE_1); if ((z = (Random() & 1))) { u32 o; @@ -1547,7 +1547,7 @@ void sub_8119134(struct Sprite *sprite) sub_8118724(sprite); if (!(eRoulette->var94 > 60.0f)) { - m4aSongNumStartOrChange(SE_TAMAKORO_E); + m4aSongNumStartOrChange(SE_ROULETTE_BALL2); eRoulette->var98 = - ( 20.0f / (float)((u16)eRoulette->var84)); eRoulette->var90 = ((1.0f - eRoulette->var8C) / (float)((u16)eRoulette->var84)); sprite->animNum = 1; @@ -1785,7 +1785,7 @@ void sub_8119898(struct Sprite *sprite) gSprites[sprite->data[6]].data[1] = -2; gSprites[sprite->data[5]].invisible = FALSE; gSprites[sprite->data[5]].callback = sub_81197D8; - m4aSongNumStart(SE_W070); + m4aSongNumStart(SE_M_STRENGTH); } } @@ -1810,7 +1810,7 @@ void sub_8119964(struct Sprite *sprite) { sprite->invisible = FALSE; sprite->data[7]++; - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); eRoulette->var01 = 1; eRoulette->var34 = gUnknown_083FA61E[0]; } @@ -1858,7 +1858,7 @@ void sub_8119AAC(struct Sprite *sprite) sprite->callback = &SpriteCallbackDummy; sprite->invisible = TRUE; sprite->animPaused = TRUE; - m4aSongNumStop(SE_BASABASA); + m4aSongNumStop(SE_TAILLOW_WING_FLAP); DestroySprite(sprite); FreeOamMatrix(gSprites[eRoulette->var3C[56]].oam.matrixNum); DestroySprite(&gSprites[eRoulette->var3C[56]]); @@ -1889,7 +1889,7 @@ void sub_8119B24(struct Sprite *sprite) } else { - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); StartSpriteAnim(sprite, eRoulette->var38->data[0] + 4); sprite->callback = sub_8119AAC; gSprites[sprite->data[6]].affineAnimPaused = FALSE; @@ -1929,7 +1929,7 @@ void sub_8119BCC(struct Sprite *sprite) } else { - m4aSongNumStartOrChange(SE_BASABASA); + m4aSongNumStartOrChange(SE_TAILLOW_WING_FLAP); if (eRoulette->var38->data[0] == 0) PlayCry1(SPECIES_TAILLOW, 63); else @@ -1983,5 +1983,5 @@ void sub_8119D80(struct Sprite *sprite) } gSprites[sprite->data[6]].callback = sub_8119D08; gSprites[sprite->data[4]].callback = sub_8119BCC; - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); } diff --git a/src/shop.c b/src/shop.c index 75d83d132..75ed36fa4 100644 --- a/src/shop.c +++ b/src/shop.c @@ -657,7 +657,7 @@ static void Shop_DoItemTransaction(u8 taskId) { IncrementGameStat(GAME_STAT_SHOPPED); RemoveMoney(&gSaveBlock1.money, gMartTotalCost); - PlaySE(SE_REGI); + PlaySE(SE_SHOP); UpdateMoneyWindow(gSaveBlock1.money, 0, 0); gTasks[taskId].func = Shop_DoPremierBallCheck; } diff --git a/src/slot_machine.c b/src/slot_machine.c index c6cbdb1c8..fd3e2580d 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -707,7 +707,7 @@ static bool8 sub_8101E3C(struct Task *task) eSlotMachine->coins -= (3 - eSlotMachine->bet); eSlotMachine->bet = 3; eSlotMachine->state = 9; - PlaySE(SE_REGI); + PlaySE(SE_SHOP); } else { @@ -718,7 +718,7 @@ static bool8 sub_8101E3C(struct Task *task) { if (gMain.newKeys & DPAD_DOWN && eSlotMachine->coins != 0) { - PlaySE(SE_REGI); + PlaySE(SE_SHOP); sub_8103D50(eSlotMachine->bet); eSlotMachine->coins--; eSlotMachine->bet++; @@ -834,7 +834,7 @@ static bool8 sub_8102058(struct Task *task) if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); sub_8102E1C(eSlotMachine->unk18); sub_8103C14(eSlotMachine->unk18); eSlotMachine->state = 13; @@ -927,17 +927,17 @@ bool8 sub_81020C8(struct Task *task) } if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); sub_8104CAC(6); } else if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_MIXED)) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); sub_8104CAC(5); } else { - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); sub_8104CAC(2); } if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) @@ -2682,7 +2682,7 @@ static void sub_810437C(struct Task *task) sub_810545C(); sub_8102680(); StopMapMusic(); - PlayNewMapMusic(MUS_BD_TIME); + PlayNewMapMusic(MUS_ROULETTE); } static void sub_81043EC(struct Task *task) @@ -2818,7 +2818,7 @@ static void sub_81046C0(struct Task *task) { task->data[4] = 0xa0; StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 5); - PlayFanfare(MUS_ME_ZANNEN); + PlayFanfare(MUS_TOO_BAD); } else { @@ -2830,7 +2830,7 @@ static void sub_81046C0(struct Task *task) sub_8104098(); eSlotMachine->pikaPower = 0; } - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); } } } @@ -2906,8 +2906,8 @@ static void sub_81048CC(struct Task *task) task->data[4] = 4; task->data[5] = 0; StopMapMusic(); - PlayFanfare(MUS_ME_ZANNEN); - PlaySE(SE_W153); + PlayFanfare(MUS_TOO_BAD); + PlaySE(SE_M_EXPLOSION); } static void sub_8104940(struct Task *task) diff --git a/src/sound.c b/src/sound.c index 73040c4df..69f796fca 100644 --- a/src/sound.c +++ b/src/sound.c @@ -37,18 +37,18 @@ extern struct ToneData gCryTable2[]; static const struct Fanfare sFanfares[] = { - { MUS_FANFA1, 80 }, - { MUS_FANFA4, 160 }, - { MUS_FANFA5, 220 }, - { MUS_ME_WAZA, 220 }, - { MUS_ME_ASA, 160 }, - { MUS_ME_BACHI, 340 }, - { MUS_ME_WASURE, 180 }, - { MUS_ME_KINOMI, 120 }, - { MUS_ME_TAMA, 710 }, - { MUS_ME_B_BIG, 250 }, - { MUS_ME_B_SMALL, 150 }, - { MUS_ME_ZANNEN, 160 }, + { MUS_LEVEL_UP, 80 }, + { MUS_OBTAIN_ITEM, 160 }, + { MUS_EVOLVED, 220 }, + { MUS_OBTAIN_TMHM, 220 }, + { MUS_HEAL, 160 }, + { MUS_OBTAIN_BADGE, 340 }, + { MUS_MOVE_DELETED, 180 }, + { MUS_OBTAIN_BERRY, 120 }, + { MUS_AWAKEN_LEGEND, 710 }, + { MUS_SLOTS_JACKPOT, 250 }, + { MUS_SLOTS_WIN, 150 }, + { MUS_TOO_BAD, 160 }, }; static void Task_Fanfare(u8 taskId); @@ -198,7 +198,7 @@ bool8 WaitFanfare(bool8 stop) if (!stop) m4aMPlayContinue(&gMPlayInfo_BGM); else - m4aSongNumStart(SE_STOP); + m4aSongNumStart(MUS_DUMMY); return TRUE; } diff --git a/src/strings.c b/src/strings.c index 7d77d503a..acdbcd9cb 100644 --- a/src/strings.c +++ b/src/strings.c @@ -355,7 +355,7 @@ const u8 gOtherText_WantsToLearn[] = _("{STR_VAR_1} wants to learn the\nmove {ST const u8 gOtherText_StopTryingTo[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gOtherText_DidNotLearnMove2[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_WhichMoveToForget2[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_ForgetMove123_2[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_ForgetMove123_2[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_AlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_HPRestoredBy[] = _("{STR_VAR_1}'s HP was restored by\n{STR_VAR_2} points.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_CuredPoisoning[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}"); diff --git a/src/trade.c b/src/trade.c index 8d57cd60b..41c63e929 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1194,7 +1194,7 @@ static void sub_8047EC0(void) sub_8048C70(); gMain.state ++; nullsub_5(7, 0); - PlayBGM(MUS_P_SCHOOL); + PlayBGM(MUS_SCHOOL); break; case 14: sub_804ACF4(1); @@ -3379,7 +3379,7 @@ static void sub_804B058(struct Sprite *sprite) { if (++ sprite->data[0] == 10) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); sprite->data[0] = 0; } } @@ -3414,7 +3414,7 @@ static void sub_804B104(struct Sprite *sprite) { if (++ sprite->data[0] == 15) { - PlaySE(SE_W107); + PlaySE(SE_M_MINIMIZE); sprite->data[0] = 0; } } @@ -4356,7 +4356,7 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset; gUnknown_03004828->unk_00c4 ++; gUnknown_03004828->unk_0124 = GetCurrentMapMusic(); - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); break; case 1: if (gUnknown_03004828->bg2hofs > 0) @@ -4509,7 +4509,7 @@ static bool8 sub_804C29C(void) case 32: if (!gPaletteFade.active) { - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); gUnknown_03004828->unk_00c4 ++; } gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3; @@ -4563,7 +4563,7 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.y += 3; if (-0xa0 > gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y && gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y >= -0xa3) { - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } if (gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y < -0xde) { @@ -4659,7 +4659,7 @@ static bool8 sub_804C29C(void) DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]); sub_804BBE8(6); gUnknown_03004828->unk_00c4 ++; - PlaySE(SE_W028); + PlaySE(SE_M_SAND_ATTACK); } break; case 51: @@ -4739,7 +4739,7 @@ static bool8 sub_804C29C(void) case 68: if (++ gUnknown_03004828->unk_00c0 == 4) { - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); } if (gUnknown_03004828->unk_00c0 == 0xf0) { @@ -4872,10 +4872,10 @@ static void sub_804D738(struct Sprite *sprite) { sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]]; if (sprite->data[0] == 22) - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); if (++ sprite->data[0] == 44) { - PlaySE(SE_W025); + PlaySE(SE_M_MEGA_KICK); sprite->callback = sub_804D7AC; sprite->data[0] = 0; BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, FADE_COLOR_WHITE); @@ -4905,17 +4905,17 @@ static void sub_804D80C(struct Sprite *sprite) { sprite->data[2] ++; sprite->data[0] = 0x16; - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); } } else { if (sprite->data[0] == 0x42) - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); if (sprite->data[0] == 0x5c) - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); if (sprite->data[0] == 0x6b) - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]]; if (++sprite->data[0] == 0x6c) sprite->callback = SpriteCallbackDummy; |