diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-16 23:59:58 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-06-16 23:59:58 -0400 |
| commit | 8b97aa28047d5bbc24448b47cbda901a3adb9d0e (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/battle_interface.c | |
| parent | dda361afb7e2abafc15a498968580be6d1a83cfe (diff) | |
| parent | f568060cae85a1e8c70a0216ea5d1c6e79d6a528 (diff) | |
Merge remote-tracking branch 'marijn/clean/headers'
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index c5d07e8e9..042861c22 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1,16 +1,18 @@ #include "global.h" -#include "asm.h" #include "battle.h" -#include "sprite.h" -#include "string_util.h" -#include "text.h" +#include "battle_interface.h" #include "decompress.h" -#include "sound.h" -#include "songs.h" -#include "battle.h" #include "palette.h" #include "pokedex.h" -#include "battle_interface.h" +#include "pokemon.h" +#include "rom_8077ABC.h" +#include "safari_zone.h" +#include "songs.h" +#include "sound.h" +#include "sprite.h" +#include "string_util.h" +#include "task.h" +#include "text.h" struct UnknownStruct5 { @@ -39,9 +41,7 @@ extern u8 gUnknown_02024A72[]; extern u8 gUnknown_03004340[]; extern u16 gBattleTypeFlags; -extern u8 gNumSafariBalls; -extern u32 gExperienceTables[8][101]; extern const struct SpriteTemplate gSpriteTemplate_820A4EC[]; extern const struct SpriteTemplate gSpriteTemplate_820A51C[]; extern const struct SpriteTemplate gSpriteTemplate_820A54C; @@ -71,22 +71,17 @@ extern const u8 gUnknown_0820A81C[]; extern const u8 gUnknown_0820A864[]; extern const u8 gUnknown_0820A89C[]; extern const u8 gUnknown_0820A8B0[]; -extern const struct BaseStats gBaseStats[]; extern const u8 BattleText_SafariBalls[]; extern const u8 BattleText_SafariBallsLeft[]; extern const u8 BattleText_HighlightRed[]; extern const u8 gUnknown_08D1216C[][32]; -extern const u8 *const gNatureNames[]; extern const u16 gBattleInterfaceStatusIcons_DynPal[]; #define ABS(n) ((n) >= 0 ? (n) : -(n)) // Used for computing copy destination addresses #define MACRO1(n) ((n) - (n) / 8 * 8) + 64 * ((n) / 8) -extern int sub_8040D3C(); -extern void load_gfxc_health_bar(); - static void sub_8043D5C(struct Sprite *); static const void *sub_8043CDC(u8); static void sub_8044210(u8, s16, u8); |