diff options
Diffstat (limited to 'data/scripts')
32 files changed, 117 insertions, 117 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e5b330bf3..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 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 b7dc59257..29485ef12 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -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 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 3ba3a5a6a..07e66efa8 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -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/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/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/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/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/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/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/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..917e2cf89 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -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 |