pushing so I can merge

This commit is contained in:
golem galvanize
2018-12-06 23:14:33 -05:00
parent ba3247d5cd
commit 18124740a4
5 changed files with 1618 additions and 3236 deletions

View File

@@ -370,6 +370,12 @@ extern const u8 gText_ThreeDashes[];
extern const u8 gText_PkmnHPRestoredByVar2[];
extern const u8 gText_CantBeUsedOnPkmn[];
extern const u8 gText_CancelParticipation[];
extern const u8 gText_PkmnWasGivenItem[];
extern const u8 gText_RecievedItemFromPkmn[];
extern const u8 gText_SwitchPkmnItem[];
extern const u8 gText_SwitchedPkmnItem[];
extern const u8 gText_BagFullCouldNotRemoveItem[];
extern const u8 gText_PkmnCantParticipate[];
//pokedex text
extern const u8 gText_CryOf[];