summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/battle.h b/include/battle.h
index 0f7a262ce..53a78024a 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -11,6 +11,7 @@
#include "battle_gfx_sfx_util.h"
#include "battle_util2.h"
#include "battle_bg.h"
+#include "pokeball.h"
#define GET_BATTLER_POSITION(battler) (gBattlerPositions[battler])
#define GET_BATTLER_SIDE(battler) (GetBattlerPosition(battler) & BIT_SIDE)
@@ -124,8 +125,8 @@ struct ProtectStruct
u32 flinchImmobility:1;
u32 notFirstStrike:1;
u32 palaceUnableToUseMove:1;
- s32 physicalDmg;
- s32 specialDmg;
+ u32 physicalDmg;
+ u32 specialDmg;
u8 physicalBattlerId;
u8 specialBattlerId;
};
@@ -254,8 +255,8 @@ struct BattleResults
u16 playerMon2Species; // 0x26
u16 caughtMonSpecies; // 0x28
u8 caughtMonNick[POKEMON_NAME_LENGTH + 1]; // 0x2A
- u8 filler35; // 0x35
- u8 catchAttempts[11]; // 0x36
+ u8 filler35; // 0x35
+ u8 catchAttempts[POKEBALL_COUNT - 1]; // 0x36 Doesn't include Master ball
};
struct BattleTv_Side
@@ -493,7 +494,7 @@ struct BattleScripting
u8 field_20;
u8 reshowMainState;
u8 reshowHelperState;
- u8 field_23;
+ u8 levelUpHP;
u8 windowsType; // 0 - normal, 1 - battle arena
u8 multiplayerId;
u8 specialTrainerBattleType;