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

Gorilla Tactics and Test typos fix (#8653)

Browse Source
This commit is contained in:
bassforte123 2025-12-24 07:15:44 -05:00 committed by GitHub
parent ac221a3aa8
commit 7bd25fae84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_script_commands.c
View File

@ -12733,7 +12733,7 @@ static void Cmd_tryswapitems(void)
if (GetBattlerAbility(gBattlerTarget) != ABILITY_GORILLA_TACTICS) if (GetBattlerAbility(gBattlerTarget) != ABILITY_GORILLA_TACTICS)
gBattleStruct->choicedMove[gBattlerTarget] = MOVE_NONE; gBattleStruct->choicedMove[gBattlerTarget] = MOVE_NONE;
if (GetBattlerAbility(gBattlerTarget) != ABILITY_GORILLA_TACTICS) if (GetBattlerAbility(gBattlerAttacker) != ABILITY_GORILLA_TACTICS)
gBattleStruct->choicedMove[gBattlerAttacker] = MOVE_NONE; gBattleStruct->choicedMove[gBattlerAttacker] = MOVE_NONE;
gBattlescriptCurrInstr = cmd->nextInstr; gBattlescriptCurrInstr = cmd->nextInstr;

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

@ -163,7 +163,7 @@ SINGLE_BATTLE_TEST("Liquid Ooze causes Dream Eater users to lose HP instead of h
} }
} }
SINGLE_BATTLE_TEST("Liquid Ooze does not cause Dream Eater users to lose HP instead of heal (Gen 3-4") SINGLE_BATTLE_TEST("Liquid Ooze does not cause Dream Eater users to lose HP instead of heal (Gen 3-4)")
{ {
s16 damage; s16 damage;
GIVEN { GIVEN {

4
test/battle/hold_effect/white_herb.c
View File

@ -151,7 +151,7 @@ SINGLE_BATTLE_TEST("White Herb wont have time to activate if it is knocked off o
} }
NONE_OF { NONE_OF {
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
MESSAGE("Wobbuffet returned its stats to normal using its White Herb!"); MESSAGE("Slugma returned its stats to normal using its White Herb!");
} }
} THEN { } THEN {
EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1); EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1);
@ -176,7 +176,7 @@ SINGLE_BATTLE_TEST("White Herb wont have time to activate if Magician steals it"
MESSAGE("The opposing Fennekin stole Slugma's White Herb!"); MESSAGE("The opposing Fennekin stole Slugma's White Herb!");
NONE_OF { NONE_OF {
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
MESSAGE("Wobbuffet returned its stats to normal using its White Herb!"); MESSAGE("Slugma returned its stats to normal using its White Herb!");
} }
} THEN { } THEN {
EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1); EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1);