Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish Expanding Force

Browse Source 
Hits both foes if the user is affected by Psychic Terrain. Modified targeting is also shown in the move selection screen.
This commit is contained in:
BuffelSaft 2021-11-21 21:49:47 +13:00
parent bcaa17ffb3
commit abb67e96e8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/battle_controller_player.c
View File

@ -609,6 +609,13 @@ static void HandleInputChooseMove(void)
else else
moveTarget = MOVE_TARGET_SELECTED; moveTarget = MOVE_TARGET_SELECTED;
} }
else if (moveInfo->moves[gMoveSelectionCursor[gActiveBattler]] == MOVE_EXPANDING_FORCE)
{
if (IsBattlerTerrainAffected(gActiveBattler, STATUS_FIELD_PSYCHIC_TERRAIN))
moveTarget = MOVE_TARGET_BOTH;
else
moveTarget = MOVE_TARGET_SELECTED;
}
else else
{ {
moveTarget = gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].target; moveTarget = gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].target;

4
src/battle_script_commands.c
View File

@ -5246,7 +5246,9 @@ static void Cmd_moveend(void)
if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE)
&& gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattleTypeFlags & BATTLE_TYPE_DOUBLE
&& !gProtectStructs[gBattlerAttacker].chargingTurn && !gProtectStructs[gBattlerAttacker].chargingTurn
&& (gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH || gBattleMoves[gCurrentMove].target == MOVE_TARGET_FOES_AND_ALLY) && (gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
|| gBattleMoves[gCurrentMove].target == MOVE_TARGET_FOES_AND_ALLY
|| (gBattleMoves[gCurrentMove].effect == EFFECT_EXPANDING_FORCE && IsBattlerTerrainAffected(gBattlerAttacker, STATUS_FIELD_PSYCHIC_TERRAIN)))
&& !(gHitMarker & HITMARKER_NO_ATTACKSTRING)) && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
{ {
u8 battlerId; u8 battlerId;