Merge pull request #541 from Diegoisawesome/master

Misc documentation

2 files changed, 22 insertions, 22 deletions

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,
 };