1 files changed, 13 insertions, 13 deletions
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index fa753ab1b..d8f88c659 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -4,7 +4,7 @@ const_value set 2
 	const LAVENDERMART_ROCKER
 
 LavenderMart_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
 	db 0
 
 .MapCallbacks:
@@ -16,13 +16,13 @@ ClerkScript_0x7eb1c:
 	closetext
 	end
 
-PokefanMScript_0x7eb23:
-	jumptextfaceplayer UnknownText_0x7eb29
+LavenderMartPokefanMScript:
+	jumptextfaceplayer LavenderMartPokefanMText
 
-RockerScript_0x7eb26:
-	jumptextfaceplayer UnknownText_0x7ebac
+LavenderMartRockerScript:
+	jumptextfaceplayer LavenderMartRockerText
 
-UnknownText_0x7eb29:
+LavenderMartPokefanMText:
 	text "REPEL is a neces-"
 	line "sity if you are"
 
@@ -36,7 +36,7 @@ UnknownText_0x7eb29:
 	line "all the caves."
 	done
 
-UnknownText_0x7ebac:
+LavenderMartRockerText:
 	text "I heard about a"
 	line "craftsman who"
 
@@ -56,14 +56,14 @@ LavenderMart_MapEventHeader:
 	warp_def $7, $2, 5, LAVENDER_TOWN
 	warp_def $7, $3, 5, LAVENDER_TOWN
 
-.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_0x7eb1c, -1
-	person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x7eb23, -1
-	person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x7eb26, -1
+	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
+	object_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
+	object_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1