summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2017-10-20 12:39:55 -0500
committerGitHub <noreply@github.com>2017-10-20 12:39:55 -0500
commit35a96cb0c007545ecc87732f8dc8b2eb93e3ecc2 (patch)
tree79174cee322cfcaac7dec1ac43f668fa747d99c3 /include/battle.h
parentae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff)
parentccd7e8b3b1d942b2e1289611639f4e9a188cdc20 (diff)
Merge pull request #88 from DizzyEggg/decompile_battle_interface
decompile battle interface
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h25
1 files changed, 25 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h
index a7a26e5eb..8ea1b78f4 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -888,6 +888,19 @@ struct BattleSpriteInfo
struct BattleAnimationInfo
{
u16 field; // to fill up later
+ u8 field_2;
+ u8 field_3;
+ u8 field_4;
+ u8 field_5;
+ u8 field_6;
+ u8 field_7;
+ u8 field_8;
+ u8 field_9_x1 : 1;
+ u8 field_9_x2 : 1;
+ u8 field_9_x1C : 3;
+ u8 field_9_x20 : 1;
+ u8 field_9_x40 : 1;
+ u8 field_9_x80 : 1;
};
struct BattleHealthboxInfo
@@ -910,11 +923,21 @@ struct BattleHealthboxInfo
u8 field_B;
};
+struct BattleBarInfo
+{
+ u8 healthboxSpriteId;
+ s32 maxValue;
+ s32 currentValue;
+ s32 field_C;
+ s32 field_10;
+};
+
struct BattleSpriteData
{
struct BattleSpriteInfo *bankData;
struct BattleHealthboxInfo *healthBoxesData;
struct BattleAnimationInfo *animationData;
+ struct BattleBarInfo *battleBars;
};
extern struct BattleSpriteData *gBattleSpritesDataPtr;
@@ -933,6 +956,8 @@ struct MonSpritesGfx
void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon
void* sprites[4];
struct SpriteTemplate templates[4];
+ u8 field_74[0x100];
+ u8 *fontPixels;
};
extern struct BattleSpritesGfx* gMonSpritesGfx;