From e30044965f85abdbbcc80e37b1151bb7b7d786cb Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 25 Nov 2016 13:32:45 -0600 Subject: Decompile more intro functions (#108) * start decompiling intro task * ignore Thumbs.db * decompile more code * actually ignore Thumbs.db * decompile more functions * fix sapphire * sort of fix task_intro_7 * name some functions and variables * more cleanup --- src/sprite.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/sprite.c') diff --git a/src/sprite.c b/src/sprite.c index 12c62145e..c91476f51 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -57,7 +57,7 @@ static void BuildSpritePriorities(void); static void SortSprites(void); static void CopyMatricesToOamBuffer(void); static void AddSpritesToOamBuffer(void); -static u8 CreateSpriteAt(u8 index, struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); +static u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); static void ClearSpriteCopyRequests(void); static void ResetOamMatrices(void); static void ResetSprite(struct Sprite *sprite); @@ -530,7 +530,7 @@ static void AddSpritesToOamBuffer(void) } } -u8 CreateSprite(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) { u8 i; @@ -541,7 +541,7 @@ u8 CreateSprite(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) return MAX_SPRITES; } -u8 CreateSpriteAtEnd(struct SpriteTemplate *template, u16 x, u16 y, u8 subpriority) +u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, u16 x, u16 y, u8 subpriority) { s16 i; @@ -554,7 +554,7 @@ u8 CreateSpriteAtEnd(struct SpriteTemplate *template, u16 x, u16 y, u8 subpriori u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)) { - u8 index = CreateSprite((struct SpriteTemplate *)&gDummySpriteTemplate, 0, 0, 31); + u8 index = CreateSprite(&gDummySpriteTemplate, 0, 0, 31); if (index == MAX_SPRITES) { @@ -568,7 +568,7 @@ u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)) } } -static u8 CreateSpriteAt(u8 index, struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +static u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) { struct Sprite *sprite = &gSprites[index]; @@ -1635,7 +1635,7 @@ void FreeAllSpritePalettes(void) sSpritePaletteTags[i] = 0xFFFF; } -u8 LoadSpritePalette(struct SpritePalette *palette) +u8 LoadSpritePalette(const struct SpritePalette *palette) { u8 index = IndexOfSpritePaletteTag(palette->tag); @@ -1656,7 +1656,7 @@ u8 LoadSpritePalette(struct SpritePalette *palette) } } -void LoadSpritePalettes(struct SpritePalette *palettes) +void LoadSpritePalettes(const struct SpritePalette *palettes) { u8 i; for (i = 0; palettes[i].data != NULL; i++) -- cgit v1.2.3