diff options
| author | MCboy <atasro2@gmail.com> | 2020-11-06 22:59:46 +0330 |
|---|---|---|
| committer | MCboy <atasro2@gmail.com> | 2020-11-06 22:59:46 +0330 |
| commit | 3b91735e63409f4c5fd88d9984b036a6304952f9 (patch) | |
| tree | 6d99248bb456988f38825c60d2c953bcc28158d0 /include/battle.h | |
| parent | 42b7f11db0ece78171690da1d220d2b7774ab5fa (diff) | |
use constants for ball throw count
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 8dad6bc25..a58f69cda 100644 --- a/include/battle.h +++ b/include/battle.h @@ -12,6 +12,8 @@ #include "battle_util2.h" #include "battle_bg.h" +#include "pokeball.h" // i'm not sure about this one + #define GET_BATTLER_POSITION(battler) (gBattlerPositions[battler]) #define GET_BATTLER_SIDE(battler) (GetBattlerPosition(battler) & BIT_SIDE) #define GET_BATTLER_SIDE2(battler) (GET_BATTLER_POSITION(battler) & BIT_SIDE) @@ -255,7 +257,7 @@ struct BattleResults u16 caughtMonSpecies; // 0x28 u8 caughtMonNick[POKEMON_NAME_LENGTH + 1]; // 0x2A u8 filler35; // 0x35 - u8 catchAttempts[11]; // 0x36 + u8 catchAttempts[POKEBALL_COUNT-1]; // 0x36 Doesn't include Master ball }; struct BattleTv_Side |