From ed1f5a74556d3a856f868e1b67edd2453122cff6 Mon Sep 17 00:00:00 2001
From: Sewef <elagroum@gmail.com>
Date: Wed, 16 Oct 2019 19:32:02 +0200
Subject: [PATCH] Conflits 3/2

Nice one, git
---
 src/battle_anim_effects_1.c | 8 ++++----
 src/battle_anim_effects_2.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 6d33f2b0fd..91d4eec003 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,
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 93e07bd355..d0f161f5b3 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -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,