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

@@ -9,15 +9,11 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotBrother::
special ChoosePartyMon
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare VAR_RESULT, PARTY_NOTHING_CHOSEN
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowSeedot
goto_if_eq VAR_RESULT, PARTY_NOTHING_CHOSEN, SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowSeedot
special CompareSeedotSize
compare VAR_RESULT, 1
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NotSeedot
compare VAR_RESULT, 2
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot
compare VAR_RESULT, 3
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot
goto_if_eq VAR_RESULT, 1, SootopolisCity_LotadAndSeedotHouse_EventScript_NotSeedot
goto_if_eq VAR_RESULT, 2, SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot
goto_if_eq VAR_RESULT, 3, SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot
release
end
@@ -39,8 +35,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot::
SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot::
msgbox SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad, MSGBOX_DEFAULT
giveitem ITEM_ELIXIR
compare VAR_RESULT, FALSE
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1
goto_if_eq VAR_RESULT, FALSE, SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1
closemessage
release
end
@@ -58,15 +53,11 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_LotadBrother::
special ChoosePartyMon
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare VAR_RESULT, PARTY_NOTHING_CHOSEN
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowLotad
goto_if_eq VAR_RESULT, PARTY_NOTHING_CHOSEN, SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowLotad
special CompareLotadSize
compare VAR_RESULT, 1
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NotLotad
compare VAR_RESULT, 2
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad
compare VAR_RESULT, 3
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad
goto_if_eq VAR_RESULT, 1, SootopolisCity_LotadAndSeedotHouse_EventScript_NotLotad
goto_if_eq VAR_RESULT, 2, SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad
goto_if_eq VAR_RESULT, 3, SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad
release
end
@@ -88,8 +79,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad::
SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad::
msgbox SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot, MSGBOX_DEFAULT
giveitem ITEM_ELIXIR
compare VAR_RESULT, FALSE
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2
goto_if_eq VAR_RESULT, FALSE, SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2
closemessage
release
end