Reformat compare + goto_if/call_if to single statements

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

View File

@@ -12,12 +12,10 @@ Route123_EventScript_GigaDrainGirl::
goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_ReceivedGigaDrain
msgbox Route123_Text_LoveGrassMonsHaveAny, MSGBOX_DEFAULT
special IsGrassTypeInParty
compare VAR_RESULT, FALSE
goto_if_eq Route123_EventScript_NoGrassMons
goto_if_eq VAR_RESULT, FALSE, Route123_EventScript_NoGrassMons
msgbox Route123_Text_YouLikeGrassMonsTooHaveThis, MSGBOX_DEFAULT
giveitem ITEM_TM19
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM19
msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT
release
@@ -62,8 +60,7 @@ Route123_EventScript_Violet::
Route123_EventScript_Cameron::
trainerbattle_single TRAINER_CAMERON_1, Route123_Text_CameronIntro, Route123_Text_CameronDefeat, Route123_EventScript_RegisterCameron
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route123_EventScript_RematchCameron
goto_if_eq VAR_RESULT, TRUE, Route123_EventScript_RematchCameron
msgbox Route123_Text_CameronPostBattle, MSGBOX_DEFAULT
release
end
@@ -84,8 +81,7 @@ Route123_EventScript_RematchCameron::
Route123_EventScript_Jacki::
trainerbattle_single TRAINER_JACKI_1, Route123_Text_JackiIntro, Route123_Text_JackiDefeat, Route123_EventScript_RegisterJacki
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route123_EventScript_RematchJacki
goto_if_eq VAR_RESULT, TRUE, Route123_EventScript_RematchJacki
msgbox Route123_Text_JackiPostBattle, MSGBOX_DEFAULT
release
end
@@ -156,8 +152,7 @@ Route123_EventScript_Davis::
Route123_EventScript_Fernando::
trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_FernandoIntro, Route123_Text_FernandoDefeat, Route123_EventScript_RegisterFernando
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route123_EventScript_RematchFernando
goto_if_eq VAR_RESULT, TRUE, Route123_EventScript_RematchFernando
msgbox Route123_Text_FernandoPostBattle, MSGBOX_DEFAULT
release
end