1 files changed, 21 insertions, 16 deletions
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index d4574eac6..285f4f868 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -1,3 +1,8 @@
+const_value set 2
+	const ROUTE39BARN_TWIN1
+	const ROUTE39BARN_TWIN2
+	const ROUTE39BARN_TAUROS
+
 Route39Barn_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -11,16 +16,16 @@ TwinScript_0x9cc76:
 	checkevent EVENT_HEALED_MOOMOO
 	iftrue .FeedingMooMoo
 	writetext Text_MoomooIsSick
+	waitbutton
 	closetext
-	loadmovesprites
-	spriteface $2, RIGHT
+	spriteface ROUTE39BARN_TWIN1, RIGHT
 	end
 
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
+	waitbutton
 	closetext
-	loadmovesprites
-	spriteface $2, RIGHT
+	spriteface ROUTE39BARN_TWIN1, RIGHT
 	end
 
 TwinScript_0x9cc90:
@@ -29,16 +34,16 @@ TwinScript_0x9cc90:
 	checkevent EVENT_HEALED_MOOMOO
 	iftrue .FeedingMooMoo
 	writetext Text_MoomooIsSick
+	waitbutton
 	closetext
-	loadmovesprites
-	spriteface $3, LEFT
+	spriteface ROUTE39BARN_TWIN2, LEFT
 	end
 
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
+	waitbutton
 	closetext
-	loadmovesprites
-	spriteface $3, LEFT
+	spriteface ROUTE39BARN_TWIN2, LEFT
 	end
 
 TaurosScript_0x9ccaa:
@@ -52,8 +57,8 @@ TaurosScript_0x9ccaa:
 	writetext Text_ItsCryIsWeak
 	checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
 	iftrue .GiveBerry
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .GiveBerry:
@@ -71,24 +76,24 @@ TaurosScript_0x9ccaa:
 	if_equal 5, .FiveBerries
 	if_equal 7, .SevenBerries
 	writetext Text_GaveBerry
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .ThreeBerries:
 	writetext Text_GaveBerry
 	keeptextopen
 	writetext Text_LittleHealthier
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .FiveBerries:
 	writetext Text_GaveBerry
 	keeptextopen
 	writetext Text_QuiteHealthy
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .SevenBerries:
@@ -98,28 +103,28 @@ TaurosScript_0x9ccaa:
 	keeptextopen
 	special RestartMapMusic
 	writetext Text_TotallyHealthy
+	waitbutton
 	closetext
-	loadmovesprites
 	setevent EVENT_HEALED_MOOMOO
 	end
 
 .NoBerriesInBag:
 	writetext Text_NoBerries
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .Refused:
 	writetext Text_RefusedToGiveBerry
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .HappyCow:
 	writetext UnknownText_0x9cd92
 	cry MILTANK
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 Text_MoomooIsSick: