atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conflits 3/2

Browse source 
Nice one, git
This commit is contained in:
Sewef 2019-10-16 19:32:02 +02:00
parent c280d0e00e
commit ed1f5a7455
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/battle_anim_effects_1.c
View file

@ -243,7 +243,7 @@ const union AnimCmd gSolarbeamBigOrbAnimCmds7[] =
ANIMCMD_END,
};
const union AnimCmd gUnknown_08592198[] =
const union AnimCmd gSolarbeamSmallOrbAnimCms[] =
{
ANIMCMD_FRAME(7, 1),
ANIMCMD_END,
@ -266,9 +266,9 @@ const union AnimCmd *const gSolarbeamBigOrbAnimTable[] =
gSolarbeamBigOrbAnimCmds7,
};
const union AnimCmd *const gUnknown_085921C4[] =
const union AnimCmd *const gSolarbeamSmallOrbAnimTable[] =
{
gUnknown_08592198,
gSolarbeamSmallOrbAnimCms,
};
const union AnimCmd *const gPowerAbsorptionOrbAnimTable[] =
@ -312,7 +312,7 @@ const struct SpriteTemplate gSolarbeamSmallOrbSpriteTemplate =
.tileTag = ANIM_TAG_ORBS,
.paletteTag = ANIM_TAG_ORBS,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_085921C4,
.anims = gSolarbeamSmallOrbAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSolarbeamSmallOrb,

2
src/battle_anim_effects_2.c
View file

@ -1244,7 +1244,7 @@ const struct SpriteTemplate gUnknown_08593C64 =
{
.tileTag = ANIM_TAG_GUARD_RING,
.paletteTag = ANIM_TAG_GUARD_RING,
.oam = &gUnknown_08524B1C,
.oam = &gOamData_AffineDouble_ObjBlend_64x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_08593C5C,