Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix poisons absorbing toxic spikes when fainting from other hazards (#8644)

Browse Source
This commit is contained in:
spindrift64 2025-12-23 21:47:42 +01:00 committed by GitHub
parent d65254c08e
commit 582a643d1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asm/macros/battle_script.inc
View File

@ -2464,3 +2464,8 @@
.byte \gen
.4byte \jumpInstr
.endm
@ Absorbs Toxic Spikes when a grounded Poison-type faints to entry hazards.
.macro tryabsorbtoxicspikesonfaint
callnative BS_TryAbsorbToxicSpikesOnFaint
.endm

4
data/battle_scripts_1.s
View File

@ -5147,6 +5147,7 @@ BattleScript_DmgHazardsOnAttackerFainted::
setbyte sGIVEEXP_STATE, 0
getexp BS_ATTACKER
moveendall
tryabsorbtoxicspikesonfaint
goto BattleScript_HandleFaintedMon
BattleScript_DmgHazardsOnTarget::
@ -5161,6 +5162,7 @@ BattleScript_DmgHazardsOnTargetFainted::
setbyte sGIVEEXP_STATE, 0
getexp BS_TARGET
moveendall
tryabsorbtoxicspikesonfaint
goto BattleScript_HandleFaintedMon
BattleScript_DmgHazardsOnBattlerScripting::
@ -5175,6 +5177,7 @@ BattleScript_DmgHazardsOnBattlerScriptingFainted::
setbyte sGIVEEXP_STATE, 0
getexp BS_SCRIPTING
moveendall
tryabsorbtoxicspikesonfaint
goto BattleScript_HandleFaintedMon
BattleScript_DmgHazardsOnFaintedBattler::
@ -5189,6 +5192,7 @@ BattleScript_DmgHazardsOnFaintedBattlerFainted::
setbyte sGIVEEXP_STATE, 0
getexp BS_FAINTED
moveendall
tryabsorbtoxicspikesonfaint
goto BattleScript_HandleFaintedMon
BattleScript_PrintHurtByDmgHazards::

26
src/battle_script_commands.c
View File

@ -18012,3 +18012,29 @@ void BS_JumpIfGenConfigLowerThan(void)
else
gBattlescriptCurrInstr = cmd->nextInstr;
}
// Used when the Pokemon faints before Toxic Spikes would normally be processed in the hazards queue.
void BS_TryAbsorbToxicSpikesOnFaint(void)
{
NATIVE_ARGS();
u32 battler = gBattlerFainted;
u32 side = GetBattlerSide(battler);
if (gSideTimers[side].toxicSpikesAmount == 0)
{
gBattlescriptCurrInstr = cmd->nextInstr;
return;
}
if (IsBattlerGrounded(battler, GetBattlerAbility(battler), GetBattlerHoldEffect(battler))
&& IS_BATTLER_OF_TYPE(battler, TYPE_POISON))
{
gSideTimers[side].toxicSpikesAmount = 0;
RemoveHazardFromField(side, HAZARDS_TOXIC_SPIKES);
gEffectBattler = battler;
BattleScriptCall(BattleScript_ToxicSpikesAbsorbed);
return;
}
gBattlescriptCurrInstr = cmd->nextInstr;
}

2
test/battle/hazards.c
View File

@ -64,8 +64,6 @@ SINGLE_BATTLE_TEST("Hazards are applied correctly after a battler faints")
SINGLE_BATTLE_TEST("Toxic Spikes can be removed after fainting to other hazards")
{
KNOWN_FAILING; // tryfaintmon changes something that doesn't allow other switch-in effects on the battler
GIVEN {
PLAYER(SPECIES_WYNAUT);
PLAYER(SPECIES_GRIMER) { HP(1); }