diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 18:24:59 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 18:24:59 +0200 |
| commit | c80b76e85a84509aa6ab849f26c2c7e0219e33c8 (patch) | |
| tree | bd2a34d1f921e08f5013c43f0e59120e5c676183 /include | |
| parent | a08cd8e5a718ad4383a5b66b48e44a50a99dc6bf (diff) | |
| parent | 78009a835f840864b3d30af00c65a745f75b80fa (diff) | |
Merge branch 'master' into decomp_berry
Diffstat (limited to 'include')
| -rw-r--r-- | include/sprite.h | 6 | ||||
| -rw-r--r-- | include/util.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/sprite.h b/include/sprite.h index 68474b2ae..7b3c9fb5a 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -237,9 +237,11 @@ struct OamMatrix s16 d; }; -extern struct Sprite gSprites[]; - extern const struct OamData gDummyOamData; +extern const union AnimCmd *const gDummySpriteAnimTable[]; +extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; + +extern struct Sprite gSprites[]; void ResetSpriteData(void); void AnimateSprites(void); diff --git a/include/util.h b/include/util.h index 69ef329ad..63887b13f 100644 --- a/include/util.h +++ b/include/util.h @@ -3,13 +3,15 @@ #include "sprite.h" -extern const u8 gMiscBlank_Gfx[]; +extern const u8 gMiscBlank_Gfx[]; // unused in Emerald extern const u32 gBitTable[]; u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *)); void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); +int CountTrailingZeroBits(u32 value); u16 CalcCRC16(u8 *data, s32 length); -u16 CalcCRC16WithTable(u8 *data, s32 length); +u16 CalcCRC16WithTable(u8 *data, u32 length); +u32 CalcByteArraySum(const u8* data, u32 length); #endif // GUARD_UTIL_H |