diff options
Diffstat (limited to 'data/scripts')
80 files changed, 158 insertions, 158 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index ebe7b9e0b..2828036e0 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -119,7 +119,7 @@ Route102_EventScript_274448:: @ 8274448 special sub_80EED34 special FieldObjectInteractionRemoveBerryTree message Route102_Text_27461B - playfanfare BGM_ME_KINOMI + playfanfare MUS_ME_KINOMI waitmessage waitfanfare waitbuttonpress diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index bfe87dfc2..7eb12ac1f 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -891,7 +891,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 setvar VAR_0x4009, 1 showcontestresults setvar VAR_0x4009, 0 - playbgm BGM_CON_FAN, 0 + playbgm MUS_CON_FAN, 0 return LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB @@ -1239,7 +1239,7 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_27BBD4, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 msgbox LinkContestRoom1_Text_27BC00, 4 waitfanfare special sub_80F8390 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 7074951d7..d20cfa799 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -36,7 +36,7 @@ Route117_EventScript_291C83:: @ 8291C83 Route117_EventScript_291C9D:: @ 8291C9D message Route117_Text_2921A4 - playfanfare BGM_FANFA1 + playfanfare MUS_FANFA1 waitfanfare waitbuttonpress msgbox Route117_Text_2921CF, 4 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 3bc582c93..52351b549 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -141,7 +141,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -364,7 +364,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25819C waitmessage waitfanfare @@ -408,7 +408,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25835B waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index 9fb734a71..fce85e7d3 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -455,7 +455,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA waitmessage waitfanfare @@ -494,7 +494,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D522 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index 188fe4649..5de099292 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -247,7 +247,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index 3652d576f..7d1c57f66 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -174,7 +174,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C closemessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleFactoryBattleRoom_Text_25B460 waitmessage waitfanfare @@ -210,7 +210,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B waitmessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleFactoryBattleRoom_Text_25B640 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index ffc3744f6..4c0528e34 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -70,7 +70,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 setvar VAR_0x8004, 16 special sub_81A5E74 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty setvar VAR_0x8004, 9 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 6646694f7..ccd285a3a 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -98,7 +98,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -272,7 +272,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC waitmessage waitfanfare @@ -315,7 +315,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_250699 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index 2aafa58a6..30245d984 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -87,7 +87,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 lock faceplayer msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 @@ -166,7 +166,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 waitmessage - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 waitmessage waitfanfare @@ -201,7 +201,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 waitmessage - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 waitmessage waitfanfare @@ -236,14 +236,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end @@ -255,7 +255,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E waitmovement 0 message BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6 waitmessage - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 @@ -611,7 +611,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4 closemessage diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index b4bfcbe40..bf031e090 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -33,7 +33,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F end BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 - playbgm BGM_BATTLE_PYRAMID, 0 + playbgm MUS_PYRAMID, 0 setvar VAR_0x400E, 1 end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index f10606ded..6c44e0044 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -59,7 +59,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E .2byte 0 BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 - playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 + playbgm MUS_PYRAMID_TOP, 0 setvar VAR_0x400E, 1 end @@ -102,7 +102,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 waitmovement 0 message BattleFrontier_BattlePyramidTop_Text_2554E8 waitmessage - playfanfare BGM_ME_BATTLE_POINTS + playfanfare MUS_ME_POINTGET waitfanfare closemessage @@ -159,7 +159,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 call BattleFrontier_BattlePyramidTop_EventScript_2553ED - playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 + playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB goto BattleFrontier_BattlePyramidTop_EventScript_252B42 @@ -170,7 +170,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_2558E9 waitmessage waitfanfare @@ -206,7 +206,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 call BattleFrontier_BattlePyramidTop_EventScript_2553ED - playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 + playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 goto BattleFrontier_BattlePyramidTop_EventScript_252B42 @@ -217,7 +217,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_255B59 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index e8af66842..7ed448c9a 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -82,7 +82,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -310,7 +310,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_24270E waitmessage waitfanfare @@ -344,7 +344,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 - playfanfare BGM_ME_BATTLE_SYMBOL + playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_242932 waitmessage waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index 1ee49477f..feaa18c8d 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -159,7 +159,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 special sub_81A1780 compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index a7ff05bfb..7c0762417 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -94,7 +94,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 message BattleFrontier_BattleTowerLobby_Text_23F844 waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4 diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc index 1448904d8..7ecf83788 100644 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc @@ -29,7 +29,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message BattleFrontier_ReceptionGate_Text_266676 waitfanfare waitmessage diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 7d521e6df..afaf9a605 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -73,7 +73,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setfieldeffectargument 1, 58 setfieldeffectargument 2, 26 dofieldeffect 65 - playbgm BGM_FRLG_DEOXYS_EYE, 0 + playbgm MUS_RG_DEOEYE, 0 waitfieldeffect 65 addobject 2 applymovement 2, BirthIsland_Exterior_Movement_268054 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index b5b7c603c..6acd67792 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -182,7 +182,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 call DewfordTown_Gym_EventScript_1FC855 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox DewfordTown_Gym_Text_1FD1E0, 4 waitfanfare closemessage diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 15e03f092..f8dab1f3b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -38,7 +38,7 @@ EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 step_end EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 - playbgm BGM_DAIGO, 0 + playbgm MUS_DAIGO, 0 msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4 trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC goto EverGrandeCity_ChampionsRoom_EventScript_228A61 @@ -67,11 +67,11 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 end EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC - playbgm BGM_GIRL_SUP, 0 + playbgm MUS_GIRL_SUP, 0 return EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 - playbgm BGM_BOY_SUP, 0 + playbgm MUS_BOY_SUP, 0 return EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 8d42978d9..a5274bbe5 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 faceplayer checkflag FLAG_0x4FE goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A - playbgm BGM_SITENNOU, 0 + playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_DrakesRoom_Text_22873E, 4 trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895 goto EverGrandeCity_DrakesRoom_EventScript_228724 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index ccca35370..e05b82e2e 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 faceplayer checkflag FLAG_0x4FD goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 - playbgm BGM_SITENNOU, 0 + playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, 4 trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4 goto EverGrandeCity_GlaciasRoom_EventScript_22849A diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index e26763e2f..b838cc25b 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB faceplayer checkflag FLAG_0x4FC goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 - playbgm BGM_SITENNOU, 0 + playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_PhoebesRoom_Text_22820E, 4 trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325 goto EverGrandeCity_PhoebesRoom_EventScript_2281FC diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index 910523a87..63817688d 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -65,7 +65,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5 waitmovement 0 delay 10 - playfanfare BGM_ME_BACHI + playfanfare MUS_ME_BACHI message EverGrandeCity_PokemonLeague_1F_Text_2297EF waitmessage waitfanfare diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 405ffcfd6..46c471e4e 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -50,7 +50,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 faceplayer checkflag FLAG_0x4FB goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B - playbgm BGM_SITENNOU, 0 + playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_SidneysRoom_Text_227FA7, 4 trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2 goto EverGrandeCity_SidneysRoom_EventScript_227F95 diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index 6fbc4266b..b4d0a5d9c 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -108,7 +108,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 9fcc21667..347c55659 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -70,7 +70,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 special sub_81A1780 message FallarborTown_BattleTentLobby_Text_2C4F69 waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 closemessage diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index e9b9174a8..fc069a8ee 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -38,7 +38,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD call FortreeCity_Gym_EventScript_21666A closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox FortreeCity_Gym_Text_217044, 4 waitfanfare closemessage diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index c913c53a3..9d61bc1a5 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -15,7 +15,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox GraniteCave_StevensRoom_Text_22DF6A, 4 waitfanfare closemessage diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 965036dfb..0631a5d33 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -98,17 +98,17 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF removeobject 7 setvar VAR_0x4053, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end LavaridgeTown_EventScript_1EA630:: @ 81EA630 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return LavaridgeTown_EventScript_1EA635:: @ 81EA635 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A @@ -258,7 +258,7 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 goto_eq LavaridgeTown_EventScript_1EA791 msgbox LavaridgeTown_Text_1EACC0, 4 setflag FLAG_0x10A - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LavaridgeTown_Text_1EACF4 waitfanfare giveegg SPECIES_WYNAUT diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 6c927be40..cd34c3d81 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -87,7 +87,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 call LavaridgeTown_Gym_1F_EventScript_1FE841 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox LavaridgeTown_Gym_1F_Text_1FF517, 4 waitfanfare closemessage diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b29953d13..87a129620 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -247,7 +247,7 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE end LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 checkflag FLAG_0x11E call_if 1, LilycoveCity_EventScript_1E2E48 checkflag FLAG_0x11E @@ -272,13 +272,13 @@ LilycoveCity_EventScript_1E2E51:: @ 81E2E51 LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A setflag FLAG_0x11E msgbox LilycoveCity_Text_1E318D, 4 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm release end LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 checkflag FLAG_0x11E call_if 1, LilycoveCity_EventScript_1E2EBB checkflag FLAG_0x11E @@ -303,7 +303,7 @@ LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD setflag FLAG_0x11E msgbox LilycoveCity_Text_1E36BF, 4 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm release end @@ -413,7 +413,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006 delay 15 removeobject VAR_LAST_TALKED waitfieldeffect 30 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm setflag FLAG_0x124 release diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 0364d8127..3b7d6a2f2 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -92,7 +92,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_21B030, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_21B094, 4 @@ -266,7 +266,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_21B030, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_21B094, 4 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 1e9f9cc28..ed34cd953 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -20,7 +20,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9 LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 setflag FLAG_0x002 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F end diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 0b677028d..19471d2e1 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -43,7 +43,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 special sub_81B9770 - playfanfare BGM_ME_WASURE + playfanfare MUS_ME_WASURE waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, 4 releaseall diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index c7376e394..e60eccbaa 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -918,7 +918,7 @@ LittlerootTown_EventScript_1E8686:: @ 81E8686 LittlerootTown_EventScript_1E8693:: @ 81E8693 msgbox LittlerootTown_Text_1E87F0, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_Text_1E8925 waitfanfare setflag FLAG_0x112 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 45f57262b..112311462 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -153,7 +153,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 waitmovement 0 compare VAR_0x8008, 1 call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C compare VAR_0x8008, 1 @@ -176,7 +176,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 delay 30 setvar VAR_0x408D, 3 setvar VAR_0x4050, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 23d30545c..f1763753a 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -73,7 +73,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A waitmovement 0 delay 10 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 compare VAR_FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 compare VAR_FACING, 1 @@ -86,7 +86,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 setflag FLAG_0x331 clearflag FLAG_0x2F8 setvar VAR_0x4050, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 92f4a58e0..2fdf79b03 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B waitmovement 0 compare VAR_0x8008, 1 call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 compare VAR_0x8008, 1 @@ -215,7 +215,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B delay 30 setvar VAR_0x408D, 3 setvar VAR_0x4050, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 963ce9880..3a983cdd4 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -74,7 +74,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A waitmovement 0 delay 10 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 compare VAR_FACING, 2 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA compare VAR_FACING, 1 @@ -87,7 +87,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A setflag FLAG_0x332 clearflag FLAG_0x2D2 setvar VAR_0x4050, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 9e2ac5197..433db24d2 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -96,7 +96,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_1FA74D waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 compare VAR_RESULT, 1 @@ -184,7 +184,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FB436 waitmessage waitfanfare @@ -469,7 +469,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F end LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7 waitmessage waitfanfare @@ -517,7 +517,7 @@ Route101_EventScript_1FA2D2:: @ 81FA2D2 msgbox Route101_Text_2B5F52, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route101_Text_2B603A, 4 waitfanfare closemessage @@ -568,7 +568,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FAC32 waitfanfare setflag FLAG_SYS_POKEDEX_GET diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/scripts/maps/MagmaHideout_4F.inc index bf96fbb7d..cb0580580 100644 --- a/data/scripts/maps/MagmaHideout_4F.inc +++ b/data/scripts/maps/MagmaHideout_4F.inc @@ -3,7 +3,7 @@ MagmaHideout_4F_MapScripts:: @ 823A55F MagmaHideout_4F_EventScript_23A560:: @ 823A560 lockall - playbgm BGM_MGM0, 0 + playbgm MUS_MGM0, 0 msgbox MagmaHideout_4F_Text_23A9F4, 4 closemessage delay 20 @@ -15,7 +15,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 dofieldeffect 54 waitfieldeffect 54 setvar VAR_RESULT, 1 - playfanfare BGM_ME_TAMA + playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 applymovement 255, MagmaHideout_4F_Movement_2725A6 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 908b3a3b3..1c48e9710 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -462,7 +462,7 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA pokenavcall MauvilleCity_Text_1DFDFB waitmessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox MauvilleCity_Text_1DFEB4, 4 waitfanfare closemessage diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 03d5d5525..94da547d5 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -108,7 +108,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B call MauvilleCity_Gym_EventScript_20DFB1 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox MauvilleCity_Gym_Text_20E8B5, 4 waitfanfare closemessage diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index fd0f0935a..50b218f04 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -16,7 +16,7 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall - playbgm BGM_MGM0, 0 + playbgm MUS_MGM0, 0 applymovement 255, MeteorFalls_1F_1R_Movement_2725B0 waitmovement 0 delay 30 @@ -45,7 +45,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F addobject 7 addobject 8 addobject 9 - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 7, MeteorFalls_1F_1R_Movement_22BED9 applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 3443d003d..972d5f4e8 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -82,7 +82,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 call MossdeepCity_Gym_EventScript_22095B closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox MossdeepCity_Gym_Text_221AEA, 4 waitfanfare closemessage diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 918b186ec..91bf06c48 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -121,7 +121,7 @@ MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0 MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB bufferspeciesname 1, SPECIES_BELDUM removeobject 2 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message MossdeepCity_StevensHouse_Text_222BED waitmessage waitfanfare diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 107cda58d..e445fc23f 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -35,7 +35,7 @@ MtChimney_EventScript_22EE02:: @ 822EE02 MtChimney_EventScript_22EE0B:: @ 822EE0B lockall - playbgm BGM_MGM0, 0 + playbgm MUS_MGM0, 0 msgbox MtChimney_Text_22F26A, 4 applymovement 2, MtChimney_Movement_27259E waitmovement 0 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 874c4122a..fed63f0e0 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -31,7 +31,7 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 end MtPyre_Summit_EventScript_23203C:: @ 823203C - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 255, MtPyre_Summit_Movement_2725B2 waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725AA diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index d627a1632..3c075cad0 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC checkflag FLAG_0x001 goto_eq OldaleTown_EventScript_1E8FB9 setflag FLAG_0x001 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 msgbox OldaleTown_Text_1E91C0, 4 closemessage switch VAR_FACING diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 198c46cf1..1f6de9966 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_1DC307:: @ 81DC307 PetalburgCity_EventScript_1DC30F:: @ 81DC30F setflag FLAG_SPECIAL_FLAG_0x4000 - savebgm BGM_TSURETEK + savebgm MUS_TSURETEK return PetalburgCity_EventScript_1DC316:: @ 81DC316 @@ -260,7 +260,7 @@ PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA applymovement 8, PetalburgCity_Movement_27259E waitmovement 0 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 playse SE_PIN applymovement 8, PetalburgCity_Movement_272598 waitmovement 0 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 5eb82c2be..c07b89eec 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -206,7 +206,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC msgbox PetalburgCity_Gym_Text_205B0F, 4 closemessage setflag FLAG_SPECIAL_FLAG_0x4001 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204C78 compare VAR_0x8008, 1 @@ -491,7 +491,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 msgbox PetalburgCity_Gym_Text_2063CA, 4 closemessage setflag FLAG_SPECIAL_FLAG_0x4001 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_205041 compare VAR_0x8008, 2 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index c70b3fc1c..5afb12d68 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -8,7 +8,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 waitmovement 0 msgbox PetalburgWoods_Text_22E34F, 4 closemessage - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 msgbox PetalburgWoods_Text_22E3AA, 4 @@ -45,7 +45,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 waitmovement 0 msgbox PetalburgWoods_Text_22E34F, 4 closemessage - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 msgbox PetalburgWoods_Text_22E3AA, 4 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 8ff9d5b55..4d4334aca 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_1EBCD5:: @ 81EBCD5 Route101_EventScript_1EBCDE:: @ 81EBCDE lockall - playbgm BGM_EVENT0, 1 + playbgm MUS_EVENT0, 1 msgbox Route101_Text_1EBE8F, 4 closemessage setobjectxy 2, 0, 15 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 8493897b1..fa055a971 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -30,7 +30,7 @@ Route103_EventScript_1EC3C1:: @ 81EC3C1 Route103_EventScript_1EC3DA:: @ 81EC3DA msgbox Route103_Text_1EC7A6, 4 closemessage - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 applymovement 2, Route103_Movement_27259E waitmovement 0 applymovement 2, Route103_Movement_272598 @@ -47,7 +47,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA Route103_EventScript_1EC434:: @ 81EC434 msgbox Route103_Text_1EC989, 4 closemessage - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 applymovement 2, Route103_Movement_27259E waitmovement 0 applymovement 2, Route103_Movement_272598 @@ -146,7 +146,7 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 setflag FLAG_0x082 setvar VAR_0x40C7, 1 clearflag FLAG_0x3D3 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 1fc3b89cc..128888939 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -83,11 +83,11 @@ Route104_EventScript_1ECD11:: @ 81ECD11 return Route104_EventScript_1ECD29:: @ 81ECD29 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return Route104_EventScript_1ECD2E:: @ 81ECD2E - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return Route104_EventScript_1ECD33:: @ 81ECD33 @@ -107,7 +107,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B msgbox Route104_Text_1EDBFF, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route104_Text_1EDC8F, 4 waitfanfare closemessage @@ -167,7 +167,7 @@ Route104_EventScript_1ECE1C:: @ 81ECE1C end Route104_EventScript_1ECE31:: @ 81ECE31 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm return @@ -198,7 +198,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F msgbox Route104_Text_1EDF04, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route104_Text_1EDFA0, 4 waitfanfare closemessage @@ -395,7 +395,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF pokenavcall Route104_Text_1EE336 waitmessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route104_Text_1EE463, 4 waitfanfare closemessage diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 39a4c57d4..210354444 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -16,7 +16,7 @@ Route110_MapScript1_1EF27D: @ 81EF27D end Route110_EventScript_1EF293:: @ 81EF293 - savebgm BGM_CYCLING + savebgm MUS_CYCLING return Route110_MapScript2_1EF297: @ 81EF297 @@ -369,7 +369,7 @@ Route110_EventScript_1EF735:: @ 81EF735 Route110_EventScript_1EF743:: @ 81EF743 setvar VAR_0x40A9, 3 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm return @@ -417,11 +417,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E end Route110_EventScript_1EF7E1:: @ 81EF7E1 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return Route110_EventScript_1EF7E6:: @ 81EF7E6 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return Route110_EventScript_1EF7EB:: @ 81EF7EB @@ -509,7 +509,7 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC call_if 1, Route110_EventScript_1EF985 removeobject 29 setvar VAR_0x4069, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm releaseall end @@ -655,7 +655,7 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0AFF, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox Route110_Text_1F0C0C, 4 waitfanfare closemessage diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index f71a6a097..580848838 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -723,7 +723,7 @@ Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5 Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5 Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5 Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route110_TrickHousePuzzle1_Text_26ABE8 waitfanfare msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index bd416f463..3d9914b83 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -264,14 +264,14 @@ Route111_Movement_1F0FAE: @ 81F0FAE Route111_EventScript_1F0FB0:: @ 81F0FB0 setweather 2 - fadenewbgm BGM_DOORO_X1 + fadenewbgm MUS_DOORO_X1 doweather setvar VAR_0x4003, 0 end Route111_EventScript_1F0FBD:: @ 81F0FBD setweather 8 - fadenewbgm BGM_ASHROAD + fadenewbgm MUS_ASHROAD doweather end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 41c74d4a7..53c2c14ff 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -71,11 +71,11 @@ Route119_EventScript_1F4488:: @ 81F4488 end Route119_EventScript_1F4501:: @ 81F4501 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return Route119_EventScript_1F4506:: @ 81F4506 - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return Route119_EventScript_1F450B:: @ 81F450B @@ -158,7 +158,7 @@ Route119_EventScript_1F460F:: @ 81F460F call_if 1, Route119_EventScript_1F46EE removeobject 25 setvar VAR_0x4072, 1 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm delay 60 compare VAR_0x4001, 1 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 7d7281e4d..38f79763d 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -118,7 +118,7 @@ Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 end Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route119_WeatherInstitute_2F_Text_2706E8 waitmessage waitfanfare diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 74746e16f..c813fe6ac 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -15,7 +15,7 @@ Route121_EventScript_1F5E0F:: @ 81F5E0F Route121_EventScript_1F5E18:: @ 81F5E18 lockall - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 applymovement 13, Route121_Movement_2725B8 waitmovement 0 msgbox Route121_Text_1F605A, 4 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index bfacaaee8..4b60f1428 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -70,7 +70,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_2A5036, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route121_SafariZoneEntrance_Text_2A5052 waitfanfare msgbox Route121_SafariZoneEntrance_Text_2A506F, 4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 5b6d0fe7d..8798a586a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -288,7 +288,7 @@ RustboroCity_EventScript_1E09B6:: @ 81E09B6 RustboroCity_EventScript_1E09CD:: @ 81E09CD msgbox RustboroCity_Text_1E17FE, 4 closemessage - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 addobject 10 addobject 9 applymovement 10, RustboroCity_Movement_1E0AA0 @@ -689,11 +689,11 @@ RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 return RustboroCity_EventScript_1E0DE9:: @ 81E0DE9 - playbgm BGM_GIRL_SUP, 1 + playbgm MUS_GIRL_SUP, 1 return RustboroCity_EventScript_1E0DEE:: @ 81E0DEE - playbgm BGM_BOY_SUP, 1 + playbgm MUS_BOY_SUP, 1 return RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 @@ -841,7 +841,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B msgbox RustboroCity_Text_1E1A49, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox RustboroCity_Text_1E1ADB, 4 waitfanfare closemessage @@ -883,7 +883,7 @@ RustboroCity_EventScript_1E10C1:: @ 81E10C1 end RustboroCity_EventScript_1E10D6:: @ 81E10D6 - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm return @@ -914,7 +914,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 msgbox RustboroCity_Text_1E1D7D, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox RustboroCity_Text_1E1E11, 4 waitfanfare closemessage diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index e9765fa56..5543b297a 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -193,7 +193,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 bufferspeciesname 1, SPECIES_LILEEP - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_2F_Text_2122CB waitmessage waitfanfare @@ -242,7 +242,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 bufferspeciesname 1, SPECIES_ANORITH - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_2F_Text_2122CB waitmessage waitfanfare diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 373f4e566..9547fbd67 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4 closemessage - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E msgbox RustboroCity_DevonCorp_3F_Text_212609, 4 giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_212820 waitfanfare setflag FLAG_SYS_POKENAV_GET diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 0cdfaf4b9..1d722b7de 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -100,7 +100,7 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B pokenavcall RustboroCity_Gym_Text_213A76 waitmessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox RustboroCity_Gym_Text_213C01, 4 waitfanfare closemessage diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index cefb978fe..e4e362234 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -311,7 +311,7 @@ RusturfTunnel_EventScript_22D0AF:: @ 822D0AF RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 lock faceplayer - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 msgbox RusturfTunnel_Text_22D20A, 4 trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 msgbox RusturfTunnel_Text_22D2E1, 4 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 984d53295..087459bbb 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -11,7 +11,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_23505C waitmovement 0 - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 msgbox SeafloorCavern_Room9_Text_23505F, 4 closemessage addobject VAR_0x8004 @@ -44,7 +44,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitfieldeffect 54 closemessage setvar VAR_RESULT, 0 - playfanfare BGM_ME_TAMA + playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 @@ -81,7 +81,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, 4 - playse SE_PC_LOGON + playse SE_PC_LOGIN applymovement 255, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, 4 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 304e4decc..566c37a51 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -70,7 +70,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C msgbox SlateportCity_Text_1DF12B, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox SlateportCity_Text_1DF1A6, 4 waitfanfare closemessage @@ -149,7 +149,7 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message SlateportCity_Text_1DD6E3 waitfanfare msgbox SlateportCity_Text_1DD702, 4 @@ -586,7 +586,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 applymovement 11, SlateportCity_Movement_2725A6 waitmovement 0 msgbox SlateportCity_Text_1DE64F, 4 - playbgm BGM_AQA_0, 0 + playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, 4 applymovement 6, SlateportCity_Movement_2725A4 applymovement 1, SlateportCity_Movement_2725A4 diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index e1f464368..6a0bafb45 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -63,7 +63,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE setvar VAR_0x8004, 16 special sub_81A5E74 msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 985251556..ca51ab57e 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -69,7 +69,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 special sub_81A1780 message SlateportCity_BattleTentLobby_Text_23F68C waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare goto SlateportCity_BattleTentLobby_EventScript_208861 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index aa8704027..5fb080363 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -16,7 +16,7 @@ SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 return SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 - savebgm BGM_AQA_0 + savebgm MUS_AQA_0 setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 setflag FLAG_0x389 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 75f967fef..a7a24757f 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -6,7 +6,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4 closemessage - playbgm BGM_AQA_0, 1 + playbgm MUS_AQA_0, 1 addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4 waitmovement 0 @@ -59,7 +59,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4 closemessage - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm fadescreen 1 removeobject 2 @@ -76,7 +76,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4 closemessage fadescreen 1 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty removeobject 1 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 2883c5c2a..a274d1f78 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -546,7 +546,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 3 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm BGM_RUNECITY + fadenewbgm MUS_RUNECITY delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 warp8 SOOTOPOLIS_CITY, 255, 43, 32 @@ -599,7 +599,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 2 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm BGM_NAMINORI + fadenewbgm MUS_NAMINORI delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 warp8 SOOTOPOLIS_CITY, 255, 29, 53 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 81bb9b7c2..362ae269c 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -115,7 +115,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 call SootopolisCity_Gym_1F_EventScript_224FD4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox SootopolisCity_Gym_1F_Text_22574D, 4 waitfanfare closemessage diff --git a/data/scripts/maps/TrainerHill_Roof.inc b/data/scripts/maps/TrainerHill_Roof.inc index d38ef8153..bdec2f7aa 100644 --- a/data/scripts/maps/TrainerHill_Roof.inc +++ b/data/scripts/maps/TrainerHill_Roof.inc @@ -28,7 +28,7 @@ TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 TrainerHill_Roof_EventScript_269020:: @ 8269020 msgbox TrainerHill_Roof_Text_268AC5, 4 - playfanfare BGM_FANFA1 + playfanfare MUS_FANFA1 message gUnknown_08272A78 waitfanfare waitmessage diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 32094137a..65f62498e 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -32,23 +32,23 @@ LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF return LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF - savebgm BGM_TEST1 + savebgm MUS_TEST1 return LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 - savebgm BGM_TEST2 + savebgm MUS_TEST2 return LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 - savebgm BGM_TEST3 + savebgm MUS_TEST3 return LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB - savebgm BGM_TEST4 + savebgm MUS_TEST4 return LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF - savebgm BGM_CONTEST0 + savebgm MUS_CONTEST0 return LinkContestRoom1_MapScript1_23B803: @ 823B803 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index d9d4211e7..b673e959b 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -86,7 +86,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index cd23003c7..a7f496820 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -70,7 +70,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 special sub_81A1780 message VerdanturfTown_BattleTentLobby_Text_24A554 waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 closemessage diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index abb8fed2e..6bae599fc 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D call LittlerootTown_BrendansHouse_1F_EventScript_29294B applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0 waitmovement 0 - playbgm BGM_INTER_V, 0 + playbgm MUS_INTER_V, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, 4 closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 @@ -185,7 +185,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC call LittlerootTown_MaysHouse_1F_EventScript_29294B applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8 waitmovement 0 - playbgm BGM_INTER_V, 0 + playbgm MUS_INTER_V, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, 4 closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA @@ -341,7 +341,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, 4 closemessage delay 30 - playfanfare BGM_ME_MATCH_CALL + playfanfare MUS_ME_TORE_EYE msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, 4 waitfanfare closemessage |