Merge branch 'master' into field_poison

This commit is contained in:
PikalaxALT
2017-11-29 08:19:54 -05:00
8 changed files with 86 additions and 151 deletions

View File

@@ -83,5 +83,6 @@ extern const u8 gText_OkayToDeleteFromRegistry[];
extern const u8 gText_RegisteredDataDeleted[];
extern const u8 gUnknown_085EA79D[];
extern const u8 gText_PkmnFainted3[];
extern const u8 gText_Coins[];
#endif //GUARD_STRINGS_H