Merge branch 'master' into doc-partymenu

This commit is contained in:
GriffinR
2019-10-31 14:22:51 -04:00
committed by GitHub
219 changed files with 7959 additions and 7663 deletions

View File

@@ -2035,8 +2035,8 @@ extern const u8 gText_Confusion[];
extern const u8 gText_Love[];
// battle message
extern const u8 gText_PkmnBoxSomeonesPCFull[];
extern const u8 gText_PkmnBoxLanettesPCFull[];
extern const u8 gText_PkmnTransferredSomeonesPCBoxFull[];
extern const u8 gText_PkmnTransferredLanettesPCBoxFull[];
extern const u8 gText_PkmnTransferredSomeonesPC[];
extern const u8 gText_PkmnTransferredLanettesPC[];