diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 53b17f1eb059..c70b3c1e1795 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -75,7 +75,7 @@ gBattleAnimGeneral_SafariRockThrow:: setalpha 12, 8 delay 0 playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET - create_basic_hitsplat_sprite ANIM_TARGET, 2, x=-4, y=-20, relative_to=1, animation=2 + create_basic_hitsplat_sprite ANIM_TARGET, 2, x=-4, y=-20, relative_to=ANIM_TARGET, animation=2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -187,7 +187,7 @@ gBattleAnimMove_WakeUpSlap:: createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 2 waitforvisualfinish createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, 1, 8, 3 - loopsewithpan SE_M_SWAGGER2, +63, 16, 3 + loopsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET, 16, 3 clearmonbg ANIM_DEF_PARTNER blendoff end @@ -204,7 +204,7 @@ gBattleAnimMove_HammerArm:: gBattleAnimMove_GyroBall:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE waitforvisualfinish playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8 @@ -225,9 +225,9 @@ gBattleAnimMove_GyroBall:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish end @@ -253,11 +253,11 @@ gBattleAnimMove_HealingWish:: gBattleAnimMove_Brine:: monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_M_DIVE, -64 + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER waitforvisualfinish delay 16 createvisualtask AnimTask_BrineRain, 5 - playsewithpan SE_M_SURF, +63 + playsewithpan SE_M_SURF, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER blendoff end @@ -266,19 +266,19 @@ gBattleAnimMove_NaturalGift:: monbg ANIM_ATTACKER splitbgprio ANIM_ATTACKER blend_color_cycle selector=F_PAL_ATTACKER, delay=2, num_blends=2, initial_blend_y=0, target_blend_y=16, color=RGB(27, 31, 18) - playsewithpan SE_M_MEGA_KICK, -64 + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish delay 1 createvisualtask AnimTask_DragonDanceWaver, 5 - playsewithpan SE_M_TELEPORT, -64 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, RGB(0, 0, 19), 14, 0, 3 call CreateDragonDanceOrbs delay 30 - playsewithpan SE_M_TELEPORT, -64 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_M_TELEPORT, -64 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER delay 1 @@ -378,12 +378,12 @@ gBattleAnimMove_Acupressure:: end gBattleAnimMove_MetalBurst:: - loopsewithpan SE_M_TRI_ATTACK, -64, 18, 3 + loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 set_grayscale_pal battler=ANIM_ATTACKER createvisualtask AnimTask_DefenseCurlDeformMon, 5 waitforvisualfinish setarg 7, -1 - playsewithpan SE_M_REFLECT, -64 + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32 @@ -421,75 +421,75 @@ gBattleAnimMove_CloseCombat:: call SetHighSpeedBg createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_VITAL_THROW2, +63 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_MEGA_KICK2, +63 + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_VITAL_THROW2, +63 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_MEGA_KICK2, +63 + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_VITAL_THROW2, +63 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_MEGA_KICK2, +63 + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_VITAL_THROW2, +63 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_MEGA_KICK2, +63 + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_VITAL_THROW2, +63 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_MEGA_KICK2, +63 + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_VITAL_THROW2, +63 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1 - playsewithpan SE_M_MEGA_KICK2, +63 + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 1 call UnsetBackground clearmonbg ANIM_DEF_PARTNER @@ -507,22 +507,22 @@ gBattleAnimMove_Payback:: setalpha 12, 8 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=24, y=8, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=-24, y=-16, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=8, y=4, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=-16, y=19, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=18, y=-18, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -537,7 +537,7 @@ gBattleAnimMove_Assurance:: delay 0 setalpha 12, 8 createsprite gPalmSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0 - playsewithpan SE_M_VITAL_THROW2, -64 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_ATTACKER create_basic_hitsplat_sprite ANIM_TARGET, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -550,13 +550,13 @@ gBattleAnimMove_Assurance:: gBattleAnimMove_Embargo:: monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET - loopsewithpan SE_M_POISON_POWDER, +63, 18, 10 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 18, 10 call EmbargoOrbs1 call EmbargoOrbs1 call EmbargoOrbs1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 10, 1 - playsewithpan SE_M_NIGHTMARE, +63 + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER end EmbargoOrbs1: @@ -573,11 +573,11 @@ gBattleAnimMove_Fling:: splitbgprio ANIM_TARGET setalpha 12, 8 createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 - playsewithpan SE_M_SWAGGER, -64 + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_M_VITAL_THROW, +63 + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER blendoff end @@ -585,18 +585,18 @@ gBattleAnimMove_Fling:: gBattleAnimMove_PsychoShift:: monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_M_MEGA_KICK, -64 + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER create_dragon_dance_orb_sprite ANIM_ATTACKER, 2, angle=0/256 delay 30 waitforvisualfinish createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 1, 0 - playsewithpan SE_M_SUPERSONIC, -64 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 1, 0 - playsewithpan SE_M_SUPERSONIC, -64 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 1, 0 - playsewithpan SE_M_SUPERSONIC, -64 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end @@ -689,7 +689,7 @@ gBattleAnimMove_WringOut:: end gBattleAnimMove_PowerTrick:: - loopsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET 10 3 + loopsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET, 10, 3 createvisualtask AnimTask_UproarDistortion 2, 0 createsprite gPowerTrickSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, SOUND_PAN_TARGET, 0 delay 16 @@ -793,13 +793,13 @@ gBattleAnimMove_Copycat:: simple_palette_blend selector=F_PAL_ATTACKER, delay=0, initial_blend_y=12, target_blend_y=0, color=RGB_WHITE waitforvisualfinish createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_M_SUPERSONIC, -64 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_M_SUPERSONIC, -64 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_M_SUPERSONIC, -64 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER waitforvisualfinish end @@ -936,9 +936,9 @@ gBattleAnimMove_LastResort:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 7 waitforvisualfinish call UnsetBackground end @@ -963,7 +963,7 @@ gBattleAnimMove_SuckerPunch:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, ANIM_TARGET, 2 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 4 end gBattleAnimMove_ToxicSpikes:: @@ -1137,37 +1137,37 @@ gBattleAnimMove_FlareBlitz:: createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=0 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 192, 176, 40 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=24, y=8, relative_to=ANIM_TARGET, animation=0 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, -192, 240, 40 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=-24, y=-16, relative_to=ANIM_TARGET, animation=0 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 192, -160, 40 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=8, y=4, relative_to=ANIM_TARGET, animation=0 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, -192, -112, 40 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=-16, y=19, relative_to=ANIM_TARGET, animation=0 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 160, 48, 40 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=18, y=-18, relative_to=ANIM_TARGET, animation=0 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, -224, -32, 40 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 112, -128, 40 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 0, RGB_BLACK - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 9 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1184,7 +1184,7 @@ gBattleAnimMove_ForcePalm:: createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET - createsprite gForcePalmSpriteTemplate, ANIM_ATTACKER 3, 0, 0, 1, 2 + createsprite gForcePalmSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -1613,8 +1613,8 @@ gBattleAnimMove_PowerGem:: @ Copy of Hidden Power with background blackened gBattleAnimMove_DrainPunch:: monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_M_VITAL_THROW2, -64 - create_fist_sprite ANIM_TARGET, 3, x=0, y=0, duration=8, initPosition=1 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_ATTACKER + create_fist_sprite ANIM_TARGET, 3, x=0, y=0, duration=8 create_basic_hitsplat_sprite ANIM_TARGET, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 delay 20 @@ -1631,7 +1631,7 @@ gBattleAnimMove_VacuumWave:: monbg ANIM_TARGET setalpha 12, 8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=8, y=-8, relative_to=ANIM_TARGET, animation=2 - create_fist_sprite ANIM_ATTACKER, 3, x=8, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=8, y=0, duration=8 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0, RGB_WHITE, 3 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET @@ -1707,7 +1707,7 @@ gBattleAnimMove_EarthPower:: waitbgfadeout createvisualtask AnimTask_PositionFissureBgOnBattler, 5, ANIM_TARGET, 5, -1 waitbgfadein - loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET 11, 3 + loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 call CreateDragonRageFirePlumes waitforvisualfinish @@ -1784,43 +1784,43 @@ gBattleAnimMove_NastyPlot:: gBattleAnimMove_BulletPunch:: monbg ANIM_TARGET setalpha 12, 8 - create_fist_sprite ANIM_ATTACKER, 3, x=-8, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=-8, y=0, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-8, y=0, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=-16, y=8, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=-16, y=8, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-16, y=8, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=8, y=-16, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=8, y=-16, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-16, y=8, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=16, y=16, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=16, y=16, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=16, y=8, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=0, y=0, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=24, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=24, y=0, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=24, y=0, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=24, y=16, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=24, y=16, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=24, y=16, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=-24, y=16, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=-24, y=16, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-24, y=16, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=-24, y=-8, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=-24, y=-8, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-24, y=-8, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 - create_fist_sprite ANIM_ATTACKER, 3, x=-24, y=8, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=-24, y=8, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-24, y=8, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 @@ -2098,7 +2098,7 @@ gBattleAnimMove_PsychoCut:: createsprite gPsychoCutSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 - create_cross_impact_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=1, duration=20 + create_cross_impact_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, duration=20 createvisualtask AnimTask_BlendBattleAnimPal, 1, F_PAL_BG, 2, 4, 0, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 1, F_PAL_ATTACKER, 2, 10, 0, RGB(20, 12, 23) clearmonbg ANIM_TARGET @@ -2137,7 +2137,7 @@ gBattleAnimMove_ZenHeadbutt:: gBattleAnimMove_MirrorShot:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=1 + metallic_shine permanent=TRUE waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 10, RGB_WHITEALPHA createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(21, 21, 21) @@ -2223,9 +2223,9 @@ gBattleAnimMove_RockClimb:: delay 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 delay 30 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 6 delay 4 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 clearmonbg ANIM_DEF_PARTNER blendoff end @@ -2617,7 +2617,7 @@ gBattleAnimMove_RockWrecker:: createsprite gReallyBigRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish create_basic_hitsplat_sprite ANIM_TARGET, 131, x=0, y=0, relative_to=ANIM_TARGET, animation=1 - playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 130, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 8, 0, 40, 1 createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 130, 5, 0, -20, 24, 14, 1 @@ -2635,7 +2635,7 @@ gBattleAnimMove_CrossPoison:: setalpha 12, 8 playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET complex_palette_blend selector=F_PAL_BG | F_PAL_BATTLERS, delay=3, num_blends=1, color1=RGB_WHITE, blend_y1=10, color2=RGB_BLACK, blend_y2=10 - create_cross_impact_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=1, duration=20 + create_cross_impact_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, duration=20 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 waitforvisualfinish call PoisonBubblesEffect @@ -2699,7 +2699,7 @@ SetGunkShotBG: gBattleAnimMove_IronHead:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=1 + metallic_shine permanent=TRUE waitforvisualfinish createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER @@ -2710,7 +2710,7 @@ gBattleAnimMove_IronHead:: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 7, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 - create_flashing_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=1, animation=1 + create_flashing_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish set_original_pal battler=ANIM_ATTACKER @@ -2766,12 +2766,12 @@ gBattleAnimMove_MagnetBomb:: end gBattleAnimMove_StoneEdge:: - playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gStoneEdgeSpriteTemplate, ANIM_TARGET, 2, 0, 28, 528, 30, 13, 50, 1 delay 2 createsprite gStoneEdgeSpriteTemplate, ANIM_TARGET, 2, 0, 32, 480, 20, 16, -46, 1 delay 2 - loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET 24, 3 + loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 24, 3 createsprite gStoneEdgeSpriteTemplate, ANIM_TARGET, 2, 0, 33, 576, 20, 8, 42, 1 delay 2 createsprite gStoneEdgeSpriteTemplate, ANIM_TARGET, 2, 0, 31, 400, 25, 11, -42, 1 @@ -2850,9 +2850,9 @@ gBattleAnimMove_GrassKnot:: delay 4 create_basic_hitsplat_sprite ANIM_TARGET, 2, x=-8, y=8, relative_to=ANIM_TARGET, animation=2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, ANIM_TARGET, 2 - playsewithpan SE_M_VITAL_THROW2 SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 4 end gBattleAnimMove_Chatter:: @@ -3281,7 +3281,7 @@ gBattleAnimMove_RoarOfTime:: delay 32 monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER 13 3 + loopsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER, 13, 3 call RecoverAbsorbEffect waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -3318,7 +3318,7 @@ gBattleAnimMove_SpacialRend:: monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK - loopsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER 13 2 + loopsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER, 13, 2 createsprite gSpacialRendBladesTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0 delay 2 createsprite gSpacialRendBladesTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4 @@ -3327,7 +3327,7 @@ gBattleAnimMove_SpacialRend:: delay 2 createsprite gSpacialRendBladesTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12 waitforvisualfinish - fadetobgfromset BG_SPACIAL_REND_OPPONENT BG_SPACIAL_REND_PLAYER BG_SPACIAL_REND_OPPONENT + fadetobgfromset BG_SPACIAL_REND_OPPONENT, BG_SPACIAL_REND_PLAYER, BG_SPACIAL_REND_OPPONENT waitbgfadein loopsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET, 3, 5 createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, SOUND_PAN_ATTACKER, 176, 40 @@ -3466,7 +3466,7 @@ gBattleAnimMove_SeedFlare:: delay 2 createsprite gSeedFlareGreenCirclesTemplate, ANIM_ATTACKER, 2, -40, -20, 16 delay 2 - createsprite gSeedFlareGreenChargeTemplate, ANIM_ATTACKER 2, 0 + createsprite gSeedFlareGreenChargeTemplate, ANIM_ATTACKER, 2, 0 createsprite gSeedFlareGreenCirclesTemplate, ANIM_ATTACKER, 2, -40, 20, 16 delay 2 createsprite gSeedFlareGreenCirclesTemplate, ANIM_ATTACKER, 2, -20, 30, 16 @@ -3524,7 +3524,7 @@ gBattleAnimMove_SeedFlare:: end gBattleAnimMove_OminousWind:: - panse SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET 2, 0 + panse SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 playsewithpan SE_M_MORNING_SUN, SOUND_PAN_MIDDLE delay 0 monbg ANIM_DEF_PARTNER @@ -3947,16 +3947,16 @@ gBattleAnimMove_StormThrow:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 10, 3072, ANIM_TARGET, 2 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 4 waitforvisualfinish end StormThorwAnim: createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 20, 0, 0, 4 playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET delay 6 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 delay 8 return @@ -4016,7 +4016,7 @@ gBattleAnimMove_QuiverDance:: gBattleAnimMove_HeavySlam:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 @@ -4034,9 +4034,9 @@ gBattleAnimMove_HeavySlam:: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 6 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4179,7 +4179,7 @@ gBattleAnimMove_LowSweep:: create_basic_hitsplat_sprite ANIM_TARGET, 2, x=-8, y=8, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 4 end gBattleAnimMove_AcidSpray:: @@ -4214,7 +4214,7 @@ gBattleAnimMove_FoulPlay:: delay 6 createsprite gFoulPlayImpactTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_M_VITAL_THROW SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 10, 0, RGB_BLACK createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0, 0, 256, 0 delay 8 @@ -4345,7 +4345,7 @@ gBattleAnimMove_ChipAway:: delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 create_basic_hitsplat_sprite ANIM_TARGET, 4, x=0, y=0, relative_to=ANIM_TARGET, animation=1 - playsewithpan SE_M_VITAL_THROW2 SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB_WHITE @@ -4399,10 +4399,10 @@ gBattleAnimMove_StoredPower:: delay 10 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 8, 1, 0 playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET - create_flashing_hitsplat_sprite ANIM_TARGET, 3, x=-12, y=10, relative_to=1, animation=1 + create_flashing_hitsplat_sprite ANIM_TARGET, 3, x=-12, y=10, relative_to=ANIM_TARGET, animation=1 delay 5 playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET - create_flashing_hitsplat_sprite ANIM_TARGET, 3, x=12, y=-10, relative_to=1, animation=1 + create_flashing_hitsplat_sprite ANIM_TARGET, 3, x=12, y=-10, relative_to=ANIM_TARGET, animation=1 waitforvisualfinish call UnsetBackground waitforvisualfinish @@ -5204,7 +5204,7 @@ gBattleAnimMove_VoltSwitch:: playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER createsprite gVoltSwitchSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 0, 32, 20 delay 30 - createvisualtask AnimTask_ShakeMon2 2, ANIM_TARGET, 3, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 8, 1 call VoltSwitchElectricFlashes delay 2 playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER @@ -5212,7 +5212,7 @@ gBattleAnimMove_VoltSwitch:: delay 4 call VoltSwitchElectricFlashes delay 18 - createvisualtask AnimTask_ShakeMon2 2, ANIM_TARGET, 3, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 8, 1 call VoltSwitchElectricFlashes delay 6 call VoltSwitchElectricFlashes @@ -5569,9 +5569,9 @@ gBattleAnimMove_Steamroller:: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 6 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -5580,7 +5580,7 @@ gBattleAnimMove_Steamroller:: gBattleAnimMove_CottonGuard:: monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET 18 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 18, 6 call CreateCottonSpores call CottonSporesSpiralInward call CottonSporesSpiralInward @@ -7505,7 +7505,7 @@ gBattleAnimMove_MistyTerrain:: gBattleAnimMove_Electrify:: monbg ANIM_ATTACKER - loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET 10 4 + loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 10, 4 createsprite gElectrifyRingTemplate, ANIM_ATTACKER, 2 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, ANIM_ATTACKER, 1, 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, ANIM_ATTACKER, 1, 0 @@ -7603,7 +7603,7 @@ gBattleAnimMove_PlayRough:: waitforvisualfinish delay 13 stopsound - clearmonbg 3 + clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish end @@ -7923,7 +7923,7 @@ gBattleAnimMove_WaterShuriken:: gBattleAnimMove_MysticalFire:: call SetPsychicBackground setalpha 8, 8 - playse 177 + playse SE_M_SELF_DESTRUCT createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 blend_color_cycle selector=F_PAL_ATTACKER, delay=0, num_blends=2, initial_blend_y=0, target_blend_y=8, color=RGB_WHITE waitforvisualfinish @@ -7944,7 +7944,7 @@ gBattleAnimMove_MysticalFire:: createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -2 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 3, 1 - playse 140 + playse SE_M_MEGA_KICK waitforvisualfinish call UnsetBackground end @@ -8000,7 +8000,7 @@ gBattleAnimMove_AromaticMist:: gBattleAnimMove_EerieImpulse:: monbg ANIM_DEF_PARTNER - waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 delay 4 createsprite gEerieImpulseRingTemplate, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 delay 11 @@ -8350,7 +8350,7 @@ gBattleAnimMove_Celebrate:: delay 18 playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER delay 71 - loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER 22 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 end gBattleAnimMove_HoldHands:: @@ -8697,32 +8697,32 @@ ThousandWavesRecover: delay 2 return ThousandWavesRotatingImpact: - createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 28, 384, 50, 8, 50, 1 @1 + createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 28, 384, 50, 8, 50, 1 createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 70, 1984, 96, 1 delay 2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 1, 0, 0, 3 - createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 32, 240, 40, 11, -46, 1 @2 + createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 32, 240, 40, 11, -46, 1 createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0, 2816, 96, 1 delay 2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 1, 5, -12, 3 - createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 33, 416, 40, 4, 42, 1 @3 + createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 33, 416, 40, 4, 42, 1 createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 1 delay 2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 1, -6, 9, 3 - createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 31, 288, 45, 6, -42, 1 @4 + createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 31, 288, 45, 6, -42, 1 createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 1 delay 2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 1, -6, -12, 3 - createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 28, 448, 45, 11, 46, 1 @5 + createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 28, 448, 45, 11, 46, 1 createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 90, 2048, 96, 1 delay 2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 1, 5, 9, 3 - createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 33, 464, 50, 10, -50, 1 @6 + createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 35, 33, 464, 50, 10, -50, 1 createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 50, 2560, 96, 1 delay 2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET @@ -8751,7 +8751,7 @@ gBattleAnimMove_LandsWrath:: clearmonbg ANIM_ATTACKER end LandsWrathVortex: - playsewithpan SE_M_SACRED_FIRE2 SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gLandsWrathVortexTemplate, ANIM_TARGET, 2, 0, 28, 384, 50, 8, 50, 0 delay 2 createsprite gLandsWrathVortexTemplate, ANIM_TARGET, 2, 0, 32, 240, 40, 11, -46, 0 @@ -8893,7 +8893,7 @@ gBattleAnimMove_PrecipiceBlades:: monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET setalpha 12, 8 - fadetobg 21 + fadetobg BG_FISSURE waitbgfadeout createvisualtask AnimTask_PositionFissureBgOnBattler, 5, ANIM_TARGET, 5, -1 createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 5 @@ -8973,7 +8973,7 @@ gBattleAnimMove_DragonAscent:: createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 2, 16, 0, RGB(26, 31, 0) waitforvisualfinish delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -9085,7 +9085,7 @@ gBattleAnimMove_FirstImpression:: monbg ANIM_TARGET @This is placed here on purpose (to not ruin astonishs animation) delay 1 createsprite gFirstImpressionPoundTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 - loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET 10 2 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 10, 2 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -28, 0, 0, 3 waitforvisualfinish @@ -9102,7 +9102,7 @@ gBattleAnimMove_FirstImpression:: gBattleAnimMove_BanefulBunker:: monbg ANIM_ATK_PARTNER splitbgprio ANIM_ATTACKER - waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER 16 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 16 createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90 createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 10, 10, 25, 0 delay 4 @@ -9318,7 +9318,7 @@ gBattleAnimMove_FloralHealing:: delay 2 createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 90, 0, 64 delay 2 - createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 48, 0, 64 @2 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 48, 0, 64 delay 2 createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 95, 1, 80 delay 2 @@ -9781,7 +9781,7 @@ PollenPuffAlly: end gBattleAnimMove_AnchorShot:: - playsewithpan SE_FALL SOUND_PAN_TARGET + playsewithpan SE_FALL, SOUND_PAN_TARGET monbg ANIM_TARGET createsprite gAnchorShotAngledAnchorTemplate, ANIM_ATTACKER, 2, 0, 0, 53 waitforvisualfinish @@ -9790,7 +9790,7 @@ gBattleAnimMove_AnchorShot:: delay 37 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 waitforvisualfinish - loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER 28 2 + loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 createsprite gAnchorShotChainTemplate, ANIM_TARGET, 2, -16, -16 delay 4 createsprite gAnchorShotChainTemplate, ANIM_TARGET, 2, -16, 0 @@ -9962,7 +9962,7 @@ gBattleAnimMove_BurnUp:: delay 1 createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 0 delay 1 - loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER 9 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask AnimTask_CopyPalUnfadedToBackup, 5, 1, 0 delay 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 13, RGB(28, 0, 0) @@ -10147,7 +10147,7 @@ gBattleAnimMove_CoreEnforcer:: waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, 0, -1024, 1, -1 waitbgfadein - loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER 13 10 + loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 13, 10 createsprite gCoreEnforcerCircleChargeTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 2 createsprite gCoreEnforcerBlueRingTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, ANIM_ATTACKER, 1, 0 @@ -10416,7 +10416,7 @@ gBattleAnimMove_BeakBlast:: delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 2 - loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET 4 8 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 4, 8 createvisualtask AnimTask_DrillPeckHitSplats, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 waitforvisualfinish @@ -10870,7 +10870,7 @@ gBattleAnimMove_ShadowBone:: waitforvisualfinish restorebg waitbgfadein - clearmonbg 3 + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -11571,7 +11571,7 @@ PlasmaFistSpark2: return PlasmaFistsImpact: playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET - create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 delay 1 invert_screen_color scenery=257 @@ -11835,7 +11835,7 @@ gBattleAnimMove_SizzlySlide:: playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET call FireSpreadEffect delay 7 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 9 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end @@ -11997,16 +11997,16 @@ gBattleAnimMove_FreezyFrost:: end FreezyFrostHitEffect: createsprite gFreezyFrostRisingSpearSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, -4, 16 - playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 1 createsprite gFreezyFrostRisingSpearSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 4109, 16 - playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 1 createsprite gFreezyFrostRisingSpearSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 4, 16 - playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 1 createsprite gFreezyFrostRisingSpearSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, -16, 16 - playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 1 return @@ -12051,7 +12051,7 @@ gBattleAnimMove_VeeveeVolley:: gBattleAnimMove_DoubleIronBash:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE waitforvisualfinish monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -12097,7 +12097,7 @@ gBattleAnimMove_DynamaxCannon:: fadetobg BG_DYNAMAX_CANNON waitbgfadein blend_color_cycle selector=F_PAL_TARGET, delay=4, num_blends=4, initial_blend_y=0, target_blend_y=12, color=RGB(31, 4, 10)@Pinkish Red - panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER SOUND_PAN_TARGET 2 0 + panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 shake_mon_or_platform velocity=4, shake_timer=1, shake_duration=180, type=SHAKE_BG_Y createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 87, 1 call DynamaxCannonLaunch @@ -12175,7 +12175,7 @@ gBattleAnimMove_StuffCheeks:: createsprite gFloatingBerryTemplate, ANIM_ATTACKER, 1, 0 delay 69 createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 1 BERRYEAT_ON_PLAYER + jumpargeq 7, 1, BERRYEAT_ON_PLAYER BerryEatingOpponent: call BiteOpponent delay 16 @@ -12205,7 +12205,7 @@ BiteOpponent: return gBattleAnimMove_NoRetreat:: - loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER 7 18 + loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 7, 18 createsprite gNoRetreatFlameTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 20, 10, 160, 0 createsprite gNoRetreatFlameTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -20, 10, 160, 0 createvisualtask AnimTask_TeeterDanceMovement, 5 @@ -12230,7 +12230,7 @@ gBattleAnimMove_TarShot:: playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, -15, -17, 0, 10, 45 - playsewithpan SE_M_BUBBLE SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET end @@ -12757,7 +12757,7 @@ gBattleAnimMove_AuraWheel:: createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 48, 44, 128, 40, 0, -32765 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 48, 44, 192, 40, 2, -32765 delay 7 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 9 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -12820,7 +12820,7 @@ OverdriveRings: createsprite gHyperVoiceRingSpriteTemplate, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1 - shake_battle_platforms priority=2, x_offset=1, y_offset=0, shakes=6, delay=1 + shake_battle_platforms x_offset=1, y_offset=0, shakes=6, delay=1 createvisualtask SoundTask_WaitForCry, 5 return @@ -13078,7 +13078,7 @@ gBattleAnimMove_Eternabeam:: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB(31, 4, 10) @Pinkish Red createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 13, 13, RGB(31, 4, 10) @Pinkish Red createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(11, 1, 22) - fadetobgfromset BG_SPACIAL_REND_OPPONENT BG_SPACIAL_REND_PLAYER BG_SPACIAL_REND_OPPONENT + fadetobgfromset BG_SPACIAL_REND_OPPONENT, BG_SPACIAL_REND_PLAYER, BG_SPACIAL_REND_OPPONENT playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER invisible ANIM_ATTACKER createsprite gDevastatingDrakeDrakeUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1248, 36, 21, 1, ANIM_ATTACKER @@ -13155,7 +13155,7 @@ EternabeamGeyser: gBattleAnimMove_SteelBeam:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE delay 48 createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 20, 0, 2 playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER @@ -13373,7 +13373,7 @@ MeteorBeamBlast: createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, TRUE, -1 @;Scroll right/left waitbgfadein monbg ANIM_TARGET - panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER SOUND_PAN_TARGET 2 0 + panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 87, 1 call MeteorBeamRockLaunch call MeteorBeamRockLaunch @@ -13431,9 +13431,9 @@ gBattleAnimMove_ShellSideArmPhysical:: @ Modified Body Slam, placeholder createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 6 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -13856,14 +13856,14 @@ gBattleAnimMove_TripleAxel:: jumpifmoveturn 1, TripleAxelTurn1 goto TripleAxelTurn2 TripleAxelTurn0: - create_narrow_foot_sprite ANIM_TARGET, 4, x=-16, y=-8, duration=20, initPosition=1 + create_narrow_foot_sprite ANIM_TARGET, 4, x=-16, y=-8, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=-16, y=-16, relative_to=ANIM_TARGET, animation=2 createsprite gTripleAxelIceCrystalSpriteTemplate, ANIM_TARGET, 1, -16, -8, -256, -40 createsprite gTripleAxelIceCrystalSpriteTemplate, ANIM_TARGET, 1, -16, -8, 416, -38 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 4, 1 goto TripleAxelEnd TripleAxelTurn1: - create_narrow_foot_sprite ANIM_TARGET, 4, x=8, y=8, duration=20, initPosition=1 + create_narrow_foot_sprite ANIM_TARGET, 4, x=8, y=8, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=8, y=0, relative_to=ANIM_TARGET, animation=2 createsprite gTripleAxelIceCrystalSpriteTemplate, ANIM_TARGET, 1, 8, 8, 160, -32 createsprite gTripleAxelIceCrystalSpriteTemplate, ANIM_TARGET, 1, 8, 8, -256, -40 @@ -13872,7 +13872,7 @@ TripleAxelTurn1: createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 goto TripleAxelEnd TripleAxelTurn2: - create_narrow_foot_sprite ANIM_TARGET, 4, x=0, y=0, duration=20, initPosition=1 + create_narrow_foot_sprite ANIM_TARGET, 4, x=0, y=0, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=-8, relative_to=ANIM_TARGET, animation=1 createsprite gTripleAxelIceCrystalSpriteTemplate, ANIM_TARGET, 1, 0, 0, 160, -32 createsprite gTripleAxelIceCrystalSpriteTemplate, ANIM_TARGET, 1, 0, 0, -256, -40 @@ -13950,7 +13950,7 @@ gBattleAnimMove_ScorchingSands:: playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -10, 0, 0, 3 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 2 call SandAttackDirt call SandAttackDirt call SandAttackDirt @@ -14063,8 +14063,8 @@ WickedBlowBuffEffect: gBattleAnimMove_SurgingStrikes:: - jumpifmoveturn 1 SURGING_STRIKES_1 - jumpifmoveturn 2 SURGING_STRIKES_2 + jumpifmoveturn 1, SURGING_STRIKES_1 + jumpifmoveturn 2, SURGING_STRIKES_2 SURGING_STRIKES_0: playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET @@ -14537,9 +14537,9 @@ gBattleAnimMove_PsyshieldBash:: waitforvisualfinish delay 2 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 11, 0, RGB(15, 29, 31) @;Light blue - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish call UnsetBackground clearmonbg ANIM_DEF_PARTNER @@ -15367,7 +15367,7 @@ gBattleAnimMove_ChillyReception:: delay 60 waitforvisualfinish blend_color_cycle selector=F_PAL_ATTACKER, delay=0, num_blends=1, initial_blend_y=13, target_blend_y=0, color=RGB_BLACK - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_ROAR setalpha 12, 4 @@ -15432,7 +15432,7 @@ ChillyReceptionSnowballs: gBattleAnimMove_BurningBulwark:: monbg ANIM_ATK_PARTNER splitbgprio ANIM_ATTACKER - waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER 16 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 16 createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 13, 13, RGB(27, 10, 0) createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0 @@ -15484,7 +15484,7 @@ gBattleAnimMove_AquaCutter:: createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 @@ -15509,7 +15509,7 @@ gBattleAnimMove_AquaCutter:: gBattleAnimMove_GigatonHammer:: playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 4 - metallic_shine permanent=0 + metallic_shine permanent=FALSE createsprite gWoodHammerHammerSpriteTemplate, ANIM_TARGET, 2 delay 60 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 @@ -15578,9 +15578,9 @@ RagingBullNormal: waitforvisualfinish call RagingBullCommon2 RagingBullEnd: - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish restorebg waitbgfadein @@ -15664,7 +15664,7 @@ gBattleAnimMove_JetPunch:: setarg 7, 4096 createsprite gSmallBubblePairSpriteTemplate, ANIM_TARGET, 2, 20, -20, 20, ANIM_TARGET createsprite gSmallBubblePairSpriteTemplate, ANIM_TARGET, 2, 10, 10, 20, ANIM_TARGET - create_fist_sprite ANIM_TARGET, 3, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 3, x=0, y=0, duration=8 playsewithpan SE_M_DIVE, SOUND_PAN_TARGET create_basic_hitsplat_sprite ANIM_TARGET, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 @@ -16028,7 +16028,7 @@ gBattleAnimMove_RageFist:: playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 - create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 @@ -16112,7 +16112,7 @@ gBattleAnimMove_Pounce:: playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish delay 20 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -16281,12 +16281,12 @@ gBattleAnimMove_AxeKick:: create_basic_hitsplat_sprite ANIM_ATTACKER, 1, x=0, y=0, relative_to=ANIM_TARGET, animation=1 createvisualtask AnimTask_SquishTargetShort, 2 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 4 end gBattleAnimMove_SpinOut:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE waitforvisualfinish call SetHighSpeedBg loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 3 @@ -16495,22 +16495,22 @@ gBattleAnimMove_Comeuppance:: setalpha 12, 8 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=24, y=8, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=-24, y=-16, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=8, y=4, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=-16, y=19, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=18, y=-18, relative_to=ANIM_TARGET, animation=0 - playsewithpan SE_M_COMET_PUNCH, +63 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -16532,7 +16532,7 @@ gBattleAnimMove_BloodMoon:: playsewithpan SE_M_DETECT, SOUND_PAN_MIDDLE waitforvisualfinish createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET BloodMoonOnPlayer + jumpargeq 7, ANIM_TARGET, BloodMoonOnPlayer BloodMoonOnOpponent: createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 10, 0, 5 call BloodMoonOnslaughtOpponent @@ -16631,7 +16631,7 @@ FickleBeamRegular: waitforvisualfinish end FickleBeamIntense: - fadetobgfromset BG_SPACIAL_REND_OPPONENT BG_SPACIAL_REND_PLAYER BG_SPACIAL_REND_OPPONENT + fadetobgfromset BG_SPACIAL_REND_OPPONENT, BG_SPACIAL_REND_PLAYER, BG_SPACIAL_REND_OPPONENT waitbgfadein delay 10 playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER @@ -17052,13 +17052,13 @@ gBattleAnimMove_GlaiveRush:: createsprite gGlaiveRushSpriteTemplate, ANIM_TARGET, 2 delay 14 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET - create_basic_hitsplat_sprite ANIM_TARGET, 4, x=-10, y=0, relative_to=1, animation=0 + create_basic_hitsplat_sprite ANIM_TARGET, 4, x=-10, y=0, relative_to=ANIM_TARGET, animation=0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 6, 0, 12, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 2, 16, 0, RGB(26, 31, 0) waitforvisualfinish delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 15, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -17416,9 +17416,9 @@ gBattleAnimMove_SupercellSlam:: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 6 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -17460,9 +17460,9 @@ gBattleAnimMove_BlazingTorque:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish blendoff call UnsetBackground @@ -17499,9 +17499,9 @@ gBattleAnimMove_WickedTorque:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish blendoff call UnsetBackground @@ -17548,9 +17548,9 @@ gBattleAnimMove_NoxiousTorque:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish blendoff call UnsetBackground @@ -17588,9 +17588,9 @@ gBattleAnimMove_CombatTorque:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -17625,9 +17625,9 @@ gBattleAnimMove_MagicalTorque:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish blendoff call UnsetBackground @@ -17754,42 +17754,42 @@ TeraBlastFighting: createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 63, 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 24, 0, 0, 10, 1, ANIM_FOOT_1, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -6, 18, 0, 0, 10, 1, ANIM_CHOP, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -64, 16, 0, 0, 10, 1, ANIM_FIST_1, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 21, 0, 0, 10, 1, ANIM_FOOT_2, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 20, 0, 0, 10, 1, ANIM_FIST_1, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -32, 23, 0, 0, 10, 1, ANIM_CHOP, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 2 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -64, 17, 0, 0, 10, 1, ANIM_FOOT_1, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -80, 16, 0, 0, 10, 1, ANIM_FOOT_2, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -96, 21, 0, 0, 10, 1, ANIM_CHOP, 1 @@ -17797,34 +17797,34 @@ TeraBlastFighting: playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 24, 0, 0, 10, 1, ANIM_FOOT_1, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -6, 18, 0, 0, 10, 1, ANIM_CHOP, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -64, 16, 0, 0, 10, 1, ANIM_FIST_1, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 21, 0, 0, 10, 1, ANIM_FOOT_2, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 20, 0, 0, 10, 1, ANIM_FIST_1, 1 delay 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -32, 23, 0, 0, 10, 1, ANIM_CHOP, 1 delay 1 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1 - create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=1, animation=1 + create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET call EternabeamGeyser delay 5 @@ -18109,27 +18109,27 @@ TeraBlastGround: createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50 playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET delay 40 - loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET 11, 3 + loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 call CreateDragonRageFirePlumes delay 1 - loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET 11, 3 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=5, y=0 + loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=5, y=0 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=-10, y=-15 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=-10, y=-15 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=1, x=0, y=25 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=ANIM_TARGET, x=0, y=25 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=15, y=5 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=15, y=5 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=-25, y=0 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=-25, y=0 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=1, x=30, y=30 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=ANIM_TARGET, x=30, y=30 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=1, x=-27, y=25 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=ANIM_TARGET, x=-27, y=25 delay 1 - loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET 11, 3 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=0, y=8 + loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=0, y=8 delay 1 call CreateDragonRageFirePlumes createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1 @@ -18257,7 +18257,7 @@ TeraBlastSteel: call ContinentalCrushStockpileRocks delay 30 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE waitforvisualfinish playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createsprite gReallyBigRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257 @@ -18599,7 +18599,7 @@ TeraBlastIce: waitforvisualfinish fadetobg BG_ICE waitbgfadein - createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 9, RGB(12, 26, 31) + createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB(12, 26, 31) call CreateIceSpiral delay 17 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 @@ -18616,7 +18616,7 @@ TeraBlastIce: delay 5 call EternabeamGeyser delay 5 - createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 9, 0, RGB(12, 26, 31) + createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish blendoff call UnsetBackground @@ -19079,7 +19079,7 @@ MatchaGotchaSingle: call MatchaGotchaProjectile call MatchaGotchaProjectile delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 delay 28 playsewithpan SE_M_DIVE, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 @@ -19108,7 +19108,7 @@ MatchaGotchaDouble: call MatchaGotchaDoubleProjectile call MatchaGotchaDoubleProjectile delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 waitforvisualfinish playsewithpan SE_M_DIVE, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 @@ -19219,7 +19219,7 @@ gBattleAnimMove_Strength:: createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 delay 4 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET @@ -19267,9 +19267,9 @@ gBattleAnimMove_BodySlam:: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 6 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -19341,7 +19341,7 @@ gBattleAnimMove_FlameWheel:: playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET call FireSpreadEffect delay 7 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 9 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -19419,9 +19419,9 @@ gBattleAnimMove_TakeDown:: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 2 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -19453,9 +19453,9 @@ gBattleAnimMove_DoubleEdge:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish end @@ -19485,10 +19485,10 @@ gBattleAnimMove_Twineedle:: create_linear_stinger_sprite ANIM_TARGET, 2, initial_x=20, initial_y=12, target_x=10, target_y=12, duration=20 delay 20 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 - create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=-4, relative_to=1, animation=3 + create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=-4, relative_to=ANIM_TARGET, animation=3 loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 2 delay 1 - create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=10, y=12, relative_to=1, animation=3 + create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=10, y=12, relative_to=ANIM_TARGET, animation=3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -19645,11 +19645,11 @@ CometPunchContinue: end CometPunchLeft: create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-8, y=-8, relative_to=ANIM_TARGET, animation=2 - create_fist_sprite ANIM_ATTACKER, 3, x=-8, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=-8, y=0, duration=8 goto CometPunchContinue CometPunchRight: create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=8, y=-8, relative_to=ANIM_TARGET, animation=2 - create_fist_sprite ANIM_ATTACKER, 3, x=8, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=8, y=0, duration=8 goto CometPunchContinue gBattleAnimMove_SonicBoom:: @@ -19777,23 +19777,23 @@ BeatUpContinue: end BeatUpLeft: create_basic_hitsplat_sprite ANIM_TARGET, 2, x=-20, y=-20, relative_to=ANIM_TARGET, animation=2 - create_fist_sprite ANIM_TARGET, 3, x=-20, y=-12, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 3, x=-20, y=-12, duration=8 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 create_basic_hitsplat_sprite ANIM_TARGET, 2, x=8, y=0, relative_to=ANIM_TARGET, animation=2 - create_fist_sprite ANIM_TARGET, 3, x=8, y=8, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 3, x=8, y=8, duration=8 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto BeatUpContinue BeatUpRight: create_basic_hitsplat_sprite ANIM_TARGET, 2, x=12, y=-20, relative_to=ANIM_TARGET, animation=2 - create_fist_sprite ANIM_TARGET, 3, x=12, y=-12, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 3, x=12, y=-12, duration=8 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 create_basic_hitsplat_sprite ANIM_TARGET, 2, x=-12, y=0, relative_to=ANIM_TARGET, animation=2 - create_fist_sprite ANIM_TARGET, 3, x=-12, y=8, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 3, x=-12, y=8, duration=8 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto BeatUpContinue @@ -19863,7 +19863,7 @@ gBattleAnimMove_Reversal:: delay 8 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET complex_palette_blend selector=F_PAL_BG | F_PAL_BATTLERS, delay=3, num_blends=1, color1=RGB_WHITE, blend_y1=8, color2=RGB_BLACK, blend_y2=0 - create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=10, initPosition=1 + create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=10 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 8, 1, 0 end @@ -19901,14 +19901,14 @@ gBattleAnimMove_SpikeCannon:: createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 5, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 create_linear_stinger_sprite ANIM_ATTACKER, 2, initial_x=10, initial_y=-8, target_x=-8, target_y=-8, duration=20 create_linear_stinger_sprite ANIM_ATTACKER, 2, initial_x=18, initial_y=0, target_x=0, target_y=0, duration=20 create_linear_stinger_sprite ANIM_ATTACKER, 2, initial_x=26, initial_y=8, target_x=8, target_y=8, duration=20 waitforvisualfinish - create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=-8, y=-8, relative_to=1, animation=2 - create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=1, animation=2 - create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=8, y=8, relative_to=1, animation=2 + create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=-8, y=-8, relative_to=ANIM_TARGET, animation=2 + create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=2 + create_handle_invert_hitsplat_sprite ANIM_ATTACKER, 3, x=8, y=8, relative_to=ANIM_TARGET, animation=2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish @@ -19952,7 +19952,7 @@ gBattleAnimMove_DizzyPunch:: monbg ANIM_TARGET setalpha 12, 8 call DizzyPunchLunge - create_fist_sprite ANIM_TARGET, 5, x=16, y=8, duration=20, initPosition=1 + create_fist_sprite ANIM_TARGET, 5, x=16, y=8, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 4, x=16, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 160, -32 @@ -19963,7 +19963,7 @@ gBattleAnimMove_DizzyPunch:: createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, -384, -31 delay 10 call DizzyPunchLunge - create_fist_sprite ANIM_TARGET, 5, x=-16, y=-8, duration=20, initPosition=1 + create_fist_sprite ANIM_TARGET, 5, x=-16, y=-8, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 4, x=-16, y=-16, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 160, -32 @@ -20084,12 +20084,12 @@ gBattleAnimMove_Slam:: playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -12, 10, 0, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -20118,7 +20118,7 @@ gBattleAnimMove_DrillPeck:: waitforvisualfinish createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 6 waitforvisualfinish end @@ -20959,7 +20959,7 @@ gBattleAnimMove_RollingKick:: create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-8, y=0, relative_to=ANIM_TARGET, animation=2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 8 clearmonbg ANIM_TARGET blendoff end @@ -21142,7 +21142,7 @@ gBattleAnimMove_LowKick:: createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, ANIM_TARGET, 2 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 4 end gBattleAnimMove_Earthquake:: @@ -21668,7 +21668,7 @@ gBattleAnimMove_MachPunch:: playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 - create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -22210,7 +22210,7 @@ BrickBreakCommon2: simple_palette_blend selector=F_PAL_BG, delay=2, initial_blend_y=0, target_blend_y=6, color=RGB_BLACK delay 37 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 - create_fist_sprite ANIM_ATTACKER, 4, x=0, y=0, duration=10, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 4, x=0, y=0, duration=10 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish return @@ -22521,7 +22521,7 @@ gBattleAnimMove_NeedleArm:: waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 - create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, -24, 10 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, -17, 10 @@ -22734,7 +22734,7 @@ gBattleAnimMove_ShadowPunch:: playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 - create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -22783,7 +22783,7 @@ gBattleAnimMove_AerialAce:: gBattleAnimMove_IronDefense:: loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE complex_palette_blend selector=F_PAL_BG, delay=8, num_blends=2, color1=RGB_WHITEALPHA, blend_y1=14, color2=RGB_WHITEALPHA, blend_y2=0 waitforvisualfinish end @@ -22915,7 +22915,7 @@ gBattleAnimMove_LeafBlade:: setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 - create_cross_impact_sprite ANIM_TARGET, 2, x=0, y=0, relative_to=1, duration=36 + create_cross_impact_sprite ANIM_TARGET, 2, x=0, y=0, relative_to=ANIM_TARGET, duration=36 playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET @@ -22977,7 +22977,7 @@ gBattleAnimMove_ShockWave:: gBattleAnimMove_Harden:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE waitforvisualfinish end @@ -23067,7 +23067,7 @@ gBattleAnimMove_IcePunch:: delay 20 call CreateIceSpiral delay 17 - create_fist_sprite ANIM_ATTACKER, 4, x=0, y=-10, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 4, x=0, y=-10, duration=8 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=-10, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 @@ -23221,7 +23221,7 @@ gBattleAnimMove_ThunderPunch:: simple_palette_blend selector=F_PAL_BG, delay=2, initial_blend_y=0, target_blend_y=16, color=RGB_BLACK waitforvisualfinish playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET - create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 4, x=0, y=0, duration=8 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 delay 1 invert_screen_color scenery=1 | 2 | 4 @@ -23565,7 +23565,7 @@ gBattleAnimMove_SandAttack:: playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -10, 0, 0, 3 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 2 call SandAttackDirt call SandAttackDirt call SandAttackDirt @@ -23589,7 +23589,7 @@ gBattleAnimMove_MudSlap:: playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -10, 0, 0, 3 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 2 call MudSlapMud call MudSlapMud call MudSlapMud @@ -23624,21 +23624,21 @@ gBattleAnimMove_DragonRage:: end CreateDragonRageFirePlumes: - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=5, y=0 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=5, y=0 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=-10, y=-15 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=-10, y=-15 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=1, x=0, y=25 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=ANIM_TARGET, x=0, y=25 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=15, y=5 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=15, y=5 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=-25, y=0 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=-25, y=0 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=1, x=30, y=30 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=ANIM_TARGET, x=30, y=30 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=1, x=-27, y=25 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 2, relative_to=ANIM_TARGET, x=-27, y=25 delay 1 - create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=1, x=0, y=8 + create_dragon_rage_fire_plume_sprite ANIM_TARGET, 66, relative_to=ANIM_TARGET, x=0, y=8 return gBattleAnimMove_RainDance:: @@ -24464,9 +24464,9 @@ MegahornContinue: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1 complex_palette_blend selector=F_PAL_BG | F_PAL_ATTACKER | F_PAL_TARGET, delay=5, num_blends=1, color1=RGB_WHITE, blend_y1=10, color2=RGB_BLACK, blend_y2=0 delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 11 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -24510,7 +24510,7 @@ gBattleAnimMove_WingAttack:: create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-16, y=0, relative_to=ANIM_TARGET, animation=1 loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -24595,7 +24595,7 @@ gBattleAnimMove_Crabhammer:: waitforvisualfinish delay 8 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 @@ -24771,7 +24771,7 @@ gBattleAnimMove_CrossChop:: delay 40 playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET complex_palette_blend selector=F_PAL_BG | F_PAL_BATTLERS, delay=3, num_blends=1, color1=RGB_WHITE, blend_y1=10, color2=RGB_BLACK, blend_y2=10 - create_cross_impact_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=1, duration=20 + create_cross_impact_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, duration=20 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -24800,7 +24800,7 @@ gBattleAnimMove_HighJumpKick:: createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 8 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 3 delay 2 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, ANIM_TARGET, 1, 1 playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET @@ -24812,7 +24812,7 @@ gBattleAnimMove_HighJumpKick:: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -24843,19 +24843,19 @@ TripleKickContinue: end TripleKickLeft: - create_wide_foot_sprite ANIM_TARGET, 4, x=-16, y=-8, duration=20, initPosition=1 + create_wide_foot_sprite ANIM_TARGET, 4, x=-16, y=-8, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=-16, y=-16, relative_to=ANIM_TARGET, animation=2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 goto TripleKickContinue TripleKickRight: - create_wide_foot_sprite ANIM_TARGET, 4, x=8, y=8, duration=20, initPosition=1 + create_wide_foot_sprite ANIM_TARGET, 4, x=8, y=8, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=8, y=0, relative_to=ANIM_TARGET, animation=2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 goto TripleKickContinue TripleKickCenter: - create_wide_foot_sprite ANIM_TARGET, 4, x=0, y=0, duration=20, initPosition=1 + create_wide_foot_sprite ANIM_TARGET, 4, x=0, y=0, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=-8, relative_to=ANIM_TARGET, animation=1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 goto TripleKickContinue @@ -24865,7 +24865,7 @@ gBattleAnimMove_DynamicPunch:: monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET - create_fist_sprite ANIM_TARGET, 3, x=0, y=0, duration=20, initPosition=1 + create_fist_sprite ANIM_TARGET, 3, x=0, y=0, duration=20 create_basic_hitsplat_sprite ANIM_TARGET, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 delay 1 @@ -24902,19 +24902,19 @@ gBattleAnimMove_Counter:: playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1 - create_fist_sprite ANIM_ATTACKER, 3, x=-15, y=18, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=-15, y=18, duration=8 delay 3 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=-4, relative_to=ANIM_TARGET, animation=0 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 - create_fist_sprite ANIM_ATTACKER, 3, x=0, y=-4, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=0, y=-4, duration=8 delay 3 create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=15, y=9, relative_to=ANIM_TARGET, animation=0 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 - create_fist_sprite ANIM_ATTACKER, 3, x=15, y=9, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 3, x=15, y=9, duration=8 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -24934,9 +24934,9 @@ gBattleAnimMove_VitalThrow:: createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -24, 0, 0, 4 waitforvisualfinish delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 delay 11 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 10 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -24947,7 +24947,7 @@ gBattleAnimMove_RockSmash:: setalpha 12, 8 delay 1 create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 - create_fist_sprite ANIM_ATTACKER, 2, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_ATTACKER, 2, x=0, y=0, duration=8 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish @@ -25078,7 +25078,7 @@ gBattleAnimMove_PetalDance:: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 8 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -25177,7 +25177,7 @@ gBattleAnimMove_AncientPower:: create_basic_hitsplat_sprite ANIM_ATTACKER, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -25237,7 +25237,7 @@ gBattleAnimMove_FirePunch:: call CreateFireSpiral playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish - create_fist_sprite ANIM_TARGET, 3, x=0, y=0, duration=8, initPosition=1 + create_fist_sprite ANIM_TARGET, 3, x=0, y=0, duration=8 create_basic_hitsplat_sprite ANIM_TARGET, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 call FireSpreadEffect @@ -25493,7 +25493,7 @@ gBattleAnimMove_ZapCannon:: gBattleAnimMove_SteelWing:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE waitforvisualfinish monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -25510,7 +25510,7 @@ gBattleAnimMove_SteelWing:: create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=-16, y=0, relative_to=ANIM_TARGET, animation=1 playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -25518,7 +25518,7 @@ gBattleAnimMove_SteelWing:: gBattleAnimMove_IronTail:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=1 + metallic_shine permanent=TRUE waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 @@ -25536,7 +25536,7 @@ gBattleAnimMove_IronTail:: gBattleAnimMove_PoisonTail:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=1, color=RGB(24, 6, 23) + metallic_shine permanent=TRUE, color=RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 @@ -25555,7 +25555,7 @@ gBattleAnimMove_PoisonTail:: gBattleAnimMove_MetalClaw:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - metallic_shine permanent=0 + metallic_shine permanent=FALSE waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 @@ -25678,7 +25678,7 @@ BideUnleash: create_basic_hitsplat_sprite ANIM_ATTACKER, 1, x=-8, y=-5, relative_to=ANIM_TARGET, animation=1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 7 waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 11, 0, RGB_RED waitforvisualfinish @@ -27718,11 +27718,11 @@ gBattleAnimMove_KnockOff:: create_basic_hitsplat_sprite ANIM_TARGET, 3, x=0, y=0, relative_to=ANIM_TARGET, animation=2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -12, 10, 0, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 5 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 delay 10 waitforvisualfinish end @@ -27778,9 +27778,9 @@ gBattleAnimMove_SkyUppercut:: delay 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 delay 30 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 6 delay 4 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 6 clearmonbg ANIM_DEF_PARTNER blendoff call UnsetBackground @@ -29537,20 +29537,20 @@ gBattleAnimMove_BreakneckBlitz:: playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 8 playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER - createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 @ 0, 0 + createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 1 playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER - createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 10, -10, 1, 1 @ +10, -10 + createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 10, -10, 1, 1 playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 1 playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER - createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 15, -15, 1, 1 @ +15, -15 + createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 15, -15, 1, 1 delay 1 playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER - createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 20, -20, 1, 1 @ +20, -20 + createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 20, -20, 1, 1 delay 1 playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER - createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 25, -25, 1, 1 @ +25, -25 + createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 25, -25, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4 waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -512, ANIM_TARGET, 0 @@ -29578,7 +29578,7 @@ gBattleAnimMove_AllOutPummeling:: createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 10 waitforvisualfinish call EndureEffect - loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER 9 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 blend_color_cycle selector=F_PAL_ATTACKER, delay=2, num_blends=2, initial_blend_y=0, target_blend_y=11, color=RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 call EndureEffect @@ -29692,7 +29692,7 @@ gBattleAnimMove_SupersonicSkystrike:: fadetobg BG_SKY waitbgfadeout createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 1 SupersonicSkystrikeOnPlayer + jumpargeq 7, 1, SupersonicSkystrikeOnPlayer SupersonicSkystrikeOnOpponent: createvisualtask AnimTask_StartSlidingBg, 5, -2048, 2048, 0, -1 goto FinishSupersonicSkystrike @@ -29709,14 +29709,14 @@ FinishSupersonicSkystrike: create_basic_hitsplat_sprite ANIM_ATTACKER, 2, x=0, y=0, relative_to=ANIM_TARGET, animation=0 playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -256, 21, 0, 4 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, -24, -16, 24 @ 12, -48, -16, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 16, -38, -10, 24 @ 16, -16, -10, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 14, -20, -18, 24 @ 14, -52, -18, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 12, -36, -16, 24 @ 12, -32, -16, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, -48, -16, 24 @ 12, -24, -16, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 16, -16, -10, 24 @ 16, -38, -10, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 14, -52, -18, 24 @ 14, -20, -18, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 12, -32, -16, 24 @ 12, -36, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, -24, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 16, -38, -10, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 14, -20, -18, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 12, -36, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, -48, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 16, -16, -10, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 14, -52, -18, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 12, -32, -16, 24 delay 48 clearmonbg ANIM_DEF_PARTNER blendoff @@ -29731,7 +29731,7 @@ gBattleAnimMove_AcidDownpour:: fadetobg BG_POISON waitbgfadeout createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 1 AcidDownpourOnPlayer + jumpargeq 7, 1, AcidDownpourOnPlayer AcidDownpourOnOpponent: createvisualtask AnimTask_StartSlidingBg, 5, 0, -240, 1, -1 goto FinishAcidDownpour @@ -29936,8 +29936,8 @@ gBattleAnimMove_ContinentalCrush:: createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 12, 4, -16, 18 delay 48 createvisualtask AnimTask_GetTimeOfDay, 2 - jumpargeq 0 0 ContinentalCrushDay - jumpargeq 0 2 ContinentalCrushAfternoon + jumpargeq 0, 0, ContinentalCrushDay + jumpargeq 0, 2, ContinentalCrushAfternoon ContinentalCrushNight: fadetobg BG_ROCK_FIELD_NIGHT goto FinishContinentalCrush @@ -29998,14 +29998,14 @@ FinishContinentalCrush: delay 5 playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -256, 21, 0, 4 - createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 12, -24, -16, 24 @ 12, -48, -16, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 16, -38, -10, 24 @ 16, -16, -10, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 14, -20, -18, 24 @ 14, -52, -18, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 12, -36, -16, 24 @ 12, -32, -16, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 12, -48, -16, 24 @ 12, -24, -16, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 16, -16, -10, 24 @ 16, -38, -10, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 14, -52, -18, 24 @ 14, -20, -18, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 12, -32, -16, 24 @ 12, -36, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 12, -24, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 16, -38, -10, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 14, -20, -18, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 12, -36, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 12, -48, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 16, -16, -10, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 14, -52, -18, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 12, -32, -16, 24 delay 5 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 7, 0, RGB_BLACK @undo pal change on tgt delay 16 @@ -30032,29 +30032,29 @@ ContinentalCrashBuffEffect: createsprite gContinentalCrushFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -12, 0, 1 return ContinentalCrushStockpileRocks: - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, -64, 32 @ 0,-32 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, -64, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 44, -44, 32 @ +44,-44 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 44, -44, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 60, 0, 32 @ +60,0 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 60, 0, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 40, 40, 32 @ +40,+40 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 40, 40, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, 56, 32 @ +0,+56 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, 56, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, -38, 38, 32 @ -38,+38 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, -38, 38, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, -54, 0, 32 @ -54, +0 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, -54, 0, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, -36, -36, 32 @ -36, -36 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, -36, -36, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, -50, 32 @ 0, -50 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, -50, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 34, -34, 32 @ +34, -34 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 34, -34, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 46, 0, 32 @ +46, +0 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 46, 0, 32 delay 2 - createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 32, 32, 32 @ +32, +32 + createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 32, 32, 32 delay 2 return @@ -30096,7 +30096,7 @@ gBattleAnimMove_SavageSpinOut:: delay 0 createvisualtask AnimTask_IsTargetPlayerSide, 2 delay 0 - jumpargeq 7 ANIM_TARGET SavageSpinOutOnPlayer + jumpargeq 7, ANIM_TARGET, SavageSpinOutOnPlayer SavageSpinOutOnOpponent: createsprite gSavageSpinOutCacoonSpriteTemplate, ANIM_TARGET, 2, 0, ANIM_TARGET, 2, 0, 0, 128 goto FinishSavageSpinOut @@ -30105,7 +30105,7 @@ SavageSpinOutOnPlayer: FinishSavageSpinOut: fadetobg BG_IN_AIR waitbgfadeout - createvisualtask AnimTask_StartSlidingBg, 5, 0, 4096, 0, -1 @+4096 + createvisualtask AnimTask_StartSlidingBg, 5, 0, 4096, 0, -1 waitbgfadein delay 16 call SlowSavageSpinOutBackgroundSpeed @@ -30200,7 +30200,7 @@ SavageSpinOutCrash_2: createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 12, -32, -16, 24 return SlowSavageSpinOutBackgroundSpeed: - createvisualtask AnimTask_StartSlidingBg, 5, 0, -682, 0, -1 @-682 + createvisualtask AnimTask_StartSlidingBg, 5, 0, -682, 0, -1 delay 1 return @@ -30304,29 +30304,29 @@ NeverendingNightmareAttackerRings: delay 14 return NeverendingNightmareHands: - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, -64, 32 @ 0,-32 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, -64, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 44, -44, 32 @ +44,-44 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 44, -44, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 60, 0, 32 @ +60,0 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 60, 0, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 40, 40, 32 @ +40,+40 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 40, 40, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 56, 32 @ +0,+56 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 56, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -38, 38, 32 @ -38,+38 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -38, 38, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -54, 0, 32 @ -54, +0 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -54, 0, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -36, -36, 32 @ -36, -36 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -36, -36, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, -50, 32 @ 0, -50 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, -50, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 34, -34, 32 @ +34, -34 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 34, -34, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 46, 0, 32 @ +46, +0 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 46, 0, 32 delay 2 - createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 32, 32, 32 @ +32, +32 + createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 32, 32, 32 delay 2 return NeverendingNightmareGeyser: @@ -30411,7 +30411,7 @@ gBattleAnimMove_CorkscrewCrash:: createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET CorkscrewCrashOnPlayer + jumpargeq 7, ANIM_TARGET, CorkscrewCrashOnPlayer CorkscrewCrashOnOpponent: createsprite gCorkscrewCrashRightUpSpriteTemplate, ANIM_ATTACKER, 50, -16, 136, 256, 56, 21 waitforvisualfinish @@ -30511,7 +30511,7 @@ gBattleAnimMove_InfernoOverdrive:: fadetobg BG_INFERNO_OVERDRIVE waitbgfadeout createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET InfernoOverdriveOnPlayer + jumpargeq 7, ANIM_TARGET, InfernoOverdriveOnPlayer InfernoOverdriveOnOpponent: createvisualtask AnimTask_StartSlidingBg, 5, -1280, 0, 0, -1 goto FinishInfernoOverdrive @@ -30820,7 +30820,7 @@ gBattleAnimMove_BloomDoom:: createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 0, 16, RGB(13, 31, 12) call BloomDoomPetalBlast createvisualtask AnimTask_IsTargetPartner, 5 - jumpargeq 0 1 BloomDoomFadeScreenTargetPartner + jumpargeq 0, 1, BloomDoomFadeScreenTargetPartner createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 1, 0, 16, RGB(13, 31, 12) @ green bg pal BloomDoomEnding: call BloomDoomPetalBlast @@ -30836,7 +30836,7 @@ BloomDoomHurricane: createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 return BloomDoomFlowerGeyser: - createsprite gBloomDoomFlowerGeyserSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -4, 16 @ -4, -16 + createsprite gBloomDoomFlowerGeyserSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -4, 16 delay 0 createsprite gBloomDoomFlowerGeyserSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 4109, 16 delay 0 @@ -30953,47 +30953,47 @@ gBattleAnimMove_GigavoltHavoc:: @ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 44, 64, 40, 1, 3 @ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 44, 192, 40, 2, 3 delay 20 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 waitforvisualfinish playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET @@ -31046,7 +31046,7 @@ gBattleAnimMove_GigavoltHavoc:: waitforvisualfinish end HavocSpearGeyser: - createsprite gGigavoltHavocGeyserSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, -4, 16 @ -4, -16 + createsprite gGigavoltHavocGeyserSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, -4, 16 delay 1 createsprite gGigavoltHavocGeyserSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 4109, 16 @ delay 1 @@ -31108,7 +31108,7 @@ gBattleAnimMove_ShatteredPsyche:: waitforvisualfinish ShatteredPsycheCheckBattler: createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET ShatteredPsycheOnPlayer + jumpargeq 7, ANIM_TARGET, ShatteredPsycheOnPlayer ShatteredPsycheOnOpponent: call ShatteredPsycheFlingOpponent waitforvisualfinish @@ -31124,7 +31124,7 @@ ShatteredPsycheFinish: restorebg createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 - createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 0 @ -8, -12 + createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 0 createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 1, 0, 0 createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 2, 0, 0 createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 3, 0, 0 @@ -31133,88 +31133,88 @@ ShatteredPsycheFinish: waitforvisualfinish end ShatteredPsycheFlingOpponent: - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4 @ -26, +16 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 26, -16, 1, 1 @ 26, -16 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 26, -16, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, -16, 1, 4 @ -26,-16 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, -16, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -26, 16, 1, 1 @ 26, 16 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -26, 16, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 32, 1, 4 @ 0,32 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 32, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0, -32, 1, 1 @ 0, -32 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0, -32, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, -32, 1, 4 @ 0,-32 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, -32, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0, 32, 1, 1 @ 0, 32 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0, 32, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, 16, 1, 4 @ 26,16 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, 16, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -26, -16, 1, 1 @ -26, -16 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -26, -16, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, -32, 1, 4 @ 26,-16 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, -32, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 26, 16, 1, 1 @ 0, 32 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 26, 16, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 5 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4 @ -26, +16 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 26, -16, 1, 1 @ 26, -16 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 26, -16, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, -16, 1, 4 @ -26,-16 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, -16, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -26, 16, 1, 1 @ 26, 16 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -26, 16, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish return ShatteredPsycheFlingPlayer: - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4 @ -26,-16 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 26, -16, 1, 1 @ 26, 16 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 26, -16, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 32, 0, 1, 4 @ 32,0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 32, 0, 1, 4 waitforvisualfinish createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -32, 0, 1, 1 @ playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -32, 0, 1, 4 @ -32,0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -32, 0, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 32, 0, 1, 1 @ 32, 0 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 32, 0, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 10, 32, 1, 4 @ 10, -32 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 10, 32, 1, 4 waitforvisualfinish - createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -10, 5, 1, 1 @ 10, -32 + createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, -10, 5, 1, 1 playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET delay 2 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 5 @@ -31229,7 +31229,7 @@ gBattleAnimMove_SubzeroSlammer:: fadetobg BG_ICE waitbgfadeout createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET SubzeroSlammerOnPlayer + jumpargeq 7, ANIM_TARGET, SubzeroSlammerOnPlayer SubzeroSlammerOnOpponent: createvisualtask AnimTask_StartSlidingBg, 5, -768, 0, 0, -1 goto SubzeroSlammerFinish @@ -31301,7 +31301,7 @@ SubzeroSlammerFinish: waitforvisualfinish playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 3 - createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 0 @ -8, -12 + createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 0 createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 1, 0, 0 createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 2, 0, 0 createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 3, 0, 0 @@ -31398,7 +31398,7 @@ gBattleAnimMove_DevastatingDrake:: createvisualtask AnimTask_StartSlidingBg, 5, 0, 4096, 0, -1 waitbgfadein createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET DevastatingDrakeOnPlayer + jumpargeq 7, ANIM_TARGET, DevastatingDrakeOnPlayer DevastatingDrakeOnOpponent: playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createsprite gDevastatingDrakeRightSpriteTemplate, ANIM_ATTACKER, 50, -16, 136, 256, 56, 21 @left to right @@ -31437,7 +31437,7 @@ DevastatingDrakeFinish: call DevastatingDrakeExplosion delay 6 createvisualtask AnimTask_IsTargetPartner, 5 - jumpargeq 0 1 DevastatingDrakeFadeTargetPartner + jumpargeq 0, 1, DevastatingDrakeFadeTargetPartner createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 6, 0, 16, RGB(0, 6, 16) call DevastatingDrakeExplosion waitforvisualfinish @@ -31738,7 +31738,7 @@ gBattleAnimMove_TwinkleTackle:: createsprite gTwinkleTackleStarGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET TwinkleTackleOnPlayer + jumpargeq 7, ANIM_TARGET, TwinkleTackleOnPlayer TwinkleTackleOnOpponent: call PlayerTwinkling goto TwinkleTackleFinish @@ -31896,8 +31896,8 @@ gBattleAnimMove_Catastropika:: unloadspritegfx ANIM_TAG_ROUND_SHADOW unloadspritepal ANIM_TAG_ROUND_SHADOW createvisualtask AnimTask_GetTimeOfDay, 2 - jumpargeq 0 0 CatastropikaDaytime - jumpargeq 0 2 CatastropikaAfternoon + jumpargeq 0, 0, CatastropikaDaytime + jumpargeq 0, 2, CatastropikaAfternoon CatastropikaNight: fadetobg BG_MAX_LIGHTNING goto CatastropikaFinish @@ -31939,49 +31939,49 @@ CatastropikaFinish: createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 24, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 24, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 24, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 24, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 24, 44, 192, 40, 2, 3 delay 20 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 26, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 26, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 26, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 26, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 26, 44, 192, 40, 2, 3 delay 20 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, 192, 40, 2, 3 delay 20 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, 192, 40, 2, 3 delay 20 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, 44, 192, 40, 2, 3 delay 20 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 21, 44, 192, 40, 2, 3 delay 20 restorebg waitbgfadeout @@ -32007,10 +32007,10 @@ CatastropikaFinish: createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, -64, -40, 37, 44, 224, 8, 2, 3 delay 13 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -256, 21, 0, 4 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, -24, -16, 24 @ 12, -48, -16, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 16, -38, -10, 24 @ 16, -16, -10, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 14, -20, -18, 24 @ 14, -52, -18, 24 - createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 12, -36, -16, 24 @ 12, -32, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, -24, -16, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 16, -38, -10, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 14, -20, -18, 24 + createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 12, -36, -16, 24 call CatastropikaThundering invisible ANIM_TARGET unloadspritegfx ANIM_TAG_MUD_SAND @@ -32090,7 +32090,7 @@ gBattleAnimMove_10000000VoltThunderbolt:: createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 44, 192, 40, 2, 3 delay 16 playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET invert_screen_color scenery=257 @thunder flash @@ -32119,7 +32119,7 @@ gBattleAnimMove_10000000VoltThunderbolt:: createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, 0, 40, 0, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, 64, 40, 1, 3 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, 128, 40, 0, 3 - createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, SOUND_PAN_ATTACKER, 40, 2, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 28, 44, 192, 40, 2, 3 delay 20 playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET invert_screen_color scenery=257 @thunder flash @@ -32328,8 +32328,8 @@ gBattleAnimMove_StokedSparksurfer:: unloadspritegfx ANIM_TAG_ROUND_SHADOW unloadspritepal ANIM_TAG_ROUND_SHADOW createvisualtask AnimTask_GetTimeOfDay, 2 - jumpargeq 0 0 StokedSparksurferDay - jumpargeq 0 2 StokedSparksurferAfternoon + jumpargeq 0, 0, StokedSparksurferDay + jumpargeq 0, 2, StokedSparksurferAfternoon StokedSparksurferNight: fadetobg BG_MAX_LIGHTNING goto StokedSparksurferFinish @@ -32560,7 +32560,7 @@ gBattleAnimMove_PulverizingPancake:: createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 10 waitforvisualfinish createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET PulverizingPancakeOnPlayer + jumpargeq 7, ANIM_TARGET, PulverizingPancakeOnPlayer PulverizingPancakeOnOpponent: createsprite gPulverizingPancakeRedDetectSpriteTemplate, ANIM_ATTACKER, 13, 20, -20 goto PulverizingPancakeFinish @@ -32639,7 +32639,7 @@ PulverizingPancakeDiggingRun: delay 5 return PulverizingPancakeSlowBackground: - createvisualtask AnimTask_StartSlidingBg, 5, 0, -682, 0, -1 @-682 + createvisualtask AnimTask_StartSlidingBg, 5, 0, -682, 0, -1 delay 1 return PulverizingPancakeExplosion: @@ -32669,7 +32669,7 @@ gBattleAnimMove_GenesisSupernova:: call SetPsychicBackground playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET GenesisSupernovaOnPlayer + jumpargeq 7, ANIM_TARGET, GenesisSupernovaOnPlayer GenesisSupernovaOnOpponent: call GenesisSupernovaBuffEffectPlayer_1 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 11, (RGB(28, 3, 22) | RGB_ALPHA) @@ -32872,7 +32872,7 @@ gBattleAnimMove_SinisterArrowRaid:: waitforvisualfinish invisible ANIM_ATTACKER createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET SinisterArrowRaidOnPlayer + jumpargeq 7, ANIM_TARGET, SinisterArrowRaidOnPlayer SinisterArrowRaidOnOpponent: playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createsprite gArrowRaidFlyRightSpriteTemplate, ANIM_ATTACKER, 50, -16, 136, 256, 56, 21 @left to right @@ -33443,8 +33443,8 @@ OceanicOperettaExplosion: gBattleAnimMove_SplinteredStormshards:: createvisualtask AnimTask_GetLycanrocForm, 2 - jumpargeq 0 0 SplinteredStormshardsDayForme - jumpargeq 0 2 SplinteredStormshardsDuskForme + jumpargeq 0, 0, SplinteredStormshardsDayForme + jumpargeq 0, 2, SplinteredStormshardsDuskForme SplinteredStormshardsNightForme: fadetobg BG_ROCK_FIELD_NIGHT goto SplinteredStormshardsFinishFade @@ -33460,7 +33460,7 @@ SplinteredStormshardsFinishFade: waitforvisualfinish playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET SplinteredStormshardsByOpponent + jumpargeq 7, ANIM_TARGET, SplinteredStormshardsByOpponent SplinteredStormshardsByPlayer: loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 call SplinteredStormshardsPlayer_Rising1 @@ -33541,7 +33541,7 @@ SplinteredStormshardsExplosionOpponent: delay 2 return SplinteredStormshardsByOpponent: - loopsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET 16 12 + loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 call SplinteredStormshardsOpponent_Rising1 delay 2 createsprite gSplinteredShardsFlySpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 @@ -33870,7 +33870,7 @@ gBattleAnimMove_ClangorousSoulblaze:: delay 5 call ClangorousSoulblazePulse_4 createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET ClangorousSoulblazeOnOpponent + jumpargeq 7, ANIM_TARGET, ClangorousSoulblazeOnOpponent ClangorousSoulblazeOnPlayer: playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, -16, ANIM_ATTACKER, 1 @@ -34128,7 +34128,7 @@ gBattleAnimMove_GuardianOfAlola:: createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0, 11, 0, RGB_BLACK playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 37 - loopsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET 16 9 + loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 9 call GuardianOfAlolaRocksTarget call GuardianOfAlolaRockGeyser call GuardianOfAlolaRockGeyser @@ -34426,7 +34426,7 @@ gBattleAnimMove_MenacingMoonrazeMaelstrom:: fadetobg BG_COSMIC waitbgfadeout createvisualtask AnimTask_IsTargetPlayerSide, 2 - jumpargeq 7 ANIM_TARGET MenacingMoonrazeMaelstromOnPlayer + jumpargeq 7, ANIM_TARGET, MenacingMoonrazeMaelstromOnPlayer MenacingMoonrazeMaelstromOnOpponent: createvisualtask AnimTask_StartSlidingBg, 5, -768, 512, 1, -1 goto MenacingMoonrazeMaelstromFinish diff --git a/src/battle_anim_dark.c b/src/battle_anim_dark.c index 2af74516bd5e..10915573b158 100644 --- a/src/battle_anim_dark.c +++ b/src/battle_anim_dark.c @@ -986,7 +986,7 @@ static void AnimTask_MetallicShine_Step(u8 taskId) { spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); paletteNum = 16 + gSprites[spriteId].oam.paletteNum; - if (gTasks[taskId].data[1] == 0) + if (gTasks[taskId].data[1] == FALSE) SetGrayscaleOrOriginalPalette(paletteNum, TRUE); DestroySprite(&gSprites[gTasks[taskId].data[0]]); diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index 74d3d38cff36..86a3b38f1f30 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -496,7 +496,7 @@ static void ReverseVerticalDipDirection(struct Sprite *sprite) static void SlideMonToOriginalPos(struct Sprite *sprite) { u32 monSpriteId; - if (!gBattleAnimArgs[0]) + if (gBattleAnimArgs[0] == ANIM_ATTACKER) monSpriteId = gBattlerSpriteIds[gBattleAnimAttacker]; else monSpriteId = gBattlerSpriteIds[gBattleAnimTarget];