Merge branch 'master' into event_object_movement

1 files changed, 12 insertions, 12 deletions

diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc
index 8633ab23e..787e68e04 100644
--- a/data/maps/Route17/scripts.inc
+++ b/data/maps/Route17/scripts.inc
@@ -1,26 +1,26 @@
 Route17_MapScripts:: @ 81681BF
 	.byte 0
 
-Route17_EventScript_1681C0:: @ 81681C0
-	msgbox gUnknown_81874E4, MSGBOX_SIGN
+Route17_EventScript_ItemsNotice:: @ 81681C0
+	msgbox Route17_Text_WatchOutForDiscardedItems, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681C9:: @ 81681C9
-	msgbox gUnknown_8187512, MSGBOX_SIGN
+Route17_EventScript_TrainerTips1:: @ 81681C9
+	msgbox Route17_Text_SameSpeciesGrowDifferentRates, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681D2:: @ 81681D2
-	msgbox gUnknown_818757B, MSGBOX_SIGN
+Route17_EventScript_TrainerTips2:: @ 81681D2
+	msgbox Route17_Text_PressBToStayInPlace, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681DB:: @ 81681DB
-	msgbox gUnknown_81875BE, MSGBOX_SIGN
+Route17_EventScript_RouteSign:: @ 81681DB
+	msgbox Route17_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681E4:: @ 81681E4
-	msgbox gUnknown_81875E3, MSGBOX_SIGN
+Route17_EventScript_BallsNotice:: @ 81681E4
+	msgbox Route17_Text_DontThrowGameThrowBalls, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681ED:: @ 81681ED
-	msgbox gUnknown_8187622, MSGBOX_SIGN
+Route17_EventScript_CyclingRoadSign:: @ 81681ED
+	msgbox Route17_Text_CyclingRoadSign, MSGBOX_SIGN
 	end