diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/battle_message.c | |
parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/battle_message.c')
-rw-r--r-- | src/battle_message.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 75f9b1da8..f283d959c 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -14,6 +14,7 @@ #include "palette.h" #include "recorded_battle.h" #include "string_util.h" +#include "strings.h" #include "text.h" #include "window.h" #include "constants/battle_string_ids.h" @@ -40,15 +41,7 @@ extern u8 gUnknown_0203C7B4; extern const u8 gTrainerClassNames[][13]; extern const u16 gUnknown_08D85620[]; -// strings -extern const u8 gText_PkmnBoxSomeonesPCFull[]; -extern const u8 gText_PkmnBoxLanettesPCFull[]; -extern const u8 gText_PkmnTransferredSomeonesPC[]; -extern const u8 gText_PkmnTransferredLanettesPC[]; - -extern u8 GetFrontierBrainTrainerClass(void); // battle_frontier_2 extern u8 GetTrainerHillOpponentClass(u16 trainerId); // pokenav -extern void CopyFrontierBrainTrainerName(u8 *txtPtr); // battle_frontier_2 extern void GetTrainerHillTrainerName(u8 *txtPtr, u16 trainerId); // pokenav extern void CopyTrainerHillTrainerText(u8 arg0, u16 trainerId); // pokenav |