From 95d41524a2e69453a6e739cfd8cb9b5c8b5b6af1 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 9 May 2021 18:15:24 -0300 Subject: [PATCH 1/3] Implemented Clanging Scales' effect --- data/battle_scripts_1.s | 5 +++++ include/constants/battle_move_effects.h | 3 ++- src/data/battle_moves.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 9c4172861f..f4ca9abf8b 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -365,6 +365,11 @@ gBattleScriptsForMoveEffects:: @ 82D86A8 .4byte BattleScript_EffectFairyLock .4byte BattleScript_EffectAllySwitch .4byte BattleScript_EffectSleepHit + .4byte BattleScript_EffectAttackerDefenseDownHit + +BattleScript_EffectAttackerDefenseDownHit: + setmoveeffect MOVE_EFFECT_DEF_MINUS_1 | MOVE_EFFECT_AFFECTS_USER + goto BattleScript_EffectHit BattleScript_EffectSleepHit: setmoveeffect MOVE_EFFECT_SLEEP diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 74418d2c73..323e7eb32a 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -351,7 +351,8 @@ #define EFFECT_FAIRY_LOCK 345 #define EFFECT_ALLY_SWITCH 346 #define EFFECT_SLEEP_HIT 347 // Relic Song +#define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 348 -#define NUM_BATTLE_MOVE_EFFECTS 348 +#define NUM_BATTLE_MOVE_EFFECTS 349 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index c8203aa0e4..f7e645414d 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10044,7 +10044,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_CLANGING_SCALES] = { - .effect = EFFECT_DEFENSE_DOWN_HIT, + .effect = EFFECT_ATTACKER_DEFENSE_DOWN_HIT, .power = 110, .type = TYPE_DRAGON, .accuracy = 100, From a60fd31b9f37457daedee6f81c7046b62153e0ac Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 2 Jun 2021 16:42:02 -0300 Subject: [PATCH 2/3] Added the MOVE_EFFECT_CERTAIN arg to BattleScript_EffectAttackerDefenseDownHit Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- data/battle_scripts_1.s | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index f4ca9abf8b..549a882a0f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -368,7 +368,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8 .4byte BattleScript_EffectAttackerDefenseDownHit BattleScript_EffectAttackerDefenseDownHit: - setmoveeffect MOVE_EFFECT_DEF_MINUS_1 | MOVE_EFFECT_AFFECTS_USER + setmoveeffect MOVE_EFFECT_DEF_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN goto BattleScript_EffectHit BattleScript_EffectSleepHit: @@ -7950,4 +7950,3 @@ BattleScript_JabocaRowapBerryActivate_Dmg: call BattleScript_HurtAttacker removeitem BS_TARGET return - From 586c76d93affb98dc544357858a7de729c1fdead Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 2 Jun 2021 16:46:28 -0300 Subject: [PATCH 3/3] Changed Clanging Scales' secondaryEffectChance to 0 Review request. --- src/data/battle_moves.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index f7e645414d..5284622fc0 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10049,7 +10049,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .type = TYPE_DRAGON, .accuracy = 100, .pp = 5, - .secondaryEffectChance = 100, + .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SOUND,