dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename battle anim sprites

Browse Source
This commit is contained in:
DizzyEggg
2019-04-06 16:32:02 +02:00
committed by huderlem
parent 311c1b9cba
commit b93581b519
314 changed files with 1694 additions and 1697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1159
src/battle_anim.c
View File

File diff suppressed because it is too large Load Diff

12
src/battle_anim_effects_1.c
View File

@@ -1121,8 +1121,8 @@ const union AnimCmd *const gUnknown_08592918[] =
const struct SpriteTemplate gUnknown_0859291C =
{
.tileTag = ANIM_TAG_UNUSED_HIT,
.paletteTag = ANIM_TAG_UNUSED_HIT,
.tileTag = ANIM_TAG_HIT,
.paletteTag = ANIM_TAG_HIT,
.oam = &gUnknown_08524914,
.anims = gUnknown_08592918,
.images = NULL,
@@ -1132,8 +1132,8 @@ const struct SpriteTemplate gUnknown_0859291C =
const struct SpriteTemplate gUnknown_08592934 =
{
.tileTag = ANIM_TAG_UNUSED_HIT_2,
.paletteTag = ANIM_TAG_UNUSED_HIT_2,
.tileTag = ANIM_TAG_HIT_2,
.paletteTag = ANIM_TAG_HIT_2,
.oam = &gUnknown_08524914,
.anims = gUnknown_08592918,
.images = NULL,
@@ -1442,8 +1442,8 @@ const union AnimCmd *const gUnknown_08592BF4[] =
const struct SpriteTemplate gUnknown_08592BFC =
{
.tileTag = ANIM_TAG_UNUSED_BUBBLE_BURST,
.paletteTag = ANIM_TAG_UNUSED_BUBBLE_BURST,
.tileTag = ANIM_TAG_BUBBLE_BURST,
.paletteTag = ANIM_TAG_BUBBLE_BURST,
.oam = &gUnknown_0852490C,
.anims = gUnknown_08592BF4,
.images = NULL,

10
src/battle_anim_effects_2.c
View File

@@ -189,8 +189,8 @@ const union AffineAnimCmd *const gUnknown_08593300[] =
const struct SpriteTemplate gUnknown_08593304 =
{
.tileTag = ANIM_TAG_UNUSED_EXPLOSION,
.paletteTag = ANIM_TAG_UNUSED_EXPLOSION,
.tileTag = ANIM_TAG_EXPLOSION_6,
.paletteTag = ANIM_TAG_EXPLOSION_6,
.oam = &gUnknown_08524974,
.anims = gUnknown_085932E4,
.images = NULL,
@@ -359,8 +359,8 @@ const struct SpriteTemplate gUnknown_08593488 =
const struct SpriteTemplate gUnknown_085934A0 =
{
.tileTag = ANIM_TAG_UNUSED_VOID_LINES,
.paletteTag = ANIM_TAG_UNUSED_VOID_LINES,
.tileTag = ANIM_TAG_VOID_LINES,
.paletteTag = ANIM_TAG_VOID_LINES,
.oam = &gUnknown_08524A3C,
.anims = gDummySpriteAnimTable,
.images = NULL,
@@ -3067,7 +3067,7 @@ void sub_8105CB4(u8 taskId)
paletteNums[i] = AllocSpritePalette(ANIM_SPRITES_START - i);
gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000);
LZDecompressWram(gBattleAnimSpritePalette_206, gMonSpritesGfxPtr->field_17C);
LZDecompressWram(gBattleAnimSpritePalette_MusicNotes2, gMonSpritesGfxPtr->field_17C);
for (i = 0; i < 3; i++)
LoadPalette(&gMonSpritesGfxPtr->field_17C[i * 32], (u16)((paletteNums[i] << 4) + 0x100), 32);

36
src/battle_anim_special.c
View File

@@ -121,18 +121,18 @@ const struct CompressedSpriteSheet gBallOpenParticleSpritesheets[] =
const struct CompressedSpritePalette gBallOpenParticlePalettes[] =
{
{gBattleAnimSpritePalette_136, 0xD6EC},
{gBattleAnimSpritePalette_136, 0xD6ED},
{gBattleAnimSpritePalette_136, 0xD6EE},
{gBattleAnimSpritePalette_136, 0xD6EF},
{gBattleAnimSpritePalette_136, 0xD6F0},
{gBattleAnimSpritePalette_136, 0xD6F1},
{gBattleAnimSpritePalette_136, 0xD6F2},
{gBattleAnimSpritePalette_136, 0xD6F3},
{gBattleAnimSpritePalette_136, 0xD6F4},
{gBattleAnimSpritePalette_136, 0xD6F5},
{gBattleAnimSpritePalette_136, 0xD6F6},
{gBattleAnimSpritePalette_136, 0xD6F7},
{gBattleAnimSpritePalette_CircleImpact, 0xD6EC},
{gBattleAnimSpritePalette_CircleImpact, 0xD6ED},
{gBattleAnimSpritePalette_CircleImpact, 0xD6EE},
{gBattleAnimSpritePalette_CircleImpact, 0xD6EF},
{gBattleAnimSpritePalette_CircleImpact, 0xD6F0},
{gBattleAnimSpritePalette_CircleImpact, 0xD6F1},
{gBattleAnimSpritePalette_CircleImpact, 0xD6F2},
{gBattleAnimSpritePalette_CircleImpact, 0xD6F3},
{gBattleAnimSpritePalette_CircleImpact, 0xD6F4},
{gBattleAnimSpritePalette_CircleImpact, 0xD6F5},
{gBattleAnimSpritePalette_CircleImpact, 0xD6F6},
{gBattleAnimSpritePalette_CircleImpact, 0xD6F7},
};
const union AnimCmd gUnknown_085E5154[] =
@@ -357,8 +357,8 @@ const u16 gUnknown_085E5310[] =
const struct SpriteTemplate gBattleAnimSpriteTemplate_85E5338 =
{
.tileTag = ANIM_TAG_UNUSED_RED_BRICK,
.paletteTag = ANIM_TAG_UNUSED_RED_BRICK,
.tileTag = ANIM_TAG_RED_BRICK,
.paletteTag = ANIM_TAG_RED_BRICK,
.oam = &gUnknown_0852490C,
.anims = gDummySpriteAnimTable,
.images = NULL,
@@ -1314,7 +1314,7 @@ static void sub_8171BAC(struct Sprite *sprite)
if (sprite->animEnded)
sprite->invisible = 1;
if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded)
{
StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 0);
@@ -1323,7 +1323,7 @@ static void sub_8171BAC(struct Sprite *sprite)
else
{
gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] -= 288;
gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8;
gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8;
}
if (sprite->animEnded && next)
@@ -1907,7 +1907,7 @@ void sub_8172BF0(u8 taskId)
u8 spriteId;
u32 x;
u32 done;
done = FALSE;
spriteId = gBattlerSpriteIds[gBattleAnimAttacker];
switch (gTasks[taskId].data[10])
@@ -2063,7 +2063,7 @@ static void sub_8172FEC(u8 taskId)
gTasks[taskId].data[13]++;
return;
}
if (gBattleSpritesDataPtr->animationData->field_A)
return;

16
src/battle_anim_status_effects.c
View File

@@ -44,8 +44,8 @@ static const union AnimCmd *const sSpriteAnimTable_853EDF8[] =
const struct SpriteTemplate gUnknown_0853EDFC =
{
.tileTag = ANIM_TAG_UNUSED_ORB,
.paletteTag = ANIM_TAG_UNUSED_ORB,
.tileTag = ANIM_TAG_ORB,
.paletteTag = ANIM_TAG_ORB,
.oam = &gUnknown_0852490C,
.anims = sSpriteAnimTable_853EDF8,
.images = NULL,
@@ -55,8 +55,8 @@ const struct SpriteTemplate gUnknown_0853EDFC =
const struct SpriteTemplate gUnknown_0853EE14 =
{
.tileTag = ANIM_TAG_UNUSED_ORB,
.paletteTag = ANIM_TAG_UNUSED_ORB,
.tileTag = ANIM_TAG_ORB,
.paletteTag = ANIM_TAG_ORB,
.oam = &gUnknown_0852490C,
.anims = sSpriteAnimTable_853EDF8,
.images = NULL,
@@ -125,8 +125,8 @@ const struct SpriteTemplate gUnknown_0853EE84 =
const struct SpriteTemplate gUnknown_0853EE9C =
{
.tileTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
.paletteTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
.tileTag = ANIM_TAG_MONSTER_FOOT,
.paletteTag = ANIM_TAG_MONSTER_FOOT,
.oam = &gUnknown_08524914,
.anims = gDummySpriteAnimTable,
.images = NULL,
@@ -195,8 +195,8 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_853EEF8[] =
const struct SpriteTemplate gUnknown_0853EF18 =
{
.tileTag = ANIM_TAG_UNUSED_ORB,
.paletteTag = ANIM_TAG_UNUSED_ORB,
.tileTag = ANIM_TAG_ORB,
.paletteTag = ANIM_TAG_ORB,
.oam = &gUnknown_085249CC,
.anims = sSpriteAnimTable_853EEF8,
.images = NULL,

1018
src/graphics.c
View File

File diff suppressed because it is too large Load Diff

2
src/rock.c
View File

@@ -419,7 +419,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId)
sub_80A6B30(&animBg);
AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08D8D58C, animBg.tilesOffset);
sub_80A6D60(&animBg, gUnknown_08D8D410, 0);
LoadCompressedPalette(gBattleAnimSpritePalette_261, animBg.paletteId * 16, 32);
LoadCompressedPalette(gBattleAnimSpritePalette_FlyingDirt, animBg.paletteId * 16, 32);
if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
var0 = 1;