Merge branch 'master' into doc-binterface

2021-11-09 16:09:48 -05:00
parent adf773f1ed 1c82571fa0
commit 8e424b6985
228 changed files with 3158 additions and 3198 deletions
@@ -682,7 +682,7 @@ static void CB2_InitBattleInternal(void)
    {
        CreateNPCTrainerParty(&gEnemyParty[0], gTrainerBattleOpponent_A, TRUE);
        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
-            CreateNPCTrainerParty(&gEnemyParty[3], gTrainerBattleOpponent_B, FALSE);
+            CreateNPCTrainerParty(&gEnemyParty[PARTY_SIZE / 2], gTrainerBattleOpponent_B, FALSE);
        SetWildMonHeldItem();
    }