diff options
| author | melthelesbian <44884535+melthelesbian@users.noreply.github.com> | 2018-12-25 12:50:15 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-12-25 11:50:15 -0600 |
| commit | 2dd706ca5410d98ad214ceff7026d6db276f4d5a (patch) | |
| tree | 20d184fb4f7e48d965c6c88b39dfd7fc11d3dd86 /src/battle_controllers.c | |
| parent | dcbc8db6a32e70651163a132950d486d93a58254 (diff) | |
use max mon moves constant where able (#480)
* use max mon moves constant where able
* fix errors in script commands file
* fix more errors
Diffstat (limited to 'src/battle_controllers.c')
| -rw-r--r-- | src/battle_controllers.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 1b0ca6a73..06d856d28 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -142,7 +142,7 @@ static void InitSinglePlayerBtlControllers(void) gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT; } - gBattlersCount = 4; + gBattlersCount = MAX_BATTLERS_COUNT; sub_81B8D64(0, 0); sub_81B8D64(1, 0); @@ -225,7 +225,7 @@ static void InitSinglePlayerBtlControllers(void) gBattlerControllerFuncs[3] = SetControllerToOpponent; gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT; - gBattlersCount = 4; + gBattlersCount = MAX_BATTLERS_COUNT; if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) { @@ -245,7 +245,7 @@ static void InitSinglePlayerBtlControllers(void) gBattlerControllerFuncs[3] = SetControllerToOpponent; gBattlerPositions[3] = 3; - gBattlersCount = 4; + gBattlersCount = MAX_BATTLERS_COUNT; sub_81B8D64(0, 0); sub_81B8D64(1, 0); @@ -431,7 +431,7 @@ static void InitLinkBtlControllers(void) gBattlerControllerFuncs[3] = SetControllerToLinkOpponent; gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT; - gBattlersCount = 4; + gBattlersCount = MAX_BATTLERS_COUNT; } else { @@ -447,7 +447,7 @@ static void InitLinkBtlControllers(void) gBattlerControllerFuncs[2] = SetControllerToLinkOpponent; gBattlerPositions[2] = B_POSITION_OPPONENT_RIGHT; - gBattlersCount = 4; + gBattlersCount = MAX_BATTLERS_COUNT; } } else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) @@ -468,7 +468,7 @@ static void InitLinkBtlControllers(void) gBattlerControllerFuncs[3] = SetControllerToOpponent; gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT; - gBattlersCount = 4; + gBattlersCount = MAX_BATTLERS_COUNT; } else { @@ -484,7 +484,7 @@ static void InitLinkBtlControllers(void) gBattlerControllerFuncs[3] = SetControllerToLinkOpponent; gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT; - gBattlersCount = 4; + gBattlersCount = MAX_BATTLERS_COUNT; } sub_81B8D64(0, 0); @@ -574,7 +574,7 @@ static void InitLinkBtlControllers(void) } } - gBattlersCount = 4; + gBattlersCount = MAX_BATTLERS_COUNT; } } |