summaryrefslogtreecommitdiff
path: root/data/maps/CeruleanCity_BikeShop/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/CeruleanCity_BikeShop/scripts.inc')
-rw-r--r--data/maps/CeruleanCity_BikeShop/scripts.inc17
1 files changed, 7 insertions, 10 deletions
diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc
index 75ebd4b6b..88c8108cc 100644
--- a/data/maps/CeruleanCity_BikeShop/scripts.inc
+++ b/data/maps/CeruleanCity_BikeShop/scripts.inc
@@ -4,10 +4,8 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC
CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
lock
faceplayer
- checkflag FLAG_GOT_BICYCLE
- goto_if TRUE, EventScript_16AC58
- checkflag FLAG_GOT_BIKE_VOUCHER
- goto_if TRUE, EventScript_16AC22
+ goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC58
+ goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16AC22
showmoneybox 0, 0, 0
message Text_192755
waitmessage
@@ -31,9 +29,9 @@ EventScript_16AC15:: @ 816AC15
EventScript_16AC22:: @ 816AC22
msgbox gUnknown_81927B2
- giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
+ msgreceiveditem gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
setflag FLAG_GOT_BICYCLE
- additem ITEM_BICYCLE, 1
+ additem ITEM_BICYCLE
removeitem ITEM_BIKE_VOUCHER, 1
msgbox gUnknown_819280E
release
@@ -50,14 +48,13 @@ EventScript_16AC62:: @ 816AC62
end
CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C
- msgbox gUnknown_81928CF, 2
+ msgbox gUnknown_81928CF, MSGBOX_NPC
end
CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
lock
faceplayer
- checkflag FLAG_GOT_BICYCLE
- goto_if TRUE, EventScript_16AC8A
+ goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC8A
msgbox gUnknown_8192937
release
end
@@ -69,5 +66,5 @@ EventScript_16AC8A:: @ 816AC8A
CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94
CeruleanCity_EventScript_16AC94:: @ 816AC94
- msgbox gUnknown_81929AD, 3
+ msgbox gUnknown_81929AD, MSGBOX_SIGN
end