diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-08 12:21:24 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-09-16 19:21:23 -0500 |
| commit | b46c4b670339754ca83fd9f2809f13d4de0dc6a5 (patch) | |
| tree | c1e4b1f76785a3d26047ada7eab8119281386990 /src/battle_main.c | |
| parent | 85d97542cdb269278aad3cc3735c29845f9d8738 (diff) | |
more constant usage
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 87e29dd57..27889e81e 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]; |