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

33
data/maps/LilycoveCity/scripts.inc
View File

@@ -42,8 +42,7 @@ LilycoveCity_EventScript_BerryGentleman::
random 10
addvar VAR_RESULT, FIRST_BERRY_INDEX
giveitem VAR_RESULT
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY
msgbox LilycoveCity_Text_BecauseYoureTrainer, MSGBOX_DEFAULT
release
@@ -234,18 +233,15 @@ LilycoveCity_EventScript_Rival::
lock
faceplayer
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq LilycoveCity_EventScript_May
compare VAR_RESULT, FEMALE
goto_if_eq LilycoveCity_EventScript_Brendan
goto_if_eq VAR_RESULT, MALE, LilycoveCity_EventScript_May
goto_if_eq VAR_RESULT, FEMALE, LilycoveCity_EventScript_Brendan
end
LilycoveCity_EventScript_May::
playbgm MUS_ENCOUNTER_MAY, TRUE
call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain
call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle
compare VAR_RESULT, NO
goto_if_eq LilycoveCity_EventScript_DeclineMayBattle
goto_if_eq VAR_RESULT, NO, LilycoveCity_EventScript_DeclineMayBattle
msgbox LilycoveCity_Text_MayWontBeBeaten, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, LilycoveCity_EventScript_BattleMayTreecko
@@ -273,8 +269,7 @@ LilycoveCity_EventScript_Brendan::
playbgm MUS_ENCOUNTER_BRENDAN, TRUE
call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain
call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle
compare VAR_RESULT, NO
goto_if_eq LilycoveCity_EventScript_DeclineBrendanBattle
goto_if_eq VAR_RESULT, NO, LilycoveCity_EventScript_DeclineBrendanBattle
msgbox LilycoveCity_Text_BrendanWontBeBeaten, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, LilycoveCity_EventScript_BattleBrendanTreecko
@@ -332,10 +327,8 @@ LilycoveCity_EventScript_DefeatedMay::
msgbox LilycoveCity_Text_MayGoingBackToLittleroot, MSGBOX_DEFAULT
setvar VAR_RESULT, FALSE
call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge
compare VAR_RESULT, FALSE
call_if_eq LilycoveCity_EventScript_MayCollectBadges
compare VAR_RESULT, TRUE
call_if_eq LilycoveCity_EventScript_MayPokemonLeague
call_if_eq VAR_RESULT, FALSE, LilycoveCity_EventScript_MayCollectBadges
call_if_eq VAR_RESULT, TRUE, LilycoveCity_EventScript_MayPokemonLeague
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
goto LilycoveCity_EventScript_RivalFlyAway
@@ -366,10 +359,8 @@ LilycoveCity_EventScript_DefeatedBrendan::
msgbox LilycoveCity_Text_BrendanGoingBackToLittleroot, MSGBOX_DEFAULT
setvar VAR_RESULT, FALSE
call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge
compare VAR_RESULT, FALSE
call_if_eq LilycoveCity_EventScript_BrendanCollectBadges
compare VAR_RESULT, TRUE
call_if_eq LilycoveCity_EventScript_BrendanPokemonLeague
call_if_eq VAR_RESULT, FALSE, LilycoveCity_EventScript_BrendanCollectBadges
call_if_eq VAR_RESULT, TRUE, LilycoveCity_EventScript_BrendanPokemonLeague
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
goto LilycoveCity_EventScript_RivalFlyAway
@@ -408,10 +399,8 @@ LilycoveCity_EventScript_SchoolKidM::
lock
faceplayer
msgbox LilycoveCity_Text_DoYouKnowAboutBerryBlender, MSGBOX_YESNO
compare VAR_RESULT, YES
call_if_eq LilycoveCity_EventScript_KnowAboutBerryBlender
compare VAR_RESULT, NO
call_if_eq LilycoveCity_EventScript_DontKnowAboutBerryBlender
call_if_eq VAR_RESULT, YES, LilycoveCity_EventScript_KnowAboutBerryBlender
call_if_eq VAR_RESULT, NO, LilycoveCity_EventScript_DontKnowAboutBerryBlender
release
end