summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-21 17:32:35 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-21 17:32:35 +0200
commit3d1c16523e277b0b4044e685aa118c15aaaeffe9 (patch)
tree5e1561b2ee508383dc50e3cc7fc473edfb21b2d2 /include/battle.h
parentafd42c8e145c77fbf07799a54aec405766eed45c (diff)
start working on battle controllers, especially player
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h
index 8ea1b78f4..a67442f85 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -856,6 +856,8 @@ void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species);
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank);
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank);
void BattleLoadSubstituteSpriteGfx(u8 bank, bool8 arg1);
+void nullsub_24(u16 arg0);
+void nullsub_25(u8 arg0);
enum
{
@@ -910,7 +912,17 @@ struct BattleHealthboxInfo
u8 flag_x4 : 1;
u8 flag_x8 : 1;
u8 flag_x10 : 1;
- u8 field_1;
+ u8 flag_x20 : 1;
+ u8 flag_x40 : 1;
+ u8 flag_x80 : 1;
+ u8 field_1_x1 : 1;
+ u8 field_1_x2 : 1;
+ u8 field_1_x4 : 1;
+ u8 field_1_x8 : 1;
+ u8 field_1_x10 : 1;
+ u8 field_1_x20 : 1;
+ u8 field_1_x40 : 1;
+ u8 field_1_x80 : 1;
u8 field_2;
u8 field_3;
u8 field_4;