Merge branch 'master' into heal_location

This commit is contained in:
PikalaxALT
2017-11-02 07:59:29 -04:00
55 changed files with 17065 additions and 11647 deletions

View File

@@ -77,5 +77,10 @@ extern const u8 gText_Hideout[];
extern const u8 gText_FlyToWhere[];
extern const u8 gUnknown_085EC782[];
extern const u8 gUnknown_085EC791[];
extern const u8 gText_ApostropheSBase[];
extern const u8 gText_NoRegistry[];
extern const u8 gText_OkayToDeleteFromRegistry[];
extern const u8 gText_RegisteredDataDeleted[];
extern const u8 gUnknown_085EA79D[];
#endif //GUARD_STRINGS_H