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

Reverts wrongly done gem fix and renames struggle effect (#6806)

Browse Source
This commit is contained in:
Alex 2025-05-15 10:45:48 +02:00 committed by GitHub
parent 75cd16dae0
commit a086d5f592
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -5229,7 +5229,7 @@ BattleScript_EffectSnatch::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectRecoilHP25::
BattleScript_EffectStruggle::
jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit
incrementgamestat GAME_STAT_USED_STRUGGLE
goto BattleScript_EffectHit

2
include/battle_scripts.h
View File

@ -816,7 +816,7 @@ extern const u8 BattleScript_MoveEffectEerieSpell[];
extern const u8 BattleScript_EffectJungleHealing[];
extern const u8 BattleScript_EffectCoaching[];
extern const u8 BattleScript_EffectDecorate[];
extern const u8 BattleScript_EffectRecoilHP25[];
extern const u8 BattleScript_EffectStruggle[];
extern const u8 BattleScript_EffectStuffCheeks[];
extern const u8 BattleScript_MoveEffectLightScreen[];
extern const u8 BattleScript_MoveEffectReflect[];

2
include/constants/battle_move_effects.h
View File

@ -292,7 +292,7 @@ enum {
EFFECT_DYNAMAX_DOUBLE_DMG,
EFFECT_DECORATE,
EFFECT_SNIPE_SHOT,
EFFECT_RECOIL_HP_25,
EFFECT_STRUGGLE,
EFFECT_STUFF_CHEEKS,
EFFECT_GRAV_APPLE,
EFFECT_HYPERSPACE_FURY,

6
src/battle_main.c
View File

@ -6074,10 +6074,12 @@ void SetTypeBeforeUsingMove(u32 move, u32 battler)
gBattleStruct->dynamicMoveType = TYPE_ELECTRIC | F_DYNAMIC_TYPE_SET;
// Check if a gem should activate.
u32 effect = GetMoveEffect(move);
if (holdEffect == HOLD_EFFECT_GEMS
&& GetBattleMoveType(move) == ItemId_GetSecondaryId(heldItem)
&& GetMoveEffect(move) != EFFECT_PLEDGE
&& GetMovePower(move) > 1)
&& effect != EFFECT_PLEDGE
&& effect != EFFECT_OHKO
&& effect != EFFECT_STRUGGLE)
{
gSpecialStatuses[battler].gemParam = GetBattlerHoldEffectParam(battler);
gSpecialStatuses[battler].gemBoost = TRUE;

3
src/battle_script_commands.c
View File

@ -2201,8 +2201,7 @@ static void Cmd_adjustdamage(void)
if (gSpecialStatuses[gBattlerAttacker].gemBoost
&& !(gBattleStruct->moveResultFlags[gBattlerTarget] & MOVE_RESULT_NO_EFFECT)
&& !(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE)
&& gBattleMons[gBattlerAttacker].item
&& gCurrentMove != MOVE_STRUGGLE)
&& gBattleMons[gBattlerAttacker].item)
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_GemActivates;

4
src/data/battle_move_effects.h
View File

@ -1876,9 +1876,9 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] =
.battleTvScore = 0, // TODO: Assign points
},
[EFFECT_RECOIL_HP_25] =
[EFFECT_STRUGGLE] =
{
.battleScript = BattleScript_EffectRecoilHP25,
.battleScript = BattleScript_EffectStruggle,
.battleTvScore = 0, // TODO: Assign points
},

2
src/data/moves_info.h
View File

@ -4333,7 +4333,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
"Used only if all PP are gone.\n"
"Also hurts the user a little."),
#if B_UPDATED_MOVE_DATA >= GEN_4
.effect = EFFECT_RECOIL_HP_25,
.effect = EFFECT_STRUGGLE,
.accuracy = 0,
.mirrorMoveBanned = TRUE,
.additionalEffects = ADDITIONAL_EFFECTS({

16
test/battle/hold_effect/gems.c
View File

@ -87,19 +87,3 @@ SINGLE_BATTLE_TEST("Gem is consumed if the move type is changed")
ANIMATION(ANIM_TYPE_MOVE, MOVE_FEINT_ATTACK, player);
}
}
SINGLE_BATTLE_TEST("Gem is not consumed if a no type damage move is used") //ie. Counter, Psywave, Super Fang. All these moves have 1 base power.
{
ASSUME(GetMovePower(MOVE_PSYWAVE) == 1);
GIVEN {
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_PSYCHIC_GEM); };
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_PSYWAVE); }
} SCENE {
NONE_OF {
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
MESSAGE("The Psychic Gem strengthened Wobbuffet's power!");
}
}
}