dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat compare + goto_if/call_if to single statements

Browse Source
This commit is contained in:
GriffinR
2021-11-18 23:06:30 -05:00
parent c57efdba5d
commit e66ea0cb99
293 changed files with 2990 additions and 5978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route121_SafariZoneEntrance/scripts.inc
+6 -12
View File
@@ -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