diff options
Diffstat (limited to 'src/sprite.c')
| -rw-r--r-- | src/sprite.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/sprite.c b/src/sprite.c index 78a8608ad..df101b61f 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -10,12 +10,8 @@ #define SET_SPRITE_TILE_RANGE(index, start, count) \ { \ - u16 *rangeStarts; \ - u16 *rangeCounts; \ - rangeStarts = sSpriteTileRanges; \ - rangeStarts[index * 2] = start; \ - rangeCounts = sSpriteTileRanges + 1; \ - rangeCounts[index * 2] = count; \ + sSpriteTileRanges[index * 2] = start; \ + (sSpriteTileRanges + 1)[index * 2] = count; \ } #define ALLOC_SPRITE_TILE(n) \ @@ -61,10 +57,8 @@ static void ClearSpriteCopyRequests(void); static void ResetOamMatrices(void); static void ResetSprite(struct Sprite *sprite); static s16 AllocSpriteTiles(u16 tileCount); -static u8 SpriteTileAllocBitmapOp(u16 bit, u8 op); +u8 SpriteTileAllocBitmapOp(u16 bit, u8 op); static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, struct SpriteFrameImage *images); -static void CopyFromSprites(u8 *dest); -static void CopyToSprites(u8 *src); static void ResetAllSprites(void); static void BeginAnim(struct Sprite *sprite); static void ContinueAnim(struct Sprite *sprite); @@ -786,7 +780,7 @@ static s16 AllocSpriteTiles(u16 tileCount) return start; } -static u8 SpriteTileAllocBitmapOp(u16 bit, u8 op) +u8 SpriteTileAllocBitmapOp(u16 bit, u8 op) { u8 index = bit / 8; u8 shift = bit % 8; @@ -855,7 +849,7 @@ void RequestSpriteCopy(u8 *src, u8 *dest, u16 size) } } -static void CopyFromSprites(u8 *dest) +void CopyFromSprites(u8 *dest) { u32 i; u8 *src = (u8 *)gSprites; @@ -867,7 +861,7 @@ static void CopyFromSprites(u8 *dest) } } -static void CopyToSprites(u8 *src) +void CopyToSprites(u8 *src) { u32 i; u8 *dest = (u8 *)gSprites; |