diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
| commit | 7b8b5b5c8c02156d7cdaa76212ad68f01b1600c9 (patch) | |
| tree | 32b1c3ce14f272708fdc4b5b944a8dc9c14d07e3 /src/battle_main.c | |
| parent | 27aae9da9a570b6787171e33fa29c43c507187c1 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into gflib
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index c8b2d17cc..26e9e91ae 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1790,9 +1790,9 @@ static void CB2_HandleStartMultiBattle(void) gBattleCommunication[SPRITES_INIT_STATE2] = 0; if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - for (id = 0; id < 4 && (gLinkPlayers[id].version & 0xFF) == 3; id++); + for (id = 0; id < MAX_LINK_PLAYERS && (gLinkPlayers[id].version & 0xFF) == VERSION_EMERALD; id++); - if (id == 4) + if (id == MAX_LINK_PLAYERS) gBattleCommunication[MULTIUSE_STATE] = 8; else gBattleCommunication[MULTIUSE_STATE] = 10; @@ -4244,7 +4244,7 @@ static void HandleTurnActionSelectionState(void) moveInfo.monType1 = gBattleMons[gActiveBattler].type1; moveInfo.monType2 = gBattleMons[gActiveBattler].type2; - for (i = 0; i < 4; i++) + for (i = 0; i < MAX_MON_MOVES; i++) { moveInfo.moves[i] = gBattleMons[gActiveBattler].moves[i]; moveInfo.currentPp[i] = gBattleMons[gActiveBattler].pp[i]; |