ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix strength sap on substitute (#3486)

Browse Source 
* tests for strenth sap

* fix strength sap on substitute

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
This commit is contained in:
DizzyEggg 2023-10-30 11:58:15 +01:00 committed by GitHub
parent 0c8fdce1a4
commit f4be01f0ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/battle_scripts_1.s
View File

@ -1452,6 +1452,7 @@ BattleScript_StrengthSapHp:
jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_MoveEnd
jumpiffullhp BS_ATTACKER, BattleScript_MoveEnd
manipulatedamage DMG_BIG_ROOT
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNENERGYDRAINED

59
test/battle/move_effect/strength_sap.c Normal file
View File

@ -0,0 +1,59 @@
#include "global.h"
#include "test/battle.h"
ASSUMPTIONS
{
ASSUME(gBattleMoves[MOVE_STRENGTH_SAP].effect == EFFECT_STRENGTH_SAP);
}
SINGLE_BATTLE_TEST("Strength Sap lowers Attack by 1 and restores HP based on target's Attack Stat", s16 hp)
{
u32 atkStat = 0;
PARAMETRIZE{ atkStat = 100; }
PARAMETRIZE{ atkStat = 50; }
GIVEN {
PLAYER(SPECIES_WOBBUFFET) { HP(200); }
OPPONENT(SPECIES_WOBBUFFET) { Attack(atkStat); }
} WHEN {
TURN { MOVE(player, MOVE_STRENGTH_SAP); }
} SCENE {
MESSAGE("Wobbuffet used Strength Sap!");
ANIMATION(ANIM_TYPE_MOVE, MOVE_STRENGTH_SAP, player);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
MESSAGE("Foe Wobbuffet's Attack fell!");
HP_BAR(player, captureDamage: &results[i].hp);
MESSAGE("Foe Wobbuffet had its energy drained!");
} THEN {
EXPECT_EQ(results[i].hp * -1, atkStat);
}
}
// Same as above, but Substitute is used before Strength Sap.
SINGLE_BATTLE_TEST("Strength Sap works exactly the same when attacker is behind substitute", s16 hp)
{
u32 atkStat = 0;
PARAMETRIZE{ atkStat = 100; }
PARAMETRIZE{ atkStat = 50; }
GIVEN {
PLAYER(SPECIES_WOBBUFFET) { HP(200); }
OPPONENT(SPECIES_WOBBUFFET) { Attack(atkStat); }
} WHEN {
TURN { MOVE(player, MOVE_SUBSTITUTE); }
TURN { MOVE(player, MOVE_STRENGTH_SAP); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_SUBSTITUTE, player);
MESSAGE("Wobbuffet used Strength Sap!");
ANIMATION(ANIM_TYPE_MOVE, MOVE_STRENGTH_SAP, player);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
MESSAGE("Foe Wobbuffet's Attack fell!");
HP_BAR(player, captureDamage: &results[i].hp);
NOT MESSAGE("The SUBSTITUTE took damage for Foe Wobbuffet!");
MESSAGE("Foe Wobbuffet had its energy drained!");
} THEN {
EXPECT_EQ(results[i].hp * -1, atkStat);
}
}