diff options
Diffstat (limited to 'maps/SaffronMart.asm')
| -rw-r--r-- | maps/SaffronMart.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index fe798909b..df0e3c684 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,34 +1,29 @@ -SaffronMart_MapScriptHeader: ; 0x18a3bd - ; trigger count +SaffronMart_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x18a3bf -ClerkScript_0x18a3bf: ; 0x18a3bf +ClerkScript_0x18a3bf: loadfont pokemart $0, $001e loadmovesprites end -; 0x18a3c6 -CooltrainerMScript_0x18a3c6: ; 0x18a3c6 +CooltrainerMScript_0x18a3c6: jumptextfaceplayer UnknownText_0x18a3cc -; 0x18a3c9 -CooltrainerFScript_0x18a3c9: ; 0x18a3c9 +CooltrainerFScript_0x18a3c9: jumptextfaceplayer UnknownText_0x18a3f3 -; 0x18a3cc -UnknownText_0x18a3cc: ; 0x18a3cc +UnknownText_0x18a3cc: text "There's a big" line "RADIO TOWER in" cont "LAVENDER." done -; 0x18a3f3 -UnknownText_0x18a3f3: ; 0x18a3f3 +UnknownText_0x18a3f3: text "I want to become" line "stronger, but I'm" cont "not good yet…" @@ -36,26 +31,24 @@ UnknownText_0x18a3f3: ; 0x18a3f3 para "Could you show me" line "how sometime?" done -; 0x18a444 -SaffronMart_MapEventHeader: ; 0x18a444 +SaffronMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 3, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, $ffff - person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, $ffff - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, $ffff -; 0x18a47b + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18a3bf, -1 + person_event SPRITE_COOLTRAINER_M, 6, 11, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CooltrainerMScript_0x18a3c6, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18a3c9, -1 |