Merge remote-tracking branch 'pret/master'

This commit is contained in:
Diegoisawesome
2017-12-15 00:08:48 -06:00
188 changed files with 20683 additions and 24708 deletions

View File

@@ -57,7 +57,7 @@ gEasyChatGroup_Pokemon2:: @ 859CE0C
.2byte SPECIES_ESPEON
.2byte SPECIES_EXEGGCUTE
.2byte SPECIES_EXEGGUTOR
.2byte SPECIES_FARFETCH_D
.2byte SPECIES_FARFETCHD
.2byte SPECIES_FEAROW
.2byte SPECIES_FERALIGATR
.2byte SPECIES_FLAAFFY

File diff suppressed because it is too large Load Diff