diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:33:17 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:33:17 -0500 |
| commit | cbd3aa95d12bab05042025bd143a2a7cacf0b86d (patch) | |
| tree | bf46f9503cebc19ccae728cb1292989b192ca2fe /include/battle_anim.h | |
| parent | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 9598c5e5f..9decb8f95 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -3,19 +3,11 @@ #include "sprite.h" -#define REG_BGnCNT_BITFIELD(n) (*(struct BGCntrlBitfield *)REG_ADDR_BG##n##CNT) +#define REG_BGnCNT_BITFIELD(n) (*(vBgCnt *)REG_ADDR_BG##n##CNT) +#define REG_BG0CNT_BITFIELD REG_BGnCNT_BITFIELD(0) #define REG_BG1CNT_BITFIELD REG_BGnCNT_BITFIELD(1) #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2) - -struct BGCntrlBitfield -{ - volatile u16 priority:2; - volatile u16 charBaseBlock:2; - volatile u16 field_0_2:4; - volatile u16 field_1_0:5; - volatile u16 areaOverflowMode:1; - volatile u16 screenSize:2; -}; +#define REG_BG3CNT_BITFIELD REG_BGnCNT_BITFIELD(3) struct BattleAnimBackground { @@ -42,6 +34,12 @@ struct UnknownStruct3 u8 filler1[0xB]; }; +extern void (*gAnimScriptCallback)(void); +extern u8 gAnimScriptActive; +extern u8 gHappinessMoveAnim; +extern u8 gUnknown_0202F7C4; + +void ExecuteMoveAnim(u16 move); void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c); bool8 IsAnimBankSpriteVisible(u8 a); void sub_8076034(u8, u8); |