diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-11 14:50:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 14:50:18 -0600 |
| commit | 14a76793e596d612efd273169c4172922c270f13 (patch) | |
| tree | 9517f097031e48ed4dd590ee772875a0da48c652 /src/reshow_battle_screen.c | |
| parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) | |
| parent | d704a2b5df0a7957f6df06669cf4423e5026d87b (diff) | |
Merge pull request #206 from DizzyEggg/battle_labels
More battle code clean up
Diffstat (limited to 'src/reshow_battle_screen.c')
| -rw-r--r-- | src/reshow_battle_screen.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 925b65de5..b12917c61 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -12,6 +12,7 @@ #include "sprite.h" #include "constants/species.h" #include "battle_interface.h" +#include "battle_anim.h" extern u16 gBattle_BG0_X; extern u16 gBattle_BG0_Y; @@ -21,28 +22,12 @@ extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG3_X; extern u16 gBattle_BG3_Y; -extern u8 gReservedSpritePaletteCount; -extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT]; -extern u8 gBankInMenu; -extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT]; -extern u8 gBattlersCount; -extern u32 gBattleTypeFlags; -extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT]; -extern u8 gBattleMonForms[MAX_BATTLERS_COUNT]; -extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT]; extern struct SpriteTemplate gUnknown_0202499C; extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[]; -extern void ScanlineEffect_Clear(void); -extern void sub_8035658(void); -extern bool8 IsDoubleBattle(void); -extern u8 GetSubstituteSpriteDefault_Y(u8 bank); -extern u8 GetBattlerSpriteDefault_Y(u8 bank); -extern u8 sub_80A82E4(u8 bank); extern void sub_806A068(u16 species, u8 bankIdentity); extern void sub_806A12C(u16 backPicId, u8 bankIdentity); -extern u8 GetBattlerSpriteCoord(u8 bank, u8 caseId); // this file's functions static void CB2_ReshowBattleScreenAfterMenu(void); @@ -175,7 +160,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) SetBattlerShadowSpriteCallback(opponentBank, species); } - ActionSelectionCreateCursorAt(gActionSelectionCursor[gBankInMenu], 0); + ActionSelectionCreateCursorAt(gActionSelectionCursor[gBattlerInMenuId], 0); if (gLinkVSyncDisabled != 0 && gReceivedRemoteLinkPlayers != 0) { |