Document trainer backsprites

6 files changed, 53 insertions, 53 deletions

diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index a7b08a974..d69e05b9e 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1278,7 +1278,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
         else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_FIRE_RED
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN)
         {
-            if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
+            if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE)
                 trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
             else
                 trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
@@ -1286,7 +1286,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
         else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE)
         {
-            if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
+            if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE)
                 trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY];
             else
                 trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN];
diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h
index 6e8474c12..04c7ab3c4 100644
--- a/src/data/pokemon/trainer_class_lookups.h
+++ b/src/data/pokemon/trainer_class_lookups.h
@@ -146,10 +146,10 @@ const u8 gFacilityClassToTrainerClass[] =
     [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS,
     [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR,
     [FACILITY_CLASS_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER,
diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h
index 21dbda597..0cc4bb203 100644
--- a/src/data/trainer_graphics/back_pic_anims.h
+++ b/src/data/trainer_graphics/back_pic_anims.h
@@ -70,13 +70,13 @@ const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
 
 const union AnimCmd *const gTrainerBackAnims_Brendan[] =
 {
-    AnimCmd_82FF540,
+    gAnimCmd_General_Frame3,
     gAnimCmd_Brendan_1,
 };
 
 const union AnimCmd *const gTrainerBackAnims_May[] =
 {
-    AnimCmd_82FF540,
+    gAnimCmd_General_Frame3,
     gAnimCmd_May_Steven_1,
 };
 
@@ -94,25 +94,25 @@ const union AnimCmd *const gTrainerBackAnims_Leaf[] =
 
 const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] =
 {
-    AnimCmd_82FF540,
+    gAnimCmd_General_Frame3,
     gAnimCmd_RubySapphireBrendan_1,
 };
 
 const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] =
 {
-    AnimCmd_82FF540,
+    gAnimCmd_General_Frame3,
     gAnimCmd_RubySapphireMay_1,
 };
 
 const union AnimCmd *const gTrainerBackAnims_Wally[] =
 {
-    AnimCmd_82FF540,
+    gAnimCmd_General_Frame3,
     gAnimCmd_Wally_1,
 };
 
 const union AnimCmd *const gTrainerBackAnims_Steven[] =
 {
-    AnimCmd_82FF540,
+    gAnimCmd_General_Frame3,
     gAnimCmd_May_Steven_1,
 };
 
diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h
index 920ecbb39..0f6b0cb91 100644
--- a/src/data/trainer_graphics/back_pic_tables.h
+++ b/src/data/trainer_graphics/back_pic_tables.h
@@ -15,24 +15,24 @@ const struct MonCoords gTrainerBackPicCoords[] =
 // the casts are so they'll play nice with the strict struct definition
 const struct CompressedSpriteSheet gTrainerBackPicTable[] =
 {
-    (const u32 *)gTrainerBackPic_Brendan, 0x2000, 0,
-    (const u32 *)gTrainerBackPic_May, 0x2000, 1,
-    (const u32 *)gTrainerBackPic_Red, 0x2800, 2,
-    (const u32 *)gTrainerBackPic_Leaf, 0x2800, 3,
-    (const u32 *)gTrainerBackPic_RubySapphireBrendan, 0x2000, 4,
-    (const u32 *)gTrainerBackPic_RubySapphireMay, 0x2000, 5,
-    (const u32 *)gTrainerBackPic_Wally, 0x2000, 6,
-    (const u32 *)gTrainerBackPic_Steven, 0x2000, 7,
+    (const u32 *)gTrainerBackPic_Brendan, 0x2000, TRAINER_BACK_PIC_BRENDAN,
+    (const u32 *)gTrainerBackPic_May, 0x2000, TRAINER_BACK_PIC_MAY,
+    (const u32 *)gTrainerBackPic_Red, 0x2800, TRAINER_BACK_PIC_RED,
+    (const u32 *)gTrainerBackPic_Leaf, 0x2800, TRAINER_BACK_PIC_LEAF,
+    (const u32 *)gTrainerBackPic_RubySapphireBrendan, 0x2000, TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN,
+    (const u32 *)gTrainerBackPic_RubySapphireMay, 0x2000, TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY,
+    (const u32 *)gTrainerBackPic_Wally, 0x2000, TRAINER_BACK_PIC_WALLY,
+    (const u32 *)gTrainerBackPic_Steven, 0x2000, TRAINER_BACK_PIC_STEVEN,
 };
 
 const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = 
 {
-    gTrainerPalette_Brendan, 0,
-    gTrainerPalette_May, 1,
-    gTrainerBackPicPalette_Red, 2,
-    gTrainerBackPicPalette_Leaf, 3,
-    gTrainerPalette_RubySapphireBrendan, 4,
-    gTrainerPalette_RubySapphireMay, 5,
-    gTrainerPalette_Wally, 6,
-    gTrainerPalette_Steven, 7,
+    gTrainerPalette_Brendan, TRAINER_BACK_PIC_BRENDAN,
+    gTrainerPalette_May, TRAINER_BACK_PIC_MAY,
+    gTrainerBackPicPalette_Red, TRAINER_BACK_PIC_RED,
+    gTrainerBackPicPalette_Leaf, TRAINER_BACK_PIC_LEAF,
+    gTrainerPalette_RubySapphireBrendan, TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN,
+    gTrainerPalette_RubySapphireMay, TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY,
+    gTrainerPalette_Wally, TRAINER_BACK_PIC_WALLY,
+    gTrainerPalette_Steven, TRAINER_BACK_PIC_STEVEN,
 };
diff --git a/src/data2b.c b/src/data2b.c
index bb1baa266..af76390a4 100644
--- a/src/data2b.c
+++ b/src/data2b.c
@@ -40,7 +40,7 @@ const struct SpriteFrameImage gUnknown_082FF408[] =
     gHeap + 0xF800, 0x800,
 };
 
-const struct SpriteFrameImage gUnknown_082FF428[] =
+const struct SpriteFrameImage gTrainerBackPicTable_Brendan[] =
 {
     gTrainerBackPic_Brendan, 0x0800,
     gTrainerBackPic_Brendan + 0x0800, 0x0800,
@@ -48,7 +48,7 @@ const struct SpriteFrameImage gUnknown_082FF428[] =
     gTrainerBackPic_Brendan + 0x1800, 0x0800,
 };
 
-const struct SpriteFrameImage gUnknown_082FF448[] =
+const struct SpriteFrameImage gTrainerBackPicTable_May[] =
 {
     gTrainerBackPic_May, 0x0800,
     gTrainerBackPic_May + 0x0800, 0x0800,
@@ -56,7 +56,7 @@ const struct SpriteFrameImage gUnknown_082FF448[] =
     gTrainerBackPic_May + 0x1800, 0x0800,
 };
 
-const struct SpriteFrameImage gUnknown_082FF468[] =
+const struct SpriteFrameImage gTrainerBackPicTable_Red[] =
 {
     gTrainerBackPic_Red, 0x0800,
     gTrainerBackPic_Red + 0x0800, 0x0800,
@@ -65,7 +65,7 @@ const struct SpriteFrameImage gUnknown_082FF468[] =
     gTrainerBackPic_Red + 0x2000, 0x0800,
 };
 
-const struct SpriteFrameImage gUnknown_082FF490[] =
+const struct SpriteFrameImage gTrainerBackPicTable_Leaf[] =
 {
     gTrainerBackPic_Leaf, 0x0800,
     gTrainerBackPic_Leaf + 0x0800, 0x0800,
@@ -74,7 +74,7 @@ const struct SpriteFrameImage gUnknown_082FF490[] =
     gTrainerBackPic_Leaf + 0x2000, 0x0800,
 };
 
-const struct SpriteFrameImage gUnknown_082FF4B8[] =
+const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] =
 {
     gTrainerBackPic_RubySapphireBrendan, 0x0800,
     gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800,
@@ -82,7 +82,7 @@ const struct SpriteFrameImage gUnknown_082FF4B8[] =
     gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800,
 };
 
-const struct SpriteFrameImage gUnknown_082FF4D8[] =
+const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] =
 {
     gTrainerBackPic_RubySapphireMay, 0x0800,
     gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800,
@@ -90,7 +90,7 @@ const struct SpriteFrameImage gUnknown_082FF4D8[] =
     gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800,
 };
 
-const struct SpriteFrameImage gUnknown_082FF4F8[] =
+const struct SpriteFrameImage gTrainerBackPicTable_Wally[] =
 {
     gTrainerBackPic_Wally, 0x0800,
     gTrainerBackPic_Wally + 0x0800, 0x0800,
@@ -98,7 +98,7 @@ const struct SpriteFrameImage gUnknown_082FF4F8[] =
     gTrainerBackPic_Wally + 0x1800, 0x0800,
 };
 
-const struct SpriteFrameImage gUnknown_082FF518[] =
+const struct SpriteFrameImage gTrainerBackPicTable_Steven[] =
 {
     gTrainerBackPic_Steven, 0x0800,
     gTrainerBackPic_Steven + 0x0800, 0x0800,
@@ -112,7 +112,7 @@ const union AnimCmd gAnimCmd_General_Frame0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd AnimCmd_82FF540[] =
+const union AnimCmd gAnimCmd_General_Frame3[] =
 {
     ANIMCMD_FRAME(3, 0),
     ANIMCMD_END,
diff --git a/src/pokemon.c b/src/pokemon.c
index 174f7ae66..1e07ee168 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -52,14 +52,14 @@ extern const struct SpriteFrameImage gUnknown_082FF3A8[];
 extern const struct SpriteFrameImage gUnknown_082FF3C8[];
 extern const struct SpriteFrameImage gUnknown_082FF3E8[];
 extern const struct SpriteFrameImage gUnknown_082FF408[];
-extern const struct SpriteFrameImage gUnknown_082FF428[];
-extern const struct SpriteFrameImage gUnknown_082FF448[];
-extern const struct SpriteFrameImage gUnknown_082FF468[];
-extern const struct SpriteFrameImage gUnknown_082FF490[];
-extern const struct SpriteFrameImage gUnknown_082FF4B8[];
-extern const struct SpriteFrameImage gUnknown_082FF4D8[];
-extern const struct SpriteFrameImage gUnknown_082FF4F8[];
-extern const struct SpriteFrameImage gUnknown_082FF518[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_Brendan[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_May[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_Wally[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_Steven[];
 extern const union AffineAnimCmd *const gUnknown_082FF618[];
 extern const union AffineAnimCmd *const gUnknown_082FF694[];
 extern const union AnimCmd *gPlayerMonSpriteAnimsTable[];
@@ -2328,14 +2328,14 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
     },
 };
 
-static const struct SpriteTemplate gUnknown_08329DF8[] =
+static const struct SpriteTemplate gSpriteTemplateTable_TrainerBackSprites[] =
 {
     {
         .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gOamData_831ACB0,
         .anims = NULL,
-        .images = gUnknown_082FF428,
+        .images = gTrainerBackPicTable_Brendan,
         .affineAnims = gUnknown_082FF618,
         .callback = sub_8039BB4,
     },
@@ -2344,7 +2344,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .paletteTag = 0,
         .oam = &gOamData_831ACB0,
         .anims = NULL,
-        .images = gUnknown_082FF448,
+        .images = gTrainerBackPicTable_May,
         .affineAnims = gUnknown_082FF618,
         .callback = sub_8039BB4,
     },
@@ -2353,7 +2353,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .paletteTag = 0,
         .oam = &gOamData_831ACB0,
         .anims = NULL,
-        .images = gUnknown_082FF468,
+        .images = gTrainerBackPicTable_Red,
         .affineAnims = gUnknown_082FF618,
         .callback = sub_8039BB4,
     },
@@ -2362,7 +2362,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .paletteTag = 0,
         .oam = &gOamData_831ACB0,
         .anims = NULL,
-        .images = gUnknown_082FF490,
+        .images = gTrainerBackPicTable_Leaf,
         .affineAnims = gUnknown_082FF618,
         .callback = sub_8039BB4,
     },
@@ -2371,7 +2371,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .paletteTag = 0,
         .oam = &gOamData_831ACB0,
         .anims = NULL,
-        .images = gUnknown_082FF4B8,
+        .images = gTrainerBackPicTable_RubySapphireBrendan,
         .affineAnims = gUnknown_082FF618,
         .callback = sub_8039BB4,
     },
@@ -2380,7 +2380,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .paletteTag = 0,
         .oam = &gOamData_831ACB0,
         .anims = NULL,
-        .images = gUnknown_082FF4D8,
+        .images = gTrainerBackPicTable_RubySapphireMay,
         .affineAnims = gUnknown_082FF618,
         .callback = sub_8039BB4,
     },
@@ -2389,7 +2389,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .paletteTag = 0,
         .oam = &gOamData_831ACB0,
         .anims = NULL,
-        .images = gUnknown_082FF4F8,
+        .images = gTrainerBackPicTable_Wally,
         .affineAnims = gUnknown_082FF618,
         .callback = sub_8039BB4,
     },
@@ -2398,7 +2398,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .paletteTag = 0,
         .oam = &gOamData_831ACB0,
         .anims = NULL,
-        .images = gUnknown_082FF518,
+        .images = gTrainerBackPicTable_Steven,
         .affineAnims = gUnknown_082FF618,
         .callback = sub_8039BB4,
     },
@@ -3817,7 +3817,7 @@ void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosit
     gMultiuseSpriteTemplate.paletteTag = trainerSpriteId;
     if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT)
     {
-        gMultiuseSpriteTemplate = gUnknown_08329DF8[trainerSpriteId];
+        gMultiuseSpriteTemplate = gSpriteTemplateTable_TrainerBackSprites[trainerSpriteId];
         gMultiuseSpriteTemplate.anims = gTrainerBackAnimsPtrTable[trainerSpriteId];
     }
     else