ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-23 22:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some moves hitting the user

Browse Source
This commit is contained in:
DizzyEggg 2019-12-30 13:14:20 +01:00
parent 77842b0376
commit 770a57bec7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/battle_util.c
View File

@ -4652,14 +4652,23 @@ void HandleAction_RunBattleScript(void) // identical to RunBattleScriptCommands
u32 SetRandomTarget(u32 battlerId) u32 SetRandomTarget(u32 battlerId)
{ {
u32 target;
static const u8 targets[2][2] = static const u8 targets[2][2] =
{ {
[B_SIDE_PLAYER] = {B_POSITION_OPPONENT_LEFT, B_POSITION_OPPONENT_RIGHT}, [B_SIDE_PLAYER] = {B_POSITION_OPPONENT_LEFT, B_POSITION_OPPONENT_RIGHT},
[B_SIDE_OPPONENT] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT}, [B_SIDE_OPPONENT] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT},
}; };
u32 target = GetBattlerAtPosition(targets[GetBattlerSide(battlerId)][Random() % 2]);
if (!IsBattlerAlive(target)) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
target ^= BIT_FLANK; {
target = GetBattlerAtPosition(targets[GetBattlerSide(battlerId)][Random() % 2]);
if (!IsBattlerAlive(target))
target ^= BIT_FLANK;
}
else
{
target = GetBattlerAtPosition(targets[GetBattlerSide(battlerId)][0]);
}
return target; return target;
} }