summaryrefslogtreecommitdiff
path: root/maps/ViridianMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/ViridianMart.asm')
-rw-r--r--maps/ViridianMart.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index 25764b0a5..c2235496a 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -4,7 +4,7 @@ const_value set 2
const VIRIDIANMART_COOLTRAINER_M
ViridianMart_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -16,19 +16,19 @@ ClerkScript_0x9b5e7:
closetext
end
-LassScript_0x9b5ee:
- jumptextfaceplayer UnknownText_0x9b5f4
+ViridianMartLassScript:
+ jumptextfaceplayer ViridianMartLassText
-CooltrainerMScript_0x9b5f1:
- jumptextfaceplayer UnknownText_0x9b61a
+ViridianMartCooltrainerMScript:
+ jumptextfaceplayer ViridianMartCooltrainerMText
-UnknownText_0x9b5f4:
+ViridianMartLassText:
text "The GYM LEADER"
line "here is totally"
cont "cool."
done
-UnknownText_0x9b61a:
+ViridianMartCooltrainerMText:
text "Have you been to"
line "CINNABAR?"
@@ -45,14 +45,14 @@ ViridianMart_MapEventHeader:
warp_def $7, $2, 4, VIRIDIAN_CITY
warp_def $7, $3, 4, VIRIDIAN_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_0x9b5e7, -1
- person_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x9b5ee, -1
- person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b5f1, -1
+ object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
+ object_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
+ object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1