diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-05-04 17:45:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-04 17:45:50 -0400 |
commit | 58200616d55798002046e67a656f5295834455ec (patch) | |
tree | 7487b983c8205a97832831b6b6b06cf60534f65a /data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc | |
parent | 4acbcf5759cb2d5453631dd104e3a845931df66c (diff) | |
parent | cdb5e9e3143b2f1086d8bd4f02a76186c164d02a (diff) |
Merge branch 'master' into trader
Diffstat (limited to 'data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc')
-rw-r--r-- | data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc | 14 |
1 files changed, 7 insertions, 7 deletions
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 |