diff options
Diffstat (limited to 'data/scripts')
81 files changed, 252 insertions, 252 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b8aef7c3d..bd633a115 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -450,8 +450,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD special HealPlayerParty - special copy_player_party_to_sav1 - special copy_bags_and_unk_data_from_save_blocks + special SavePlayerParty + special LoadPlayerBag copyvar VAR_0x4087, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage @@ -787,9 +787,9 @@ MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360 gUnknown_08277365:: @ 8277365 lockall setvar VAR_0x8004, 0 - special sub_813C4BC + special ShowLinkBattleRecords waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -916,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471 releaseall end -gUnknown_0827747E:: @ 827747E +EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E msgbox Text_278452, 4 fadescreen 1 special sp02A_crash_sound waitstate end -gUnknown_0827748D:: @ 827748D +EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D msgbox Text_27847B, 4 fadescreen 1 special sp02A_crash_sound waitstate end -gUnknown_0827749C:: @ 827749C +EventScript_TradeRoom_TooBusyToNotice:: @ 827749C msgbox Text_27842E, 4 closemessage end @@ -983,7 +983,7 @@ gUnknown_08277509:: @ 8277509 special sub_80B371C end -gUnknown_08277513:: @ 8277513 +EventScript_277513:: @ 8277513 special sub_80B36EC special sub_80AF9F8 waitstate diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index ab710546b..2ffe3afc7 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -13,7 +13,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 setvar VAR_0x8004, 642 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 642 callstd 8 release @@ -36,7 +36,7 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 setvar VAR_0x8004, 642 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 642 callstd 8 release diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/scripts/maps/AbandonedShip_Rooms_1F.inc index 00fde5ccb..2a6bc36b6 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_1F.inc @@ -24,7 +24,7 @@ AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF waitmovement 0 msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4 setvar VAR_0x8004, 144 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 144 callstd 8 release diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 52351b549..88a0f9989 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -136,8 +136,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4 - special copy_player_party_from_sav1 - special copy_player_party_to_sav1 + special LoadPlayerParty + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index 303a2c4c9..176b153f7 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -89,7 +89,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 setvar VAR_0x8004, 8 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 @@ -134,7 +134,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 faceplayer setvar VAR_FRONTIER_FACILITY, 3 setvar VAR_0x40CE, 0 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4 BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B @@ -196,7 +196,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattleArenaLobby_EventScript_27134F @@ -205,7 +205,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -248,7 +248,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 goto BattleFrontier_BattleArenaLobby_EventScript_255FFB BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8 - special copy_player_party_from_sav1 + special LoadPlayerParty BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4 @@ -348,7 +348,7 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 setvar VAR_0x8005, 3 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index 33b5654d0..f985606de 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -76,7 +76,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9 message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -94,7 +94,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 special sub_818E9AC - special copy_player_party_from_sav1 + special LoadPlayerParty special HealPlayerParty goto BattleFrontier_BattleDomeLobby_EventScript_249991 @@ -103,7 +103,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4 message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -117,7 +117,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special sub_818E9AC - special copy_player_party_from_sav1 + special LoadPlayerParty special HealPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 @@ -181,7 +181,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 end BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 - special copy_player_party_to_sav1 + special SavePlayerParty compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD compare VAR_0x40CE, 1 @@ -245,7 +245,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattleDomeLobby_EventScript_27134F @@ -256,7 +256,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 special sub_818E9AC BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -299,7 +299,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A goto BattleFrontier_BattleDomeLobby_EventScript_249C64 BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61 - special copy_player_party_from_sav1 + special LoadPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64 msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 @@ -415,7 +415,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 setvar VAR_0x8006, 0 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -426,7 +426,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B setvar VAR_0x8006, 1 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index 5de099292..a9b6af7f7 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -243,7 +243,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 setvar VAR_0x4000, 1 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 791a666d5..4a52743a5 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -74,7 +74,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 waitmessage setvar VAR_0x8004, 8 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_81A5E74 @@ -89,7 +89,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 waitmessage setvar VAR_0x8004, 8 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 @@ -154,7 +154,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD end BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED - special copy_player_party_to_sav1 + special SavePlayerParty compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 compare VAR_0x40CE, 1 @@ -215,7 +215,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_0x8006, 0 BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A - special copy_player_party_to_sav1 + special SavePlayerParty msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 closemessage compare VAR_0x40CE, 0 @@ -253,7 +253,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 goto BattleFrontier_BattleFactoryLobby_EventScript_25879D BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A - special copy_player_party_from_sav1 + special LoadPlayerParty BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 @@ -305,7 +305,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 setvar VAR_0x8006, 0 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -316,7 +316,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA setvar VAR_0x8006, 1 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 4c0528e34..2f5cdeef2 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -236,7 +236,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47 end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 special sub_81A5E74 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index ccd285a3a..8393d7501 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -93,8 +93,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4 - special copy_player_party_from_sav1 - special copy_player_party_to_sav1 + special LoadPlayerParty + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index 2e0f152b4..11fc42ced 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -89,7 +89,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 setvar VAR_0x8004, 8 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 @@ -152,7 +152,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 special sub_8195960 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 - special copy_player_party_to_sav1 + special SavePlayerParty compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E compare VAR_0x40CE, 1 @@ -220,7 +220,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattlePalaceLobby_EventScript_27134F @@ -229,7 +229,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -272,7 +272,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94 BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91 - special copy_player_party_from_sav1 + special LoadPlayerParty BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94 msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 @@ -366,7 +366,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 setvar VAR_0x8006, 0 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -377,7 +377,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69 setvar VAR_0x8006, 1 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 40b5e437f..f78cec646 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -76,7 +76,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D setvar VAR_0x8005, 3 copyvar VAR_0x8006, VAR_RESULT special sub_81A703C - special copy_player_party_from_sav1 + special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 27 special sub_81A703C @@ -107,7 +107,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 special sub_81A703C - special copy_player_party_from_sav1 + special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 27 special sub_81A703C @@ -127,7 +127,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 faceplayer setvar VAR_FRONTIER_FACILITY, 5 setvar VAR_0x40CE, 0 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4 BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F @@ -192,7 +192,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattlePikeLobby_EventScript_27134F @@ -201,7 +201,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special sub_81A703C compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -242,7 +242,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C goto BattleFrontier_BattlePikeLobby_EventScript_25BA76 BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73 - special copy_player_party_from_sav1 + special LoadPlayerParty BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76 msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 @@ -257,7 +257,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 setvar VAR_0x8005, 5 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index 74da4c01c..d4723acc7 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -45,7 +45,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 setvar VAR_0x8006, 0 special sub_81A1780 setvar VAR_0x4000, 255 - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -136,7 +136,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD special sub_81A1780 message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 waitmessage - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 8 setvar VAR_0x8005, 2 special sub_81A703C diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index cff676124..29485ef12 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -28,7 +28,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F - special AddMapNamePopUpWindowTask + special ShowMapNamePopup setvar VAR_0x400F, 0 end @@ -99,7 +99,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8004, 3 setvar VAR_0x8005, 1 special sub_81A8E7C - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 @@ -180,12 +180,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88 BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D .string "This is a sample message.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252CA7:: @ 8252CA7 +gText_BattlePyramidConfirmRest:: @ 8252CA7 .string "Your BATTLE PYRAMID quest will be\n" .string "saved so that you may quit for now.\l" .string "Is that okay?$" -BattleFrontier_BattlePyramidEmptySquare_Text_252CFB:: @ 8252CFB +gText_BattlePyramidConfirmRetire:: @ 8252CFB .string "Are you sure you want to quit your\n" .string "PYRAMID quest?$" diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index 9455479a7..eab2bb18c 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -67,7 +67,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA clearflag FLAG_SPECIAL_FLAG_0x4004 setvar VAR_0x8004, 8 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 14 special sub_81A8E7C special HealPlayerParty @@ -97,7 +97,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 setvar VAR_0x8004, 8 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 14 special sub_81A8E7C special HealPlayerParty @@ -131,7 +131,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 faceplayer setvar VAR_FRONTIER_FACILITY, 6 setvar VAR_0x40CE, 0 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4 BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8 @@ -197,7 +197,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 special sub_81A8E7C setvar VAR_0x8004, 9 special sub_81A8E7C - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattlePyramidLobby_EventScript_27134F @@ -206,7 +206,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -249,7 +249,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4 BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1 - special copy_player_party_from_sav1 + special LoadPlayerParty BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4 msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4 @@ -428,7 +428,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 setvar VAR_0x8005, 6 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 6c44e0044..07e66efa8 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -64,7 +64,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 end BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A - special AddMapNamePopUpWindowTask + special ShowMapNamePopup setvar VAR_0x400F, 0 end @@ -72,7 +72,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 setvar VAR_0x8004, 3 setvar VAR_0x8005, 1 special sub_81A8E7C - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index feaa18c8d..ec2994591 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -153,7 +153,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118 delay 48 BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 special sub_81A1780 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index def3dd122..774507df9 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -152,7 +152,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D waitmessage setvar VAR_0x8004, 8 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 @@ -240,7 +240,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 lock faceplayer setvar VAR_FRONTIER_FACILITY, 0 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4 BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 @@ -299,7 +299,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F @@ -320,7 +320,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F lock faceplayer setvar VAR_FRONTIER_FACILITY, 0 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4 BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 @@ -379,7 +379,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F @@ -401,7 +401,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 faceplayer setvar VAR_FRONTIER_FACILITY, 0 clearflag FLAG_0x152 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4 BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D @@ -460,7 +460,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F @@ -481,7 +481,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74 lock faceplayer setvar VAR_FRONTIER_FACILITY, 0 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4 BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 @@ -540,7 +540,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 setvar VAR_0x8004, 6 @@ -636,7 +636,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 setvar VAR_0x8006, 0 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -647,7 +647,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 setvar VAR_0x8006, 1 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -658,7 +658,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 setvar VAR_0x8006, 2 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -669,7 +669,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012 setvar VAR_0x8006, 3 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -722,7 +722,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 end BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3 - special copy_player_party_from_sav1 + special LoadPlayerParty BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6 special CloseLink @@ -733,7 +733,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3 - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 call BattleFrontier_BattleTowerLobby_EventScript_23F272 special sub_81A1780 diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/scripts/maps/BattleFrontier_RankingHall.inc index b13bfe343..e469024e9 100644 --- a/data/scripts/maps/BattleFrontier_RankingHall.inc +++ b/data/scripts/maps/BattleFrontier_RankingHall.inc @@ -66,7 +66,7 @@ BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522 waitbuttonpress special sub_81A4AE8 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index afaf9a605..0435692f4 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -86,7 +86,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setvar VAR_0x8004, 410 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 3f9518722..4d4c3732d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - special sub_81229C8 + special TrendyPhraseIsOld compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD4EF msgbox DewfordTown_Hall_Text_1FD818, 4 @@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 lockall call DewfordTown_Hall_EventScript_271E8B - special sub_8122A30 + special GetDewfordHallPaintingNameIndex switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_1FD607 case 4, DewfordTown_Hall_EventScript_1FD607 @@ -133,7 +133,7 @@ DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 call DewfordTown_Hall_EventScript_271E8B - special sub_8122A30 + special GetDewfordHallPaintingNameIndex switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_1FD6AD case 1, DewfordTown_Hall_EventScript_1FD6AD diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index b4d0a5d9c..16cb9fff5 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -72,7 +72,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -103,8 +103,8 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 waitmovement 0 msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4 - special copy_player_party_from_sav1 - special copy_player_party_to_sav1 + special LoadPlayerParty + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -157,7 +157,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate setvar VAR_0x8004, 1 diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 347c55659..78a067a55 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -134,7 +134,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 special sub_81B9B80 compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4 FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 @@ -188,7 +188,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call FallarborTown_BattleTentLobby_EventScript_27134F @@ -197,7 +197,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -234,7 +234,7 @@ FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB goto FallarborTown_BattleTentLobby_EventScript_2001C5 FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2 - special copy_player_party_from_sav1 + special LoadPlayerParty FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5 msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4 diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index d3132b202..23bdac560 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -143,7 +143,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 setvar VAR_0x8004, 151 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index fc069a8ee..b8b800286 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -4,7 +4,7 @@ FortreeCity_Gym_MapScripts:: @ 82165AB .byte 0 FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 - special sub_80FBE90 + special RotatingGate_InitPuzzle end FortreeCity_Gym_MapScript2_2165BA: @ 82165BA @@ -12,7 +12,7 @@ FortreeCity_Gym_MapScript2_2165BA: @ 82165BA .2byte 0 FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 - special sub_80FBED0 + special RotatingGate_InitPuzzleAndGraphics end FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index e5c393221..15ac1bae6 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -115,7 +115,7 @@ JaggedPass_EventScript_2307C8:: @ 82307C8 special sub_80B4808 msgbox JaggedPass_Text_230A2C, 4 setvar VAR_0x8004, 474 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 474 callstd 8 release @@ -139,7 +139,7 @@ JaggedPass_EventScript_230827:: @ 8230827 special sub_80B4808 msgbox JaggedPass_Text_230BC6, 4 setvar VAR_0x8004, 216 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 216 callstd 8 release diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index beb96e171..4a7279fb2 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -554,7 +554,7 @@ LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A lockall special ShowBerryBlenderRecordWindow waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end @@ -564,7 +564,7 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 setvar VAR_0x8005, 7 special sub_81A1780 waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 0e7ecbf22..a5223d38a 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -259,7 +259,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 - special sub_816AE58 + special BedroomPC waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 327112d2f..f300b5849 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -320,7 +320,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 - special sub_816AE58 + special BedroomPC waitstate releaseall end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 1c48e9710..40578a907 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -5,18 +5,18 @@ MauvilleCity_MapScripts:: @ 81DF385 MauvilleCity_MapScript1_1DF38B: @ 81DF38B setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_0x09D - clearflag FLAG_0x3C1 + clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION setflag FLAG_SYS_TV_START clearflag FLAG_0x063 setvar VAR_0x4093, 0 - checkflag FLAG_0x0D1 + checkflag FLAG_GOT_TM24_FROM_WATTSON call_if 1, MauvilleCity_EventScript_1DF3A9 end MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 - clearflag FLAG_0x391 - setflag FLAG_0x390 - setflag FLAG_0x05B + clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON + setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON + setflag FLAG_WATTSON_REMATCH_AVAILABLE return MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 @@ -424,15 +424,15 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F MauvilleCity_EventScript_1DF73A:: @ 81DF73A lock faceplayer - checkflag FLAG_0x0D1 + checkflag FLAG_GOT_TM24_FROM_WATTSON goto_eq MauvilleCity_EventScript_1DF7B0 compare VAR_0x40BA, 2 goto_eq MauvilleCity_EventScript_1DF784 - checkflag FLAG_0x0D0 + checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON goto_eq MauvilleCity_EventScript_1DF77A msgbox MauvilleCity_Text_1DFFE4, 4 giveitem_std ITEM_BASEMENT_KEY - setflag FLAG_0x0D0 + setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON msgbox MauvilleCity_Text_1E0154, 4 release end @@ -447,7 +447,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784 giveitem_std ITEM_TM24 compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_272054 - setflag FLAG_0x0D1 + setflag FLAG_GOT_TM24_FROM_WATTSON msgbox MauvilleCity_Text_1E02AA, 4 release end diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index d4915a478..0231e5bde 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -58,7 +58,7 @@ MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 msgbox MauvilleCity_BikeShop_Text_20F1BD, 4 - special sub_80D6EDC + special SwapRegisteredBike release end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 9b8561873..03b7928aa 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 end MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 - special sub_8120B5C + special ScrSpecial_SetMauvilleOldManMapObjGfx end MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 76aad489f..4f4ab7c6b 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -15,7 +15,7 @@ MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A waitmovement 0 msgbox MeteorFalls_1F_2R_Text_22C6F6, 4 setvar VAR_0x8004, 392 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 392 callstd 8 release @@ -38,7 +38,7 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 msgbox MeteorFalls_1F_2R_Text_22C99C, 4 setvar VAR_0x8004, 681 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 681 callstd 8 release @@ -61,7 +61,7 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 msgbox MeteorFalls_1F_2R_Text_22C99C, 4 setvar VAR_0x8004, 681 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 681 callstd 8 release diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index b23da6481..cee99c4d5 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -250,13 +250,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA waitmovement 0 - special copy_player_party_to_sav1 + special SavePlayerParty fadescreen 1 special sub_80F9438 waitstate compare VAR_RESULT, 0 goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032 - special copy_player_party_from_sav1 + special LoadPlayerParty goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 @@ -270,7 +270,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 waitstate setvar VAR_0x8004, 6 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty switch VAR_RESULT case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 fadescreen 1 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index e445fc23f..b4825579c 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -500,7 +500,7 @@ MtChimney_EventScript_22F176:: @ 822F176 waitmovement 0 msgbox MtChimney_Text_2300E3, 4 setvar VAR_0x8004, 313 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 313 callstd 8 release @@ -545,7 +545,7 @@ MtChimney_EventScript_22F234:: @ 822F234 waitmovement 0 msgbox MtChimney_Text_230557, 4 setvar VAR_0x8004, 1 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 1 callstd 8 release diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/scripts/maps/MtPyre_3F.inc index 0d733a433..ec5373509 100644 --- a/data/scripts/maps/MtPyre_3F.inc +++ b/data/scripts/maps/MtPyre_3F.inc @@ -25,7 +25,7 @@ MtPyre_3F_EventScript_2317AD:: @ 82317AD waitmovement 0 msgbox MtPyre_3F_Text_231A49, 4 setvar VAR_0x8004, 9 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 9 callstd 8 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 7a98eb2ab..8d5d912c2 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -15,7 +15,7 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67 waitmovement 0 msgbox MtPyre_6F_Text_231E43, 4 setvar VAR_0x8004, 108 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 108 callstd 8 release diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc index dc99ec7f7..cce93e624 100644 --- a/data/scripts/maps/NavelRock_Bottom.inc +++ b/data/scripts/maps/NavelRock_Bottom.inc @@ -59,7 +59,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 setvar VAR_0x8004, 249 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index af3586554..07a90e7b7 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -63,7 +63,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_0x8004, 250 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 0da686052..c297d61a7 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -30,7 +30,7 @@ PetalburgCity_MapScript2_1DC31C: @ 81DC31C PetalburgCity_EventScript_1DC32E:: @ 81DC32E lockall - special copy_player_party_to_sav1 + special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_1DC451 applymovement 255, PetalburgCity_Movement_1DC430 @@ -47,7 +47,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E setvar VAR_0x4057, 3 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x4085, 1 warp PETALBURG_CITY_GYM, 255, 4, 108 waitstate diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 627ae904c..2751e345e 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -423,8 +423,8 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B setflag FLAG_BADGE05_GET special sub_813B9A0 call PetalburgCity_Gym_EventScript_2721F8 - setflag FLAG_0x391 - clearflag FLAG_0x390 + setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON + clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON setvar VAR_0x8008, 5 call PetalburgCity_Gym_EventScript_271F43 clearflag FLAG_0x3AC diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 5afb12d68..907f07623 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -301,7 +301,7 @@ PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 msgbox PetalburgWoods_Text_22E8C3, 4 setvar VAR_0x8004, 621 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 621 callstd 8 release @@ -317,7 +317,7 @@ PetalburgWoods_EventScript_22E2EF:: @ 822E2EF PetalburgWoods_EventScript_22E302:: @ 822E302 msgbox PetalburgWoods_Text_22E914, 4 setvar VAR_0x8004, 621 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 621 callstd 8 release diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index ae82ea0b4..cd817df35 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -41,7 +41,7 @@ Route102_EventScript_1EC146:: @ 81EC146 Route102_EventScript_1EC157:: @ 81EC157 msgbox Route102_Text_294668, 4 setvar VAR_0x8004, 318 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 318 callstd 8 release @@ -57,7 +57,7 @@ Route102_EventScript_1EC170:: @ 81EC170 Route102_EventScript_1EC183:: @ 81EC183 msgbox Route102_Text_2945EB, 4 setvar VAR_0x8004, 318 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 318 callstd 8 release diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index fa055a971..d71ec729c 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -218,7 +218,7 @@ Route103_EventScript_1EC60B:: @ 81EC60B Route103_EventScript_1EC63A:: @ 81EC63A msgbox Route103_Text_294B8A, 4 setvar VAR_0x8004, 481 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 481 callstd 8 release @@ -240,7 +240,7 @@ Route103_EventScript_1EC66E:: @ 81EC66E Route103_EventScript_1EC69D:: @ 81EC69D msgbox Route103_Text_294B8A, 4 setvar VAR_0x8004, 481 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 481 callstd 8 release @@ -270,7 +270,7 @@ Route103_EventScript_1EC714:: @ 81EC714 waitmovement 0 msgbox Route103_Text_294F7E, 4 setvar VAR_0x8004, 293 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 293 callstd 8 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index e672b7ad2..314b47e1d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -904,7 +904,7 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE Route104_EventScript_1ED3DF:: @ 81ED3DF msgbox Route104_Text_29576B, 4 setvar VAR_0x8004, 604 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 604 callstd 8 release @@ -920,7 +920,7 @@ Route104_EventScript_1ED3F8:: @ 81ED3F8 Route104_EventScript_1ED40B:: @ 81ED40B msgbox Route104_Text_2956FF, 4 setvar VAR_0x8004, 604 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 604 callstd 8 release @@ -955,7 +955,7 @@ Route104_EventScript_1ED47C:: @ 81ED47C Route104_EventScript_1ED48D:: @ 81ED48D msgbox Route104_Text_29595A, 4 setvar VAR_0x8004, 136 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 136 callstd 8 release @@ -971,7 +971,7 @@ Route104_EventScript_1ED4A6:: @ 81ED4A6 Route104_EventScript_1ED4B9:: @ 81ED4B9 msgbox Route104_Text_2958F8, 4 setvar VAR_0x8004, 136 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 136 callstd 8 release @@ -1006,7 +1006,7 @@ Route104_EventScript_1ED52A:: @ 81ED52A Route104_EventScript_1ED53B:: @ 81ED53B msgbox Route104_Text_295B60, 4 setvar VAR_0x8004, 114 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 114 callstd 8 release @@ -1022,7 +1022,7 @@ Route104_EventScript_1ED554:: @ 81ED554 Route104_EventScript_1ED567:: @ 81ED567 msgbox Route104_Text_295B01, 4 setvar VAR_0x8004, 114 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 114 callstd 8 release diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 32c6826af..3cb6d9ae6 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -75,7 +75,7 @@ Route105_EventScript_1EE300:: @ 81EE300 waitmovement 0 msgbox Route105_Text_296159, 4 setvar VAR_0x8004, 737 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 737 callstd 8 release diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 132621cb8..fdfff0587 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -29,7 +29,7 @@ Route106_EventScript_1EE4ED:: @ 81EE4ED waitmovement 0 msgbox Route106_Text_2963E3, 4 setvar VAR_0x8004, 339 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 339 callstd 8 release diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index b7d144ef2..2c8364592 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -20,7 +20,7 @@ Route107_EventScript_1EE5D8:: @ 81EE5D8 waitmovement 0 msgbox Route107_Text_29685A, 4 setvar VAR_0x8004, 155 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 155 callstd 8 release diff --git a/data/scripts/maps/Route108.inc b/data/scripts/maps/Route108.inc index e77006508..25657c5a4 100644 --- a/data/scripts/maps/Route108.inc +++ b/data/scripts/maps/Route108.inc @@ -40,7 +40,7 @@ Route108_EventScript_1EE729:: @ 81EE729 waitmovement 0 msgbox Route108_Text_296FD8, 4 setvar VAR_0x8004, 740 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 740 callstd 8 release diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index d708246de..123f78db1 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -409,7 +409,7 @@ Route109_EventScript_1EEAC5:: @ 81EEAC5 waitmovement 0 msgbox Route109_Text_2973C1, 4 setvar VAR_0x8004, 64 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 64 callstd 8 release @@ -434,7 +434,7 @@ Route109_EventScript_1EEB27:: @ 81EEB27 waitmovement 0 msgbox Route109_Text_297520, 4 setvar VAR_0x8004, 57 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 57 callstd 8 release diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 3c743fb3c..9d00303c9 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -188,7 +188,7 @@ Route110_EventScript_1EF44C:: @ 81EF44C waitmovement 0 msgbox Route110_Text_298201, 4 setvar VAR_0x8004, 512 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 512 callstd 8 release @@ -228,7 +228,7 @@ Route110_EventScript_1EF4F3:: @ 81EF4F3 waitmovement 0 msgbox Route110_Text_297CFE, 4 setvar VAR_0x8004, 353 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 353 callstd 8 release @@ -258,7 +258,7 @@ Route110_EventScript_1EF56C:: @ 81EF56C waitmovement 0 msgbox Route110_Text_297ECD, 4 setvar VAR_0x8004, 358 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 358 callstd 8 release @@ -283,7 +283,7 @@ Route110_EventScript_1EF5CE:: @ 81EF5CE waitmovement 0 msgbox Route110_Text_2983EE, 4 setvar VAR_0x8004, 302 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 302 callstd 8 release diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index a043b2ec4..0a0e025af 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 .byte 0 Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 - special sub_80FBE90 + special RotatingGate_InitPuzzle end Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6 @@ -12,7 +12,7 @@ Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6 .2byte 0 Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 - special sub_80FBED0 + special RotatingGate_InitPuzzleAndGraphics end Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 8e1672dfe..a23565c14 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -485,7 +485,7 @@ Route111_EventScript_1F128C:: @ 81F128C waitmovement 0 msgbox Route111_Text_298C00, 4 setvar VAR_0x8004, 44 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 44 callstd 8 release @@ -525,7 +525,7 @@ Route111_EventScript_1F1333:: @ 81F1333 waitmovement 0 msgbox Route111_Text_29903D, 4 setvar VAR_0x8004, 78 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 78 callstd 8 release @@ -550,7 +550,7 @@ Route111_EventScript_1F1395:: @ 81F1395 waitmovement 0 msgbox Route111_Text_29921D, 4 setvar VAR_0x8004, 94 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 94 callstd 8 release diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 88262fadb..0ad5ee47c 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -79,7 +79,7 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD waitmovement 0 msgbox Route112_Text_29993C, 4 setvar VAR_0x8004, 627 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 627 callstd 8 release diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index c1ce29b72..d990527a6 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -72,7 +72,7 @@ Route113_EventScript_1F221A:: @ 81F221A waitmovement 0 msgbox Route113_Text_299F49, 4 setvar VAR_0x8004, 434 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 434 callstd 8 release @@ -97,7 +97,7 @@ Route113_EventScript_1F227C:: @ 81F227C waitmovement 0 msgbox Route113_Text_29A0A2, 4 setvar VAR_0x8004, 419 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 419 callstd 8 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 6be6bea91..9443d35bc 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -122,7 +122,7 @@ Route114_EventScript_1F26C8:: @ 81F26C8 waitmovement 0 msgbox Route114_Text_29A9F7, 4 setvar VAR_0x8004, 143 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 143 callstd 8 release @@ -147,7 +147,7 @@ Route114_EventScript_1F272A:: @ 81F272A waitmovement 0 msgbox Route114_Text_29ABA6, 4 setvar VAR_0x8004, 206 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 206 callstd 8 release diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 69edd5830..2d4f7c2e3 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -50,7 +50,7 @@ Route115_EventScript_1F29BA:: @ 81F29BA waitmovement 0 msgbox Route115_Text_29B2B3, 4 setvar VAR_0x8004, 307 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 307 callstd 8 release @@ -80,7 +80,7 @@ Route115_EventScript_1F2A33:: @ 81F2A33 waitmovement 0 msgbox Route115_Text_29B50B, 4 setvar VAR_0x8004, 183 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 183 callstd 8 release @@ -105,7 +105,7 @@ Route115_EventScript_1F2A95:: @ 81F2A95 waitmovement 0 msgbox Route115_Text_29B6AB, 4 setvar VAR_0x8004, 427 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 427 callstd 8 release diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 00bc1ff6c..a8d73397c 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -281,7 +281,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 waitmovement 0 msgbox Route116_Text_29BE71, 4 setvar VAR_0x8004, 273 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 273 callstd 8 release @@ -297,7 +297,7 @@ Route116_EventScript_1F2F22:: @ 81F2F22 Route116_EventScript_1F2F35:: @ 81F2F35 msgbox Route116_Text_29BDEF, 4 setvar VAR_0x8004, 273 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 273 callstd 8 release @@ -342,7 +342,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF waitmovement 0 msgbox Route116_Text_29C096, 4 setvar VAR_0x8004, 280 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 280 callstd 8 release @@ -358,7 +358,7 @@ Route116_EventScript_1F2FFE:: @ 81F2FFE Route116_EventScript_1F3011:: @ 81F3011 msgbox Route116_Text_29C052, 4 setvar VAR_0x8004, 280 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 280 callstd 8 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 20240dc82..55a7b910e 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -52,7 +52,7 @@ Route117_EventScript_1F39FC:: @ 81F39FC waitmovement 0 msgbox Route117_Text_29C508, 4 setvar VAR_0x8004, 538 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 538 callstd 8 release @@ -77,7 +77,7 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E waitmovement 0 msgbox Route117_Text_29C6BC, 4 setvar VAR_0x8004, 545 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 545 callstd 8 release @@ -102,7 +102,7 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0 waitmovement 0 msgbox Route117_Text_29C846, 4 setvar VAR_0x8004, 364 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 364 callstd 8 release @@ -127,7 +127,7 @@ Route117_EventScript_1F3B22:: @ 81F3B22 waitmovement 0 msgbox Route117_Text_29CA32, 4 setvar VAR_0x8004, 369 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 369 callstd 8 release @@ -155,7 +155,7 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F Route117_EventScript_1F3B9F:: @ 81F3B9F msgbox Route117_Text_29CD1D, 4 setvar VAR_0x8004, 287 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 287 callstd 8 release @@ -178,7 +178,7 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 Route117_EventScript_1F3C03:: @ 81F3C03 msgbox Route117_Text_29CD1D, 4 setvar VAR_0x8004, 287 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 287 callstd 8 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 4894e8187..27a2539e1 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -200,7 +200,7 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3 waitmovement 0 msgbox Route118_Text_29D343, 4 setvar VAR_0x8004, 37 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 37 callstd 8 release @@ -235,7 +235,7 @@ Route118_EventScript_1F4043:: @ 81F4043 waitmovement 0 msgbox Route118_Text_29D74A, 4 setvar VAR_0x8004, 196 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 196 callstd 8 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 72707186b..5f60851b4 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -18,7 +18,7 @@ Route119_EventScript_1F4439:: @ 81F4439 Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271ED7 call Route119_EventScript_271EFB - compare VAR_0x40B3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_EventScript_1F4466 special SetRoute119Weather end @@ -26,7 +26,7 @@ Route119_MapScript1_1F444D: @ 81F444D Route119_EventScript_1F4466:: @ 81F4466 setflag FLAG_0x37D clearflag FLAG_0x37C - setvar VAR_0x40B3, 2 + setvar VAR_WEATHER_INSTITUTE_STATE, 2 return Route119_EventScript_1F4472:: @ 81F4472 @@ -380,7 +380,7 @@ Route119_EventScript_1F483C:: @ 81F483C waitmovement 0 msgbox Route119_Text_29DD1C, 4 setvar VAR_0x8004, 552 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 552 callstd 8 release @@ -405,7 +405,7 @@ Route119_EventScript_1F489E:: @ 81F489E waitmovement 0 msgbox Route119_Text_29DEF7, 4 setvar VAR_0x8004, 559 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 559 callstd 8 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 399692db3..b008f52c0 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 .byte 0 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C - compare VAR_0x40B3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98 end @@ -16,7 +16,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 lock faceplayer special GetPlayerBigGuyGirlString - compare VAR_0x40B3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 38f79763d..c8f24f33d 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -3,9 +3,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E .byte 0 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 - compare VAR_0x40B3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44 - compare VAR_0x40B3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50 checkflag FLAG_SYS_GAME_CLEAR call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C @@ -62,7 +62,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4 closemessage - setvar VAR_0x40B3, 1 + setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_0x37D fadedefaultbgm fadescreen 1 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index f89ac7e86..b3475a3ed 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -309,7 +309,7 @@ Route120_EventScript_1F581A:: @ 81F581A waitmovement 0 msgbox Route120_Text_29E75D, 4 setvar VAR_0x8004, 406 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 406 callstd 8 release @@ -344,7 +344,7 @@ Route120_EventScript_1F58AA:: @ 81F58AA waitmovement 0 msgbox Route120_Text_29EA31, 4 setvar VAR_0x8004, 226 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 226 callstd 8 release diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index c813fe6ac..d579401b8 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -84,7 +84,7 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7 waitmovement 0 msgbox Route121_Text_29F25B, 4 setvar VAR_0x8004, 254 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 254 callstd 8 release @@ -124,7 +124,7 @@ Route121_EventScript_1F5F66:: @ 81F5F66 waitmovement 0 msgbox Route121_Text_29F69F, 4 setvar VAR_0x8004, 127 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 127 callstd 8 release @@ -169,7 +169,7 @@ Route121_EventScript_1F6024:: @ 81F6024 waitmovement 0 msgbox Route121_Text_29F80D, 4 setvar VAR_0x8004, 767 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 767 callstd 8 release diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index f6d535e38..b622a931b 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -74,7 +74,7 @@ Route123_EventScript_1F6236:: @ 81F6236 waitmovement 0 msgbox Route123_Text_29FE70, 4 setvar VAR_0x8004, 238 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 238 callstd 8 release @@ -99,7 +99,7 @@ Route123_EventScript_1F6298:: @ 81F6298 waitmovement 0 msgbox Route123_Text_2A0027, 4 setvar VAR_0x8004, 249 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 249 callstd 8 release @@ -174,7 +174,7 @@ Route123_EventScript_1F63E8:: @ 81F63E8 waitmovement 0 msgbox Route123_Text_2A03C1, 4 setvar VAR_0x8004, 195 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 195 callstd 8 release diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 2079c338d..b21e55417 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -35,7 +35,7 @@ Route124_EventScript_1F65DF:: @ 81F65DF waitmovement 0 msgbox Route124_Text_2A0C14, 4 setvar VAR_0x8004, 449 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 449 callstd 8 release @@ -68,7 +68,7 @@ Route124_EventScript_1F6643:: @ 81F6643 Route124_EventScript_1F6673:: @ 81F6673 msgbox Route124_Text_2A109F, 4 setvar VAR_0x8004, 687 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 687 callstd 8 release @@ -91,7 +91,7 @@ Route124_EventScript_1F66A7:: @ 81F66A7 Route124_EventScript_1F66D7:: @ 81F66D7 msgbox Route124_Text_2A109F, 4 setvar VAR_0x8004, 687 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 687 callstd 8 release diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index de3ae07b5..2dda3fb2d 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -60,7 +60,7 @@ Route125_EventScript_1F682C:: @ 81F682C waitmovement 0 msgbox Route125_Text_2A17CF, 4 setvar VAR_0x8004, 492 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 492 callstd 8 release diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index d03e08103..3ea9ba786 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -56,7 +56,7 @@ Route126_EventScript_1F69A3:: @ 81F69A3 waitmovement 0 msgbox Route126_Text_2A1F5A, 4 setvar VAR_0x8004, 377 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 377 callstd 8 release diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index cbc7d7da1..12e5bf127 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -75,7 +75,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02 waitmovement 0 msgbox Route127_Text_2A26EE, 4 setvar VAR_0x8004, 672 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 672 callstd 8 release diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 6d336e464..f62f78404 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -189,7 +189,7 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA waitmovement 0 msgbox Route128_Text_2A2916, 4 setvar VAR_0x8004, 376 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 376 callstd 8 release @@ -214,7 +214,7 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C waitmovement 0 msgbox Route128_Text_2A2AF9, 4 setvar VAR_0x8004, 386 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 386 callstd 8 release diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index e0c6da76c..e52828a19 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -67,7 +67,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -93,7 +93,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @ forced stop diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 6a0bafb45..b293dc140 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -140,7 +140,7 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022 end SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 special sub_81A5E74 diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index ca51ab57e..e5f510179 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -122,7 +122,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA special sub_81B9D08 compare VAR_RESULT, 0 goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 - special copy_player_party_to_sav1 + special SavePlayerParty msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4 SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA @@ -228,7 +228,7 @@ SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 goto SlateportCity_BattleTentLobby_EventScript_208A2E SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B - special copy_player_party_from_sav1 + special LoadPlayerParty SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index 019bdce10..eaca36e59 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -45,7 +45,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D compare VAR_0x40C0, 3 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x40C0, 0 releaseall end @@ -90,7 +90,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 - special copy_player_party_to_sav1 + special SavePlayerParty special sub_8139238 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 compare VAR_RESULT, 0 @@ -101,11 +101,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5 compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - special copy_player_party_from_sav1 + special LoadPlayerParty call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - special copy_player_party_to_sav1 + special SavePlayerParty special sub_80F94E8 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 closemessage @@ -121,7 +121,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 end SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 - special copy_player_party_from_sav1 + special LoadPlayerParty msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4 release end diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 78c7303ae..0dec00967 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -32,7 +32,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 special HealPlayerParty applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 waitmovement 0 - special copy_player_party_from_sav1 + special LoadPlayerParty setvar VAR_0x4001, 1 warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 waitstate diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 057c4581d..cbaaa905a 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -121,14 +121,14 @@ SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4 setvar VAR_0x8004, 408 setvar VAR_0x8005, 50 setvar VAR_0x8006, 191 - special DoScriptedWildBattle + special CreateObedientEnemyMon return SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 setvar VAR_0x8004, 407 setvar VAR_0x8005, 50 setvar VAR_0x8006, 191 - special DoScriptedWildBattle + special CreateObedientEnemyMon return SouthernIsland_Interior_Movement_242BCA: @ 8242BCA diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index 77b67fb14..eb12efb4b 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -236,7 +236,7 @@ TrainerHill_Entrance_Movement_268385: @ 8268385 TrainerHill_Entrance_EventScript_268388:: @ 8268388 lockall fadescreen 1 - special sub_813C904 + special ShowTrainerHillRecords waitstate releaseall end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index b673e959b..ad2749ba8 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -59,7 +59,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -81,8 +81,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 waitmovement 0 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4 - special copy_player_party_from_sav1 - special copy_player_party_to_sav1 + special LoadPlayerParty + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -132,7 +132,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index a7f496820..6f1624a2d 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -135,7 +135,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 special sub_81B99B4 compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE - special copy_player_party_to_sav1 + special SavePlayerParty msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4 VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 @@ -189,7 +189,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - special copy_player_party_from_sav1 + special LoadPlayerParty closemessage delay 2 call VerdanturfTown_BattleTentLobby_EventScript_27134F @@ -198,7 +198,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE - special copy_player_party_to_sav1 + special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 @@ -235,7 +235,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D goto VerdanturfTown_BattleTentLobby_EventScript_201A37 VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34 - special copy_player_party_from_sav1 + special LoadPlayerParty VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37 msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 2e00ee702..46be101e1 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066 - special sub_81201DC + special ScrSpecial_GetCurrentMauvilleMan switch VAR_RESULT case 0, MauvilleCity_PokemonCenter_1F_EventScript_28E0A6 case 1, MauvilleCity_PokemonCenter_1F_EventScript_28E167 @@ -20,9 +20,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 setvar VAR_0x8004, 0 - special sub_8120340 + special ScrSpecial_PlayBardSong delay 60 - special sub_81201F4 + special ScrSpecial_HasBardSongBeenChanged compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4 @@ -51,12 +51,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4 setvar VAR_0x8004, 1 - special sub_8120340 + special ScrSpecial_PlayBardSong delay 60 msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 - special sub_8120210 + special ScrSpecial_SaveBardSongLyrics msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4 release end @@ -71,7 +71,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 faceplayer setflag FLAG_SYS_HIPSTER_MEET msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4 - special sub_8120358 + special ScrSpecial_GetHipsterSpokenFlag compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4 @@ -79,7 +79,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 end MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C - special sub_812038C + special ScrSpecial_HipsterTeachWord compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4 @@ -88,7 +88,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4 msgbox MauvilleCity_PokemonCenter_1F_Text_290666, 4 - special sub_8120374 + special ScrSpecial_SetHipsterSpokenFlag release end @@ -157,7 +157,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 - special sub_8133CD8 + special ScrSpecial_GetTraderTradedFlag compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D message MauvilleCity_PokemonCenter_1F_Text_28E23F @@ -176,7 +176,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D end MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 - special sub_8133EC0 + special ScrSpecial_TraderMenuGetDecoration waitstate compare VAR_0x8004, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 @@ -185,7 +185,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E - special sub_8133CF4 + special ScrSpecial_DoesPlayerHaveNoDecorations compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 @@ -215,19 +215,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4 - special sub_8133D8C + special ScrSpecial_TraderMenuGiveDecoration waitstate compare VAR_0x8006, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 compare VAR_0x8006, 65535 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE - special sub_8133D2C + special ScrSpecial_IsDecorationFull compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 - special sub_8133E38 + special ScrSpecial_TraderDoDecorationTrade msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4 release end @@ -813,20 +813,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 - specialvar VAR_RESULT, sub_81213B0 + specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA message MauvilleCity_PokemonCenter_1F_Text_28E673 waitmessage - special sub_8121388 + special ScrSpecial_StorytellerStoryListMenu waitstate compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 setvar VAR_0x8008, 1 - special sub_812139C + special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress - specialvar VAR_RESULT, sub_81213D8 + specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD goto MauvilleCity_PokemonCenter_1F_EventScript_29020F @@ -837,7 +837,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4 - specialvar VAR_RESULT, sub_8121424 + specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 @@ -849,7 +849,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 - specialvar VAR_RESULT, sub_8121450 + specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4 @@ -903,7 +903,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 end MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 - special sub_81203C4 + special ScrSpecial_GiddyShouldTellAnotherTale compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 compare VAR_RESULT, 0 @@ -911,7 +911,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 end MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 - special sub_81203C4 + special ScrSpecial_GiddyShouldTellAnotherTale compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B compare VAR_RESULT, 0 @@ -924,7 +924,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B end MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 - special sub_81203FC + special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waitmessage yesnobox 20, 8 |