From 5bde98741ae2156d2d2c51ad30c3219d13e0b3d5 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 29 Mar 2023 00:21:09 -0300 Subject: [PATCH] Completed Take Heart's effect It was missing its "heals any status condition" effect because I'm dumb and I forgot to actually go and do it. --- data/battle_scripts_1.s | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 21d952674b..c3d0055d8a 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -479,10 +479,22 @@ BattleScript_AxeKickHitFromAtkString: end BattleScript_EffectTakeHeart:: - printstring STRINGID_EMPTYSTRING3 + attackcanceler + accuracycheck BattleScript_AxeKickMissedDoDamage, ACC_CURR_MOVE + attackstring + ppreduce + attackanimation + waitanimation + jumpifstatus BS_ATTACKER, STATUS1_ANY, BattleScript_TakeHeart_HealStatusConditions + goto BattleScript_TakeHeart_TryToRaiseSpecialStats +BattleScript_TakeHeart_HealStatusConditions: + curestatus BS_ATTACKER + updatestatusicon BS_ATTACKER + printstring STRINGID_PKMNSTATUSNORMAL + waitmessage B_WAIT_TIME_LONG +BattleScript_TakeHeart_TryToRaiseSpecialStats: modifybattlerstatstage BS_ATTACKER, STAT_SPATK, INCREASE, 1, BattleScript_TakeHeartTrySpDef, ANIM_ON BattleScript_TakeHeartTrySpDef: - printstring STRINGID_EMPTYSTRING3 modifybattlerstatstage BS_ATTACKER, STAT_SPDEF, INCREASE, 1, BattleScript_TakeHeart_MoveEnd, ANIM_ON BattleScript_TakeHeart_MoveEnd: goto BattleScript_MoveEnd