Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix pressing left or up when choosing target potentially causing a softlock (#9247)
Some checks are pending
CI / build (push) Waiting to run
Details
CI / docs_validate (push) Waiting to run
Details
CI / allcontributors (push) Waiting to run
Details

Browse Source
This commit is contained in:
PhallenTree 2026-02-18 22:56:12 +00:00 committed by GitHub
parent 8567d23736
commit ccfb1b6e09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/battle_controller_player.c
View File

@ -473,6 +473,7 @@ void HandleInputChooseTarget(enum BattlerId battler)
}
else
{
bool32 validTarget = FALSE;
do
{
enum BattlerPosition currSelIdentity = GetBattlerPosition(gMultiUsePlayerCursor);
@ -484,34 +485,37 @@ void HandleInputChooseTarget(enum BattlerId battler)
}
do
{
if (--i < 0)
if (i == 0)
i = MAX_BATTLERS_COUNT - 1;
else
i--;
gMultiUsePlayerCursor = GetBattlerAtPosition(identities[i]);
} while (gMultiUsePlayerCursor == gBattlersCount);
} while (gMultiUsePlayerCursor >= gBattlersCount);
i = 0;
switch (GetBattlerPosition(gMultiUsePlayerCursor))
{
case B_POSITION_PLAYER_LEFT:
case B_POSITION_PLAYER_RIGHT:
if (battler != gMultiUsePlayerCursor)
i++;
validTarget = TRUE;
break;
case B_POSITION_OPPONENT_LEFT:
case B_POSITION_OPPONENT_RIGHT:
i++;
validTarget = TRUE;
break;
default:
break;
}
if (B_SHOW_EFFECTIVENESS)
MoveSelectionDisplayMoveEffectiveness(CheckTypeEffectiveness(battler, gMultiUsePlayerCursor), battler);
if (gAbsentBattlerFlags & (1u << gMultiUsePlayerCursor)
|| !CanTargetBattler(battler, gMultiUsePlayerCursor, move)
|| (moveTarget == TARGET_OPPONENT && IsOnPlayerSide(gMultiUsePlayerCursor)))
i = 0;
} while (i == 0);
validTarget = FALSE;
if (B_SHOW_EFFECTIVENESS && validTarget)
MoveSelectionDisplayMoveEffectiveness(CheckTypeEffectiveness(battler, gMultiUsePlayerCursor), battler);
} while (!validTarget);
}
gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_ShowAsMoveTarget;
}