From b5956d8eba73cafcf80f3ca70297ac3647a3d720 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 24 Jun 2025 17:15:16 -0400 Subject: [PATCH] Fix healthbox when blending effects happen (#7203) --- src/battle_controllers.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 2a5cdbece9..4a631e3f71 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -154,19 +154,12 @@ static void InitBtlControllersInternal(void) else isPlayerPrimary = (!isRecordedLink || isRecordedMaster); - if (isPlayerPrimary) + gBattlerPositions[B_BATTLER_0] = isPlayerPrimary ? B_POSITION_PLAYER_LEFT : B_POSITION_OPPONENT_LEFT; + gBattlerPositions[B_BATTLER_1] = isPlayerPrimary ? B_POSITION_OPPONENT_LEFT : B_POSITION_PLAYER_LEFT; + if (isDouble) { - gBattlerPositions[B_BATTLER_0] = B_POSITION_PLAYER_LEFT; - gBattlerPositions[B_BATTLER_1] = B_POSITION_OPPONENT_LEFT; - gBattlerPositions[B_BATTLER_2] = B_POSITION_PLAYER_RIGHT; - gBattlerPositions[B_BATTLER_3] = B_POSITION_OPPONENT_RIGHT; - } - else - { - gBattlerPositions[B_BATTLER_0] = B_POSITION_OPPONENT_LEFT; - gBattlerPositions[B_BATTLER_1] = B_POSITION_PLAYER_LEFT; - gBattlerPositions[B_BATTLER_2] = B_POSITION_OPPONENT_RIGHT; - gBattlerPositions[B_BATTLER_3] = B_POSITION_PLAYER_RIGHT; + gBattlerPositions[B_BATTLER_2] = isPlayerPrimary ? B_POSITION_PLAYER_RIGHT : B_POSITION_OPPONENT_RIGHT; + gBattlerPositions[B_BATTLER_3] = isPlayerPrimary ? B_POSITION_OPPONENT_RIGHT : B_POSITION_PLAYER_RIGHT; } if (isLink)