diff --git a/include/battle.h b/include/battle.h index d2a1e9eb2..4b9cdc018 100644 --- a/include/battle.h +++ b/include/battle.h @@ -976,10 +976,10 @@ struct BattleSpriteData struct MonSpritesGfx { - void *firstDecompressed; // ptr to the decompressed sprite of the first Pokémon + void *firstDecompressed; // ptr to the decompressed sprite of the first pokemon u8 *spritesGfx[MAX_BATTLERS_COUNT]; struct SpriteTemplate templates[MAX_BATTLERS_COUNT]; - struct SpriteFrameImage frameImages[MAX_BATTLERS_COUNT][4]; + struct SpriteFrameImage images[MAX_BATTLERS_COUNT][4]; u8 *barFontGfx; u16 *buffer; }; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index e70ad56bf..551bd6b8b 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -1180,11 +1180,11 @@ void AllocateMonSpritesGfx(void) for (j = 0; j < MAX_MON_PIC_FRAMES; ++j) { - gMonSpritesGfxPtr->frameImages[i][j].data = gMonSpritesGfxPtr->spritesGfx[i] + (j * 0x800); - gMonSpritesGfxPtr->frameImages[i][j].size = 0x800; + gMonSpritesGfxPtr->images[i][j].data = gMonSpritesGfxPtr->spritesGfx[i] + (j * 0x800); + gMonSpritesGfxPtr->images[i][j].size = 0x800; } - gMonSpritesGfxPtr->templates[i].images = gMonSpritesGfxPtr->frameImages[i]; + gMonSpritesGfxPtr->templates[i].images = gMonSpritesGfxPtr->images[i]; } gMonSpritesGfxPtr->barFontGfx = AllocZeroed(0x1000); }