From 9cd8d81412456f3fc3091b4293d44f8eac4df9fb Mon Sep 17 00:00:00 2001 From: SonikkuA-DatH <58025603+SonikkuA-DatH@users.noreply.github.com> Date: Sun, 18 Dec 2022 15:37:44 -0800 Subject: [PATCH] Update battle_scripts_1.s Fixed spacing --- data/battle_scripts_1.s | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index dc8e0758b..62ed5f2e1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -414,10 +414,10 @@ BattleScript_EffectTeatime:: attackanimation waitanimation BattleScript_TeatimeLoop: -jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul -jumpifrodaffected BS_TARGET, BattleScript_Teatimerod -jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb -jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor + jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul + jumpifrodaffected BS_TARGET, BattleScript_Teatimerod + jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb + jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor orword gHitMarker, HITMARKER_NO_ANIMATIONS setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries consumeberry BS_TARGET, TRUE @ consume the berry, then restore the item from changedItems @@ -426,23 +426,23 @@ jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_TeatimeLoop moveendcase MOVEEND_CLEAR_BITS - goto BattleScript_MoveEnd + goto BattleScript_MoveEnd BattleScript_Teatimevul: moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_TeatimeLoop moveendcase MOVEEND_CLEAR_BITS - goto BattleScript_MoveEnd + goto BattleScript_MoveEnd BattleScript_Teatimesorb: copybyte gBattlerAbility, gBattlerTarget call BattleScript_AbilityPopUp moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_TeatimeLoop moveendcase MOVEEND_CLEAR_BITS - goto BattleScript_MoveEnd + goto BattleScript_MoveEnd BattleScript_Teatimerod: copybyte gBattlerAbility, gBattlerTarget call BattleScript_AbilityPopUp - playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_BY_TWO + playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_BY_TWO setstatchanger STAT_SPATK, 1, FALSE statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TeatimeBuffer jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer @@ -451,11 +451,11 @@ BattleScript_Teatimerod: moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_TeatimeLoop moveendcase MOVEEND_CLEAR_BITS - goto BattleScript_MoveEnd + goto BattleScript_MoveEnd BattleScript_Teatimemotor: copybyte gBattlerAbility, gBattlerTarget call BattleScript_AbilityPopUp - playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_BY_TWO + playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_BY_TWO setstatchanger STAT_SPEED, 1, FALSE statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TeatimeBuffer jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer @@ -464,12 +464,12 @@ BattleScript_Teatimemotor: moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_TeatimeLoop moveendcase MOVEEND_CLEAR_BITS - goto BattleScript_MoveEnd + goto BattleScript_MoveEnd BattleScript_TeatimeBuffer: moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_TeatimeLoop moveendcase MOVEEND_CLEAR_BITS - goto BattleScript_MoveEnd + goto BattleScript_MoveEnd BattleScript_EffectShellSideArm: shellsidearmcheck