summaryrefslogtreecommitdiff
path: root/maps/PewterMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PewterMart.asm')
-rw-r--r--maps/PewterMart.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index 6ee67b720..be92c8cac 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -4,7 +4,7 @@ const_value set 2
const PEWTERMART_SUPER_NERD
PewterMart_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -16,13 +16,13 @@ ClerkScript_0x1a2dcb:
closetext
end
-YoungsterScript_0x1a2dd2:
- jumptextfaceplayer UnknownText_0x1a2dd8
+PewterMartYoungsterScript:
+ jumptextfaceplayer PewterMartYoungsterText
-SuperNerdScript_0x1a2dd5:
- jumptextfaceplayer UnknownText_0x1a2e3a
+PewterMartSuperNerdScript:
+ jumptextfaceplayer PewterMartSuperNerdText
-UnknownText_0x1a2dd8:
+PewterMartYoungsterText:
text "Hi! Check out my"
line "GYARADOS!"
@@ -33,7 +33,7 @@ UnknownText_0x1a2dd8:
line "it has become."
done
-UnknownText_0x1a2e3a:
+PewterMartSuperNerdText:
text "There once was a"
line "weird old man who"
cont "sold MAGIKARP."
@@ -54,14 +54,14 @@ PewterMart_MapEventHeader:
warp_def $7, $2, 3, PEWTER_CITY
warp_def $7, $3, 3, PEWTER_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_0x1a2dcb, -1
- person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a2dd2, -1
- person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2dd5, -1
+ object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
+ object_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
+ object_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1