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

@@ -41,8 +41,7 @@ Route117_EventScript_DayCareSign::
Route117_EventScript_Isaac::
trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route117_EventScript_RematchIsaac
goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchIsaac
msgbox Route117_Text_IsaacPostBattle, MSGBOX_DEFAULT
release
end
@@ -63,8 +62,7 @@ Route117_EventScript_RematchIsaac::
Route117_EventScript_Lydia::
trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route117_EventScript_RematchLydia
goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchLydia
msgbox Route117_Text_LydiaPostBattle, MSGBOX_DEFAULT
release
end
@@ -85,8 +83,7 @@ Route117_EventScript_RematchLydia::
Route117_EventScript_Dylan::
trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route117_EventScript_RematchDylan
goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchDylan
msgbox Route117_Text_DylanPostBattle, MSGBOX_DEFAULT
release
end
@@ -107,8 +104,7 @@ Route117_EventScript_RematchDylan::
Route117_EventScript_Maria::
trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route117_EventScript_RematchMaria
goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchMaria
msgbox Route117_Text_MariaPostBattle, MSGBOX_DEFAULT
release
end
@@ -134,8 +130,7 @@ Route117_EventScript_Derek::
Route117_EventScript_Anna::
trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route117_EventScript_RematchAnna
goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchAnna
msgbox Route117_Text_AnnaPostBattle, MSGBOX_DEFAULT
release
end
@@ -154,8 +149,7 @@ Route117_EventScript_RematchAnna::
Route117_EventScript_Meg::
trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route117_EventScript_RematchMeg
goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchMeg
msgbox Route117_Text_MegPostBattle, MSGBOX_DEFAULT
release
end