Merge branch 'master' into battle

1 files changed, 16 insertions, 16 deletions

diff --git a/include/data.h b/include/data.h
index 82fc527dc..9726b95e5 100644
--- a/include/data.h
+++ b/include/data.h
@@ -4,6 +4,8 @@
 #include "global.h"
 #include "constants/species.h"
 
+#define SPECIES_SHINY_TAG 500
+
 struct MonCoords
 {
     // This would use a bitfield, but some function
@@ -12,9 +14,6 @@ struct MonCoords
     u8 y_offset;
 };
 
-extern struct MonCoords gTrainerBackPicCoords[];
-extern struct MonCoords gTrainerFrontPicCoords[];
-
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const u8 gMoveNames[][13];
 extern const u16 gUnknown_8251CB8[];
@@ -22,15 +21,19 @@ extern const u16 gUnknown_8251FEE[];
 extern const u16 gUnknown_8252324[];
 extern const u16 gUnknown_82539D4[];
 
+extern const struct MonCoords gMonFrontPicCoords[];
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
+extern const struct MonCoords gMonBackPicCoords[];
 extern const struct CompressedSpriteSheet gMonBackPicTable[];
 extern const struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
+extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
+extern const struct MonCoords gTrainerFrontPicCoords[];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
+extern const struct MonCoords gTrainerBackPicCoords[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-extern const struct MonCoords gMonFrontPicCoords[];
-extern const struct MonCoords gMonBackPicCoords[];
 
 extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
 extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
@@ -40,11 +43,8 @@ extern const u8 gEnemyMonElevation[NUM_SPECIES];
 extern const u8 *const gBattleAnims_General[];
 extern const u8 *const gBattleAnims_Special[];
 
-extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
-extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
-
-extern const struct OamData gOamData_824F010;
-extern const struct OamData gOamData_824F018;
+extern const struct OamData gUnknown_824F010;
+extern const struct OamData gUnknown_824F018;
 extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_82348C8[];
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_8234944[];
@@ -52,11 +52,11 @@ extern const struct SpriteFrameImage gUnknown_8234698[];
 extern const struct SpriteFrameImage gUnknown_82346B8[];
 extern const struct SpriteFrameImage gUnknown_82346D8[];
 extern const struct SpriteFrameImage gUnknown_82346F8[];
-extern const struct SpriteFrameImage gUnknown_8234718[];
-extern const struct SpriteFrameImage gUnknown_8234740[];
-extern const struct SpriteFrameImage gUnknown_8234768[];
-extern const struct SpriteFrameImage gUnknown_8234788[];
-extern const struct SpriteFrameImage gUnknown_82347A8[];
-extern const struct SpriteFrameImage gUnknown_82347C8[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_PokeDude[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_OldMan[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_RSBrendan[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_RSMay[];
 
 #endif // GUARD_DATA_H