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

Fix Liquid Ooze + Leech Seed Test (#6217)

Browse Source 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
This commit is contained in:
ghoulslash 2025-02-08 16:42:25 -05:00 committed by GitHub
parent 41882b267d
commit 6f541bb449
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_scripts_1.s
View File

@ -5952,10 +5952,14 @@ BattleScript_SafeguardEnds::
waitmessage B_WAIT_TIME_LONG
end2
@ Leech Seed end turn effect
@ attacker is the victim
@ target is the leech seeder (recieving HP)
BattleScript_LeechSeedTurnDrainLiquidOoze::
call BattleScript_LeechSeedTurnDrain
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
copybyte gBattlerAttacker, gBattlerTarget @ needed to get liquid ooze message correct
goto BattleScript_LeechSeedTurnDrainGainHp
BattleScript_LeechSeedTurnDrainHealBlock::

11
test/battle/ability/liquid_ooze.c
View File

@ -108,9 +108,11 @@ SINGLE_BATTLE_TEST("Liquid Ooze causes Strength Sap users to lose HP instead of
}
}
SINGLE_BATTLE_TEST("Liquid Ooze causes leech seedee to faint before seeder")
/* * https://bulbapedia.bulbagarden.net/wiki/Liquid_Ooze_(Ability)#In_battle:
* If the recipient of Leech Seed's effect were to faint due to Liquid Ooze on the same turn as the victim of Leech Seed, then the victim faints before the recipient. This means that the victim's team loses the battle if both teams had their final Pokémon sent out.
*/
SINGLE_BATTLE_TEST("Liquid Ooze causes leech seed victim to faint before seeder")
{
KNOWN_FAILING; // Message fails
u16 ability;
PARAMETRIZE { ability = ABILITY_CLEAR_BODY; }
PARAMETRIZE { ability = ABILITY_LIQUID_OOZE; }
@ -120,16 +122,17 @@ SINGLE_BATTLE_TEST("Liquid Ooze causes leech seedee to faint before seeder")
} WHEN {
TURN { MOVE(player, MOVE_LEECH_SEED); }
} SCENE {
// Player seeds opponent
MESSAGE("Bulbasaur used Leech Seed!");
// Drain at end of turn
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_LEECH_SEED_DRAIN, opponent);
if (ability != ABILITY_LIQUID_OOZE) {
MESSAGE("The opposing Tentacool's health is sapped by Leech Seed!");
MESSAGE("The opposing Tentacool fainted!");
MESSAGE("The opposing Tentacool's health is sapped by Leech Seed!");
} else {
MESSAGE("The opposing Tentacool fainted!");
ABILITY_POPUP(opponent, ABILITY_LIQUID_OOZE);
MESSAGE("Bulbasaur sucked up the liquid ooze!");
MESSAGE("The opposing Tentacool fainted!");
MESSAGE("Bulbasaur fainted!");
}
}