diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-24 01:33:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-24 01:33:57 -0600 |
| commit | 980b055bf09215d89870730fa8cea2ac207e2260 (patch) | |
| tree | 60c96f448c076fae793c378cd2327779b5821718 /src/battle_main.c | |
| parent | f835a356622b0038d82bd45fe698d5663091fcde (diff) | |
| parent | 72aa9eb5a91bc36514eb5cf922c5cde209fba8c5 (diff) | |
Merge pull request #471 from DizzyEggg/clean
Get rid of externs and add includes
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index a17ccd4eb..40fb90406 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -39,6 +39,7 @@ #include "sound.h" #include "sprite.h" #include "string_util.h" +#include "strings.h" #include "task.h" #include "text.h" #include "trig.h" @@ -58,7 +59,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; -extern u8 gUnknown_0203CF00[]; extern const u16 gBattleTextboxPalette[]; extern const struct BgTemplate gBattleBgTemplates[]; @@ -69,22 +69,8 @@ extern const u8 *const gBattlescriptsForRunningByItem[]; extern const u8 *const gBattlescriptsForUsingItem[]; extern const u8 *const gBattlescriptsForSafariActions[]; -// strings -extern const u8 gText_LinkStandby3[]; -extern const u8 gText_BattleRecordCouldntBeSaved[]; -extern const u8 gText_Poison[]; -extern const u8 gText_Sleep[]; -extern const u8 gText_Paralysis[]; -extern const u8 gText_Burn[]; -extern const u8 gText_Ice[]; -extern const u8 gText_Confusion[]; -extern const u8 gText_Love[]; - // functions -extern void sub_81B9150(void); extern void sub_80B3AF8(u8 taskId); // cable club -extern void sub_81B8FB0(u8, u8); // party menu -extern u8 pokemon_order_func(u8); // party menu // this file's functions static void CB2_InitBattleInternal(void); |