summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-07-04 21:06:42 -0400
committerGitHub <noreply@github.com>2017-07-04 21:06:42 -0400
commit813c1846c94fa14b55bf75cf4c14465f1fb26635 (patch)
tree68d09144d1aad1b52f2930d3295c6b244b311a4c /include
parent86a4a2cd3b7cda3b1885e53e7c9ac4d31270bd6c (diff)
parentb219b70250e9eb001111965fbdbcda2305c63c7f (diff)
Merge pull request #344 from camthesaxman/decompile_battle_10
decompile battle_10
Diffstat (limited to 'include')
-rw-r--r--include/battle.h1
-rw-r--r--include/data2.h10
2 files changed, 11 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h
index d93860094..208515be8 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -183,6 +183,7 @@ struct Struct2017810
u8 unk0_6:1;
u8 unk0_7:1;
u8 unk1_0:1;
+ u8 unk1_1:5;
u8 unk2;
u8 unk3;
u8 unk4;
diff --git a/include/data2.h b/include/data2.h
index 2289969b8..9dd26fd5f 100644
--- a/include/data2.h
+++ b/include/data2.h
@@ -53,4 +53,14 @@ extern const struct SpriteTemplate gSpriteTemplate_81FAF0C;
extern void *const gUnknown_081FAF4C[];
extern struct BattleMove gBattleMoves[];
+// data/graphics/trainers/front_pic_coords.inc
+extern const struct MonCoords gTrainerFrontPicCoords[];
+
+// data/graphics/trainers/front_pic_table.inc
+extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
+
+// data/graphics/trainers/front_pic_palette_table.inc
+extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+
+
#endif // GUARD_DATA2_H