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/DewfordTown/scripts.inc
View File

@@ -54,8 +54,7 @@ DewfordTown_EventScript_CancelSailSelect::
DewfordTown_EventScript_ReturnToPetalburgPrompt::
msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq DewfordTown_EventScript_SailBackToPetalburg
goto_if_eq VAR_RESULT, YES, DewfordTown_EventScript_SailBackToPetalburg
msgbox DewfordTown_Text_GoDeliverIllBeWaiting, MSGBOX_DEFAULT
release
end
@@ -87,10 +86,8 @@ DewfordTown_EventScript_OldRodFisherman::
faceplayer
goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing
msgbox DewfordTown_Text_GettingItchToFish, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq DewfordTown_EventScript_GiveOldRod
compare VAR_RESULT, NO
goto_if_eq DewfordTown_EventScript_NotGettingItchToFish
goto_if_eq VAR_RESULT, YES, DewfordTown_EventScript_GiveOldRod
goto_if_eq VAR_RESULT, NO, DewfordTown_EventScript_NotGettingItchToFish
end
DewfordTown_EventScript_GiveOldRod::
@@ -110,10 +107,8 @@ DewfordTown_EventScript_HowsFishing::
message DewfordTown_Text_HowsYourFishing
waitmessage
multichoice 20, 8, MULTI_HOWS_FISHING, TRUE
compare VAR_RESULT, 0
goto_if_eq DewfordTown_EventScript_FishingExcellent
compare VAR_RESULT, 1
goto_if_eq DewfordTown_EventScript_FishingNotSoGood
goto_if_eq VAR_RESULT, 0, DewfordTown_EventScript_FishingExcellent
goto_if_eq VAR_RESULT, 1, DewfordTown_EventScript_FishingNotSoGood
end
DewfordTown_EventScript_FishingExcellent::
@@ -607,10 +602,8 @@ DewfordTown_EventScript_TrendyPhraseBoy::
faceplayer
call Common_EventScript_BufferTrendyPhrase
msgbox DewfordTown_Text_XIsTheBiggestHappeningThingRight, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq DewfordTown_EventScript_ConfirmTrendyPhrase
compare VAR_RESULT, NO
goto_if_eq DewfordTown_EventScript_RejectTrendyPhrase
goto_if_eq VAR_RESULT, YES, DewfordTown_EventScript_ConfirmTrendyPhrase
goto_if_eq VAR_RESULT, NO, DewfordTown_EventScript_RejectTrendyPhrase
end
DewfordTown_EventScript_ConfirmTrendyPhrase::
@@ -624,16 +617,13 @@ DewfordTown_EventScript_RejectTrendyPhrase::
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, TRUE
goto_if_eq DewfordTown_EventScript_GiveNewTrendyPhrase
compare VAR_RESULT, FALSE
goto_if_eq DewfordTown_EventScript_CancelNewTrendyPhrase
goto_if_eq VAR_RESULT, TRUE, DewfordTown_EventScript_GiveNewTrendyPhrase
goto_if_eq VAR_RESULT, FALSE, DewfordTown_EventScript_CancelNewTrendyPhrase
end
DewfordTown_EventScript_GiveNewTrendyPhrase::
incrementgamestat GAME_STAT_STARTED_TRENDS
compare VAR_0x8004, FALSE
goto_if_eq DewfordTown_EventScript_PhraseNotTrendyEnough
goto_if_eq VAR_0x8004, FALSE, DewfordTown_EventScript_PhraseNotTrendyEnough
msgbox DewfordTown_Text_OfCourseIKnowAboutThat, MSGBOX_DEFAULT
release
end