1 files changed, 21 insertions, 20 deletions

diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 50ede7c7d..417706adf 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -49,11 +49,11 @@ extern u8 gDisplayedStringBattle[];
 extern u8 gBankInMenu;
 extern u8 gBattleMonForms[];
 extern u8 gBattleOutcome;
-extern u16 gUnknown_02024DE8;
+extern u16 gIntroSlideFlags;
 extern u8 gUnknown_02024E68[];
-extern struct SpriteTemplate gUnknown_02024E8C;
+extern struct SpriteTemplate gCreatingSpriteTemplate;
 extern u8 gAnimMoveTurn;
-extern struct Window gUnknown_03004210;
+extern struct Window gWindowTemplate_Contest_MoveDescription;
 extern u8 gUnknown_0300434C[];
 extern const u8 BattleText_WallyMenu[];
 extern const u8 BattleText_MenuOptions[];
@@ -324,7 +324,7 @@ void sub_813741C(void)
 
 void sub_8137454(void)
 {
-    if (gUnknown_03004210.state == 0)
+    if (gWindowTemplate_Contest_MoveDescription.state == 0)
         WallyBufferExecCompleted();
 }
 
@@ -1098,7 +1098,7 @@ void WallyHandleTrainerThrow(void)
     LoadPlayerTrainerBankSprite(2, gActiveBattler);
     GetMonSpriteTemplate_803C5A0(2, GetBattlerPosition(gActiveBattler));
     gBattlerSpriteIds[gActiveBattler] = CreateSprite(
-      &gUnknown_02024E8C,
+      &gCreatingSpriteTemplate,
       80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords),
       30);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
@@ -1113,7 +1113,7 @@ void WallyHandleTrainerSlide(void)
     LoadPlayerTrainerBankSprite(2, gActiveBattler);
     GetMonSpriteTemplate_803C5A0(2, GetBattlerPosition(gActiveBattler));
     gBattlerSpriteIds[gActiveBattler] = CreateSprite(
-      &gUnknown_02024E8C,
+      &gCreatingSpriteTemplate,
       80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords),
       30);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
@@ -1195,7 +1195,7 @@ void sub_81390D0(void)
     switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBattler].substituteSprite == 1)
+        if (gBattleSpriteInfo[gActiveBattler].substituteSprite == 1)
             move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
         ewram17810[gActiveBattler].unk4 = 1;
         break;
@@ -1212,7 +1212,7 @@ void sub_81390D0(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if (ewram17800[gActiveBattler].substituteSprite == 1)
+            if (gBattleSpriteInfo[gActiveBattler].substituteSprite == 1)
                 move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
             ewram17810[gActiveBattler].unk4 = 3;
         }
@@ -1239,7 +1239,8 @@ void WallyHandlePrintString(void)
     if (*ptr == 2)
         DestroyMenuCursor();
     BufferStringBattle(*ptr);
-    Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15);
+    Contest_StartTextPrinter(
+        &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 0x90, 2, 15);
     gBattlerControllerFuncs[gActiveBattler] = sub_8137454;
 }
 
@@ -1257,23 +1258,23 @@ void WallyHandlecmd18(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 160;
-    gUnknown_03004210.paletteNum = 0;
-    Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 15, 27, 18);
-    Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 35, 16, 36);
+    gWindowTemplate_Contest_MoveDescription.paletteNum = 0;
+    Text_FillWindowRectDefPalette(&gWindowTemplate_Contest_MoveDescription, 10, 2, 15, 27, 18);
+    Text_FillWindowRectDefPalette(&gWindowTemplate_Contest_MoveDescription, 10, 2, 35, 16, 36);
     gBattlerControllerFuncs[gActiveBattler] = sub_81372BC;
-    Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35);
-    Text_PrintWindow8002F44(&gUnknown_03004210);
+    Text_InitWindow(&gWindowTemplate_Contest_MoveDescription, BattleText_MenuOptions, 400, 18, 35);
+    Text_PrintWindow8002F44(&gWindowTemplate_Contest_MoveDescription);
     MenuCursor_Create814A5C0(0, 0xFFFF, 12, 0x2D9F, 0);
     for (i = 0; i < 4; i++)
         nullsub_8(i);
     sub_802E3E4(0, 0);
     BattleStringExpandPlaceholdersToDisplayedString(BattleText_WallyMenu);
 #ifdef ENGLISH
-    Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 440, 2, 35);
+    Text_InitWindow(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 440, 2, 35);
 #else
-    Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 444, 2, 35);
+    Text_InitWindow(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 444, 2, 35);
 #endif
-    Text_PrintWindow8002F44(&gUnknown_03004210);
+    Text_PrintWindow8002F44(&gWindowTemplate_Contest_MoveDescription);
 }
 
 void WallyHandlecmd19(void)
@@ -1464,7 +1465,7 @@ void WallyHandleFaintingCry(void)
 void WallyHandleIntroSlide(void)
 {
     StartBattleIntroAnim(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_02024DE8 |= 1;
+    gIntroSlideFlags |= 1;
     WallyBufferExecCompleted();
 }
 
@@ -1496,13 +1497,13 @@ void sub_81398BC(u8 bank)
 {
     u16 species;
 
-    ewram17800[bank].transformedSpecies = 0;
+    gBattleSpriteInfo[bank].transformedSpecies = 0;
     gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_0300434C[bank] = CreateInvisibleSpriteWithCallback(sub_80312F0);
     GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(bank));
     gBattlerSpriteIds[bank] = CreateSprite(
-      &gUnknown_02024E8C,
+      &gCreatingSpriteTemplate,
       GetBattlerSpriteCoord(bank, 2),
       sub_8077F68(bank),
       GetBattlerSubpriority(bank));