diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-26 15:02:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 15:02:38 -0400 |
| commit | 1016b239186097361ea20f2f91adf3932026f40c (patch) | |
| tree | 840a0f28046d3c66fcaf1c2bb8ab3228386a3a8a /src/recorded_battle.c | |
| parent | bb236b490d99fef02ed172e7ca86f6c70ef09527 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into rename-tablecmds
Diffstat (limited to 'src/recorded_battle.c')
| -rw-r--r-- | src/recorded_battle.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 9e03d57f6..432c5dbe6 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -37,8 +37,8 @@ struct PlayerInfo struct MovePp { - u16 moves[4]; - u8 pp[4]; + u16 moves[MAX_MON_MOVES]; + u8 pp[MAX_MON_MOVES]; }; struct RecordedBattleSave @@ -91,7 +91,7 @@ EWRAM_DATA static u32 sBattleFlags = 0; EWRAM_DATA static u32 sAI_Scripts = 0; EWRAM_DATA static struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0}; EWRAM_DATA static struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0}; -EWRAM_DATA static u16 sPlayerMonMoves[2][4] = {0}; +EWRAM_DATA static u16 sPlayerMonMoves[2][MAX_MON_MOVES] = {0}; EWRAM_DATA static struct PlayerInfo sPlayers[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA static u8 sUnknown_0203CCD0 = 0; EWRAM_DATA static u8 sRecordMixFriendName[PLAYER_NAME_LENGTH + 1] = {0}; @@ -766,11 +766,11 @@ void sub_818603C(u8 arg0) { if (sBattleRecords[battlerId][sRecordedBytesNo[battlerId]] == ACTION_MOVE_CHANGE) { - u8 ppBonuses[4]; - u8 array1[4]; - u8 array2[4]; + u8 ppBonuses[MAX_MON_MOVES]; + u8 array1[MAX_MON_MOVES]; + u8 array2[MAX_MON_MOVES]; struct MovePp movePp; - u8 array3[8]; + u8 array3[(MAX_MON_MOVES * 2)]; u8 var; RecordedBattle_GetBattlerAction(battlerId); |