summaryrefslogtreecommitdiff
path: root/maps/GoldenrodFlowerShop.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodFlowerShop.asm')
-rw-r--r--maps/GoldenrodFlowerShop.asm16
1 files changed, 10 insertions, 6 deletions
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index d99afb751..f89eee61a 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -1,3 +1,7 @@
+const_value set 2
+ const GOLDENRODFLOWERSHOP_TEACHER
+ const GOLDENRODFLOWERSHOP_LASS
+
GoldenrodFlowerShop_MapScriptHeader:
.MapTriggers:
db 0
@@ -22,17 +26,17 @@ FlowerShopTeacherScript:
keeptextopen
verbosegiveitem SQUIRTBOTTLE
setevent EVENT_GOT_SQUIRTBOTTLE
- loadmovesprites
+ closetext
setevent EVENT_FLORIA_AT_SUDOWOODO
clearevent EVENT_FLORIA_AT_FLOWER_SHOP
end
.Lalala:
- spriteface $2, LEFT
+ spriteface GOLDENRODFLOWERSHOP_TEACHER, LEFT
loadfont
writetext UnknownText_0x5552e
+ waitbutton
closetext
- loadmovesprites
end
.GotSquirtbottle:
@@ -52,8 +56,8 @@ FlowerShopFloriaScript:
checkevent EVENT_GOT_SQUIRTBOTTLE
iftrue .GotSquirtbottle
writetext UnknownText_0x55561
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
setevent EVENT_FLORIA_AT_FLOWER_SHOP
clearevent EVENT_FLORIA_AT_SUDOWOODO
@@ -61,14 +65,14 @@ FlowerShopFloriaScript:
.GotSquirtbottle:
writetext UnknownText_0x555e6
+ waitbutton
closetext
- loadmovesprites
end
.FoughtSudowoodo:
writetext UnknownText_0x55604
+ waitbutton
closetext
- loadmovesprites
end
FlowerShopShelf1: