diff options
-rw-r--r-- | include/graphics.h | 5 | ||||
-rw-r--r-- | src/battle/battle_interface.c | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/graphics.h b/include/graphics.h index 76a45f6f6..01a193ab3 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3337,4 +3337,9 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; +extern const u8 gBattleGfx_BallStatusBar[]; +extern const u8 gUnknown_08D1212C[]; +extern const u8 gUnknown_08D1214C[]; +extern const u8 Tiles_D129AC[]; + #endif // GUARD_GRAPHICS_H diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index 2b47d358a..0fca01c00 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -14,6 +14,7 @@ #include "task.h" #include "text.h" #include "ewram.h" +#include "graphics.h" struct UnknownStruct5 { @@ -29,11 +30,7 @@ struct UnknownStruct7 u8 filler0[0x180]; }; -void sub_8043CEC(struct Sprite *sprite); -extern const u8 gBattleGfx_BallStatusBar[]; -extern const u8 gUnknown_08D1212C[]; -extern const u8 gUnknown_08D1214C[]; -extern const u8 Tiles_D129AC[]; +static void sub_8043CEC(struct Sprite *sprite); static void sub_8045030(struct Sprite *sprite); static void sub_804507C(struct Sprite *sprite); @@ -876,7 +873,7 @@ static const void *sub_8043CDC(u8 a) return gUnknown_08D1216C[a]; } -void sub_8043CEC(struct Sprite *sprite) +static void sub_8043CEC(struct Sprite *sprite) { u8 r5 = sprite->data[5]; @@ -2640,7 +2637,7 @@ static void sub_8044F70(u8 taskId) } } -void sub_8045030(struct Sprite *sprite) +static void sub_8045030(struct Sprite *sprite) { if (sprite->pos2.x != 0) sprite->pos2.x += sprite->data[0]; @@ -2656,7 +2653,7 @@ static void sub_8045048(struct Sprite *sprite) sprite->data[1] &= 0xF; } -void sub_804507C(struct Sprite *sprite) +static void sub_804507C(struct Sprite *sprite) { u8 r3; u16 r2; |