diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 00:01:17 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 00:01:17 +0200 |
| commit | 36035518dcd36c915b8b8f3461881ea813933454 (patch) | |
| tree | 0b394be6ad68d49fcb0d194303b3707d2f959797 /include | |
| parent | dee61330769b3e3a93844c9a0ef609500fe399d3 (diff) | |
review battle anim changes
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/battle_anim.h | 3 | ||||
| -rw-r--r-- | include/gba/io_reg.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index a36fdec23..a7a26e5eb 100644 --- a/include/battle.h +++ b/include/battle.h @@ -830,7 +830,7 @@ void LoadBattleTextboxAndBackground(void); void LoadBattleEntryBackground(void); void ApplyPlayerChosenFrameToBattleMenu(void); bool8 LoadChosenBattleElement(u8 caseId); -void LoadFittingBackgroundForBattle(void); +void DrawMainBattleBackground(void); void task00_0800F6FC(u8 taskId); // battle_5 diff --git a/include/battle_anim.h b/include/battle_anim.h index 3345d7de3..f38572d19 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -39,6 +39,9 @@ struct BattleAnimBackground #define ANIM_ARGS_COUNT 8 +#define PAN_ATTACKER_PLAYER -64 +#define PAN_ATTACKER_OPPONENT 63 + extern void (*gAnimScriptCallback)(void); extern bool8 gAnimScriptActive; extern u8 gAnimVisualTaskCount; diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 5234e5b6c..f8c89fdbd 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -521,6 +521,8 @@ #define DISPSTAT_HBLANK_INTR 0x0010 // H-Blank interrupt enabled #define DISPSTAT_VCOUNT_INTR 0x0020 // V-Count interrupt enabled +// BLDCNT + // SOUNDCNT_H #define SOUND_CGB_MIX_QUARTER 0x0000 #define SOUND_CGB_MIX_HALF 0x0001 |