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

153
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@@ -29,18 +29,14 @@ LittlerootTown_ProfessorBirchsLab_MapScripts::
LittlerootTown_ProfessorBirchsLab_OnTransition:
call Common_EventScript_SetupRivalGfxId
call ProfBirch_EventScript_UpdateLocation
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout
goto_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter
end
LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter::
specialvar VAR_RESULT, HasAllHoennMons
compare VAR_RESULT, TRUE
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter
goto_if_eq VAR_RESULT, TRUE, LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter
setobjectmovementtype LOCALID_RIVAL, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
setobjectxyperm LOCALID_RIVAL, 5, 10
end
@@ -123,10 +119,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent::
playfanfare MUS_OBTAIN_ITEM
waitfanfare
msgbox LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival
goto_if_eq VAR_RESULT, YES, LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival
end
LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter::
@@ -137,10 +131,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter::
LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival::
msgbox LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival
goto_if_eq VAR_RESULT, YES, LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival
end
LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival::
@@ -152,10 +144,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival::
LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival::
msgbox LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival
goto_if_eq VAR_RESULT, YES, LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival
end
LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent::
@@ -195,10 +185,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment
call_if_eq VAR_RESULT, MALE, LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment
playse SE_PC_ON
waitse
delay 20
@@ -288,8 +276,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter:
LittlerootTown_ProfessorBirchsLab_EventScript_Aide::
lock
faceplayer
compare VAR_BIRCH_LAB_STATE, 3
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter
goto_if_ge VAR_BIRCH_LAB_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter
goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet
msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork, MSGBOX_DEFAULT
setflag FLAG_BIRCH_AIDE_MET
@@ -308,40 +295,34 @@ LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter::
LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil::
release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
showmonpic SPECIES_CYNDAQUIL, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil
end
LittlerootTown_ProfessorBirchsLab_EventScript_Totodile::
release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
showmonpic SPECIES_TOTODILE, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile
end
LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita::
release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
showmonpic SPECIES_CHIKORITA, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita
end
@@ -360,10 +341,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil::
bufferspeciesname STR_VAR_1, SPECIES_CYNDAQUIL
setvar VAR_TEMP_1, SPECIES_CYNDAQUIL
givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC
goto_if_eq VAR_RESULT, 0, LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty
goto_if_eq VAR_RESULT, 1, LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC
hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon
end
@@ -372,8 +351,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty::
call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
removeobject LOCALID_BALL_CYNDAQUIL
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil
@@ -383,8 +361,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC::
call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
removeobject LOCALID_BALL_CYNDAQUIL
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC
call Common_EventScript_NameReceivedBoxMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC
end
@@ -405,10 +382,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile::
bufferspeciesname STR_VAR_1, SPECIES_TOTODILE
setvar VAR_TEMP_1, SPECIES_TOTODILE
givemon SPECIES_TOTODILE, 5, ITEM_NONE
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC
goto_if_eq VAR_RESULT, 0, LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty
goto_if_eq VAR_RESULT, 1, LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC
hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon
end
@@ -417,8 +392,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty::
call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
removeobject LOCALID_BALL_TOTODILE
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile
@@ -428,8 +402,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC::
call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
removeobject LOCALID_BALL_TOTODILE
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC
call Common_EventScript_NameReceivedBoxMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC
end
@@ -450,10 +423,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita::
bufferspeciesname STR_VAR_1, SPECIES_CHIKORITA
setvar VAR_TEMP_1, SPECIES_CHIKORITA
givemon SPECIES_CHIKORITA, 5, ITEM_NONE
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC
goto_if_eq VAR_RESULT, 0, LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty
goto_if_eq VAR_RESULT, 1, LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC
hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon
end
@@ -462,8 +433,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty::
call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
removeobject LOCALID_BALL_CHIKORITA
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita
@@ -473,8 +443,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC::
call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
removeobject LOCALID_BALL_CHIKORITA
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC
goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC
call Common_EventScript_NameReceivedBoxMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC
end
@@ -501,10 +470,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter::
LittlerootTown_ProfessorBirchsLab_EventScript_Birch::
lock
faceplayer
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting
goto_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon
goto_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting
goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister
goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
goto LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister
@@ -522,12 +489,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting::
LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister::
goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister
compare VAR_BIRCH_LAB_STATE, 5
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait
goto_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, ProfBirch_EventScript_RatePokedexOrRegister
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, ProfBirch_EventScript_RatePokedexOrRegister
goto_if_eq VAR_BIRCH_LAB_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait
msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome, MSGBOX_DEFAULT
release
end
@@ -556,10 +520,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls
call_if_eq VAR_RESULT, MALE, LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls
setvar VAR_BIRCH_LAB_STATE, 5
setflag FLAG_ADVENTURE_STARTED
setvar VAR_OLDALE_TOWN_STATE, 1
@@ -571,8 +533,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex::
LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls::
msgbox LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese, MSGBOX_DEFAULT
giveitem ITEM_POKE_BALL, 5
compare VAR_RESULT, FALSE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls
call_if_eq VAR_RESULT, FALSE, LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls
msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls, MSGBOX_DEFAULT
setvar VAR_RESULT, 0
return
@@ -580,8 +541,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls::
LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls::
msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese, MSGBOX_DEFAULT
giveitem ITEM_POKE_BALL, 5
compare VAR_RESULT, FALSE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls
call_if_eq VAR_RESULT, FALSE, LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls
msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls, MSGBOX_DEFAULT
setvar VAR_RESULT, 1
return
@@ -621,17 +581,12 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Machine::
LittlerootTown_ProfessorBirchsLab_EventScript_Rival::
lock
faceplayer
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork
goto_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext
call_if_eq VAR_RESULT, MALE, LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext
release
end
@@ -645,10 +600,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext::
LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans::
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly
call_if_eq VAR_RESULT, MALE, LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly
release
end
@@ -662,10 +615,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly:
LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier::
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier
call_if_eq VAR_RESULT, MALE, LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier
release
end
@@ -679,10 +630,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier
LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork::
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork
call_if_eq VAR_RESULT, MALE, LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork
release
end