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

36
data/scripts/berry_tree.inc
View File

@@ -22,8 +22,7 @@ BerryTree_EventScript_CheckSoil::
lock
faceplayer
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, TRUE
goto_if_eq BerryTree_EventScript_WantToPlant
goto_if_eq VAR_RESULT, TRUE, BerryTree_EventScript_WantToPlant
message BerryTree_Text_ItsSoftLoamySoil
waitmessage
waitbuttonpress
@@ -32,10 +31,8 @@ BerryTree_EventScript_CheckSoil::
BerryTree_EventScript_WantToPlant::
msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryTree_EventScript_ChooseBerryToPlant
compare VAR_RESULT, NO
goto_if_eq BerryTree_EventScript_CancelPlanting
goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_ChooseBerryToPlant
goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_CancelPlanting
end
BerryTree_EventScript_ChooseBerryToPlant::
@@ -43,8 +40,7 @@ BerryTree_EventScript_ChooseBerryToPlant::
closemessage
special Bag_ChooseBerry
waitstate
compare VAR_ITEM_ID, 0
goto_if_eq BerryTree_EventScript_CancelPlanting
goto_if_eq VAR_ITEM_ID, 0, BerryTree_EventScript_CancelPlanting
removeitem VAR_ITEM_ID
call BerryTree_EventScript_PlantBerry
@@ -88,10 +84,8 @@ BerryTree_EventScript_CheckBerryStage4::
@ VAR_0x8005 here is the number of times watered
@ Buffered by ObjectEventInteractionGetBerryTreeData
BerryTree_EventScript_GetCareAdverb::
compare VAR_0x8005, 0
goto_if_eq BerryTree_EventScript_SetAdverbPoor
compare VAR_0x8005, 4
goto_if_eq BerryTree_EventScript_SetAdverbGreat
goto_if_eq VAR_0x8005, 0, BerryTree_EventScript_SetAdverbPoor
goto_if_eq VAR_0x8005, 4, BerryTree_EventScript_SetAdverbGreat
bufferstring STR_VAR_2, BerryTree_Text_CareAdverbGood
return
@@ -110,15 +104,12 @@ BerryTree_EventScript_CheckBerryFullyGrown::
faceplayer
special ObjectEventInteractionGetBerryCountString
msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryTree_EventScript_PickBerry
compare VAR_RESULT, NO
goto_if_eq BerryTree_EventScript_CancelPickingBerry
goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_PickBerry
goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_CancelPickingBerry
BerryTree_EventScript_PickBerry::
special ObjectEventInteractionPickBerryTree
compare VAR_0x8004, 0
goto_if_eq BerryTree_EventScript_BerryPocketFull
goto_if_eq VAR_0x8004, 0, BerryTree_EventScript_BerryPocketFull
special IncrementDailyPickedBerries
special ObjectEventInteractionRemoveBerryTree
message BerryTree_Text_PickedTheBerry
@@ -155,14 +146,11 @@ BerryTree_EventScript_ItemUsePlantBerry::
BerryTree_EventScript_WantToWater::
checkitem ITEM_WAILMER_PAIL
compare VAR_RESULT, FALSE
goto_if_eq BerryTree_EventScript_DontWater
goto_if_eq VAR_RESULT, FALSE, BerryTree_EventScript_DontWater
special ObjectEventInteractionGetBerryName
msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryTree_EventScript_WaterBerry
compare VAR_RESULT, NO
goto_if_eq BerryTree_EventScript_DontWater
goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_WaterBerry
goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_DontWater
BerryTree_EventScript_DontWater::
releaseall