Skip to content

Commit f9c826c

Browse files
hedara90hedara90
authored
Merge pull request #2228 from hedara90/fix-spaces
Fix spaces instead of tabs in battle_anim_scripts.s
1 parent f0b5abe commit f9c826c

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎data/battle_anim_scripts.s‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ FuryCutterStrong:
14521452
complex_palette_blend unused_anim_battler=ANIM_ATTACKER, unused_subpriority_offset=2, selector=F_PAL_BG | F_PAL_BATTLERS, delay=3, num_blends=3, color1=RGB(9, 8, 10), blend_y1=4, color2=RGB_BLACK, blend_y2=0
14531453
goto FuryCutterContinue2
14541454
FuryCutterStrongest:
1455-
complex_palette_blend unused_anim_battler=ANIM_ATTACKER, unused_subpriority_offset=2, selector=F_PAL_BG | F_PAL_BATTLERS, delay=3, num_blends=3, color1=RGB(9, 8, 10), blend_y1=4, color2=RGB_BLACK, blend_y2=0
1455+
complex_palette_blend unused_anim_battler=ANIM_ATTACKER, unused_subpriority_offset=2, selector=F_PAL_BG | F_PAL_BATTLERS, delay=3, num_blends=3, color1=RGB(9, 8, 10), blend_y1=4, color2=RGB_BLACK, blend_y2=0
14561456
goto FuryCutterContinue2
14571457

14581458
Move_SELF_DESTRUCT:
@@ -2054,7 +2054,7 @@ Move_CONFUSE_RAY:
20542054
fadetobg BG_GHOST
20552055
waitbgfadein
20562056
createvisualtask SoundTask_AdjustPanningVar, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0
2057-
blend_color_cyclebytag tag=ANIM_TAG_YELLOW_BALL, delay=0, num_blends=6, initial_blend_y=0, target_blend_y=14, color=RGB(31, 10, 0)
2057+
blend_color_cyclebytag tag=ANIM_TAG_YELLOW_BALL, delay=0, num_blends=6, initial_blend_y=0, target_blend_y=14, color=RGB(31, 10, 0)
20582058
createsprite gConfuseRayBallBounceSpriteTemplate, ANIM_TARGET, 2, 28, 0, 288
20592059
waitforvisualfinish
20602060
setalpha 8, 8
@@ -2097,7 +2097,7 @@ Move_MEAN_LOOK:
20972097

20982098
Move_ROCK_THROW:
20992099
loadspritegfx ANIM_TAG_ROCKS
2100-
shake_mon_or_platform unused_anim_battler=ANIM_TARGET, velocity=6, shake_timer=1, shake_duration=15, type=SHAKE_BG_Y
2100+
shake_mon_or_platform unused_anim_battler=ANIM_TARGET, velocity=6, shake_timer=1, shake_duration=15, type=SHAKE_BG_Y
21012101
createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 0, 1, 0, 0
21022102
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
21032103
delay 6
@@ -2119,7 +2119,7 @@ Move_ROCK_THROW:
21192119
Move_ROCK_SLIDE:
21202120
loadspritegfx ANIM_TAG_ROCKS
21212121
monbg ANIM_DEF_PARTNER
2122-
shake_mon_or_platform velocity=7, shake_timer=1, shake_duration=11, type=SHAKE_BG_Y
2122+
shake_mon_or_platform velocity=7, shake_timer=1, shake_duration=11, type=SHAKE_BG_Y
21232123
createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -5, 1, -5, 1
21242124
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
21252125
delay 2
@@ -2909,7 +2909,7 @@ Move_BARRAGE:
29092909
createvisualtask AnimTask_BarrageBall, 3
29102910
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
29112911
delay 24
2912-
shake_mon_or_platform velocity=8, shake_timer=1, shake_duration=40, type=SHAKE_BG_Y
2912+
shake_mon_or_platform velocity=8, shake_timer=1, shake_duration=40, type=SHAKE_BG_Y
29132913
createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1
29142914
createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1
29152915
loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 2
@@ -3660,7 +3660,7 @@ Move_SUPERPOWER:
36603660
createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 2, ANIM_ATTACKER
36613661
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
36623662
delay 20
3663-
shake_mon_or_platform velocity=4, shake_timer=1, shake_duration=180, type=SHAKE_BG_Y
3663+
shake_mon_or_platform velocity=4, shake_timer=1, shake_duration=180, type=SHAKE_BG_Y
36643664
createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_EARTHQUAKE, 0
36653665
delay 40
36663666
createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 200, 96, 1, 120
@@ -4769,7 +4769,7 @@ Move_THUNDER:
47694769
waitbgfadein
47704770
simple_palette_blend selector=F_PAL_BG, delay=2, initial_blend_y=0, target_blend_y=16, color=RGB_BLACK
47714771
delay 16
4772-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4772+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
47734773
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
47744774
delay 1
47754775
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, -36
@@ -4786,17 +4786,17 @@ Move_THUNDER:
47864786
createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, 16
47874787
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
47884788
delay 5
4789-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4789+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
47904790
delay 1
47914791
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 24, -32
47924792
delay 1
47934793
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 24, -16
47944794
delay 1
47954795
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 24, 16
47964796
delay 30
4797-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4797+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
47984798
delay 5
4799-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4799+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48004800
delay 1
48014801
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32
48024802
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
@@ -4805,11 +4805,11 @@ Move_THUNDER:
48054805
delay 1
48064806
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, 16
48074807
delay 10
4808-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4808+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48094809
delay 1
48104810
createvisualtask AnimTask_ShakeTargetInPattern, 2, 30, 3, TRUE, 0
48114811
delay 2
4812-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4812+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48134813
delay 1
48144814
simple_palette_blend unused_anim_battler=ANIM_TARGET, selector=F_PAL_BG, delay=2, initial_blend_y=16, target_blend_y=0, color=RGB_BLACK
48154815
waitforvisualfinish
@@ -4831,7 +4831,7 @@ Move_THUNDER_PUNCH:
48314831
createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
48324832
create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1
48334833
delay 1
4834-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4834+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48354835
delay 1
48364836
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -48
48374837
delay 1
@@ -4840,7 +4840,7 @@ Move_THUNDER_PUNCH:
48404840
createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0, 16
48414841
delay 1
48424842
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
4843-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4843+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48444844
delay 2
48454845
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
48464846
create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=2
@@ -4868,12 +4868,12 @@ Move_SACRED_FIRE:
48684868
delay 1
48694869
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 20, 10, 50, 5, 1, 1
48704870
delay 1
4871-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4871+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48724872
delay 1
48734873
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 50, 5, 0, 1
48744874
delay 1
48754875
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, 10, 50, 5, -1, 1
4876-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4876+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48774877
delay 1
48784878
waitforvisualfinish
48794879
playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
@@ -4885,10 +4885,10 @@ Move_SACRED_FIRE:
48854885
playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
48864886
createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 16, 0, 80, 16, 0, 1
48874887
delay 1
4888-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4888+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48894889
delay 1
48904890
waitforvisualfinish
4891-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
4891+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
48924892
delay 1
48934893
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
48944894
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0
@@ -5011,7 +5011,7 @@ SnoreEffect:
50115011
playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER
50125012
createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1
50135013
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
5014-
shake_mon_or_platform velocity=6, shake_timer=1, shake_duration=14, type=SHAKE_BG_X, battler_selector=SHAKE_MON_ATTACKER
5014+
shake_mon_or_platform velocity=6, shake_timer=1, shake_duration=14, type=SHAKE_BG_X, battler_selector=SHAKE_MON_ATTACKER
50155015
createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0
50165016
createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0
50175017
createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0
@@ -6871,7 +6871,7 @@ Move_ANCIENT_POWER:
68716871
loadspritegfx ANIM_TAG_IMPACT
68726872
monbg ANIM_DEF_PARTNER
68736873
setalpha 12, 8
6874-
shake_mon_or_platform velocity=4, shake_timer=1, shake_duration=10, type=SHAKE_BG_Y
6874+
shake_mon_or_platform velocity=4, shake_timer=1, shake_duration=10, type=SHAKE_BG_Y
68756875
createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 20, 32, -48, 50, 2
68766876
createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, -38, 25, 5
68776877
createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 32, 32, -28, 40, 3
@@ -7265,7 +7265,7 @@ Move_POISON_TAIL:
72657265
loadspritegfx ANIM_TAG_IMPACT
72667266
loadspritegfx ANIM_TAG_POISON_BUBBLE
72677267
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
7268-
metallic_shine permanent=TRUE, color=RGB(24, 6, 23)
7268+
metallic_shine permanent=TRUE, color=RGB(24, 6, 23)
72697269
waitforvisualfinish
72707270
monbg ANIM_TARGET
72717271
setalpha 12, 8
@@ -7292,14 +7292,14 @@ Move_METAL_CLAW:
72927292
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
72937293
create_claw_slash_sprite ANIM_TARGET, 2, x=-10, y=-10, animation=0
72947294
create_claw_slash_sprite ANIM_TARGET, 2, x=-10, y=10, animation=0
7295-
shake_mon_or_platform velocity=-4, shake_timer=1, shake_duration=10, type=SHAKE_MON_Y, battler_selector=SHAKE_MON_TARGET
7295+
shake_mon_or_platform velocity=-4, shake_timer=1, shake_duration=10, type=SHAKE_MON_Y, battler_selector=SHAKE_MON_TARGET
72967296
delay 8
72977297
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
72987298
delay 2
72997299
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
73007300
create_claw_slash_sprite ANIM_TARGET, 2, x=10, y=-10, animation=1
73017301
create_claw_slash_sprite ANIM_TARGET, 2, x=10, y=10, animation=1
7302-
shake_mon_or_platform velocity=-4, shake_timer=1, shake_duration=10, type=SHAKE_MON_Y, battler_selector=SHAKE_MON_TARGET
7302+
shake_mon_or_platform velocity=-4, shake_timer=1, shake_duration=10, type=SHAKE_MON_Y, battler_selector=SHAKE_MON_TARGET
73037303
waitforvisualfinish
73047304
end
73057305

@@ -8049,7 +8049,7 @@ Move_TRI_ATTACK:
80498049
createvisualtask AnimTask_ShakeTargetInPattern, 2, 20, 3, TRUE, 1
80508050
waitforvisualfinish
80518051
loadspritegfx ANIM_TAG_LIGHTNING
8052-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
8052+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
80538053
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
80548054
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -48
80558055
delay 1
@@ -8059,7 +8059,7 @@ Move_TRI_ATTACK:
80598059
delay 20
80608060
createvisualtask AnimTask_ShakeTargetInPattern, 2, 20, 3, TRUE, 0
80618061
delay 2
8062-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
8062+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
80638063
waitforvisualfinish
80648064
loadspritegfx ANIM_TAG_ICE_CRYSTALS
80658065
call IceCrystalEffectShort
@@ -8637,7 +8637,7 @@ Move_DRAGON_CLAW:
86378637
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET
86388638
create_claw_slash_sprite ANIM_TARGET, 2, x=-10, y=-10, animation=0
86398639
create_claw_slash_sprite ANIM_TARGET, 2, x=-10, y=10, animation=0
8640-
shake_mon_or_platform velocity=-4, shake_timer=1, shake_duration=10, type=SHAKE_MON_Y, battler_selector=SHAKE_MON_TARGET
8640+
shake_mon_or_platform velocity=-4, shake_timer=1, shake_duration=10, type=SHAKE_MON_Y, battler_selector=SHAKE_MON_TARGET
86418641
createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, ANIM_ATTACKER
86428642
delay 2
86438643
createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, ANIM_ATTACKER
@@ -8650,7 +8650,7 @@ Move_DRAGON_CLAW:
86508650
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET
86518651
create_claw_slash_sprite ANIM_TARGET, 2, x=10, y=-10, animation=1
86528652
create_claw_slash_sprite ANIM_TARGET, 2, x=10, y=10, animation=1
8653-
shake_mon_or_platform velocity=-4, shake_timer=1, shake_duration=10, type=SHAKE_MON_Y, battler_selector=SHAKE_MON_TARGET
8653+
shake_mon_or_platform velocity=-4, shake_timer=1, shake_duration=10, type=SHAKE_MON_Y, battler_selector=SHAKE_MON_TARGET
86548654
createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, ANIM_ATTACKER
86558655
delay 2
86568656
createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, ANIM_ATTACKER
@@ -9102,7 +9102,7 @@ Move_BLAST_BURN:
91029102
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 40, 20, 24, 0, 0, 0
91039103
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 24, 0, 0, 0
91049104
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 24, 0, 0, 0
9105-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
9105+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
91069106
delay 25
91079107
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
91089108
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -96, 0, 24, 0, 0, 0
@@ -9116,7 +9116,7 @@ Move_BLAST_BURN:
91169116
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 60, 30, 24, 0, 0, 0
91179117
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 48, 24, 0, 0, 0
91189118
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -60, 30, 24, 0, 0, 0
9119-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
9119+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
91209120
waitforvisualfinish
91219121
clearmonbg ANIM_DEF_PARTNER
91229122
blendoff
@@ -9368,7 +9368,7 @@ Move_HYDRO_CANNON:
93689368
playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER
93699369
createsprite gHydroCannonChargeSpriteTemplate, ANIM_TARGET, 2
93709370
delay 10
9371-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
9371+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
93729372
delay 30
93739373
panse SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
93749374
call HydroCannonBeam
@@ -9385,7 +9385,7 @@ Move_HYDRO_CANNON:
93859385
call HydroCannonBeam
93869386
createsprite gWaterHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0
93879387
waitforvisualfinish
9388-
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
9388+
invert_screen_color scenery=TRUE, attacker=TRUE, target=TRUE
93899389
waitforvisualfinish
93909390
clearmonbg ANIM_DEF_PARTNER
93919391
blendoff

0 commit comments

Comments
 (0)