Merge branch 'master' into doc-viridian

2020-01-24 20:50:53 -05:00
parent c0be66fc2e a09e66b53f
commit 97d2555fad
113 changed files with 1045 additions and 995 deletions
@@ -84,11 +84,11 @@ CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty:: @ 81ACE68
 	release
 	end

-VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83
+VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83
 	lockall
 	famechecker FAMECHECKER_LTSURGE, 5
 	textcolor 3
-	msgbox gUnknown_81B1558
+	msgbox PokemonJournal_Text_SpecialFeatureLtSurge
 	releaseall
 	end