summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattlePikeThreePathRoom
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-22 19:10:49 -0500
committerGitHub <noreply@github.com>2021-11-22 19:10:49 -0500
commite0fae879da1b773bf90fca145e047ccdb7613938 (patch)
treeb1be0ec73e33fccf2fe2deac44d62aa10ae391e4 /data/maps/BattleFrontier_BattlePikeThreePathRoom
parent5cb875b6cb798cf890e156f54a150ff90735ddab (diff)
parent42a83ee50e3364f3f7361dacb3d3616053f4c5bf (diff)
Merge pull request #1558 from GriffinRichards/update-macros
Update event macro comments
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom')
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index 37737554f..e95ca9dce 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -28,7 +28,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus::
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby::
- warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+ warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
waitstate
end
@@ -151,8 +151,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge::
BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom::
pike_sethintroom
- compare VAR_RESULT, TRUE
- goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint
+ goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint
setvar VAR_TEMP_5, 255
end
@@ -173,8 +172,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint::
BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver::
pike_gethint
- compare VAR_RESULT, PIKE_HINT_BRAIN
- goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
+ goto_if_eq VAR_RESULT, PIKE_HINT_BRAIN, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
lock
faceplayer
msgbox BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose, MSGBOX_YESNO