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

30
data/maps/SlateportCity_NameRatersHouse/scripts.inc
View File

@@ -5,20 +5,16 @@ SlateportCity_NameRatersHouse_EventScript_NameRater::
lock
faceplayer
msgbox SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate
compare VAR_RESULT, NO
goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
goto_if_eq VAR_RESULT, YES, SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate
goto_if_eq VAR_RESULT, NO, SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
end
SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate::
msgbox SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname, MSGBOX_DEFAULT
special ChoosePartyMon
waitstate
compare VAR_0x8004, PARTY_NOTHING_CHOSEN
goto_if_ne SlateportCity_NameRatersHouse_EventScript_RateMonNickname
compare VAR_0x8004, PARTY_NOTHING_CHOSEN
goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
goto_if_ne VAR_0x8004, PARTY_NOTHING_CHOSEN, SlateportCity_NameRatersHouse_EventScript_RateMonNickname
goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
end
SlateportCity_NameRatersHouse_EventScript_DeclineNameRate::
@@ -28,21 +24,16 @@ SlateportCity_NameRatersHouse_EventScript_DeclineNameRate::
SlateportCity_NameRatersHouse_EventScript_RateMonNickname::
specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, SPECIES_EGG
goto_if_eq SlateportCity_NameRatersHouse_EventScript_CantRateEgg
goto_if_eq VAR_RESULT, SPECIES_EGG, SlateportCity_NameRatersHouse_EventScript_CantRateEgg
special BufferMonNickname
special IsMonOTIDNotPlayers
compare VAR_RESULT, TRUE
goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT
goto_if_eq VAR_RESULT, TRUE, SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT
specialvar VAR_RESULT, MonOTNameNotPlayer
special BufferMonNickname
compare VAR_RESULT, TRUE
goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT
goto_if_eq VAR_RESULT, TRUE, SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT
msgbox SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChangeNickname
compare VAR_RESULT, NO
goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
goto_if_eq VAR_RESULT, YES, SlateportCity_NameRatersHouse_EventScript_ChangeNickname
goto_if_eq VAR_RESULT, NO, SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
end
SlateportCity_NameRatersHouse_EventScript_CantRateEgg::
@@ -60,8 +51,7 @@ SlateportCity_NameRatersHouse_EventScript_ChangeNickname::
call Common_EventScript_NameReceivedPartyMon
specialvar VAR_RESULT, TryPutNameRaterShowOnTheAir
special BufferMonNickname
compare VAR_RESULT, TRUE
goto_if_eq SlateportCity_NameRatersHouse_EventScript_NewNameDifferent
goto_if_eq VAR_RESULT, TRUE, SlateportCity_NameRatersHouse_EventScript_NewNameDifferent
msgbox SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior, MSGBOX_DEFAULT
release
end