diff options
| author | YamaArashi <shadow962@live.com> | 2016-05-27 15:08:48 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-05-30 02:19:25 -0700 |
| commit | 0ebfe95d65fc2852a6b7f0528a2a114de7fe698e (patch) | |
| tree | a20b2e0e839661df88664d6547841a3a79e07222 /src/sprite.c | |
| parent | 1d8ca2c1b995be87bb78dcf9bdfdc1d924a48979 (diff) | |
text.c
Diffstat (limited to 'src/sprite.c')
| -rw-r--r-- | src/sprite.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/sprite.c b/src/sprite.c index f17670361..7714a610f 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -39,7 +39,7 @@ struct OamDimensions s8 height; }; -void gpu_pal_apply(u8 *, u16, u32); +void gpu_pal_apply(u16 *, u16, u32); void sub_814A590(void); static void UpdateOamCoords(void); @@ -92,7 +92,7 @@ static void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameC static void ResetAffineAnimData(void); static u8 IndexOfSpriteTileTag(u16 tag); static void AllocSpriteTileRange(u16 tag, u16 start, u16 count); -static void ApplySpritePalette(u8 *src, u16 paletteOffset); +static void DoLoadSpritePalette(u16 *src, u16 paletteOffset); typedef void (*AnimFunc)(struct Sprite *); typedef void (*AnimCmdFunc)(struct Sprite *); @@ -292,8 +292,6 @@ static const struct OamDimensions sOamDimensions[3][4] = }, }; -extern struct Main gMain; - static u16 sSpriteTileRangeTags[MAX_SPRITES]; static u16 sSpriteTileRanges[MAX_SPRITES * 2]; static struct AffineAnimState sAffineAnimStates[OAM_MATRIX_COUNT]; @@ -1638,7 +1636,7 @@ u8 LoadSpritePalette(struct SpritePalette *palette) else { sSpritePaletteTags[index] = palette->tag; - ApplySpritePalette(palette->data, index * 16); + DoLoadSpritePalette(palette->data, index * 16); return index; } } @@ -1651,7 +1649,7 @@ void LoadSpritePalettes(struct SpritePalette *palettes) break; } -static void ApplySpritePalette(u8 *src, u16 paletteOffset) +static void DoLoadSpritePalette(u16 *src, u16 paletteOffset) { gpu_pal_apply(src, paletteOffset + 0x100, 32); } |