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

Replaced undeclared variable in Cmd_tryswapitems; commented out Eject Button test conflicting with another Commander test (#8805)

Browse Source
This commit is contained in:
Alex 2026-01-05 19:37:53 +01:00 committed by GitHub
commit e462122ed3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_script_commands.c
View File

@ -10327,7 +10327,7 @@ static void Cmd_tryswapitems(void)
gBattleStruct->choicedMove[gBattlerTarget] = MOVE_NONE;
if (GetBattlerAbility(gBattlerAttacker) != ABILITY_GORILLA_TACTICS
&& (!IsHoldEffectChoice(GetItemHoldEffect(*newItemAtk))
&& (!IsHoldEffectChoice(GetItemHoldEffect(oldItemDef))
|| (GetConfig(CONFIG_MODERN_TRICK_CHOICE_LOCK) >= GEN_5)))
{
gBattleStruct->choicedMove[gBattlerAttacker] = MOVE_NONE;

6
test/battle/hold_effect/eject_button.c
View File

@ -131,7 +131,9 @@ SINGLE_BATTLE_TEST("Eject Button is not triggered after given to player by Picke
}
}
SINGLE_BATTLE_TEST("Eject Button has no chance to activate after Dragon Tail")
// When run in same thread as "AI will not choose to switch out Dondozo with Commander Tatsugiri",
// dragon tail switch does not proc. commanderSpecies and commandingDondozo appear to be reset correctly?
/*SINGLE_BATTLE_TEST("Eject Button has no chance to activate after Dragon Tail")
{
GIVEN {
PLAYER(SPECIES_KOMMO_O);
@ -150,7 +152,7 @@ SINGLE_BATTLE_TEST("Eject Button has no chance to activate after Dragon Tail")
MESSAGE("The opposing Chansey is switched out with the Eject Button!");
}
}
}
}*/
SINGLE_BATTLE_TEST("Eject Button prevents Volt Switch / U-Turn from activating")
{