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

Fixes Receiver not immediately activating copied Soul Heart (#8162)

Browse Source
This commit is contained in:
PhallenTree 2025-11-07 18:23:00 +00:00 committed by GitHub
parent 2467584af5
commit b8dc1968f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/battle_scripts_1.s
View File

@ -5085,8 +5085,8 @@ BattleScript_FaintAttacker::
tryrevertweatherform
flushtextbox
waitanimation
tryactivatesoulheart
tryactivatereceiver BS_ATTACKER
tryactivatesoulheart
trytrainerslidemsgfirstoff BS_ATTACKER
return
@ -5103,8 +5103,8 @@ BattleScript_FaintTarget::
tryrevertweatherform
flushtextbox
waitanimation
tryactivatesoulheart
tryactivatereceiver BS_TARGET
tryactivatesoulheart
trytrainerslidemsgfirstoff BS_TARGET
return
@ -7285,6 +7285,7 @@ BattleScript_ReceiverActivates::
printstring STRINGID_RECEIVERABILITYTAKEOVER
waitmessage B_WAIT_TIME_LONG
settracedability BS_ABILITY_BATTLER
switchinabilities BS_ABILITY_BATTLER
return
BattleScript_AbilityHpHeal:

59
test/battle/ability/receiver.c
View File

@ -1,4 +1,63 @@
#include "global.h"
#include "test/battle.h"
DOUBLE_BATTLE_TEST("Receiver copies ally's ability when they faint and immediately activates it")
{
GIVEN {
ASSUME(!gAbilitiesInfo[ABILITY_INTIMIDATE].cantBeCopied);
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_PASSIMIAN) { Ability(ABILITY_RECEIVER); }
OPPONENT(SPECIES_GYARADOS) { Ability(ABILITY_INTIMIDATE); HP(1); }
} WHEN {
TURN { MOVE(playerLeft, MOVE_SCRATCH, target: opponentRight); }
} SCENE {
ABILITY_POPUP(opponentRight, ABILITY_INTIMIDATE);
ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, playerLeft);
ABILITY_POPUP(opponentLeft, ABILITY_RECEIVER);
ABILITY_POPUP(opponentLeft, ABILITY_INTIMIDATE);
} THEN {
EXPECT_EQ(playerLeft->statStages[STAT_ATK], DEFAULT_STAT_STAGE - 2);
EXPECT_EQ(playerRight->statStages[STAT_ATK], DEFAULT_STAT_STAGE - 2);
}
}
DOUBLE_BATTLE_TEST("Receiver copies ally's ability when they faint and can activate it on future moves")
{
GIVEN {
ASSUME(!gAbilitiesInfo[ABILITY_WATER_ABSORB].cantBeCopied);
ASSUME(GetMoveType(MOVE_WATER_GUN) == TYPE_WATER);
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_PASSIMIAN) { Ability(ABILITY_RECEIVER); }
OPPONENT(SPECIES_LANTURN) { Ability(ABILITY_WATER_ABSORB); HP(1); }
} WHEN {
TURN { MOVE(playerLeft, MOVE_SCRATCH, target: opponentRight); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, playerLeft);
ABILITY_POPUP(opponentLeft, ABILITY_RECEIVER);
ABILITY_POPUP(opponentLeft, ABILITY_WATER_ABSORB);
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_WATER_GUN, playerRight);
}
}
DOUBLE_BATTLE_TEST("Receiver copies ally's Soul Heart and immediately activates it")
{
GIVEN {
ASSUME(!gAbilitiesInfo[ABILITY_SOUL_HEART].cantBeCopied);
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_PASSIMIAN) { Ability(ABILITY_RECEIVER); }
OPPONENT(SPECIES_MAGEARNA) { Ability(ABILITY_SOUL_HEART); HP(1); }
} WHEN {
TURN { MOVE(playerLeft, MOVE_SCRATCH, target: opponentRight); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, playerLeft);
ABILITY_POPUP(opponentLeft, ABILITY_RECEIVER);
ABILITY_POPUP(opponentLeft, ABILITY_SOUL_HEART);
} THEN {
EXPECT_EQ(opponentLeft->statStages[STAT_SPATK], DEFAULT_STAT_STAGE + 1);
}
}
TO_DO_BATTLE_TEST("TODO: Write Receiver (Ability) test titles")