Merge branch 'master' into navdata

This commit is contained in:
garak
2019-07-20 12:30:41 -04:00
committed by GitHub
96 changed files with 4362 additions and 897 deletions

View File

@@ -485,7 +485,6 @@ extern const u8 gText_CryOf[];
extern const u8 gText_SizeComparedTo[];
extern const u8 gText_PokedexRegistration[];
extern const u8 gText_UnkCtrlF908Clear01[];
extern const u8 sText_TenDashes2[];
extern const u8 gText_5MarksPokemon[];
extern const u8 gText_UnkHeight[];
extern const u8 gText_UnkWeight[];