summaryrefslogtreecommitdiff
path: root/data/maps/Route121_SafariZoneEntrance
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:30 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:51 -0500
commite66ea0cb996c70093fe3f250cafb7f1f87e84d4d (patch)
tree162e07afa059e7683e4aa991a1a82205c16b3025 /data/maps/Route121_SafariZoneEntrance
parentc57efdba5d3cc475f75c5909c31f96bbce6190b8 (diff)
Reformat compare + goto_if/call_if to single statements
Diffstat (limited to 'data/maps/Route121_SafariZoneEntrance')
-rw-r--r--data/maps/Route121_SafariZoneEntrance/scripts.inc18
1 files changed, 6 insertions, 12 deletions
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index 5050612f7..92fdc2d0b 100644
--- a/data/maps/Route121_SafariZoneEntrance/scripts.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -33,8 +33,7 @@ Route121_SafariZoneEntrance_EventScript_InfoAttendant::
lock
faceplayer
msgbox Route121_SafariZoneEntrance_Text_WelcomeFirstTime, MSGBOX_YESNO
- compare VAR_RESULT, YES
- goto_if_eq Route121_SafariZoneEntrance_EventScript_FirstTimeInfo
+ goto_if_eq VAR_RESULT, YES, Route121_SafariZoneEntrance_EventScript_FirstTimeInfo
msgbox Route121_SafariZoneEntrance_Text_ComeInAndEnjoy, MSGBOX_DEFAULT
release
end
@@ -50,20 +49,17 @@ Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger::
waitmovement 0
showmoneybox 0, 0
msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, MSGBOX_YESNO
- compare VAR_RESULT, YES
- goto_if_eq Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone
+ goto_if_eq VAR_RESULT, YES, Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone
msgbox Route121_SafariZoneEntrance_Text_PlayAnotherTime, MSGBOX_DEFAULT
goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
end
Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone::
checkitem ITEM_POKEBLOCK_CASE
- compare VAR_RESULT, 0
- goto_if_eq Route121_SafariZoneEntrance_EventScript_NoPokeblockCase
+ goto_if_eq VAR_RESULT, 0, Route121_SafariZoneEntrance_EventScript_NoPokeblockCase
call Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon
checkmoney 500
- compare VAR_RESULT, 0
- goto_if_eq Route121_SafariZoneEntrance_EventScript_NotEnoughMoney
+ goto_if_eq VAR_RESULT, 0, Route121_SafariZoneEntrance_EventScript_NotEnoughMoney
playse SE_SHOP
msgbox Route121_SafariZoneEntrance_Text_ThatWillBe500Please, MSGBOX_DEFAULT
removemoney 500
@@ -86,11 +82,9 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone::
Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon::
getpartysize
- compare VAR_RESULT, PARTY_SIZE
- goto_if_ne Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
+ goto_if_ne VAR_RESULT, PARTY_SIZE, Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace
- compare VAR_RESULT, 1
- goto_if_eq Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
+ goto_if_eq VAR_RESULT, 1, Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
msgbox Route121_SafariZoneEntrance_Text_PCIsFull, MSGBOX_DEFAULT
goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
end