diff options
Diffstat (limited to 'maps/OlivineMart.asm')
| -rw-r--r-- | maps/OlivineMart.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 1320a3330..f8910aceb 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,36 +1,31 @@ -OlivineMart_MapScriptHeader: ; 0x9cac5 - ; trigger count +OlivineMart_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x9cac7 -ClerkScript_0x9cac7: ; 0x9cac7 +ClerkScript_0x9cac7: loadfont pokemart $0, $000d loadmovesprites end -; 0x9cace -CooltrainerFScript_0x9cace: ; 0x9cace +CooltrainerFScript_0x9cace: jumptextfaceplayer UnknownText_0x9cad4 -; 0x9cad1 -LassScript_0x9cad1: ; 0x9cad1 +LassScript_0x9cad1: jumptextfaceplayer UnknownText_0x9cb16 -; 0x9cad4 -UnknownText_0x9cad4: ; 0x9cad4 +UnknownText_0x9cad4: text "Do your #MON" line "already know the" para "move for carrying" line "people on water?" done -; 0x9cb16 -UnknownText_0x9cb16: ; 0x9cb16 +UnknownText_0x9cb16: text "My BUTTERFREE came" line "from my boyfriend" cont "overseas." @@ -44,26 +39,24 @@ UnknownText_0x9cb16: ; 0x9cb16 para "Let's see… Nope!" line "It's a secret!" done -; 0x9cb9e -OlivineMart_MapEventHeader: ; 0x9cb9e +OlivineMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 8, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 8, GROUP_OLIVINE_CITY, MAP_OLIVINE_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_0x9cac7, $ffff - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, $ffff - person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, $ffff -; 0x9cbd5 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x9cac7, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, OW_UP | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x9cace, -1 + person_event SPRITE_LASS, 10, 5, OW_LEFT | $0, $0, -1, -1, $0, 0, LassScript_0x9cad1, -1 |