Conflits 3/2

Nice one, git
2019-10-16 19:32:02 +02:00
parent c280d0e00e
commit ed1f5a7455
2 changed files with 5 additions and 5 deletions
--- 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,