3 files changed, 17 insertions, 17 deletions
diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c
index c18f5790c..e432701f4 100644
--- a/src/battle/anim/battle_intro.c
+++ b/src/battle/anim/battle_intro.c
@@ -12,7 +12,7 @@
 #include "trig.h"
 
 extern u16 gBattleTypeFlags;
-extern u16 gUnknown_02024DE8;
+extern u16 gIntroSlideFlags;
 extern u8 gBattleMonForms[];
 
 extern void sub_800FE20(struct Sprite *);
@@ -118,7 +118,7 @@ static void BattleIntroTask_ScrollScenery(u8 taskId)
             gTasks[taskId].tState++;
             gTasks[taskId].tBgXOffset = DISPLAY_WIDTH;
             gTasks[taskId].tFramesUntilBg1Slide = 32;
-            gUnknown_02024DE8 &= ~1;
+            gIntroSlideFlags &= ~1;
         }
         break;
     case 3:
@@ -227,7 +227,7 @@ static void BattleIntroTask_FadeScenery(u8 taskId)
             gTasks[taskId].tBgXOffset = DISPLAY_WIDTH;
             gTasks[taskId].tFramesUntilBg1Slide = 32;
             gTasks[taskId].data[5] = 1;
-            gUnknown_02024DE8 &= ~1;
+            gIntroSlideFlags &= ~1;
         }
         break;
     case 3:
@@ -323,7 +323,7 @@ static void BattleIntroTask_ScrollAndFadeScenery(u8 taskId)
             gTasks[taskId].tBgXOffset = DISPLAY_WIDTH;
             gTasks[taskId].tFramesUntilBg1Slide = 32;
             gTasks[taskId].data[5] = 1;
-            gUnknown_02024DE8 &= ~1;
+            gIntroSlideFlags &= ~1;
         }
         break;
     case 3:
@@ -402,10 +402,10 @@ static void BattleIntroTask_80E4C34(u8 taskId)
         if (gTasks[taskId].tBgXOffset == 0)
         {
             gTasks[taskId].tState++;
-            gSprites[ewram1608A].oam.objMode = 2;
-            gSprites[ewram1608A].callback = sub_800FE20;
-            gSprites[ewram1608B].oam.objMode = 2;
-            gSprites[ewram1608B].callback = sub_800FE20;
+            gSprites[gBattleStruct->unk1608A].oam.objMode = 2;
+            gSprites[gBattleStruct->unk1608A].callback = sub_800FE20;
+            gSprites[gBattleStruct->unk1608B].oam.objMode = 2;
+            gSprites[gBattleStruct->unk1608B].callback = sub_800FE20;
             REG_WININ = 0x3F;
             REG_WINOUT = 0x3F06;
         }
@@ -419,7 +419,7 @@ static void BattleIntroTask_80E4C34(u8 taskId)
             gTasks[taskId].tState++;
             gTasks[taskId].tBgXOffset = DISPLAY_WIDTH;
             gTasks[taskId].tFramesUntilBg1Slide = 32;
-            gUnknown_02024DE8 &= ~1;
+            gIntroSlideFlags &= ~1;
         }
         break;
     case 3:
@@ -463,7 +463,7 @@ void sub_80E4EF8(u8 left, u8 top, u8 c, u8 paletteNum, u16 e, u8 bgMap, u8 g)
     s32 y;
     u8 bank = GetBattlerAtPosition(c);
 
-    DmaCopy16(3, gUnknown_081FAF4C[c] + gBattleMonForms[bank] * 0x800, (void *)(VRAM + e), 0x800);
+    DmaCopy16(3, gMonSpriteGfx_Sprite_ptr[c] + gBattleMonForms[bank] * 0x800, (void *)(VRAM + e), 0x800);
     tileNum = e / 32 - g * 512;
     for (y = top; y < top + 8; y++)
     {
@@ -481,7 +481,7 @@ void unref_sub_80E4FDC(u8 left, u8 top, u8 c, u8 form, u8 paletteNum, u16 f, u8
     s32 x;
     s32 y;
 
-    DmaCopy16(3, gUnknown_081FAF4C[c] + form * 0x800, (void *)(VRAM + f), 0x800);
+    DmaCopy16(3, gMonSpriteGfx_Sprite_ptr[c] + form * 0x800, (void *)(VRAM + f), 0x800);
     tileNum = f / 32 - h * 512;
     for (y = top; y < top + 8; y++)
     {
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index 9053d7844..9be913b70 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -1932,8 +1932,8 @@ void sub_80E4300(u8 taskId)
     }
     else
     {
-        gTasks[taskId].data[0] = ewram17800[gBattleAnimAttacker].invisible;
-        ewram17800[gBattleAnimAttacker].invisible = TRUE;
+        gTasks[taskId].data[0] = gBattleSpriteInfo[gBattleAnimAttacker].invisible;
+        gBattleSpriteInfo[gBattleAnimAttacker].invisible = TRUE;
         gTasks[taskId].func = sub_80E4368;
         gAnimVisualTaskCount--;
     }
@@ -1943,7 +1943,7 @@ static void sub_80E4368(u8 taskId)
 {
     if (gBattleAnimArgs[7] == 0x1000)
     {
-        ewram17800[gBattleAnimAttacker].invisible = gTasks[taskId].data[0] & 1;
+        gBattleSpriteInfo[gBattleAnimAttacker].invisible = gTasks[taskId].data[0] & 1;
         DestroyTask(taskId);
     }
 }
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index 9bc88e258..a22e96428 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -137,7 +137,7 @@ static void sub_812B108(u8 taskId)
     }
 }
 
-// #define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348))
+// #define gContestResources__moveAnim (*(struct ContestMoveAnim *)(gSharedMem + 0x19348))
 // #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348))
 
 // used in 3 moves:
@@ -150,7 +150,7 @@ void sub_812B18C(u8 taskId)
     if (IsContest())
     {
         if (!gBattleAnimArgs[0])
-            species = shared19348.unk0;
+            species = gContestResources__moveAnim.species;
         else
             DestroyAnimVisualTask(taskId);
     }
@@ -200,7 +200,7 @@ void sub_812B2B8(u8 taskId)
     s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG);
 
     if (IsContest())
-        species = shared19348.unk0;
+        species = gContestResources__moveAnim.species;
     else
         species = gAnimSpeciesByBanks[gBattleAnimAttacker];