diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
commit | d004ce065c9cc6425df6f567dff39eb831f84875 (patch) | |
tree | 2c20338324f10a553e78e731d999dd58669266c3 /include/battle.h | |
parent | ec780bb2098be75e591b212e85947f88c91d4e37 (diff) | |
parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) |
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'include/battle.h')
-rw-r--r-- | include/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index c5c747137..73caed16f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -419,7 +419,7 @@ struct BattleStruct u8 wildVictorySong; u8 dynamicMoveType; u8 wrappedBy[MAX_BATTLERS_COUNT]; - u16 assistPossibleMoves[PARTY_SIZE * 4]; // Each of mons can know max 4 moves. + u16 assistPossibleMoves[PARTY_SIZE * MAX_MON_MOVES]; // Each of mons can know max 4 moves. u8 focusPunchBattlerId; u8 battlerPreventingSwitchout; u8 moneyMultiplier; |