Merge remote-tracking branch 'pret/master'

This commit is contained in:
Diegoisawesome
2017-09-16 14:24:47 -05:00
111 changed files with 6263 additions and 10954 deletions

View File

@@ -45,7 +45,7 @@ gExpandedPlaceholder_Brendan:: @ 85E8258
gExpandedPlaceholder_May:: @ 85E8260
.string "MAY$"
gText_Egg:: @ 85E8264
gText_EggNickname:: @ 85E8264
.string "EGG$"
gText_Pokemon:: @ 85E8268