diff options
Diffstat (limited to 'maps/GoldenrodFlowerShop.asm')
| -rw-r--r-- | maps/GoldenrodFlowerShop.asm | 80 |
1 files changed, 31 insertions, 49 deletions
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 9e453e5c4..08f6dc3c9 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,21 +1,20 @@ -GoldenrodFlowerShop_MapScriptHeader: ; 0x5535b - ; trigger count +GoldenrodFlowerShop_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x5535d -TeacherScript_0x5535d: ; 0x5535d +TeacherScript_0x5535d: checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x5538f checkevent EVENT_GOT_SQUIRTBOTTLE iftrue UnknownScript_0x55399 checkevent EVENT_MET_FLORIA iffalse UnknownScript_0x5539f - checkevent $00ba + checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP iffalse UnknownScript_0x5538f - checkflag $001d + checkflag ENGINE_PLAINBADGE iffalse UnknownScript_0x5539c faceplayer loadfont @@ -25,32 +24,27 @@ TeacherScript_0x5535d: ; 0x5535d setevent EVENT_GOT_SQUIRTBOTTLE loadmovesprites setevent EVENT_FLORIA_AT_SUDOWOODO - clearevent $0768 + clearevent EVENT_FLORIA_AT_FLOWER_SHOP end -; 0x5538f -UnknownScript_0x5538f: ; 0x5538f +UnknownScript_0x5538f: spriteface $2, LEFT loadfont writetext UnknownText_0x5552e closetext loadmovesprites end -; 0x55399 -UnknownScript_0x55399: ; 0x55399 +UnknownScript_0x55399: jumptextfaceplayer UnknownText_0x5550d -; 0x5539c -UnknownScript_0x5539c: ; 0x5539c +UnknownScript_0x5539c: jumptextfaceplayer UnknownText_0x55463 -; 0x5539f -UnknownScript_0x5539f: ; 0x5539f +UnknownScript_0x5539f: jumptextfaceplayer UnknownText_0x553d4 -; 0x553a2 -LassScript_0x553a2: ; 0x553a2 +LassScript_0x553a2: faceplayer loadfont checkevent EVENT_FOUGHT_SUDOWOODO @@ -60,25 +54,22 @@ LassScript_0x553a2: ; 0x553a2 writetext UnknownText_0x55561 closetext loadmovesprites - setevent $00ba - setevent $0768 + setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP + setevent EVENT_FLORIA_AT_FLOWER_SHOP clearevent EVENT_FLORIA_AT_SUDOWOODO end -; 0x553bf -UnknownScript_0x553bf: ; 0x553bf +UnknownScript_0x553bf: writetext UnknownText_0x555e6 closetext loadmovesprites end -; 0x553c5 -UnknownScript_0x553c5: ; 0x553c5 +UnknownScript_0x553c5: writetext UnknownText_0x55604 closetext loadmovesprites end -; 0x553cb FlowerShopShelf1: ; unused @@ -92,7 +83,7 @@ FlowerShopRadio: ; unused jumpstd radio2 -UnknownText_0x553d4: ; 0x553d4 +UnknownText_0x553d4: text "Have you seen that" line "wiggly tree that's" @@ -108,9 +99,8 @@ UnknownText_0x553d4: ; 0x553d4 para "I'm worried… Isn't" line "it dangerous?" done -; 0x55463 -UnknownText_0x55463: ; 0x55463 +UnknownText_0x55463: text "Do you want to" line "borrow the water" @@ -120,9 +110,8 @@ UnknownText_0x55463: ; 0x55463 para "doing anything" line "dangerous with it." done -; 0x554c2 -UnknownText_0x554c2: ; 0x554c2 +UnknownText_0x554c2: text "Oh, you're better" line "than WHITNEY…" @@ -130,22 +119,19 @@ UnknownText_0x554c2: ; 0x554c2 line "then. Here's the" cont "SQUIRTBOTTLE!" done -; 0x5550d -UnknownText_0x5550d: ; 0x5550d +UnknownText_0x5550d: text "Don't do anything" line "too dangerous!" done -; 0x5552e -UnknownText_0x5552e: ; 0x5552e +UnknownText_0x5552e: text "Lalala lalalala." line "Have plenty of" cont "water, my lovely!" done -; 0x55561 -UnknownText_0x55561: ; 0x55561 +UnknownText_0x55561: text "When I told my sis" line "about the jiggly" @@ -158,37 +144,33 @@ UnknownText_0x55561: ; 0x55561 para "lend me her water" line "bottle…" done -; 0x555e6 -UnknownText_0x555e6: ; 0x555e6 +UnknownText_0x555e6: text "Wow, you beat" line "WHITNEY? Cool!" done -; 0x55604 -UnknownText_0x55604: ; 0x55604 +UnknownText_0x55604: text "So it really was a" line "#MON!" done -; 0x5561e -GoldenrodFlowerShop_MapEventHeader: ; 0x5561e +GoldenrodFlowerShop_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 6, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, $ffff - person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, $0768 -; 0x55648 + person_event SPRITE_TEACHER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x5535d, -1 + person_event SPRITE_LASS, 10, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_FLORIA_AT_FLOWER_SHOP |