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

87
data/scripts/day_care.inc
View File

@@ -5,23 +5,18 @@ Route117_EventScript_DaycareMan::
faceplayer
special GetDaycareMonNicknames
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, DAYCARE_EGG_WAITING
goto_if_eq Route117_EventScript_DaycareEggWaiting
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq Route117_EventScript_CheckOnOneMon
compare VAR_RESULT, DAYCARE_TWO_MONS
goto_if_eq Route117_EventScript_CheckOnTwoMons
goto_if_eq VAR_RESULT, DAYCARE_EGG_WAITING, Route117_EventScript_DaycareEggWaiting
goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, Route117_EventScript_CheckOnOneMon
goto_if_eq VAR_RESULT, DAYCARE_TWO_MONS, Route117_EventScript_CheckOnTwoMons
msgbox Route117_Text_SeeWifeIfYoudLikeMeToRaiseMon, MSGBOX_DEFAULT
release
end
Route117_EventScript_DaycareEggWaiting::
msgbox Route117_Text_DoYouWantEgg, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_EventScript_DaycareAcceptEgg
goto_if_eq VAR_RESULT, YES, Route117_EventScript_DaycareAcceptEgg
msgbox Route117_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_EventScript_DaycareAcceptEgg
goto_if_eq VAR_RESULT, YES, Route117_EventScript_DaycareAcceptEgg
msgbox Route117_Text_IllKeepIt, MSGBOX_DEFAULT
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
@@ -30,8 +25,7 @@ Route117_EventScript_DaycareEggWaiting::
Route117_EventScript_DaycareAcceptEgg::
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, PARTY_SIZE
goto_if_ne Route117_EventScript_DaycareReceiveEgg
goto_if_ne VAR_RESULT, PARTY_SIZE, Route117_EventScript_DaycareReceiveEgg
msgbox Route117_Text_YouHaveNoRoomForIt, MSGBOX_DEFAULT
release
end
@@ -49,8 +43,7 @@ Route117_EventScript_DaycareReceiveEgg::
Route117_EventScript_CheckMonReceivedMail::
specialvar VAR_RESULT, CheckDaycareMonReceivedMail
compare VAR_RESULT, 1
call_if_eq Route117_EventScript_MonReceivedMail
call_if_eq VAR_RESULT, 1, Route117_EventScript_MonReceivedMail
return
Route117_EventScript_MonReceivedMail::
@@ -83,35 +76,27 @@ Route117_PokemonDayCare_EventScript_DaycareWoman::
lock
faceplayer
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, DAYCARE_EGG_WAITING
goto_if_eq Route117_PokemonDayCare_EventScript_EggWaiting
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq Route117_PokemonDayCare_EventScript_OneMonInDaycare
compare VAR_RESULT, DAYCARE_TWO_MONS
goto_if_eq Route117_PokemonDayCare_EventScript_TwoMonsInDaycare
goto_if_eq VAR_RESULT, DAYCARE_EGG_WAITING, Route117_PokemonDayCare_EventScript_EggWaiting
goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, Route117_PokemonDayCare_EventScript_OneMonInDaycare
goto_if_eq VAR_RESULT, DAYCARE_TWO_MONS, Route117_PokemonDayCare_EventScript_TwoMonsInDaycare
msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
goto_if_eq VAR_RESULT, YES, Route117_PokemonDayCare_EventScript_GiveMonToRaise
msgbox Route117_PokemonDayCare_Text_FineThenComeAgain, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_GiveMonToRaise::
specialvar VAR_RESULT, CountPartyNonEggMons
compare VAR_RESULT, 1
goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneMon
goto_if_eq VAR_RESULT, 1, Route117_PokemonDayCare_EventScript_OnlyOneMon
specialvar VAR_RESULT, CountPartyAliveNonEggMons
compare VAR_RESULT, 2
goto_if_eq Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons
goto_if_eq VAR_RESULT, 2, Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons
msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
special ChooseSendDaycareMon
waitstate
compare VAR_0x8004, PARTY_NOTHING_CHOSEN
goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain
goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, Route117_PokemonDayCare_EventScript_ComeAgain
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
compare VAR_RESULT, 0
goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneAliveMon
goto_if_eq VAR_RESULT, 0, Route117_PokemonDayCare_EventScript_OnlyOneAliveMon
specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies
waitse
playmoncry VAR_0x8005, CRY_MODE_NORMAL
@@ -120,8 +105,7 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise::
special StoreSelectedPokemonInDaycare
incrementgamestat GAME_STAT_USED_DAYCARE
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq Route117_PokemonDayCare_EventScript_CanRaiseOneMore
goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, Route117_PokemonDayCare_EventScript_CanRaiseOneMore
release
end
@@ -132,8 +116,7 @@ Route117_PokemonDayCare_EventScript_ComeAgain::
Route117_PokemonDayCare_EventScript_CanRaiseOneMore::
msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
goto_if_eq VAR_RESULT, YES, Route117_PokemonDayCare_EventScript_GiveMonToRaise
goto Route117_PokemonDayCare_EventScript_ComeAgain
end
@@ -163,8 +146,7 @@ Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels::
Route117_PokemonDayCare_EventScript_DisplayLevelsGained::
specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
compare VAR_RESULT, 0
call_if_ne Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels
call_if_ne VAR_RESULT, 0, Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels
return
Route117_PokemonDayCare_EventScript_OneMonInDaycare::
@@ -172,42 +154,35 @@ Route117_PokemonDayCare_EventScript_OneMonInDaycare::
setvar VAR_0x8004, 0
call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
goto_if_eq VAR_RESULT, YES, Route117_PokemonDayCare_EventScript_GiveMonToRaise
msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
goto_if_eq VAR_RESULT, YES, Route117_PokemonDayCare_EventScript_TryRetrieveMon
goto Route117_PokemonDayCare_EventScript_ComeAgain
end
Route117_PokemonDayCare_EventScript_TryRetrieveMon::
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, PARTY_SIZE
goto_if_eq Route117_PokemonDayCare_EventScript_NoRoom
goto_if_eq VAR_RESULT, PARTY_SIZE, Route117_PokemonDayCare_EventScript_NoRoom
specialvar VAR_RESULT, GetDaycareState
setvar VAR_0x8004, 0
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq Route117_PokemonDayCare_EventScript_CostPrompt
goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, Route117_PokemonDayCare_EventScript_CostPrompt
special ShowDaycareLevelMenu
waitstate
copyvar VAR_0x8004, VAR_RESULT
compare VAR_RESULT, DAYCARE_EXITED_LEVEL_MENU
goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain
goto_if_eq VAR_RESULT, DAYCARE_EXITED_LEVEL_MENU, Route117_PokemonDayCare_EventScript_ComeAgain
goto Route117_PokemonDayCare_EventScript_CostPrompt
end
Route117_PokemonDayCare_EventScript_CostPrompt::
special GetDaycareCost
msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_CheckEnoughMoney
goto_if_eq VAR_RESULT, YES, Route117_PokemonDayCare_EventScript_CheckEnoughMoney
goto Route117_PokemonDayCare_EventScript_ComeAgain
end
Route117_PokemonDayCare_EventScript_CheckEnoughMoney::
specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
compare VAR_RESULT, 1
goto_if_eq Route117_PokemonDayCare_EventScript_RetrieveMon
goto_if_eq VAR_RESULT, 1, Route117_PokemonDayCare_EventScript_RetrieveMon
msgbox Route117_PokemonDayCare_Text_NotEnoughMoney, MSGBOX_DEFAULT
release
end
@@ -224,15 +199,13 @@ Route117_PokemonDayCare_EventScript_RetrieveMon::
msgbox Route117_PokemonDayCare_Text_TookBackMon, MSGBOX_DEFAULT
waitmoncry
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon
goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon
goto Route117_PokemonDayCare_EventScript_ComeAgain
end
Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon::
msgbox Route117_PokemonDayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
goto_if_eq VAR_RESULT, YES, Route117_PokemonDayCare_EventScript_TryRetrieveMon
goto Route117_PokemonDayCare_EventScript_ComeAgain
end
@@ -274,8 +247,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare::
setvar VAR_0x8004, 1
call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
goto_if_eq VAR_RESULT, YES, Route117_PokemonDayCare_EventScript_TryRetrieveMon
msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT
release
end
@@ -284,8 +256,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare::
Route117_PokemonDayCare_EventScript_UnusedRetrieveMon::
special ShowDaycareLevelMenu
waitstate
compare VAR_RESULT, 2
goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain
goto_if_eq VAR_RESULT, 2, Route117_PokemonDayCare_EventScript_ComeAgain
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, TakePokemonFromDaycare
msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT