diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-29 02:00:19 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-12-05 21:11:17 -0600 |
| commit | 41c1c9ca8a472573e5acaea26bf3682399f50e35 (patch) | |
| tree | 5455f60df938357e4429ddfd5f8ac1b224197b3f /data/maps/BattleFrontier_BattlePikeThreePathRoom | |
| parent | 9b3d1cfab61fff89cae64c093f28775fdbad1027 (diff) | |
Set up Battle Pike macros
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cd8f3dd4f..a0bf811a5 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -34,9 +34,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 lockall message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume waitmessage - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE - setvar VAR_0x8005, CHALLENGE_STATUS_SAVING - special CallBattlePikeFunction + pike_save CHALLENGE_STATUS_SAVING playse SE_SAVE waitse frontier_set FRONTIER_DATA_PAUSED, FALSE @@ -124,9 +122,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData waitmessage special LoadPlayerParty - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE - setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED - special CallBattlePikeFunction + pike_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse fadescreen 1 @@ -152,9 +148,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM - special CallBattlePikeFunction - compare VAR_RESULT, 1 + pike_sethintroom + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_TEMP_5, 255 end @@ -175,7 +170,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 end BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB - battlepike_gethint + pike_gethint compare VAR_RESULT, PIKE_HINT_BRAIN goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint lock @@ -194,8 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint:: @ 825CB00 end BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID - special CallBattlePikeFunction + pike_gethintroomid switch VAR_RESULT case PIKE_ROOM_LEFT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint case PIKE_ROOM_CENTER, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint @@ -215,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint:: @ 825CB53 goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60 - battlepike_gethint + pike_gethint switch VAR_RESULT case PIKE_HINT_NOSTALGIA, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia case PIKE_HINT_WHISPERING, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering |