diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-11-07 18:06:37 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-11-07 18:06:37 -0500 |
| commit | a29b18ed2f27c2991b0894a69fa04738ba9522ca (patch) | |
| tree | 4db08c6d6a2d585a0a42ee6f023faa9f6e8d13fb /include/battle.h | |
| parent | 8d2d34aae9767f283b3c34140920828e37540d23 (diff) | |
| parent | 8b1c2c946b3b58cc938f0496a9af11a641749a1e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/battle.h b/include/battle.h index e4b773089..820684a69 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 |