diff options
Diffstat (limited to 'maps/FuchsiaMart.asm')
| -rw-r--r-- | maps/FuchsiaMart.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index fdf0bc045..05266ecee 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -4,7 +4,7 @@ const_value set 2 const FUCHSIAMART_COOLTRAINER_F FuchsiaMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x195ce8: closetext end -FisherScript_0x195cef: - jumptextfaceplayer UnknownText_0x195cf5 +FuchsiaMartFisherScript: + jumptextfaceplayer FuchsiaMartFisherText -CooltrainerFScript_0x195cf2: - jumptextfaceplayer UnknownText_0x195d36 +FuchsiaMartCooltrainerFScript: + jumptextfaceplayer FuchsiaMartCooltrainerFText -UnknownText_0x195cf5: +FuchsiaMartFisherText: text "I was hoping to" line "buy some SAFARI" @@ -30,7 +30,7 @@ UnknownText_0x195cf5: line "but it's closed…" done -UnknownText_0x195d36: +FuchsiaMartCooltrainerFText: text "The SAFARI ZONE" line "WARDEN's grand-" cont "daughter lives in" @@ -46,14 +46,14 @@ FuchsiaMart_MapEventHeader: warp_def $7, $2, 1, FUCHSIA_CITY warp_def $7, $3, 1, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x195cef, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x195cf2, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 + object_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 + object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 |