Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-08-17 15:41:50 -04:00
commit ab56ac41a1
322 files changed
+12564 -12748

No files matched your search

+2 -2
View File
@@ -6,7 +6,7 @@ CeruleanCity_BikeShop_EventScript_Clerk::
faceplayer
goto_if_set FLAG_GOT_BICYCLE, CeruleanCity_BikeShop_EventScript_AlreadyGotBicycle
goto_if_set FLAG_GOT_BIKE_VOUCHER, CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher
showmoneybox 0, 0, 0
showmoneybox 0, 0
message CeruleanCity_BikeShop_Text_WelcomeToBikeShop
waitmessage
multichoice 11, 0, MULTICHOICE_BIKE_SHOP, FALSE
@@ -24,7 +24,7 @@ CeruleanCity_BikeShop_EventScript_TryPurchaseBicycle::
CeruleanCity_BikeShop_EventScript_ClerkGoodbye::
msgbox CeruleanCity_BikeShop_Text_ThankYouComeAgain
hidemoneybox 0, 0
hidemoneybox
release
end