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

48
data/maps/Route123_BerryMastersHouse/scripts.inc
View File

@@ -16,16 +16,14 @@ Route123_BerryMastersHouse_EventScript_BerryMaster::
addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED
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_BERRY_MASTER_RECEIVED_BERRY
msgbox Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother, MSGBOX_DEFAULT
random NUM_BERRY_MASTER_BERRIES
addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED
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
msgbox Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop, MSGBOX_DEFAULT
release
end
@@ -45,10 +43,8 @@ Route123_BerryMastersHouse_EventScript_BerryMastersWife::
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, TRUE
goto_if_eq Route123_BerryMastersHouse_EventScript_GavePhrase
compare VAR_RESULT, FALSE
goto_if_eq Route123_BerryMastersHouse_EventScript_CancelPhrase
goto_if_eq VAR_RESULT, TRUE, Route123_BerryMastersHouse_EventScript_GavePhrase
goto_if_eq VAR_RESULT, FALSE, Route123_BerryMastersHouse_EventScript_CancelPhrase
end
Route123_BerryMastersHouse_EventScript_CancelPhrase::
@@ -58,18 +54,12 @@ Route123_BerryMastersHouse_EventScript_CancelPhrase::
end
Route123_BerryMastersHouse_EventScript_GavePhrase::
compare VAR_0x8004, NOT_SPECIAL_PHRASE
goto_if_eq Route123_BerryMastersHouse_EventScript_GiveNormalBerry
compare VAR_0x8004, PHRASE_GREAT_BATTLE
goto_if_eq Route123_BerryMastersHouse_EventScript_GiveSpelonBerry
compare VAR_0x8004, PHRASE_CHALLENGE_CONTEST
goto_if_eq Route123_BerryMastersHouse_EventScript_GivePamtreBerry
compare VAR_0x8004, PHRASE_OVERWHELMING_LATIAS
goto_if_eq Route123_BerryMastersHouse_EventScript_GiveWatmelBerry
compare VAR_0x8004, PHRASE_COOL_LATIOS
goto_if_eq Route123_BerryMastersHouse_EventScript_GiveDurinBerry
compare VAR_0x8004, PHRASE_SUPER_HUSTLE
goto_if_eq Route123_BerryMastersHouse_EventScript_GiveBelueBerry
goto_if_eq VAR_0x8004, NOT_SPECIAL_PHRASE, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
goto_if_eq VAR_0x8004, PHRASE_GREAT_BATTLE, Route123_BerryMastersHouse_EventScript_GiveSpelonBerry
goto_if_eq VAR_0x8004, PHRASE_CHALLENGE_CONTEST, Route123_BerryMastersHouse_EventScript_GivePamtreBerry
goto_if_eq VAR_0x8004, PHRASE_OVERWHELMING_LATIAS, Route123_BerryMastersHouse_EventScript_GiveWatmelBerry
goto_if_eq VAR_0x8004, PHRASE_COOL_LATIOS, Route123_BerryMastersHouse_EventScript_GiveDurinBerry
goto_if_eq VAR_0x8004, PHRASE_SUPER_HUSTLE, Route123_BerryMastersHouse_EventScript_GiveBelueBerry
end
Route123_BerryMastersHouse_EventScript_GiveNormalBerry::
@@ -77,8 +67,7 @@ Route123_BerryMastersHouse_EventScript_GiveNormalBerry::
random NUM_BERRY_MASTER_WIFE_BERRIES
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
goto Route123_BerryMastersHouse_EventScript_GaveBerry
release
end
@@ -87,8 +76,7 @@ Route123_BerryMastersHouse_EventScript_GiveSpelonBerry::
goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem ITEM_SPELON_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_SPELON_BERRY
goto Route123_BerryMastersHouse_EventScript_GaveBerry
end
@@ -97,8 +85,7 @@ Route123_BerryMastersHouse_EventScript_GivePamtreBerry::
goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem ITEM_PAMTRE_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_PAMTRE_BERRY
goto Route123_BerryMastersHouse_EventScript_GaveBerry
end
@@ -107,8 +94,7 @@ Route123_BerryMastersHouse_EventScript_GiveWatmelBerry::
goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem ITEM_WATMEL_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_WATMEL_BERRY
goto Route123_BerryMastersHouse_EventScript_GaveBerry
end
@@ -117,8 +103,7 @@ Route123_BerryMastersHouse_EventScript_GiveDurinBerry::
goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem ITEM_DURIN_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_DURIN_BERRY
goto Route123_BerryMastersHouse_EventScript_GaveBerry
end
@@ -127,8 +112,7 @@ Route123_BerryMastersHouse_EventScript_GiveBelueBerry::
goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem ITEM_BELUE_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_BELUE_BERRY
goto Route123_BerryMastersHouse_EventScript_GaveBerry
end