ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update battle_scripts_1.s

Browse Source 
Fixed spacing
This commit is contained in:
SonikkuA-DatH 2022-12-18 15:37:44 -08:00 committed by GitHub
parent 9d14cb3309
commit 9cd8d81412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
data/battle_scripts_1.s
View File

@ -414,10 +414,10 @@ BattleScript_EffectTeatime::
attackanimation attackanimation
waitanimation waitanimation
BattleScript_TeatimeLoop: BattleScript_TeatimeLoop:
jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul
jumpifrodaffected BS_TARGET, BattleScript_Teatimerod jumpifrodaffected BS_TARGET, BattleScript_Teatimerod
jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb
jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor
orword gHitMarker, HITMARKER_NO_ANIMATIONS orword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries
consumeberry BS_TARGET, TRUE @ consume the berry, then restore the item from changedItems 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 moveendto MOVEEND_NEXT_TARGET
jumpifnexttargetvalid BattleScript_TeatimeLoop jumpifnexttargetvalid BattleScript_TeatimeLoop
moveendcase MOVEEND_CLEAR_BITS moveendcase MOVEEND_CLEAR_BITS
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_Teatimevul: BattleScript_Teatimevul:
moveendto MOVEEND_NEXT_TARGET moveendto MOVEEND_NEXT_TARGET
jumpifnexttargetvalid BattleScript_TeatimeLoop jumpifnexttargetvalid BattleScript_TeatimeLoop
moveendcase MOVEEND_CLEAR_BITS moveendcase MOVEEND_CLEAR_BITS
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_Teatimesorb: BattleScript_Teatimesorb:
copybyte gBattlerAbility, gBattlerTarget copybyte gBattlerAbility, gBattlerTarget
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
moveendto MOVEEND_NEXT_TARGET moveendto MOVEEND_NEXT_TARGET
jumpifnexttargetvalid BattleScript_TeatimeLoop jumpifnexttargetvalid BattleScript_TeatimeLoop
moveendcase MOVEEND_CLEAR_BITS moveendcase MOVEEND_CLEAR_BITS
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_Teatimerod: BattleScript_Teatimerod:
copybyte gBattlerAbility, gBattlerTarget copybyte gBattlerAbility, gBattlerTarget
call BattleScript_AbilityPopUp 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 setstatchanger STAT_SPATK, 1, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TeatimeBuffer statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TeatimeBuffer
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer
@ -451,11 +451,11 @@ BattleScript_Teatimerod:
moveendto MOVEEND_NEXT_TARGET moveendto MOVEEND_NEXT_TARGET
jumpifnexttargetvalid BattleScript_TeatimeLoop jumpifnexttargetvalid BattleScript_TeatimeLoop
moveendcase MOVEEND_CLEAR_BITS moveendcase MOVEEND_CLEAR_BITS
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_Teatimemotor: BattleScript_Teatimemotor:
copybyte gBattlerAbility, gBattlerTarget copybyte gBattlerAbility, gBattlerTarget
call BattleScript_AbilityPopUp 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 setstatchanger STAT_SPEED, 1, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TeatimeBuffer statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TeatimeBuffer
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer
@ -464,12 +464,12 @@ BattleScript_Teatimemotor:
moveendto MOVEEND_NEXT_TARGET moveendto MOVEEND_NEXT_TARGET
jumpifnexttargetvalid BattleScript_TeatimeLoop jumpifnexttargetvalid BattleScript_TeatimeLoop
moveendcase MOVEEND_CLEAR_BITS moveendcase MOVEEND_CLEAR_BITS
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_TeatimeBuffer: BattleScript_TeatimeBuffer:
moveendto MOVEEND_NEXT_TARGET moveendto MOVEEND_NEXT_TARGET
jumpifnexttargetvalid BattleScript_TeatimeLoop jumpifnexttargetvalid BattleScript_TeatimeLoop
moveendcase MOVEEND_CLEAR_BITS moveendcase MOVEEND_CLEAR_BITS
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectShellSideArm: BattleScript_EffectShellSideArm:
shellsidearmcheck shellsidearmcheck