1 files changed, 22 insertions, 11 deletions
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index b970499f8..582cc8d38 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -1,3 +1,14 @@
+const_value set 2
+	const BLACKTHORNCITY_SUPER_NERD1
+	const BLACKTHORNCITY_SUPER_NERD2
+	const BLACKTHORNCITY_GRAMPS1
+	const BLACKTHORNCITY_GRAMPS2
+	const BLACKTHORNCITY_BLACK_BELT
+	const BLACKTHORNCITY_COOLTRAINER_F1
+	const BLACKTHORNCITY_YOUNGSTER1
+	const BLACKTHORNCITY_YOUNGSTER2
+	const BLACKTHORNCITY_COOLTRAINER_F2
+
 BlackthornCity_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -16,11 +27,11 @@ BlackthornCity_MapScriptHeader:
 .Santos
 	checkcode VAR_WEEKDAY
 	if_equal SATURDAY, .SantosAppears
-	disappear $9
+	disappear BLACKTHORNCITY_YOUNGSTER2
 	return
 
 .SantosAppears
-	appear $9
+	appear BLACKTHORNCITY_YOUNGSTER2
 	return
 
 SuperNerdScript_0x1a46e8:
@@ -31,20 +42,20 @@ SuperNerdScript_0x1a46e8:
 	checkevent EVENT_CLEARED_RADIO_TOWER
 	iftrue UnknownScript_0x1a46fc
 	writetext UnknownText_0x1a477a
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 UnknownScript_0x1a46fc:
 	writetext UnknownText_0x1a47f3
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 UnknownScript_0x1a4702:
 	writetext UnknownText_0x1a4865
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 GrampsScript_0x1a4708:
@@ -59,14 +70,14 @@ BlackBeltScript_0x1a470e:
 	checkevent EVENT_CLEARED_RADIO_TOWER
 	iftrue UnknownScript_0x1a471c
 	writetext UnknownText_0x1a494a
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 UnknownScript_0x1a471c:
 	writetext UnknownText_0x1a4983
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 CooltrainerFScript_0x1a4722:
@@ -97,21 +108,21 @@ SantosScript:
 	iffalse SantosDoneScript
 	setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
 	writetext SantosGaveGiftText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 SantosSaturdayScript:
 	writetext SantosSaturdayText
-	closetext
+	waitbutton
 SantosDoneScript:
-	loadmovesprites
+	closetext
 	end
 
 SantosNotSaturdayScript:
 	writetext SantosNotSaturdayText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 BlackthornCitySign: