From 4b45282dd37266cc7d263a6fd4a5223f8e92b5be Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 16 Oct 2017 18:12:27 +0200 Subject: start working on battle interface --- include/battle.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include/battle.h') diff --git a/include/battle.h b/include/battle.h index f00b7f9ab..548eb8de1 100644 --- a/include/battle.h +++ b/include/battle.h @@ -903,11 +903,21 @@ struct BattleHealthboxInfo u8 field_B; }; +struct BattleBarInfo +{ + u8 healthboxSpriteId; + u32 maxValue; + u32 currentValue; + bool32 isDoubleBattle; + s32 field_10; +}; + struct BattleSpriteData { struct BattleSpriteInfo *bankData; struct BattleHealthboxInfo *healthBoxesData; struct BattleAnimationInfo *animationData; + struct BattleBarInfo *battleBars; }; extern struct BattleSpriteData *gBattleSpritesDataPtr; -- cgit v1.2.3 From 0ffc5652fd746816a763e4e0ec83c08f2f53222c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 18 Oct 2017 00:00:46 +0200 Subject: hp printing in healthboxes done I hope --- include/battle.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/battle.h') diff --git a/include/battle.h b/include/battle.h index 548eb8de1..948111d43 100644 --- a/include/battle.h +++ b/include/battle.h @@ -931,6 +931,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; -- cgit v1.2.3 From 6e56211f40d7a191afd91bcf41d63178e26b5199 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 18 Oct 2017 21:42:00 +0200 Subject: more of battle interface done --- include/battle.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'include/battle.h') diff --git a/include/battle.h b/include/battle.h index 948111d43..ae7fa3ce4 100644 --- a/include/battle.h +++ b/include/battle.h @@ -883,6 +883,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 -- cgit v1.2.3 From 11bead31e90aca72f85352b684670a76a5aa7a16 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 19 Oct 2017 15:28:41 +0200 Subject: battle interface is done --- include/battle.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/battle.h') diff --git a/include/battle.h b/include/battle.h index ae7fa3ce4..719db0fa3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -919,9 +919,9 @@ struct BattleHealthboxInfo struct BattleBarInfo { u8 healthboxSpriteId; - u32 maxValue; - u32 currentValue; - bool32 isDoubleBattle; + s32 maxValue; + s32 currentValue; + s32 field_C; s32 field_10; }; -- cgit v1.2.3