diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
| commit | 22ec43a6eddfc63bbb1f9a883c7b1cdda05f0d64 (patch) | |
| tree | b5d33877dbe736022815a40c6ff2af3977e36d77 /data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc | |
| parent | 39fd42faeadeb73bf57018f69a6d69463635847a (diff) | |
| parent | 83ea8d0cd9f8141181d09718c79b8916df945752 (diff) | |
resolve merge conflicts
Diffstat (limited to 'data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc')
| -rw-r--r-- | data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |