diff options
Diffstat (limited to 'maps/VioletMart.asm')
| -rw-r--r-- | maps/VioletMart.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 0513be044..c28c00869 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -4,7 +4,7 @@ const_value set 2 const VIOLETMART_COOLTRAINER_M VioletMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x68295: closetext end -GrannyScript_0x6829c: - jumptextfaceplayer UnknownText_0x682a2 +VioletMartGrannyScript: + jumptextfaceplayer VioletMartGrannyText -CooltrainerMScript_0x6829f: - jumptextfaceplayer UnknownText_0x68323 +VioletMartCooltrainerMScript: + jumptextfaceplayer VioletMartCooltrainerMText -UnknownText_0x682a2: +VioletMartGrannyText: text "When you first" line "catch a #MON," cont "it may be weak." @@ -36,7 +36,7 @@ UnknownText_0x682a2: cont "love." done -UnknownText_0x68323: +VioletMartCooltrainerMText: text "#MON can hold" line "items like POTION" cont "and ANTIDOTE." @@ -57,14 +57,14 @@ VioletMart_MapEventHeader: warp_def $7, $2, 1, VIOLET_CITY warp_def $7, $3, 1, VIOLET_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_0x68295, -1 - person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x6829c, -1 - person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x6829f, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 + object_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 + object_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 |