diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-11-06 15:41:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 15:41:25 -0500 |
| commit | 8b1c2c946b3b58cc938f0496a9af11a641749a1e (patch) | |
| tree | 4db08c6d6a2d585a0a42ee6f023faa9f6e8d13fb /include/battle.h | |
| parent | 75b12b86dcf5525371e2a8394b41e1cbd7c0c744 (diff) | |
| parent | e31158d017c71110d421864beee166d1facbebd9 (diff) | |
Merge pull request #1247 from PidgeyALT/attemptcountfix
use constants for ball throw count
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 8dad6bc25..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) @@ -255,7 +256,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 |