From 81bb299e7f5952e1a7c596ca9d4643a987d46d9f Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 13 Jun 2023 06:50:12 -0300 Subject: [PATCH] Updated Axe Kick's battle script I have no idea why is this working now when I'm pretty sure it didn't work before, but I consider this a win all the same. --- data/battle_scripts_1.s | 48 +---------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 25b935a00..41689d297 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -436,54 +436,8 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectAxeKick @ EFFECT_AXE_KICK BattleScript_EffectAxeKick:: - attackcanceler - accuracycheck BattleScript_AxeKickMissedDoDamage, ACC_CURR_MOVE - typecalc - jumpifhalfword CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_AxeKickMissedDoDamage - goto BattleScript_AxeKickHitFromAtkString -BattleScript_AxeKickMissedDoDamage:: - jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_PrintMoveMissed - attackstring - ppreduce - pause B_WAIT_TIME_LONG - resultmessage - waitmessage B_WAIT_TIME_LONG - printstring STRINGID_PKMNCRASHED - waitmessage B_WAIT_TIME_LONG - damagecalc - typecalc - adjustdamage - manipulatedamage DMG_RECOIL_FROM_MISS - bichalfword gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE - orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE - healthbarupdate BS_ATTACKER - datahpupdate BS_ATTACKER - tryfaintmon BS_ATTACKER - orhalfword gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE - goto BattleScript_MoveEnd - -BattleScript_AxeKickHitFromAtkString: - attackstring - ppreduce - critcalc - damagecalc - adjustdamage - attackanimation - waitanimation - effectivenesssound - hitanimation BS_TARGET - waitstate - healthbarupdate BS_TARGET - datahpupdate BS_TARGET - critmessage - waitmessage B_WAIT_TIME_LONG - resultmessage - waitmessage B_WAIT_TIME_LONG setmoveeffect MOVE_EFFECT_CONFUSION - seteffectwithchance - tryfaintmon BS_TARGET - moveendall - end + goto BattleScript_EffectRecoilIfMiss BattleScript_EffectTakeHeart:: attackcanceler