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

Fix Synchronoise typeless behavior in Gen7+ (#9031)

Browse Source
This commit is contained in:
GGbond 2026-01-27 22:39:59 +08:00 committed by GitHub
parent c468c9a5f7
commit e0fb60ba09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/battle_util.c
View File

@ -9409,19 +9409,23 @@ bool32 TryBattleFormChange(u32 battler, enum FormChanges method)
bool32 DoBattlersShareType(u32 battler1, u32 battler2)
{
s32 i;
s32 j;
enum Type types1[3], types2[3];
GetBattlerTypes(battler1, FALSE, types1);
GetBattlerTypes(battler2, FALSE, types2);
if (types1[2] == TYPE_MYSTERY)
types1[2] = types1[0];
if (types2[2] == TYPE_MYSTERY)
types2[2] = types2[0];
for (i = 0; i < 3; i++)
{
if (types1[i] == types2[0] || types1[i] == types2[1] || types1[i] == types2[2])
return TRUE;
if (types1[i] == TYPE_MYSTERY)
continue;
for (j = 0; j < 3; j++)
{
if (types2[j] == TYPE_MYSTERY)
continue;
if (types1[i] == types2[j])
return TRUE;
}
}
return FALSE;

42
test/battle/move_effect/synchronoise.c
View File

@ -1,6 +1,17 @@
#include "global.h"
#include "test/battle.h"
ASSUMPTIONS
{
ASSUME(GetMoveEffect(MOVE_SYNCHRONOISE) == EFFECT_SYNCHRONOISE);
ASSUME(GetSpeciesType(SPECIES_WOBBUFFET, 0) == TYPE_PSYCHIC);
ASSUME(GetSpeciesType(SPECIES_WOBBUFFET, 1) == TYPE_PSYCHIC);
ASSUME(GetSpeciesType(SPECIES_BULBASAUR, 0) == TYPE_GRASS);
ASSUME(GetSpeciesType(SPECIES_BULBASAUR, 1) == TYPE_POISON);
ASSUME(GetSpeciesType(SPECIES_ARCANINE, 0) == TYPE_FIRE);
ASSUME(GetSpeciesType(SPECIES_ARCANINE, 1) == TYPE_FIRE);
}
DOUBLE_BATTLE_TEST("Synchronoise hits all Pokemon that share a type with the attacker")
{
GIVEN {
@ -71,4 +82,35 @@ DOUBLE_BATTLE_TEST("Synchronoise will fail if the corresponding typing mon prote
}
}
DOUBLE_BATTLE_TEST("Synchronoise will fail for a typeless user even if a target is typeless")
{
GIVEN {
ASSUME(GetMoveEffect(MOVE_BURN_UP) == EFFECT_FAIL_IF_NOT_ARG_TYPE);
PLAYER(SPECIES_ARCANINE) { Moves(MOVE_BURN_UP, MOVE_SYNCHRONOISE); }
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_ARCANINE) { Moves(MOVE_BURN_UP, MOVE_CELEBRATE); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN {
MOVE(playerLeft, MOVE_BURN_UP, target: opponentRight);
MOVE(opponentLeft, MOVE_BURN_UP, target: playerRight);
MOVE(playerRight, MOVE_CELEBRATE);
MOVE(opponentRight, MOVE_CELEBRATE);
}
TURN {
MOVE(playerLeft, MOVE_SYNCHRONOISE);
MOVE(opponentLeft, MOVE_CELEBRATE);
MOVE(playerRight, MOVE_CELEBRATE);
MOVE(opponentRight, MOVE_CELEBRATE);
}
} SCENE {
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_SYNCHRONOISE, playerLeft);
MESSAGE("Arcanine used Synchronoise!");
MESSAGE("It doesn't affect the opposing Arcanine…");
MESSAGE("It doesn't affect Wobbuffet…");
MESSAGE("It doesn't affect the opposing Wobbuffet…");
NOT MESSAGE("But it failed!");
}
}
TO_DO_BATTLE_TEST("TODO: Write Synchronoise (Move Effect) test titles")