diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-04 19:49:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-04 19:49:38 -0700 |
| commit | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (patch) | |
| tree | 8f4bded9d721a993674a4e5d9eeb57ad86580d39 /include/battle_anim.h | |
| parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) | |
| parent | b4c6e0560a7b1310cc08b93ea04935d4fbb7c3de (diff) | |
Merge pull request #450 from ProjectRevoTPP/fix_setmondata
various fixes
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 2386c515c..3db5ae967 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -3,10 +3,6 @@ #include "sprite.h" -#define SCRIPT_READ_8(ptr) ((ptr)[0]) -#define SCRIPT_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8)) -#define SCRIPT_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) - #define REG_BGnCNT_BITFIELD(n) (*(struct BGCntrlBitfield *)REG_ADDR_BG##n##CNT) #define REG_BG1CNT_BITFIELD REG_BGnCNT_BITFIELD(1) #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2) @@ -55,13 +51,12 @@ struct UnknownStruct3 void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c); bool8 IsAnimBankSpriteVisible(u8 a); void sub_8076034(u8, u8); -bool8 IsContest(void); +bool8 NotInBattle(void); void battle_anim_clear_some_data(void); void move_anim_8072740(struct Sprite *sprite); void DestroyAnimVisualTask(u8 task); void DestroyAnimVisualTask(u8 task); bool8 IsAnimBankSpriteVisible(u8); -u8 IsContest(); #endif |