From 5a740c7461fd7652dea077f1e6894b7e0a878ef0 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 27 Feb 2023 22:18:42 -0500 Subject: [PATCH 1/3] dont overwrite gbattlerAttacker in TryChangeBattleTerrain, update BattleScript_ActivateTerrainAbilities loop iterator --- data/battle_scripts_1.s | 10 +++++----- src/battle_util.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index e8b751777b..f8e24cb91a 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8803,14 +8803,14 @@ BattleScript_ActivateSwitchInAbilities_Increment: return BattleScript_ActivateTerrainAbilities: - copybyte sBATTLER, gBattlerAttacker - setbyte gBattlerAttacker, 0 + savetarget + setbyte gBattlerTarget, 0 BattleScript_ActivateTerrainAbilities_Loop: activateterrainchangeabilities BS_ATTACKER BattleScript_ActivateTerrainAbilities_Increment: - addbyte gBattlerAttacker, 1 - jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_ActivateTerrainAbilities_Loop - copybyte gBattlerAttacker, sBATTLER + addbyte gBattlerTarget, 1 + jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_ActivateTerrainAbilities_Loop + restoretarget return BattleScript_ElectricSurgeActivates:: diff --git a/src/battle_util.c b/src/battle_util.c index 1625ff919c..fc30547e60 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4205,7 +4205,7 @@ static bool32 TryChangeBattleTerrain(u32 battler, u32 statusFlag, u8 *timer) else *timer = 5; - gBattlerAttacker = gBattleScripting.battler = battler; + gBattleScripting.battler = battler; return TRUE; } From b399d1e8c5529fc311c93c281a4a8eea51ccfd77 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 27 Feb 2023 22:29:23 -0500 Subject: [PATCH 2/3] fix ABILITYEFFECT_ON_TERRAIN battler Id settings --- src/battle_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index fc30547e60..ddc3eaa1a2 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6230,7 +6230,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move } break; case ABILITYEFFECT_ON_TERRAIN: // For ability effects that activate when the field terrain changes. - battler = gBattlerAbility = gBattleScripting.battler; gLastUsedAbility = GetBattlerAbility(battler); switch (gLastUsedAbility) { @@ -6239,6 +6238,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move { gSpecialStatuses[battler].terrainAbilityDone = TRUE; ChangeTypeBasedOnTerrain(battler); + gBattlerAbility = gBattleScripting.battler = battler; BattleScriptPushCursorAndCallback(BattleScript_MimicryActivates_End3); effect++; } @@ -6247,6 +6247,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move if (!gSpecialStatuses[battler].terrainAbilityDone && IsBattlerTerrainAffected(battler, STATUS_FIELD_ELECTRIC_TERRAIN)) { gSpecialStatuses[battler].terrainAbilityDone = TRUE; + gBattlerAbility = gBattleScripting.battler = battler; PREPARE_STAT_BUFFER(gBattleTextBuff1, GetHighestStatId(battler)); BattleScriptPushCursorAndCallback(BattleScript_QuarkDriveActivates); effect++; From ba03992abd990b92998580c119bbb1383cade1c6 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 24 Sep 2023 14:28:06 +0200 Subject: [PATCH 3/3] test for seed sower --- test/battle/ability/seed_sower.c | 112 +++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 test/battle/ability/seed_sower.c diff --git a/test/battle/ability/seed_sower.c b/test/battle/ability/seed_sower.c new file mode 100644 index 0000000000..7f535cd53c --- /dev/null +++ b/test/battle/ability/seed_sower.c @@ -0,0 +1,112 @@ +#include "global.h" +#include "test/battle.h" + +SINGLE_BATTLE_TEST("Seed Sower sets up Grassy Terrain when hit by an attack") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SEED_SOWER); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); } + } SCENE { + MESSAGE("Foe Wobbuffet used Tackle!"); + HP_BAR(player); + ABILITY_POPUP(player); + MESSAGE("Grass grew to cover the battlefield!"); + } +} + +#define ABILITY_PARAM(n)(abilities[n] = (k == n) ? ABILITY_SEED_SOWER : ABILITY_SHADOW_TAG) +#define MOVE_HIT(target, position) \ +{ \ + HP_BAR(target); \ + if (abilities[position] == ABILITY_SEED_SOWER) { \ + ABILITY_POPUP(target); \ + MESSAGE("Grass grew to cover the battlefield!");\ + } \ +} + +DOUBLE_BATTLE_TEST("Multi-target moves hit correct battlers after Seed Sower is triggered") // #2796 +{ + u32 j, k, l; + u16 usedMove; + static const u16 moves[] = {MOVE_HYPER_VOICE, MOVE_SURF}; + u16 abilities[MAX_BATTLERS_COUNT]; + u8 attacker; + + for (j = 0; j < ARRAY_COUNT(moves); j++) + { + for (k = 0; k < MAX_BATTLERS_COUNT; k++) + { + for (l = 0; l < MAX_BATTLERS_COUNT; l++) + { + PARAMETRIZE { attacker = l; usedMove = moves[j]; ABILITY_PARAM(0); ABILITY_PARAM(1); ABILITY_PARAM(2); ABILITY_PARAM(3); } + } + } + } + + GIVEN { + ASSUME(gBattleMoves[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); + ASSUME(gBattleMoves[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY); + PLAYER(SPECIES_WYNAUT) { Ability(abilities[B_POSITION_PLAYER_LEFT]); } + PLAYER(SPECIES_WOBBUFFET) { Ability(abilities[B_POSITION_PLAYER_RIGHT]); } + OPPONENT(SPECIES_WYNAUT) { Ability(abilities[B_POSITION_OPPONENT_LEFT]); } + OPPONENT(SPECIES_WOBBUFFET) { Ability(abilities[B_POSITION_OPPONENT_RIGHT]); } + } WHEN { + TURN { + MOVE(opponentLeft, (attacker == B_POSITION_OPPONENT_LEFT) ? usedMove : MOVE_CELEBRATE); + MOVE(opponentRight, (attacker == B_POSITION_OPPONENT_RIGHT) ? usedMove : MOVE_CELEBRATE); + MOVE(playerLeft, (attacker == B_POSITION_PLAYER_LEFT) ? usedMove : MOVE_CELEBRATE); + MOVE(playerRight, (attacker == B_POSITION_PLAYER_RIGHT) ? usedMove : MOVE_CELEBRATE); + } + } SCENE { + // ANIMATION(ANIM_TYPE_MOVE, usedMove); + if (usedMove == MOVE_HYPER_VOICE) { + if ((attacker & BIT_SIDE) == B_SIDE_OPPONENT) { + MOVE_HIT(playerLeft, B_POSITION_PLAYER_LEFT); + MOVE_HIT(playerRight, B_POSITION_PLAYER_RIGHT); + NONE_OF { + HP_BAR(opponentLeft); + HP_BAR(opponentRight); + } + } else { + MOVE_HIT(opponentLeft, B_POSITION_OPPONENT_LEFT); + MOVE_HIT(opponentRight, B_POSITION_OPPONENT_RIGHT); + NONE_OF { + HP_BAR(playerLeft); + HP_BAR(playerRight); + } + } + } else { // SURF + switch (attacker) { + case B_POSITION_PLAYER_LEFT: + MOVE_HIT(opponentLeft, B_POSITION_OPPONENT_LEFT); + MOVE_HIT(playerRight, B_POSITION_PLAYER_RIGHT); + MOVE_HIT(opponentRight, B_POSITION_OPPONENT_RIGHT); + NOT HP_BAR(playerLeft); + break; + case B_POSITION_OPPONENT_LEFT: + MOVE_HIT(playerLeft, B_POSITION_PLAYER_LEFT); + MOVE_HIT(playerRight, B_POSITION_PLAYER_RIGHT); + MOVE_HIT(opponentRight, B_POSITION_OPPONENT_RIGHT); + NOT HP_BAR(opponentLeft); + break; + case B_POSITION_PLAYER_RIGHT: + MOVE_HIT(playerLeft, B_POSITION_PLAYER_LEFT); + MOVE_HIT(opponentLeft, B_POSITION_OPPONENT_LEFT); + MOVE_HIT(opponentRight, B_POSITION_OPPONENT_RIGHT); + NOT HP_BAR(playerRight); + break; + case B_POSITION_OPPONENT_RIGHT: + MOVE_HIT(playerLeft, B_POSITION_OPPONENT_LEFT); + MOVE_HIT(opponentLeft, B_POSITION_OPPONENT_LEFT); + MOVE_HIT(playerRight, B_POSITION_PLAYER_RIGHT); + NOT HP_BAR(opponentRight); + break; + } + } + } +} + +#undef ABILITY_PARAM +#undef MOVE_HIT