atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes simu hp reduction when no partner was on field (#5799)

Browse source
This commit is contained in:
Alex 2024-12-10 21:48:31 +01:00 committed by GitHub
parent 3ad5de5fef
commit 4bff9f8ee9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/constants/pokemon.h
View file

@ -323,8 +323,9 @@ enum EvolutionMode {
// - Unown has 1 frame, presumably to avoid the work of animating all 28 of its forms
#define MAX_MON_PIC_FRAMES 2
#define BATTLE_ALIVE_EXCEPT_BATTLER 0
#define BATTLE_ALIVE_SIDE 1
#define BATTLE_ALIVE_EXCEPT_BATTLER 0
#define BATTLE_ALIVE_EXCEPT_BATTLER_SIDE 1
#define BATTLE_ALIVE_SIDE 2
#define SKIP_FRONT_ANIM (1 << 7)

2
src/battle_util.c
View file

@ -3696,7 +3696,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType)
}
}
if (moveTarget == MOVE_TARGET_BOTH)
gBattleStruct->numSpreadTargets = CountAliveMonsInBattle(BATTLE_ALIVE_SIDE, gBattlerAttacker);
gBattleStruct->numSpreadTargets = CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_BATTLER_SIDE, gBattlerAttacker);
else
gBattleStruct->numSpreadTargets = CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_BATTLER, gBattlerAttacker);

7
src/pokemon.c
View file

@ -2074,6 +2074,13 @@ u8 CountAliveMonsInBattle(u8 caseId, u32 battler)
retVal++;
}
break;
case BATTLE_ALIVE_EXCEPT_BATTLER_SIDE:
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{
if (i != battler && i != BATTLE_PARTNER(battler) && !(gAbsentBattlerFlags & (1u << i)))
retVal++;
}
break;
case BATTLE_ALIVE_SIDE:
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{

22
test/battle/spread_moves.c
View file

@ -411,3 +411,25 @@ DOUBLE_BATTLE_TEST("Spread Moves: Doesn't affect message on both opposing mons")
MESSAGE("It doesn't affect the opposing Pidgey and Hoothoot…");
}
}
DOUBLE_BATTLE_TEST("Spread Moves: Unless move hits every target user will not include partner in the target count")
{
GIVEN {
PLAYER(SPECIES_SANDSLASH);
PLAYER(SPECIES_WYNAUT) { HP(1); }
PLAYER(SPECIES_RALTS);
OPPONENT(SPECIES_TORKOAL);
OPPONENT(SPECIES_TORKOAL);
} WHEN {
TURN { MOVE(opponentRight, MOVE_ICY_WIND); MOVE(playerLeft, MOVE_ROCK_SLIDE); SEND_OUT(playerRight, 2); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_ICY_WIND, opponentRight);
HP_BAR(playerLeft);
HP_BAR(playerRight);
ANIMATION(ANIM_TYPE_MOVE, MOVE_ROCK_SLIDE, playerLeft);
HP_BAR(opponentLeft);
HP_BAR(opponentRight);
MESSAGE("It's super effective on the opposing Torkoal and Torkoal!");
}
}