diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 3 | ||||
| -rw-r--r-- | include/battle_anim.h | 12 | ||||
| -rw-r--r-- | include/contest.h | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index f00b7f9ab..a9243182e 100644 --- a/include/battle.h +++ b/include/battle.h @@ -826,6 +826,7 @@ void LoadBattleTextboxAndBackground(void); void LoadBattleEntryBackground(void); void ApplyPlayerChosenFrameToBattleMenu(void); bool8 LoadChosenBattleElement(u8 caseId); +void LoadFittingBackgroundForBattle(void); void task00_0800F6FC(u8 taskId); // battle_5 @@ -890,6 +891,8 @@ struct BattleHealthboxInfo u8 flag_x1 : 1; u8 flag_x2 : 1; u8 flag_x4 : 1; + u8 flag_x8 : 1; + u8 flag_x10 : 1; u8 field_1; u8 field_2; u8 field_3; diff --git a/include/battle_anim.h b/include/battle_anim.h index 8ba25f9c5..86eb20aec 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -30,6 +30,13 @@ struct UnknownAnimStruct2 u16 unkC; }; +struct BattleAnimBackground +{ + void *image; + void *palette; + void *tilemap; +}; + void ClearBattleAnimationVars(void); void DoMoveAnim(u16 move); void DoBattleAnim(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim); @@ -38,8 +45,11 @@ void DestroyAnimVisualTask(u8 taskId); void DestroyAnimSoundTask(u8 taskId); bool8 IsAnimBankSpriteVisible(u8 bank); void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible); - bool8 IsContest(void); +s8 BattleAnimAdjustPanning(s8 pan); +s8 BattleAnimAdjustPanning2(s8 pan); +s16 sub_80A52EC(s16 a); +s16 sub_80A5314(s16 a, s16 b, s16 c); // battle_anim_80FE840.s void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); diff --git a/include/contest.h b/include/contest.h index 7635e7358..7dcde7da2 100644 --- a/include/contest.h +++ b/include/contest.h @@ -36,5 +36,6 @@ struct ContestResources extern struct ContestResources *gContestResources; bool8 IsSpeciesNotUnown(u16 species); +void LoadContestBgAfterMoveAnim(void); #endif //GUARD_CONTEST_H |