diff options
| -rw-r--r-- | data/battle/effect_command_pointers.asm | 2 | ||||
| -rw-r--r-- | data/moves/effects.asm | 124 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 8 | ||||
| -rw-r--r-- | macros/scripts/battle_commands.asm | 2 |
4 files changed, 69 insertions, 67 deletions
diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index 1b06eefe7..d5c044d78 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -20,7 +20,7 @@ BattleCommandPointers: dw BattleCommand_ApplyDamage dw BattleCommand_CriticalText dw BattleCommand_SuperEffectiveText - dw BattleCommand_CheckDestinyBond + dw BattleCommand_CheckFaint dw BattleCommand_BuildOpponentRage dw BattleCommand_PoisonTarget dw BattleCommand_SleepTarget diff --git a/data/moves/effects.asm b/data/moves/effects.asm index 81bd89f5f..8e5b5c173 100644 --- a/data/moves/effects.asm +++ b/data/moves/effects.asm @@ -17,7 +17,7 @@ NormalHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -47,7 +47,7 @@ PoisonHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage poisontarget endmove @@ -68,7 +68,7 @@ LeechHit: criticaltext supereffectivetext draintarget - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -89,7 +89,7 @@ BurnHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage burntarget endmove @@ -110,7 +110,7 @@ FreezeHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage freezetarget endmove @@ -131,7 +131,7 @@ ParalyzeHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage paralyzetarget endmove @@ -152,7 +152,7 @@ Selfdestruct: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -173,7 +173,7 @@ DreamEater: criticaltext supereffectivetext eatdream - checkdestinybond + checkfaint buildopponentrage endmove @@ -551,7 +551,7 @@ AttackDownHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage attackdown statdownmessage @@ -573,7 +573,7 @@ DefenseDownHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage effectchance ; bug: duplicate effectchance shouldn't be here defensedown @@ -596,7 +596,7 @@ SpeedDownHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage speeddown statdownmessage @@ -618,7 +618,7 @@ SpecialAttackDownHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage specialattackdown statdownmessage @@ -640,7 +640,7 @@ SpecialDefenseDownHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage specialdefensedown statdownmessage @@ -662,7 +662,7 @@ AccuracyDownHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage accuracydown statdownmessage @@ -684,7 +684,7 @@ EvasionDownHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage evasiondown statdownmessage @@ -706,7 +706,7 @@ DefenseUpHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage defenseup statupmessage @@ -728,7 +728,7 @@ AttackUpHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage attackup statupmessage @@ -750,7 +750,7 @@ AllUpHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage allstatsup endmove @@ -771,7 +771,7 @@ PayDay: criticaltext supereffectivetext payday - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -801,7 +801,7 @@ Bide: moveanim bidefailtext applydamage - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -824,7 +824,7 @@ Rampage: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -856,7 +856,7 @@ MultiHit: criticaltext cleartext supereffectivelooptext - checkdestinybond + checkfaint buildopponentrage endloop raisesub @@ -883,7 +883,7 @@ PoisonMultiHit: criticaltext cleartext supereffectivelooptext - checkdestinybond + checkfaint buildopponentrage endloop raisesub @@ -907,7 +907,7 @@ FlinchHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage flinchtarget endmove @@ -923,7 +923,7 @@ OHKOHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage endmove @@ -943,7 +943,7 @@ RecoilHit: criticaltext supereffectivetext recoil - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -987,7 +987,7 @@ ConfuseHit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage confusetarget endmove @@ -1029,7 +1029,7 @@ TriAttack: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage tristatuschance endmove @@ -1073,7 +1073,7 @@ SkyAttack: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage flinchtarget kingsrock @@ -1102,7 +1102,7 @@ HyperBeam: criticaltext supereffectivetext rechargenextturn - checkdestinybond + checkfaint buildopponentrage endmove @@ -1123,7 +1123,7 @@ Rage: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1183,7 +1183,7 @@ RazorWind: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1206,7 +1206,7 @@ Fly: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1227,7 +1227,7 @@ TrapTarget: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage traptarget endmove @@ -1244,7 +1244,7 @@ StaticDamage: moveanim failuretext applydamage - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1260,7 +1260,7 @@ Reversal: failuretext applydamage supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1273,7 +1273,7 @@ Counter: moveanim failuretext applydamage - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1311,7 +1311,7 @@ Snore: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage flinchtarget kingsrock @@ -1385,7 +1385,7 @@ FalseSwipe: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1417,7 +1417,7 @@ TripleKick: criticaltext cleartext supereffectivelooptext - checkdestinybond + checkfaint buildopponentrage kickcounter endloop @@ -1442,7 +1442,7 @@ Thief: criticaltext supereffectivetext thief - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1478,7 +1478,7 @@ FlameWheel: criticaltext supereffectivetext defrost - checkdestinybond + checkfaint buildopponentrage burntarget endmove @@ -1550,7 +1550,7 @@ Rollout: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1589,7 +1589,7 @@ FuryCutter: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1618,7 +1618,7 @@ Return: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1639,7 +1639,7 @@ Present: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1660,7 +1660,7 @@ Frustration: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1689,7 +1689,7 @@ SacredFire: criticaltext supereffectivetext defrost - checkdestinybond + checkfaint buildopponentrage burntarget endmove @@ -1711,7 +1711,7 @@ Magnitude: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1739,7 +1739,7 @@ Pursuit: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1760,7 +1760,7 @@ RapidSpin: criticaltext supereffectivetext clearhazards - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1801,7 +1801,7 @@ HiddenPower: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1852,7 +1852,7 @@ MirrorCoat: moveanim failuretext applydamage - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -1874,7 +1874,7 @@ SkullBash: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endturn @@ -1899,7 +1899,7 @@ Twister: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage flinchtarget endmove @@ -1921,7 +1921,7 @@ Earthquake: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage endmove @@ -1938,7 +1938,7 @@ FutureSight: moveanimnosub failuretext applydamage - checkdestinybond + checkfaint buildopponentrage endmove @@ -1958,7 +1958,7 @@ Gust: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage endmove @@ -1979,7 +1979,7 @@ Stomp: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage flinchtarget endmove @@ -2002,7 +2002,7 @@ Solarbeam: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage kingsrock endmove @@ -2024,7 +2024,7 @@ Thunder: applydamage criticaltext supereffectivetext - checkdestinybond + checkfaint buildopponentrage paralyzetarget endmove @@ -2055,7 +2055,7 @@ BeatUp: criticaltext cleartext supereffectivetext - checkdestinybond + checkfaint buildopponentrage endloop beatupfailtext diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 4f34b5be6..91c021a72 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -2363,10 +2363,12 @@ BattleCommand_SuperEffectiveText: .print jp StdBattleTextBox -BattleCommand_CheckDestinyBond: -; checkdestinybond +BattleCommand_CheckFaint: +; checkfaint -; Faint the user if it fainted an opponent using Destiny Bond. +; Faint the opponent if its HP reached zero +; and faint the user along with it if it used Destiny Bond. +; Ends the move effect if the opponent faints. ld hl, wEnemyMonHP ld a, [hBattleTurn] diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 48e034bdf..919d6e00f 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -21,7 +21,7 @@ ENDM command applydamage ; 0e command criticaltext ; 0f command supereffectivetext ; 10 - command checkdestinybond ; 11 + command checkfaint ; 11 command buildopponentrage ; 12 command poisontarget ; 13 command sleeptarget ; 14 |