Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2691 from DizzyEggg/clang_scales

Browse Source 
Fix Clanging Scales target and effect
This commit is contained in:
ghoulslash authored and GitHub committed 2023-02-16 09:13:33 -05:00
2 parents 8c81cf1e66 4c18ed2bd4
commit 60a3da5811
2 files changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/battle_scripts_1.s
+4
View File
@@ -1283,8 +1283,12 @@ BattleScript_JungleHealingTryRestoreAlly:
goto BattleScript_MoveEnd
BattleScript_EffectAttackerDefenseDownHit:
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_NoMoveEffect
setmoveeffect MOVE_EFFECT_DEF_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_NoMoveEffect:
setmoveeffect 0
goto BattleScript_EffectHit
BattleScript_EffectRelicSong:
setmoveeffect MOVE_EFFECT_RELIC_SONG | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
src/data/battle_moves.h
+1 -1
View File
@@ -11554,7 +11554,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.accuracy = 100,
.pp = 5,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.target = MOVE_TARGET_BOTH,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SOUND,
.split = SPLIT_SPECIAL,