diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-11 16:52:28 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-11 16:52:28 +0100 |
| commit | 8ac17e09486006c7d2d066173c8fa907aceb72de (patch) | |
| tree | 8e78f66bf9214a9ed6129d8dfddca171fda22e75 /src/pokeblock_feed.c | |
| parent | b4d10ab7aba76bf9ab16f07cc9409083388c603d (diff) | |
move data from asm to pokeblock.c
Diffstat (limited to 'src/pokeblock_feed.c')
| -rw-r--r-- | src/pokeblock_feed.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 58a8667fd..ec5f3074f 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -56,8 +56,6 @@ extern struct SpriteTemplate gUnknown_0202499C; extern const u8 gBattleTerrainPalette_Frontier[]; extern const u8 gBattleTerrainTiles_Building[]; extern const u8 gUnknown_08D9BA44[]; -extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet; -extern const struct CompressedSpritePalette gPokeblockCase_SpritePal; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const u16 gUnknown_0860F074[]; @@ -508,13 +506,13 @@ static const union AffineAnimCmd *const sThrownPokeblockAffineAnimTable[] = static const struct CompressedSpriteSheet sPokeblock_SpriteSheet = { - gPokeblock_Gfx, 0x20, TAG_POKEBLOCK_GFX + gPokeblock_Gfx, 0x20, GFX_TAG_POKEBLOCK }; static const struct SpriteTemplate sThrownPokeblockSpriteTemplate = { - .tileTag = TAG_POKEBLOCK_GFX, - .paletteTag = TAG_POKEBLOCK_GFX, + .tileTag = GFX_TAG_POKEBLOCK, + .paletteTag = GFX_TAG_POKEBLOCK, .oam = &sThrownPokeblockOamData, .anims = sThrownPokeblockAnimTable, .images = NULL, @@ -721,7 +719,7 @@ static void SetPokeblockSpritePal(u8 pokeblockCaseId) { u8 colorId = GetPokeblockData(&gSaveBlock1Ptr->pokeblocks[pokeblockCaseId], PBLOCK_COLOR); sPokeblockSpritePal.data = sPokeblocksPals[colorId - 1]; - sPokeblockSpritePal.tag = TAG_POKEBLOCK_GFX; + sPokeblockSpritePal.tag = GFX_TAG_POKEBLOCK; } // defines for task data fields |