diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-19 13:34:32 -0500 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-06-20 15:13:44 +0200 |
| commit | e072ddd6fbae8b303de546d0e9bd5ace2ecb20a1 (patch) | |
| tree | 5652c2e7dc0cd743c6114af68bb5af5e88f9a076 /src/credits.c | |
| parent | 1fafe80241d56c7e89aa37d0bf6d20a0f4d208f2 (diff) | |
move data to C and introduce CompressedSpriteSheet and CompressedSpritePalette
Diffstat (limited to 'src/credits.c')
| -rw-r--r-- | src/credits.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/credits.c b/src/credits.c index a7d6191e6..8ec126a41 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1495,7 +1495,7 @@ void spritecb_81454E0(struct Sprite *sprite) { static u8 sub_81456B4(u16 species, u16 x, u16 y, u16 position) { u32 personality; - const u16 *palette; + const u8 *lzPaletteData; u8 spriteId; u8 spriteId2; @@ -1527,8 +1527,8 @@ static u8 sub_81456B4(u16 species, u16 x, u16 y, u16 position) 1 ); - palette = species_and_otid_get_pal(species, 0, 0xFFFF); - LoadCompressedPalette(palette, 0x100 + (position * 16), 0x20); + lzPaletteData = species_and_otid_get_pal(species, 0, 0xFFFF); + LoadCompressedPalette(lzPaletteData, 0x100 + (position * 16), 0x20); sub_8143648(position, position); spriteId = CreateSprite(&gUnknown_02024E8C, x, y, 0); |