diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index d1ce1513d1..cd142781b8 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -5175,6 +5175,58 @@ GoToIfEq \destVarID, FALSE, \offset .endm + .macro NPCMessage messageID + PlayFanfare SEQ_SE_CONFIRM + LockAll + FacePlayer + Message \messageID + WaitABXPadPress + CloseMessage + ReleaseAll + .endm + + .macro EventMessage messageID + PlayFanfare SEQ_SE_CONFIRM + LockAll + Message \messageID + WaitABXPadPress + CloseMessage + ReleaseAll + .endm + + .macro PokemonCryAndMessage species, messageID, unused=0 + PlayFanfare SEQ_SE_CONFIRM + LockAll + FacePlayer + WaitFanfare SEQ_SE_CONFIRM + PlayCry \species, \unused + Message \messageID + WaitCry + WaitABXPadPress + CloseMessage + ReleaseAll + .endm + + .macro PokeMartCommonWithGreeting unused=1 + PlayFanfare SEQ_SE_CONFIRM + LockAll + FacePlayer + Common_VendorGreeting + CloseMessageWithoutErasing + PokeMartCommon \unused + ReleaseAll + .endm + + .macro PokeMartSpecialtiesWithGreeting martID + PlayFanfare SEQ_SE_CONFIRM + LockAll + FacePlayer + Common_VendorGreeting + CloseMessageWithoutErasing + PokeMartSpecialties \martID + ReleaseAll + .endm + /* CallCommonScript aliases below */ .macro Common_HandleSignpostInput diff --git a/res/field/scripts/scripts_amity_square.s b/res/field/scripts/scripts_amity_square.s index d4df6f652e..7300511701 100644 --- a/res/field/scripts/scripts_amity_square.s +++ b/res/field/scripts/scripts_amity_square.s @@ -610,92 +610,35 @@ _08D0: EndMovement AmitySquare_DrifloonMan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message AmitySquare_Text_TheseRuinsAreFromALongLongTimeAgo - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage AmitySquare_Text_TheseRuinsAreFromALongLongTimeAgo End AmitySquare_Drifloon: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_DRIFLOON - Message AmitySquare_Text_DrifloonFoon - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_DRIFLOON, AmitySquare_Text_DrifloonFoon End AmitySquare_HappinyWoman: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message AmitySquare_Text_IComeHereWithMyHappinyEverySingleDay - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage AmitySquare_Text_IComeHereWithMyHappinyEverySingleDay End AmitySquare_Happiny: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message AmitySquare_Text_HappinyAppearsToBeDrowsy - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage AmitySquare_Text_HappinyAppearsToBeDrowsy End AmitySquare_PikachuMan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message AmitySquare_Text_OohIJustCantBelieveIt - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage AmitySquare_Text_OohIJustCantBelieveIt End AmitySquare_Pikachu: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message AmitySquare_Text_PikachuPikkaPika - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, AmitySquare_Text_PikachuPikkaPika End AmitySquare_ClefairyGirl: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message AmitySquare_Text_YouShouldTalkToYourPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage AmitySquare_Text_YouShouldTalkToYourPokemon End AmitySquare_Clefairy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message AmitySquare_Text_ThereIsSomethingShinyInClefairysHands - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, AmitySquare_Text_ThereIsSomethingShinyInClefairysHands End AmitySquare_CheckPartyHasSpecies: diff --git a/res/field/scripts/scripts_battle_arcade.s b/res/field/scripts/scripts_battle_arcade.s index 95945a56c5..f2b036d41b 100644 --- a/res/field/scripts/scripts_battle_arcade.s +++ b/res/field/scripts/scripts_battle_arcade.s @@ -515,101 +515,43 @@ BattleArcade_UnusedMovement2: EndMovement _079C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 46 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 46 End _07AF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 47 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 47 End _07C2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 48 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 48 End _07D5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 49 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 49 End _07E8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 50 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 50 End _07FB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 51 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 51 End _080E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 52 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 52 End _0821: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 53 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 53 End _0834: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 54 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 54 End _0845: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 55 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 55 End .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_castle.s b/res/field/scripts/scripts_battle_castle.s index 26f812fd5e..6822b0bcc2 100644 --- a/res/field/scripts/scripts_battle_castle.s +++ b/res/field/scripts/scripts_battle_castle.s @@ -510,73 +510,31 @@ BattleCastle_UnusedMovement2: EndMovement _0788: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 46 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 46 End _079B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 47 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 47 End _07AE: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 48 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 48 End _07C1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 49 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 49 End _07D4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 50 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 50 End _07E7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 51 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 51 End _07FA: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 52 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 52 End .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_factory.s b/res/field/scripts/scripts_battle_factory.s index 6616892f24..d8b6c0805b 100644 --- a/res/field/scripts/scripts_battle_factory.s +++ b/res/field/scripts/scripts_battle_factory.s @@ -468,73 +468,31 @@ BattleFactory_UnusedMovement2: EndMovement _0698: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 27 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 27 End _06AB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 28 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 28 End _06BE: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 29 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 29 End _06D1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 30 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 30 End _06E4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 31 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 31 End _06F7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 32 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 32 End _070A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 33 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 33 End .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_frontier.s b/res/field/scripts/scripts_battle_frontier.s index b30d310e2f..57b7b715ff 100644 --- a/res/field/scripts/scripts_battle_frontier.s +++ b/res/field/scripts/scripts_battle_frontier.s @@ -58,213 +58,87 @@ _00D5: End _00DB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _00EE: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0101: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0114: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0127: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _013A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _014D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _0160: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _0173: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _0186: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _0199: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 10 End _01AC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End _01BF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 12 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 12 End _01D2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 13 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 13 End _01E5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End _01F8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 15 End _020B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 16 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 16 End _021E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 17 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 17 End _0231: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 18 End _0244: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 19 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 19 End _0257: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 20 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 20 End _026A: @@ -321,30 +195,15 @@ _0316: End _032D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 29 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 29 End _033E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 30 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 30 End _034F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 31 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 31 End _0360: diff --git a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s index 026fd144f3..86aaffeef2 100644 --- a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s +++ b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s @@ -279,41 +279,17 @@ _034C: EndMovement _0358: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 32 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 32 End _036B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 33 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 33 End _037E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 34 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 34 End _0391: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 35 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 35 End diff --git a/res/field/scripts/scripts_battle_hall.s b/res/field/scripts/scripts_battle_hall.s index acb495e093..66a6f2a854 100644 --- a/res/field/scripts/scripts_battle_hall.s +++ b/res/field/scripts/scripts_battle_hall.s @@ -639,96 +639,39 @@ BattleHall_UnusedMovement2: EndMovement BattleHall_Hiker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleHall_Text_StartWithHardMatchups - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleHall_Text_StartWithHardMatchups End BattleHall_SnowpointNPC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleHall_Text_TryForARecord - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleHall_Text_TryForARecord End BattleHall_Twin: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleHall_Text_PachirisusACutie - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleHall_Text_PachirisusACutie End BattleHall_Pachirisu: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PACHIRISU - Message BattleHall_Text_Pachirisu - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PACHIRISU, BattleHall_Text_Pachirisu End BattleHall_ExpertM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleHall_Text_TryDifferentPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleHall_Text_TryDifferentPokemon End BattleHall_Idol: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleHall_Text_TrySameSpeciesDifferentMoves - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleHall_Text_TrySameSpeciesDifferentMoves End BattleHall_PokefanF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleHall_Text_CroagunkHasTwoTypes - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleHall_Text_CroagunkHasTwoTypes End BattleHall_Maid: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleHall_Text_MysteriousMaid - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleHall_Text_MysteriousMaid End BattleHall_BugCatcher: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleHall_Text_CompeteWithAFriend - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleHall_Text_CompeteWithAFriend End BattleHall_RecordKeeper: diff --git a/res/field/scripts/scripts_battle_park.s b/res/field/scripts/scripts_battle_park.s index 09cecbd8ef..5463d5c8ba 100644 --- a/res/field/scripts/scripts_battle_park.s +++ b/res/field/scripts/scripts_battle_park.s @@ -210,90 +210,39 @@ _02FC: EndMovement _0308: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _031B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 9 End _032C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 10 End _033D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End _0350: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 12 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 12 End _0361: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 13 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 13 End _0374: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End _0387: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 15 End _039A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 16 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 16 End _03AD: diff --git a/res/field/scripts/scripts_battle_park_exchange_service_corner.s b/res/field/scripts/scripts_battle_park_exchange_service_corner.s index a54c26a7aa..2cfcc0f813 100644 --- a/res/field/scripts/scripts_battle_park_exchange_service_corner.s +++ b/res/field/scripts/scripts_battle_park_exchange_service_corner.s @@ -109,53 +109,23 @@ BattleParkExchangeServiceCorner_Unused9: Return _0192: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _01A5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _01B8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 10 End _01CB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 13 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 13 End _01DE: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End _01F1: diff --git a/res/field/scripts/scripts_battle_tower.s b/res/field/scripts/scripts_battle_tower.s index 26538479b7..168cedfca2 100644 --- a/res/field/scripts/scripts_battle_tower.s +++ b/res/field/scripts/scripts_battle_tower.s @@ -1168,89 +1168,38 @@ _1304: Return BattleTower_ParasolLady: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleTower_Text_UsedToLiveInHoenn - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleTower_Text_UsedToLiveInHoenn End BattleTower_Jogger: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleTower_Text_WiFiBattleRoomsAreFullOfSurprises - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleTower_Text_WiFiBattleRoomsAreFullOfSurprises End BattleTower_Idol: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleTower_Text_TheyProfileYouOnTV - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleTower_Text_TheyProfileYouOnTV End BattleTower_RichBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleTower_Text_ITrainedMyLittleGuy - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleTower_Text_ITrainedMyLittleGuy End BattleTower_Pikachu1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleTower_Text_PikachuDotDotDot - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleTower_Text_PikachuDotDotDot End BattleTower_Artist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleTower_Text_YouLookPowerful - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleTower_Text_YouLookPowerful End BattleTower_SchoolKid: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message BattleTower_Text_ThereAreManyToughTrainers - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage BattleTower_Text_ThereAreManyToughTrainers End _13AD: End BattleTower_Pikachu2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message BattleTower_Text_PikachuPichuu - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, BattleTower_Text_PikachuPichuu End _13CE: diff --git a/res/field/scripts/scripts_bg_events.s b/res/field/scripts/scripts_bg_events.s index cb8133b759..b003ce428d 100644 --- a/res/field/scripts/scripts_bg_events.s +++ b/res/field/scripts/scripts_bg_events.s @@ -14,75 +14,35 @@ ScriptEntryEnd _0026: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 0 End _0037: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 1 End _0048: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 2 End _0059: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 3 End _006A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 4 End _007B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 5 End _008C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 6 End _009D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 7 End _00AE: diff --git a/res/field/scripts/scripts_cafe.s b/res/field/scripts/scripts_cafe.s index 8ef9f4ee3c..1daf4f3f70 100644 --- a/res/field/scripts/scripts_cafe.s +++ b/res/field/scripts/scripts_cafe.s @@ -13,13 +13,7 @@ _0012: End _0018: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _002B: diff --git a/res/field/scripts/scripts_canalave_city.s b/res/field/scripts/scripts_canalave_city.s index f7d418e582..fe0fdbacde 100644 --- a/res/field/scripts/scripts_canalave_city.s +++ b/res/field/scripts/scripts_canalave_city.s @@ -212,13 +212,7 @@ _035C: EndMovement _0364: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0377: @@ -344,13 +338,7 @@ _04C8: EndMovement _04D4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 13 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 13 End _04E7: @@ -499,12 +487,7 @@ _06E2: End _06F7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 43 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 43 End _0708: diff --git a/res/field/scripts/scripts_canalave_city_mart.s b/res/field/scripts/scripts_canalave_city_mart.s index 01618b0b62..d754c7f7a4 100644 --- a/res/field/scripts/scripts_canalave_city_mart.s +++ b/res/field/scripts/scripts_canalave_city_mart.s @@ -10,23 +10,11 @@ ScriptEntryEnd CanalaveCityMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End CanalaveCityMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_CANALAVE - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_CANALAVE End CanalaveCityMart_Lady: diff --git a/res/field/scripts/scripts_canalave_city_pokecenter_1f.s b/res/field/scripts/scripts_canalave_city_pokecenter_1f.s index d94bf2063e..6f9a0c2d45 100644 --- a/res/field/scripts/scripts_canalave_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_canalave_city_pokecenter_1f.s @@ -14,43 +14,19 @@ _0016: End _0022: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0035: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0048: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _005B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s index 4565d71ae0..c47f5cd8d5 100644 --- a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s +++ b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s @@ -45,56 +45,26 @@ _00A5: GoToIfEq VAR_0x8008, 1, _00E5 GoToIfEq VAR_0x8008, 2, _00E5 GoToIfEq VAR_0x8008, 3, _00F8 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _00E5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _00F8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 10 End _010B: GoToIfEq VAR_UNK_0x4106, 1, _0158 GoToIfEq VAR_UNK_0x4106, 2, _0158 GoToIfEq VAR_UNK_0x4106, 3, _0145 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0145: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0158: @@ -126,12 +96,7 @@ _0158: End _01D9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 1 End _01EA: diff --git a/res/field/scripts/scripts_canalave_city_southeast_house.s b/res/field/scripts/scripts_canalave_city_southeast_house.s index f1082af23b..5da4a3f5ae 100644 --- a/res/field/scripts/scripts_canalave_city_southeast_house.s +++ b/res/field/scripts/scripts_canalave_city_southeast_house.s @@ -34,13 +34,7 @@ _005C: End _0066: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_canalave_library_1f.s b/res/field/scripts/scripts_canalave_library_1f.s index 04dfada74a..86efe937fa 100644 --- a/res/field/scripts/scripts_canalave_library_1f.s +++ b/res/field/scripts/scripts_canalave_library_1f.s @@ -54,21 +54,11 @@ _0078: EndMovement _0080: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 5 End _0091: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 6 End _00A2: diff --git a/res/field/scripts/scripts_canalave_library_2f.s b/res/field/scripts/scripts_canalave_library_2f.s index 448cbafac5..30857336cb 100644 --- a/res/field/scripts/scripts_canalave_library_2f.s +++ b/res/field/scripts/scripts_canalave_library_2f.s @@ -58,21 +58,11 @@ _0082: End _0090: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 3 End _00A1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 4 End _00B2: diff --git a/res/field/scripts/scripts_canalave_library_3f.s b/res/field/scripts/scripts_canalave_library_3f.s index 0009300d7e..7d318a69c6 100644 --- a/res/field/scripts/scripts_canalave_library_3f.s +++ b/res/field/scripts/scripts_canalave_library_3f.s @@ -571,12 +571,7 @@ _0694: End _06A2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 58 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 58 End .balign 4, 0 diff --git a/res/field/scripts/scripts_celestic_town.s b/res/field/scripts/scripts_celestic_town.s index 4f2f3adc79..94d3c012b5 100644 --- a/res/field/scripts/scripts_celestic_town.s +++ b/res/field/scripts/scripts_celestic_town.s @@ -263,43 +263,19 @@ _02FC: EndMovement _0304: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End _0317: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 12 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 12 End _032A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End _033D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 13 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 13 End _0350: @@ -307,21 +283,11 @@ _0350: End _0367: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 16 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 16 End _0378: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 17 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 17 End .balign 4, 0 diff --git a/res/field/scripts/scripts_celestic_town_cave.s b/res/field/scripts/scripts_celestic_town_cave.s index c96cd6a166..2187b89901 100644 --- a/res/field/scripts/scripts_celestic_town_cave.s +++ b/res/field/scripts/scripts_celestic_town_cave.s @@ -435,12 +435,7 @@ _057A: End _0585: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 12 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 12 End _0596: diff --git a/res/field/scripts/scripts_celestic_town_north_house.s b/res/field/scripts/scripts_celestic_town_north_house.s index 901e987d01..0b6b341740 100644 --- a/res/field/scripts/scripts_celestic_town_north_house.s +++ b/res/field/scripts/scripts_celestic_town_north_house.s @@ -63,33 +63,16 @@ _0099: End _00A1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _00B4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 10 End _00C5: BufferPlayerName 0 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End .balign 4, 0 diff --git a/res/field/scripts/scripts_celestic_town_northeast_house.s b/res/field/scripts/scripts_celestic_town_northeast_house.s index 387ed68a4c..5e2d6bbef1 100644 --- a/res/field/scripts/scripts_celestic_town_northeast_house.s +++ b/res/field/scripts/scripts_celestic_town_northeast_house.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_celestic_town_northwest_house.s b/res/field/scripts/scripts_celestic_town_northwest_house.s index 682f223e54..d5293c3dca 100644 --- a/res/field/scripts/scripts_celestic_town_northwest_house.s +++ b/res/field/scripts/scripts_celestic_town_northwest_house.s @@ -20,23 +20,11 @@ _0012: End _002B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End _0041: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_CELESTIC - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_CELESTIC End _0057: diff --git a/res/field/scripts/scripts_celestic_town_pokecenter_1f.s b/res/field/scripts/scripts_celestic_town_pokecenter_1f.s index ece9f80505..0759eeca5c 100644 --- a/res/field/scripts/scripts_celestic_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_celestic_town_pokecenter_1f.s @@ -13,23 +13,11 @@ _0012: End _001E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0031: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0044: diff --git a/res/field/scripts/scripts_celestic_town_southwest_house.s b/res/field/scripts/scripts_celestic_town_southwest_house.s index 9f713aa029..76470d1f64 100644 --- a/res/field/scripts/scripts_celestic_town_southwest_house.s +++ b/res/field/scripts/scripts_celestic_town_southwest_house.s @@ -28,14 +28,5 @@ _003A: End _0045: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_HAPPINY - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_HAPPINY, 2 End diff --git a/res/field/scripts/scripts_common.s b/res/field/scripts/scripts_common.s index 95e6aaa21c..6f1a427afc 100644 --- a/res/field/scripts/scripts_common.s +++ b/res/field/scripts/scripts_common.s @@ -1364,33 +1364,15 @@ _12A8: End CommonScript_Vent: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir End _12CD: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000213_00070 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000213_00070 End _12E0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000213_00071 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000213_00071 End _12F3: @@ -1457,13 +1439,7 @@ _139D: End _13AB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000213_00082 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000213_00082 End CommonScript_PrintPlateObtainedMessage: diff --git a/res/field/scripts/scripts_communication_club.s b/res/field/scripts/scripts_communication_club.s index db01fc2be6..c9c23755ca 100644 --- a/res/field/scripts/scripts_communication_club.s +++ b/res/field/scripts/scripts_communication_club.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: diff --git a/res/field/scripts/scripts_contest_hall_lobby.s b/res/field/scripts/scripts_contest_hall_lobby.s index dfce140bc3..db1d112f67 100644 --- a/res/field/scripts/scripts_contest_hall_lobby.s +++ b/res/field/scripts/scripts_contest_hall_lobby.s @@ -252,33 +252,15 @@ _031D: End _0328: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 21 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 21 End _033B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 22 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 22 End _034E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 23 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 23 End _0361: diff --git a/res/field/scripts/scripts_contest_hall_stage_no_contest.s b/res/field/scripts/scripts_contest_hall_stage_no_contest.s index 7952c25039..70ded256b4 100644 --- a/res/field/scripts/scripts_contest_hall_stage_no_contest.s +++ b/res/field/scripts/scripts_contest_hall_stage_no_contest.s @@ -9,43 +9,19 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0038: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _004B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_contest_registration.s b/res/field/scripts/scripts_contest_registration.s index a49b0caf8f..7c963ae902 100644 --- a/res/field/scripts/scripts_contest_registration.s +++ b/res/field/scripts/scripts_contest_registration.s @@ -164,13 +164,7 @@ _01E3: Return _01E9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _01FC: diff --git a/res/field/scripts/scripts_cycle_shop.s b/res/field/scripts/scripts_cycle_shop.s index 9889881f62..a69c7fa65c 100644 --- a/res/field/scripts/scripts_cycle_shop.s +++ b/res/field/scripts/scripts_cycle_shop.s @@ -32,16 +32,7 @@ _0052: End _005D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, 2 End _007C: @@ -63,21 +54,11 @@ _009A: End _00A5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 5 End _00B6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 6 End .balign 4, 0 diff --git a/res/field/scripts/scripts_distortion_world_1f.s b/res/field/scripts/scripts_distortion_world_1f.s index 311cf2ff70..31651cb14e 100644 --- a/res/field/scripts/scripts_distortion_world_1f.s +++ b/res/field/scripts/scripts_distortion_world_1f.s @@ -88,13 +88,7 @@ _011D: End _012A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End .balign 4, 0 diff --git a/res/field/scripts/scripts_distortion_world_b6f.s b/res/field/scripts/scripts_distortion_world_b6f.s index 667b62f1d5..b3f2d2fd9a 100644 --- a/res/field/scripts/scripts_distortion_world_b6f.s +++ b/res/field/scripts/scripts_distortion_world_b6f.s @@ -19,13 +19,7 @@ _0022: _0026: GoToIfEq VAR_DISTORTION_WORLD_PROGRESS, 7, _0080 GoToIfSet FLAG_DISTORTION_WORLD_PUZZLE_FINISHED, _0051 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0051: @@ -44,13 +38,7 @@ _0051: End _0080: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _0093: @@ -90,12 +78,7 @@ _00D5: End _00F6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 6 End .balign 4, 0 diff --git a/res/field/scripts/scripts_distortion_world_giratina_room.s b/res/field/scripts/scripts_distortion_world_giratina_room.s index c63d6fc5a8..601795678e 100644 --- a/res/field/scripts/scripts_distortion_world_giratina_room.s +++ b/res/field/scripts/scripts_distortion_world_giratina_room.s @@ -141,13 +141,7 @@ _0204: End _020A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 12 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 12 End _021D: diff --git a/res/field/scripts/scripts_eterna_city.s b/res/field/scripts/scripts_eterna_city.s index 8befefe795..4e7da8c53f 100644 --- a/res/field/scripts/scripts_eterna_city.s +++ b/res/field/scripts/scripts_eterna_city.s @@ -53,23 +53,11 @@ _00B5: Return _00BF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 25 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 25 End _00D2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 26 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 26 End _00E5: @@ -370,93 +358,40 @@ _04F0: EndMovement _04FC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 18 End _050F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 19 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 19 End _0522: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 20 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 20 End _0535: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 27 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 27 End _0548: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 28 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 28 End _055B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 29 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 29 End _056E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 42 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 42 End _057F: GoToIfSet FLAG_EXPLORER_KIT_RECEIVED, _059D - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 31 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 31 End _059D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 32 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 32 End _05B0: diff --git a/res/field/scripts/scripts_eterna_city_condominiums_2f.s b/res/field/scripts/scripts_eterna_city_condominiums_2f.s index 1b8cfea556..846d2d52ff 100644 --- a/res/field/scripts/scripts_eterna_city_condominiums_2f.s +++ b/res/field/scripts/scripts_eterna_city_condominiums_2f.s @@ -36,23 +36,11 @@ _005D: End _0068: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _007B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_eterna_city_condominiums_3f.s b/res/field/scripts/scripts_eterna_city_condominiums_3f.s index 57d48dc0e8..026f449381 100644 --- a/res/field/scripts/scripts_eterna_city_condominiums_3f.s +++ b/res/field/scripts/scripts_eterna_city_condominiums_3f.s @@ -9,43 +9,19 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0038: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _004B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_eterna_city_east_house.s b/res/field/scripts/scripts_eterna_city_east_house.s index a2c821da0b..71ba580aaf 100644 --- a/res/field/scripts/scripts_eterna_city_east_house.s +++ b/res/field/scripts/scripts_eterna_city_east_house.s @@ -8,23 +8,11 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0034: diff --git a/res/field/scripts/scripts_eterna_city_herb_shop.s b/res/field/scripts/scripts_eterna_city_herb_shop.s index 63604a985e..9fd9805c0d 100644 --- a/res/field/scripts/scripts_eterna_city_herb_shop.s +++ b/res/field/scripts/scripts_eterna_city_herb_shop.s @@ -18,23 +18,11 @@ EternaCityHerbShop_Vendor: End EternaCityHerbShop_ExpertF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message EternaCityHerbShop_Text_YourPokemonWontLikeThem - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage EternaCityHerbShop_Text_YourPokemonWontLikeThem End EternaCityHerbShop_ExpertM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message EternaCityHerbShop_Text_NonBitterWouldBeMedicalBreakthrough - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage EternaCityHerbShop_Text_NonBitterWouldBeMedicalBreakthrough End .balign 4, 0 diff --git a/res/field/scripts/scripts_eterna_city_mart.s b/res/field/scripts/scripts_eterna_city_mart.s index d3d6dc90b4..71c412218b 100644 --- a/res/field/scripts/scripts_eterna_city_mart.s +++ b/res/field/scripts/scripts_eterna_city_mart.s @@ -10,45 +10,21 @@ ScriptEntryEnd EternaCityMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End EternaCityMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_ETERNA_MART - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_ETERNA_MART End EternaCityMart_Guitarist: BufferItemName 0, ITEM_SUPER_POTION //Unused? BufferItemName 1, ITEM_TM03 //Unused? - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message EternaCityMart_Text_GardeniaIsTooMuch - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage EternaCityMart_Text_GardeniaIsTooMuch End EternaCityMart_Hiker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message EternaCityMart_Text_EscapeRopeIsIndispensable - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage EternaCityMart_Text_EscapeRopeIsIndispensable End .balign 4, 0 diff --git a/res/field/scripts/scripts_eterna_city_pokecenter_1f.s b/res/field/scripts/scripts_eterna_city_pokecenter_1f.s index e1f60decc3..1762f0d419 100644 --- a/res/field/scripts/scripts_eterna_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_eterna_city_pokecenter_1f.s @@ -14,13 +14,7 @@ _0016: End _0022: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0035: @@ -42,16 +36,7 @@ _0053: End _005E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_BUNEARY - Message 3 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_BUNEARY, 3 End _007D: diff --git a/res/field/scripts/scripts_eterna_city_pokecenter_2f.s b/res/field/scripts/scripts_eterna_city_pokecenter_2f.s index c7d3a2b19b..f468b1149c 100644 --- a/res/field/scripts/scripts_eterna_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_eterna_city_pokecenter_2f.s @@ -6,13 +6,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_eterna_city_underground_man_house.s b/res/field/scripts/scripts_eterna_city_underground_man_house.s index 1ff22a663a..f43c392ffc 100644 --- a/res/field/scripts/scripts_eterna_city_underground_man_house.s +++ b/res/field/scripts/scripts_eterna_city_underground_man_house.s @@ -439,13 +439,7 @@ _0620: EndMovement _0634: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 36 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 36 End _0647: @@ -468,12 +462,7 @@ _0669: End _0674: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 40 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 40 End _0685: @@ -533,13 +522,7 @@ _0741: End _0747: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 37 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 37 End .balign 4, 0 diff --git a/res/field/scripts/scripts_eterna_forest.s b/res/field/scripts/scripts_eterna_forest.s index d3450b29e9..7292be2d57 100644 --- a/res/field/scripts/scripts_eterna_forest.s +++ b/res/field/scripts/scripts_eterna_forest.s @@ -334,13 +334,7 @@ _03F5: End _03FE: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _0411: @@ -418,12 +412,7 @@ _04F7: End _050C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 10 End _051D: diff --git a/res/field/scripts/scripts_fight_area.s b/res/field/scripts/scripts_fight_area.s index 8b9c915ca0..e01e7933d2 100644 --- a/res/field/scripts/scripts_fight_area.s +++ b/res/field/scripts/scripts_fight_area.s @@ -391,73 +391,31 @@ FightArea_UnusedMovement5: EndMovement _049C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 31 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 31 End _04AF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 33 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 33 End _04C2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 34 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 34 End _04D5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 35 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 35 End _04E8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 36 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 36 End _04FB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 37 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 37 End _050E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 41 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 41 End _0521: @@ -671,23 +629,11 @@ _07D0: EndMovement _07DC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 29 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 29 End _07EF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 30 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 30 End _0802: @@ -732,53 +678,23 @@ _085C: EndMovement _0864: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 24 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 24 End _0877: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 25 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 25 End _088A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 26 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 26 End _089D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 27 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 27 End _08B0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 28 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 28 End .balign 0 diff --git a/res/field/scripts/scripts_fight_area_mart.s b/res/field/scripts/scripts_fight_area_mart.s index 9a444183a5..f054dffd99 100644 --- a/res/field/scripts/scripts_fight_area_mart.s +++ b/res/field/scripts/scripts_fight_area_mart.s @@ -9,13 +9,7 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End _0028: @@ -49,13 +43,7 @@ _007C: End _0086: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_fight_area_middle_house.s b/res/field/scripts/scripts_fight_area_middle_house.s index dcd781263d..fa49733466 100644 --- a/res/field/scripts/scripts_fight_area_middle_house.s +++ b/res/field/scripts/scripts_fight_area_middle_house.s @@ -8,33 +8,15 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0034: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_fight_area_pokecenter_1f.s b/res/field/scripts/scripts_fight_area_pokecenter_1f.s index ebb6fd5497..4d4602ea73 100644 --- a/res/field/scripts/scripts_fight_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_fight_area_pokecenter_1f.s @@ -13,33 +13,15 @@ _0012: End _001E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0031: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0044: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_fight_area_south_house.s b/res/field/scripts/scripts_fight_area_south_house.s index e66294f1d0..1d86432f57 100644 --- a/res/field/scripts/scripts_fight_area_south_house.s +++ b/res/field/scripts/scripts_fight_area_south_house.s @@ -9,36 +9,15 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0038: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_TORCHIC - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_TORCHIC, 2 End _0057: diff --git a/res/field/scripts/scripts_floaroma_meadow_house.s b/res/field/scripts/scripts_floaroma_meadow_house.s index 7f39d0956b..9eba86a6de 100644 --- a/res/field/scripts/scripts_floaroma_meadow_house.s +++ b/res/field/scripts/scripts_floaroma_meadow_house.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_floaroma_town.s b/res/field/scripts/scripts_floaroma_town.s index 87905c744a..7ba24be7a1 100644 --- a/res/field/scripts/scripts_floaroma_town.s +++ b/res/field/scripts/scripts_floaroma_town.s @@ -71,43 +71,19 @@ _00A4: EndMovement _00B0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _00C3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _00D6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _00E9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _00FC: diff --git a/res/field/scripts/scripts_floaroma_town_mart.s b/res/field/scripts/scripts_floaroma_town_mart.s index 69c0777708..e43e8ff15d 100644 --- a/res/field/scripts/scripts_floaroma_town_mart.s +++ b/res/field/scripts/scripts_floaroma_town_mart.s @@ -9,41 +9,17 @@ ScriptEntryEnd FloaromaTownMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End FloaromaTownMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_FLOAROMA - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_FLOAROMA End FloaromaTownMart_Beauty: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message FloaromaTownMart_Text_DressUpPokemonWithAccessories - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage FloaromaTownMart_Text_DressUpPokemonWithAccessories End FloaromaTownMart_SchoolGirl: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message FloaromaTownMart_Text_CantBuyBerriesAtMarts - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage FloaromaTownMart_Text_CantBuyBerriesAtMarts End diff --git a/res/field/scripts/scripts_floaroma_town_middle_house.s b/res/field/scripts/scripts_floaroma_town_middle_house.s index 9ca5811015..6d78916a34 100644 --- a/res/field/scripts/scripts_floaroma_town_middle_house.s +++ b/res/field/scripts/scripts_floaroma_town_middle_house.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: @@ -60,14 +54,5 @@ _009F: End _00A9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message 5 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, 5 End diff --git a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s index 79ed958d12..bcb0d11f37 100644 --- a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s @@ -13,23 +13,11 @@ _0012: End _001E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0031: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0044: diff --git a/res/field/scripts/scripts_floaroma_town_southeast_house.s b/res/field/scripts/scripts_floaroma_town_southeast_house.s index e166bf3ff0..bbd2f2ff58 100644 --- a/res/field/scripts/scripts_floaroma_town_southeast_house.s +++ b/res/field/scripts/scripts_floaroma_town_southeast_house.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_foreign_building.s b/res/field/scripts/scripts_foreign_building.s index 5a20138033..e00ded3fbd 100644 --- a/res/field/scripts/scripts_foreign_building.s +++ b/res/field/scripts/scripts_foreign_building.s @@ -14,93 +14,39 @@ ScriptEntryEnd _0026: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0039: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _004C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _005F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0072: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0085: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _0098: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _00AB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _00BE: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End .balign 4, 0 diff --git a/res/field/scripts/scripts_galactic_hq_1f.s b/res/field/scripts/scripts_galactic_hq_1f.s index 1ae77c028d..9de204d231 100644 --- a/res/field/scripts/scripts_galactic_hq_1f.s +++ b/res/field/scripts/scripts_galactic_hq_1f.s @@ -89,13 +89,7 @@ _00C1: End _00CC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _00DF: @@ -149,12 +143,7 @@ _016C: EndMovement _0174: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 12 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 12 End .balign 4, 0 diff --git a/res/field/scripts/scripts_galactic_hq_2f.s b/res/field/scripts/scripts_galactic_hq_2f.s index b970c925fc..1fef040bae 100644 --- a/res/field/scripts/scripts_galactic_hq_2f.s +++ b/res/field/scripts/scripts_galactic_hq_2f.s @@ -43,48 +43,23 @@ _0074: End _007A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 7 End _008B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 8 End _009C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 9 End _00AD: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 10 End _00BE: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 11 End _00CF: diff --git a/res/field/scripts/scripts_galactic_hq_3f.s b/res/field/scripts/scripts_galactic_hq_3f.s index f188aeaeb0..aa52263083 100644 --- a/res/field/scripts/scripts_galactic_hq_3f.s +++ b/res/field/scripts/scripts_galactic_hq_3f.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: @@ -68,12 +62,7 @@ _00B0: EndMovement _00B8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 4 End .balign 4, 0 diff --git a/res/field/scripts/scripts_galactic_hq_4f.s b/res/field/scripts/scripts_galactic_hq_4f.s index a1dd02e963..6c930d9b00 100644 --- a/res/field/scripts/scripts_galactic_hq_4f.s +++ b/res/field/scripts/scripts_galactic_hq_4f.s @@ -150,12 +150,7 @@ _01BC: EndMovement _01C4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 8 End _01D5: diff --git a/res/field/scripts/scripts_galactic_hq_b1f.s b/res/field/scripts/scripts_galactic_hq_b1f.s index 16b91a9625..483ed5b5a7 100644 --- a/res/field/scripts/scripts_galactic_hq_b1f.s +++ b/res/field/scripts/scripts_galactic_hq_b1f.s @@ -6,13 +6,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_galactic_hq_b2f.s b/res/field/scripts/scripts_galactic_hq_b2f.s index 2c157f9bce..8939e63aed 100644 --- a/res/field/scripts/scripts_galactic_hq_b2f.s +++ b/res/field/scripts/scripts_galactic_hq_b2f.s @@ -8,23 +8,11 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0034: diff --git a/res/field/scripts/scripts_galactic_hq_control_room.s b/res/field/scripts/scripts_galactic_hq_control_room.s index 6b38799162..3238d03f7c 100644 --- a/res/field/scripts/scripts_galactic_hq_control_room.s +++ b/res/field/scripts/scripts_galactic_hq_control_room.s @@ -325,33 +325,15 @@ _03BC: EndMovement _03C4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 13 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 13 End _03D7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End _03EA: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 15 End _03FD: diff --git a/res/field/scripts/scripts_galactic_hq_laboratory.s b/res/field/scripts/scripts_galactic_hq_laboratory.s index 97b01e9527..a4c5ced8a9 100644 --- a/res/field/scripts/scripts_galactic_hq_laboratory.s +++ b/res/field/scripts/scripts_galactic_hq_laboratory.s @@ -8,32 +8,15 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0034: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_game_corner.s b/res/field/scripts/scripts_game_corner.s index 43605500e4..2052faeeb2 100644 --- a/res/field/scripts/scripts_game_corner.s +++ b/res/field/scripts/scripts_game_corner.s @@ -226,13 +226,7 @@ GameCorner_CoinsClerk_SaveTM64: End GameCorner_LadyExplainSlotMachines: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message GameCorner_Text_IllEplainHowTheSlotMachinesWorkAtThisGameCorner - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage GameCorner_Text_IllEplainHowTheSlotMachinesWorkAtThisGameCorner End GameCorner_OldMan20Coins: @@ -302,64 +296,30 @@ GameCorner_Farmer_CannotAddCoins: End GameCorner_Worker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message GameCorner_Text_IWantCoinsOfCourse - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage GameCorner_Text_IWantCoinsOfCourse End GameCorner_LadyPokeBalls: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message GameCorner_Text_WhenAPokeBallAppears - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage GameCorner_Text_WhenAPokeBallAppears End GameCorner_Guitarist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message GameCorner_Text_AFriendInMyGroupScoredATonOfCoinsHere - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage GameCorner_Text_AFriendInMyGroupScoredATonOfCoinsHere End GameCorner_MaylenesDad: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message GameCorner_Text_SighNothingGoingMyWayToday - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage GameCorner_Text_SighNothingGoingMyWayToday End GameCorner_SignBonusRounds: GoToIfGt VAR_CONSECUTIVE_BONUS_ROUND_WINS, 999, GameCorner_SignBonusRounds_GreaterThan999 BufferNumber 0, VAR_CONSECUTIVE_BONUS_ROUND_WINS - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message GameCorner_Text_ShootFor10 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage GameCorner_Text_ShootFor10 End GameCorner_SignBonusRounds_GreaterThan999: BufferNumber 0, 999 - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message GameCorner_Text_ShootFor10 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage GameCorner_Text_ShootFor10 End GameCorner_Looker: diff --git a/res/field/scripts/scripts_global_terminal_1f.s b/res/field/scripts/scripts_global_terminal_1f.s index 37faaafe72..b75605613a 100644 --- a/res/field/scripts/scripts_global_terminal_1f.s +++ b/res/field/scripts/scripts_global_terminal_1f.s @@ -264,83 +264,35 @@ GlobalTerminal1f_GTS_Exit_BadEgg: End _0374: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00010 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00010 End _0387: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00011 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00011 End _039A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00012 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00012 End _03AD: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00013 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00013 End _03C0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00014 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00014 End _03D3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00015 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00015 End _03E6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00016 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00016 End _03F9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00017 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00017 End _040C: @@ -424,23 +376,11 @@ _0515: End _0520: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00032 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00032 End _0533: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message pl_msg_00000046_00033 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage pl_msg_00000046_00033 End _0546: @@ -590,12 +530,7 @@ _074A: Return _074C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message pl_msg_00000046_00041 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage pl_msg_00000046_00041 End .balign 4, 0 diff --git a/res/field/scripts/scripts_global_terminal_2f.s b/res/field/scripts/scripts_global_terminal_2f.s index a176161f15..10936c512f 100644 --- a/res/field/scripts/scripts_global_terminal_2f.s +++ b/res/field/scripts/scripts_global_terminal_2f.s @@ -19,111 +19,47 @@ ScriptEntryEnd _003A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _004D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0060: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0073: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0086: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0099: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _00AC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _00BF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _00D2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _00E5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 9 End _00F6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 10 End _0107: diff --git a/res/field/scripts/scripts_global_terminal_3f.s b/res/field/scripts/scripts_global_terminal_3f.s index 9121597512..2be965f110 100644 --- a/res/field/scripts/scripts_global_terminal_3f.s +++ b/res/field/scripts/scripts_global_terminal_3f.s @@ -18,111 +18,47 @@ ScriptEntryEnd _0036: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0049: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _005C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _006F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0082: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0095: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _00A8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _00BB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _00CE: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _00E1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 9 End _00F2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 10 End _0103: diff --git a/res/field/scripts/scripts_grand_lake_route_213_lobby.s b/res/field/scripts/scripts_grand_lake_route_213_lobby.s index 958cc930f6..4ac3bee5d3 100644 --- a/res/field/scripts/scripts_grand_lake_route_213_lobby.s +++ b/res/field/scripts/scripts_grand_lake_route_213_lobby.s @@ -31,13 +31,7 @@ _0014: End _004C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _005F: diff --git a/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s b/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s index 0be1c36c52..9c48b040ff 100644 --- a/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s +++ b/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s @@ -88,13 +88,7 @@ _012F: End _013A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End .balign 4, 0 diff --git a/res/field/scripts/scripts_great_marsh_1.s b/res/field/scripts/scripts_great_marsh_1.s index 8793af1409..174a0a3f38 100644 --- a/res/field/scripts/scripts_great_marsh_1.s +++ b/res/field/scripts/scripts_great_marsh_1.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_great_marsh_2.s b/res/field/scripts/scripts_great_marsh_2.s index 5a7651b157..216293a67b 100644 --- a/res/field/scripts/scripts_great_marsh_2.s +++ b/res/field/scripts/scripts_great_marsh_2.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_great_marsh_3.s b/res/field/scripts/scripts_great_marsh_3.s index 808ba20806..e9e0b24a07 100644 --- a/res/field/scripts/scripts_great_marsh_3.s +++ b/res/field/scripts/scripts_great_marsh_3.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_great_marsh_4.s b/res/field/scripts/scripts_great_marsh_4.s index 74c152f066..112eb0260a 100644 --- a/res/field/scripts/scripts_great_marsh_4.s +++ b/res/field/scripts/scripts_great_marsh_4.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_great_marsh_5.s b/res/field/scripts/scripts_great_marsh_5.s index 17642299a9..d8e9aa825b 100644 --- a/res/field/scripts/scripts_great_marsh_5.s +++ b/res/field/scripts/scripts_great_marsh_5.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_hearthome_city.s b/res/field/scripts/scripts_hearthome_city.s index eb1311ed16..07b14735e1 100644 --- a/res/field/scripts/scripts_hearthome_city.s +++ b/res/field/scripts/scripts_hearthome_city.s @@ -41,96 +41,39 @@ _0082: End _0084: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _0097: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _00AA: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 23 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 23 End _00BD: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _00D0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _00E3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End _00F6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 13 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 13 End _0109: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 21 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 21 End _011C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PACHIRISU - Message 22 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PACHIRISU, 22 End _013B: @@ -266,32 +209,15 @@ _02C4: EndMovement _02E4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 19 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 19 End _02F7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 12 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 12 End _030A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 20 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 20 End _031B: @@ -498,42 +424,19 @@ _06FE: End _0709: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 47 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 47 End _071C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 48 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 48 End _072D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 49 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 49 End _0740: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 50 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 50 End _0753: @@ -664,33 +567,15 @@ _095A: End _0971: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0984: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 10 End _0997: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 51 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 51 End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s b/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s index 890b5840ab..b8fa39ba76 100644 --- a/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s +++ b/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s @@ -18,23 +18,11 @@ _0027: End _002D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0040: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_mart.s b/res/field/scripts/scripts_hearthome_city_mart.s index f99a58135c..e0492e69c4 100644 --- a/res/field/scripts/scripts_hearthome_city_mart.s +++ b/res/field/scripts/scripts_hearthome_city_mart.s @@ -9,41 +9,17 @@ ScriptEntryEnd HearthomeCityMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End HearthomeCityMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_HEARTHOME - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_HEARTHOME End HearthomeCityMart_Hiker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message HearthomeCityMart_Text_CantBuyRevivesWithTwoBadges - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage HearthomeCityMart_Text_CantBuyRevivesWithTwoBadges End HearthomeCityMart_Beauty: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message HearthomeCityMart_Text_FindAccessoriesInAmitySquare - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage HearthomeCityMart_Text_FindAccessoriesInAmitySquare End diff --git a/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s b/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s index c0b96325bc..80bf7b672c 100644 --- a/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s +++ b/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s @@ -14,95 +14,39 @@ ScriptEntryEnd _0026: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0039: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 1 End _004A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _005D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0070: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0083: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _0096: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _00A9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _00BC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message 8 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, 8 End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s b/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s index 8b585e3af9..ad7b72331a 100644 --- a/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s +++ b/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s @@ -9,43 +9,19 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0038: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _004B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s index 786e9b965e..fd1c81fed7 100644 --- a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s @@ -13,33 +13,15 @@ _0012: End _001E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0031: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0044: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s b/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s index a6409a9190..0bdc9c2f6e 100644 --- a/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s +++ b/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s @@ -117,42 +117,15 @@ _014A: End _0155: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PSYDUCK - Message 11 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PSYDUCK, 11 End _0174: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_BUNEARY - Message 12 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_BUNEARY, 12 End _0193: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message 13 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, 13 End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s b/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s index 23a1e235ed..0f2735d780 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s @@ -9,46 +9,19 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0038: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _004B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_SHROOMISH - Message 3 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_SHROOMISH, 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s b/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s index c049c650e8..682a6428b0 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s @@ -37,16 +37,7 @@ _0064: End _006E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s b/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s index e2670811c7..e9472f300a 100644 --- a/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s +++ b/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s @@ -19,36 +19,15 @@ _002B: End _0031: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0044: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0057: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index 9d8054d24a..ebbd3e2e97 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -457,13 +457,7 @@ JubilifeCity_HaveYouPaidAVisitToTheTVStation: End JubilifeCity_AceTrainerM3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCity_Text_PastHereIsTheGlobalTerminal - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCity_Text_PastHereIsTheGlobalTerminal End JubilifeCity_TriggerGTSGreeterBlockPlayer: @@ -1254,33 +1248,15 @@ JubilifeCity_APersonThatLikesTheWaterTypeMustBeSomewhatCool: End JubilifeCity_Twin: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCity_Text_DidYouSeeMeOnTV - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCity_Text_DidYouSeeMeOnTV End JubilifeCity_AceTrainerM1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCity_Text_HiyaWheredYouComeFrom - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCity_Text_HiyaWheredYouComeFrom End JubilifeCity_AceTrainerF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCity_Text_WhenYouWalkWithYourPokemonTheyGraduallyGrowFriendlier - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCity_Text_WhenYouWalkWithYourPokemonTheyGraduallyGrowFriendlier End JubilifeCity_ExpertM1: @@ -1308,13 +1284,7 @@ JubilifeCity_OhYoureNotKnowledgeable: End JubilifeCity_SchoolKidM2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCity_Text_AtMostYouCanHaveSixPokemonWithYou - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCity_Text_AtMostYouCanHaveSixPokemonWithYou End JubilifeCity_MapSign: @@ -1650,23 +1620,11 @@ JubilifeCity_YouShouldStickAround: End JubilifeCity_KidWithNDS1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCity_Text_ImTradingPokemonWithMyBuddy - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCity_Text_ImTradingPokemonWithMyBuddy End JubilifeCity_KidWithNDS2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCity_TextIMadeMyPokemonHoldAnItemBeforeTradingIt - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCity_TextIMadeMyPokemonHoldAnItemBeforeTradingIt End JubilifeCity_TriggerLookerPalPad: diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s index 812ff56860..f0bb343572 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s @@ -9,39 +9,15 @@ ScriptEntryEnd JubilifeCityCondominiums1F_ExpertF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityCondominiums1F_Text_IsntMyPoketchQuiteFetching - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityCondominiums1F_Text_IsntMyPoketchQuiteFetching End JubilifeCityCondominiums1F_Pikachu: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message JubilifeCityCondominiums1F_Text_PiikaPi - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, JubilifeCityCondominiums1F_Text_PiikaPi End JubilifeCityCondominiums1F_Pachirisu: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PACHIRISU - Message JubilifeCityCondominiums1F_Text_Pachipachii - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PACHIRISU, JubilifeCityCondominiums1F_Text_Pachipachii End JubilifeCityCondominiums1F_Beauty: diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s index c19ed61c2b..8e5651c160 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s @@ -7,21 +7,9 @@ ScriptEntryEnd JubilifeCityCondominiums2F_BugCatcher: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityCondominiums2F_Text_ILikeHowPokemonCanUseAttacks - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityCondominiums2F_Text_ILikeHowPokemonCanUseAttacks End JubilifeCityCondominiums2F_PokemonBreederM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityCondominiums2F_Text_DidYouBuySomeHealBallsAtThePokeMart - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityCondominiums2F_Text_DidYouBuySomeHealBallsAtThePokeMart End diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s index f2339920f6..76fd7cb792 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s @@ -7,21 +7,9 @@ ScriptEntryEnd JubilifeCityCondominiums3F_Collector: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityCondominiums3F_Text_ICanTradePokemonAroundTheWorldUsingNintendoWFC - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityCondominiums3F_Text_ICanTradePokemonAroundTheWorldUsingNintendoWFC End JubilifeCityCondominiums3F_Lass: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityCondominiums3F_Text_TheWorldYouCanReachWithNintendoWFC - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityCondominiums3F_Text_TheWorldYouCanReachWithNintendoWFC End diff --git a/res/field/scripts/scripts_jubilife_city_mart.s b/res/field/scripts/scripts_jubilife_city_mart.s index 2210b3ae4e..a8cbc16625 100644 --- a/res/field/scripts/scripts_jubilife_city_mart.s +++ b/res/field/scripts/scripts_jubilife_city_mart.s @@ -10,53 +10,23 @@ ScriptEntryEnd JubilifeCityMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End JubilifeCityMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_JUBILIFE - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_JUBILIFE End JubilifeCityMart_Guitarist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityMart_Text_WastedMoneyOnPokeBalls - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityMart_Text_WastedMoneyOnPokeBalls End JubilifeCityMart_Pokefan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityMart_Text_PackSomePotions - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityMart_Text_PackSomePotions End JubilifeCityMart_Beauty: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityMart_Text_JustUseARepel - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityMart_Text_JustUseARepel End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s index ffe4ff6a0b..9bdc187ab8 100644 --- a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s @@ -14,33 +14,15 @@ JubilifeCityPokecenter1F_Nurse: End JubilifeCityPokecenter1F_Twin: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityPokecenter1F_Text_AllTypesHaveStrengthsAndWeaknesses - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityPokecenter1F_Text_AllTypesHaveStrengthsAndWeaknesses End JubilifeCityPokecenter1F_SchoolKidM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityPokecenter1F_Text_InTheUnionRoomUpstairsYouCanChatAndTradeWithOtherPeople - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityPokecenter1F_Text_InTheUnionRoomUpstairsYouCanChatAndTradeWithOtherPeople End JubilifeCityPokecenter1F_TrainerF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCityPokecenter1F_Text_YouCanStillCatchAPokemonIfYouAlreadyHaveSixTravelingWithYou - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCityPokecenter1F_Text_YouCanStillCatchAPokemonIfYouAlreadyHaveSixTravelingWithYou End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_south_house_1f.s b/res/field/scripts/scripts_jubilife_city_south_house_1f.s index b12049b923..c230468ce0 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_1f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_1f.s @@ -8,36 +8,15 @@ ScriptEntryEnd JubilifeCitySouthHouse1F_AceTrainerM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthHouse1F_PokemonAreWonderfulDeeplyMysteriousCreatures - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthHouse1F_PokemonAreWonderfulDeeplyMysteriousCreatures End JubilifeCitySouthHouse1F_Lass: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthHouse1F_TalkToEveryoneYouSee - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthHouse1F_TalkToEveryoneYouSee End JubilifeCitySouthHouse1F_Pachirisu: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PACHIRISU - Message JubilifeCitySouthHouse1F_PachirisuKukkuuh - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PACHIRISU, JubilifeCitySouthHouse1F_PachirisuKukkuuh End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_south_house_2f.s b/res/field/scripts/scripts_jubilife_city_south_house_2f.s index d9c5d2f638..cbdd29869c 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_2f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_2f.s @@ -8,33 +8,15 @@ ScriptEntryEnd JubilifeCitySouthHouse2F_Youngster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthHouse2F_SomeKindsOfPokemonEvolveWhenTheyGetStrongerFromBattling - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthHouse2F_SomeKindsOfPokemonEvolveWhenTheyGetStrongerFromBattling End JubilifeCitySouthHouse2F_PokefanF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthHouse2F_EvolutionMakesPokemonJustThatMuchMoreFascinating - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthHouse2F_EvolutionMakesPokemonJustThatMuchMoreFascinating End JubilifeCitySouthHouse2F_PokemonBreederF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthHouse2F_DidntProfRowanConductResearchWithProfOak - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthHouse2F_DidntProfRowanConductResearchWithProfOak End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_south_house_3f.s b/res/field/scripts/scripts_jubilife_city_south_house_3f.s index 754901a76c..8887e5c872 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_3f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_3f.s @@ -6,13 +6,7 @@ ScriptEntryEnd JubilifeCitySouthHouse3F_PokefanM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthHouse3F_WhenIGiveMyPokemonNicknamesItsLikeTheyreMyVeryOwn - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthHouse3F_WhenIGiveMyPokemonNicknamesItsLikeTheyreMyVeryOwn End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s index 226da2913d..2c9c0dcfdd 100644 --- a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s +++ b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s @@ -8,36 +8,15 @@ ScriptEntryEnd JubilifeCitySouthwestHouse1F_Youngster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthwestHouse1F_Text_IGotMyPikachuThroughATradeFromSomeone - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthwestHouse1F_Text_IGotMyPikachuThroughATradeFromSomeone End JubilifeCitySouthwestHouse1F_Pikachu: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message JubilifeCitySouthwestHouse1F_Text_PikachuPikapikapikaaah - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, JubilifeCitySouthwestHouse1F_Text_PikachuPikapikapikaaah End JubilifeCitySouthwestHouse1F_MiddleAgedMan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthwestHouse1F_Text_IfEveryoneAroundTheWorldHadPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthwestHouse1F_Text_IfEveryoneAroundTheWorldHadPokemon End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s index f6ee25aad7..790bbad7ad 100644 --- a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s +++ b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s @@ -9,43 +9,19 @@ ScriptEntryEnd JubilifeCitySouthwestHouse2F_AceTrainerM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthwestHouse2F_Text_WeComeFromFarawayLand - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthwestHouse2F_Text_WeComeFromFarawayLand End JubilifeCitySouthwestHouse2F_Beauty: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemonIGetFromFriendInTrade - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemonIGetFromFriendInTrade End JubilifeCitySouthwestHouse2F_Collector: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthwestHouse2F_Text_YouCanTradePokemonWithPeopleAroundTheWorldOnNintendoWFC - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthwestHouse2F_Text_YouCanTradePokemonWithPeopleAroundTheWorldOnNintendoWFC End JubilifeCitySouthwestHouse2F_Lass: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeCitySouthwestHouse2F_Text_WhenYouConnectWithPeopleOnNintendoWFCItsHardToBe - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeCitySouthwestHouse2F_Text_WhenYouConnectWithPeopleOnNintendoWFCItsHardToBe End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_1.s b/res/field/scripts/scripts_jubilife_city_unknown_house_1.s index 8ae79632ab..45c3869557 100644 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_1.s +++ b/res/field/scripts/scripts_jubilife_city_unknown_house_1.s @@ -6,13 +6,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_2.s b/res/field/scripts/scripts_jubilife_city_unknown_house_2.s index 535a6fffc6..27a07f49f0 100644 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_2.s +++ b/res/field/scripts/scripts_jubilife_city_unknown_house_2.s @@ -6,13 +6,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_3.s b/res/field/scripts/scripts_jubilife_city_unknown_house_3.s index 8e77d030d1..67dc52480d 100644 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_3.s +++ b/res/field/scripts/scripts_jubilife_city_unknown_house_3.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_4.s b/res/field/scripts/scripts_jubilife_city_unknown_house_4.s index d9fb975a50..a760672854 100644 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_4.s +++ b/res/field/scripts/scripts_jubilife_city_unknown_house_4.s @@ -6,13 +6,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_1f.s b/res/field/scripts/scripts_jubilife_tv_1f.s index 4f7c9b8c35..3d26968f80 100644 --- a/res/field/scripts/scripts_jubilife_tv_1f.s +++ b/res/field/scripts/scripts_jubilife_tv_1f.s @@ -20,13 +20,7 @@ JubilifeTV1F_Unused1: End JubilifeTV1F_GymGuide: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV1F_Text_WhyDontYouTryDressingUpYourPokemonNow - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV1F_Text_WhyDontYouTryDressingUpYourPokemonNow End JubilifeTV1F_Unused2: @@ -184,36 +178,18 @@ JubilifeTV1F_PleaseDoVisitAgain: End JubilifeTV1F_Beauty: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV1F_Text_TheyKeepTrackOfOfficialRecordsHere - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV1F_Text_TheyKeepTrackOfOfficialRecordsHere End JubilifeTV1F_MiddleAgedMan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV1F_Text_ImGoingToGetCommercialsShownOnTV - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV1F_Text_ImGoingToGetCommercialsShownOnTV End JubilifeTV1F_Unused3: End JubilifeTV1F_AceTrainerM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV1F_Text_TheTVStationInterviewsAllSortsOfTrainersForItsShows - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV1F_Text_TheTVStationInterviewsAllSortsOfTrainersForItsShows End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_2f.s b/res/field/scripts/scripts_jubilife_tv_2f.s index 2e701eb067..bf53b873d3 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f.s +++ b/res/field/scripts/scripts_jubilife_tv_2f.s @@ -19,13 +19,7 @@ JubilifeTV2F_SetFlagHideJubilifeTV2FReporter: End JubilifeTV2F_Idol: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV2F_Text_WhatAccessoriesWillGoWellWithMyDressToday - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV2F_Text_WhatAccessoriesWillGoWellWithMyDressToday End JubilifeTV2F_GymGuide: @@ -68,13 +62,7 @@ JubilifeTV2F_SetAccessoryPiplupMask: Return JubilifeTV2F_Roughneck: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV2F_Text_TheRoomAtTheBackIsOurDreamyFittingRoom - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV2F_Text_TheRoomAtTheBackIsOurDreamyFittingRoom End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s index 7100e25bfe..631a3d1f3c 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s @@ -446,21 +446,9 @@ JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto: End JubilifeTV2FGallery_PokemonBreederM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV2FGallery_Text_TheyDisplayPhotosFromTrainersYouBeenMixinRecordsWithRight - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV2FGallery_Text_TheyDisplayPhotosFromTrainersYouBeenMixinRecordsWithRight End JubilifeTV2FGallery_Twin: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV2FGallery_Text_SomeoneGaveMeANewBackdropWhenIWentToTheGlobalTerminal - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV2FGallery_Text_SomeoneGaveMeANewBackdropWhenIWentToTheGlobalTerminal End diff --git a/res/field/scripts/scripts_jubilife_tv_3f.s b/res/field/scripts/scripts_jubilife_tv_3f.s index 99dee39ecf..4e1f49d53c 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f.s +++ b/res/field/scripts/scripts_jubilife_tv_3f.s @@ -37,23 +37,11 @@ JubilifeTV3F_Movement_BeautyFaceWestGlobalRankingRoom: EndMovement JubilifeTV3F_Beauty2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3F_Text_TheMoreTradesIMakeTheBetterMyOddsOfWinningThePokemonLottery - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3F_Text_TheMoreTradesIMakeTheBetterMyOddsOfWinningThePokemonLottery End JubilifeTV3F_GymGuide1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3F_Text_RecordsAreFineThings - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3F_Text_RecordsAreFineThings End JubilifeTV3F_GymGuide2: diff --git a/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s b/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s index 948d1964cf..d1a90e3d46 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s +++ b/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s @@ -33,41 +33,17 @@ JubilifeTV3FGlobalRankingRoom_RecordMachineContests: End JubilifeTV3FGlobalRankingRoom_AceTrainerF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3FGlobalRankingRoom_Text_SomeoneBrokeMyPokemonCatchingRecord - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3FGlobalRankingRoom_Text_SomeoneBrokeMyPokemonCatchingRecord End JubilifeTV3FGlobalRankingRoom_Collector: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3FGlobalRankingRoom_Text_IBetItdFeelGreatIfICouldBeNumberOneHere - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3FGlobalRankingRoom_Text_IBetItdFeelGreatIfICouldBeNumberOneHere End JubilifeTV3FGlobalRankingRoom_Fisherman: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3FGlobalRankingRoom_Text_ImTryingForTheWorldRecordAtPokemonFishing - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3FGlobalRankingRoom_Text_ImTryingForTheWorldRecordAtPokemonFishing End JubilifeTV3FGlobalRankingRoom_Worker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3FGlobalRankingRoom_Text_SorryImStillFineTuningThisThingyHere - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3FGlobalRankingRoom_Text_SorryImStillFineTuningThisThingyHere End diff --git a/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s b/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s index 5b0f3bd93b..51dbc9c65a 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s +++ b/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s @@ -32,33 +32,15 @@ JubilifeTV3FGroupRankingRoom_RecordMachineContests: End JubilifeTV3FGroupRankingRoom_Youngster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3FGroupRankingRoom_Text_YouCanSeeTheRankingsOfPeopleInYourGroupHere - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3FGroupRankingRoom_Text_YouCanSeeTheRankingsOfPeopleInYourGroupHere End JubilifeTV3FGroupRankingRoom_BattleGirl: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3FGroupRankingRoom_Text_TheseRankingsAreNifty - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3FGroupRankingRoom_Text_TheseRankingsAreNifty End JubilifeTV3FGroupRankingRoom_Worker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV3FGroupRankingRoom_Text_SorryImStillFineTuningThisThingyHere - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV3FGroupRankingRoom_Text_SorryImStillFineTuningThisThingyHere End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_4f.s b/res/field/scripts/scripts_jubilife_tv_4f.s index 83b167ea3b..6b54fa97b0 100644 --- a/res/field/scripts/scripts_jubilife_tv_4f.s +++ b/res/field/scripts/scripts_jubilife_tv_4f.s @@ -8,33 +8,15 @@ ScriptEntryEnd JubilifeTV4F_MiddleAgedMan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV4F_Text_YourExploitsAreFantastic - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV4F_Text_YourExploitsAreFantastic End JubilifeTV4F_Receptionist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV4F_Text_ParticipationForAllIsOurTVNetworksMotto - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV4F_Text_ParticipationForAllIsOurTVNetworksMotto End JubilifeTV4F_PokemonBreederF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message JubilifeTV4F_Text_WerePromotingTheThemeSmilesAreDreamy - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage JubilifeTV4F_Text_WerePromotingTheThemeSmilesAreDreamy End .balign 4, 0 diff --git a/res/field/scripts/scripts_lake_valor_drained.s b/res/field/scripts/scripts_lake_valor_drained.s index f1acf9f1c9..b4f49e4b8d 100644 --- a/res/field/scripts/scripts_lake_valor_drained.s +++ b/res/field/scripts/scripts_lake_valor_drained.s @@ -9,46 +9,19 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0038: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _004B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_MAGIKARP, 11 - Message 3 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_MAGIKARP, 3, 11 End .balign 4, 0 diff --git a/res/field/scripts/scripts_lake_verity.s b/res/field/scripts/scripts_lake_verity.s index 68ce5aa284..6b39215424 100644 --- a/res/field/scripts/scripts_lake_verity.s +++ b/res/field/scripts/scripts_lake_verity.s @@ -260,12 +260,7 @@ LakeVerity_Movement_PlayerFaceWest: EndMovement LakeVerity_GruntM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message LakeVerity_Text_OuchWhatsWithThisOldTimer - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage LakeVerity_Text_OuchWhatsWithThisOldTimer End .balign 4, 0 diff --git a/res/field/scripts/scripts_maniac_tunnel.s b/res/field/scripts/scripts_maniac_tunnel.s index 5eb7853ab6..d22e77e790 100644 --- a/res/field/scripts/scripts_maniac_tunnel.s +++ b/res/field/scripts/scripts_maniac_tunnel.s @@ -11,13 +11,7 @@ _000A: End _0010: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_mining_museum.s b/res/field/scripts/scripts_mining_museum.s index e3eff4054c..3a60abc064 100644 --- a/res/field/scripts/scripts_mining_museum.s +++ b/res/field/scripts/scripts_mining_museum.s @@ -21,13 +21,7 @@ ScriptEntryEnd MiningMuseum_Welcome: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message MiningMuseum_Text_Welcome - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage MiningMuseum_Text_Welcome End MiningMuseum_FossilResearcher: @@ -283,135 +277,59 @@ MiningMuseum_NotYetReady: End MiningMuseum_CoalExhibit1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message MiningMuseum_Text_CoalExhibit1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage MiningMuseum_Text_CoalExhibit1 End MiningMuseum_CoalExhibit2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message MiningMuseum_Text_CoalExhibit2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage MiningMuseum_Text_CoalExhibit2 End MiningMuseum_MineUnderSea: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message MiningMuseum_Text_MineExtendsUnderSea - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage MiningMuseum_Text_MineExtendsUnderSea End MiningMuseum_HowCoalIsMade1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message MiningMuseum_Text_HowCoalIsMade1 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage MiningMuseum_Text_HowCoalIsMade1 End MiningMuseum_HowCoalIsMade2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message MiningMuseum_Text_HowCoalIsMade2 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage MiningMuseum_Text_HowCoalIsMade2 End MiningMuseum_HowCoalIsMade3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message MiningMuseum_Text_HowCoalIsMade3 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage MiningMuseum_Text_HowCoalIsMade3 End MiningMuseum_CoalSamplesDisplay: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message MiningMuseum_Text_CoalSamplesDisplay - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage MiningMuseum_Text_CoalSamplesDisplay End MiningMuseum_CoalSamplesBox: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message MiningMuseum_Text_CoalSamplesBox - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage MiningMuseum_Text_CoalSamplesBox End MiningMuseum_MiningLamps: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message MiningMuseum_Text_MiningLamps - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage MiningMuseum_Text_MiningLamps End MiningMuseum_MiningTools: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message MiningMuseum_Text_MiningTools - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage MiningMuseum_Text_MiningTools End MiningMuseum_MineWorkerItems: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message MiningMuseum_Text_MineWorkerItems - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage MiningMuseum_Text_MineWorkerItems End MiningMuseum_UndergroundManInfo: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message MiningMuseum_Text_UndergroundManInfo - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage MiningMuseum_Text_UndergroundManInfo End MiningMuseum_MiningRequiresStrongMind: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message MiningMuseum_Text_MiningRequiresStrongMind - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage MiningMuseum_Text_MiningRequiresStrongMind End MiningMuseum_MineHistory: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message MiningMuseum_Text_MineHistory - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage MiningMuseum_Text_MineHistory End .balign 4, 0 diff --git a/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s b/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s index fdcd86c368..b41b2e7eac 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s +++ b/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_mt_coronet_2f.s b/res/field/scripts/scripts_mt_coronet_2f.s index eb8838d719..505e4f3131 100644 --- a/res/field/scripts/scripts_mt_coronet_2f.s +++ b/res/field/scripts/scripts_mt_coronet_2f.s @@ -9,22 +9,11 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 6 End _0023: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _0036: diff --git a/res/field/scripts/scripts_old_chateau.s b/res/field/scripts/scripts_old_chateau.s index ba1dbdf9f2..90385a06f1 100644 --- a/res/field/scripts/scripts_old_chateau.s +++ b/res/field/scripts/scripts_old_chateau.s @@ -11,12 +11,7 @@ _000A: End _0010: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_old_chateau_side_rooms.s b/res/field/scripts/scripts_old_chateau_side_rooms.s index 118f473386..c5290688cb 100644 --- a/res/field/scripts/scripts_old_chateau_side_rooms.s +++ b/res/field/scripts/scripts_old_chateau_side_rooms.s @@ -6,12 +6,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city.s b/res/field/scripts/scripts_oreburgh_city.s index ca8601c6f2..01d06dd504 100644 --- a/res/field/scripts/scripts_oreburgh_city.s +++ b/res/field/scripts/scripts_oreburgh_city.s @@ -262,23 +262,11 @@ OreburghCity_Movement_RivalWalkOnSpotWest: EndMovement OreburghCity_Hiker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_UpAheadTheresAHugeMountainThatTowersAboveEverything - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_UpAheadTheresAHugeMountainThatTowersAboveEverything End OreburghCity_Worker1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_TheseVentsExchangeTheHotAirDownBelowWithTheFreshAirOutside - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_TheseVentsExchangeTheHotAirDownBelowWithTheFreshAirOutside End OreburghCity_Worker2: @@ -309,23 +297,11 @@ OreburghCity_BagIsFull: End OreburghCity_Worker3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_ThisPileOfDirtySandIsCalledASlagHeap - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_ThisPileOfDirtySandIsCalledASlagHeap End OreburghCity_Worker4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_ChopChopMachopChopChopAwayOnRocks - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_ChopChopMachopChopChopAwayOnRocks End OreburghCity_TriggerYoungster: @@ -507,13 +483,7 @@ OreburghCity_Movement_YoungsterWalkToPlayerZ751: EndMovement OreburghCity_BattleGirl1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_TMsAreSingleUseOnlyButHMsCanBeUsedOverAndOver - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_TMsAreSingleUseOnlyButHMsCanBeUsedOverAndOver End OreburghCity_SchoolKidF: @@ -535,33 +505,15 @@ OreburghCity_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor: End OreburghCity_Guitarist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_HaveYouSeenTheVents - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_HaveYouSeenTheVents End OreburghCity_PokefanF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_EveryonesProudOfTheMine - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_EveryonesProudOfTheMine End OreburghCity_Camper: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_WhenIRunAroundWithMyRunningShoesOnImTheCenterOfAttention - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_WhenIRunAroundWithMyRunningShoesOnImTheCenterOfAttention End OreburghCity_MapSign: @@ -581,52 +533,19 @@ OreburghCity_ScrollingSignOreburghMine: End OreburghCity_Machop1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_MACHOP - Message OreburghCity_Text_MachopMachoChopo - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopMachoChopo End OreburghCity_BattleGirl2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCity_Text_ThatsWhatFossilsAre - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCity_Text_ThatsWhatFossilsAre End OreburghCity_Machop3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_MACHOP - Message OreburghCity_Text_MachopPigyooh - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopPigyooh End OreburghCity_Machop2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_MACHOP - Message OreburghCity_Text_MachopGwoohGogogooh - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopGwoohGogogooh End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_1f.s b/res/field/scripts/scripts_oreburgh_city_east_house_1f.s index 5310525cf7..f2ceefd00c 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_1f.s @@ -8,33 +8,15 @@ ScriptEntryEnd OreburghCityEastHouse1F_PokefanM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityEastHouse1F_Text_WhyNotTryTrainingInTheOreburghMine - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityEastHouse1F_Text_WhyNotTryTrainingInTheOreburghMine End OreburghCityEastHouse1F_Hiker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityEastHouse1F_Text_IAlwaysHaveARottenTimeTryingToDecideWhichMovesMyPokemonShouldLearn - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityEastHouse1F_Text_IAlwaysHaveARottenTimeTryingToDecideWhichMovesMyPokemonShouldLearn End OreburghCityEastHouse1F_AceTrainerM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityEastHouse1F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityEastHouse1F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s index b07aba2ef0..442bde48c3 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s @@ -9,13 +9,7 @@ ScriptEntryEnd OreburghCityEastHouse2F_Gentleman: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityEastHouse2F_Text_TheOreburghMineIsOperatedWithTheUtmostCare - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityEastHouse2F_Text_TheOreburghMineIsOperatedWithTheUtmostCare End OreburghCityEastHouse2F_Youngster: @@ -49,13 +43,7 @@ OreburghCityEastHouse2F_Unused: End OreburghCityEastHouse2F_ScientistM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityEastHouse2F_Text_CoalIsCarriedOutOfTheOreburghMineOnAFullyAutomatedSystem - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityEastHouse2F_Text_CoalIsCarriedOutOfTheOreburghMineOnAFullyAutomatedSystem End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_3f.s b/res/field/scripts/scripts_oreburgh_city_east_house_3f.s index 45c782b10a..9960ad9de0 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_3f.s @@ -7,21 +7,9 @@ ScriptEntryEnd OreburghCityEastHouse3F_ScientistM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityEastHouse3F_Text_TheCoalMineHeresFullyAutomated - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityEastHouse3F_Text_TheCoalMineHeresFullyAutomated End OreburghCityEastHouse3F_AceTrainerM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityEastHouse3F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityEastHouse3F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon End diff --git a/res/field/scripts/scripts_oreburgh_city_mart.s b/res/field/scripts/scripts_oreburgh_city_mart.s index d463d53b89..86fccd65a8 100644 --- a/res/field/scripts/scripts_oreburgh_city_mart.s +++ b/res/field/scripts/scripts_oreburgh_city_mart.s @@ -9,41 +9,17 @@ ScriptEntryEnd OreburghCityMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End OreburghCityMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_OREBURGH - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_OREBURGH End OreburghCityMart_Hiker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityMart_Text_MoreBadgesMoreItems - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityMart_Text_MoreBadgesMoreItems End OreburghCityMart_Collector: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityMart_Text_TwoStaffOfferDifferentMerchandise - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityMart_Text_TwoStaffOfferDifferentMerchandise End diff --git a/res/field/scripts/scripts_oreburgh_city_middle_house.s b/res/field/scripts/scripts_oreburgh_city_middle_house.s index 01eece0c89..dabc6fa245 100644 --- a/res/field/scripts/scripts_oreburgh_city_middle_house.s +++ b/res/field/scripts/scripts_oreburgh_city_middle_house.s @@ -7,21 +7,9 @@ ScriptEntryEnd OreburghCityMiddleHouse_SchoolKidF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityMiddleHouse_Text_RoarkIsAUserOfRockTypePokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityMiddleHouse_Text_RoarkIsAUserOfRockTypePokemon End OreburghCityMiddleHouse_Hiker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityMiddleHouse_Text_RoarkIsOurTownsGymLeader - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityMiddleHouse_Text_RoarkIsOurTownsGymLeader End diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s index ae85e30442..b2ebb3c63c 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s @@ -62,21 +62,9 @@ OreburghCityNorthHouse1F_ThanksToPokemonIGotToBeFriendsWithYou: End OreburghCityNorthHouse1F_ExpertF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthHouse1F_Text_APokemonObtainedInATradeGrowsQuickly - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthHouse1F_Text_APokemonObtainedInATradeGrowsQuickly End OreburghCityNorthHouse1F_PokemonBreederM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthHouse1F_Text_WhenYouTradeAPokemonTheItemItsHoldingIsTradedAsWell - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthHouse1F_Text_WhenYouTradeAPokemonTheItemItsHoldingIsTradedAsWell End diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s index ce0d12d27e..00f2a1e67d 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s @@ -8,23 +8,11 @@ ScriptEntryEnd OreburghCityNorthHouse2F_Guitarist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthHouse2F_Text_AllPokemonHaveASpecialPowerCalledAnAbility - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthHouse2F_Text_AllPokemonHaveASpecialPowerCalledAnAbility End OreburghCityNorthHouse2F_PokemonBreederF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthHouse2F_Text_MyFavoritePokemonAbilityIsMyPachirisusPickup - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthHouse2F_Text_MyFavoritePokemonAbilityIsMyPachirisusPickup End OreburghCityNorthHouse2F_Collector: diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_3f.s b/res/field/scripts/scripts_oreburgh_city_north_house_3f.s index c309718887..6c2f7139ea 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_3f.s @@ -8,33 +8,15 @@ ScriptEntryEnd OreburghCityNorthHouse3F_PokefanF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthHouse3F_Text_DuringTheDaytimeEveryoneGoesOffToTheMine - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthHouse3F_Text_DuringTheDaytimeEveryoneGoesOffToTheMine End OreburghCityNorthHouse3F_Worker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthHouse3F_Text_WellKeepDiggingCoal - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthHouse3F_Text_WellKeepDiggingCoal End OreburghCityNorthHouse3F_Twin: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthHouse3F_Text_EveryoneIncludingLotsOfPokemonDugTheBigUndergroundMaze - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthHouse3F_Text_EveryoneIncludingLotsOfPokemonDugTheBigUndergroundMaze End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s index bf73609ec8..bf4e1545bc 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s @@ -8,33 +8,15 @@ ScriptEntryEnd OreburghCityNorthwestHouse1F_BreederM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthwestHouse1F_Text_ThereAreEightGymLeadersInTheSinnohRegion - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthwestHouse1F_Text_ThereAreEightGymLeadersInTheSinnohRegion End OreburghCityNorthwestHouse1F_Youngster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthwestHouse1F_Text_AGymLeaderIsntLikeJustAnyTrainerYouMeet - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthwestHouse1F_Text_AGymLeaderIsntLikeJustAnyTrainerYouMeet End OreburghCityNorthwestHouse1F_PokefanF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthwestHouse1F_Text_RoarkLetsUsTrainOurPokemonInTheMine - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthwestHouse1F_Text_RoarkLetsUsTrainOurPokemonInTheMine End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s index 590760b02c..ed8abe3847 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s @@ -9,23 +9,11 @@ ScriptEntryEnd OreburghCityNorthwestHouse2F_Worker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthwestHouse2F_Text_GivingNicknamesToPokemonIsTheWayToGo - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthwestHouse2F_Text_GivingNicknamesToPokemonIsTheWayToGo End OreburghCityNorthwestHouse2F_SchoolKidF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthwestHouse2F_Text_ButHeNamedOurPsyduckYellowJustBecauseOfItsColor - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthwestHouse2F_Text_ButHeNamedOurPsyduckYellowJustBecauseOfItsColor End OreburghCityNorthwestHouse2F_Lass: @@ -58,16 +46,7 @@ OreburghCityNorthwestHouse2F_TheDuskBallIsAPokeBallDesignedForUseInDarkness: End OreburghCityNorthwestHouse2F_Psyduck: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PSYDUCK - Message OreburghCityNorthwestHouse2F_Text_YellowDuuuck - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PSYDUCK, OreburghCityNorthwestHouse2F_Text_YellowDuuuck End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s index a3b912ace5..686736cb82 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s @@ -37,16 +37,7 @@ OreburghCityNorthwestHouse3F_BagIsFull: End OreburghCityNorthwestHouse3F_Psyduck: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PSYDUCK - Message OreburghCityNorthwestHouse3F_Text_PsyduckDuuuck - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PSYDUCK, OreburghCityNorthwestHouse3F_Text_PsyduckDuuuck End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s index b864dbd060..cc3b0b2961 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s @@ -8,33 +8,15 @@ ScriptEntryEnd OreburghCityNorthwestHouse4F_SchoolKidM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthwestHouse4F_Text_HahahaImGonnaSwipeYourFlag - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthwestHouse4F_Text_HahahaImGonnaSwipeYourFlag End OreburghCityNorthwestHouse4F_NinjaBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthwestHouse4F_Text_ISetSomeNastyTrapsCatchMeIfYouCan - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthwestHouse4F_Text_ISetSomeNastyTrapsCatchMeIfYouCan End OreburghCityNorthwestHouse4F_PokefanF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityNorthwestHouse4F_Text_ThanksToTheGymLeaderWeCanPlayUnderground - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityNorthwestHouse4F_Text_ThanksToTheGymLeaderWeCanPlayUnderground End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s index 11e9e9fdd5..4c511985fa 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s @@ -18,23 +18,11 @@ OreburghCityPokecenter1F_Nurse: End OreburghCityPokecenter1F_NinjaBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityPokecenter1F_Text_YayIGotAPalPadAtThePokemonWiFiClubDownstairs - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityPokecenter1F_Text_YayIGotAPalPadAtThePokemonWiFiClubDownstairs End OreburghCityPokecenter1F_AceTrainerF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityPokecenter1F_Text_SwitchOnThePCAtAnyPokemonCenter - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityPokecenter1F_Text_SwitchOnThePCAtAnyPokemonCenter End OreburghCityPokecenter1F_Psychic: @@ -106,23 +94,11 @@ OreburghCityPokecenter1F_WhatOrWhoIsThisTeamGalactic: End OreburghCityPokecenter1F_KidWithNDSWest: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityPokecenter1F_Text_NowYouCanCaptureItAsABattleVideoUsingAVsRecorder - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityPokecenter1F_Text_NowYouCanCaptureItAsABattleVideoUsingAVsRecorder End OreburghCityPokecenter1F_KidWithNDSEast: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityPokecenter1F_Text_CoolYouHaveAVsRecorder - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityPokecenter1F_Text_CoolYouHaveAVsRecorder End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s index 3b2394bb64..92428940c1 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s @@ -6,13 +6,7 @@ ScriptEntryEnd OreburghCityPokecenterB1F_BattleGirl: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityPokecenterB1F_Text_IWantToBecomeFriendsWithAnExperiencedTrainerIReallyAdmire - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityPokecenterB1F_Text_IWantToBecomeFriendsWithAnExperiencedTrainerIReallyAdmire End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_south_house.s b/res/field/scripts/scripts_oreburgh_city_south_house.s index 06582f58ff..9f328533d2 100644 --- a/res/field/scripts/scripts_oreburgh_city_south_house.s +++ b/res/field/scripts/scripts_oreburgh_city_south_house.s @@ -6,13 +6,7 @@ ScriptEntryEnd OreburghCitySouthHouse_Worker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCitySouthHouse_Text_YoureTakingATourOfOurCoalMine - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCitySouthHouse_Text_YoureTakingATourOfOurCoalMine End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_west_house.s b/res/field/scripts/scripts_oreburgh_city_west_house.s index 2fd238a582..1c3d4fb9cc 100644 --- a/res/field/scripts/scripts_oreburgh_city_west_house.s +++ b/res/field/scripts/scripts_oreburgh_city_west_house.s @@ -8,36 +8,15 @@ ScriptEntryEnd OreburghCityWestHouse_Youngster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityWestHouse_Text_HaveYouEverSeenOrHeardAboutDifferentlyColoredPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityWestHouse_Text_HaveYouEverSeenOrHeardAboutDifferentlyColoredPokemon End OreburghCityWestHouse_PokefanF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghCityWestHouse_Text_YouKnowHowPokemonHaveDifferentNaturesLikeWeHavePersonalities - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghCityWestHouse_Text_YouKnowHowPokemonHaveDifferentNaturesLikeWeHavePersonalities End OreburghCityWestHouse_Pikachu: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message OreburghCityWestHouse_Text_PikachuPikaaah - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, OreburghCityWestHouse_Text_PikachuPikaaah End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_gate_b1f.s b/res/field/scripts/scripts_oreburgh_gate_b1f.s index bd1fca075a..f0688f367d 100644 --- a/res/field/scripts/scripts_oreburgh_gate_b1f.s +++ b/res/field/scripts/scripts_oreburgh_gate_b1f.s @@ -6,13 +6,7 @@ ScriptEntryEnd OreburghGateB1F_CyclistF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghGateB1F_Text_DoYouSeeThoseBumpsOnTheGround - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghGateB1F_Text_DoYouSeeThoseBumpsOnTheGround End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_mine_b1f.s b/res/field/scripts/scripts_oreburgh_mine_b1f.s index a0d8e63534..18c6e76574 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b1f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b1f.s @@ -20,23 +20,11 @@ OreburghMineB1F_ShowHiker: Return OreburghMineB1F_Worker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghMineB1F_Text_EveryoneThatWorksInTheCoalMineKeepsTheirOwnPokemonWithThem - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghMineB1F_Text_EveryoneThatWorksInTheCoalMineKeepsTheirOwnPokemonWithThem End OreburghMineB1F_Twin: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghMineB1F_Text_IFoundWhatIThoughtWereSomeRocksThenTheyStartedMoving - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghMineB1F_Text_IFoundWhatIThoughtWereSomeRocksThenTheyStartedMoving End OreburghMineB1F_Hiker: diff --git a/res/field/scripts/scripts_oreburgh_mine_b2f.s b/res/field/scripts/scripts_oreburgh_mine_b2f.s index 43b3719391..d2d4d41e98 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b2f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b2f.s @@ -90,50 +90,17 @@ OreburghMineB2F_UnusedMovement3: EndMovement OreburghMineB2F_Machop1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_MACHOP - Message OreburghMineB2F_Text_MachopMaaacho - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopMaaacho End OreburghMineB2F_Machop3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_MACHOP - Message OreburghMineB2F_Text_MachopChopChop - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopChopChop End OreburghMineB2F_Machop2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_MACHOP - Message OreburghMineB2F_Text_MachopChopmacho - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopChopmacho End OreburghMineB2F_Worker: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message OreburghMineB2F_Text_IMetTheseMachopOnRoute207 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage OreburghMineB2F_Text_IMetTheseMachopOnRoute207 End diff --git a/res/field/scripts/scripts_pal_park_lobby.s b/res/field/scripts/scripts_pal_park_lobby.s index 69f6df4074..d3b8463b4c 100644 --- a/res/field/scripts/scripts_pal_park_lobby.s +++ b/res/field/scripts/scripts_pal_park_lobby.s @@ -293,13 +293,7 @@ _03F8: EndMovement PalParkLobby_RecordUnused: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PalParkLobby_Text_TheCurrentRecordHolderIsXWithYPoints - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PalParkLobby_Text_TheCurrentRecordHolderIsXWithYPoints End PalParkLobby_Daughter: @@ -335,44 +329,20 @@ PalParkLobby_Daughter_IHopeYouDoBetterNextTime: PalParkLobby_Dad: BufferPlayerName 0 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PalParkLobby_Text_PlayerMyDaughterIsABigFanOfYours - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PalParkLobby_Text_PlayerMyDaughterIsABigFanOfYours End PalParkLobby_ShowWatcherBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PalParkLobby_Text_WeGetToSeeRareAndExoticPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PalParkLobby_Text_WeGetToSeeRareAndExoticPokemon End PalParkLobby_ComplaintsLady: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PalParkLobby_Text_RarePokemonTakeLongerToAppear - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PalParkLobby_Text_RarePokemonTakeLongerToAppear End PalParkLobby_RecordGuy: Call PalParkLobby_BufferRecord - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PalParkLobby_Text_TheCurrentRecordHolderIsXWithYPoints - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PalParkLobby_Text_TheCurrentRecordHolderIsXWithYPoints End PalParkLobby_Oak: diff --git a/res/field/scripts/scripts_pastoria_city.s b/res/field/scripts/scripts_pastoria_city.s index bcd4e63586..bf109347e2 100644 --- a/res/field/scripts/scripts_pastoria_city.s +++ b/res/field/scripts/scripts_pastoria_city.s @@ -44,43 +44,19 @@ _009C: End _00B2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 29 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 29 End _00C5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 30 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 30 End _00D8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 31 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 31 End _00EB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 32 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 32 End _00FE: @@ -139,46 +115,19 @@ _01A4: Return _01AC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 39 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 39 End _01BF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 40 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 40 End _01D2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 35 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 35 End _01E5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message 36 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, 36 End PastoriaGity_GalacticGrunt: diff --git a/res/field/scripts/scripts_pastoria_city_east_house.s b/res/field/scripts/scripts_pastoria_city_east_house.s index 94f0df5921..c0617a4486 100644 --- a/res/field/scripts/scripts_pastoria_city_east_house.s +++ b/res/field/scripts/scripts_pastoria_city_east_house.s @@ -79,11 +79,5 @@ _011A: End _0125: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 17 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 17 End diff --git a/res/field/scripts/scripts_pastoria_city_mart.s b/res/field/scripts/scripts_pastoria_city_mart.s index b7185b9282..27210939fd 100644 --- a/res/field/scripts/scripts_pastoria_city_mart.s +++ b/res/field/scripts/scripts_pastoria_city_mart.s @@ -10,52 +10,23 @@ ScriptEntryEnd PastoriaCityMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End PastoriaCityMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_PASTORIA - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_PASTORIA End PastoriaCityMart_BugCatcher: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PastoriaCityMart_Text_CroagunkIsOfficialCityMascot - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PastoriaCityMart_Text_CroagunkIsOfficialCityMascot End PastoriaCityMart_SchoolGirl: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PastoriaCityMart_Text_AreYouUsingBallCapsules - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PastoriaCityMart_Text_AreYouUsingBallCapsules End PastoriaCityMart_CroagunkCarving: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message PastoriaCityMart_Text_LooksLikeItsSeepingPoison - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage PastoriaCityMart_Text_LooksLikeItsSeepingPoison End .balign 4, 0 diff --git a/res/field/scripts/scripts_pastoria_city_middle_house.s b/res/field/scripts/scripts_pastoria_city_middle_house.s index 6634681fa9..3d4bb73f7e 100644 --- a/res/field/scripts/scripts_pastoria_city_middle_house.s +++ b/res/field/scripts/scripts_pastoria_city_middle_house.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_pastoria_city_north_house.s b/res/field/scripts/scripts_pastoria_city_north_house.s index 10bf0552c8..c855360c1b 100644 --- a/res/field/scripts/scripts_pastoria_city_north_house.s +++ b/res/field/scripts/scripts_pastoria_city_north_house.s @@ -8,36 +8,15 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PSYDUCK - Message 1 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PSYDUCK, 1 End _0040: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_pastoria_city_northeast_house.s b/res/field/scripts/scripts_pastoria_city_northeast_house.s index 342271329b..f7dd6fe7f2 100644 --- a/res/field/scripts/scripts_pastoria_city_northeast_house.s +++ b/res/field/scripts/scripts_pastoria_city_northeast_house.s @@ -181,26 +181,11 @@ _0304: Return _030C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End _031F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PACHIRISU - Message 12 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PACHIRISU, 12 End .balign 4, 0 diff --git a/res/field/scripts/scripts_pastoria_city_observatory_gate_2f.s b/res/field/scripts/scripts_pastoria_city_observatory_gate_2f.s index 5a6fdb6ada..36c062fd93 100644 --- a/res/field/scripts/scripts_pastoria_city_observatory_gate_2f.s +++ b/res/field/scripts/scripts_pastoria_city_observatory_gate_2f.s @@ -41,41 +41,17 @@ _006B: End _0078: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _008B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _009E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _00B1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End diff --git a/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s b/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s index f7be4887ab..6d47768d4e 100644 --- a/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s @@ -12,21 +12,9 @@ _000E: End _001A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _002D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_pastoria_city_pokecenter_2f.s b/res/field/scripts/scripts_pastoria_city_pokecenter_2f.s index 6ded29911a..2502d6afa7 100644 --- a/res/field/scripts/scripts_pastoria_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_pastoria_city_pokecenter_2f.s @@ -6,13 +6,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_pastoria_city_southwest_house.s b/res/field/scripts/scripts_pastoria_city_southwest_house.s index 9d356def71..f156e7917c 100644 --- a/res/field/scripts/scripts_pastoria_city_southwest_house.s +++ b/res/field/scripts/scripts_pastoria_city_southwest_house.s @@ -36,13 +36,7 @@ _0060: End _006A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_poffin_house.s b/res/field/scripts/scripts_poffin_house.s index 1450c010fe..c6521ba5cb 100644 --- a/res/field/scripts/scripts_poffin_house.s +++ b/res/field/scripts/scripts_poffin_house.s @@ -36,41 +36,17 @@ _0066: End _0070: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0083: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0096: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _00A9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End diff --git a/res/field/scripts/scripts_pokemon_day_care.s b/res/field/scripts/scripts_pokemon_day_care.s index 2018d6737c..9590e13d58 100644 --- a/res/field/scripts/scripts_pokemon_day_care.s +++ b/res/field/scripts/scripts_pokemon_day_care.s @@ -37,12 +37,7 @@ _0051: End _005C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_pokemon_league.s b/res/field/scripts/scripts_pokemon_league.s index 3334e1bc47..1168b5dabf 100644 --- a/res/field/scripts/scripts_pokemon_league.s +++ b/res/field/scripts/scripts_pokemon_league.s @@ -16,12 +16,7 @@ PokemonLeague_SignboardVictoryRoad: End PokemonLeague_Statue: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message PokemonLeague_Text_PokemonLeagueThePinnacleOfTrainerdom - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage PokemonLeague_Text_PokemonLeagueThePinnacleOfTrainerdom End .balign 4, 0 diff --git a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s index caf8aa7a9a..d7976b2d86 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s @@ -98,23 +98,11 @@ PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastWest: EndMovement PokemonLeagueNorthPokecenter1F_VendorCommon: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End PokemonLeagueNorthPokecenter1F_VendorSpecial: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_POKEMON_LEAGUE - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_POKEMON_LEAGUE End PokemonLeagueNorthPokecenter1F_RivalTrigger: @@ -252,23 +240,11 @@ PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveWest: EndMovement PokemonLeagueNorthPokecenter1F_AceTrainerF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PokemonLeagueNorthPokecenter1F_Text_ImNeverGivingUp - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PokemonLeagueNorthPokecenter1F_Text_ImNeverGivingUp End PokemonLeagueNorthPokecenter1F_Guitarist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PokemonLeagueNorthPokecenter1F_Text_ExperienceItForYourself - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PokemonLeagueNorthPokecenter1F_Text_ExperienceItForYourself End PokemonLeagueNorthPokecenter1F_Nurse: diff --git a/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s index 6bd75bb9e2..5bd2c37380 100644 --- a/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s @@ -19,43 +19,19 @@ PokemonLeagueSouthPokecenter1F_Nurse: End PokemonLeagueSouthPokecenter1F_UnusedVendor2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End PokemonLeagueSouthPokecenter1F_UnusedVendor3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_POKEMON_LEAGUE - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_POKEMON_LEAGUE End PokemonLeagueSouthPokecenter1F_Pokefan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PokemonLeagueSouthPokecenter1F_Text_TheObjectiveIsToReachThePokemonLeague - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PokemonLeagueSouthPokecenter1F_Text_TheObjectiveIsToReachThePokemonLeague End PokemonLeagueSouthPokecenter1F_AceTrainer: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PokemonLeagueSouthPokecenter1F_Text_VictoryRoadConfusesMe - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PokemonLeagueSouthPokecenter1F_Text_VictoryRoadConfusesMe End .balign 4, 0 diff --git a/res/field/scripts/scripts_pokemon_mansion.s b/res/field/scripts/scripts_pokemon_mansion.s index cd56fa5c7d..fc90b62630 100644 --- a/res/field/scripts/scripts_pokemon_mansion.s +++ b/res/field/scripts/scripts_pokemon_mansion.s @@ -353,13 +353,7 @@ _04C0: EndMovement _04C8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 29 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 29 End .balign 4, 0 diff --git a/res/field/scripts/scripts_pokemon_mansion_maids_room.s b/res/field/scripts/scripts_pokemon_mansion_maids_room.s index 953c24fd92..8a5ee3eb51 100644 --- a/res/field/scripts/scripts_pokemon_mansion_maids_room.s +++ b/res/field/scripts/scripts_pokemon_mansion_maids_room.s @@ -36,13 +36,7 @@ _005D: End _0068: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _007B: diff --git a/res/field/scripts/scripts_pokemon_mansion_office.s b/res/field/scripts/scripts_pokemon_mansion_office.s index 5e32f51284..0e3919cea4 100644 --- a/res/field/scripts/scripts_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_pokemon_mansion_office.s @@ -285,12 +285,7 @@ _037C: EndMovement _0388: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 18 End _0399: diff --git a/res/field/scripts/scripts_poketch_co_1f.s b/res/field/scripts/scripts_poketch_co_1f.s index 5b2db8e757..1488130afb 100644 --- a/res/field/scripts/scripts_poketch_co_1f.s +++ b/res/field/scripts/scripts_poketch_co_1f.s @@ -143,31 +143,13 @@ PoketchCo1F_DoYouThinkIShouldSolicitNewPoketchIdeas: End PoketchCo1F_ScientistM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PoketchCo1F_Text_OhYouCanBeSureIWillKeepDevelopingPoketchApps - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PoketchCo1F_Text_OhYouCanBeSureIWillKeepDevelopingPoketchApps End PoketchCo1F_Receptionist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PoketchCo1F_Text_WelcomeToThePoketchCompany - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PoketchCo1F_Text_WelcomeToThePoketchCompany End PoketchCo1F_Lass: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PoketchCo1F_Text_HeyDoYouWatchTV - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PoketchCo1F_Text_HeyDoYouWatchTV End diff --git a/res/field/scripts/scripts_poketch_co_2f.s b/res/field/scripts/scripts_poketch_co_2f.s index 286f062094..ab628418c6 100644 --- a/res/field/scripts/scripts_poketch_co_2f.s +++ b/res/field/scripts/scripts_poketch_co_2f.s @@ -9,49 +9,19 @@ ScriptEntryEnd PoketchCo2F_PokefanM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PoketchCo2F_Text_WellTryToThinkLikeATrainerAndFindWhatPoketchAppsWouldBeGood - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PoketchCo2F_Text_WellTryToThinkLikeATrainerAndFindWhatPoketchAppsWouldBeGood End PoketchCo2F_OldMan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PoketchCo2F_Text_PokemonWatchThatsPoketchForShort - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PoketchCo2F_Text_PokemonWatchThatsPoketchForShort End PoketchCo2F_Clefairy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message PoketchCo2F_Text_ClefairyCleffy - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, PoketchCo2F_Text_ClefairyCleffy End PoketchCo2F_Pachirisu: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PACHIRISU - Message PoketchCo2F_Text_PachirisuPatchii - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PACHIRISU, PoketchCo2F_Text_PachirisuPatchii End .balign 4, 0 diff --git a/res/field/scripts/scripts_poketch_co_3f.s b/res/field/scripts/scripts_poketch_co_3f.s index 5fe5d9ae6b..4e9686a60f 100644 --- a/res/field/scripts/scripts_poketch_co_3f.s +++ b/res/field/scripts/scripts_poketch_co_3f.s @@ -13,33 +13,15 @@ ScriptEntryEnd PoketchCo3F_NinjaBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PoketchCo3F_Text_TheresAGirlsModelAndABoysModel - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PoketchCo3F_Text_TheresAGirlsModelAndABoysModel End PoketchCo3F_PokefanF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PoketchCo3F_Text_MyHusbandsThePresident - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PoketchCo3F_Text_MyHusbandsThePresident End PoketchCo3F_ExpertF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message PoketchCo3F_Text_PeopleEverywhereMakePoketchApps - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage PoketchCo3F_Text_PeopleEverywhereMakePoketchApps End PoketchCo3F_PCSouthWest: diff --git a/res/field/scripts/scripts_resort_area.s b/res/field/scripts/scripts_resort_area.s index 6f51f949db..2c58340778 100644 --- a/res/field/scripts/scripts_resort_area.s +++ b/res/field/scripts/scripts_resort_area.s @@ -59,23 +59,11 @@ _00D4: Return _00DA: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _00ED: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0100: @@ -98,13 +86,7 @@ _012B: Return _0130: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0143: @@ -116,13 +98,7 @@ _015A: End _0171: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _0184: diff --git a/res/field/scripts/scripts_resort_area_house.s b/res/field/scripts/scripts_resort_area_house.s index c92039d0cb..e13e236035 100644 --- a/res/field/scripts/scripts_resort_area_house.s +++ b/res/field/scripts/scripts_resort_area_house.s @@ -25,13 +25,7 @@ _002C: EndMovement _0034: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0047: diff --git a/res/field/scripts/scripts_resort_area_mart.s b/res/field/scripts/scripts_resort_area_mart.s index 761a0301eb..476b0e7cdd 100644 --- a/res/field/scripts/scripts_resort_area_mart.s +++ b/res/field/scripts/scripts_resort_area_mart.s @@ -6,13 +6,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End _0020: diff --git a/res/field/scripts/scripts_resort_area_pokecenter_1f.s b/res/field/scripts/scripts_resort_area_pokecenter_1f.s index 5f252994d1..489ab4f534 100644 --- a/res/field/scripts/scripts_resort_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_resort_area_pokecenter_1f.s @@ -12,21 +12,9 @@ _000E: End _001A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _002D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s index 1f6350de27..90d7069d36 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s @@ -59,13 +59,7 @@ _00AC: _00C0: BufferPlayerName 0 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _00D6: @@ -167,13 +161,7 @@ _025C: End _0269: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 15 End _027C: @@ -200,27 +188,9 @@ _02AF: End _02BA: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_SKITTY - Message 18 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_SKITTY, 18 End _02D9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PSYDUCK - Message 19 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PSYDUCK, 19 End diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s index 237935ce9d..f84d34fef5 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s @@ -236,33 +236,15 @@ _02DC: EndMovement _02E8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 12 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 12 End _02FB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 13 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 13 End _030E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End .balign 4, 0 diff --git a/res/field/scripts/scripts_restaurant.s b/res/field/scripts/scripts_restaurant.s index e9ac89c100..995674213a 100644 --- a/res/field/scripts/scripts_restaurant.s +++ b/res/field/scripts/scripts_restaurant.s @@ -179,13 +179,7 @@ _02DF: End _031E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0331: diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s index 22e34bd176..8231b695b7 100644 --- a/res/field/scripts/scripts_rotoms_room.s +++ b/res/field/scripts/scripts_rotoms_room.s @@ -484,12 +484,7 @@ RotomsRoom_CloseMessage: End RotomsRoom_MysteriousNotebook: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message RotomsRoom_Text_ThereIsAMysteriousNotebookHere - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage RotomsRoom_Text_ThereIsAMysteriousNotebookHere End _07BB: diff --git a/res/field/scripts/scripts_route_201.s b/res/field/scripts/scripts_route_201.s index 3fef5dc83d..a64b9f4086 100644 --- a/res/field/scripts/scripts_route_201.s +++ b/res/field/scripts/scripts_route_201.s @@ -1133,23 +1133,11 @@ _0DDC: EndMovement Route201_BreederM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message Route201_Text_WildPokemonLurkInTallGrass - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage Route201_Text_WildPokemonLurkInTallGrass End Route201_SchoolKidM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message Route201_Text_ThatLedgeIsOneWay - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage Route201_Text_ThatLedgeIsOneWay End Route201_Lass: @@ -1199,13 +1187,7 @@ Route201_BagIsFull: End Route201_ProfRowan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message Route201_Text_RowanGoOnChooseAPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage Route201_Text_RowanGoOnChooseAPokemon End Route201_TriggerLetsCatchThatLegendaryPokemon: diff --git a/res/field/scripts/scripts_route_202.s b/res/field/scripts/scripts_route_202.s index 43ec3076fb..fae526d24f 100644 --- a/res/field/scripts/scripts_route_202.s +++ b/res/field/scripts/scripts_route_202.s @@ -34,13 +34,7 @@ Route202_SetCounterpartPokeRadarPosition: Return Route202_Youngster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message Route202_Text_SomePokemonOnlyAppearInTheMorning - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage Route202_Text_SomePokemonOnlyAppearInTheMorning End Route202_ArrowSignpostSandgemTown: diff --git a/res/field/scripts/scripts_route_203.s b/res/field/scripts/scripts_route_203.s index a0030d57f3..bc9a46c587 100644 --- a/res/field/scripts/scripts_route_203.s +++ b/res/field/scripts/scripts_route_203.s @@ -12,13 +12,7 @@ ScriptEntryEnd Route203_Lass: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message Route203_Text_YourFavoritePokemonShouldBePlacedAtTheTop - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage Route203_Text_YourFavoritePokemonShouldBePlacedAtTheTop End Route203_ArrowSignpostJubilifeCity: diff --git a/res/field/scripts/scripts_route_204_north.s b/res/field/scripts/scripts_route_204_north.s index 6d9d49ef6e..117316927f 100644 --- a/res/field/scripts/scripts_route_204_north.s +++ b/res/field/scripts/scripts_route_204_north.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: diff --git a/res/field/scripts/scripts_route_204_south.s b/res/field/scripts/scripts_route_204_south.s index 9e28a1724b..afc9118849 100644 --- a/res/field/scripts/scripts_route_204_south.s +++ b/res/field/scripts/scripts_route_204_south.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: diff --git a/res/field/scripts/scripts_route_205_house.s b/res/field/scripts/scripts_route_205_house.s index 61c7a1bd4d..38b02b1213 100644 --- a/res/field/scripts/scripts_route_205_house.s +++ b/res/field/scripts/scripts_route_205_house.s @@ -39,11 +39,5 @@ _0062: End _006D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End diff --git a/res/field/scripts/scripts_route_205_north.s b/res/field/scripts/scripts_route_205_north.s index 950b701659..d77ec0d44f 100644 --- a/res/field/scripts/scripts_route_205_north.s +++ b/res/field/scripts/scripts_route_205_north.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: diff --git a/res/field/scripts/scripts_route_205_south.s b/res/field/scripts/scripts_route_205_south.s index 719a5acccd..5f1c7a3e0f 100644 --- a/res/field/scripts/scripts_route_205_south.s +++ b/res/field/scripts/scripts_route_205_south.s @@ -98,23 +98,11 @@ _00EC: EndMovement _00F8: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _010B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _011E: diff --git a/res/field/scripts/scripts_route_206.s b/res/field/scripts/scripts_route_206.s index a559595487..d89fb2e8f4 100644 --- a/res/field/scripts/scripts_route_206.s +++ b/res/field/scripts/scripts_route_206.s @@ -44,13 +44,7 @@ _009F: Return _00A4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _00B7: diff --git a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s index 1fd11066df..e399cefebe 100644 --- a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s +++ b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s @@ -29,13 +29,7 @@ _0048: Return _004E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0061: diff --git a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s index ddfae4c9b2..60727a89ef 100644 --- a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s +++ b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s @@ -24,13 +24,7 @@ _0037: Return _003D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0050: diff --git a/res/field/scripts/scripts_route_207.s b/res/field/scripts/scripts_route_207.s index c93c9267d7..9e0254ec87 100644 --- a/res/field/scripts/scripts_route_207.s +++ b/res/field/scripts/scripts_route_207.s @@ -136,13 +136,7 @@ _01A8: EndMovement _01B0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _01C3: diff --git a/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s index 8c72df5a52..39c2a93ea4 100644 --- a/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s @@ -8,36 +8,15 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0034: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_209.s b/res/field/scripts/scripts_route_209.s index 30425c48fc..047c05baeb 100644 --- a/res/field/scripts/scripts_route_209.s +++ b/res/field/scripts/scripts_route_209.s @@ -37,13 +37,7 @@ _007F: End _0091: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _00A4: @@ -202,23 +196,11 @@ _029E: End _02B3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 16 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 16 End _02C6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 17 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 17 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s index caaf04c12d..f86ace117e 100644 --- a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_route_209_lost_tower_1f.s b/res/field/scripts/scripts_route_209_lost_tower_1f.s index c082d5d203..90409b6562 100644 --- a/res/field/scripts/scripts_route_209_lost_tower_1f.s +++ b/res/field/scripts/scripts_route_209_lost_tower_1f.s @@ -12,23 +12,11 @@ _000E: End _0014: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0027: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_210_north.s b/res/field/scripts/scripts_route_210_north.s index 49ec2ac2ee..ad75b9c1fe 100644 --- a/res/field/scripts/scripts_route_210_north.s +++ b/res/field/scripts/scripts_route_210_north.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: diff --git a/res/field/scripts/scripts_route_210_south.s b/res/field/scripts/scripts_route_210_south.s index 0546c6075e..bfc7fe2a23 100644 --- a/res/field/scripts/scripts_route_210_south.s +++ b/res/field/scripts/scripts_route_210_south.s @@ -219,13 +219,7 @@ Route210South_UnusedMovement2: EndMovement _030C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _031F: @@ -263,13 +257,7 @@ _0390: End _03A7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_211_west.s b/res/field/scripts/scripts_route_211_west.s index 20811faa55..0240137bc7 100644 --- a/res/field/scripts/scripts_route_211_west.s +++ b/res/field/scripts/scripts_route_211_west.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: diff --git a/res/field/scripts/scripts_route_212_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_212_gate_to_hearthome_city.s index 5bb67080f3..149a08c838 100644 --- a/res/field/scripts/scripts_route_212_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_212_gate_to_hearthome_city.s @@ -9,43 +9,19 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0038: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _004B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_212_house.s b/res/field/scripts/scripts_route_212_house.s index 36348e047b..a462ae3b49 100644 --- a/res/field/scripts/scripts_route_212_house.s +++ b/res/field/scripts/scripts_route_212_house.s @@ -15,32 +15,15 @@ _0016: End _001C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 17 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 17 End _002F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 18 End _0042: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 19 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 19 End _0053: diff --git a/res/field/scripts/scripts_route_212_north.s b/res/field/scripts/scripts_route_212_north.s index 756797597c..69afb1cbf2 100644 --- a/res/field/scripts/scripts_route_212_north.s +++ b/res/field/scripts/scripts_route_212_north.s @@ -46,13 +46,7 @@ _0093: End _00B5: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _00C8: @@ -68,53 +62,23 @@ _00F6: End _010B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _011E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0131: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0144: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0157: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_212_south.s b/res/field/scripts/scripts_route_212_south.s index 2616bb4d14..a64c8d3419 100644 --- a/res/field/scripts/scripts_route_212_south.s +++ b/res/field/scripts/scripts_route_212_south.s @@ -32,33 +32,15 @@ _0073: End _007D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0090: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _00A3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _00B6: @@ -74,11 +56,5 @@ _00E4: End _00F9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End diff --git a/res/field/scripts/scripts_route_213.s b/res/field/scripts/scripts_route_213.s index 13a8d414c4..e01b4398cd 100644 --- a/res/field/scripts/scripts_route_213.s +++ b/res/field/scripts/scripts_route_213.s @@ -314,33 +314,15 @@ _03F0: EndMovement _03FC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _040F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _0422: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _0435: diff --git a/res/field/scripts/scripts_route_213_gate_to_pastoria_city.s b/res/field/scripts/scripts_route_213_gate_to_pastoria_city.s index c2228a6a23..3d16e766dd 100644 --- a/res/field/scripts/scripts_route_213_gate_to_pastoria_city.s +++ b/res/field/scripts/scripts_route_213_gate_to_pastoria_city.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_route_215.s b/res/field/scripts/scripts_route_215.s index d275bd38fd..d62cdb04f8 100644 --- a/res/field/scripts/scripts_route_215.s +++ b/res/field/scripts/scripts_route_215.s @@ -36,13 +36,7 @@ _007B: End _008D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _00A0: @@ -84,23 +78,11 @@ _0128: End _013D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0150: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_216.s b/res/field/scripts/scripts_route_216.s index 2f9a9f5a95..b6e72e1617 100644 --- a/res/field/scripts/scripts_route_216.s +++ b/res/field/scripts/scripts_route_216.s @@ -8,13 +8,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: diff --git a/res/field/scripts/scripts_route_216_house.s b/res/field/scripts/scripts_route_216_house.s index 78060e5cae..9ed5baf43c 100644 --- a/res/field/scripts/scripts_route_216_house.s +++ b/res/field/scripts/scripts_route_216_house.s @@ -40,13 +40,7 @@ _0066: End _0071: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0084: diff --git a/res/field/scripts/scripts_route_217.s b/res/field/scripts/scripts_route_217.s index 1733f64efa..0532fe1cc6 100644 --- a/res/field/scripts/scripts_route_217.s +++ b/res/field/scripts/scripts_route_217.s @@ -9,12 +9,7 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 3 End _0023: @@ -22,13 +17,7 @@ _0023: End _003A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _004D: diff --git a/res/field/scripts/scripts_route_218.s b/res/field/scripts/scripts_route_218.s index 47a559d970..c4491afed6 100644 --- a/res/field/scripts/scripts_route_218.s +++ b/res/field/scripts/scripts_route_218.s @@ -20,21 +20,11 @@ _0035: End _004C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 0 End _005D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 4 End _006E: diff --git a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s index a819552e3c..e92828c244 100644 --- a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s +++ b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s @@ -177,13 +177,7 @@ _01FC: EndMovement _0208: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_218_gate_to_jubilife_city.s b/res/field/scripts/scripts_route_218_gate_to_jubilife_city.s index d9fe047f66..bf816dd09f 100644 --- a/res/field/scripts/scripts_route_218_gate_to_jubilife_city.s +++ b/res/field/scripts/scripts_route_218_gate_to_jubilife_city.s @@ -7,13 +7,7 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: diff --git a/res/field/scripts/scripts_route_221.s b/res/field/scripts/scripts_route_221.s index b9e4c37541..2765266dc5 100644 --- a/res/field/scripts/scripts_route_221.s +++ b/res/field/scripts/scripts_route_221.s @@ -17,23 +17,11 @@ _002C: End _002E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0041: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0054: diff --git a/res/field/scripts/scripts_route_221_house.s b/res/field/scripts/scripts_route_221_house.s index 121d75062f..66ff0b7072 100644 --- a/res/field/scripts/scripts_route_221_house.s +++ b/res/field/scripts/scripts_route_221_house.s @@ -92,12 +92,7 @@ _016F: End _017A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 5 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_222.s b/res/field/scripts/scripts_route_222.s index e74ea5d43b..8262b7ca72 100644 --- a/res/field/scripts/scripts_route_222.s +++ b/res/field/scripts/scripts_route_222.s @@ -58,13 +58,7 @@ _00CD: End _00D7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _00EA: @@ -84,13 +78,7 @@ _012F: End _0146: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s b/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s index e1874945e7..cd0e13b687 100644 --- a/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s +++ b/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_route_222_west_house.s b/res/field/scripts/scripts_route_222_west_house.s index e6fd402d28..89929fd641 100644 --- a/res/field/scripts/scripts_route_222_west_house.s +++ b/res/field/scripts/scripts_route_222_west_house.s @@ -16,78 +16,27 @@ _001E: End _0024: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message 0 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, 0 End _0043: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message 1 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, 1 End _0062: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, 2 End _0081: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message 3 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, 3 End _00A0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PIKACHU - Message 4 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PIKACHU, 4 End _00BF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_224.s b/res/field/scripts/scripts_route_224.s index 44675e92f9..506a6a90b2 100644 --- a/res/field/scripts/scripts_route_224.s +++ b/res/field/scripts/scripts_route_224.s @@ -144,13 +144,7 @@ _0222: GoTo _0124 _022D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _0240: diff --git a/res/field/scripts/scripts_route_225_gate_to_fight_area.s b/res/field/scripts/scripts_route_225_gate_to_fight_area.s index 43ce45ce3f..d1f3a8b3a4 100644 --- a/res/field/scripts/scripts_route_225_gate_to_fight_area.s +++ b/res/field/scripts/scripts_route_225_gate_to_fight_area.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_route_226_house.s b/res/field/scripts/scripts_route_226_house.s index 3129181672..7c31eb1c50 100644 --- a/res/field/scripts/scripts_route_226_house.s +++ b/res/field/scripts/scripts_route_226_house.s @@ -77,10 +77,5 @@ _00DC: End _00E7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 7 End diff --git a/res/field/scripts/scripts_route_227.s b/res/field/scripts/scripts_route_227.s index ea28bcaf8c..964df04ac6 100644 --- a/res/field/scripts/scripts_route_227.s +++ b/res/field/scripts/scripts_route_227.s @@ -174,13 +174,7 @@ _01CC: End _01E3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _01F6: diff --git a/res/field/scripts/scripts_route_228_gate_to_route_226.s b/res/field/scripts/scripts_route_228_gate_to_route_226.s index 6e375fae98..5d65c35ff2 100644 --- a/res/field/scripts/scripts_route_228_gate_to_route_226.s +++ b/res/field/scripts/scripts_route_228_gate_to_route_226.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_route_228_north_house.s b/res/field/scripts/scripts_route_228_north_house.s index 80f5e1ad59..5291dd3cb0 100644 --- a/res/field/scripts/scripts_route_228_north_house.s +++ b/res/field/scripts/scripts_route_228_north_house.s @@ -163,12 +163,7 @@ _02BB: End _02C6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 18 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_228_south_house.s b/res/field/scripts/scripts_route_228_south_house.s index dbd94aefec..11d8f5d81e 100644 --- a/res/field/scripts/scripts_route_228_south_house.s +++ b/res/field/scripts/scripts_route_228_south_house.s @@ -36,39 +36,19 @@ _0057: End _005F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 3 End _0070: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 4 End _0081: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 5 End _0092: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 6 End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_230.s b/res/field/scripts/scripts_route_230.s index df3624ccc9..d9d7b79d67 100644 --- a/res/field/scripts/scripts_route_230.s +++ b/res/field/scripts/scripts_route_230.s @@ -12,23 +12,11 @@ _000E: End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0038: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_sandgem_town.s b/res/field/scripts/scripts_sandgem_town.s index 787b3b025e..fcf4c3e7b9 100644 --- a/res/field/scripts/scripts_sandgem_town.s +++ b/res/field/scripts/scripts_sandgem_town.s @@ -663,43 +663,19 @@ SandgemTown_Movement_CounterpartLeave: EndMovement SandgemTown_Youngster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTown_Text_PokemonAreSoCool - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTown_Text_PokemonAreSoCool End SandgemTown_PokemonBreederM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTown_Text_TheThingYouHaveItsAPokedexIsntIt - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTown_Text_TheThingYouHaveItsAPokedexIsntIt End SandgemTown_PokemonBreederF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTown_Text_IdBetterSaveThis - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTown_Text_IdBetterSaveThis End SandgemTown_Unused: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTown_Text_ProfessorRowansComeBackToTown - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTown_Text_ProfessorRowansComeBackToTown End SandgemTown_MapSign: diff --git a/res/field/scripts/scripts_sandgem_town_house.s b/res/field/scripts/scripts_sandgem_town_house.s index b4a426d159..13248e4111 100644 --- a/res/field/scripts/scripts_sandgem_town_house.s +++ b/res/field/scripts/scripts_sandgem_town_house.s @@ -7,21 +7,9 @@ ScriptEntryEnd SandgemTownHouse_BreederM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTownHouse_Text_PokemonGrowStrongerFromBattlingOtherPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTownHouse_Text_PokemonGrowStrongerFromBattlingOtherPokemon End SandgemTownHouse_BreederF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTownHouse_Text_AGoodTrainerTakesCareToNotLetTheirPokemonFaint - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTownHouse_Text_AGoodTrainerTakesCareToNotLetTheirPokemonFaint End diff --git a/res/field/scripts/scripts_sandgem_town_mart.s b/res/field/scripts/scripts_sandgem_town_mart.s index 1951af6870..11eb5eac5d 100644 --- a/res/field/scripts/scripts_sandgem_town_mart.s +++ b/res/field/scripts/scripts_sandgem_town_mart.s @@ -9,34 +9,16 @@ ScriptEntryEnd SandgemTownMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon 0 - ReleaseAll + PokeMartCommonWithGreeting 0 End SandgemTownMart_Dummy: End SandgemTownMart_Breeder: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTownMart_Text_BuyLotsOfPotions - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTownMart_Text_BuyLotsOfPotions End SandgemTownMart_SchoolBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTownMart_Text_TossAPokeBall - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTownMart_Text_TossAPokeBall End diff --git a/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s b/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s index a73f559a5c..720dd161ce 100644 --- a/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s @@ -14,33 +14,15 @@ SandgemTownPokecenter1F_PokecenterNurse: End SandgemTownPokecenter1F_BreederM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTownPokecenter1F_Text_ThatLadyAtTheCounterWillHealYourPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTownPokecenter1F_Text_ThatLadyAtTheCounterWillHealYourPokemon End SandgemTownPokecenter1F_ExpertM: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTownPokecenter1F_Text_DoYouSeeThatPCOverThere - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTownPokecenter1F_Text_DoYouSeeThatPCOverThere End SandgemTownPokecenter1F_Lass: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTownPokecenter1F_Text_TheTopFloorIsTheCommunicationClub - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTownPokecenter1F_Text_TheTopFloorIsTheCommunicationClub End .balign 4, 0 diff --git a/res/field/scripts/scripts_sandgem_town_pokecenter_2f.s b/res/field/scripts/scripts_sandgem_town_pokecenter_2f.s index 6e4c6590e1..cb0b9defe0 100644 --- a/res/field/scripts/scripts_sandgem_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_sandgem_town_pokecenter_2f.s @@ -6,13 +6,7 @@ ScriptEntryEnd SandgemTownPokecenter2F_Lass: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SandgemTownPokecenter2F_Text_WhatKindOfTrainersSignWillGetPeopleLaughing - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SandgemTownPokecenter2F_Text_WhatKindOfTrainersSignWillGetPeopleLaughing End .balign 4, 0 diff --git a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s index 9de974a9f2..58071cc9cb 100644 --- a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s +++ b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s @@ -445,67 +445,32 @@ _0592: End SandgemTownLab_BookshelfAdventureRuleNo1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message SandgemTownLab_Text_AdventureRuleNo1 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage SandgemTownLab_Text_AdventureRuleNo1 End SandgemTownLab_BookshelfAdventureRuleNo2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message SandgemTownLab_Text_AdventureRuleNo2 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage SandgemTownLab_Text_AdventureRuleNo2 End SandgemTownLab_BookshelfBooks: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message SandgemTownLab_Text_ItsCrammedFullOfBooks - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage SandgemTownLab_Text_ItsCrammedFullOfBooks End SandgemTownLab_BookshelfReferenceMaterial: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message SandgemTownLab_Text_ThereALotOfReferenceMaterial - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage SandgemTownLab_Text_ThereALotOfReferenceMaterial End SandgemTownLab_PC: BufferPlayerName 0 - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message SandgemTownLab_Text_PlayerCheckedThePC - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage SandgemTownLab_Text_PlayerCheckedThePC End _05EC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message SandgemTownLab_Text_ResearchMaterialsAreCarefullyTuckedAway - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage SandgemTownLab_Text_ResearchMaterialsAreCarefullyTuckedAway End SandgemTownLab_Refrigerator: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message SandgemTownLab_Text_TheRefrigeratorIsFilledWithTastySweets - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage SandgemTownLab_Text_TheRefrigeratorIsFilledWithTastySweets End SandgemTownLab_ShowCompleteLocalDex: diff --git a/res/field/scripts/scripts_snowpoint_city.s b/res/field/scripts/scripts_snowpoint_city.s index ca34141286..5e2ac876bf 100644 --- a/res/field/scripts/scripts_snowpoint_city.s +++ b/res/field/scripts/scripts_snowpoint_city.s @@ -130,43 +130,19 @@ _016C: EndMovement _0174: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0187: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _019A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _01AD: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _01C0: @@ -188,13 +164,7 @@ _01E0: End _01EB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End _01FE: diff --git a/res/field/scripts/scripts_snowpoint_city_mart.s b/res/field/scripts/scripts_snowpoint_city_mart.s index b3901ad76e..1cbfa2a5e4 100644 --- a/res/field/scripts/scripts_snowpoint_city_mart.s +++ b/res/field/scripts/scripts_snowpoint_city_mart.s @@ -9,41 +9,17 @@ ScriptEntryEnd SnowpointCityMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End SnowpointCityMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_SNOWPOINT - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_SNOWPOINT End SnowpointCityMart_Youngster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SnowpointCityMart_Text_UsingTmsForEliteFour - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SnowpointCityMart_Text_UsingTmsForEliteFour End SnowpointCityMart_SnowpointLady: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SnowpointCityMart_Text_KeepSomeIceHeals - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SnowpointCityMart_Text_KeepSomeIceHeals End diff --git a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s index b06e2ec17c..1ecd63226d 100644 --- a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s @@ -14,36 +14,15 @@ _0016: End _0022: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0035: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0048: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PSYDUCK - Message 4 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PSYDUCK, 4 End _0067: diff --git a/res/field/scripts/scripts_snowpoint_temple_1f.s b/res/field/scripts/scripts_snowpoint_temple_1f.s index 53a8dfd9a0..a343a99e81 100644 --- a/res/field/scripts/scripts_snowpoint_temple_1f.s +++ b/res/field/scripts/scripts_snowpoint_temple_1f.s @@ -11,12 +11,7 @@ _000A: End _0010: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 0 End SnowpointTemple1F_Unused: diff --git a/res/field/scripts/scripts_solaceon_town.s b/res/field/scripts/scripts_solaceon_town.s index 968c66fd42..a802f2c148 100644 --- a/res/field/scripts/scripts_solaceon_town.s +++ b/res/field/scripts/scripts_solaceon_town.s @@ -29,13 +29,7 @@ _0047: End _004F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0062: @@ -57,33 +51,15 @@ _0088: End _0093: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _00A6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _00B9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _00CC: diff --git a/res/field/scripts/scripts_solaceon_town_mart.s b/res/field/scripts/scripts_solaceon_town_mart.s index e88c29d4d9..c9187c1536 100644 --- a/res/field/scripts/scripts_solaceon_town_mart.s +++ b/res/field/scripts/scripts_solaceon_town_mart.s @@ -9,41 +9,17 @@ ScriptEntryEnd SolaceonTownMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End SolaceonTownMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_SOLACEON - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_SOLACEON End SolaceonTownMart_NinjaBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SolaceonTownMart_Text_NeedPCToSealPokeBalls - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SolaceonTownMart_Text_NeedPCToSealPokeBalls End SolaceonTownMart_Pokefan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SolaceonTownMart_Text_ConsiderSuperRepels - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SolaceonTownMart_Text_ConsiderSuperRepels End diff --git a/res/field/scripts/scripts_solaceon_town_north_house.s b/res/field/scripts/scripts_solaceon_town_north_house.s index ce93b18a8f..f5a8ff9581 100644 --- a/res/field/scripts/scripts_solaceon_town_north_house.s +++ b/res/field/scripts/scripts_solaceon_town_north_house.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_solaceon_town_northeast_house.s b/res/field/scripts/scripts_solaceon_town_northeast_house.s index e2cb34cf71..0409abe0ad 100644 --- a/res/field/scripts/scripts_solaceon_town_northeast_house.s +++ b/res/field/scripts/scripts_solaceon_town_northeast_house.s @@ -20,13 +20,7 @@ _000A: End _002C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End .balign 4, 0 diff --git a/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s b/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s index 40747f78f3..802b32933c 100644 --- a/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s @@ -13,33 +13,15 @@ _0012: End _001E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0031: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0044: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s b/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s index dc9d677f63..2413304f1b 100644 --- a/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s +++ b/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s @@ -188,13 +188,7 @@ _02B0: End _02BB: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End _02CE: diff --git a/res/field/scripts/scripts_spear_pillar.s b/res/field/scripts/scripts_spear_pillar.s index 4f306cb244..5a79f2053d 100644 --- a/res/field/scripts/scripts_spear_pillar.s +++ b/res/field/scripts/scripts_spear_pillar.s @@ -150,33 +150,15 @@ _0204: EndMovement _0210: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0223: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 44 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 44 End _0236: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 43 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 43 End _0249: diff --git a/res/field/scripts/scripts_spear_pillar_distorted.s b/res/field/scripts/scripts_spear_pillar_distorted.s index 2e5438eb91..fd4ff4d20c 100644 --- a/res/field/scripts/scripts_spear_pillar_distorted.s +++ b/res/field/scripts/scripts_spear_pillar_distorted.s @@ -134,59 +134,25 @@ _01AF: End _01BA: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 10 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 10 End _01CD: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _01E0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End _01F3: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 11 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 11 End _0206: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 18 End _0217: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 19 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 19 End diff --git a/res/field/scripts/scripts_stark_mountain_room_2.s b/res/field/scripts/scripts_stark_mountain_room_2.s index 9ef758817d..017600fe36 100644 --- a/res/field/scripts/scripts_stark_mountain_room_2.s +++ b/res/field/scripts/scripts_stark_mountain_room_2.s @@ -187,23 +187,11 @@ _0214: EndMovement _021C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _022F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End .balign 4, 0 diff --git a/res/field/scripts/scripts_stark_mountain_room_3.s b/res/field/scripts/scripts_stark_mountain_room_3.s index cffb8f2fae..2216b6d713 100644 --- a/res/field/scripts/scripts_stark_mountain_room_3.s +++ b/res/field/scripts/scripts_stark_mountain_room_3.s @@ -66,13 +66,7 @@ StarkMountainRoom3_UnusedMovement3: _00D0: BufferPlayerName 1 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 18 End _00E6: diff --git a/res/field/scripts/scripts_sunyshore_city.s b/res/field/scripts/scripts_sunyshore_city.s index 37b77afc5b..17a393299e 100644 --- a/res/field/scripts/scripts_sunyshore_city.s +++ b/res/field/scripts/scripts_sunyshore_city.s @@ -519,63 +519,27 @@ _0678: EndMovement _0680: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End _0693: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 20 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 20 End _06A6: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 15 End _06B9: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 17 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 17 End _06CC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 18 End _06DF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 19 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 19 End _06F2: diff --git a/res/field/scripts/scripts_sunyshore_city_mart.s b/res/field/scripts/scripts_sunyshore_city_mart.s index 013ba018a6..fc694ea7c7 100644 --- a/res/field/scripts/scripts_sunyshore_city_mart.s +++ b/res/field/scripts/scripts_sunyshore_city_mart.s @@ -9,41 +9,17 @@ ScriptEntryEnd SunyshoreCityMart_CommonVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End SunyshoreCityMart_SpecialtyVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_SUNYSHORE - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_SUNYSHORE End SunyshoreCityMart_RuinManiac: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SunyshoreCityMart_Text_VictoryRoadIsHarrowing - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SunyshoreCityMart_Text_VictoryRoadIsHarrowing End SunyshoreCityMart_Sailor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SunyshoreCityMart_Text_BuyBallSealsAtSunyshoreMarket - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SunyshoreCityMart_Text_BuyBallSealsAtSunyshoreMarket End diff --git a/res/field/scripts/scripts_sunyshore_city_northwest_house.s b/res/field/scripts/scripts_sunyshore_city_northwest_house.s index 7a973072a4..c4a51ede44 100644 --- a/res/field/scripts/scripts_sunyshore_city_northwest_house.s +++ b/res/field/scripts/scripts_sunyshore_city_northwest_house.s @@ -7,21 +7,9 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s b/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s index 129c3a2224..5e1c6d4aad 100644 --- a/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s @@ -13,13 +13,7 @@ _0012: End _001E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0031: @@ -41,13 +35,7 @@ _0057: End _0062: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_sunyshore_city_west_house.s b/res/field/scripts/scripts_sunyshore_city_west_house.s index ee1d3cbe17..a18f71da8c 100644 --- a/res/field/scripts/scripts_sunyshore_city_west_house.s +++ b/res/field/scripts/scripts_sunyshore_city_west_house.s @@ -12,73 +12,31 @@ ScriptEntryEnd _001E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0031: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0044: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _0057: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _006A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _007D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _0090: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End .balign 4, 0 diff --git a/res/field/scripts/scripts_sunyshore_market.s b/res/field/scripts/scripts_sunyshore_market.s index 7b3dc72f06..2eb99ac2ea 100644 --- a/res/field/scripts/scripts_sunyshore_market.s +++ b/res/field/scripts/scripts_sunyshore_market.s @@ -54,13 +54,7 @@ SunyshoreMarket_PokemonAlreadyHasEffortRibbon: End SunyshoreMarket_Sailor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SunyshoreMarket_Text_BestKnownForSeals - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SunyshoreMarket_Text_BestKnownForSeals End SunyshoreMarket_SealShop: @@ -150,13 +144,7 @@ SunyshoreMarket_PokefanM_SecondWeekHalfMessage: End SunyshoreMarket_BattleGirl: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message SunyshoreMarket_Text_HugeFanOfWiFiPlaza - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage SunyshoreMarket_Text_HugeFanOfWiFiPlaza End .balign 4, 0 diff --git a/res/field/scripts/scripts_survival_area.s b/res/field/scripts/scripts_survival_area.s index 9d7e6d0e9c..443fbf6d45 100644 --- a/res/field/scripts/scripts_survival_area.s +++ b/res/field/scripts/scripts_survival_area.s @@ -32,33 +32,15 @@ _0052: End _005C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _006F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _0082: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _0095: @@ -116,12 +98,7 @@ _0124: EndMovement _0130: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 1 End _0141: diff --git a/res/field/scripts/scripts_survival_area_mart.s b/res/field/scripts/scripts_survival_area_mart.s index 5c4672510d..16fa8eced9 100644 --- a/res/field/scripts/scripts_survival_area_mart.s +++ b/res/field/scripts/scripts_survival_area_mart.s @@ -9,34 +9,16 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End _0028: End _002A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _003D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End diff --git a/res/field/scripts/scripts_survival_area_north_house.s b/res/field/scripts/scripts_survival_area_north_house.s index 9895c64499..c564660ec9 100644 --- a/res/field/scripts/scripts_survival_area_north_house.s +++ b/res/field/scripts/scripts_survival_area_north_house.s @@ -9,13 +9,7 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 17 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 17 End _0021: @@ -154,10 +148,5 @@ _0248: End _0253: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 18 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 18 End diff --git a/res/field/scripts/scripts_survival_area_pokecenter_1f.s b/res/field/scripts/scripts_survival_area_pokecenter_1f.s index 65ed983ac1..09eeab9f3a 100644 --- a/res/field/scripts/scripts_survival_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_survival_area_pokecenter_1f.s @@ -31,23 +31,11 @@ _003C: End _0047: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _005A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End .balign 4, 0 diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s index c5371a7ae4..d20a451ef1 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s @@ -16,42 +16,19 @@ _001E: End _0020: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0033: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0046: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 5 End _0057: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 2 End _006A: diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_2f.s b/res/field/scripts/scripts_team_galactic_eterna_building_2f.s index 00c4c1a4ce..d1f48c78ac 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_2f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_2f.s @@ -8,32 +8,15 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0034: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 2 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_3f.s b/res/field/scripts/scripts_team_galactic_eterna_building_3f.s index f034e02aca..7ff08563d0 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_3f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_3f.s @@ -7,22 +7,11 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _001D: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 1 End .balign 4, 0 diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s index afd6a5a3ca..afad186e60 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s @@ -134,29 +134,11 @@ TeamGalacticEternaBuilding4F_UnusedMovement3: EndMovement _0198: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_CLEFAIRY - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_CLEFAIRY, 2 End _01B7: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_BUNEARY - Message 5 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_BUNEARY, 5 End _01D6: @@ -178,10 +160,5 @@ _01F4: End _01FF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 6 End diff --git a/res/field/scripts/scripts_trainers_school.s b/res/field/scripts/scripts_trainers_school.s index 00b4f65ab1..23f42aee78 100644 --- a/res/field/scripts/scripts_trainers_school.s +++ b/res/field/scripts/scripts_trainers_school.s @@ -105,46 +105,22 @@ _0148: EndMovement _0154: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0167: End _0169: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End _017C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End _018F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 7 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 7 End _01A2: @@ -381,12 +357,7 @@ _0496: End _049C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 27 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 27 End .balign 4, 0 diff --git a/res/field/scripts/scripts_turnback_cave_entrance.s b/res/field/scripts/scripts_turnback_cave_entrance.s index 4c93baa4f8..831590032b 100644 --- a/res/field/scripts/scripts_turnback_cave_entrance.s +++ b/res/field/scripts/scripts_turnback_cave_entrance.s @@ -19,21 +19,11 @@ _001C: _002A: GoToIfSet FLAG_CAUGHT_GIRATINA, _0046 - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 0 End _0046: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 1 End .balign 4, 0 diff --git a/res/field/scripts/scripts_turnback_cave_giratina_room.s b/res/field/scripts/scripts_turnback_cave_giratina_room.s index f87b58fced..1868f64f18 100644 --- a/res/field/scripts/scripts_turnback_cave_giratina_room.s +++ b/res/field/scripts/scripts_turnback_cave_giratina_room.s @@ -89,12 +89,7 @@ _010C: End _0116: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage 4 End _0127: diff --git a/res/field/scripts/scripts_twinleaf_town.s b/res/field/scripts/scripts_twinleaf_town.s index 60c50246aa..569812b186 100644 --- a/res/field/scripts/scripts_twinleaf_town.s +++ b/res/field/scripts/scripts_twinleaf_town.s @@ -469,13 +469,7 @@ TwinleafTown_Movement_RivalEnterHouse: EndMovement TwinleafTown_Collector: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message TwinleafTown_Text_TechnologyBlowsMeAway - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage TwinleafTown_Text_TechnologyBlowsMeAway End TwinleafTown_BreederF: diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s index 254e679af0..5de176cee2 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s @@ -778,13 +778,7 @@ TwinleafTownPlayerHouse1F_Movement_Unused4: TwinleafTownPlayerHouse1F_RivalsMom: BufferRivalName 1 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message TwinleafTownPlayerHouse1F_Text_HedProbablyHeadStraightToJubilife - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage TwinleafTownPlayerHouse1F_Text_HedProbablyHeadStraightToJubilife End TwinleafTownPlayerHouse1F_TV: @@ -797,57 +791,27 @@ TwinleafTownPlayerHouse1F_TV: End TwinleafTownPlayerHouse1F_CuteContestDigest: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownPlayerHouse1F_Text_CuteContestDigest - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownPlayerHouse1F_Text_CuteContestDigest End TwinleafTownPlayerHouse1F_SmartContestDigest: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownPlayerHouse1F_Text_SmartContestDigest - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownPlayerHouse1F_Text_SmartContestDigest End TwinleafTownPlayerHouse1F_ToughContestDigest: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownPlayerHouse1F_Text_ToughContestDigest - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownPlayerHouse1F_Text_ToughContestDigest End TwinleafTownPlayerHouse1F_Fridge: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownPlayerHouse1F_Text_MomsFavoriteDessertIsInRefrigerator - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownPlayerHouse1F_Text_MomsFavoriteDessertIsInRefrigerator End TwinleafTownPlayerHouse1F_KitchenSink: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownPlayerHouse1F_Text_MomsKitchenIsSpotless - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownPlayerHouse1F_Text_MomsKitchenIsSpotless End TwinleafTownPlayerHouse1F_KitchenCounter: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownPlayerHouse1F_Text_ThisIsWhereMomDoesHerDeliciousCooking - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownPlayerHouse1F_Text_ThisIsWhereMomDoesHerDeliciousCooking End .balign 4, 0 diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s index 7c8805023d..02723a8636 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s @@ -36,12 +36,7 @@ TwinleafTownPlayerHouse2F_OnFrame_ConcludeSpecialProgram: End TwinleafTownPlayerHouse2F_Wii: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownPlayerHouse2F_Text_ItsAWii - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownPlayerHouse2F_Text_ItsAWii End TwinleafTownPlayerHouse2F_PC: @@ -59,12 +54,7 @@ TwinleafTownPlayerHouse2F_ScrollingSign: End TwinleafTownPlayerHouse2F_TV: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownPlayerHouse2F_Text_MomBoughThisTVAsAGift - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownPlayerHouse2F_Text_MomBoughThisTVAsAGift End TwinleafTownPlayerHouse2F_RivalTriggerNorth: diff --git a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s index 2c7f7f4e1e..771bebb6ff 100644 --- a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s @@ -53,12 +53,7 @@ TwinleafTownRivalHouse2F_Movement_PlayerMoveAwayFromStairs: EndMovement TwinleafTownRivalHouse2F_Wii: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message TwinleafTownRivalHouse2F_Text_ItsAWii - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage TwinleafTownRivalHouse2F_Text_ItsAWii End TwinleafTownRivalHouse2F_PC: diff --git a/res/field/scripts/scripts_union_room.s b/res/field/scripts/scripts_union_room.s index c7e65a6979..681e1c80f1 100644 --- a/res/field/scripts/scripts_union_room.s +++ b/res/field/scripts/scripts_union_room.s @@ -720,13 +720,7 @@ _0BB2: Return _0BC0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 207 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 207 End _0BD3: diff --git a/res/field/scripts/scripts_unk_0173.s b/res/field/scripts/scripts_unk_0173.s index c8b03520b7..2a9359602d 100644 --- a/res/field/scripts/scripts_unk_0173.s +++ b/res/field/scripts/scripts_unk_0173.s @@ -5,13 +5,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_unk_1087.s b/res/field/scripts/scripts_unk_1087.s index ef07bc7b74..f0c6ed40da 100644 --- a/res/field/scripts/scripts_unk_1087.s +++ b/res/field/scripts/scripts_unk_1087.s @@ -6,23 +6,11 @@ ScriptEntryEnd _000A: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartCommon - ReleaseAll + PokeMartCommonWithGreeting End _0020: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_CELESTIC - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_CELESTIC End .balign 4, 0 diff --git a/res/field/scripts/scripts_valley_windworks_building.s b/res/field/scripts/scripts_valley_windworks_building.s index eb88366fa1..4082d817e8 100644 --- a/res/field/scripts/scripts_valley_windworks_building.s +++ b/res/field/scripts/scripts_valley_windworks_building.s @@ -57,13 +57,7 @@ _00A0: EndMovement _00AC: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _00BF: diff --git a/res/field/scripts/scripts_valor_lakefront.s b/res/field/scripts/scripts_valor_lakefront.s index 25a94db180..42331d4765 100644 --- a/res/field/scripts/scripts_valor_lakefront.s +++ b/res/field/scripts/scripts_valor_lakefront.s @@ -455,23 +455,11 @@ _0600: EndMovement _060C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 14 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 14 End _061F: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 15 End _0632: @@ -521,13 +509,7 @@ _06B8: End _06CF: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 17 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 17 End _06E2: diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index 24dc0d3fd6..04b18ea413 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/res/field/scripts/scripts_veilstone_city.s @@ -938,53 +938,23 @@ _0C08: EndMovement _0C18: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 43 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 43 End _0C2B: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 49 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 49 End _0C3E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 44 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 44 End _0C51: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 45 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 45 End _0C64: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 46 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 46 End _0C77: @@ -1014,23 +984,11 @@ _0CC7: End _0CD1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 47 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 47 End _0CE4: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 48 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 48 End VeilstoneCity_GalacticGruntWarehouseGuard: @@ -1286,13 +1244,7 @@ _0FE0: EndMovement _0FF0: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 42 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 42 End _1003: @@ -1454,13 +1406,7 @@ _1236: End _123E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 55 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 55 End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s index e754b16603..8006c066d1 100644 --- a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s +++ b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s @@ -131,13 +131,7 @@ _0174: EndMovement _0184: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 3 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 3 End _0197: diff --git a/res/field/scripts/scripts_veilstone_city_gym.s b/res/field/scripts/scripts_veilstone_city_gym.s index a180332959..f3b3a6414b 100644 --- a/res/field/scripts/scripts_veilstone_city_gym.s +++ b/res/field/scripts/scripts_veilstone_city_gym.s @@ -122,30 +122,15 @@ VeilstoneGym_GymStatueAfterBadge: End VeilstoneGym_LeftPoster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneGym_Text_GoodDeedEveryDay - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneGym_Text_GoodDeedEveryDay End VeilstoneGym_RightPoster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneGym_Text_TreasureEveryEncounter - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneGym_Text_TreasureEveryEncounter End VeilstoneGym_MiddlePoster: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneGym_Text_OneDayAtATime - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneGym_Text_OneDayAtATime End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_city_northeast_house.s b/res/field/scripts/scripts_veilstone_city_northeast_house.s index eb2103c670..ac82413794 100644 --- a/res/field/scripts/scripts_veilstone_city_northeast_house.s +++ b/res/field/scripts/scripts_veilstone_city_northeast_house.s @@ -88,13 +88,7 @@ _0114: End _011C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 8 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 8 End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_city_northwest_house.s b/res/field/scripts/scripts_veilstone_city_northwest_house.s index c51d33e024..cb1ca6f433 100644 --- a/res/field/scripts/scripts_veilstone_city_northwest_house.s +++ b/res/field/scripts/scripts_veilstone_city_northwest_house.s @@ -8,36 +8,15 @@ ScriptEntryEnd _000E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End _0021: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End _0034: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_BUNEARY - Message 2 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_BUNEARY, 2 End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s b/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s index 8d76aad3fe..7ab6421c43 100644 --- a/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s @@ -23,13 +23,7 @@ _001A: End _0032: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 1 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 1 End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_city_pokecenter_b1f.s b/res/field/scripts/scripts_veilstone_city_pokecenter_b1f.s index 75fd99e884..956bd6cded 100644 --- a/res/field/scripts/scripts_veilstone_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_veilstone_city_pokecenter_b1f.s @@ -6,13 +6,7 @@ ScriptEntryEnd _0006: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_city_prize_exchange.s b/res/field/scripts/scripts_veilstone_city_prize_exchange.s index edcc268c5a..1344e3ddc0 100644 --- a/res/field/scripts/scripts_veilstone_city_prize_exchange.s +++ b/res/field/scripts/scripts_veilstone_city_prize_exchange.s @@ -161,13 +161,7 @@ _0276: End _027E: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 15 End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_city_southeast_house.s b/res/field/scripts/scripts_veilstone_city_southeast_house.s index 4a016db958..39baaae3b9 100644 --- a/res/field/scripts/scripts_veilstone_city_southeast_house.s +++ b/res/field/scripts/scripts_veilstone_city_southeast_house.s @@ -121,13 +121,7 @@ _0168: EndMovement _018C: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 6 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 6 End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_city_southwest_house.s b/res/field/scripts/scripts_veilstone_city_southwest_house.s index 6c9bede630..3dd756f0b0 100644 --- a/res/field/scripts/scripts_veilstone_city_southwest_house.s +++ b/res/field/scripts/scripts_veilstone_city_southwest_house.s @@ -75,26 +75,11 @@ _00F6: End _0101: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 9 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 9 End _0114: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - WaitFanfare SEQ_SE_CONFIRM - PlayCry SPECIES_PACHIRISU - Message 10 - WaitCry - WaitABXPadPress - CloseMessage - ReleaseAll + PokemonCryAndMessage SPECIES_PACHIRISU, 10 End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_store_1f.s b/res/field/scripts/scripts_veilstone_store_1f.s index 45b9fb5b33..142a13def7 100644 --- a/res/field/scripts/scripts_veilstone_store_1f.s +++ b/res/field/scripts/scripts_veilstone_store_1f.s @@ -15,71 +15,31 @@ ScriptEntryEnd VeilstoneStore1F_Attendant: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore1F_Text_Welcome - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore1F_Text_Welcome End VeilstoneStore1F_MiddleAgedMan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore1F_Text_EnsureCustomerSatisfaction - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore1F_Text_EnsureCustomerSatisfaction End VeilstoneStore1F_Lady: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore1F_Text_FormalAirOfLuxury - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore1F_Text_FormalAirOfLuxury End VeilstoneStore1F_RightVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_1F_RIGHT - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_VEILSTONE_1F_RIGHT End VeilstoneStore1F_LeftVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_1F_LEFT - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_VEILSTONE_1F_LEFT End VeilstoneStore1F_Sign: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneStore1F_Text_DiscoverANewYou - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneStore1F_Text_DiscoverANewYou End VeilstoneStore1F_Directory: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneStore1F_Text_Directory - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneStore1F_Text_Directory End VeilstoneStore1F_Socialite: diff --git a/res/field/scripts/scripts_veilstone_store_2f.s b/res/field/scripts/scripts_veilstone_store_2f.s index 8668f5bbd5..648f606c4c 100644 --- a/res/field/scripts/scripts_veilstone_store_2f.s +++ b/res/field/scripts/scripts_veilstone_store_2f.s @@ -77,33 +77,15 @@ VeilstoneStore2F_AttendantXAccuracy: End VeilstoneStore2F_Lady: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore2F_Text_MatchingDressesForMeAndMyPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore2F_Text_MatchingDressesForMeAndMyPokemon End VeilstoneStore2F_BugCatcher1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore2F_Text_GivingHPUpToKricketot - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore2F_Text_GivingHPUpToKricketot End VeilstoneStore2F_BugCatcher2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore2F_Text_GettingTheCarbos - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore2F_Text_GettingTheCarbos End VeilstoneStore2F_PoketchVendor: @@ -138,42 +120,19 @@ VeilstoneStore2F_PoketchVendorDeclined: End VeilstoneStore2F_Unused: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore2F_Text_GivingCounterAppAsPromotion - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore2F_Text_GivingCounterAppAsPromotion End VeilstoneStore2F_TopVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_2F_UP - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_VEILSTONE_2F_UP End VeilstoneStore2F_MiddleVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_2F_MID - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_VEILSTONE_2F_MID End VeilstoneStore2F_Directory: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneStore2F_Text_Directory - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneStore2F_Text_Directory End .balign 4, 0 diff --git a/res/field/scripts/scripts_veilstone_store_3f.s b/res/field/scripts/scripts_veilstone_store_3f.s index 67b3f9271d..638f3a8cba 100644 --- a/res/field/scripts/scripts_veilstone_store_3f.s +++ b/res/field/scripts/scripts_veilstone_store_3f.s @@ -76,60 +76,25 @@ VeilstoneStore3F_AttendantThunder: End VeilstoneStore3F_Twin: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore3F_Text_FriendTradedMeMachoke - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore3F_Text_FriendTradedMeMachoke End VeilstoneStore3F_Guitarist: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore3F_Text_WroteSecretsInMyMail - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore3F_Text_WroteSecretsInMyMail End VeilstoneStore3F_Breeder: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore3F_Text_WouldLoveToBuyAllTheMerchandise - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore3F_Text_WouldLoveToBuyAllTheMerchandise End VeilstoneStore3F_TopVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_3F_UP - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_VEILSTONE_3F_UP End VeilstoneStore3F_BottomVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_3F_DOWN - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_VEILSTONE_3F_DOWN End VeilstoneStore3F_Directory: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneStore3F_Text_Directory - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneStore3F_Text_Directory End diff --git a/res/field/scripts/scripts_veilstone_store_4f.s b/res/field/scripts/scripts_veilstone_store_4f.s index 90dc0e5eca..537e82d015 100644 --- a/res/field/scripts/scripts_veilstone_store_4f.s +++ b/res/field/scripts/scripts_veilstone_store_4f.s @@ -76,33 +76,15 @@ VeilstoneStore4F_AttendantMantykeDoll: End VeilstoneStore4F_NinjaBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore4F_Text_ChuckAQuickBallOrTimerBall - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore4F_Text_ChuckAQuickBallOrTimerBall End VeilstoneStore4F_Pokefan: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore4F_Text_ThatBoySaysHeIsTrainingHisImage - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore4F_Text_ThatBoySaysHeIsTrainingHisImage End VeilstoneStore4F_SchoolBoy: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore4F_Text_NeedAnotherCopyOfGameToChallengePapa - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore4F_Text_NeedAnotherCopyOfGameToChallengePapa End VeilstoneStore4F_TopDecorVendor: @@ -126,10 +108,5 @@ VeilstoneStore4F_BottomDecorVendor: End VeilstoneStore4F_Directory: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneStore4F_Text_Directory - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneStore4F_Text_Directory End diff --git a/res/field/scripts/scripts_veilstone_store_5f.s b/res/field/scripts/scripts_veilstone_store_5f.s index adc55a257b..7fcd0ddb5e 100644 --- a/res/field/scripts/scripts_veilstone_store_5f.s +++ b/res/field/scripts/scripts_veilstone_store_5f.s @@ -18,23 +18,11 @@ ScriptEntryEnd VeilstoneStore5F_BugCatcher: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore5F_Text_GrabADrinkAndUnwind - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore5F_Text_GrabADrinkAndUnwind End VeilstoneStore5F_MiddleAgedWoman: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore5F_Text_TheyConsiderMeARegular - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore5F_Text_TheyConsiderMeARegular End VeilstoneStore5F_Collector1: @@ -65,22 +53,11 @@ VeilstoneStore5F_Collector1BagIsFull: End VeilstoneStore5F_Collector2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStore5F_Text_TwoBuffGuysSideBySide - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStore5F_Text_TwoBuffGuysSideBySide End VeilstoneStore5F_Directory: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneStore5F_Text_Directory - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneStore5F_Text_Directory End VeilstoneStore5F_VendingMachine: diff --git a/res/field/scripts/scripts_veilstone_store_b1f.s b/res/field/scripts/scripts_veilstone_store_b1f.s index 6891dff6e8..2b6acd1194 100644 --- a/res/field/scripts/scripts_veilstone_store_b1f.s +++ b/res/field/scripts/scripts_veilstone_store_b1f.s @@ -24,63 +24,27 @@ ScriptEntryEnd VeilstoneStoreB1F_Gentleman: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStoreB1F_Text_IBoughtAllTheRageCandyBars - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStoreB1F_Text_IBoughtAllTheRageCandyBars End VeilstoneStoreB1F_Socialite1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStoreB1F_Text_HopelessAtCookingPoffins - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStoreB1F_Text_HopelessAtCookingPoffins End VeilstoneStoreB1F_Socialite2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStoreB1F_Text_FlavorsOfPoffinsAffectConditionOfPokemon - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStoreB1F_Text_FlavorsOfPoffinsAffectConditionOfPokemon End VeilstoneStoreB1F_Attendant1: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStoreB1F_Text_Welcome - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStoreB1F_Text_Welcome End VeilstoneStoreB1F_Attendant2: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStoreB1F_Text_WeHaveBerriesOnSale - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStoreB1F_Text_WeHaveBerriesOnSale End VeilstoneStoreB1F_RageCandyBarVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message VeilstoneStoreB1F_Text_AllSoldOut - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage VeilstoneStoreB1F_Text_AllSoldOut End VeilstoneStoreB1F_ProfRowan: @@ -110,13 +74,7 @@ VeilstoneStoreB1F_ProfRowanClose: End VeilstoneStoreB1F_BerryVendor: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Common_VendorGreeting - CloseMessageWithoutErasing - PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_B1F - ReleaseAll + PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_VEILSTONE_B1F End VeilstoneStoreB1F_LavaCookieVendor: @@ -456,12 +414,7 @@ VeilstoneStoreB1F_IncrementDepartmentStoreRegularCounter: Return VeilstoneStoreB1F_Directory: - PlayFanfare SEQ_SE_CONFIRM - LockAll - Message VeilstoneStoreB1F_Text_Directory - WaitABXPadPress - CloseMessage - ReleaseAll + EventMessage VeilstoneStoreB1F_Text_Directory End .balign 4, 0 diff --git a/res/field/scripts/scripts_verity_lakefront_unknown_house.s b/res/field/scripts/scripts_verity_lakefront_unknown_house.s index c4b08c5806..3be12a9067 100644 --- a/res/field/scripts/scripts_verity_lakefront_unknown_house.s +++ b/res/field/scripts/scripts_verity_lakefront_unknown_house.s @@ -7,11 +7,5 @@ _0006: BufferPlayerName 0 - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 0 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 0 End diff --git a/res/field/scripts/scripts_vista_lighthouse.s b/res/field/scripts/scripts_vista_lighthouse.s index c479d70024..756086ae62 100644 --- a/res/field/scripts/scripts_vista_lighthouse.s +++ b/res/field/scripts/scripts_vista_lighthouse.s @@ -9,23 +9,11 @@ ScriptEntryEnd _0012: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 4 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 4 End _0025: - PlayFanfare SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 5 - WaitABXPadPress - CloseMessage - ReleaseAll + NPCMessage 5 End _0038: