summaryrefslogtreecommitdiff
path: root/data/maps/Route109_SeashoreHouse
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:30 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:51 -0500
commite66ea0cb996c70093fe3f250cafb7f1f87e84d4d (patch)
tree162e07afa059e7683e4aa991a1a82205c16b3025 /data/maps/Route109_SeashoreHouse
parentc57efdba5d3cc475f75c5909c31f96bbce6190b8 (diff)
Reformat compare + goto_if/call_if to single statements
Diffstat (limited to 'data/maps/Route109_SeashoreHouse')
-rw-r--r--data/maps/Route109_SeashoreHouse/scripts.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index d1a892b7c..afb2a4aa0 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -25,8 +25,7 @@ Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction::
Route109_SeashoreHouse_EventScript_DefeatedTrainers::
msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT
giveitem ITEM_SODA_POP, 6
- compare VAR_RESULT, FALSE
- goto_if_eq Route109_SeashoreHouse_EventScript_BagFull
+ goto_if_eq VAR_RESULT, FALSE, Route109_SeashoreHouse_EventScript_BagFull
setflag FLAG_RECEIVED_6_SODA_POP
release
end
@@ -39,8 +38,7 @@ Route109_SeashoreHouse_EventScript_BagFull::
Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop::
showmoneybox 0, 0
msgbox Route109_SeashoreHouse_Text_WantToBuySodaPop, MSGBOX_YESNO
- compare VAR_RESULT, YES
- goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop
+ goto_if_eq VAR_RESULT, YES, Route109_SeashoreHouse_EventScript_BuySodaPop
msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT
hidemoneybox
release
@@ -48,11 +46,9 @@ Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop::
Route109_SeashoreHouse_EventScript_BuySodaPop::
checkmoney 300
- compare VAR_RESULT, FALSE
- goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughMoney
+ goto_if_eq VAR_RESULT, FALSE, Route109_SeashoreHouse_EventScript_NotEnoughMoney
checkitemspace ITEM_SODA_POP
- compare VAR_RESULT, FALSE
- goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughSpace
+ goto_if_eq VAR_RESULT, FALSE, Route109_SeashoreHouse_EventScript_NotEnoughSpace
msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT
removemoney 300
updatemoneybox