diff options
| author | Sewef <elagroum@gmail.com> | 2019-10-16 19:32:02 +0200 |
|---|---|---|
| committer | Sewef <elagroum@gmail.com> | 2019-10-16 19:32:02 +0200 |
| commit | ed1f5a74556d3a856f868e1b67edd2453122cff6 (patch) | |
| tree | dee7b03ff0584ed2f0909d105231f7ab7701c232 /src/battle_anim_effects_1.c | |
| parent | c280d0e00e0cc0466ee8235980b1ecb3b7ae4ee3 (diff) | |
Conflits 3/2
Nice one, git
Diffstat (limited to 'src/battle_anim_effects_1.c')
| -rw-r--r-- | src/battle_anim_effects_1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 6d33f2b0f..91d4eec00 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -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, |