1 files changed, 11 insertions, 16 deletions

diff --git a/src/battle_bg.c b/src/battle_bg.c
index bbe50cc70..bb66a41fd 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -31,11 +31,6 @@ struct BattleBackground
     const void *palette;
 };
 
-extern u16 gBattle_BG1_X;
-extern u16 gBattle_BG1_Y;
-extern u16 gBattle_BG2_X;
-extern u16 gBattle_BG2_Y;
-
 extern u8 GetCurrentMapBattleScene(void);
 
 // .rodata
@@ -162,9 +157,9 @@ const struct BgTemplate gBattleBgTemplates[] =
     },
 };
 
-static const struct WindowTemplate gUnknown_0831AA18[] =
+static const struct WindowTemplate gStandardBattleWindowTemplates[] =
 {
-    {
+    { // 0 Standard battle message
         .bg = 0,
         .tilemapLeft = 2,
         .tilemapTop = 15,
@@ -173,7 +168,7 @@ static const struct WindowTemplate gUnknown_0831AA18[] =
         .paletteNum = 0,
         .baseBlock = 0x0090,
     },
-    {
+    { // 1 "What will (pokemon) do?"
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 35,
@@ -182,7 +177,7 @@ static const struct WindowTemplate gUnknown_0831AA18[] =
         .paletteNum = 0,
         .baseBlock = 0x01c0,
     },
-    {
+    { // 2 "Fight/Pokemon/Bag/Run"
         .bg = 0,
         .tilemapLeft = 17,
         .tilemapTop = 35,
@@ -191,7 +186,7 @@ static const struct WindowTemplate gUnknown_0831AA18[] =
         .paletteNum = 5,
         .baseBlock = 0x0190,
     },
-    {
+    { // 3 Top left move
         .bg = 0,
         .tilemapLeft = 2,
         .tilemapTop = 55,
@@ -200,7 +195,7 @@ static const struct WindowTemplate gUnknown_0831AA18[] =
         .paletteNum = 5,
         .baseBlock = 0x0300,
     },
-    {
+    { // 4 Top right move
         .bg = 0,
         .tilemapLeft = 11,
         .tilemapTop = 55,
@@ -209,7 +204,7 @@ static const struct WindowTemplate gUnknown_0831AA18[] =
         .paletteNum = 5,
         .baseBlock = 0x0310,
     },
-    {
+    { // 5 Bottom left move
         .bg = 0,
         .tilemapLeft = 2,
         .tilemapTop = 57,
@@ -218,7 +213,7 @@ static const struct WindowTemplate gUnknown_0831AA18[] =
         .paletteNum = 5,
         .baseBlock = 0x0320,
     },
-    {
+    { // 6 Bottom right move
         .bg = 0,
         .tilemapLeft = 11,
         .tilemapTop = 57,
@@ -383,7 +378,7 @@ static const struct WindowTemplate gUnknown_0831AA18[] =
     DUMMY_WIN_TEMPLATE
 };
 
-static const struct WindowTemplate gUnknown_0831AAE0[] =
+static const struct WindowTemplate gBattleArenaWindowTemplates[] =
 {
     {
         .bg = 0,
@@ -597,8 +592,8 @@ static const struct WindowTemplate gUnknown_0831AAE0[] =
 
 const struct WindowTemplate * const gBattleWindowTemplates[] =
 {
-    gUnknown_0831AA18,
-    gUnknown_0831AAE0,
+    gStandardBattleWindowTemplates,
+    gBattleArenaWindowTemplates,
 };
 
 static const struct BattleBackground gBattleTerrainTable[] =