summaryrefslogtreecommitdiff
path: root/data/maps/Route109_SeashoreHouse/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route109_SeashoreHouse/scripts.inc')
-rw-r--r--data/maps/Route109_SeashoreHouse/scripts.inc22
1 files changed, 9 insertions, 13 deletions
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index c4cfd1576..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
@@ -37,25 +36,22 @@ Route109_SeashoreHouse_EventScript_BagFull::
end
Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop::
- showmoneybox 0, 0, 0
+ 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
end
Route109_SeashoreHouse_EventScript_BuySodaPop::
- checkmoney 300, 0
- compare VAR_RESULT, FALSE
- goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughMoney
- checkitemspace ITEM_SODA_POP, 1
- compare VAR_RESULT, FALSE
- goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughSpace
+ checkmoney 300
+ goto_if_eq VAR_RESULT, FALSE, Route109_SeashoreHouse_EventScript_NotEnoughMoney
+ checkitemspace ITEM_SODA_POP
+ goto_if_eq VAR_RESULT, FALSE, Route109_SeashoreHouse_EventScript_NotEnoughSpace
msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT
- removemoney 300, 0
- updatemoneybox 0, 0
+ removemoney 300
+ updatemoneybox
giveitem ITEM_SODA_POP
hidemoneybox
release