diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index ec3611dee3..caba0ed151 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -762,7 +762,7 @@
 	.ifgt \isDouble; .set trainerbattle_flags, trainerbattle_flags | (1 << 0); .endif
 	.ifgt \isRematch; .set trainerbattle_flags, trainerbattle_flags | (1 << 1); .endif
 	.ifgt \playMusicA; .set trainerbattle_flags, trainerbattle_flags | (1 << 2); .endif
-	.ifgt \playMusicB; .set trainerBattle_flags, trainerbattle_flags | (1 << 3); .endif
+	.ifgt \playMusicB; .set trainerbattle_flags, trainerbattle_flags | (1 << 3); .endif
 	.ifgt \continueScript; .set trainerbattle_flags, trainerbattle_flags | (1 << 4); .endif
 	.ifgt \facePlayer; .set trainerbattle_flags, trainerbattle_flags | (1 << 5); .endif
 	.ifgt \earlyRival; .set trainerbattle_flags, trainerbattle_flags | (1 << 6); .endif
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 5c046029ef..5bd28ed7c0 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1217,6 +1217,11 @@ static void BattleSetup_ConfigureTrainerBattle(TrainerBattleParameter *battlePar
         PUSH(EventSnippet_NotEnoughMonsForDoubleBattle)
         return;
     }
+
+    if (battleParams->params.opponentA != 0 && battleParams->params.opponentB != 0)
+    {
+        gNoOfApproachingTrainers = 2;
+    }
     
 #if FREE_MATCH_CALL == FALSE
     if (battleParams->params.isRematch)