summaryrefslogtreecommitdiff
path: root/maps/VermilionMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VermilionMart.asm')
-rw-r--r--maps/VermilionMart.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index 7da93f1e2..0825c71d8 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -4,7 +4,7 @@ const_value set 2
const VERMILIONMART_BUENA
VermilionMart_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -16,13 +16,13 @@ ClerkScript_0x191f7e:
closetext
end
-SuperNerdScript_0x191f85:
- jumptextfaceplayer UnknownText_0x191f8b
+VermilionMartSuperNerdScript:
+ jumptextfaceplayer VermilionMartSuperNerdText
-BuenaScript_0x191f88:
- jumptextfaceplayer UnknownText_0x191fca
+VermilionMartBuenaScript:
+ jumptextfaceplayer VermilionMartBuenaText
-UnknownText_0x191f8b:
+VermilionMartSuperNerdText:
text "TEAM ROCKET is no"
line "longer in KANTO."
@@ -30,7 +30,7 @@ UnknownText_0x191f8b:
line "me happy."
done
-UnknownText_0x191fca:
+VermilionMartBuenaText:
text "I'm thinking about"
line "going shopping in"
cont "SAFFRON."
@@ -45,14 +45,14 @@ VermilionMart_MapEventHeader:
warp_def $7, $2, 5, VERMILION_CITY
warp_def $7, $3, 5, VERMILION_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_0x191f7e, -1
- person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x191f85, -1
- person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x191f88, -1
+ object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
+ object_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
+ object_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1