Merge branch 'master' into doc-oneisland

2020-02-26 13:58:26 -05:00
parent ad4f363a58 13f14218e1
commit e3ffb01912
89 changed files with 2360 additions and 2501 deletions
@@ -59,19 +59,19 @@ PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: @ 81ACE1C
 	releaseall
 	end

-Route20_EventScript_1ACE36:: @ 81ACE36
+Route20_EventScript_Camper:: @ 81ACE36
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MISTY, 3
-	msgbox Text_1882E1
+	msgbox Route20_Text_MistyTrainsHere
 	release
 	end

-Route25_EventScript_1ACE4F:: @ 81ACE4F
+Route25_EventScript_Beauty:: @ 81ACE4F
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MISTY, 4
-	msgbox Text_189569
+	msgbox Route25_Text_MistyHighHopesAboutThisPlace
 	release
 	end