From 269aebaca762b91f7b455dba2534d26b54187ec5 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 13 Nov 2018 15:35:46 -0500 Subject: [PATCH 1/2] update createsprite macro and rename BANK to BATTLER --- asm/macros/battle_anim_script.inc | 14 + data/battle_anim_scripts.s | 5862 ++++++++++++++--------------- include/constants/battle_anim.h | 8 +- src/battle_anim.c | 48 +- src/battle_anim_80A5C6C.c | 10 +- src/battle_anim_sound_tasks.c | 20 +- 6 files changed, 2988 insertions(+), 2974 deletions(-) diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 1d5b01de7..78cbf1725 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -20,6 +20,20 @@ .Lsprite_\@_2: .endm +.macro createsprite2 template, anim_battler, subpriority_offset, argv:vararg + .byte 0x02 + .4byte \template + .if \anim_battler == ANIM_BATTLER_TARGET + .byte 0x80 | (\subpriority_offset & 0x7F) + .else + .byte (\subpriority_offset & 0x7F) + .endif + .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 +.Lsprite_\@_1: + .2byte \argv +.Lsprite_\@_2: + .endm + .macro createvisualtask addr, priority, argv:vararg .byte 0x03 .4byte \addr diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index e86c7b784..82b6c265b 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -424,207 +424,207 @@ Move_NONE: Move_MIRROR_MOVE: Move_POUND: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_DOUBLE_SLAP: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight DoubleSlapContinue: - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end DoubleSlapLeft: - createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 goto DoubleSlapContinue DoubleSlapRight: - createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 0, 1, 2 goto DoubleSlapContinue Move_POISON_POWDER: loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_STUN_SPORE: loadspritegfx ANIM_TAG_STUN_SPORE loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 - createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 - createsprite gStunSporeParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 - createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 - createsprite gStunSporeParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 - createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SLEEP_POWDER: loadspritegfx ANIM_TAG_SLEEP_POWDER loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 - createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 - createsprite gSleepPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 - createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 - createsprite gSleepPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 - createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SWIFT: loadspritegfx ANIM_TAG_YELLOW_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1 + createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1 + createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, -10, 22, 15, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1 + createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 18, 1 delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1 + createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1 + createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_STRENGTH: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 + createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_BATTLER_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_TARGET, 18, 6, 2, 4 delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 16, 12, 1, 1 delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -16, -12, 1, 1 delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 3, 4, 1, 1 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_TACKLE: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_BODY_SLAM: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER waitforvisualfinish delay 11 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 26, 0, 0, 5 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, -10, 0, 1, 0 loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 delay 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 6 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_SUPERSONIC: loadspritegfx ANIM_TAG_GOLD_RING - monbg ANIM_ATK_PARTNER - monbgprio_2A ANIM_ATTACKER + monbg ANIM_BATTLER_ATK_PARTNER + monbgprio_2A ANIM_BATTLER_ATTACKER setalpha 12, 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1 call Supersonic1 call Supersonic1 call Supersonic1 @@ -632,183 +632,183 @@ Move_SUPERSONIC: call Supersonic1 call Supersonic1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff end Supersonic1: playsewithpan SE_W048, SOUND_PAN_ATTACKER - createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + createsprite2 gSupersonicWaveSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return Move_SCREECH: loadspritegfx ANIM_TAG_PURPLE_RING - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 3, 0, 2, 1 call Screech1 call Screech1 delay 16 - createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_TARGET + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_BATTLER_TARGET waitforvisualfinish end Screech1: playsewithpan SE_W103, SOUND_PAN_ATTACKER - createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + createsprite2 gScreechWaveSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return Move_FLAME_WHEEL: loadspritegfx ANIM_TAG_SMALL_EMBER - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0 + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET + createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 0 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 4 + createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 4 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 8 + createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 8 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 12 + createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 12 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 16 + createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 16 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 20 + createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 20 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 24 + createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 24 playsewithpan SE_W172, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1 - createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 8, 1 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BATTLER_TARGET, RGB_RED, 12, 1, 1 playsewithpan SE_W172B, SOUND_PAN_TARGET call FireMoveEffect delay 7 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 9 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end FlameWheel1: @ Unused - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 50 + createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 50 delay 4 return Move_PIN_MISSILE: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gPinMissileSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 + createsprite2 gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 - createsprite gPinMissileSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 + createsprite2 gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 9 - createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + createsprite2 gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 14 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_ICICLE_SPEAR: loadspritegfx ANIM_TAG_ICICLE_SPEAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W196, SOUND_PAN_ATTACKER - createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 + createsprite2 gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 - createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 + createsprite2 gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 9 - createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + createsprite2 gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 14 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_TAKE_DOWN: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -24, 8, 23, 10, 40, 10 delay 35 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 - createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, -10, 0, 1, 0 playsewithpan SE_W025B, SOUND_PAN_TARGET delay 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 2 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_DOUBLE_EDGE: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 2, 4 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 16, 16, RGB_WHITE - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, 0, 1, 0 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish createvisualtask sub_80D6134, 2, 8, -256, 0, 0 createvisualtask sub_80D6134, 2, 8, -256, 1, 0 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_WHITE + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 12, 1 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, RGB_WHITE waitforvisualfinish createvisualtask sub_80D6134, 2, 8, -256, 0, 1 createvisualtask sub_80D6134, 2, 8, -256, 1, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7 waitforvisualfinish end @@ -816,39 +816,39 @@ Move_POISON_STING: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gLinearStingerSpriteTemplate, 130, 20, 0, -8, 0, 20 + createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 5, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish call PoisonBubblesEffect waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_TWINEEDLE: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2 - createsprite gLinearStingerSpriteTemplate, 130, 10, -4, 0, -4, 20 - createsprite gLinearStingerSpriteTemplate, 130, 20, 12, 10, 12, 20 + createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -4, 0, -4, 20 + createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 12, 10, 12, 20 delay 20 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 - createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, -4, 1, 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 5, 1 + createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, 0, -4, 1, 3 loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 delay 1 - createsprite gBattleAnimSpriteTemplate_8597370, 3, 10, 12, 1, 3 + createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end @@ -862,7 +862,7 @@ Move_FIRE_BLAST: createvisualtask sub_8116620, 10, 1, 3, 0, 8, RGB_BLACK waitforvisualfinish delay 19 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 20, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 20, 1 call FireBlast2 delay 3 call FireBlast2 @@ -885,31 +885,31 @@ Move_FIRE_BLAST: waitforvisualfinish end FireBlast1: - createsprite gUnknown_0859551C, 130, 0, 0, 0 - createsprite gUnknown_0859551C, 130, 0, 0, 51 - createsprite gUnknown_0859551C, 130, 0, 0, 102 - createsprite gUnknown_0859551C, 130, 0, 0, 153 - createsprite gUnknown_0859551C, 130, 0, 0, 204 + createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 0 + createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 51 + createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 102 + createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 153 + createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 204 delay 5 return FireBlast2: - createsprite gUnknown_0859556C, 130, 0, 0, 10, 0, -2 - createsprite gUnknown_0859556C, 130, 0, 0, 13, -2, 0 - createsprite gUnknown_0859556C, 130, 0, 0, 13, 2, 0 - createsprite gUnknown_0859556C, 130, 0, 0, 15, -2, 2 - createsprite gUnknown_0859556C, 130, 0, 0, 15, 2, 2 + createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 10, 0, -2 + createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 13, -2, 0 + createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 13, 2, 0 + createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 15, -2, 2 + createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 15, 2, 2 return Move_LEECH_SEED: loadspritegfx ANIM_TAG_SEED playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 + createsprite2 gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite gLeechSeedSpriteTemplate, 130, 15, 0, -16, 24, 35, -40 + createsprite2 gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 16, 24, 35, -37 + createsprite2 gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish @@ -918,11 +918,11 @@ Move_LEECH_SEED: Move_EMBER: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 - createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1 + createsprite2 gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 - createsprite gEmberSpriteTemplate, 130, 20, 0, 0, 24, 20, 1 + createsprite2 gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 24, 20, 1 delay 4 - createsprite gEmberSpriteTemplate, 130, 20, 0, 16, 24, 20, 1 + createsprite2 gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, 16, 24, 20, 1 delay 16 playsewithpan SE_W172, SOUND_PAN_TARGET call Ember1 @@ -931,29 +931,29 @@ Move_EMBER: end Ember1: - createsprite gEmberFlareSpriteTemplate, 130, -24, 24, 24, 24, 20, 1, 1 + createsprite2 gEmberFlareSpriteTemplate, ANIM_BATTLER_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 delay 4 return Move_MEGA_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET delay 2 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 0, 50 + createsprite2 gMegaPunchKickSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 50 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 50 call SetImpactBackground - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 22, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff delay 2 restorebg @@ -981,22 +981,22 @@ SetImpactContestsBG: Move_MEGA_KICK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET delay 2 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 1, 50 + createsprite2 gMegaPunchKickSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 50 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 50 playsewithpan SE_W025B, SOUND_PAN_TARGET call SetImpactBackground - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 22, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff delay 2 restorebg @@ -1006,47 +1006,47 @@ Move_MEGA_KICK: Move_COMET_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 choosetwoturnanim CometPunchLeft, CometPunchRight CometPunchContinue: - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end CometPunchLeft: - createsprite gBasicHitSplatSpriteTemplate, 2, -8, -8, 1, 2 - createsprite gFistFootSpriteTemplate, 3, -8, 0, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, -8, 1, 2 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, 0, 8, 1, 0 goto CometPunchContinue CometPunchRight: - createsprite gBasicHitSplatSpriteTemplate, 2, 8, -8, 1, 2 - createsprite gFistFootSpriteTemplate, 3, 8, 0, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, -8, 1, 2 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 0, 8, 1, 0 goto CometPunchContinue Move_SONIC_BOOM: loadspritegfx ANIM_TAG_AIR_WAVE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 call SonicBoom1 call SonicBoom1 call SonicBoom1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 10, 1 call SonicBoom2 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end SonicBoom1: playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gSonicBoomSpriteTemplate, 130, 16, 0, 0, 0, 15 + createsprite2 gSonicBoomSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return SonicBoom2: - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 2 delay 4 return @@ -1092,15 +1092,15 @@ Move_THUNDERBOLT: createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 20 - createsprite gBattleAnimSpriteTemplate_85957E0, 131, 44, 0, 0, 3 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 0, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 64, 40, 1, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 128, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 192, 40, 2, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 32, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 96, 40, 1, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 160, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 224, 40, 2, -32765 + createsprite2 gBattleAnimSpriteTemplate_85957E0, ANIM_BATTLER_TARGET, 3, 44, 0, 0, 3 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 playsewithpan SE_W063, SOUND_PAN_TARGET delay 0 createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK @@ -1131,11 +1131,11 @@ Move_THUNDER_WAVE: playsewithpan SE_W086, SOUND_PAN_TARGET delay 20 loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 - createsprite gUnknown_08595840, 130, -16, -16 + createsprite2 gUnknown_08595840, ANIM_BATTLER_TARGET, 2, -16, -16 delay 4 - createsprite gUnknown_08595840, 130, -16, 0 + createsprite2 gUnknown_08595840, ANIM_BATTLER_TARGET, 2, -16, 0 delay 4 - createsprite gUnknown_08595840, 130, -16, 16 + createsprite2 gUnknown_08595840, ANIM_BATTLER_TARGET, 2, -16, 16 waitforvisualfinish createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish @@ -1144,69 +1144,69 @@ Move_THUNDER_WAVE: Move_BEAT_UP: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 choosetwoturnanim BeatUpLeft, BeatUpRight BeatUpContinue: waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end BeatUpLeft: - createsprite gBasicHitSplatSpriteTemplate, 130, -20, -20, 1, 2 - createsprite gFistFootSpriteTemplate, 131, -20, -12, 8, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, -20, 1, 2 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, -20, -12, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 - createsprite gFistFootSpriteTemplate, 131, 8, 8, 8, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 0, 1, 2 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, 8, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET goto BeatUpContinue BeatUpRight: - createsprite gBasicHitSplatSpriteTemplate, 130, 12, -20, 1, 2 - createsprite gFistFootSpriteTemplate, 131, 12, -12, 8, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 12, -20, 1, 2 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 12, -12, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 130, -12, 0, 1, 2 - createsprite gFistFootSpriteTemplate, 131, -12, 8, 8, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -12, 0, 1, 2 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, -12, 8, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET goto BeatUpContinue Move_STOMP: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET - createsprite gUnknown_08595F60, 3, 0, -32, 15 + createsprite2 gUnknown_08595F60, ANIM_BATTLER_ATTACKER, 3, 0, -32, 15 delay 19 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 4, 9, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_TAIL_WHIP: loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end Move_CUT: loadspritegfx ANIM_TAG_CUT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W015, SOUND_PAN_TARGET - createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + createsprite2 gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 delay 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff waitforvisualfinish end @@ -1214,31 +1214,31 @@ Move_CUT: Move_HIDDEN_POWER: loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 waitforvisualfinish delay 30 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB(31, 31, 19), 12, 5, 1 delay 4 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 playsewithpan SE_W179, SOUND_PAN_ATTACKER - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 0 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 42 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 84 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 126 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 168 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 210 + createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 0 + createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 42 + createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 84 + createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 126 + createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 168 + createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 210 delay 52 setarg 7, -1 playsewithpan SE_W115, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 0 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 32 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 64 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 96 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 128 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 160 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 192 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 224 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 + createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0 + createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 32 + createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 64 + createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 96 + createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 128 + createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 160 + createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 192 + createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 224 end Move_REVERSAL: @@ -1246,32 +1246,32 @@ Move_REVERSAL: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 playsewithpan SE_W179, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 0 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 42 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 84 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 126 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 168 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 210 + createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 0 + createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 42 + createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 84 + createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 126 + createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 168 + createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 210 waitforvisualfinish delay 20 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 8 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 10, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 10, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 end Move_PURSUIT: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET fadetobg BG_DARK waitbgfadein delay 0 @@ -1279,7 +1279,7 @@ Move_PURSUIT: choosetwoturnanim PursuitNormal, PursuitOnSwitchout PursuitContinue: waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff delay 0 restorebg @@ -1287,69 +1287,69 @@ PursuitContinue: end PursuitNormal: playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 goto PursuitContinue PursuitOnSwitchout: playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 goto PursuitContinue Move_SPIKE_CANNON: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 - createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 - createsprite gLinearStingerSpriteTemplate, 2, 10, -8, -8, -8, 20 - createsprite gLinearStingerSpriteTemplate, 2, 18, 0, 0, 0, 20 - createsprite gLinearStingerSpriteTemplate, 2, 26, 8, 8, 8, 20 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 + createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -8, -8, -8, 20 + createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 18, 0, 0, 0, 20 + createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 8, 8, 8, 20 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_8597370, 3, -8, -8, 1, 2 - createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, 0, 1, 2 - createsprite gBattleAnimSpriteTemplate_8597370, 3, 8, 8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 + createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 + createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 7, 1 loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_SWORDS_DANCE: loadspritegfx ANIM_TAG_SWORD - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 playsewithpan SE_W014, SOUND_PAN_ATTACKER - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 - createsprite gBattleAnimSpriteTemplate_8593380, 2, 0, 0 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 16, 6, 1, 4 + createsprite2 gBattleAnimSpriteTemplate_8593380, ANIM_BATTLER_ATTACKER, 2, 0, 0 delay 22 createvisualtask sub_8115D94, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER blendoff delay 1 end Move_PSYCH_UP: loadspritegfx ANIM_TAG_SPIRAL - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10 - createsprite gUnknown_08596548, 2, 0, 0, 0, 0 - createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER + createsprite2 gUnknown_08596548, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_BATTLER_ATTACKER delay 127 delay 4 playsewithpan SE_W060, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 createvisualtask sub_8116620, 9, 2, 2, 10, 0, RGB_YELLOW delay 30 - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff waitforvisualfinish end @@ -1358,43 +1358,43 @@ Move_DIZZY_PUNCH: loadspritegfx ANIM_TAG_DUCK loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 call DizzyPunch1 - createsprite gFistFootSpriteTemplate, 133, 16, 8, 20, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 5, 16, 8, 20, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 16, 0, 1, 1 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08595F78, 131, 16, 8, 160, -32 - createsprite gUnknown_08595F78, 131, 16, 8, -256, -40 - createsprite gUnknown_08595F78, 131, 16, 8, 128, -16 - createsprite gUnknown_08595F78, 131, 16, 8, 416, -38 - createsprite gUnknown_08595F78, 131, 16, 8, -128, -22 - createsprite gUnknown_08595F78, 131, 16, 8, -384, -31 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, 160, -32 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, -256, -40 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, 128, -16 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, 416, -38 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, -128, -22 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, -384, -31 delay 10 call DizzyPunch1 - createsprite gFistFootSpriteTemplate, 133, -16, -8, 20, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 5, -16, -8, 20, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -16, -16, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08595F78, 131, -16, -8, 160, -32 - createsprite gUnknown_08595F78, 131, -16, -8, -256, -40 - createsprite gUnknown_08595F78, 131, -16, -8, 128, -16 - createsprite gUnknown_08595F78, 131, -16, -8, 416, -38 - createsprite gUnknown_08595F78, 131, -16, -8, -128, -22 - createsprite gUnknown_08595F78, 131, -16, -8, -384, -31 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, 160, -32 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, -256, -40 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, 128, -16 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, 416, -38 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, -128, -22 + createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, -384, -31 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end DizzyPunch1: - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 6 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 7, 1 return Move_FIRE_SPIN: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 47, 1 call FireSpinEffect call FireSpinEffect call FireSpinEffect @@ -1402,23 +1402,23 @@ Move_FIRE_SPIN: end FireSpinEffect: - createsprite gUnknown_08596B88, 130, 0, 28, 528, 30, 13, 50, 1 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 28, 528, 30, 13, 50, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 32, 480, 20, 16, -46, 1 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 32, 480, 20, 16, -46, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 33, 576, 20, 8, 42, 1 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 33, 576, 20, 8, 42, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 31, 400, 25, 11, -42, 1 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 31, 400, 25, 11, -42, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 28, 512, 25, 16, 46, 1 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 28, 512, 25, 16, 46, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 33, 464, 30, 15, -50, 1 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 33, 464, 30, 15, -50, 1 delay 2 return Move_FURY_CUTTER: loadspritegfx ANIM_TAG_CUT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_IsFuryCutterHitRight, 2 @@ -1432,26 +1432,26 @@ FuryCutterContinue: goto FuryCutterStrongest FuryCutterContinue2: delay 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff waitforvisualfinish end FuryCutterLeft: - createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + createsprite2 gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 goto FuryCutterContinue FuryCutterRight: - createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 1 + createsprite2 gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 1 goto FuryCutterContinue FuryCutterMedium: - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(9, 8, 10), 4, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 FuryCutterStrong: - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 FuryCutterStrongest: - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 Move_SELF_DESTRUCT: @@ -1469,73 +1469,73 @@ Move_SELF_DESTRUCT: end SelfDestruct1: playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 24, -24, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -16, 16, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -24, -12, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_SLAM: loadspritegfx ANIM_TAG_SLAM_HIT loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W004, SOUND_PAN_ATTACKER - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 - createsprite gUnknown_085928D0, 2, 0, 0 + createsprite2 gUnknown_085928D0, ANIM_BATTLER_ATTACKER, 2, 0, 0 delay 3 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -12, 10, 0, 3 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 delay 3 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 0, 3, 6, 1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_VINE_WHIP: loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 6 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_085928E8, 130, 0, 0 + createsprite2 gUnknown_085928E8, ANIM_BATTLER_TARGET, 2, 0, 0 delay 6 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 6, 1 end Move_DRILL_PECK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES - createsprite gUnknown_08592CD8, 2, 0 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, 2, 1 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 1 delay 2 loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 createvisualtask sub_810EB88, 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 waitforvisualfinish - createsprite gUnknown_08592CD8, 2, 2 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 2 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 6 waitforvisualfinish end @@ -1543,86 +1543,86 @@ Move_WATERFALL: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_ICE_CRYSTALS - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 23, 1 delay 5 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 2, 10, 10, 25, 0 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 10, 10, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 2, -15, 0, 25, 0 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -15, 0, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 2, 20, 10, 25, 0 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 20, 10, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 2, 0, -10, 25, 0 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 0, -10, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 2, -10, 15, 25, 0 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -10, 15, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 2, 25, 20, 25, 0 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 25, 20, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 2, -20, 20, 25, 0 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -20, 20, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 2, 12, 0, 25, 0 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 5 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 5 delay 6 call UnderWaterAttack1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end UnderWaterAttack1: playsewithpan SE_W127, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1 - createsprite gUnknown_08597388, 3, 0, 20, 1, 1 - createsprite gUnknown_08595250, 4, 0, 20 - createsprite gUnknown_08595250, 4, 0, 20 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 17, 1 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 20, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 20 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 20 delay 2 - createsprite gUnknown_08597388, 3, 0, 15, 1, 1 - createsprite gUnknown_08595250, 4, 0, 15 - createsprite gUnknown_08595250, 4, 0, 15 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 15, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 15 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 15 delay 2 - createsprite gUnknown_08597388, 3, 0, 10, 1, 1 - createsprite gUnknown_08595250, 4, 0, 10 - createsprite gUnknown_08595250, 4, 0, 10 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 10, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 10 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 10 delay 2 - createsprite gUnknown_08597388, 3, 0, 5, 1, 1 - createsprite gUnknown_08595250, 4, 0, 5 - createsprite gUnknown_08595250, 4, 0, 5 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 5, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 5 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 5 delay 2 - createsprite gUnknown_08597388, 3, 0, 0, 1, 1 - createsprite gUnknown_08595250, 4, 0, 0 - createsprite gUnknown_08595250, 4, 0, 0 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 0 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 0 delay 2 - createsprite gUnknown_08597388, 3, 0, -5, 1, 1 - createsprite gUnknown_08595250, 4, 0, -5 - createsprite gUnknown_08595250, 4, 0, -5 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, -5, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -5 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -5 delay 2 - createsprite gUnknown_08597388, 3, 0, -10, 1, 1 - createsprite gUnknown_08595250, 4, 0, -10 - createsprite gUnknown_08595250, 4, 0, -10 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, -10, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -10 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -10 delay 2 - createsprite gUnknown_08597388, 3, 0, -15, 1, 1 - createsprite gUnknown_08595250, 4, 0, -15 - createsprite gUnknown_08595250, 4, 0, -15 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, -15, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -15 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -15 delay 2 - createsprite gUnknown_08597388, 3, 0, -20, 1, 1 - createsprite gUnknown_08595250, 4, 0, -20 - createsprite gUnknown_08595250, 4, 0, -20 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, -20, 1, 1 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -20 + createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -20 return Move_EXPLOSION: loadspritegfx ANIM_TAG_EXPLOSION - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 @@ -1637,19 +1637,19 @@ Move_EXPLOSION: end Explosion1: playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 24, -24, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -16, 16, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -24, -12, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1659,7 +1659,7 @@ Move_DEFENSE_CURL: createvisualtask sub_811489C, 5, 0, 0 createvisualtask sub_815B338, 5 waitforvisualfinish - createsprite gUnknown_085CE338, 2, 0, 6, 0, 1 + createsprite2 gUnknown_085CE338, ANIM_BATTLER_ATTACKER, 2, 0, 6, 0, 1 waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 waitforvisualfinish @@ -1667,25 +1667,25 @@ Move_DEFENSE_CURL: Move_PROTECT: loadspritegfx ANIM_TAG_PROTECT - monbg ANIM_ATK_PARTNER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATK_PARTNER + monbgprio_28 ANIM_BATTLER_ATTACKER waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 - createsprite gUnknown_08592ADC, 2, 24, 0, 90 + createsprite2 gUnknown_08592ADC, ANIM_BATTLER_ATTACKER, 2, 24, 0, 90 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER end Move_DETECT: loadspritegfx ANIM_TAG_SPARKLE_4 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE delay 18 playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite gUnknown_0853EE84, 13, 20, -20 + createsprite2 gUnknown_0853EE84, ANIM_BATTLER_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 9, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 9, 0, RGB_BLACK createvisualtask sub_8116620, 10, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end @@ -1693,7 +1693,7 @@ Move_DETECT: Move_FRUSTRATION: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetFrustrationPowerLevel, 1 jumpreteq 0, Frustration_Strongest @@ -1702,135 +1702,135 @@ Move_FRUSTRATION: goto Frustration_Weak Frustration_Continue: waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Frustration_Strongest: playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_ATTACKER, 1, 0, 15, 1 createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, 2, 0, 20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, 2, 0, 20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 - createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_BATTLER_ATTACKER delay 5 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 30, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 24, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -24, -16, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 4, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -16, 19, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, -18, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Strong: playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_ATTACKER, 1, 0, 15, 1 createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, 2, 0, 20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask sub_815C3A8, 5 delay 7 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 8, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 delay 14 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 delay 14 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 waitforvisualfinish createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Medium: playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, 2, 0, 20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 4, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 goto Frustration_Continue Frustration_Weak: - createsprite gUnknown_085CE4D0, 2, 20, -28 + createsprite2 gUnknown_085CE4D0, ANIM_BATTLER_ATTACKER, 2, 20, -28 waitforvisualfinish delay 10 - createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 2 delay 12 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 goto Frustration_Continue Move_SAFEGUARD: loadspritegfx ANIM_TAG_GUARD_RING - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 8, 8 playsewithpan SE_W208, SOUND_PAN_ATTACKER - createsprite gUnknown_08593C64, 2 + createsprite2 gUnknown_08593C64, ANIM_BATTLER_ATTACKER, 2 delay 4 - createsprite gUnknown_08593C64, 2 + createsprite2 gUnknown_08593C64, ANIM_BATTLER_ATTACKER, 2 delay 4 - createsprite gUnknown_08593C64, 2 + createsprite2 gUnknown_08593C64, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff end Move_PAIN_SPLIT: loadspritegfx ANIM_TAG_PAIN_SPLIT - createsprite gUnknown_085CE590, 2, -8, -42, 0 - createsprite gUnknown_085CE590, 130, -8, -42, 1 + createsprite2 gUnknown_085CE590, ANIM_BATTLER_ATTACKER, 2, -8, -42, 0 + createsprite2 gUnknown_085CE590, ANIM_BATTLER_TARGET, 2, -8, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 0 createvisualtask sub_815CA20, 2, 1, 0 waitforvisualfinish - createsprite gUnknown_085CE590, 2, -24, -42, 0 - createsprite gUnknown_085CE590, 130, -24, -42, 1 + createsprite2 gUnknown_085CE590, ANIM_BATTLER_ATTACKER, 2, -24, -42, 0 + createsprite2 gUnknown_085CE590, ANIM_BATTLER_TARGET, 2, -24, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 1 createvisualtask sub_815CA20, 2, 1, 1 waitforvisualfinish - createsprite gUnknown_085CE590, 2, 8, -42, 0 - createsprite gUnknown_085CE590, 130, 8, -42, 1 + createsprite2 gUnknown_085CE590, ANIM_BATTLER_ATTACKER, 2, 8, -42, 0 + createsprite2 gUnknown_085CE590, ANIM_BATTLER_TARGET, 2, 8, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 2 @@ -1840,39 +1840,39 @@ Move_PAIN_SPLIT: Move_VICE_GRIP: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_08593590, 2, 0 - createsprite gUnknown_08593590, 2, 1 + createsprite2 gUnknown_08593590, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite2 gUnknown_08593590, ANIM_BATTLER_ATTACKER, 2, 1 delay 9 - createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 5, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_GUILLOTINE: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_085935D0, 2, 0 - createsprite gUnknown_085935D0, 2, 1 + createsprite2 gUnknown_085935D0, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite2 gUnknown_085935D0, ANIM_BATTLER_ATTACKER, 2, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK delay 9 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 23, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 23, 1 delay 0x2E - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 8, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff restorebg waitbgfadein @@ -1881,18 +1881,18 @@ Move_GUILLOTINE: Move_PAY_DAY: loadspritegfx ANIM_TAG_COIN loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085934D8, 2, 20, 0, 0, 0, 1152 + createsprite2 gUnknown_085934D8, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish playsewithpan SE_W006, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 - createsprite gUnknown_085934F0, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 2 + createsprite2 gUnknown_085934F0, ANIM_BATTLER_ATTACKER, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end @@ -1900,45 +1900,45 @@ Move_OUTRAGE: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3 createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 6, 5, 4 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, 0, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, 0, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 0, 1280, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 0, -1280, 3 delay 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 40, 1 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 40, 1 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, 768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, 768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, -768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, -768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, 0, 3 call Outrage1 call Outrage1 waitforvisualfinish end Outrage1: delay 3 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, 0, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 0, 1280, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 0, -1280, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, 768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, 768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, -768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 + createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, -768, 3 return Move_SPARK: @@ -1947,40 +1947,40 @@ Move_SPARK: delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859574C, 0, 32, 24, 190, 12, 0, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 80, 24, 22, 12, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 156, 24, 121, 13, 0, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 156, 24, 121, 13, 0, 1, 1 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 10 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859574C, 0, 100, 24, 60, 10, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 170, 24, 42, 11, 0, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 238, 24, 165, 10, 0, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 238, 24, 165, 10, 0, 1, 1 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 20 createvisualtask sub_8115A04, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 0, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 64, 20, 1, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 128, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 192, 20, 2, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 32, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 96, 20, 1, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 160, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 224, 20, 2, 0 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0 + createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0 delay 4 waitforvisualfinish createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 4 playsewithpan SE_W063, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish createvisualtask sub_8115A04, 2, 4, -31, 2, 0, 6, RGB(31, 31, 22) call ElectricityEffect @@ -1990,28 +1990,28 @@ Move_SPARK: Move_ATTRACT: loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 - createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_BATTLER_ATTACKER delay 15 - createsprite gUnknown_085939A0, 131, 20, -8 + createsprite2 gUnknown_085939A0, ANIM_BATTLER_TARGET, 3, 20, -8 waitforvisualfinish playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -32 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -40 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -16 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 160, -32 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -256, -40 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 128, -16 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 416, -38 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -128, -22 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -384, -31 waitforvisualfinish waitplaysewithpan SE_W213B, 0, 15 createvisualtask sub_81062E8, 5 - createsprite gUnknown_085939D0, 40, 16, 256, 0 - createsprite gUnknown_085939D0, 40, 224, 240, 15 - createsprite gUnknown_085939D0, 40, 126, 272, 30 - createsprite gUnknown_085939D0, 40, 80, 224, 45 - createsprite gUnknown_085939D0, 40, 170, 272, 60 - createsprite gUnknown_085939D0, 40, 40, 256, 75 - createsprite gUnknown_085939D0, 40, 112, 256, 90 - createsprite gUnknown_085939D0, 40, 200, 272, 90 + createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 16, 256, 0 + createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 224, 240, 15 + createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 126, 272, 30 + createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 80, 224, 45 + createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 170, 272, 60 + createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 40, 256, 75 + createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 112, 256, 90 + createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 200, 272, 90 delay 0x4B createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end @@ -2025,22 +2025,22 @@ Move_GROWTH: Growth1: createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_BATTLER_ATTACKER, 0 return Move_WHIRLWIND: loadspritegfx ANIM_TAG_WHIRLWIND_LINES - createsprite gUnknown_085963D4, 2, 0, -8, 1, 60, 0 - createsprite gUnknown_085963D4, 2, 0, 0, 1, 60, 1 - createsprite gUnknown_085963D4, 2, 0, 8, 1, 60, 2 - createsprite gUnknown_085963D4, 2, 0, 16, 1, 60, 3 - createsprite gUnknown_085963D4, 2, 0, 24, 1, 60, 4 - createsprite gUnknown_085963D4, 2, 0, 32, 1, 60, 0 + createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, -8, 1, 60, 0 + createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 60, 1 + createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1, 60, 2 + createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 16, 1, 60, 3 + createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 24, 1, 60, 4 + createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 32, 1, 60, 0 delay 5 loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 delay 0x1D - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_TARGET, 12, 6, 1, 5 delay 7 playsewithpan SE_W081, SOUND_PAN_TARGET createvisualtask sub_80D5DB0, 5, 1, 8 @@ -2049,31 +2049,31 @@ Move_WHIRLWIND: Move_CONFUSE_RAY: loadspritegfx ANIM_TAG_YELLOW_BALL - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER fadetobg BG_GHOST waitbgfadein createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_8115C80, 2, 10013, 0, 6, 0, 14, 351 - createsprite gUnknown_08596D14, 130, 28, 0, 288 + createsprite2 gUnknown_08596D14, ANIM_BATTLER_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_08596D2C, 130, 0, -16 + createsprite2 gUnknown_08596D2C, ANIM_BATTLER_TARGET, 2, 0, -16 waitforvisualfinish delay 0 blendoff - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER restorebg waitbgfadein end Move_LOCK_ON: loadspritegfx ANIM_TAG_LOCK_ON - createsprite gUnknown_08592CA0, 40 - createsprite gUnknown_08592CB8, 40, 1 - createsprite gUnknown_08592CB8, 40, 2 - createsprite gUnknown_08592CB8, 40, 3 - createsprite gUnknown_08592CB8, 40, 4 + createsprite2 gUnknown_08592CA0, ANIM_BATTLER_ATTACKER, 40 + createsprite2 gUnknown_08592CB8, ANIM_BATTLER_ATTACKER, 40, 1 + createsprite2 gUnknown_08592CB8, ANIM_BATTLER_ATTACKER, 40, 2 + createsprite2 gUnknown_08592CB8, ANIM_BATTLER_ATTACKER, 40, 3 + createsprite2 gUnknown_08592CB8, ANIM_BATTLER_ATTACKER, 40, 4 delay 120 setarg 7, -1 waitforvisualfinish @@ -2081,106 +2081,106 @@ Move_LOCK_ON: Move_MEAN_LOOK: loadspritegfx ANIM_TAG_EYE - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 0x55 - createsprite gUnknown_085CE104, 2 + createsprite2 gUnknown_085CE104, ANIM_BATTLER_ATTACKER, 2 delay 120 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK delay 30 - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER waitforvisualfinish end Move_ROCK_THROW: loadspritegfx ANIM_TAG_ROCKS - createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1 - createsprite gUnknown_08596B04, 130, 0, 1, 0, 0 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_TARGET, 2, 6, 1, 15, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 0, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite gUnknown_08596B04, 130, 19, 1, 10, 0 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 19, 1, 10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite gUnknown_08596B04, 130, -23, 2, -10, 0 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -23, 2, -10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 5, 20, 1 delay 6 - createsprite gUnknown_08596B04, 130, -15, 1, -10, 0 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -15, 1, -10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite gUnknown_08596B04, 130, 23, 2, 10, 0 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 23, 2, 10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish end Move_ROCK_SLIDE: loadspritegfx ANIM_TAG_ROCKS - monbg ANIM_DEF_PARTNER - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1 - createsprite gUnknown_08596B04, 130, -5, 1, -5, 1 + monbg ANIM_BATTLER_DEF_PARTNER + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 7, 1, 11, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -5, 1, -5, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 5, 0, 6, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 5, 0, 6, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 19, 1, 10, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 19, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, -23, 2, -10, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -23, 2, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 5, 50, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_DEF_PARTNER, 0, 5, 50, 1 delay 2 call RockSlide1 call RockSlide1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end RockSlide1: - createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -20, 0, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 28, 1, 10, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 28, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, -10, 1, -5, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -10, 1, -5, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 10, 0, 6, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 10, 0, 6, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 24, 1, 10, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 24, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, -32, 2, -10, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -32, 2, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -20, 0, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 30, 2, 10, 1 + createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 30, 2, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 return Move_THIEF: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET delay 1 fadetobg BG_DARK waitbgfadein setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 6 playsewithpan SE_W233, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 8, 1 waitforvisualfinish delay 20 - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff restorebg waitbgfadein @@ -2189,37 +2189,37 @@ Move_THIEF: Move_BUBBLE_BEAM: loadspritegfx ANIM_TAG_BUBBLE loadspritegfx ANIM_TAG_SMALL_BUBBLES - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 delay 1 call Bulbblebeam1 - createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_TARGET + createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_BATTLER_TARGET call Bulbblebeam1 call Bulbblebeam1 waitforvisualfinish call WaterBubbleEffect waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Bulbblebeam1: - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 70, 0, 256, 50 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 40, -10, 256, 50 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -60, 0, 256, 50 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 256, 50 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, -10, 256, 50 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 256, 50 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 return @@ -2227,7 +2227,7 @@ Bulbblebeam1: Move_ICY_WIND: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_ICE_SPIKES - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE waitbgfadeout @@ -2242,89 +2242,89 @@ Move_ICY_WIND: delay 0x37 call IcyWindEffect2 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER restorebg waitbgfadeout createvisualtask sub_8116620, 10, 11, 4, 4, 0, RGB_BLACK waitbgfadein end IcyWind1: - createsprite gUnknown_08595B98, 0xA8, 0, 0, 0, 0, 72, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, 0, 0, 0, 72, 1 delay 5 - createsprite gUnknown_08595B98, 0xA8, 0, 10, 0, 10, 72, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, 10, 0, 10, 72, 1 delay 5 - createsprite gUnknown_08595B98, 0xA8, 0, -10, 0, -10, 72, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, -10, 0, -10, 72, 1 delay 5 - createsprite gUnknown_08595B98, 0xA8, 0, 15, 0, 15, 72, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, 15, 0, 15, 72, 1 delay 5 - createsprite gUnknown_08595B98, 0xA8, 0, -5, 0, -5, 72, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, -5, 0, -5, 72, 1 return Move_SMOKESCREEN: loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W104, SOUND_PAN_ATTACKER - createsprite gUnknown_085CE050, 130, 20, 0, 0, 0, 35, -25 + createsprite2 gUnknown_085CE050, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask sub_815A160, 2 delay 2 playsewithpan SE_W028, SOUND_PAN_TARGET - createsprite gUnknown_085CE038, 132, 0, -12, 104, 0, 75 - createsprite gUnknown_085CE038, 132, 0, -12, 72, 1, 75 - createsprite gUnknown_085CE038, 132, 0, -6, 56, 1, 75 - createsprite gUnknown_085CE038, 132, 0, -6, 88, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 0, 56, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 0, 88, 1, 75 - createsprite gUnknown_085CE038, 132, 0, 6, 72, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 6, 104, 1, 75 - createsprite gUnknown_085CE038, 132, 0, 12, 72, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 12, 56, 1, 75 - createsprite gUnknown_085CE038, 132, 0, 18, 80, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 18, 72, 1, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, -12, 104, 0, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, -12, 72, 1, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, -6, 56, 1, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, -6, 88, 0, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 0, 56, 0, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 0, 88, 1, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 6, 72, 0, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 6, 104, 1, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 12, 72, 0, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 12, 56, 1, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 18, 80, 0, 75 + createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 18, 72, 1, 75 waitforvisualfinish end Move_CONVERSION: loadspritegfx ANIM_TAG_CONVERSION - monbg ANIM_ATK_PARTNER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATK_PARTNER + monbgprio_28 ANIM_BATTLER_ATTACKER setalpha 16, 0 delay 0 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, 2, -24, -24 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -24, -24 delay 3 - createsprite gUnknown_08592E74, 2, -8, -24 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -8, -24 delay 3 - createsprite gUnknown_08592E74, 2, 8, -24 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 8, -24 delay 3 - createsprite gUnknown_08592E74, 2, 24, -24 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 24, -24 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, 2, -24, -8 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -24, -8 delay 3 - createsprite gUnknown_08592E74, 2, -8, -8 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -8, -8 delay 3 - createsprite gUnknown_08592E74, 2, 8, -8 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 8, -8 delay 3 - createsprite gUnknown_08592E74, 2, 24, -8 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 24, -8 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, 2, -24, 8 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -24, 8 delay 3 - createsprite gUnknown_08592E74, 2, -8, 8 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -8, 8 delay 3 - createsprite gUnknown_08592E74, 2, 8, 8 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 8, 8 delay 3 - createsprite gUnknown_08592E74, 2, 24, 8 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 24, 8 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, 2, -24, 24 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -24, 24 delay 3 - createsprite gUnknown_08592E74, 2, -8, 24 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -8, 24 delay 3 - createsprite gUnknown_08592E74, 2, 8, 24 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 8, 24 delay 3 - createsprite gUnknown_08592E74, 2, 24, 24 + createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 24, 24 delay 20 playsewithpan SE_W112, SOUND_PAN_ATTACKER createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0 @@ -2332,33 +2332,33 @@ Move_CONVERSION: createvisualtask sub_81022D4, 5 waitforvisualfinish delay 1 - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff end Move_CONVERSION_2: loadspritegfx ANIM_TAG_CONVERSION - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET setalpha 0, 16 delay 0 playsewithpan SE_W112, SOUND_PAN_TARGET - createsprite gUnknown_08592EA4, 2, -24, -24, 60 - createsprite gUnknown_08592EA4, 2, -8, -24, 65 - createsprite gUnknown_08592EA4, 2, 8, -24, 70 - createsprite gUnknown_08592EA4, 2, 24, -24, 75 - createsprite gUnknown_08592EA4, 2, -24, -8, 80 - createsprite gUnknown_08592EA4, 2, -8, -8, 85 - createsprite gUnknown_08592EA4, 2, 8, -8, 90 - createsprite gUnknown_08592EA4, 2, 24, -8, 95 - createsprite gUnknown_08592EA4, 2, -24, 8, 100 - createsprite gUnknown_08592EA4, 2, -8, 8, 105 - createsprite gUnknown_08592EA4, 2, 8, 8, 110 - createsprite gUnknown_08592EA4, 2, 24, 8, 115 - createsprite gUnknown_08592EA4, 2, -24, 24, 120 - createsprite gUnknown_08592EA4, 2, -8, 24, 125 - createsprite gUnknown_08592EA4, 2, 8, 24, 130 - createsprite gUnknown_08592EA4, 2, 24, 24, 135 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -24, -24, 60 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -8, -24, 65 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 8, -24, 70 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 24, -24, 75 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -24, -8, 80 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -8, -8, 85 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 8, -8, 90 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 24, -8, 95 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -24, 8, 100 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -8, 8, 105 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 8, 8, 110 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 24, 8, 115 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -24, 24, 120 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -8, 24, 125 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 8, 24, 130 + createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 24, 24, 135 createvisualtask sub_81023E0, 5 delay 60 playsewithpan SE_W129, SOUND_PAN_TARGET @@ -2377,44 +2377,44 @@ Move_CONVERSION_2: delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_ROLLING_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 6 playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 2, -24, 0, 48, 10, 160, 0 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite2 gUnknown_08595EE0, ANIM_BATTLER_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 8 - clearmonbg ANIM_TARGET + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 8 + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_HEADBUTT: loadspritegfx ANIM_TAG_IMPACT - createsprite gUnknown_08592CD8, 2, 0 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, 2, 1 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 1 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 2, 2 - createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 2 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish end @@ -2422,17 +2422,17 @@ Move_HEADBUTT: Move_HORN_ATTACK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT - createsprite gUnknown_08592CD8, 2, 0 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, 2, 1 - createsprite gUnknown_08592F44, 132, 0, 0, 10 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 1 + createsprite2 gUnknown_08592F44, ANIM_BATTLER_TARGET, 4, 0, 0, 10 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 2, 2 - createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 2 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish end @@ -2443,21 +2443,21 @@ Move_FURY_ATTACK: createvisualtask sub_80D6134, 2, 4, 256, 0, 2 choosetwoturnanim FuryAttackRight, FuryAttackLeft FuryAttackContinue: - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 waitforvisualfinish end FuryAttackRight: - createsprite gUnknown_08592F44, 132, 8, 8, 10 + createsprite2 gUnknown_08592F44, ANIM_BATTLER_TARGET, 4, 8, 8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET goto FuryAttackContinue FuryAttackLeft: - createsprite gUnknown_08592F44, 132, -8, -8, 10 + createsprite2 gUnknown_08592F44, ANIM_BATTLER_TARGET, 4, -8, -8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET goto FuryAttackContinue @@ -2471,50 +2471,50 @@ Move_HORN_DRILL: HornDrillContinue: waitbgfadein setalpha 12, 8 - createsprite gUnknown_08592CD8, 2, 0 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, 2, 1 - createsprite gUnknown_08592F44, 132, 0, 0, 12 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 1 + createsprite2 gUnknown_08592F44, ANIM_BATTLER_TARGET, 4, 0, 0, 12 waitforvisualfinish playse SE_BAN - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 131, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 40, 1 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 0, 2, 1, 3 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 2, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, -4, 3, 1, 3 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -4, 3, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, -8, -5, 1, 3 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -8, -5, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 4, -12, 1, 3 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 4, -12, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 16, 0, 1, 3 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 16, 0, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 5, 18, 1, 3 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 5, 18, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, -17, 12, 1, 2 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -17, 12, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, -21, -15, 1, 2 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -21, -15, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 8, -27, 1, 2 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 8, -27, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 32, 0, 1, 2 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 32, 0, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08592CD8, 2, 2 + createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 2 waitforvisualfinish restorebg waitbgfadeout @@ -2533,51 +2533,51 @@ Move_THRASH: loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask sub_8104C38, 2 createvisualtask sub_8104CA4, 2 - createsprite gUnknown_08595EB0, 131, 1, 10, 0 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 + createsprite2 gUnknown_08595EB0, ANIM_BATTLER_TARGET, 3, 1, 10, 0 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 playsewithpan SE_W004, SOUND_PAN_TARGET delay 28 - createsprite gUnknown_08595EB0, 131, 1, 10, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 + createsprite2 gUnknown_08595EB0, ANIM_BATTLER_TARGET, 3, 1, 10, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 28 - createsprite gUnknown_08595EB0, 131, 1, 10, 3 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 + createsprite2 gUnknown_08595EB0, ANIM_BATTLER_TARGET, 3, 1, 10, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET end Move_SING: loadspritegfx ANIM_TAG_MUSIC_NOTES - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_8102BE8, 2 waitforvisualfinish panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite gUnknown_08593008, 130, 7, 0, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 7, 0, 12 delay 5 - createsprite gUnknown_08593008, 130, 6, 1, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 6, 1, 12 delay 5 - createsprite gUnknown_08593008, 130, 1, 2, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 1, 2, 12 delay 5 - createsprite gUnknown_08593008, 130, 2, 3, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 3, 12 delay 5 - createsprite gUnknown_08593008, 130, 3, 0, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 3, 0, 12 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 12 delay 4 - createsprite gUnknown_08593008, 130, 5, 2, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 5, 2, 12 delay 4 - createsprite gUnknown_08593008, 130, 6, 3, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 6, 3, 12 delay 4 - createsprite gUnknown_08593008, 130, 2, 0, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 0, 12 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 12 delay 4 - createsprite gUnknown_08593008, 130, 1, 2, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 1, 2, 12 delay 4 - createsprite gUnknown_08593008, 130, 5, 3, 12 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 5, 3, 12 delay 4 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_8102CA0, 2 waitforvisualfinish end @@ -2585,14 +2585,14 @@ Move_SING: Move_LOW_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 130, -24, 28, 40, 8, 160, 0 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite2 gUnknown_08595EE0, ANIM_BATTLER_TARGET, 2, -24, 28, 40, 8, 160, 0 delay 4 - createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -8, 8, 1, 2 createvisualtask sub_80D6134, 2, 6, 384, 1, 2 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 4 end Move_EARTHQUAKE: @@ -2600,9 +2600,9 @@ Move_EARTHQUAKE: createvisualtask sub_81152DC, 5, 4, 10, 50 playsewithpan SE_W089, 0 delay 10 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 end Move_FISSURE: @@ -2613,11 +2613,11 @@ Move_FISSURE: delay 8 call Fissure1 delay 15 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 15 call Fissure2 delay 15 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 15 call Fissure1 delay 50 @@ -2633,18 +2633,18 @@ Move_FISSURE: end Fissure1: - createsprite gUnknown_085971FC, 130, 1, 0, 12, -48, -16, 24 - createsprite gUnknown_085971FC, 130, 1, 0, 16, -16, -10, 24 - createsprite gUnknown_085971FC, 130, 1, 1, 14, -52, -18, 24 - createsprite gUnknown_085971FC, 130, 1, 1, 12, -32, -16, 24 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 0, 12, -48, -16, 24 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 0, 16, -16, -10, 24 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 1, 14, -52, -18, 24 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 1, 12, -32, -16, 24 playsewithpan SE_W091, SOUND_PAN_TARGET return Fissure2: - createsprite gUnknown_085971FC, 130, 1, 0, 12, -24, -16, 24 - createsprite gUnknown_085971FC, 130, 1, 0, 16, -38, -10, 24 - createsprite gUnknown_085971FC, 130, 1, 1, 14, -20, -18, 24 - createsprite gUnknown_085971FC, 130, 1, 1, 12, -36, -16, 24 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 0, 12, -24, -16, 24 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 0, 16, -38, -10, 24 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 1, 14, -20, -18, 24 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 1, 12, -36, -16, 24 playsewithpan SE_W091, SOUND_PAN_TARGET return @@ -2655,9 +2655,9 @@ DigEnd: DigSetUp: loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_DIRT_MOUND - createsprite gUnknown_08597214, 1, 0, 0, 180 - createsprite gUnknown_08597214, 1, 0, 1, 180 - monbg_22 ANIM_ATTACKER + createsprite2 gUnknown_08597214, ANIM_BATTLER_ATTACKER, 1, 0, 0, 180 + createsprite2 gUnknown_08597214, ANIM_BATTLER_ATTACKER, 1, 0, 1, 180 + monbg_22 ANIM_BATTLER_ATTACKER delay 1 createvisualtask sub_8114CBC, 2, 0 delay 6 @@ -2667,7 +2667,7 @@ DigSetUp: call DigSetUp1 call DigSetUp1 waitforvisualfinish - clearmonbg_23 ANIM_ATTACKER + clearmonbg_23 ANIM_BATTLER_ATTACKER delay 1 createvisualtask sub_8114CBC, 2, 1 goto DigEnd @@ -2676,22 +2676,22 @@ DigUnleash: loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_8114F14, 2, 0 waitforvisualfinish - monbg ANIM_ATTACKER - createsprite gUnknown_08597214, 1, 0, 0, 48 - createsprite gUnknown_08597214, 1, 0, 1, 48 + monbg ANIM_BATTLER_ATTACKER + createsprite2 gUnknown_08597214, ANIM_BATTLER_ATTACKER, 1, 0, 0, 48 + createsprite2 gUnknown_08597214, ANIM_BATTLER_ATTACKER, 1, 0, 1, 48 delay 1 createvisualtask sub_8114F14, 2, 1 delay 16 - createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 playsewithpan SE_W025B, SOUND_PAN_ATTACKER - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER goto DigEnd DigSetUp1: - createsprite gUnknown_085971FC, 2, 0, 0, 12, 4, -16, 18 - createsprite gUnknown_085971FC, 2, 0, 0, 16, 4, -10, 18 - createsprite gUnknown_085971FC, 2, 0, 1, 14, 4, -18, 18 - createsprite gUnknown_085971FC, 2, 0, 1, 12, 4, -16, 18 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_ATTACKER, 2, 0, 0, 12, 4, -16, 18 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_ATTACKER, 2, 0, 0, 16, 4, -10, 18 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_ATTACKER, 2, 0, 1, 14, 4, -18, 18 + createsprite2 gUnknown_085971FC, ANIM_BATTLER_ATTACKER, 2, 0, 1, 12, 4, -16, 18 playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 return @@ -2707,9 +2707,9 @@ Move_MEDITATE: end Move_AGILITY: - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 4, 4 createvisualtask sub_81169C0, 2, 0, 4, 7, 10 playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 @@ -2722,24 +2722,24 @@ Move_AGILITY: playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff delay 1 end Move_QUICK_ATTACK: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 1, 5 createvisualtask sub_81169C0, 2, 0, 4, 7, 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 4 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff waitforvisualfinish end @@ -2747,22 +2747,22 @@ Move_QUICK_ATTACK: Move_RAGE: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 - createsprite gUnknown_0859368C, 2, 0, -20, -28 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BATTLER_ATTACKER, RGB_RED, 10, 0, 2 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, -20, -28 playsewithpan SE_W207B, SOUND_PAN_ATTACKER delay 20 - createsprite gUnknown_0859368C, 2, 0, 20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 4 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_80D6388, 2, 1, 1, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET end Move_TELEPORT: @@ -2777,7 +2777,7 @@ Move_TELEPORT: Move_DOUBLE_TEAM: createvisualtask sub_81029B4, 2 setalpha 12, 8 - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 32 playsewithpan SE_W104, SOUND_PAN_ATTACKER @@ -2796,7 +2796,7 @@ Move_DOUBLE_TEAM: delay 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff delay 1 end @@ -2812,10 +2812,10 @@ Move_MINIMIZE: Move_METRONOME: loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE - createsprite gUnknown_08593114, 11, 0, 100 + createsprite2 gUnknown_08593114, ANIM_BATTLER_ATTACKER, 11, 0, 100 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085931BC, 12, 0 + createsprite2 gUnknown_085931BC, ANIM_BATTLER_ATTACKER, 12, 0 delay 24 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish @@ -2831,12 +2831,12 @@ SkullBashSetUp: waitforvisualfinish goto SkullBashEnd SkullBashSetUp1: - createsprite gUnknown_0857FE88, 2, 0, -24, 0, 0, 10, 0 + createsprite2 gUnknown_0857FE88, ANIM_BATTLER_ATTACKER, 2, 0, -24, 0, 0, 10, 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D6134, 2, 16, 96, 0, 2 waitforvisualfinish - createsprite gUnknown_0857FE88, 2, 0, 24, 0, 0, 10, 1 + createsprite2 gUnknown_0857FE88, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 10, 1 waitforvisualfinish return SkullBashAttack: @@ -2845,10 +2845,10 @@ SkullBashAttack: playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish playse SE_BAN - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 132, 0, 0, 1, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 40, 1 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 0 loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish createvisualtask sub_8101C94, 2, 1 @@ -2858,7 +2858,7 @@ Move_AMNESIA: loadspritegfx ANIM_TAG_AMNESIA call SetPsychicBackground delay 8 - createsprite gUnknown_08596744, 20 + createsprite2 gUnknown_08596744, ANIM_BATTLER_ATTACKER, 20 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 54 loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 @@ -2871,9 +2871,9 @@ Move_KINESIS: loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground - createsprite gUnknown_085966DC, 20 - createsprite gUnknown_08593344, 19, 32, -8, 0 - createsprite gUnknown_08593344, 19, 32, 16, 1 + createsprite2 gUnknown_085966DC, ANIM_BATTLER_ATTACKER, 20 + createsprite2 gUnknown_08593344, ANIM_BATTLER_ATTACKER, 19, 32, -8, 0 + createsprite2 gUnknown_08593344, ANIM_BATTLER_ATTACKER, 19, 32, 16, 1 loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 delay 60 playsewithpan SE_W146, SOUND_PAN_ATTACKER @@ -2893,8 +2893,8 @@ Move_GLARE: waitforvisualfinish createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0, -16, -8 - createsprite gUnknown_08593A84, 0, 16, -8 + createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, -16, -8 + createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, 16, -8 createvisualtask sub_81064F8, 5 playsewithpan SE_W043, SOUND_PAN_ATTACKER delay 2 @@ -2908,9 +2908,9 @@ Move_BARRAGE: createvisualtask sub_815E47C, 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 24 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 8, 1, 40, 1 - createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1 - createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 8, 1, 40, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 0, 4, 20, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_DEF_PARTNER, 0, 4, 20, 1 loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2 end @@ -2919,7 +2919,7 @@ Move_SKY_ATTACK: SkyAttackEnd: end SkyAttackSetUp: - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 11 createvisualtask AnimTask_IsTargetPartner, 5, ARG_RET_ID jumpretfalse SkyAttackSetUpAgainstOpponent @@ -2937,7 +2937,7 @@ SkyAttackSetUpAgainstOpponent: waitforvisualfinish createvisualtask sub_8116620, 10, 25, 1, 8, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff goto SkyAttackEnd SkyAttackSetUpAgainstPartner: @@ -2954,29 +2954,29 @@ SkyAttackSetUpAgainstPartner: waitforvisualfinish createvisualtask sub_8116664, 10, 4, 1, 8, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff goto SkyAttackEnd SkyAttackUnleash: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BIRD call SetFlyingBg - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE delay 4 createvisualtask sub_81136E8, 5, 0 waitforvisualfinish createvisualtask sub_8159244, 5, 238, SOUND_PAN_ATTACKER - createsprite gUnknown_08596514, 130 + createsprite2 gUnknown_08596514, ANIM_BATTLER_TARGET, 2 delay 14 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 10, 0, 18, 1 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 20 createvisualtask sub_81137E4, 5, 1 delay 2 createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER call UnsetFlyingBg goto SkyAttackEnd @@ -2994,49 +2994,49 @@ Move_SPLASH: end Move_ACID_ARMOR: - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 15, 0 createvisualtask sub_815D240, 2, 0 playsewithpan SE_W151, SOUND_PAN_ATTACKER waitforvisualfinish blendoff - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER delay 1 end Move_SHARPEN: loadspritegfx ANIM_TAG_SPHERE_TO_CUBE - createsprite gUnknown_08592DE4, 2 + createsprite2 gUnknown_08592DE4, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish end Move_SUPER_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1 - createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 3, 0, 48, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATTACKER, RGB(31, 6, 1), 12, 4, 1 waitforvisualfinish delay 20 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 4 - createsprite gUnknown_08592F74, 130 + createsprite2 gUnknown_08592F74, ANIM_BATTLER_TARGET, 2 playsewithpan SE_W044, SOUND_PAN_TARGET delay 8 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 7, 12, 1 waitforvisualfinish blendoff end Move_SLASH: loadspritegfx ANIM_TAG_SLASH - createsprite gUnknown_08592D2C, 130, 1, -8, 0 + createsprite2 gUnknown_08592D2C, ANIM_BATTLER_TARGET, 2, 1, -8, 0 playsewithpan SE_W013, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08592D2C, 130, 1, 8, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 + createsprite2 gUnknown_08592D2C, ANIM_BATTLER_TARGET, 2, 1, 8, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish end @@ -3044,28 +3044,28 @@ Move_SLASH: Move_STRUGGLE: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MOVEMENT_WAVES - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 - createsprite gUnknown_08593B80, 2, 0, 0, 2 - createsprite gUnknown_08593B80, 2, 0, 1, 2 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 3, 0, 12, 4 + createsprite2 gUnknown_08593B80, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 + createsprite2 gUnknown_08593B80, ANIM_BATTLER_ATTACKER, 2, 0, 1, 2 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_SKETCH: loadspritegfx ANIM_TAG_PENCIL - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET createvisualtask sub_8104E74, 2 - createsprite gUnknown_085936D4, 130 + createsprite2 gUnknown_085936D4, ANIM_BATTLER_TARGET, 2 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET createvisualtask sub_8104938, 2, 0, 2 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 end @@ -3074,18 +3074,18 @@ Move_NIGHTMARE: fadetobg BG_GHOST waitbgfadein jumpifcontest NightmareInContest - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_8111C50, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 40, 1 playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER restorebg waitbgfadein end NightmareInContest: - createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATTACKER, RGB_WHITE, 10, 2, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 3, 0, 32, 1 playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg @@ -3094,16 +3094,16 @@ NightmareInContest: Move_FLAIL: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 createvisualtask sub_815C770, 2, 0 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish - createsprite gUnknown_085973A0, 131, 1, 3 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 3 createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end @@ -3111,20 +3111,20 @@ Move_SPITE: fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_8115A04, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask sub_8111E50, 2 loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg waitbgfadein - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET end Move_MACH_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue MachPunchAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -3137,12 +3137,12 @@ MachPunchContinue: createvisualtask sub_80A8BC4, 2, 28968, 10 playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 6 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff restorebg waitbgfadeout @@ -3155,21 +3155,21 @@ MachPunchAgainstPlayer: Move_FORESIGHT: loadspritegfx ANIM_TAG_MAGNIFYING_GLASS - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 16, 0 - createsprite gUnknown_085CE8C4, 130, 1 + createsprite2 gUnknown_085CE8C4, ANIM_BATTLER_TARGET, 2, 1 delay 17 loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 delay 48 delay 24 playsewithpan SE_W166, SOUND_PAN_TARGET delay 10 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_TARGET, RGB_WHITE, 12, 2, 1 playsewithpan SE_W197, SOUND_PAN_TARGET waitforvisualfinish blendoff - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Move_DESTINY_BOND: @@ -3180,7 +3180,7 @@ Move_DESTINY_BOND: createvisualtask sub_81123C4, 5, 0, 48 playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 48 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 24, 1 createvisualtask sub_8116664, 2, 6, 1, 0, 12, RGB(29, 29, 29) delay 24 createvisualtask sub_8116664, 2, 6, 1, 12, 0, RGB(29, 29, 29) @@ -3198,7 +3198,7 @@ Move_ENDURE: call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 call EndureEffect delay 8 call EndureEffect @@ -3206,27 +3206,27 @@ Move_ENDURE: end EndureEffect: - createsprite gUnknown_08592D8C, 2, 0, -24, 26, 2 + createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 26, 2 delay 4 - createsprite gUnknown_08592D8C, 2, 0, 14, 28, 1 + createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, 14, 28, 1 delay 4 - createsprite gUnknown_08592D8C, 2, 0, -5, 10, 2 + createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, -5, 10, 2 delay 4 - createsprite gUnknown_08592D8C, 2, 0, 28, 26, 3 + createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, 28, 26, 3 delay 4 - createsprite gUnknown_08592D8C, 2, 0, -12, 0, 1 + createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, -12, 0, 1 return Move_CHARM: loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_815C478, 5, 0, 2, 0 - createsprite gUnknown_08593970, 3, 0, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite gUnknown_08593970, 3, -20, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, -20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite gUnknown_08593970, 3, 20, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish end @@ -3235,43 +3235,43 @@ Move_ROLLOUT: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_ROCKS - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 createvisualtask sub_8110F74, 2 waitforvisualfinish createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 2 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_FALSE_SWIPE: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT - createsprite gUnknown_08592D44, 130 + createsprite2 gUnknown_08592D44, ANIM_BATTLER_TARGET, 2 playsewithpan SE_W233, SOUND_PAN_TARGET delay 16 - createsprite gUnknown_08592D5C, 130, 0 + createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 0 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, 130, 16 + createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 16 delay 2 - createsprite gUnknown_08592D5C, 130, 32 + createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 32 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, 130, 48 + createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 48 delay 2 - createsprite gUnknown_08592D5C, 130, 64 + createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 64 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, 130, 80 + createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 80 delay 2 waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET end @@ -3281,14 +3281,14 @@ Move_SWAGGER: createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08593658, 2 + createsprite2 gUnknown_08593658, ANIM_BATTLER_ATTACKER, 2 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 - createsprite gUnknown_0859368C, 130, 1, -20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET delay 12 - createsprite gUnknown_0859368C, 130, 1, 20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish end @@ -3297,8 +3297,8 @@ Move_MILK_DRINK: loadspritegfx ANIM_TAG_MILK_BOTTLE loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_TARGET - createsprite gUnknown_08592B3C, 2 + monbg ANIM_BATTLER_TARGET + createsprite2 gUnknown_08592B3C, ANIM_BATTLER_ATTACKER, 2 delay 40 playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 12 @@ -3306,10 +3306,10 @@ Move_MILK_DRINK: delay 20 playsewithpan SE_W152, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_0859381C, 3, 0, 0, 1, 0 + createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 playsewithpan SE_W208, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET call HealingEffect2 waitforvisualfinish end @@ -3331,20 +3331,20 @@ MagnitudeIntense: createvisualtask sub_81152DC, 5, 4, 0, 50 loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 delay 10 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 goto MagnitudeEnd Move_RAPID_SPIN: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_RAPID_SPIN - monbg ANIM_ATTACKER - createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2 + monbg ANIM_BATTLER_ATTACKER + createsprite2 gUnknown_085CE288, ANIM_BATTLER_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_815ADB0, 2, 0, 2, 0 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish @@ -3352,7 +3352,7 @@ Move_RAPID_SPIN: createvisualtask sub_815ADB0, 2, 0, 2, 1 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER end Move_MOONLIGHT: @@ -3360,21 +3360,21 @@ Move_MOONLIGHT: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592EBC, 2, 120, 56 + createsprite2 gUnknown_08592EBC, ANIM_BATTLER_ATTACKER, 2, 120, 56 createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -12, 0 + createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, -12, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -24, 0 + createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, -24, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 21, 0 + createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, 21, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 0, 0 + createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, 0, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 10, 0 + createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, 10, 0 delay 20 createvisualtask sub_81025C0, 2 waitforvisualfinish @@ -3397,19 +3397,19 @@ ExtremeSpeedContinue: waitforvisualfinish delay 1 createvisualtask sub_8117F60, 2 - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 delay 18 createvisualtask sub_8105810, 2 delay 2 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, -12, 3 + createsprite2 gBattleAnimSpriteTemplate_85973B8, ANIM_BATTLER_TARGET, 2, 1, 0, -12, 3 delay 10 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 12, 3 + createsprite2 gBattleAnimSpriteTemplate_85973B8, ANIM_BATTLER_TARGET, 2, 1, 0, 12, 3 delay 10 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 0, 3 + createsprite2 gBattleAnimSpriteTemplate_85973B8, ANIM_BATTLER_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish createvisualtask sub_8105AAC, 2 delay 10 @@ -3420,7 +3420,7 @@ ExtremeSpeedContinue: waitbgfadeout setarg 7, -1 waitbgfadein - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff delay 1 setarg 7, 0x1000 @@ -3433,26 +3433,26 @@ ExtremeSpeedAgainstPlayer: Move_UPROAR: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_8106D90, 2, 0 - createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 + createsprite2 gBattleAnimSpriteTemplate_8593898, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 29, -12, 0 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -12, -29, 1 + createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, 29, -12, 0 + createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask sub_8106D90, 2, 0 - createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 + createsprite2 gBattleAnimSpriteTemplate_8593898, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 12, -29, 1 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -29, -12, 0 + createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, 12, -29, 1 + createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask sub_8106D90, 2, 0 - createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 + createsprite2 gBattleAnimSpriteTemplate_8593898, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 24, -24, 1 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -24, -24, 0 + createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, 24, -24, 1 + createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Move_HEAT_WAVE: @@ -3464,19 +3464,19 @@ Move_HEAT_WAVE: delay 4 createvisualtask sub_8109DBC, 5 delay 12 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 1 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 10, 2304, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 1 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 90, 2048, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 1 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 50, 2560, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 1 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 20, 2304, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 1 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 70, 1984, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 1 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 0, 2816, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 1 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 60, 2560, 96, 1 end Move_HAIL: @@ -3495,11 +3495,11 @@ Move_TORMENT: loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask sub_815AFF0, 2 waitforvisualfinish - createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 - createsprite gUnknown_0859368C, 130, 1, -20, -28 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_TARGET, RGB_RED, 10, 1, 1 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET delay 20 - createsprite gUnknown_0859368C, 130, 1, 20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET end @@ -3517,11 +3517,11 @@ Move_MEMENTO: delay 12 setalpha 0, 16 delay 1 - monbg_22 ANIM_TARGET + monbg_22 ANIM_BATTLER_TARGET createvisualtask sub_8113E78, 5 playsewithpan SE_W060, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg_23 ANIM_TARGET + clearmonbg_23 ANIM_BATTLER_TARGET delay 1 blendoff delay 1 @@ -3537,21 +3537,21 @@ Move_FACADE: Move_SMELLING_SALT: loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT - createsprite gUnknown_085CE864, 130, 1, 0, 2 - createsprite gUnknown_085CE864, 130, 1, 1, 2 + createsprite2 gUnknown_085CE864, ANIM_BATTLER_TARGET, 2, 1, 0, 2 + createsprite2 gUnknown_085CE864, ANIM_BATTLER_TARGET, 2, 1, 1, 2 delay 32 createvisualtask sub_815E840, 3, 1, 2 loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish delay 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 - createsprite gUnknown_085CE894, 130, 1, 8, 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 6, 2 + createsprite2 gUnknown_085CE894, ANIM_BATTLER_TARGET, 2, 1, 8, 3 loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: loadspritegfx ANIM_TAG_FINGER - createsprite gUnknown_085931D4, 2, 0 + createsprite2 gUnknown_085931D4, ANIM_BATTLER_ATTACKER, 2, 0 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 18 playsewithpan SE_W213, SOUND_PAN_ATTACKER @@ -3563,9 +3563,9 @@ Move_CHARGE: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_810AAFC, 2, 0, 60, 2, 12 playsewithpan SE_W268, SOUND_PAN_ATTACKER @@ -3573,7 +3573,7 @@ Move_CHARGE: playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 30 playsewithpan SE_W268, SOUND_PAN_ATTACKER - createsprite gUnknown_0859595C, 2, 0 + createsprite2 gUnknown_0859595C, ANIM_BATTLER_ATTACKER, 2, 0 delay 25 playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 20 @@ -3584,13 +3584,13 @@ Move_CHARGE: delay 6 loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish - createsprite gUnknown_0859598C, 2, 0, 16, 16 + createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 0, 16, 16 delay 2 - createsprite gUnknown_0859598C, 2, 0, -16, -16 + createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -16 playsewithpan SE_W085B, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK - clearmonbg ANIM_ATTACKER + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK + clearmonbg ANIM_BATTLER_ATTACKER blendoff end @@ -3598,53 +3598,53 @@ Move_TAUNT: loadspritegfx ANIM_TAG_FINGER_2 loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER - createsprite gUnknown_08593114, 11, 0, 45 + createsprite2 gUnknown_08593114, ANIM_BATTLER_ATTACKER, 11, 0, 45 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_0859324C, 12, 0 + createsprite2 gUnknown_0859324C, ANIM_BATTLER_ATTACKER, 12, 0 delay 4 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 - createsprite gUnknown_0859368C, 130, 1, -20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish delay 12 - createsprite gUnknown_0859368C, 130, 1, 20, -28 + createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_HELPING_HAND: loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_815EC48, 5 - createsprite gUnknown_085CE8AC, 40, 0 - createsprite gUnknown_085CE8AC, 40, 1 + createsprite2 gUnknown_085CE8AC, ANIM_BATTLER_ATTACKER, 40, 0 + createsprite2 gUnknown_085CE8AC, ANIM_BATTLER_ATTACKER, 40, 1 delay 19 playsewithpan SE_W227, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 2, 0, 5, 1 delay 14 playsewithpan SE_W227, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 2, 0, 5, 1 delay 20 playsewithpan SE_W227, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1 - createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 3, 0, 10, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 end Move_ASSIST: loadspritegfx ANIM_TAG_PAW_PRINT - createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 + createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 - createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 + createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, 208, 128, -16, 48, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_085CE804, 50, -16, 112, 256, -16, 36 + createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, -16, 112, 256, -16, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_085CE804, 50, 108, 128, 84, -16, 36 + createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, 108, 128, 84, -16, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_085CE804, 50, -16, 56, 256, 56, 36 + createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, -16, 56, 256, 56, 36 playsewithpan SE_W010, 0 end @@ -3652,49 +3652,49 @@ Move_SUPERPOWER: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_METEOR loadspritegfx ANIM_TAG_FLAT_ROCK - monbg ANIM_ATK_PARTNER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATK_PARTNER + monbgprio_28 ANIM_BATTLER_ATTACKER setalpha 12, 8 - createsprite gUnknown_08595FEC, 130, 0 + createsprite2 gUnknown_08595FEC, ANIM_BATTLER_TARGET, 2, 0 playsewithpan SE_W025, SOUND_PAN_ATTACKER delay 20 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 4, 1, 180, 1 createvisualtask sub_8159244, 5, 234, 0 delay 40 - createsprite gUnknown_08596004, 41, 200, 96, 1, 120 + createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 200, 96, 1, 120 delay 8 - createsprite gUnknown_08596004, 41, 20, 248, 4, 112 + createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 20, 248, 4, 112 delay 8 - createsprite gUnknown_08596004, 41, 130, 160, 2, 104 + createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 130, 160, 2, 104 delay 8 - createsprite gUnknown_08596004, 41, 160, 192, 0, 96 + createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 160, 192, 0, 96 delay 8 - createsprite gUnknown_08596004, 41, 60, 288, 3, 88 + createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 60, 288, 3, 88 delay 74 - createsprite gUnknown_0859601C, 131, 0 + createsprite2 gUnknown_0859601C, ANIM_BATTLER_TARGET, 3, 0 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 16 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff delay 1 end Move_RECYCLE: loadspritegfx ANIM_TAG_RECYCLE - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 0, 16 delay 1 - createsprite gUnknown_085CE9B0, 2 + createsprite2 gUnknown_085CE9B0, ANIM_BATTLER_ATTACKER, 2 loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB_WHITE, 12, 2, 1 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish blendoff - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER delay 1 end @@ -3705,61 +3705,61 @@ Move_BRICK_BREAK: loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall BrickBreakNormal: - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 delay 4 delay 1 - createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -18, -18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, 18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK + createvisualtask AnimTask_WindUpLunge, 2, ANIM_BATTLER_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET end BrickBreakShatteredWall: - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 delay 4 - createsprite gUnknown_08595F90, 3, 1, 0, 0, 90, 10 + createsprite2 gUnknown_08595F90, ANIM_BATTLER_ATTACKER, 3, 1, 0, 0, 90, 10 delay 1 - createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -18, -18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, 18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK + createvisualtask AnimTask_WindUpLunge, 2, ANIM_BATTLER_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08595FA8, 2, 1, 0, -8, -12 - createsprite gUnknown_08595FA8, 2, 1, 1, 8, -12 - createsprite gUnknown_08595FA8, 2, 1, 2, -8, 12 - createsprite gUnknown_08595FA8, 2, 1, 3, 8, 12 + createsprite2 gUnknown_08595FA8, ANIM_BATTLER_ATTACKER, 2, 1, 0, -8, -12 + createsprite2 gUnknown_08595FA8, ANIM_BATTLER_ATTACKER, 2, 1, 1, 8, -12 + createsprite2 gUnknown_08595FA8, ANIM_BATTLER_ATTACKER, 2, 1, 2, -8, 12 + createsprite2 gUnknown_08595FA8, ANIM_BATTLER_ATTACKER, 2, 1, 3, 8, 12 playsewithpan SE_W280, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET end Move_YAWN: @@ -3767,12 +3767,12 @@ Move_YAWN: createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_085CE68C, 133, 2 + createsprite2 gUnknown_085CE68C, ANIM_BATTLER_TARGET, 5, 2 playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 4 - createsprite gUnknown_085CE68C, 133, 1 + createsprite2 gUnknown_085CE68C, ANIM_BATTLER_TARGET, 5, 1 delay 4 - createsprite gUnknown_085CE68C, 133, 0 + createsprite2 gUnknown_085CE68C, ANIM_BATTLER_TARGET, 5, 0 waitforvisualfinish createvisualtask sub_815D64C, 2, 1 playsewithpan SE_W281, SOUND_PAN_TARGET @@ -3783,20 +3783,20 @@ Move_ENDEAVOR: loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_815DCA4, 2, 0, 2 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB(31, 21, 0), 12, 1, 2 delay 6 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 12, -12, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET delay 24 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -12, 12, 1, 2 playsewithpan SE_W004, SOUND_PAN_TARGET end Move_ERUPTION: loadspritegfx ANIM_TAG_WARM_ROCK - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask sub_8109460, 2 waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 @@ -3805,29 +3805,29 @@ Move_ERUPTION: waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 waitforvisualfinish delay 30 - createsprite gUnknown_085955E8, 40, 200, -32, 0, 100, 0 - createsprite gUnknown_085955E8, 40, 30, -32, 16, 90, 1 - createsprite gUnknown_085955E8, 40, 150, -32, 32, 60, 2 - createsprite gUnknown_085955E8, 40, 90, -32, 48, 80, 3 - createsprite gUnknown_085955E8, 40, 110, -32, 64, 50, 0 - createsprite gUnknown_085955E8, 40, 60, -32, 80, 70, 1 + createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 200, -32, 0, 100, 0 + createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 30, -32, 16, 90, 1 + createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 150, -32, 32, 60, 2 + createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 90, -32, 48, 80, 3 + createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 110, -32, 64, 50, 0 + createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 60, -32, 80, 70, 1 delay 22 createvisualtask sub_81152DC, 5, 5, 8, 60 createvisualtask sub_81152DC, 5, 4, 8, 60 loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12 delay 80 - createsprite gSimplePaletteBlendSpriteTemplate, 40, 31, 4, 4, 0, RGB_RED + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 40, 31, 4, 4, 0, RGB_RED end Move_SKILL_SWAP: loadspritegfx ANIM_TAG_BLUEGREEN_ORB call SetPsychicBackground createvisualtask sub_810FBF0, 3, 1 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_TARGET, RGB_WHITE, 12, 3, 1 loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 delay 16 createvisualtask sub_810FBF0, 3, 0 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB_WHITE, 12, 3, 1 waitforvisualfinish call UnsetPsychicBackground end @@ -3836,22 +3836,22 @@ Move_IMPRISON: loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_X_SIGN call SetPsychicBackground - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_810F940, 5 delay 8 loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish delay 4 - createsprite gUnknown_085967AC, 5, 0, 40 + createsprite2 gUnknown_085967AC, ANIM_BATTLER_ATTACKER, 5, 0, 40 createvisualtask sub_81152DC, 5, 4, 1, 10 playsewithpan SE_W063, SOUND_PAN_ATTACKER - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER call UnsetPsychicBackground end Move_GRUDGE: loadspritegfx ANIM_TAG_PURPLE_FLAME - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER monbgprio_29 fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER @@ -3864,12 +3864,12 @@ Move_GRUDGE: waitforvisualfinish restorebg waitbgfadein - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER end Move_CAMOUFLAGE: - monbg ANIM_ATK_PARTNER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATK_PARTNER + monbgprio_28 ANIM_BATTLER_ATTACKER setalpha 16, 0 createvisualtask sub_811675C, 5, 2, 3, 0, 14 delay 16 @@ -3882,21 +3882,21 @@ Move_CAMOUFLAGE: createvisualtask sub_81137E4, 2, 1 waitforvisualfinish blendoff - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER end Move_TAIL_GLOW: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08596AC8, 66, 0 + createsprite2 gUnknown_08596AC8, ANIM_BATTLER_ATTACKER, 66, 0 delay 18 loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK - clearmonbg ANIM_ATTACKER + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK + clearmonbg ANIM_BATTLER_ATTACKER blendoff delay 1 end @@ -3908,38 +3908,38 @@ Move_LUSTER_PURGE: waitbgfadeout createvisualtask sub_815A5C8, 5 waitbgfadein - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 playsewithpan SE_W076, SOUND_PAN_ATTACKER - createsprite gUnknown_08596898, 41, 0, 0, 0, 0 + createsprite2 gUnknown_08596898, ANIM_BATTLER_ATTACKER, 41, 0, 0, 0, 0 delay 20 createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, RGB_WHITEALPHA waitforvisualfinish createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish - createsprite gUnknown_085973A0, 131, 1, 2 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116664, 5, 5, 2, 16, 0, RGB_WHITEALPHA createvisualtask sub_81152DC, 5, 1, 5, 14 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER blendoff call UnsetPsychicBackground end @@ -3949,60 +3949,60 @@ Move_MIST_BALL: loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 playsewithpan SE_W081, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0 + createsprite2 gUnknown_08595C70, ANIM_BATTLER_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 - createsprite gComplexPaletteBlendSpriteTemplate, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 10, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 delay 0 playsewithpan SE_W114, 0 createvisualtask sub_810C324, 5 createvisualtask sub_8116620, 10, 4, 3, 0, 16, RGB_WHITE delay 8 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 70, 0 delay 70 createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE end Move_FEATHER_DANCE: loadspritegfx ANIM_TAG_WHITE_FEATHER - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, SOUND_PAN_TARGET delay 0 - createsprite gUnknown_08596388, 128, 0, -16, 64, 2, 104, 11304, 32, 1 + createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 128, 0, -16, 32, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 128, 0, -16, 0, 2, 104, 11304, 32, 1 + createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 32, 2, 104, 11304, 32, 1 + createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 0, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 128, 0, -16, 224, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 128, 0, -16, 128, 2, 104, 11304, 32, 1 + createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 224, 2, 104, 11304, 32, 1 + createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 128, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 128, 0, -16, 192, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 128, 0, -16, 160, 2, 104, 11304, 32, 1 + createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 192, 2, 104, 11304, 32, 1 + createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 160, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 128, 0, -16, 96, 2, 104, 11304, 32, 1 + createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 96, 2, 104, 11304, 32, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Move_TEETER_DANCE: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_DUCK createvisualtask sub_8160164, 5 - createsprite gUnknown_08593050, 2, 0, 16, -2 + createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 0, 16, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, 2, 0, 0, -2 + createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 0, 0, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, 2, 0, -16, -2 + createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 0, -16, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, 2, 1, -8, -2 + createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 1, -8, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, 2, 2, 8, -2 + createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 2, 8, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER end @@ -4010,46 +4010,46 @@ Move_MUD_SPORT: loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_8104938, 2, 0, 6 delay 24 - createsprite gUnknown_085971E4, 130, 0, -4, -16 - createsprite gUnknown_085971E4, 130, 0, 4, -12 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, -4, -16 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, 4, -12 playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 - createsprite gUnknown_085971E4, 130, 0, -3, -12 - createsprite gUnknown_085971E4, 130, 0, 5, -14 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, -3, -12 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, 5, -14 playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 - createsprite gUnknown_085971E4, 130, 0, -5, -18 - createsprite gUnknown_085971E4, 130, 0, 3, -14 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, -5, -18 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, 3, -14 playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 16 - createsprite gUnknown_085971E4, 130, 1, 220, 60 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 220, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite gUnknown_085971E4, 130, 1, 60, 100 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 60, 100 waitplaysewithpan SE_W145B, 0, 25 delay 2 - createsprite gUnknown_085971E4, 130, 1, 140, 55 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 140, 55 waitplaysewithpan SE_W145B, 0, 14 delay 2 - createsprite gUnknown_085971E4, 130, 1, 180, 50 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 180, 50 waitplaysewithpan SE_W145B, 0, 10 delay 2 - createsprite gUnknown_085971E4, 130, 1, 20, 90 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 20, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite gUnknown_085971E4, 130, 1, 90, 90 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 90, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite gUnknown_085971E4, 130, 1, 160, 60 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 160, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite gUnknown_085971E4, 130, 1, 30, 90 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 30, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite gUnknown_085971E4, 130, 1, 120, 60 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 120, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite gUnknown_085971E4, 130, 1, 200, 40 + createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 200, 40 waitplaysewithpan SE_W145B, 0, 10 end @@ -4058,42 +4058,42 @@ Move_NEEDLE_ARM: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 - createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 0, -32, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 22, -22, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 22, -22, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 30, 0, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 30, 0, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 20, 20, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 20, 20, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 0, 28, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 0, 28, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, -19, 19, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, -19, 19, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, -27, 0, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, -27, 0, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, -18, -18, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, -18, -18, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 0, -25, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 0, -25, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 17, -17, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 17, -17, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 23, 0, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 23, 0, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 16, 16, 16 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 16, 16, 16 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08592888, 130, 1, 1, 0, -24, 10 - createsprite gUnknown_08592888, 130, 1, 1, 17, -17, 10 - createsprite gUnknown_08592888, 130, 1, 1, 24, 0, 10 - createsprite gUnknown_08592888, 130, 1, 1, 17, 17, 10 - createsprite gUnknown_08592888, 130, 1, 1, 0, 24, 10 - createsprite gUnknown_08592888, 130, 1, 1, -17, 17, 10 - createsprite gUnknown_08592888, 130, 1, 1, -24, 0, 10 - createsprite gUnknown_08592888, 130, 1, 1, -17, -17, 10 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 0, -24, 10 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 17, -17, 10 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 24, 0, 10 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 17, 17, 10 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 0, 24, 10 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, -17, 17, 10 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, -24, 0, 10 + createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, -17, -17, 10 end Move_SLACK_OFF: @@ -4109,21 +4109,21 @@ Move_CRUSH_CLAW: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_TORN_METAL - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 18, 1 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, -10, 0 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, 10, 0 playsewithpan SE_W013, SOUND_PAN_TARGET delay 12 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, -10, 1 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, 10, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish blendoff - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET end Move_AROMATHERAPY: @@ -4131,37 +4131,37 @@ Move_AROMATHERAPY: loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 0, 0, 7, RGB(13, 31, 12) delay 1 - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER delay 1 - createsprite gUnknown_085927AC, 0, 24, 16, 0, 2, 2, 0, 0 - createsprite gUnknown_085927AC, 66, 64, 24, 0, 3, 1, 1, 0 - createsprite gUnknown_085927C4, 0, 16, 24, 0, 2, 1, 0, 0 + createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 0, 24, 16, 0, 2, 2, 0, 0 + createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 66, 64, 24, 0, 3, 1, 1, 0 + createsprite2 gUnknown_085927C4, ANIM_BATTLER_ATTACKER, 0, 16, 24, 0, 2, 1, 0, 0 delay 20 - createsprite gUnknown_085927AC, 66, 48, 12, 0, 4, 3, 1, 0 - createsprite gUnknown_085927AC, 0, 100, 16, 0, 3, 2, 0, 0 - createsprite gUnknown_085927AC, 0, 74, 24, 180, 3, 2, 0, 0 + createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 66, 48, 12, 0, 4, 3, 1, 0 + createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 0, 100, 16, 0, 3, 2, 0, 0 + createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 0, 74, 24, 180, 3, 2, 0, 0 delay 10 - createsprite gUnknown_085927AC, 66, 80, 30, 0, 4, 1, 1, 0 - createsprite gUnknown_085927AC, 0, 128, 12, 0, 3, 3, 0, 0 - createsprite gUnknown_085927C4, 0, 90, 16, 0, 2, 1, 0, 0 + createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 66, 80, 30, 0, 4, 1, 1, 0 + createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 0, 128, 12, 0, 3, 3, 0, 0 + createsprite2 gUnknown_085927C4, ANIM_BATTLER_ATTACKER, 0, 90, 16, 0, 2, 1, 0, 0 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 7, 0, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 0, 7, 0, RGB(13, 31, 12) delay 1 playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 2, 1 waitforvisualfinish playsewithpan SE_W234, SOUND_PAN_ATTACKER - createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + createsprite2 gUnknown_08592B94, ANIM_BATTLER_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite2 gUnknown_08592B94, ANIM_BATTLER_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite gSimplePaletteBlendSpriteTemplate, 0, 43, 3, 10, 0, RGB(13, 31, 12) - createsprite gUnknown_08593868, 16, 0, 0, 0, 1 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 43, 3, 10, 0, RGB(13, 31, 12) + createsprite2 gUnknown_08593868, ANIM_BATTLER_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish end @@ -4174,17 +4174,17 @@ Move_FAKE_TEARS: createvisualtask sub_815C478, 5, 0, 2, 1 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 delay 8 - createsprite gUnknown_085970E8, 2, 0, 0 - createsprite gUnknown_085970E8, 2, 0, 1 + createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 0 + createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 1 delay 8 - createsprite gUnknown_085970E8, 2, 0, 2 - createsprite gUnknown_085970E8, 2, 0, 3 + createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 2 + createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 3 delay 8 - createsprite gUnknown_085970E8, 2, 0, 0 - createsprite gUnknown_085970E8, 2, 0, 1 + createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 0 + createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 1 delay 8 - createsprite gUnknown_085970E8, 2, 0, 2 - createsprite gUnknown_085970E8, 2, 0, 3 + createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 2 + createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 3 waitforvisualfinish end @@ -4193,87 +4193,87 @@ Move_AIR_CUTTER: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT delay 0 - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 0 createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128 waitforvisualfinish playsewithpan SE_W015, SOUND_PAN_TARGET - createsprite gUnknown_08592A34, 2, 40, -32, 0, 2 + createsprite2 gUnknown_08592A34, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0, 2 delay 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish blendoff - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER delay 0 end Move_ODOR_SLEUTH: - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET createvisualtask sub_815F620, 5 delay 24 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 4 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 6 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 4 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET delay 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 playsewithpan SE_W043, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: loadspritegfx ANIM_TAG_MUSIC_NOTES - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish createvisualtask sub_8102BE8, 2 waitforvisualfinish panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite gUnknown_08593008, 130, 7, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 7, 1, 0 delay 5 - createsprite gUnknown_08593008, 130, 6, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 6, 1, 0 delay 5 - createsprite gUnknown_08593008, 130, 1, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 1, 1, 0 delay 5 - createsprite gUnknown_08593008, 130, 2, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 0 delay 5 - createsprite gUnknown_08593008, 130, 3, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 3, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 5, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 5, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 6, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 6, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 1, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 1, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 5, 1, 0 + createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 5, 1, 0 delay 4 waitforvisualfinish createvisualtask sub_8102CA0, 2 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB(18, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, RGB(18, 31, 12) waitforvisualfinish end Move_TICKLE: loadspritegfx ANIM_TAG_EYE_SPARKLE - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0, -16, -8 - createsprite gUnknown_08593A84, 0, 16, -8 + createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, -16, -8 + createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, 16, -8 playsewithpan SE_W197, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish delay 20 - createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER + createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_BATTLER_ATTACKER delay 12 createvisualtask sub_815C478, 3, 1, 6, 2 loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 @@ -4283,7 +4283,7 @@ Move_TICKLE: Move_WATER_SPOUT: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask sub_81080E4, 5 playsewithpan SE_W029, SOUND_PAN_ATTACKER @@ -4293,7 +4293,7 @@ Move_WATER_SPOUT: delay 16 createvisualtask sub_81085C8, 5 playsewithpan SE_W057, SOUND_PAN_TARGET - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -4302,17 +4302,17 @@ Move_SHADOW_PUNCH: loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg BG_GHOST waitbgfadein - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 9, 8 createvisualtask sub_80A8BC4, 2, 0, 13 playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 6 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff restorebg waitbgfadein @@ -4320,13 +4320,13 @@ Move_SHADOW_PUNCH: Move_EXTRASENSORY: call SetPsychicBackground - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask sub_810FE14, 5, 0 playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask sub_810FE14, 5, 1 playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish @@ -4335,37 +4335,37 @@ Move_EXTRASENSORY: playsewithpan SE_W043, SOUND_PAN_ATTACKER waitforvisualfinish blendoff - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER call UnsetPsychicBackground end Move_AERIAL_ACE: loadspritegfx ANIM_TAG_CUT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 1, 5 createvisualtask sub_81169C0, 2, 0, 4, 7, 3 - createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + createsprite2 gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 playsewithpan SE_W013B, SOUND_PAN_ATTACKER delay 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_IRON_DEFENSE: loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 waitforvisualfinish end Move_BLOCK: loadspritegfx ANIM_TAG_X_SIGN - createsprite gUnknown_085CE90C, 194 + createsprite2 gUnknown_085CE90C, ANIM_BATTLER_TARGET, 66 playsewithpan SE_W207, SOUND_PAN_TARGET end @@ -4384,7 +4384,7 @@ Move_BULK_UP: createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08593658, 2 + createsprite2 gUnknown_08593658, ANIM_BATTLER_ATTACKER, 2 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end @@ -4393,16 +4393,16 @@ Move_COVET: loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_815C478, 5, 0, 2, 0 - createsprite gUnknown_08593970, 3, 0, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite gUnknown_08593970, 3, -20, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, -20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite gUnknown_08593970, 3, 20, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 end @@ -4410,14 +4410,14 @@ Move_VOLT_TACKLE: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish - createsprite gUnknown_085959A4, 1 + createsprite2 gUnknown_085959A4, ANIM_BATTLER_ATTACKER, 1 playsewithpan SE_W268, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER blendoff delay 8 createvisualtask sub_810AFCC, 5, 0 @@ -4435,19 +4435,19 @@ Move_VOLT_TACKLE: createvisualtask sub_810AFCC, 5, 4 playsewithpan SE_W085, SOUND_PAN_ATTACKER delay 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 10, 0, 18, 1 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859598C, 2, 1, 16, 16 + createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 1, 16, 16 delay 2 - createsprite gUnknown_0859598C, 2, 1, -16, -16 + createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 1, -16, -16 delay 8 createvisualtask sub_810AE5C, 5 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 3, 0, 9, 1 playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859598C, 2, 0, 16, 16 + createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 0, 16, 16 delay 2 - createsprite gUnknown_0859598C, 2, 0, -16, -16 + createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -16 waitforvisualfinish createvisualtask sub_8116620, 10, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish @@ -4468,25 +4468,25 @@ Move_WATER_SPORT: Move_CALM_MIND: loadspritegfx ANIM_TAG_THIN_RING - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK waitforvisualfinish createvisualtask sub_81177E4, 5, 1 waitforvisualfinish - createsprite gUnknown_08593850, 40, 0, 0, 0, 0 + createsprite2 gUnknown_08593850, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 - createsprite gUnknown_08593850, 40, 0, 0, 0, 0 + createsprite2 gUnknown_08593850, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 - createsprite gUnknown_08593850, 40, 0, 0, 0, 0 + createsprite2 gUnknown_08593850, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_81177E4, 5, 0 waitforvisualfinish createvisualtask sub_8116664, 5, 0, 0, 16, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER end Move_LEAF_BLADE: @@ -4494,47 +4494,47 @@ Move_LEAF_BLADE: loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask sub_80FFFC0, 5 delay 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET delay 50 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET delay 50 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET waitforvisualfinish - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 delay 12 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 - createsprite gUnknown_085973D0, 130, 0, 0, 1, 36 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 8, 0, 18, 1 + createsprite2 gUnknown_085973D0, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 36 playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_DRAGON_DANCE: loadspritegfx ANIM_TAG_HOLLOW_ORB - monbg ANIM_ATTACKER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER + monbgprio_28 ANIM_BATTLER_ATTACKER delay 1 createvisualtask sub_81133E8, 5 playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80A7CB4, 5, 10249, 19456, 14, 0, 3 - createsprite gUnknown_08596F98, 2, 0 - createsprite gUnknown_08596F98, 2, 43 - createsprite gUnknown_08596F98, 2, 85 - createsprite gUnknown_08596F98, 2, 128 - createsprite gUnknown_08596F98, 2, 170 - createsprite gUnknown_08596F98, 2, 213 + createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 43 + createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 85 + createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 128 + createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 170 + createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 213 delay 30 playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 30 playsewithpan SE_W100, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER delay 1 end @@ -4543,14 +4543,14 @@ Move_SHOCK_WAVE: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_LIGHTNING - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_810AAFC, 2, 0, 20, 0, 2 playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 12 - createsprite gUnknown_08595A18, 2 + createsprite2 gUnknown_08595A18, ANIM_BATTLER_ATTACKER, 2 delay 30 createvisualtask sub_810B29C, 5 delay 12 @@ -4558,13 +4558,13 @@ Move_SHOCK_WAVE: createvisualtask sub_810B55C, 5 playsewithpan SE_W161B, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 6, 18, 1 createvisualtask sub_8116620, 5, 1, 3, 16, 0, RGB_WHITE createvisualtask sub_8116620, 5, 4, 0, 16, 16, RGB_BLACK delay 4 createvisualtask sub_8116620, 5, 4, 0, 0, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER blendoff end @@ -4580,27 +4580,27 @@ Move_BELLY_DRUM: createvisualtask sub_8102BE8, 2 waitforvisualfinish call BellyDrum1 - createsprite gUnknown_0859309C, 2, 0, 0, 0, 0 + createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call BellyDrum2 - createsprite gUnknown_0859309C, 2, 1, 1, 1, 0 + createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 1, 1, 1, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call BellyDrum1 - createsprite gUnknown_0859309C, 2, 0, 3, 3, 128 + createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 0, 3, 3, 128 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum2 - createsprite gUnknown_0859309C, 2, 1, 2, 0, 128 + createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 128 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum1 - createsprite gUnknown_0859309C, 2, 0, 1, 1, 0 + createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 0, 1, 1, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum2 - createsprite gUnknown_0859309C, 2, 1, 0, 3, 0 + createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 1, 0, 3, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8102CA0, 2 @@ -4608,132 +4608,132 @@ Move_BELLY_DRUM: end BellyDrum2: - createsprite gUnknown_08593068, 3, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 + createsprite2 gUnknown_08593068, ANIM_BATTLER_ATTACKER, 3, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 8, 2, 1 return BellyDrum1: - createsprite gUnknown_08593068, 3, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 + createsprite2 gUnknown_08593068, ANIM_BATTLER_ATTACKER, 3, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 8, 2, 1 return Move_MIND_READER: loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER playsewithpan SE_W109, SOUND_PAN_TARGET - createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 - createsprite gUnknown_085CE094, 5 + createsprite2 gUnknown_085CE07C, ANIM_BATTLER_ATTACKER, 5, 0, 0, 1, 0 + createsprite2 gUnknown_085CE094, ANIM_BATTLER_ATTACKER, 5 delay 40 playsewithpan SE_W043, SOUND_PAN_TARGET createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK call MindReaderEffect waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end MindReaderEffect: - createsprite gUnknown_085CE0AC, 4, 70, 0, 6 - createsprite gUnknown_085CE0AC, 4, 40, 40, 6 - createsprite gUnknown_085CE0AC, 4, 10, -60, 6 - createsprite gUnknown_085CE0AC, 4, -50, -40, 6 - createsprite gUnknown_085CE0AC, 4, -40, 40, 6 - createsprite gUnknown_085CE0AC, 4, 50, -50, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 70, 0, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 40, 40, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 10, -60, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -50, -40, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -40, 40, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 50, -50, 6 delay 2 - createsprite gUnknown_085CE0AC, 4, 50, -30, 6 - createsprite gUnknown_085CE0AC, 4, 60, 10, 6 - createsprite gUnknown_085CE0AC, 4, 0, 60, 6 - createsprite gUnknown_085CE0AC, 4, 0, -40, 6 - createsprite gUnknown_085CE0AC, 4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 4, -60, -30, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 50, -30, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 60, 10, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 0, 60, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 0, -40, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -60, 20, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -60, -30, 6 delay 2 - createsprite gUnknown_085CE0AC, 4, -50, 50, 6 - createsprite gUnknown_085CE0AC, 4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 4, -40, -40, 6 - createsprite gUnknown_085CE0AC, 4, 20, -60, 6 - createsprite gUnknown_085CE0AC, 4, 50, -50, 6 - createsprite gUnknown_085CE0AC, 4, 35, 40, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -50, 50, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -60, 20, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -40, -40, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 20, -60, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 50, -50, 6 + createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 35, 40, 6 delay 2 return Move_ICE_PUNCH: - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 playsewithpan SE_W081, SOUND_PAN_TARGET - createsprite gUnknown_08595AE8, 2, 0 - createsprite gUnknown_08595AE8, 2, 64 - createsprite gUnknown_08595AE8, 2, 128 - createsprite gUnknown_08595AE8, 2, 192 + createsprite2 gUnknown_08595AE8, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite2 gUnknown_08595AE8, ANIM_BATTLER_ATTACKER, 2, 64 + createsprite2 gUnknown_08595AE8, ANIM_BATTLER_ATTACKER, 2, 128 + createsprite2 gUnknown_08595AE8, ANIM_BATTLER_ATTACKER, 2, 192 delay 5 - createsprite gUnknown_08595AD0, 2, 32 - createsprite gUnknown_08595AD0, 2, 96 - createsprite gUnknown_08595AD0, 2, 160 - createsprite gUnknown_08595AD0, 2, 224 + createsprite2 gUnknown_08595AD0, ANIM_BATTLER_ATTACKER, 2, 32 + createsprite2 gUnknown_08595AD0, ANIM_BATTLER_ATTACKER, 2, 96 + createsprite2 gUnknown_08595AD0, ANIM_BATTLER_ATTACKER, 2, 160 + createsprite2 gUnknown_08595AD0, ANIM_BATTLER_ATTACKER, 2, 224 delay 17 - createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, -10, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -10, 1, 1 playsewithpan SE_W004, SOUND_PAN_TARGET delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 3, 1 waitforvisualfinish delay 15 call FreezeEffect1 delay 5 createvisualtask sub_8116620, 10, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_REST: playsewithpan SE_W173, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 waitforvisualfinish end Move_CONFUSION: - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER call SetPsychicBackground setalpha 8, 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish playsewithpan SE_W048, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff delay 1 call UnsetPsychicBackground end Move_PSYCHIC: - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER call SetPsychicBackground setalpha 8, 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0) waitforvisualfinish loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff delay 1 call UnsetPsychicBackground @@ -4747,15 +4747,15 @@ FutureSightContinue: call UnsetPsychicBackground end FutureSight: - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE - createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff goto FutureSightContinue @@ -4765,43 +4765,43 @@ Move_THUNDER: waitbgfadeout createvisualtask sub_8117660, 5, -256, 0, 1, -1 waitbgfadein - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W086, SOUND_PAN_TARGET delay 1 - createsprite gUnknown_085956C0, 130, 16, -36 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 16, -36 delay 1 - createsprite gUnknown_085956C0, 130, 16, -20 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 16, -20 delay 1 - createsprite gUnknown_085956C0, 130, 16, 12 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 16, 12 delay 20 - createsprite gUnknown_085956C0, 0x86, -16, -32 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 6, -16, -32 playsewithpan SE_W086, SOUND_PAN_TARGET delay 1 - createsprite gUnknown_085956C0, 0x86, -16, -16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 6, -16, -16 delay 1 - createsprite gUnknown_085956C0, 0x86, -16, 16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 6, -16, 16 playsewithpan SE_W086, SOUND_PAN_TARGET delay 5 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gUnknown_085956C0, 130, 24, -32 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 24, -32 delay 1 - createsprite gUnknown_085956C0, 130, 24, -16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 24, -16 delay 1 - createsprite gUnknown_085956C0, 130, 24, 16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 24, 16 delay 30 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 5 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gUnknown_085956C0, 130, 0, -32 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -32 playsewithpan SE_W161B, SOUND_PAN_TARGET delay 1 - createsprite gUnknown_085956C0, 130, 0, -16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -16 delay 1 - createsprite gUnknown_085956C0, 130, 0, 16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, 16 delay 10 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 @@ -4809,7 +4809,7 @@ Move_THUNDER: delay 2 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 130, 1, 2, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish restorebg waitbgfadeout @@ -4821,32 +4821,32 @@ Move_THUNDER_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_LIGHTNING - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gUnknown_085956C0, 130, 0, -48 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -48 delay 1 - createsprite gUnknown_085956C0, 2, 0, -16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_ATTACKER, 2, 0, -16 delay 1 - createsprite gUnknown_085956C0, 2, 0, 16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_ATTACKER, 2, 0, 16 delay 1 playsewithpan SE_W161B, SOUND_PAN_TARGET createvisualtask sub_8115F10, 2, 257, 257, 257 delay 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 15, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK delay 20 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end @@ -4854,34 +4854,34 @@ Move_SACRED_FIRE: loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 - createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 - createsprite gUnknown_08595428, 66, -20, -10, 50, 5, -1, -1 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, -20, -10, 50, 5, -1, -1 delay 1 - createsprite gUnknown_08595428, 66, 0, -16, 50, 5, 0, -1 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 0, -16, 50, 5, 0, -1 delay 1 - createsprite gUnknown_08595428, 66, 20, -10, 50, 5, 1, -1 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 20, -10, 50, 5, 1, -1 delay 1 - createsprite gUnknown_08595428, 2, 32, 0, 50, 5, 2, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 32, 0, 50, 5, 2, 0 delay 1 - createsprite gUnknown_08595428, 2, 20, 10, 50, 5, 1, 1 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 20, 10, 50, 5, 1, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gUnknown_08595428, 2, 0, 16, 50, 5, 0, 1 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 0, 16, 50, 5, 0, 1 delay 1 - createsprite gUnknown_08595428, 2, -20, 10, 50, 5, -1, 1 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -20, 10, 50, 5, -1, 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 waitforvisualfinish playsewithpan SE_W221B, SOUND_PAN_TARGET - createsprite gUnknown_085953F8, 130, -16, 0, 70, 16, 0, 1 + createsprite2 gUnknown_085953F8, ANIM_BATTLER_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 playsewithpan SE_W221B, SOUND_PAN_TARGET - createsprite gUnknown_085953F8, 130, 0, 0, 70, 16, 0, 1 + createsprite2 gUnknown_085953F8, ANIM_BATTLER_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 playsewithpan SE_W221B, SOUND_PAN_TARGET - createsprite gUnknown_085953F8, 130, 16, 0, 80, 16, 0, 1 + createsprite2 gUnknown_085953F8, ANIM_BATTLER_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 @@ -4889,83 +4889,83 @@ Move_SACRED_FIRE: createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 playsewithpan SE_W172B, SOUND_PAN_TARGET - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, -1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 2, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 1, -1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 1, -2 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 3, 1 waitforvisualfinish end Move_SCRATCH: loadspritegfx ANIM_TAG_SCRATCH - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_085CE020, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gUnknown_085CE020, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff waitforvisualfinish end Move_DRAGON_BREATH: loadspritegfx ANIM_TAG_SMALL_EMBER - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createvisualtask sub_8116620, 10, 4, 1, 0, 9, RGB_RED - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 21, 1 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 21, 1 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 waitforvisualfinish createvisualtask sub_8116620, 10, 4, 1, 9, 0, RGB_RED waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Move_ROAR: loadspritegfx ANIM_TAG_NOISE_LINE - monbg ANIM_ATTACKER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER + monbgprio_28 ANIM_BATTLER_ATTACKER setalpha 8, 8 createvisualtask sub_8158E9C, 2, 0, 2 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 call RoarEffect delay 20 createvisualtask sub_80D5DB0, 5, 1, 2 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER blendoff waitforvisualfinish createvisualtask sub_8159078, 5 @@ -4973,13 +4973,13 @@ Move_ROAR: end RoarEffect: - createsprite gUnknown_085CE7D4, 2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 2, 24, 8, 1 + createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, -8, 0 + createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, 0, 2 + createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, 8, 1 delay 15 - createsprite gUnknown_085CE7D4, 2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 2, 24, 8, 1 + createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, -8, 0 + createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, 0, 2 + createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, 8, 1 return Move_GROWL: @@ -4987,8 +4987,8 @@ Move_GROWL: createvisualtask sub_8158E9C, 2, 0, 255 call RoarEffect delay 10 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish createvisualtask sub_8159078, 5 waitforvisualfinish @@ -4996,23 +4996,23 @@ Move_GROWL: Move_SNORE: loadspritegfx ANIM_TAG_SNORE_Z - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 8, 8 call Snore1 delay 30 call Snore1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff end Snore1: playsewithpan SE_W173, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 6, 1, 14, 0, 0 - createsprite gUnknown_085936EC, 2, 0, 0, -42, -38, 24, 0, 0 - createsprite gUnknown_085936EC, 2, 0, 0, 0, -42, 24, 0, 0 - createsprite gUnknown_085936EC, 2, 0, 0, 42, -38, 24, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_BATTLER_ATTACKER, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 6, 1, 14, 0, 0 + createsprite2 gUnknown_085936EC, ANIM_BATTLER_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 + createsprite2 gUnknown_085936EC, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 + createsprite2 gUnknown_085936EC, ANIM_BATTLER_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 return Move_LIGHT_SCREEN: @@ -5020,7 +5020,7 @@ Move_LIGHT_SCREEN: loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 - createsprite gUnknown_08596560, 1, 40, 0, 10166 + createsprite2 gUnknown_08596560, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10166 delay 10 call SpecialScreenEffect waitforvisualfinish @@ -5029,24 +5029,24 @@ Move_LIGHT_SCREEN: end SpecialScreenEffect: - createsprite gUnknown_08596624, 2, 23, 0, 0, 1 + createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 23, 0, 0, 1 delay 6 - createsprite gUnknown_08596624, 2, 31, -8, 0, 1 + createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 31, -8, 0, 1 delay 5 - createsprite gUnknown_08596624, 2, 30, 20, 0, 1 + createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 30, 20, 0, 1 delay 7 - createsprite gUnknown_08596624, 2, 10, -15, 0, 1 + createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 10, -15, 0, 1 delay 6 - createsprite gUnknown_08596624, 2, 20, 10, 0, 1 + createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 20, 10, 0, 1 delay 6 - createsprite gUnknown_08596624, 2, 10, 18, 0, 1 + createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 10, 18, 0, 1 return Move_MIRROR_COAT: loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 - createsprite gUnknown_08596590, 1, 40, 0, 10168 + createsprite2 gUnknown_08596590, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10168 delay 10 playsewithpan SE_W115, SOUND_PAN_ATTACKER call SpecialScreenEffect @@ -5060,13 +5060,13 @@ Move_REFLECT: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 - createsprite gUnknown_08596578, 1, 40, 0, 10167 + createsprite2 gUnknown_08596578, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10167 delay 20 - createsprite gUnknown_085965F4, 2, 30, 0, 0, 1 + createsprite2 gUnknown_085965F4, ANIM_BATTLER_ATTACKER, 2, 30, 0, 0, 1 delay 7 - createsprite gUnknown_085965F4, 2, 19, -12, 0, 1 + createsprite2 gUnknown_085965F4, ANIM_BATTLER_ATTACKER, 2, 19, -12, 0, 1 delay 7 - createsprite gUnknown_085965F4, 2, 10, 20, 0, 1 + createsprite2 gUnknown_085965F4, ANIM_BATTLER_ATTACKER, 2, 10, 20, 0, 1 waitforvisualfinish delay 1 blendoff @@ -5076,7 +5076,7 @@ Move_BARRIER: loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 - createsprite gUnknown_085965A8, 3, 40, 0, 10169 + createsprite2 gUnknown_085965A8, ANIM_BATTLER_ATTACKER, 3, 40, 0, 10169 waitforvisualfinish delay 1 blendoff @@ -5085,42 +5085,42 @@ Move_BARRIER: Move_BUBBLE: loadspritegfx ANIM_TAG_BUBBLE loadspritegfx ANIM_TAG_SMALL_BUBBLES - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 delay 1 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 128, 100 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 37, 40, 128, 100 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -37, 30, 128, 100 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, 15, 128, 100 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 33, 20, 128, 100 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 128, 100 + createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 waitforvisualfinish call WaterBubbleEffect2 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_SMOG: loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 setalpha 12, 8 loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 @@ -5135,47 +5135,47 @@ Move_SMOG: loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) delay 10 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 15, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Smog1: - createsprite gUnknown_08595C44, 2, 0, -24, 48, 240, 1, 0 + createsprite2 gUnknown_08595C44, ANIM_BATTLER_ATTACKER, 2, 0, -24, 48, 240, 1, 0 delay 7 return Move_FAINT_ATTACK: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER fadetobg BG_DARK waitbgfadein delay 0 playsewithpan SE_W185, SOUND_PAN_ATTACKER - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 3 createvisualtask sub_81136E8, 2, 1 waitforvisualfinish - clearmonbg ANIM_ATTACKER - invisible ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER + invisible ANIM_BATTLER_ATTACKER delay 1 createvisualtask sub_8117F60, 2 setalpha 12, 8 - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 9, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff delay 1 setarg 7, 0x1000 delay 32 createvisualtask sub_8113888, 2 - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER createvisualtask sub_81137E4, 2, 1 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER delay 1 restorebg waitbgfadein @@ -5183,13 +5183,13 @@ Move_FAINT_ATTACK: Move_SAND_ATTACK: loadspritegfx ANIM_TAG_MUD_SAND - monbg ANIM_ATK_PARTNER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATK_PARTNER + monbgprio_28 ANIM_BATTLER_ATTACKER setalpha 12, 8 playsewithpan SE_W028, SOUND_PAN_ATTACKER - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 call SandAttack1 call SandAttack1 call SandAttack1 @@ -5197,24 +5197,24 @@ Move_SAND_ATTACK: call SandAttack1 call SandAttack1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff end SandAttack1: - createsprite gUnknown_085971A8, 130, 15, 15, 20, 0, 0 - createsprite gUnknown_085971A8, 130, 15, 15, 20, 10, 10 - createsprite gUnknown_085971A8, 130, 15, 15, 20, -10, -10 - createsprite gUnknown_085971A8, 130, 15, 15, 20, 20, 5 - createsprite gUnknown_085971A8, 130, 15, 15, 20, -20, -5 + createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 0, 0 + createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 10, 10 + createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, -10, -10 + createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 20, 5 + createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, -20, -5 delay 2 return Move_MUD_SLAP: loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_W028, SOUND_PAN_ATTACKER - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 call MudSlap1 call MudSlap1 call MudSlap1 @@ -5224,11 +5224,11 @@ Move_MUD_SLAP: waitforvisualfinish end MudSlap1: - createsprite gUnknown_085971CC, 130, 15, 15, 20, 0, 0 - createsprite gUnknown_085971CC, 130, 15, 15, 20, 10, 5 - createsprite gUnknown_085971CC, 130, 15, 15, 20, -10, -5 - createsprite gUnknown_085971CC, 130, 15, 15, 20, 20, 10 - createsprite gUnknown_085971CC, 130, 15, 15, 20, -20, -10 + createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 0, 0 + createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 10, 5 + createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, -10, -5 + createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 20, 10 + createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, -20, -10 delay 2 return @@ -5236,31 +5236,31 @@ Move_DRAGON_RAGE: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 40, 1 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 15, 0, 0, 4 waitforvisualfinish - createsprite gUnknown_08596F80, 130, 30, 15, 0, 10, 10 + createsprite2 gUnknown_08596F80, ANIM_BATTLER_TARGET, 2, 30, 15, 0, 10, 10 waitforvisualfinish loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 - createsprite gUnknown_08596F28, 194, 1, 5, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 3, 25, 1 + createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, 5, 0 delay 1 - createsprite gUnknown_08596F28, 194, 1, -10, -15 + createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, -10, -15 delay 1 - createsprite gUnknown_08596F28, 130, 1, 0, 25 + createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 2, 1, 0, 25 delay 1 - createsprite gUnknown_08596F28, 194, 1, 15, 5 + createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, 15, 5 delay 1 - createsprite gUnknown_08596F28, 194, 1, -25, 0 + createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, -25, 0 delay 1 - createsprite gUnknown_08596F28, 130, 1, 30, 30 + createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 2, 1, 30, 30 delay 1 - createsprite gUnknown_08596F28, 130, 1, -27, 25 + createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 2, 1, -27, 25 delay 1 - createsprite gUnknown_08596F28, 194, 1, 0, 8 + createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, 0, 8 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 194, 0, 0, 4 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_TARGET, 66, 0, 0, 4 waitforvisualfinish end @@ -5281,16 +5281,16 @@ Move_RAIN_DANCE: Move_BITE: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite gUnknown_08597080, 2, 0, -32, 0, 0, 819, 10 - createsprite gUnknown_08597080, 2, 0, 32, 4, 0, -819, 10 + createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, 0, -32, 0, 0, 819, 10 + createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 4, 7, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff delay 1 end @@ -5298,25 +5298,25 @@ Move_BITE: Move_CRUNCH: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET fadetobg BG_DARK waitbgfadein setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite gUnknown_08597080, 2, -32, -32, 1, 819, 819, 10 - createsprite gUnknown_08597080, 2, 32, 32, 5, -819, -819, 10 + createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, -32, -32, 1, 819, 819, 10 + createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, 32, 32, 5, -819, -819, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 7, 5, 2 waitforvisualfinish playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite gUnknown_08597080, 2, 32, -32, 7, -819, 819, 10 - createsprite gUnknown_08597080, 2, -32, 32, 3, 819, -819, 10 + createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, 32, -32, 7, -819, 819, 10 + createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 8, 4, 2 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff delay 1 restorebg @@ -5326,36 +5326,36 @@ Move_CRUNCH: Move_CLAMP: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10 + createsprite2 gUnknown_08597098, ANIM_BATTLER_ATTACKER, 2, -32, 0, 2, 819, 0, 10 + createsprite2 gUnknown_08597098, ANIM_BATTLER_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 5, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff waitforvisualfinish end Move_ICE_BEAM: - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 loadspritegfx ANIM_TAG_ICE_CRYSTALS - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 - createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 + createsprite2 gUnknown_08595B2C, ANIM_BATTLER_ATTACKER, 2, 20, 12, 0, 12, 20 + createsprite2 gUnknown_08595B2C, ANIM_BATTLER_ATTACKER, 2, 20, -12, 0, -12, 20 delay 1 call IceBeam1 call IceBeam1 call IceBeam1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, -31, 0, 7, RGB(0, 20, 31) - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, -31, 0, 7, RGB(0, 20, 31) + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 25, 1 call IceBeam1 call IceBeam1 call IceBeam1 @@ -5364,23 +5364,23 @@ Move_ICE_BEAM: call IceBeam1 call IceBeam1 call IceBeam1 - createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + createsprite2 gUnknown_08595B14, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 11 delay 1 - createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + createsprite2 gUnknown_08595B14, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 11 waitforvisualfinish delay 20 call FreezeEffect1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, 5, 7, 0, RGB(0, 20, 31) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 5, 7, 0, RGB(0, 20, 31) waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end IceBeam1: - createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 - createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + createsprite2 gUnknown_08595B2C, ANIM_BATTLER_ATTACKER, 2, 20, 12, 0, 12, 20 + createsprite2 gUnknown_08595B2C, ANIM_BATTLER_ATTACKER, 2, 20, -12, 0, -12, 20 + createsprite2 gUnknown_08595B14, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 11 delay 1 return @@ -5398,13 +5398,13 @@ Move_AURORA_BEAM: setarg 7, 0 createvisualtask sub_8107528, 10, 130 call AuroraBeam1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 17, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 1, 0, 17, 1 call AuroraBeam1 call AuroraBeam1 call AuroraBeam1 setarg 7, -1 createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 40, 1 call AuroraBeam1 call AuroraBeam1 call AuroraBeam1 @@ -5416,13 +5416,13 @@ Move_AURORA_BEAM: waitbgfadein end AuroraBeam1: - createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + createsprite2 gUnknown_085950B4, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + createsprite2 gUnknown_085950B4, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + createsprite2 gUnknown_085950B4, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + createsprite2 gUnknown_085950B4, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 17 delay 1 return @@ -5433,64 +5433,64 @@ SolarBeamEnd: waitforvisualfinish end SolarBeamSetUp: - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) playsewithpan SE_W025, SOUND_PAN_ATTACKER call SolarBeamSetUp1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff goto SolarBeamEnd SolarBeamSetUp1: - createsprite gUnknown_085921E0, 2, 40, 40, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, 40, 16 delay 2 - createsprite gUnknown_085921E0, 2, -40, -40, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, -40, 16 delay 2 - createsprite gUnknown_085921E0, 2, 0, 40, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 0, 40, 16 delay 2 - createsprite gUnknown_085921E0, 2, 0, -40, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 0, -40, 16 delay 2 - createsprite gUnknown_085921E0, 2, 40, -20, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, -20, 16 delay 2 - createsprite gUnknown_085921E0, 2, 40, 20, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, 20, 16 delay 2 - createsprite gUnknown_085921E0, 2, -40, -20, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, -20, 16 delay 2 - createsprite gUnknown_085921E0, 2, -40, 20, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, 20, 16 delay 2 - createsprite gUnknown_085921E0, 2, -20, 30, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -20, 30, 16 delay 2 - createsprite gUnknown_085921E0, 2, 20, -30, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 20, -30, 16 delay 2 - createsprite gUnknown_085921E0, 2, -20, -30, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -20, -30, 16 delay 2 - createsprite gUnknown_085921E0, 2, 20, 30, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 20, 30, 16 delay 2 - createsprite gUnknown_085921E0, 2, -40, 0, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, 0, 16 delay 2 - createsprite gUnknown_085921E0, 2, 40, 0, 16 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, 0, 16 delay 2 return SolarBeamUnleash: call SetSolarbeamBg panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask sub_80FEA58, 5 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 1 delay 4 createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0) - createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 2 delay 4 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 65, 1 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 6 delay 4 call SolarBeamUnleash1 call SolarBeamUnleash1 @@ -5499,25 +5499,25 @@ SolarBeamUnleash: call UnsetSolarbeamBg goto SolarBeamEnd SolarBeamUnleash1: - createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 1 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 2 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 6 delay 4 return Move_BLIZZARD: loadspritegfx ANIM_TAG_ICE_CRYSTALS - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue BlizzardAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -5538,29 +5538,29 @@ BlizzardContinue: waitbgfadeout setarg 7, -1 waitbgfadein - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Blizzard1: - createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, 0, 0, 0, 80, 0, 0, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -10, 0, -10, 72, 1 + createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -15, 0, -15, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, -10, 0, -10, 80, 0, 0, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -15, 0, -15, 72, 1 + createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, -10, 0, -10, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -5, 0, -5, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, 10, 0, 10, 80, 0, 0, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -5, 0, -5, 72, 1 + createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, 10, 0, 10, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -10, 0, -10, 72, 1 + createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -20, 0, -20, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, 15, 0, 15, 80, 0, 0, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 72, 1 + createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, 15, 0, 15, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -15, 0, -15, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -15, 0, -15, 72, 1 + createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -25, 0, -25, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, 20, 0, 20, 80, 0, 0, 1 + createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -25, 0, -25, 72, 1 + createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, 20, 0, 20, 80, 0, 0, 1 delay 3 return BlizzardAgainstPlayer: @@ -5569,8 +5569,8 @@ BlizzardAgainstPlayer: Move_POWDER_SNOW: loadspritegfx ANIM_TAG_ICE_CRYSTALS - monbg ANIM_DEF_PARTNER - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK + monbg ANIM_BATTLER_DEF_PARTNER + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call PowderSnow1 @@ -5580,41 +5580,41 @@ Move_POWDER_SNOW: waitsound call FreezeEffect2 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER delay 20 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 3, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 1, 3, 0, RGB_BLACK end PowderSnow1: - createsprite gUnknown_08595BC8, 40, 0, 0, 0, 0, 56, 4, 4, 1 + createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, -10, 0, -10, 56, 4, 4, 1 + createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, -10, 0, -10, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, 10, 0, 10, 56, -4, 3, 1 + createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, 10, 0, 10, 56, -4, 3, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, -4, 5, 1 + createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 56, -4, 5, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, 15, 0, 15, 56, 4, 4, 1 + createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, 15, 0, 15, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, 4, 4, 1 + createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, 20, 0, 20, 56, 4, 4, 1 + createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, 20, 0, 20, 56, 4, 4, 1 delay 3 return Move_HYDRO_PUMP: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 40, 1 delay 6 panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask sub_81076C8, 5, 100 call HydroPump1 call HydroPump1 call HydroPump1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 37, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 37, 1 call HydroPump2 call HydroPump1 call HydroPump1 @@ -5632,27 +5632,27 @@ Move_HYDRO_PUMP: delay 1 call HydroPump2 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end HydroPump1: - createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + createsprite2 gUnknown_085950E4, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 + createsprite2 gUnknown_085950E4, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, -16 delay 1 - createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + createsprite2 gUnknown_085950E4, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 + createsprite2 gUnknown_085950E4, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, -16 delay 1 return HydroPump2: - createsprite gUnknown_08597388, 4, 0, 15, 1, 1 - createsprite gUnknown_08597388, 4, 0, -15, 1, 1 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 4, 0, 15, 1, 1 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 4, 0, -15, 1, 1 return Move_SIGNAL_BEAM: loadspritegfx ANIM_TAG_GLOWY_RED_ORB loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB loadspritegfx ANIM_TAG_DUCK - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 25, 1 delay 6 panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 createvisualtask sub_81076C8, 5, 100 @@ -5662,8 +5662,8 @@ Move_SIGNAL_BEAM: call SignalBeam1 call SignalBeam1 call SignalBeam1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 25, 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 4, 8, 5, RGB_RED, 8, 961, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 25, 1 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 8, 5, RGB_RED, 8, 961, 8 call SignalBeam1 call SignalBeam1 call SignalBeam1 @@ -5684,8 +5684,8 @@ Move_SIGNAL_BEAM: waitforvisualfinish end SignalBeam1: - createsprite gUnknown_08595114, 131, 10, 10, 0, 16 - createsprite gUnknown_0859512C, 131, 10, 10, 0, -16 + createsprite2 gUnknown_08595114, ANIM_BATTLER_TARGET, 3, 10, 10, 0, 16 + createsprite2 gUnknown_0859512C, ANIM_BATTLER_TARGET, 3, 10, 10, 0, -16 delay 1 return @@ -5693,15 +5693,15 @@ Move_ABSORB: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 waitforvisualfinish delay 3 call AbsorbEffect @@ -5709,36 +5709,36 @@ Move_ABSORB: delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end AbsorbEffect: playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5746,15 +5746,15 @@ Move_MEGA_DRAIN: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 8, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 waitforvisualfinish delay 3 call MegaDrainEffect @@ -5762,44 +5762,44 @@ Move_MEGA_DRAIN: delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 8, 0, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 8, 0, RGB(13, 31, 12) waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end MegaDrainEffect: playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5807,15 +5807,15 @@ Move_GIGA_DRAIN: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 12, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 waitforvisualfinish delay 3 call GigaDrainEffect @@ -5823,52 +5823,52 @@ Move_GIGA_DRAIN: delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 12, 0, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 12, 0, RGB(13, 31, 12) waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end GigaDrainEffect: playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -40, 35 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 40, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 28, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 40, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -32, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -32, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -40, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -40, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 36, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5878,27 +5878,27 @@ Move_LEECH_LIFE: delay 1 loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET setalpha 12, 8 delay 1 - createsprite gUnknown_085969C8, 2, -20, 15, 12 + createsprite2 gUnknown_085969C8, ANIM_BATTLER_ATTACKER, 2, -20, 15, 12 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 playsewithpan SE_W071, SOUND_PAN_TARGET delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish call AbsorbEffect waitforvisualfinish delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 7, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -5926,16 +5926,16 @@ Move_TOXIC: waitforvisualfinish end Toxic1: - createsprite gUnknown_08596134, 130, -24, 16, 1, 1 + createsprite2 gUnknown_08596134, ANIM_BATTLER_TARGET, 2, -24, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, 130, 8, 16, 1, 1 + createsprite2 gUnknown_08596134, ANIM_BATTLER_TARGET, 2, 8, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, 130, -8, 16, 1, 1 + createsprite2 gUnknown_08596134, ANIM_BATTLER_TARGET, 2, -8, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, 130, 24, 16, 1, 1 + createsprite2 gUnknown_08596134, ANIM_BATTLER_TARGET, 2, 24, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 return @@ -5943,9 +5943,9 @@ Toxic1: Move_SLUDGE: loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 + createsprite2 gUnknown_085961A8, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 5, 1 createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) call PoisonBubblesEffect waitforvisualfinish @@ -5963,24 +5963,24 @@ Move_SLUDGE_BOMB: call SludgeBomb1 call SludgeBomb1 call SludgeBomb1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 3, 0, 15, 1 createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_085961D8, 130, 42, 27, 20 - createsprite gUnknown_085961D8, 130, -27, 44, 20 - createsprite gUnknown_085961D8, 130, 39, -28, 20 - createsprite gUnknown_085961D8, 130, -42, -42, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 42, 27, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -27, 44, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 39, -28, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -42, -42, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_085961D8, 130, 0, 40, 20 - createsprite gUnknown_085961D8, 130, -8, -44, 20 - createsprite gUnknown_085961D8, 130, -46, -28, 20 - createsprite gUnknown_085961D8, 130, 46, 9, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 0, 40, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -8, -44, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -46, -28, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 46, 9, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_085961D8, 130, 42, 0, 20 - createsprite gUnknown_085961D8, 130, -43, -12, 20 - createsprite gUnknown_085961D8, 130, 16, -46, 20 - createsprite gUnknown_085961D8, 130, -16, 44, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 42, 0, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -43, -12, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 16, -46, 20 + createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -16, 44, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 0 waitsound @@ -5990,118 +5990,118 @@ Move_SLUDGE_BOMB: end SludgeBomb1: playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 + createsprite2 gUnknown_085961A8, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 0 delay 3 return Move_ACID: loadspritegfx ANIM_TAG_POISON_BUBBLE - monbg ANIM_DEF_PARTNER - createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0 + monbg ANIM_BATTLER_DEF_PARTNER + createsprite2 gUnknown_085961C0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 24, 0 + createsprite2 gUnknown_085961C0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, 24, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, -24, 0 + createsprite2 gUnknown_085961C0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, -24, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 15 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_DEF_PARTNER, 2, 0, 10, 1 createvisualtask sub_8115A04, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_0859620C, 130, 0, -22, 0, 15, 55 + createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, 0, -22, 0, 15, 55 playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859620C, 130, -26, -24, 0, 15, 55 + createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, -26, -24, 0, 15, 55 playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859620C, 130, 15, -27, 0, 15, 50 + createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, 15, -27, 0, 15, 50 playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859620C, 130, -15, -17, 0, 10, 45 + createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, -15, -17, 0, 10, 45 playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859620C, 130, 27, -22, 0, 15, 50 + createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, 27, -22, 0, 15, 50 playsewithpan SE_W145, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Move_BONEMERANG: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_ATTACKER - createsprite gUnknown_08597178, 2 + createsprite2 gUnknown_08597178, ANIM_BATTLER_ATTACKER, 2 delay 20 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 5, 0, 5, 1 delay 17 playsewithpan SE_W233, SOUND_PAN_ATTACKER - createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, -4 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_BONE_CLUB: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET - createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15 + createsprite2 gUnknown_08597190, ANIM_BATTLER_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_BONE_RUSH: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET - createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15 + createsprite2 gUnknown_08597190, ANIM_BATTLER_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 3, 5, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_SPIKES: loadspritegfx ANIM_TAG_SPIKES - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER playsewithpan SE_W026, SOUND_PAN_ATTACKER waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 - createsprite gUnknown_085CE11C, 130, 20, 0, 0, 24, 30 + createsprite2 gUnknown_085CE11C, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 24, 30 delay 10 playsewithpan SE_W026, SOUND_PAN_ATTACKER waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 - createsprite gUnknown_085CE11C, 130, 20, 0, -24, 24, 30 + createsprite2 gUnknown_085CE11C, ANIM_BATTLER_TARGET, 2, 20, 0, -24, 24, 30 delay 10 waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 - createsprite gUnknown_085CE11C, 130, 20, 0, 24, 24, 30 + createsprite2 gUnknown_085CE11C, ANIM_BATTLER_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Move_MEGAHORN: loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER playsewithpan SE_W082, SOUND_PAN_ATTACKER jumpifcontest MegahornInContest fadetobg BG_DRILL @@ -6110,25 +6110,25 @@ Move_MEGAHORN: MegahornContinue: waitbgfadein setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 2, 0, 15, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 6 delay 3 - createsprite gUnknown_08596974, 3, -42, 25, 0, 0, 6 + createsprite2 gUnknown_08596974, ANIM_BATTLER_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, -4, 1, 12, 1 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff restorebg waitbgfadeout @@ -6144,42 +6144,42 @@ MegahornInContest: Move_GUST: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W016, SOUND_PAN_TARGET - createsprite gUnknown_08596270, 2, 0, -16 + createsprite2 gUnknown_08596270, ANIM_BATTLER_ATTACKER, 2, 0, -16 createvisualtask sub_810DED8, 5, 1, 70 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 1, 0, 7, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_WING_ATTACK: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 5, 1, 70 - createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 - createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 + createsprite2 gBattleAnimSpriteTemplate_85962A4, ANIM_BATTLER_ATTACKER, 2, -25, 0, 0, 0, 20 + createsprite2 gBattleAnimSpriteTemplate_85962A4, ANIM_BATTLER_ATTACKER, 2, 25, 0, 0, 0, 20 delay 24 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 9 delay 17 - createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -16, 0, 1, 1 loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -6187,109 +6187,109 @@ Move_PECK: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W030, SOUND_PAN_TARGET createvisualtask sub_80D622C, 2, 3, -768, 1, 2 - createsprite gUnknown_085973E8, 131, -12, 0, 1, 3 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -12, 0, 1, 3 waitforvisualfinish end Move_AEROBLAST: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER call SetFlyingBg - monbgprio_28 ANIM_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 call Aeroblast1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 50, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 5, 0, 50, 1 call Aeroblast1 call Aeroblast1 call Aeroblast1 call Aeroblast1 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff delay 0 call UnsetFlyingBg end Aeroblast1: playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 0, 0 - createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 0, 0 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 1, 0 - createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 1, 0 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 2, 0 - createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 2, 0 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 3, 0 - createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 3, 0 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 return Move_WATER_GUN: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gUnknown_08595208, 2, 20, 0, 0, 0, 40, -25 + createsprite2 gUnknown_08595208, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 40, -25 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1 - createsprite gUnknown_08597388, 4, 0, 0, 1, 2 - createsprite gUnknown_08595220, 2, 0, -15, 0, 15, 55 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 1, 0, 8, 1 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 2 + createsprite2 gUnknown_08595220, ANIM_BATTLER_ATTACKER, 2, 0, -15, 0, 15, 55 playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595220, 2, 15, -20, 0, 15, 50 + createsprite2 gUnknown_08595220, ANIM_BATTLER_ATTACKER, 2, 15, -20, 0, 15, 50 playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595220, 2, -15, -10, 0, 10, 45 + createsprite2 gUnknown_08595220, ANIM_BATTLER_ATTACKER, 2, -15, -10, 0, 10, 45 playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_CRABHAMMER: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createsprite gUnknown_08597388, 4, 0, 0, 1, 0 + createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 8 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 4 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 4 waitforvisualfinish loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 - createsprite gUnknown_08595238, 2, 10, 10, 20, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 4, 8, 1 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 10, 10, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, 20, -20, 20, 1 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 20, -20, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, -15, 15, 20, 1 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -15, 15, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, 0, 0, 20, 1 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 0, 0, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, -10, -20, 20, 1 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -10, -20, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, 16, -8, 20, 1 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 16, -8, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, 5, 8, 20, 1 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 5, 8, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, -16, 0, 20, 1 + createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -16, 0, 20, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -6302,17 +6302,17 @@ Move_SURF: Move_FLAMETHROWER: loadspritegfx ANIM_TAG_SMALL_EMBER - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask sub_81076C8, 5, 100 panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call Flamethrower1 call Flamethrower1 call Flamethrower1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 43, 1 call Flamethrower1 call Flamethrower1 call Flamethrower1 @@ -6322,14 +6322,14 @@ Move_FLAMETHROWER: call Flamethrower1 call Flamethrower1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Flamethrower1: - createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + createsprite2 gUnknown_08595158, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 delay 2 - createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + createsprite2 gUnknown_08595158, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 delay 2 return @@ -6338,51 +6338,51 @@ Move_SANDSTORM: playsewithpan SE_W201, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 0 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 10, 2304, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 0 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 90, 2048, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 0 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 50, 2560, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 0 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 20, 2304, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 0 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 70, 1984, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 0 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 0, 2816, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 0 + createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 60, 2560, 96, 0 end Move_WHIRLPOOL: loadspritegfx ANIM_TAG_WATER_ORB - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 delay 0 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 50, 1 call WhirlpoolEffect call WhirlpoolEffect call WhirlpoolEffect delay 12 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end WhirlpoolEffect: - createsprite gUnknown_08596B70, 130, 0, 28, 384, 50, 8, 50, 1 + createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 28, 384, 50, 8, 50, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 32, 240, 40, 11, -46, 1 + createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 32, 240, 40, 11, -46, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 33, 416, 40, 4, 42, 1 + createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 33, 416, 40, 4, 42, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 31, 288, 45, 6, -42, 1 + createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 31, 288, 45, 6, -42, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 28, 448, 45, 11, 46, 1 + createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 28, 448, 45, 11, 46, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 33, 464, 50, 10, -50, 1 + createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 33, 464, 50, 10, -50, 1 delay 2 return @@ -6396,20 +6396,20 @@ FlyEnd: FlySetUp: playsewithpan SE_W019, SOUND_PAN_ATTACKER - createsprite gUnknown_08596340, 2, 0, 0, 13, 336 + createsprite2 gUnknown_08596340, ANIM_BATTLER_ATTACKER, 2, 0, 0, 13, 336 goto FlyEnd FlyUnleash: - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER - createsprite gUnknown_08596358, 2, 20 + createsprite2 gUnknown_08596358, ANIM_BATTLER_ATTACKER, 2, 20 delay 20 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff goto FlyEnd @@ -6422,119 +6422,119 @@ BounceEnd: BounceSetUp: playsewithpan SE_W100, SOUND_PAN_ATTACKER - createsprite gUnknown_08596420, 2, 0, 0 + createsprite2 gUnknown_08596420, ANIM_BATTLER_ATTACKER, 2, 0, 0 goto BounceEnd BounceUnleash: - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_0859644C, 131 + createsprite2 gUnknown_0859644C, ANIM_BATTLER_TARGET, 3 delay 7 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 11, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff goto BounceEnd Move_KARATE_CHOP: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET - createsprite gUnknown_08595E68, 2, -16, 0, 0, 0, 10, 1, 3, 0 + createsprite2 gUnknown_08595E68, ANIM_BATTLER_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_CROSS_CHOP: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_CROSS_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite gUnknown_08595EC8, 2, 0, 0, 0 - createsprite gUnknown_08595EC8, 2, 0, 0, 1 + createsprite2 gUnknown_08595EC8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 + createsprite2 gUnknown_08595EC8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1 delay 40 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 - createsprite gUnknown_085973D0, 3, 0, 0, 1, 20 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 + createsprite2 gUnknown_085973D0, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 20 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 7, 0, 9, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_JUMP_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 3 - createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 + createsprite2 gUnknown_08595E80, ANIM_BATTLER_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 5, 0, 7, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_HI_JUMP_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -24, 0, 0, 8 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 3 delay 2 - createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 + createsprite2 gUnknown_08595E80, ANIM_BATTLER_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 11, 1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_DOUBLE_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createsprite gUnknown_08595EB0, 3, 1, 20, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + createsprite2 gUnknown_08595EB0, ANIM_BATTLER_ATTACKER, 3, 1, 20, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_TRIPLE_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET jumpifmoveturn 0, TripleKickLeft @@ -6542,26 +6542,26 @@ Move_TRIPLE_KICK: goto TripleKickCenter TripleKickContinue: waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end TripleKickLeft: - createsprite gFistFootSpriteTemplate, 132, -16, -8, 20, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 131, -16, -16, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, -16, -8, 20, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -16, -16, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 goto TripleKickContinue TripleKickRight: - createsprite gFistFootSpriteTemplate, 132, 8, 8, 20, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 131, 8, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 8, 8, 20, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 goto TripleKickContinue TripleKickCenter: - createsprite gFistFootSpriteTemplate, 132, 0, 0, 20, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, -8, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 20, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 goto TripleKickContinue Move_DYNAMIC_PUNCH: @@ -6570,86 +6570,86 @@ Move_DYNAMIC_PUNCH: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_UNUSED_EXPLOSION delay 1 - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gFistFootSpriteTemplate, 131, 0, 0, 20, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 20, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 5, 0, 7, 1 delay 1 waitsound playsewithpan SE_W120, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 5, 0, 28, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_COUNTER: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W233, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 - createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -15, 18, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1 - createsprite gFistFootSpriteTemplate, 3, -15, 18, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 25, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, -4, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -4, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite gFistFootSpriteTemplate, 3, 0, -4, 8, 1, 0 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 15, 9, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite gFistFootSpriteTemplate, 3, 15, 9, 8, 1, 0 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_VITAL_THROW: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233, SOUND_PAN_ATTACKER - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 4, 1, 2 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 7 delay 11 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 10 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 10 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -6657,32 +6657,32 @@ Move_ROCK_SMASH: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 1 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 2, 0, 0, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 8, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 waitforvisualfinish playsewithpan SE_W088, SOUND_PAN_TARGET - createsprite gUnknown_08596B1C, 2, 0, 0, 20, 24, 14, 2 - createsprite gUnknown_08596B1C, 2, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 2, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 2, -5, 0, -20, -24, 14, 2 - createsprite gUnknown_08596B1C, 2, 0, -5, 30, 18, 8, 2 - createsprite gUnknown_08596B1C, 2, 0, 0, 30, -18, 8, 2 - createsprite gUnknown_08596B1C, 2, 0, 0, -30, 18, 8, 2 - createsprite gUnknown_08596B1C, 2, 0, 0, -30, -18, 8, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 7, 1 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 20, 24, 14, 2 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 5, 0, -20, 24, 14, 1 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 5, 20, -24, 14, 2 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, -5, 0, -20, -24, 14, 2 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, -5, 30, 18, 8, 2 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 30, -18, 8, 2 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 0, -30, 18, 8, 2 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 0, -30, -18, 8, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 7, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_SUBMISSION: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 @@ -6700,22 +6700,22 @@ Move_SUBMISSION: call Submission1 call Submission1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Submission1: - createsprite gBasicHitSplatSpriteTemplate, 3, 0, -12, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -12, 1, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 3, -12, 8, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -12, 8, 1, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 3, 12, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 12, 0, 1, 1 delay 8 return Move_SUNNY_DAY: loadspritegfx ANIM_TAG_SUNLIGHT - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 13, 3 createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish @@ -6727,39 +6727,39 @@ Move_SUNNY_DAY: waitforvisualfinish createvisualtask sub_8116620, 10, 0x781, 1, 6, 0, RGB_WHITE waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff end SunnyDay1: - createsprite gUnknown_085954A0, 40 + createsprite2 gUnknown_085954A0, ANIM_BATTLER_ATTACKER, 40 delay 6 return Move_COTTON_SPORE: loadspritegfx ANIM_TAG_SPORE - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 call CottonSpore1 call CottonSpore1 call CottonSpore1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end CottonSpore1: - createsprite gUnknown_085922EC, 2, 0, -20, 85, 80, 0 + createsprite2 gUnknown_085922EC, ANIM_BATTLER_ATTACKER, 2, 0, -20, 85, 80, 0 delay 12 - createsprite gUnknown_085922EC, 2, 0, -10, 170, 80, 0 + createsprite2 gUnknown_085922EC, ANIM_BATTLER_ATTACKER, 2, 0, -10, 170, 80, 0 delay 12 - createsprite gUnknown_085922EC, 2, 0, -15, 0, 80, 0 + createsprite2 gUnknown_085922EC, ANIM_BATTLER_ATTACKER, 2, 0, -15, 0, 80, 0 delay 12 return Move_SPORE: loadspritegfx ANIM_TAG_SPORE - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80FEE1C, 2 loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 @@ -6768,54 +6768,54 @@ Move_SPORE: call Spore1 waitforvisualfinish delay 1 - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Spore1: - createsprite gUnknown_085922EC, 130, 0, -20, 85, 80, 1 + createsprite2 gUnknown_085922EC, ANIM_BATTLER_TARGET, 2, 0, -20, 85, 80, 1 delay 12 - createsprite gUnknown_085922EC, 130, 0, -10, 170, 80, 1 + createsprite2 gUnknown_085922EC, ANIM_BATTLER_TARGET, 2, 0, -10, 170, 80, 1 delay 12 - createsprite gUnknown_085922EC, 130, 0, -15, 0, 80, 1 + createsprite2 gUnknown_085922EC, ANIM_BATTLER_TARGET, 2, 0, -15, 0, 80, 1 delay 12 return Move_PETAL_DANCE: loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W080, SOUND_PAN_ATTACKER - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 - createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 2, 16, -24, 8, 100 - createsprite gUnknown_08592334, 2, -16, -24, 8, 100 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 6, 6, 3 + createsprite2 gUnknown_0859231C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 8, 140 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 16, -24, 8, 100 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -16, -24, 8, 100 delay 15 - createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 2, 32, -24, 8, 100 - createsprite gUnknown_08592334, 2, -32, -24, 8, 100 + createsprite2 gUnknown_0859231C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 8, 140 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 32, -24, 8, 100 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -32, -24, 8, 100 delay 15 - createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 2, 24, -24, 8, 100 - createsprite gUnknown_08592334, 2, -24, -24, 8, 100 + createsprite2 gUnknown_0859231C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 8, 140 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 24, -24, 8, 100 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -24, -24, 8, 100 delay 30 - createsprite gUnknown_08592334, 2, 16, -24, 0, 100 - createsprite gUnknown_08592334, 2, -16, -24, 0, 100 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 16, -24, 0, 100 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -16, -24, 0, 100 delay 30 - createsprite gUnknown_08592334, 2, 20, -16, 14, 80 - createsprite gUnknown_08592334, 2, -20, -14, 16, 80 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 20, -16, 14, 80 + createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -20, -14, 16, 80 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 8 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 7 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -6823,39 +6823,39 @@ Move_RAZOR_LEAF: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 1 loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 - createsprite gUnknown_08592390, 2, -3, -2, 10 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_08592390, 2, -1, -1, 15 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_08592390, 2, -4, -4, 7 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_08592390, 2, 3, -3, 11 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_08592390, 2, -1, -6, 8 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_08592390, 2, 2, -1, 12 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_08592390, 2, -3, -4, 13 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_08592390, 2, 4, -5, 7 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_08592390, 2, 2, -6, 11 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_08592390, 2, -3, -5, 8 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -5, 8 delay 60 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, 20, 1 - createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, -20, 1 + createsprite2 gUnknown_085923D8, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 + createsprite2 gUnknown_085923D8, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 playsewithpan SE_W013, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -6863,33 +6863,33 @@ Move_NATURE_POWER: Move_ANCIENT_POWER: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 10, 1 - createsprite gUnknown_08596C10, 2, 20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 2, 0, 32, -38, 25, 5 - createsprite gUnknown_08596C10, 2, 32, 32, -28, 40, 3 - createsprite gUnknown_08596C10, 2, -20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 2, 20, 32, -28, 60, 1 - createsprite gUnknown_08596C10, 2, 0, 32, -28, 30, 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 4, 1, 10, 1 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 20, 32, -48, 50, 2 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 0, 32, -38, 25, 5 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 32, 32, -28, 40, 3 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, -20, 32, -48, 50, 2 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 20, 32, -28, 60, 1 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 0, 32, -28, 30, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 30, 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_08596C10, 2, 15, 32, -48, 25, 5 - createsprite gUnknown_08596C10, 2, -10, 32, -42, 30, 4 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 15, 32, -48, 25, 5 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, -10, 32, -42, 30, 4 delay 10 - createsprite gUnknown_08596C10, 2, 0, 32, -42, 25, 5 - createsprite gUnknown_08596C10, 2, -25, 32, -48, 30, 4 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 0, 32, -42, 25, 5 + createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, -25, 32, -48, 30, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 7 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -6897,22 +6897,22 @@ Move_OCTAZOOKA: loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W025B, SOUND_PAN_ATTACKER - createsprite gUnknown_08592DFC, 130, 20, 0, 0, 0, 20, 0 + createsprite2 gUnknown_08592DFC, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_08592E30, 130, 8, 8, 1, 0 + createsprite2 gUnknown_08592E30, ANIM_BATTLER_TARGET, 2, 8, 8, 1, 0 delay 2 - createsprite gUnknown_08592E30, 130, -8, -8, 1, 0 + createsprite2 gUnknown_08592E30, ANIM_BATTLER_TARGET, 2, -8, -8, 1, 0 delay 2 - createsprite gUnknown_08592E30, 130, 8, -8, 1, 0 + createsprite2 gUnknown_08592E30, ANIM_BATTLER_TARGET, 2, 8, -8, 1, 0 delay 2 - createsprite gUnknown_08592E30, 130, -8, 8, 1, 0 + createsprite2 gUnknown_08592E30, ANIM_BATTLER_TARGET, 2, -8, 8, 1, 0 waitforvisualfinish end Move_MIST: loadspritegfx ANIM_TAG_MIST_CLOUD - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 call Mist1 @@ -6925,12 +6925,12 @@ Move_MIST: delay 32 createvisualtask sub_8115A04, 2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff end Mist1: - createsprite gUnknown_08595C2C, 2, 0, -24, 48, 240, 0, 1 + createsprite2 gUnknown_08595C2C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 48, 240, 0, 1 delay 7 return @@ -6948,52 +6948,52 @@ Move_FIRE_PUNCH: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED - createsprite gUnknown_08595368, 0x81, 0 - createsprite gUnknown_08595368, 0x81, 64 - createsprite gUnknown_08595368, 0x81, 128 - createsprite gUnknown_08595368, 0x81, 196 + createsprite2 gUnknown_08595368, ANIM_BATTLER_TARGET, 1, 0 + createsprite2 gUnknown_08595368, ANIM_BATTLER_TARGET, 1, 64 + createsprite2 gUnknown_08595368, ANIM_BATTLER_TARGET, 1, 128 + createsprite2 gUnknown_08595368, ANIM_BATTLER_TARGET, 1, 196 playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish - createsprite gFistFootSpriteTemplate, 131, 0, 0, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 + createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 15, 1 call FireMoveEffect delay 4 playsewithpan SE_W007, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116620, 10, 4, 0, 9, 0, RGB_RED waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end FireMoveEffect: - createsprite gUnknown_08595380, 0x81, 0, 10, 192, 176, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, -192, 240, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, 192, -160, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, -192, -112, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, 160, 48, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, -224, -32, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, 112, -128, 40 + createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, 192, 176, 40 + createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, -192, 240, 40 + createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, 192, -160, 40 + createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, -192, -112, 40 + createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, 160, 48, 40 + createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, -224, -32, 40 + createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, 112, -128, 40 return Move_LEER: loadspritegfx ANIM_TAG_LEER - monbg ANIM_ATTACKER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER + monbgprio_28 ANIM_BATTLER_ATTACKER setalpha 8, 8 playsewithpan SE_W043, SOUND_PAN_ATTACKER - createsprite gUnknown_085CE150, 2, 24, -12 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 + createsprite2 gUnknown_085CE150, ANIM_BATTLER_ATTACKER, 2, 24, -12 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish delay 10 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER blendoff delay 1 waitforvisualfinish @@ -7002,67 +7002,67 @@ Move_LEER: Move_DREAM_EATER: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W107, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 2, 25, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 2, 25, 1 call DreamEaterEffect waitforvisualfinish delay 15 call HealingEffect waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff delay 1 call UnsetPsychicBackground end DreamEaterEffect: playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -40, 35 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 40, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 28, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 40, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -32, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -32, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -40, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -40, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 36, 33 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -7070,38 +7070,38 @@ Move_POISON_GAS: loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 setalpha 12, 8 delay 0 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6 createvisualtask sub_8115A04, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER delay 0 end Move_BIND: - createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_BATTLER_ATTACKER goto BindWrap BindWrap: @@ -7111,12 +7111,12 @@ BindWrap: waitforvisualfinish end BindWrap1: - createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_TARGET, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_BATTLER_TARGET, 0 delay 16 return Move_WRAP: - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 6, 4, 2, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 6, 4, 2, 4 goto BindWrap Move_PSYBEAM: @@ -7126,7 +7126,7 @@ Move_PSYBEAM: createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 call Psybeam1 call Psybeam1 - createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_BATTLER_TARGET createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31) call Psybeam1 call Psybeam1 @@ -7142,7 +7142,7 @@ Move_PSYBEAM: call UnsetPsychicBackground end Psybeam1: - createsprite gUnknown_0859663C, 130, 16, 0, 0, 0, 13, 0 + createsprite2 gUnknown_0859663C, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 13, 0 delay 4 return @@ -7159,8 +7159,8 @@ Move_HYPNOSIS: end Hypnosis1: playsewithpan SE_W048, SOUND_PAN_ATTACKER - createsprite gUnknown_0859663C, 130, 0, 8, 0, 8, 27, 0 - createsprite gUnknown_0859663C, 130, 16, -8, 0, -8, 27, 0 + createsprite2 gUnknown_0859663C, ANIM_BATTLER_TARGET, 2, 0, 8, 0, 8, 27, 0 + createsprite2 gUnknown_0859663C, ANIM_BATTLER_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 return @@ -7182,9 +7182,9 @@ Move_PSYWAVE: call UnsetPsychicBackground end Psywave1: - createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + createsprite2 gUnknown_08595170, ANIM_BATTLER_TARGET, 3, 10, 10, 0, 16 delay 4 - createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + createsprite2 gUnknown_08595170, ANIM_BATTLER_TARGET, 3, 10, 10, 0, 16 delay 4 return @@ -7192,17 +7192,17 @@ Move_ZAP_CANNON: loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, SOUND_PAN_ATTACKER - createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0 - createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 0, 40, 0 - createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 64, 40, 1 - createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 128, 40, 0 - createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 192, 40, 2 - createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 32, 40, 0 - createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 96, 40, 1 - createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 160, 40, 0 - createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 224, 40, 2 + createsprite2 gUnknown_08595764, ANIM_BATTLER_TARGET, 3, 10, 0, 0, 0, 30, 0 + createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 + createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 + createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 128, 40, 0 + createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 192, 40, 2 + createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 8, 30, 32, 40, 0 + createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 8, 30, 96, 40, 1 + createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 8, 30, 160, 40, 0 + createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 8, 30, 224, 40, 2 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 delay 15 waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 call ElectricityEffect @@ -7215,24 +7215,24 @@ Move_STEEL_WING: loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 5, 1, 70 - createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 - createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 + createsprite2 gBattleAnimSpriteTemplate_85962A4, ANIM_BATTLER_ATTACKER, 2, -25, 0, 0, 0, 20 + createsprite2 gBattleAnimSpriteTemplate_85962A4, ANIM_BATTLER_ATTACKER, 2, 25, 0, 0, 0, 20 delay 24 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 9 delay 17 - createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -16, 0, 1, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -7241,16 +7241,16 @@ Move_IRON_TAIL: loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff waitforvisualfinish end @@ -7261,16 +7261,16 @@ Move_POISON_TAIL: loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff call PoisonBubblesEffect waitforvisualfinish @@ -7281,25 +7281,25 @@ Move_METAL_CLAW: loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 2 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, -10, 0 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, 10, 0 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 delay 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 2 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, -10, 1 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, 10, 1 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 waitforvisualfinish end Move_NIGHT_SHADE: - monbg ANIM_ATTACKER - monbgprio_28 ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER + monbgprio_28 ANIM_BATTLER_ATTACKER playsewithpan SE_W060, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein @@ -7307,10 +7307,10 @@ Move_NIGHT_SHADE: playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_811188C, 5, 85 delay 70 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 12, 1 createvisualtask sub_8115A04, 2, 4, 0, 2, 0, 13, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER delay 1 restorebg waitbgfadein @@ -7320,22 +7320,22 @@ Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, SOUND_PAN_ATTACKER - createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 + createsprite2 gUnknown_08593488, ANIM_BATTLER_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 - createsprite gBattleAnimSpriteTemplate_859371C, 132, 6, 5, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 16, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, 6, 5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, 132, -16, -15, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, -16, -15, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, 132, 16, -5, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, 16, -5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, 132, -12, 18, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, -12, 18, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, 132, 0, 5, 1, 0 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, 0, 5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 waitforvisualfinish @@ -7347,10 +7347,10 @@ Move_SHADOW_BALL: waitbgfadein delay 15 createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5 - createsprite gUnknown_08596D58, 130, 16, 16, 8 + createsprite2 gUnknown_08596D58, ANIM_BATTLER_TARGET, 2, 16, 16, 8 waitforvisualfinish playsewithpan SE_W028, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg waitbgfadein @@ -7360,8 +7360,8 @@ Move_LICK: loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_W122, SOUND_PAN_TARGET - createsprite gUnknown_08596D8C, 130, 0, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 + createsprite2 gUnknown_08596D8C, ANIM_BATTLER_TARGET, 2, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 16, 1 waitforvisualfinish end @@ -7371,7 +7371,7 @@ Move_FOCUS_ENERGY: call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_WHITE - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 call EndureEffect delay 8 call EndureEffect @@ -7384,46 +7384,46 @@ Move_BIDE: BideSetUp: loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 waitforvisualfinish end BideUnleash: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_8116620, 10, 2, 2, 0, 11, RGB_RED - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 4 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 4 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 16, 1 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 18, -8, 1, 1 delay 5 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, -18, 8, 1, 1 delay 5 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 7 waitforvisualfinish createvisualtask sub_8116620, 10, 2, 2, 11, 0, RGB_RED waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end Move_STRING_SHOT: loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER delay 0 - createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 call StringShot1 @@ -7446,31 +7446,31 @@ Move_STRING_SHOT: call StringShot1 waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_085969F8, 130, 0, 10 + createsprite2 gUnknown_085969F8, ANIM_BATTLER_TARGET, 2, 0, 10 delay 4 - createsprite gUnknown_085969F8, 130, 0, -2 + createsprite2 gUnknown_085969F8, ANIM_BATTLER_TARGET, 2, 0, -2 delay 4 - createsprite gUnknown_085969F8, 130, 0, 22 + createsprite2 gUnknown_085969F8, ANIM_BATTLER_TARGET, 2, 0, 22 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER delay 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end StringShot1: - createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 1 + createsprite2 gUnknown_085969E0, ANIM_BATTLER_TARGET, 2, 20, 0, 512, 20, 1 delay 1 return Move_SPIDER_WEB: loadspritegfx ANIM_TAG_SPIDER_WEB loadspritegfx ANIM_TAG_WEB_THREAD - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER delay 0 - createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - monbgprio_28 ANIM_TARGET + monbgprio_28 ANIM_BATTLER_TARGET loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 call SpiderWeb1 call SpiderWeb1 @@ -7488,15 +7488,15 @@ Move_SPIDER_WEB: call SpiderWeb1 waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_08596A2C, 2 + createsprite2 gUnknown_08596A2C, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end SpiderWeb1: - createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 0 + createsprite2 gUnknown_085969E0, ANIM_BATTLER_TARGET, 2, 20, 0, 512, 20, 0 delay 1 return @@ -7509,9 +7509,9 @@ RazorWindContinue: RazorWindSetUp: loadspritegfx ANIM_TAG_GUST playsewithpan SE_W016, SOUND_PAN_ATTACKER - createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 0, 7, 40 - createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 85, 7, 40 - createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 170, 7, 40 + createsprite2 gUnknown_08593550, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 + createsprite2 gUnknown_08593550, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 + createsprite2 gUnknown_08593550, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish playsewithpan SE_W016B, SOUND_PAN_ATTACKER goto RazorWindContinue @@ -7519,45 +7519,45 @@ RazorWindSetUp: RazorWindUnleash: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 2, 14, 8, 0, 0, 22, 2, 1 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 2, 14, -8, 16, 14, 22, 1, 1 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 2, 14, 12, -16, -14, 22, 0, 1 + createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 playsewithpan SE_W013, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff goto RazorWindContinue Move_DISABLE: loadspritegfx ANIM_TAG_SPARKLE_4 - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 8, 8 playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite gUnknown_0853EE84, 13, 24, -16 + createsprite2 gUnknown_0853EE84, ANIM_BATTLER_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask sub_81045B0, 5 loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_RECOVER: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) @@ -7565,7 +7565,7 @@ Move_RECOVER: call Recover1 call Recover1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff delay 1 call HealingEffect @@ -7573,52 +7573,52 @@ Move_RECOVER: end Recover1: - createsprite gUnknown_085921E0, 2, 40, -10, 13 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, -10, 13 delay 3 - createsprite gUnknown_085921E0, 2, -35, -10, 13 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -35, -10, 13 delay 3 - createsprite gUnknown_085921E0, 2, 15, -40, 13 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 15, -40, 13 delay 3 - createsprite gUnknown_085921E0, 2, -10, -32, 13 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -10, -32, 13 delay 3 - createsprite gUnknown_085921E0, 2, 25, -20, 13 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 25, -20, 13 delay 3 - createsprite gUnknown_085921E0, 2, -40, -20, 13 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, -20, 13 delay 3 - createsprite gUnknown_085921E0, 2, 5, -40, 13 + createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 5, -40, 13 delay 3 return Move_MIMIC: loadspritegfx ANIM_TAG_ORBS setalpha 11, 5 - monbg_22 ANIM_DEF_PARTNER + monbg_22 ANIM_BATTLER_DEF_PARTNER monbgprio_29 panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createvisualtask sub_80FF458, 5, 128, 24 delay 15 - createsprite gUnknown_085924DC, 130, -12, 24 + createsprite2 gUnknown_085924DC, ANIM_BATTLER_TARGET, 2, -12, 24 delay 10 setarg 7, -1 waitforvisualfinish playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish - clearmonbg_23 ANIM_DEF_PARTNER + clearmonbg_23 ANIM_BATTLER_DEF_PARTNER blendoff end Move_CONSTRICT: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 - createsprite gUnknown_08592494, 132, 0, 16, 0, 2 + createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 4, 0, 16, 0, 2 delay 7 - createsprite gUnknown_08592494, 131, 0, 0, 0, 2 - createsprite gUnknown_08592494, 130, 0, 8, 1, 2 + createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 3, 0, 0, 0, 2 + createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 2, 0, 8, 1, 2 delay 7 - createsprite gUnknown_08592494, 131, 0, -8, 1, 2 + createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 3, 0, -8, 1, 2 delay 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 delay 20 playsewithpan SE_W020, SOUND_PAN_TARGET setarg 7, -1 @@ -7630,11 +7630,11 @@ Move_CURSE: CurseGhost: loadspritegfx ANIM_TAG_NAIL loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER createvisualtask sub_8112758, 5 waitforvisualfinish delay 20 - createsprite gUnknown_08596DD0, 2 + createsprite2 gUnknown_08596DD0, ANIM_BATTLER_ATTACKER, 2 delay 60 call CurseGhost1 delay 41 @@ -7642,23 +7642,23 @@ CurseGhost: delay 41 call CurseGhost1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER delay 1 - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8596DE8, 130 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 + createsprite2 gBattleAnimSpriteTemplate_8596DE8, ANIM_BATTLER_TARGET, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 16, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end CurseGhost1: - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 4, 0, 10, 0 playsewithpan SE_W020, SOUND_PAN_ATTACKER return CurseStats: - createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_BATTLER_ATTACKER waitforvisualfinish delay 10 call CurseStats1 @@ -7674,22 +7674,22 @@ Move_SOFT_BOILED: loadspritegfx ANIM_TAG_BREAKING_EGG loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER playsewithpan SE_W039, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 - createsprite gUnknown_085937B0, 4, 0, 16, 0 - createsprite gUnknown_085937B0, 4, 0, 16, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 2, 6, 1 + createsprite2 gUnknown_085937B0, ANIM_BATTLER_ATTACKER, 4, 0, 16, 0 + createsprite2 gUnknown_085937B0, ANIM_BATTLER_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 playsewithpan SE_W030, SOUND_PAN_ATTACKER - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 31, 16, 0, 1 delay 8 - createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 31, 16, 0, 1 delay 60 setarg 7, -1 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER call HealingEffect2 end @@ -7700,24 +7700,24 @@ Move_HEAL_BELL: createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_8105CB4, 5 - createsprite gUnknown_08593938, 2, 0, -24, 0, 1 + createsprite2 gUnknown_08593938, ANIM_BATTLER_ATTACKER, 2, 0, -24, 0, 1 delay 12 - createsprite gUnknown_08593958, 40, 0, -24, 48, -18, 35, 0, 0 - createsprite gUnknown_08593958, 40, 0, -24, -48, 20, 30, 1, 1 - createsprite gUnknown_08593958, 40, 0, -24, -38, -29, 30, 2, 2 - createsprite gUnknown_08593958, 40, 0, -24, 36, 18, 30, 3, 3 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 call HealBell1 delay 0x21 - createsprite gUnknown_08593958, 40, 0, -24, 19, 26, 35, 4, 4 - createsprite gUnknown_08593958, 40, 0, -24, -34, -12, 30, 5, 5 - createsprite gUnknown_08593958, 40, 0, -24, 41, -20, 34, 6, 2 - createsprite gUnknown_08593958, 40, 0, -24, -15, 26, 32, 7, 0 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 call HealBell1 delay 0x21 - createsprite gUnknown_08593958, 40, 0, -24, -48, 18, 31, 0, 2 - createsprite gUnknown_08593958, 40, 0, -24, 48, -20, 30, 2, 5 - createsprite gUnknown_08593958, 40, 0, -24, 38, 29, 33, 4, 3 - createsprite gUnknown_08593958, 40, 0, -24, -36, -18, 30, 6, 1 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 + createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 call HealBell1 waitforvisualfinish createvisualtask sub_8105D60, 5 @@ -7727,21 +7727,21 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, SOUND_PAN_ATTACKER - createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + createsprite2 gUnknown_08592B94, ANIM_BATTLER_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite2 gUnknown_08592B94, ANIM_BATTLER_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE - createsprite gUnknown_08593868, 16, 0, 0, 0, 1 + createsprite2 gUnknown_08593868, ANIM_BATTLER_ATTACKER, 16, 0, 0, 0, 1 end HealBell1: createvisualtask sub_8116664, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE - createsprite gUnknown_0859381C, 40, 0, -24, 0, 1 + createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_W215, SOUND_PAN_ATTACKER return @@ -7750,102 +7750,102 @@ Move_FAKE_OUT: createvisualtask sub_8105EB0, 5 waitforvisualfinish playsewithpan SE_W166, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 createvisualtask sub_8106020, 3 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE end Move_SCARY_FACE: loadspritegfx ANIM_TAG_EYE_SPARKLE - createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish delay 10 playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_81064F8, 5 delay 13 - createsprite gUnknown_08593A84, 0, -16, -8 - createsprite gUnknown_08593A84, 0, 16, -8 + createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, -16, -8 + createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask sub_810A094, 3, 20, 1, 0 playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 3, 16, 0, RGB_BLACK waitforvisualfinish end Move_SWEET_KISS: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL - createsprite gUnknown_08593AA8, 130, 16, -48 + createsprite2 gUnknown_08593AA8, ANIM_BATTLER_TARGET, 2, 16, -48 playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 playsewithpan SE_W215, SOUND_PAN_TARGET waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -30 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 160, -30 playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -42 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -14 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -256, -42 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 128, -14 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 416, -38 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -128, -22 + createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -384, -31 end Move_LOVELY_KISS: loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL - createsprite gUnknown_08593AF0, 130, 0, -24 + createsprite2 gUnknown_08593AF0, ANIM_BATTLER_TARGET, 2, 0, -24 playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gUnknown_08593AC0, 131, -256, -42 - createsprite gUnknown_08593AC0, 131, 128, -14 - createsprite gUnknown_08593AC0, 131, 416, -38 - createsprite gUnknown_08593AC0, 131, -128, -22 + createsprite2 gUnknown_08593AC0, ANIM_BATTLER_TARGET, 3, -256, -42 + createsprite2 gUnknown_08593AC0, ANIM_BATTLER_TARGET, 3, 128, -14 + createsprite2 gUnknown_08593AC0, ANIM_BATTLER_TARGET, 3, 416, -38 + createsprite2 gUnknown_08593AC0, ANIM_BATTLER_TARGET, 3, -128, -22 end Move_FURY_SWIPES: loadspritegfx ANIM_TAG_SWIPE - createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_08593B38, 130, 16, 0, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 + createsprite2 gUnknown_08593B38, ANIM_BATTLER_TARGET, 2, 16, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 delay 10 - createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_08593B38, 130, -16, 0, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 + createsprite2 gUnknown_08593B38, ANIM_BATTLER_TARGET, 2, -16, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 end Move_INGRAIN: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS - createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 + createsprite2 gUnknown_0859254C, ANIM_BATTLER_ATTACKER, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, 2, -32, 20, 1, 1, 140 + createsprite2 gUnknown_0859254C, ANIM_BATTLER_ATTACKER, 2, -32, 20, 1, 1, 140 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, 2, 32, 22, 1, 0, 130 + createsprite2 gUnknown_0859254C, ANIM_BATTLER_ATTACKER, 2, 32, 22, 1, 0, 130 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, 2, -16, 25, -1, 3, 120 + createsprite2 gUnknown_0859254C, ANIM_BATTLER_ATTACKER, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 40 - createsprite gUnknown_0859258C, 3, 32, 26, -1, 3, 30 + createsprite2 gUnknown_0859258C, ANIM_BATTLER_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_0859258C, 3, -48, 20, 1, 2, 30 + createsprite2 gUnknown_0859258C, ANIM_BATTLER_ATTACKER, 3, -48, 20, 1, 2, 30 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_0859258C, 3, 48, 26, -2, 3, 18 + createsprite2 gUnknown_0859258C, ANIM_BATTLER_ATTACKER, 3, 48, 26, -2, 3, 18 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish @@ -7854,7 +7854,7 @@ Move_INGRAIN: Move_PRESENT: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 - createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1 + createsprite2 gUnknown_08592610, ANIM_BATTLER_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 14 playsewithpan SE_W145B, SOUND_PAN_ATTACKER @@ -7870,42 +7870,42 @@ Move_PRESENT: PresentDamage: loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 131, 24, -24, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 131, -16, 16, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 131, -24, -12, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 131, 16, 16, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, 16, 16, 1, 1 end PresentHeal: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, SOUND_PAN_TARGET - createsprite gUnknown_08592658, 132, -16, 32, -3, 1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -16, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, 16, 32, -3, -1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, 16, 32, -3, -1 delay 3 - createsprite gUnknown_08592658, 132, 32, 32, -3, 1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, 32, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, -32, 32, -3, 1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -32, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, 0, 32, -3, 1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, 0, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, 24, 32, -3, 1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, 24, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, -24, 32, -3, 1 + createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -24, 32, -3, 1 waitforvisualfinish waitsound call HealingEffect2 @@ -7915,38 +7915,38 @@ Move_BATON_PASS: loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_W226, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) - createsprite gUnknown_085CE370, 2 + createsprite2 gUnknown_085CE370, ANIM_BATTLER_ATTACKER, 2 end Move_PERISH_SONG: loadspritegfx ANIM_TAG_MUSIC_NOTES_2 - createsprite gUnknown_08593C0C, 4, 0, 0, 0 - createsprite gUnknown_08593C0C, 4, 1, 1, 16 - createsprite gUnknown_08593C0C, 4, 2, 1, 32 - createsprite gUnknown_08593C0C, 4, 3, 2, 48 - createsprite gUnknown_08593C0C, 4, 4, 2, 64 - createsprite gUnknown_08593C0C, 4, 5, 0, 80 - createsprite gUnknown_08593C0C, 4, 6, 0, 96 - createsprite gUnknown_08593C0C, 4, 7, 1, 112 - createsprite gUnknown_08593C0C, 4, 8, 2, 128 - createsprite gUnknown_08593C0C, 4, 9, 0, 144 - createsprite gUnknown_08593C0C, 4, 10, 2, 160 - createsprite gUnknown_08593C0C, 4, 11, 0, 176 - createsprite gUnknown_08593C0C, 4, 12, 1, 192 - createsprite gUnknown_08593C0C, 4, 13, 3, 208 - createsprite gUnknown_08593C0C, 4, 14, 3, 224 - createsprite gUnknown_08593C0C, 4, 15, 0, 240 - createsprite gUnknown_08593C24, 4, 15, 0, 0 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 0, 0, 0 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 1, 1, 16 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 2, 1, 32 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 3, 2, 48 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 4, 2, 64 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 5, 0, 80 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 6, 0, 96 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 7, 1, 112 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 8, 2, 128 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 9, 0, 144 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 10, 2, 160 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 11, 0, 176 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 12, 1, 192 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 13, 3, 208 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 14, 3, 224 + createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 15, 0, 240 + createsprite2 gUnknown_08593C24, ANIM_BATTLER_ATTACKER, 4, 15, 0, 0 delay 20 panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 80 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK createvisualtask sub_811489C, 5, 4, 0 createvisualtask sub_811489C, 5, 5, 0 createvisualtask sub_811489C, 5, 6, 0 createvisualtask sub_811489C, 5, 7, 0 delay 100 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK createvisualtask sub_811489C, 5, 4, 1 createvisualtask sub_811489C, 5, 5, 1 createvisualtask sub_811489C, 5, 6, 1 @@ -7956,28 +7956,28 @@ Move_PERISH_SONG: Move_SLEEP_TALK: loadspritegfx ANIM_TAG_LETTER_Z - createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_BATTLER_ATTACKER delay 20 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 delay 20 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 delay 20 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 + createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 waitforvisualfinish end @@ -7993,9 +7993,9 @@ Move_HYPER_FANG: goto HyperFangOnPlayer HyperFangContinue: waitbgfadeout - createsprite gUnknown_085CE1DC, 130 + createsprite2 gUnknown_085CE1DC, ANIM_BATTLER_TARGET, 2 waitbgfadein - createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 0, 10, 10, 1 playsewithpan SE_W043, SOUND_PAN_TARGET delay 20 restorebg @@ -8014,42 +8014,42 @@ HyperFangInContest: Move_TRI_ATTACK: loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE - createsprite gUnknown_085CE2F8, 130, 16, 0 + createsprite2 gUnknown_085CE2F8, ANIM_BATTLER_TARGET, 2, 16, 0 playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 20 playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 20 createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 loadspritegfx ANIM_TAG_FIRE - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, SOUND_PAN_TARGET - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, -1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 2, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 1, -1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 1, -2 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 + createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 3, 1 delay 2 createvisualtask sub_810A094, 2, 20, 3, 1, 1 waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W161B, SOUND_PAN_TARGET - createsprite gUnknown_085956C0, 130, 0, -48 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -48 delay 1 - createsprite gUnknown_085956C0, 130, 0, -16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -16 delay 1 - createsprite gUnknown_085956C0, 130, 0, 16 + createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, 16 delay 20 createvisualtask sub_810A094, 2, 20, 3, 1, 0 delay 2 @@ -8057,39 +8057,39 @@ Move_TRI_ATTACK: waitforvisualfinish loadspritegfx ANIM_TAG_ICE_CRYSTALS call FreezeEffect1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish end Move_WILL_O_WISP: loadspritegfx ANIM_TAG_WISP_FIRE loadspritegfx ANIM_TAG_WISP_ORB - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET playsewithpan SE_W052, SOUND_PAN_ATTACKER waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_ATTACKER, 1, 0 - createsprite gUnknown_0859563C, 2, 0, 0, 0 + createsprite2 gUnknown_0859563C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 delay 3 - createsprite gUnknown_0859563C, 3, 0, 0, 1 + createsprite2 gUnknown_0859563C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1 delay 3 - createsprite gUnknown_0859563C, 4, 0, 0, 2 + createsprite2 gUnknown_0859563C, ANIM_BATTLER_ATTACKER, 4, 0, 0, 2 delay 3 - createsprite gUnknown_0859563C, 4, 0, 0, 3 + createsprite2 gUnknown_0859563C, ANIM_BATTLER_ATTACKER, 4, 0, 0, 3 delay 40 createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish monbgprio_29 playsewithpan SE_W172B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1 - createsprite gUnknown_0859566C, 2, 0 - createsprite gUnknown_0859566C, 2, 42 - createsprite gUnknown_0859566C, 2, 84 - createsprite gUnknown_0859566C, 2, 126 - createsprite gUnknown_0859566C, 2, 168 - createsprite gUnknown_0859566C, 2, 210 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 13, 1 + createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 42 + createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 84 + createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 126 + createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 168 + createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 210 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Move_ENCORE: @@ -8098,14 +8098,14 @@ Move_ENCORE: createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite gUnknown_085CE22C, 130, 0, -8 - createsprite gUnknown_085CE244, 2, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE244, 2, 2, 0, 1, 0, 9 - createsprite gUnknown_085CE25C, 3, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE25C, 3, 2, 0, 1, 0, 9 + createsprite2 gUnknown_085CE22C, ANIM_BATTLER_TARGET, 2, 0, -8 + createsprite2 gUnknown_085CE244, ANIM_BATTLER_ATTACKER, 2, -2, 0, 0, 0, 9 + createsprite2 gUnknown_085CE244, ANIM_BATTLER_ATTACKER, 2, 2, 0, 1, 0, 9 + createsprite2 gUnknown_085CE25C, ANIM_BATTLER_ATTACKER, 3, -2, 0, 0, 0, 9 + createsprite2 gUnknown_085CE25C, ANIM_BATTLER_ATTACKER, 3, 2, 0, 1, 0, 9 delay 16 createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET - createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_BATTLER_TARGET waitforvisualfinish createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 waitforvisualfinish @@ -8115,8 +8115,8 @@ Move_ENCORE: Move_TRICK: loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_SPEED_DUST - createsprite gUnknown_085926E8, 2, -40, 80 - createsprite gUnknown_085926E8, 2, -40, 208 + createsprite2 gUnknown_085926E8, ANIM_BATTLER_ATTACKER, 2, -40, 80 + createsprite2 gUnknown_085926E8, ANIM_BATTLER_ATTACKER, 2, -40, 208 delay 16 playsewithpan SE_W166, 0 createvisualtask sub_8106020, 3 @@ -8135,24 +8135,24 @@ Move_TRICK: playsewithpan SE_W104, 0 delay 16 playsewithpan SE_W213, 0 - createvisualtask AnimTask_ShakeMon, 3, ANIM_ATTACKER, 5, 0, 7, 2 - createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 5, 0, 7, 2 + createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_ATTACKER, 5, 0, 7, 2 + createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 5, 0, 7, 2 waitforvisualfinish end Move_WISH: loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_SPARKLE_2 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 - createsprite gUnknown_085CE388, 40 + createsprite2 gUnknown_085CE388, ANIM_BATTLER_ATTACKER, 40 waitforvisualfinish delay 60 loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 call GrantingStarsEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK waitforvisualfinish end @@ -8164,24 +8164,24 @@ Move_STOCKPILE: call Stockpile1 call Stockpile1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 12, 0, RGB_WHITE + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end Stockpile1: - createsprite gUnknown_08592244, 2, 55, 55, 13 + createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 55, 55, 13 delay 1 - createsprite gUnknown_08592244, 2, -55, -55, 13 + createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, -55, -55, 13 delay 1 - createsprite gUnknown_08592244, 2, 0, 55, 13 + createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 0, 55, 13 delay 1 - createsprite gUnknown_08592244, 2, 0, -55, 13 + createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 0, -55, 13 delay 1 - createsprite gUnknown_08592244, 2, 55, -34, 13 + createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 55, -34, 13 delay 1 - createsprite gUnknown_08592244, 2, 55, 34, 13 + createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 55, 34, 13 delay 1 - createsprite gUnknown_08592244, 2, -55, -34, 13 + createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, -55, -34, 13 delay 1 - createsprite gUnknown_08592244, 2, -55, 34, 13 + createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, -55, 34, 13 delay 1 return @@ -8190,18 +8190,18 @@ Move_SPIT_UP: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B6B4, 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 8, 2 delay 45 playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 3 - createsprite gUnknown_08593A50, 2, 0, 12 - createsprite gUnknown_08593A50, 2, 32, 12 - createsprite gUnknown_08593A50, 2, 64, 12 - createsprite gUnknown_08593A50, 2, 96, 12 - createsprite gUnknown_08593A50, 2, 128, 12 - createsprite gUnknown_08593A50, 2, 160, 12 - createsprite gUnknown_08593A50, 2, 192, 12 - createsprite gUnknown_08593A50, 2, 224, 12 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 0, 12 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 32, 12 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 64, 12 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 96, 12 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 128, 12 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 160, 12 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 192, 12 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 224, 12 delay 5 jumpifmoveturn 2, SpitUpStrong jumpifmoveturn 3, SpitUpStrongest @@ -8209,27 +8209,27 @@ SpitUpContinue: delay 5 createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gUnknown_085973E8, 131, -12, 10, 1, 1 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -12, 10, 1, 1 delay 5 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gUnknown_085973E8, 131, 12, -10, 1, 1 + createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 12, -10, 1, 1 waitforvisualfinish end SpitUpStrong: - createsprite gUnknown_08593A50, 2, 16 - createsprite gUnknown_08593A50, 2, 80 - createsprite gUnknown_08593A50, 2, 144 - createsprite gUnknown_08593A50, 2, 208 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 16 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 80 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 144 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 208 goto SpitUpContinue SpitUpStrongest: - createsprite gUnknown_08593A50, 2, 16 - createsprite gUnknown_08593A50, 2, 48 - createsprite gUnknown_08593A50, 2, 80 - createsprite gUnknown_08593A50, 2, 112 - createsprite gUnknown_08593A50, 2, 144 - createsprite gUnknown_08593A50, 2, 176 - createsprite gUnknown_08593A50, 2, 208 - createsprite gUnknown_08593A50, 2, 240 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 16 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 48 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 80 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 112 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 144 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 176 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 208 + createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 240 goto SpitUpContinue Move_SWALLOW: @@ -8237,10 +8237,10 @@ Move_SWALLOW: loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B778, 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 8, 2 delay 38 playsewithpan SE_W255, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 2, 0, 12, 1 call SwallowEffect jumpifmoveturn 2, SwallowGood jumpifmoveturn 3, SwallowBest @@ -8249,15 +8249,15 @@ SwallowContinue: call HealingEffect end SwallowEffect: - createsprite gUnknown_085CE418, 2, 0, -8 + createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, 0, -8 delay 1 - createsprite gUnknown_085CE418, 2, -24, -8 + createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, -24, -8 delay 1 - createsprite gUnknown_085CE418, 2, 16, -8 + createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, 16, -8 delay 1 - createsprite gUnknown_085CE418, 2, -16, -8 + createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, -16, -8 delay 1 - createsprite gUnknown_085CE418, 2, 24, -8 + createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, 24, -8 delay 1 return SwallowGood: @@ -8269,12 +8269,12 @@ SwallowBest: goto SwallowContinue Move_TRANSFORM: - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 createvisualtask sub_815B7D0, 2, 0 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER end Move_MORNING_SUN: @@ -8305,66 +8305,66 @@ Move_MORNING_SUN: call HealingEffect end MorningSun1: - createsprite gUnknown_085CE48C, 2, 30, 640 + createsprite2 gUnknown_085CE48C, ANIM_BATTLER_ATTACKER, 2, 30, 640 delay 5 return Move_SWEET_SCENT: loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_W230, SOUND_PAN_ATTACKER - createsprite gUnknown_085CE544, 2, 100, 0, 100 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 call SweetScentEffect - createsprite gUnknown_085CE544, 2, 55, 0 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 55, 0 setpan SOUND_PAN_TARGET createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21) call SweetScentEffect waitforvisualfinish end SweetScentEffect: - createsprite gUnknown_085CE544, 2, 70, 1, 64 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 70, 1, 64 delay 2 - createsprite gUnknown_085CE544, 2, 60, 0, 64 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 60, 0, 64 delay 5 - createsprite gUnknown_085CE544, 2, 80, 1, 64 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 80, 1, 64 delay 2 - createsprite gUnknown_085CE544, 2, 58, 0, 120 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 58, 0, 120 delay 2 - createsprite gUnknown_085CE544, 2, 100, 0, 120 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 100, 0, 120 delay 2 - createsprite gUnknown_085CE544, 2, 90, 0, 64 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 90, 0, 64 delay 2 - createsprite gUnknown_085CE544, 2, 48, 0, 64 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 48, 0, 64 delay 2 - createsprite gUnknown_085CE544, 2, 95, 1, 80 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 95, 1, 80 delay 2 - createsprite gUnknown_085CE544, 2, 100, 0, 120 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 100, 0, 120 delay 2 - createsprite gUnknown_085CE544, 2, 75, 1, 64 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 75, 1, 64 delay 2 - createsprite gUnknown_085CE544, 2, 85, 0, 120 + createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 85, 0, 120 delay 2 return Move_HYPER_BEAM: loadspritegfx ANIM_TAG_ORBS - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 playsewithpan SE_W063, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 4, 50, 1 createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0 call HyperBeam1 call HyperBeam1 call HyperBeam1 call HyperBeam1 call HyperBeam1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 50, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 11, RGB(25, 25, 25) call HyperBeam1 call HyperBeam1 @@ -8389,11 +8389,11 @@ Move_HYPER_BEAM: call HyperBeam1 createvisualtask sub_8116620, 10, 4, 2, 11, 0, RGB(25, 25, 25) waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 16, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 16, 0, RGB_BLACK end HyperBeam1: - createsprite gUnknown_08592288, 130 - createsprite gUnknown_08592288, 130 + createsprite2 gUnknown_08592288, ANIM_BATTLER_TARGET, 2 + createsprite2 gUnknown_08592288, ANIM_BATTLER_TARGET, 2 delay 1 return @@ -8404,11 +8404,11 @@ Move_FLATTER: createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite gUnknown_085CE5C0, 130, 0, -8, 80 + createsprite2 gUnknown_085CE5C0, ANIM_BATTLER_TARGET, 2, 0, -8, 80 delay 0 - createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 2, ANIM_BATTLER_TARGET delay 10 - createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 2, ANIM_BATTLER_TARGET delay 0 createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER call Flatter1 @@ -8438,23 +8438,23 @@ Move_FLATTER: createvisualtask sub_815AC8C, 2 end Flatter1: - createsprite gUnknown_085CE5A8, 40, 0 - createsprite gUnknown_085CE5A8, 40, 1 + createsprite2 gUnknown_085CE5A8, ANIM_BATTLER_ATTACKER, 40, 0 + createsprite2 gUnknown_085CE5A8, ANIM_BATTLER_ATTACKER, 40, 1 return Move_ROLE_PLAY: - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_WHITE - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 10, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W161, SOUND_PAN_ATTACKER waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 createvisualtask sub_815CED8, 2 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE delay 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 10, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 10, 0, RGB_BLACK end Move_REFRESH: @@ -8467,28 +8467,28 @@ Move_REFRESH: call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0 end Move_BLAZE_KICK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W172, SOUND_PAN_TARGET - createsprite gUnknown_08595F14, 131, 0, 0, 1, 30 + createsprite2 gUnknown_08595F14, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 30 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 30 playsewithpan SE_W007, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 14, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 call FireMoveEffect waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end @@ -8503,40 +8503,40 @@ Move_HYPER_VOICE: waitforvisualfinish end HyperVoiceEffect: - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 8, 0, RGB_YELLOW - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0 - createsprite gUnknown_08593880, 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 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 8, 0, RGB_YELLOW + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_BATTLER_ATTACKER, 0 + createsprite2 gUnknown_08593880, ANIM_BATTLER_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 1, 0, 6, 1 createvisualtask sub_81162A4, 2, 1, 0, 6, 1 createvisualtask sub_8159078, 5 return Move_SAND_TOMB: loadspritegfx ANIM_TAG_MUD_SAND - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 43, 1 playsewithpan SE_W328, SOUND_PAN_TARGET call SandTombEffect call SandTombEffect call SandTombEffect delay 22 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish end SandTombEffect: - createsprite gUnknown_08596B34, 130, 0, 32, 528, 30, 10, 50, 1 + createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 32, 528, 30, 10, 50, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 36, 480, 20, 13, -46, 1 + createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 36, 480, 20, 13, -46, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 37, 576, 20, 5, 42, 1 + createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 37, 576, 20, 5, 42, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 35, 400, 25, 8, -42, 1 + createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 35, 400, 25, 8, -42, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 32, 512, 25, 13, 46, 1 + createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 32, 512, 25, 13, 46, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 37, 464, 30, 12, -50, 1 + createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 37, 464, 30, 12, -50, 1 delay 2 return @@ -8546,13 +8546,13 @@ Move_SHEER_COLD: playsewithpan SE_W196, 0 waitbgfadein loadspritegfx ANIM_TAG_ICE_CUBE - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 createvisualtask sub_80A9EF4, 2 waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff restorebg waitbgfadein @@ -8561,28 +8561,28 @@ Move_SHEER_COLD: Move_ARM_THRUST: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbgprio_28 ANIM_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 createvisualtask sub_80D6134, 5, 8, 5, 0, 0 delay 6 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 3 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08596034, 130, 10, -8, 14, 3 + createsprite2 gUnknown_08596034, ANIM_BATTLER_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask sub_80D6134, 5, 8, 5, 0, 1 playsewithpan SE_W003, SOUND_PAN_TARGET choosetwoturnanim ArmThrustRight, ArmThrustLeft ArmThrustContinue: - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 waitforvisualfinish blendoff end ArmThrustRight: - createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 0, 1, 2 goto ArmThrustContinue ArmThrustLeft: - createsprite gBasicHitSplatSpriteTemplate, 130, -8, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -8, 0, 1, 2 goto ArmThrustContinue Move_MUDDY_WATER: @@ -8593,26 +8593,26 @@ Move_MUDDY_WATER: Move_BULLET_SEED: loadspritegfx ANIM_TAG_SEED - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1 - createsprite gUnknown_0859351C, 130, 20, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 30, 1 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 waitforvisualfinish end @@ -8621,57 +8621,57 @@ Move_DRAGON_CLAW: loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_W221B, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0) - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 15, 1 call DragonClawEffect call DragonClawEffect - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 - createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 createvisualtask sub_8159210, 5, 136, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, -10, 0 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, 10, 0 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 - createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 createvisualtask sub_8159210, 5, 136, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, -10, 1 + createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, 10, 1 + createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 createvisualtask sub_8116620, 10, 2, 4, 8, 0, RGB(31, 19, 0) waitforvisualfinish end DragonClawEffect: - createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 delay 2 return @@ -8680,17 +8680,17 @@ End: Move_MUD_SHOT: loadspritegfx ANIM_TAG_BROWN_ORB - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask sub_81076C8, 5, 100 panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call MudShot1 call MudShot1 call MudShot1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 43, 1 call MudShot1 call MudShot1 call MudShot1 @@ -8700,13 +8700,13 @@ Move_MUD_SHOT: call MudShot1 call MudShot1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end MudShot1: - createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + createsprite2 gUnknown_085950FC, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 delay 2 - createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + createsprite2 gUnknown_085950FC, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 delay 2 return @@ -8718,16 +8718,16 @@ Move_METEOR_MASH: fadetobg BG_COSMIC waitbgfadein waitforvisualfinish - createsprite gUnknown_085CE8DC, 131, -48, SOUND_PAN_ATTACKER, 72, 32, 30 + createsprite2 gUnknown_085CE8DC, ANIM_BATTLER_TARGET, 3, -48, SOUND_PAN_ATTACKER, 72, 32, 30 delay 10 - createsprite gUnknown_085CE8DC, 131, -112, SOUND_PAN_ATTACKER, 8, 32, 30 + createsprite2 gUnknown_085CE8DC, ANIM_BATTLER_TARGET, 3, -112, SOUND_PAN_ATTACKER, 8, 32, 30 delay 40 - createsprite gUnknown_08595F14, 131, 0, 0, 0, 30 - createsprite gUnknown_085CE8DC, 131, -80, SOUND_PAN_ATTACKER, 40, 32, 30 + createsprite2 gUnknown_08595F14, ANIM_BATTLER_TARGET, 3, 0, 0, 0, 30 + createsprite2 gUnknown_085CE8DC, ANIM_BATTLER_TARGET, 3, -80, SOUND_PAN_ATTACKER, 40, 32, 30 delay 20 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 5, 0, 20, 1 waitforvisualfinish delay 10 restorebg @@ -8737,30 +8737,30 @@ Move_METEOR_MASH: Move_REVENGE: loadspritegfx ANIM_TAG_PURPLE_SCRATCH - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createsprite gUnknown_08596088, 2, 10, -10 + createsprite2 gUnknown_08596088, ANIM_BATTLER_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SCRATCH loadspritegfx ANIM_TAG_PURPLE_SWIPE - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_085960D0, 130, 10, -10 + createsprite2 gUnknown_085960D0, ANIM_BATTLER_TARGET, 2, 10, -10 waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SWIPE loadspritegfx ANIM_TAG_IMPACT - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 - createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 10, 1 + createsprite2 gUnknown_08597400, ANIM_BATTLER_TARGET, 3, -10, -8, 1, 1, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08597400, 131, 10, 8, 1, 1, 8 + createsprite2 gUnknown_08597400, ANIM_BATTLER_TARGET, 3, 10, 8, 1, 1, 8 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end @@ -8768,9 +8768,9 @@ Move_POISON_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite gUnknown_085CE1DC, 130 + createsprite2 gUnknown_085CE1DC, ANIM_BATTLER_TARGET, 2 delay 10 - createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 3, 0, 10, 1 waitforvisualfinish createvisualtask sub_8115A04, 2, 4, 0, 4, 0, 12, RGB(26, 0, 26) call PoisonBubblesEffect @@ -8785,80 +8785,80 @@ Move_SUBSTITUTE: Move_FRENZY_PLANT: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 0, 5, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592564, 2, 10, 8, 2, 0, 0, 100 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 10, 8, 2, 0, 0, 100 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_08592564, 2, 20, -8, -2, 0, 1, 95 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 delay 5 - createsprite gUnknown_08592564, 2, 30, 8, -4, 0, 0, 90 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, -22 delay 5 - createsprite gUnknown_08592564, 2, 40, -8, 4, 0, 1, 85 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 delay 5 - createsprite gUnknown_08592564, 2, 50, 8, 0, 0, 0, 85 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, +21 delay 5 - createsprite gUnknown_08592564, 2, 60, -8, -2, 0, 1, 85 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, +42 delay 5 - createsprite gUnknown_08592564, 2, 75, 8, 0, 0, 0, 85 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 75, 8, 0, 0, 0, 85 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08592564, 2, 85, 16, 6, 0, 3, 80 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 85, 16, 6, 0, 3, 80 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08592564, 2, 85, -16, -6, 0, 2, 75 + createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 85, -16, -6, 0, 2, 75 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -10, 1, 3 playsewithpan SE_W003, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 8, 0, 20, 1 delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 8, 1, 3 playsewithpan SE_W003, SOUND_PAN_TARGET delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -3, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -3, 1, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET delay 2 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, 1, 1, 1 playsewithpan SE_W003, SOUND_PAN_TARGET delay 2 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 10, 1, 1 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 5, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 2, 5, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end Move_METAL_SOUND: loadspritegfx ANIM_TAG_METAL_SOUND_WAVES - monbg ANIM_DEF_PARTNER - monbgprio_2A ANIM_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_2A ANIM_BATTLER_TARGET + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1 call MetalSound1 call MetalSound1 call MetalSound1 call MetalSound1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER delay 0 waitforvisualfinish end MetalSound1: panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite gUnknown_08593458, 130, 16, 0, 0, 0, 30, 0 + createsprite2 gUnknown_08593458, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -8878,26 +8878,26 @@ FocusPunch: jumprettrue FocusPunchOnPlayer FocusPunchContinue: waitbgfadein - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08596104, 130 + createsprite2 gUnknown_08596104, ANIM_BATTLER_TARGET, 2 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 8, 0, 24, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 2, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -6, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1, 0 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff goto FocusPunchEnd FocusPunchOnOpponent: @@ -8912,7 +8912,7 @@ FocusPunchInContest: Move_RETURN: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetReturnPowerLevel, 2 delay 2 @@ -8922,127 +8922,127 @@ Move_RETURN: jumpreteq 3, ReturnStrongest ReturnContinue: waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end ReturnWeak: - createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 139, SOUND_PAN_TARGET goto ReturnContinue ReturnMedium: - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish delay 11 - createsprite gHorizontalLungeSpriteTemplate, 2, 5, 4 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 4 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET goto ReturnContinue ReturnStrong: - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, -5, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -5, 3, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 goto ReturnContinue ReturnStrongest: - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 6, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, -5, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 12, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 12, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 4 - createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 2 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 - createsprite gVerticalDipSpriteTemplate, 2, 4, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 1, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 4, 2, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 2, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish call ReturnStrongest1 call ReturnStrongest1 call ReturnStrongest1 call ReturnStrongest1 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 0 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 8, 0, 24, 1 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 1, 0 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 6 - createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, -5, 1, 0 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 6 - createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -5, 3, 1, 0 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 6, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6, 0, RGB_BLACK goto ReturnContinue ReturnStrongest1: - createsprite gVerticalDipSpriteTemplate, 2, 4, 3, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 3, ANIM_BATTLER_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish return @@ -9059,9 +9059,9 @@ Move_COSMIC_POWER: waitbgfadein delay 70 createvisualtask sub_8159210, 5, 228, SOUND_PAN_ATTACKER - createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + createsprite2 gUnknown_08592B7C, ANIM_BATTLER_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 + createsprite2 gUnknown_08592B7C, ANIM_BATTLER_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 40 createvisualtask sub_8117610, 2, 0, 15, 0, 0 waitforvisualfinish @@ -9075,45 +9075,45 @@ Move_COSMIC_POWER: Move_BLAST_BURN: loadspritegfx ANIM_TAG_FIRE_PLUME loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W221, SOUND_PAN_ATTACKER - createsprite gUnknown_08595428, 2, -32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, -20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 0, -16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 20, 10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, 0, 16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, -20, 10, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -32, 0, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -20, -10, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 0, -16, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 20, -10, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 32, 0, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 20, 10, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 0, 16, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -20, 10, 24, 0, 0, 0 delay 25 playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite gUnknown_08595428, 2, -64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 6, -40, -20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 70, 0, -32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 70, 40, -20, 24, 0, 0, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 - createsprite gUnknown_08595428, 66, 64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 40, 20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, 0, 32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, -40, 20, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -64, 0, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 6, -40, -20, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 70, 0, -32, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 70, 40, -20, 24, 0, 0, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 64, 0, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 40, 20, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 0, 32, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 25 playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite gUnknown_08595428, 2, -96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 6, -60, -30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 70, 0, -48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 70, 60, -30, 24, 0, 0, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, -4, 3, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 12, 0, 20, 1 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -96, 0, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 6, -60, -30, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 70, 0, -48, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 70, 60, -30, 24, 0, 0, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -4, 3, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 12, 0, 20, 1 createvisualtask sub_81162A4, 2, 2, 0, 10, 1 - createsprite gUnknown_08595428, 66, 96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 60, 30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, 0, 48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, -60, 30, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 96, 0, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 60, 30, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 0, 48, 24, 0, 0, 0 + createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -60, 30, 24, 0, 0, 0 createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -9122,29 +9122,29 @@ Move_ROCK_TOMB: loadspritegfx ANIM_TAG_ROCKS createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish - createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0 + createsprite2 gUnknown_08596C58, ANIM_BATTLER_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08596C58, 130, -20, 12, 64, 98, 0 + createsprite2 gUnknown_08596C58, ANIM_BATTLER_TARGET, 2, -20, 12, 64, 98, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08596C58, 194, 3, 6, 64, 82, 0 + createsprite2 gUnknown_08596C58, ANIM_BATTLER_TARGET, 66, 3, 6, 64, 82, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08596C58, 130, -3, 13, 64, 66, 0 + createsprite2 gUnknown_08596C58, ANIM_BATTLER_TARGET, 2, -3, 13, 64, 66, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET delay 24 playsewithpan SE_W063, SOUND_PAN_TARGET - createsprite gUnknown_085967AC, 133, 1, 50 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 + createsprite2 gUnknown_085967AC, ANIM_BATTLER_TARGET, 5, 1, 50 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 20, 1 createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish end @@ -9154,7 +9154,7 @@ Move_SILVER_WIND: panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 playsewithpan SE_W234, 0 delay 0 - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 delay 0 createvisualtask sub_8116664, 10, 1, 0, 0, 4, RGB_BLACK @@ -9167,32 +9167,32 @@ SilverWindContinue: delay 0 createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein - createsprite gUnknown_08592830, -62, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592830, -62, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592830, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592830, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite2 gUnknown_08592830, ANIM_BATTLER_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite2 gUnknown_08592830, ANIM_BATTLER_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite2 gUnknown_08592830, ANIM_BATTLER_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite2 gUnknown_08592830, ANIM_BATTLER_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_08592848, -62, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592848, -62, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592848, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592848, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite2 gUnknown_08592848, ANIM_BATTLER_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite2 gUnknown_08592848, ANIM_BATTLER_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite2 gUnknown_08592848, ANIM_BATTLER_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite2 gUnknown_08592848, ANIM_BATTLER_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_08592860, -62, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592860, -62, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592860, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592860, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite2 gUnknown_08592860, ANIM_BATTLER_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite2 gUnknown_08592860, ANIM_BATTLER_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite2 gUnknown_08592860, ANIM_BATTLER_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite2 gUnknown_08592860, ANIM_BATTLER_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 6 - createsprite gUnknown_08592830, -62, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592830, -62, -16, 12, 192, 5, 2, 3, 1 + createsprite2 gUnknown_08592830, ANIM_BATTLER_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite2 gUnknown_08592830, ANIM_BATTLER_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_08592848, -62, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592848, -62, -16, 12, 192, 5, 2, 3, 1 + createsprite2 gUnknown_08592848, ANIM_BATTLER_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite2 gUnknown_08592848, ANIM_BATTLER_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_08592860, -62, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592860, -62, -16, 12, 192, 5, 2, 3, 1 + createsprite2 gUnknown_08592860, ANIM_BATTLER_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite2 gUnknown_08592860, ANIM_BATTLER_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish playsewithpan SE_W016B, SOUND_PAN_TARGET - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER delay 0 restorebg waitbgfadeout @@ -9208,7 +9208,7 @@ SilverWindOnPlayer: Move_SNATCH: playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -12, 4, 10, 10, 12, 6 end Move_DIVE: @@ -9218,10 +9218,10 @@ Move_DIVE: DiveSetUp: loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_W029, SOUND_PAN_ATTACKER - createsprite gUnknown_08596490, 2, 0, 0, 13, 336 + createsprite2 gUnknown_08596490, ANIM_BATTLER_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish playsewithpan SE_W291, SOUND_PAN_ATTACKER - createsprite gUnknown_085964CC, 3, 0 + createsprite2 gUnknown_085964CC, ANIM_BATTLER_ATTACKER, 3, 0 call DiveSetUp1 call DiveSetUp1 call DiveSetUp1 @@ -9229,16 +9229,16 @@ DiveSetUp: call DiveSetUp1 end DiveSetUp1: - createsprite gUnknown_085964E4, 5, 0, 0 - createsprite gUnknown_085964E4, 5, 1, 0 + createsprite2 gUnknown_085964E4, ANIM_BATTLER_ATTACKER, 5, 0, 0 + createsprite2 gUnknown_085964E4, ANIM_BATTLER_ATTACKER, 5, 1, 0 return DiveAttack: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W153, SOUND_PAN_TARGET - createsprite gUnknown_085964CC, 131, 1 + createsprite2 gUnknown_085964CC, ANIM_BATTLER_TARGET, 3, 1 call DiveAttack1 call DiveAttack1 call DiveAttack1 @@ -9247,39 +9247,39 @@ DiveAttack: delay 12 call UnderWaterAttack1 waitforvisualfinish - visible ANIM_ATTACKER - clearmonbg ANIM_DEF_PARTNER + visible ANIM_BATTLER_ATTACKER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end DiveAttack1: - createsprite gUnknown_085964E4, 133, 0, 1 - createsprite gUnknown_085964E4, 133, 1, 1 + createsprite2 gUnknown_085964E4, ANIM_BATTLER_TARGET, 5, 0, 1 + createsprite2 gUnknown_085964E4, ANIM_BATTLER_TARGET, 5, 1, 1 return Move_ROCK_BLAST: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER - createsprite gUnknown_08596C98, 130, 16, 0, 0, 0, 25, 257 + createsprite2 gUnknown_08596C98, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createsprite gUnknown_08596B1C, 130, 0, 0, 20, 24, 14, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 - createsprite gUnknown_08596B1C, 130, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 130, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 130, -5, 0, -20, -24, 14, 2 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_TARGET, 2, 0, 0, 20, 24, 14, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_TARGET, 2, 5, 0, -20, 24, 14, 1 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_TARGET, 2, 0, 5, 20, -24, 14, 2 + createsprite2 gUnknown_08596B1C, ANIM_BATTLER_TARGET, 2, -5, 0, -20, -24, 14, 2 waitforvisualfinish end Move_OVERHEAT: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 18 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, RGB(28, 0, 0) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 5, RGB(28, 0, 0) waitforvisualfinish createvisualtask sub_8117C44, 5 waitforvisualfinish @@ -9290,66 +9290,66 @@ Move_OVERHEAT: playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_8117CA0, 5, 1, 0 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 1, 0, 13, RGB(28, 0, 0) - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 1, 0, 13, RGB(28, 0, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 2, 0, 15, 1 waitforvisualfinish playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, -20 - createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, -20 - createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, -20 - createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, -20 - createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, -20 - createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, -20 - createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, -20 - createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, -20 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 0, 30, 25, -20 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 32, 30, 25, -20 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 64, 30, 25, -20 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 96, 30, 25, -20 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 128, 30, 25, -20 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 160, 30, 25, -20 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 192, 30, 25, -20 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 224, 30, 25, -20 delay 5 - createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 0 - createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 0 - createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 0 - createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 0 - createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 0 - createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 0 - createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 0 - createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 0 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 0, 30, 25, 0 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 32, 30, 25, 0 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 64, 30, 25, 0 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 96, 30, 25, 0 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 128, 30, 25, 0 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 160, 30, 25, 0 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 192, 30, 25, 0 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 224, 30, 25, 0 delay 5 - createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 10 - createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 10 - createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 10 - createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 10 - createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 10 - createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 10 - createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 10 - createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 10 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 0, 30, 25, 10 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 32, 30, 25, 10 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 64, 30, 25, 10 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 96, 30, 25, 10 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 128, 30, 25, 10 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 160, 30, 25, 10 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 192, 30, 25, 10 + createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 224, 30, 25, 10 delay 5 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -5, 3, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 10, 0, 25, 1 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, -5, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 10, 10, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET createvisualtask sub_8117DD8, 5, 1 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, -1, 0, 13, RGB(18, 18, 18) - createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 3, 0, 15, 1 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, -1, 0, 13, RGB(18, 18, 18) + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 3, 0, 15, 1 waitforvisualfinish createvisualtask sub_8117D3C, 5, 0, 1 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 5, 0, RGB(28, 0, 0) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 5, 0, RGB(28, 0, 0) waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff waitforvisualfinish delay 15 createvisualtask sub_8117D3C, 5, 1, 0 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 13, 0, RGB(18, 18, 18) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 13, 0, RGB(18, 18, 18) waitforvisualfinish createvisualtask sub_8117C70, 5 waitforvisualfinish @@ -9358,54 +9358,54 @@ Move_OVERHEAT: Move_HYDRO_CANNON: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER - createsprite gUnknown_085951C0, 130 + createsprite2 gUnknown_085951C0, ANIM_BATTLER_TARGET, 2 delay 10 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 30 panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call HydroCannon1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 10, 0, 40, 1 + createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 waitforvisualfinish createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end HydroCannon1: - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 return Move_ASTONISH: loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_W227, SOUND_PAN_ATTACKER - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 25 - createsprite gUnknown_085964E4, -123, 0, 1 + createsprite2 gUnknown_085964E4, ANIM_BATTLER_TARGET, 5, 0, 1 playsewithpan SE_W166, SOUND_PAN_TARGET - createsprite gUnknown_085964E4, -123, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createsprite2 gUnknown_085964E4, ANIM_BATTLER_TARGET, 5, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 createvisualtask sub_8106020, 3 waitforvisualfinish end @@ -9414,7 +9414,7 @@ Move_SEISMIC_TOSS: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 waitforvisualfinish createvisualtask AnimTask_GetSeismicTossDamageLevel, 3 @@ -9434,7 +9434,7 @@ SeismicTossContinue: waitbgfadeout setarg 7, 0xFFF waitbgfadein - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end SeismicTossWeak: @@ -9459,29 +9459,29 @@ SeismicTossStrong: call SeismicToss1 goto SeismicTossContinue SeismicToss1: - createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -10, -8, 1, 1 playsewithpan SE_W070, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 5, 1 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -12, 27, 2, 3 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 8, 28, 3, 4 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -4, 30, 2, 3 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 12, 25, 4, 4 return SeismicToss2: - createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 10, -8, 1, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 130, -12, 32, 3, 4 - createsprite gUnknown_08596CB0, 130, 8, 31, 2, 2 - createsprite gUnknown_08596CB0, 130, -4, 28, 2, 3 - createsprite gUnknown_08596CB0, 130, 12, 30, 4, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 5, 1 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -12, 32, 3, 4 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 8, 31, 2, 2 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -4, 28, 2, 3 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 12, 30, 4, 3 return Move_MAGIC_COAT: loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 - createsprite gUnknown_085965C0, 3, 40, 0, 10170 + createsprite2 gUnknown_085965C0, ANIM_BATTLER_ATTACKER, 3, 40, 0, 10170 waitforvisualfinish delay 1 blendoff @@ -9490,37 +9490,37 @@ Move_MAGIC_COAT: Move_WATER_PULSE: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_BLUE_RING_2 - monbg ANIM_TARGET - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_TARGET + monbgprio_28 ANIM_BATTLER_TARGET playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 7, RGB(0, 25, 28) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 7, RGB(0, 25, 28) delay 10 - createsprite gUnknown_085952F8, 66, 100, 100, 8, 1, 20, 40, 0 - createsprite gUnknown_085952F8, 66, 20, 100, 16, 2, 10, 35, 1 - createsprite gUnknown_085952F8, 66, 200, 80, 8, 1, 40, 20, 0 - createsprite gUnknown_085952F8, 66, 80, 60, 10, 3, 20, 50, 0 - createsprite gUnknown_085952F8, 66, 140, 100, 16, 1, 20, 30, 1 + createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 + createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 20, 100, 16, 2, 10, 35, 1 + createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 + createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 + createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + createsprite2 gUnknown_08593470, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 5 playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + createsprite2 gUnknown_08593470, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 5 playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + createsprite2 gUnknown_08593470, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 13 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 8, 18, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB(0, 25, 28) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 7, 0, RGB(0, 25, 28) waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Move_PSYCHO_BOOST: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_815A5C8, 5 @@ -9528,19 +9528,19 @@ Move_PSYCHO_BOOST: delay 6 createvisualtask sub_8115A04, 2, 1, 2, 8, 0, 10, RGB_BLACK delay 0 - monbgprio_28 ANIM_ATTACKER + monbgprio_28 ANIM_BATTLER_ATTACKER setalpha 8, 8 delay 10 - createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 3, 0, 240, 0 loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 - createsprite gUnknown_08596920, 2 + createsprite2 gUnknown_08596920, ANIM_BATTLER_ATTACKER, 2 delay 110 loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, -8, 1, 24, 1 playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff call UnsetPsychicBackground end @@ -9548,20 +9548,20 @@ Move_PSYCHO_BOOST: Move_KNOCK_OFF: loadspritegfx ANIM_TAG_SLAM_HIT_2 loadspritegfx ANIM_TAG_IMPACT - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 4 playsewithpan SE_W233, SOUND_PAN_TARGET - createsprite gUnknown_085CE984, 130, -16, -16 + createsprite2 gUnknown_085CE984, ANIM_BATTLER_TARGET, 2, -16, -16 delay 8 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 2 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -12, 10, 0, 3 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 delay 3 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 0, 3, 6, 1 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 delay 10 waitforvisualfinish end @@ -9569,26 +9569,26 @@ Move_KNOCK_OFF: Move_DOOM_DESIRE: createvisualtask sub_8114960, 2 delay 1 - monbg ANIM_ATK_PARTNER + monbg ANIM_BATTLER_ATK_PARTNER createvisualtask sub_811489C, 5, 1, 0 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK waitforvisualfinish setalpha 8, 8 playsewithpan SE_W060, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish delay 20 createvisualtask sub_811489C, 5, 1, 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff end Move_SKY_UPPERCUT: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout playsewithpan SE_W327, SOUND_PAN_ATTACKER @@ -9596,32 +9596,32 @@ Move_SKY_UPPERCUT: waitbgfadein setalpha 12, 8 delay 38 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -28, 28, 1, 1 delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -15, 8, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -5, -12, 1, 1 delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, -32, 1, 1 delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 5, -52, 1, 1 + createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 0, 3, 6, 1 delay 30 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 6 delay 4 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 - clearmonbg ANIM_DEF_PARTNER + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff restorebg waitbgfadeout @@ -9646,45 +9646,45 @@ Move_TWISTER: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET playsewithpan SE_W239, SOUND_PAN_TARGET - createsprite gUnknown_085923A8, 130, 120, 70, 5, 70, 30 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 120, 70, 5, 70, 30 delay 1 - createsprite gUnknown_085923A8, 130, 115, 55, 6, 60, 25 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 55, 6, 60, 25 delay 1 - createsprite gUnknown_085923A8, 130, 115, 60, 7, 60, 30 - createsprite gUnknown_085923A8, 130, 115, 55, 10, 60, 30 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 60, 7, 60, 30 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 55, 10, 60, 30 delay 3 - createsprite gUnknown_08596CC8, 130, 100, 50, 4, 50, 26 + createsprite2 gUnknown_08596CC8, ANIM_BATTLER_TARGET, 2, 100, 50, 4, 50, 26 delay 1 - createsprite gUnknown_085923A8, 130, 105, 25, 8, 60, 20 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 105, 25, 8, 60, 20 delay 1 - createsprite gUnknown_085923A8, 130, 115, 40, 10, 48, 30 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 40, 10, 48, 30 delay 3 - createsprite gUnknown_08596CC8, 130, 120, 30, 6, 45, 25 - createsprite gUnknown_085923A8, 130, 115, 35, 10, 60, 30 + createsprite2 gUnknown_08596CC8, ANIM_BATTLER_TARGET, 2, 120, 30, 6, 45, 25 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 35, 10, 60, 30 delay 3 - createsprite gUnknown_08596CC8, 130, 105, 20, 8, 40, 0 + createsprite2 gUnknown_08596CC8, ANIM_BATTLER_TARGET, 2, 105, 20, 8, 40, 0 delay 3 - createsprite gUnknown_085923A8, 130, 20, 255, 15, 32, 0 - createsprite gUnknown_085923A8, 130, 110, 10, 8, 32, 20 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 20, 255, 15, 32, 0 + createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -32, -16, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_DEF_PARTNER, 3, 0, 12, 1 delay 4 - createsprite gUnknown_085973A0, 131, 1, 3 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973A0, 131, 1, 3 + createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET delay 4 - createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 32, 20, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -9692,43 +9692,43 @@ Move_MAGICAL_LEAF: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 1 loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 createvisualtask sub_81007C4, 5 - createsprite gUnknown_08592390, 2, -3, -2, 10 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_08592390, 2, -1, -1, 15 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_08592390, 2, -4, -4, 7 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_08592390, 2, 3, -3, 11 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_08592390, 2, -1, -6, 8 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_08592390, 2, 2, -1, 12 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_08592390, 2, -3, -4, 13 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_08592390, 2, 4, -5, 7 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_08592390, 2, 2, -6, 11 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_08592390, 2, -3, -5, 8 + createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -5, 8 delay 60 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, 20, 0 - createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, -20, 0 + createsprite2 gUnknown_085923D8, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 + createsprite2 gUnknown_085923D8, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2 - createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, -4, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 10, 4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 delay 20 setarg 7, -1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -9739,7 +9739,7 @@ Move_ICE_BALL: jumpargeq 0, 4, IceBallSetIceBg IceBallContinue: playsewithpan SE_W196, SOUND_PAN_ATTACKER - createsprite gUnknown_08595DE4, 130, 15, 0, -12, -16, 30, -40 + createsprite2 gUnknown_08595DE4, ANIM_BATTLER_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 playsewithpan SE_W280, SOUND_PAN_TARGET createvisualtask AnimTask_GetRolloutCounter, 5, 0 @@ -9819,19 +9819,19 @@ IceBallStrongest: call IceBall1 goto IceBallContinue2 IceBall1: - createsprite gUnknown_08595DFC, 132, -12, -16 + createsprite2 gUnknown_08595DFC, ANIM_BATTLER_TARGET, 4, -12, -16 return Move_WEATHER_BALL: loadspritegfx ANIM_TAG_WEATHER_BALL - createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 1, ANIM_BATTLER_ATTACKER delay 8 playsewithpan SE_W207, SOUND_PAN_ATTACKER - createsprite gUnknown_0853EE38, 2 + createsprite2 gUnknown_0853EE38, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish delay 15 playsewithpan SE_W197, 0 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 + createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2 delay 1 @@ -9842,75 +9842,75 @@ Move_WEATHER_BALL: jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce WeatherBallNormal: loadspritegfx ANIM_TAG_IMPACT - createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0 + createsprite2 gUnknown_0853EE50, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 waitforvisualfinish end WeatherBallFire: loadspritegfx ANIM_TAG_SMALL_EMBER - createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10 + createsprite2 gUnknown_0859559C, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, -40, 20 + createsprite2 gUnknown_0859559C, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -40, 20 playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 0, 0 + createsprite2 gUnknown_0859559C, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W172B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 waitforvisualfinish end WeatherBallWater: loadspritegfx ANIM_TAG_SMALL_BUBBLES - createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10 + createsprite2 gUnknown_08595328, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08595328, 130, -30, -100, 25, 1, -20, 20 + createsprite2 gUnknown_08595328, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -20, 20 playsewithpan SE_W152, SOUND_PAN_TARGET delay 13 - createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 0, 0 + createsprite2 gUnknown_08595328, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 playsewithpan SE_W202, SOUND_PAN_TARGET waitforvisualfinish end WeatherBallSandstorm: loadspritegfx ANIM_TAG_ROCKS - createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0 + createsprite2 gUnknown_08596CE0, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, -40, 20 + createsprite2 gUnknown_08596CE0, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -40, 20 playsewithpan SE_W088, SOUND_PAN_TARGET delay 14 - createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 0, 0 + createsprite2 gUnknown_08596CE0, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W070, SOUND_PAN_TARGET - createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -12, 27, 2, 3 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 8, 28, 3, 4 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -4, 30, 2, 3 + createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 12, 25, 4, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 waitforvisualfinish end WeatherBallIce: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS - createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20 + createsprite2 gUnknown_08595D44, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 40, 0 + createsprite2 gUnknown_08595D44, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, 40, 0 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 0, 0 + createsprite2 gUnknown_08595D44, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, 0, 0 playsewithpan SE_W258, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 playsewithpan SE_W196, SOUND_PAN_TARGET call FreezeEffect1 waitforvisualfinish @@ -9918,237 +9918,237 @@ WeatherBallIce: Move_COUNT: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end FreezeEffect1: - createsprite gUnknown_08595B68, 130, -10, -10, 0 + createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -10, -10, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 10, 20, 0 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 10, 20, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, -5, 10, 0 + createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -5, 10, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 17, -12, 0 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 17, -12, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, -15, 15, 0 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, -15, 15, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 0, 0, 0 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 0, 0, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, 20, 2, 0 + createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, 20, 2, 0 playsewithpan SE_W196, SOUND_PAN_TARGET return FreezeEffect2: - createsprite gUnknown_08595B68, 130, -10, -10, 1 + createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -10, -10, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 10, 20, 1 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 10, 20, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, -29, 0, 1 + createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -29, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 29, -20, 1 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 29, -20, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, -5, 10, 1 + createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -5, 10, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 17, -12, 1 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 17, -12, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, -20, 0, 1 + createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -20, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, -15, 15, 1 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, -15, 15, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 26, -5, 1 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 26, -5, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 0, 0, 1 + createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 0, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, 20, 2, 1 + createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, 20, 2, 1 playsewithpan SE_W196, SOUND_PAN_TARGET return IcyWindEffect1: @ Unused loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 - createsprite gUnknown_08595C04, 130, 0, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 0, 24, 0 delay 4 - createsprite gUnknown_08595C04, 130, 8, 24, 0 - createsprite gUnknown_08595C04, 130, -8, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 8, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -8, 24, 0 delay 4 - createsprite gUnknown_08595C04, 130, 16, 24, 0 - createsprite gUnknown_08595C04, 130, -16, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 16, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -16, 24, 0 delay 4 - createsprite gUnknown_08595C04, 130, 24, 24, 0 - createsprite gUnknown_08595C04, 130, -24, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 24, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -24, 24, 0 delay 4 - createsprite gUnknown_08595C04, 130, 32, 24, 0 - createsprite gUnknown_08595C04, 130, -32, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 32, 24, 0 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -32, 24, 0 return IcyWindEffect2: loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 - createsprite gUnknown_08595C04, 130, 0, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 0, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 8, 24, 1 - createsprite gUnknown_08595C04, 130, -8, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 8, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -8, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 16, 24, 1 - createsprite gUnknown_08595C04, 130, -16, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 16, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -16, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 24, 24, 1 - createsprite gUnknown_08595C04, 130, -24, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 24, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -24, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 32, 24, 1 - createsprite gUnknown_08595C04, 130, -32, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 32, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -32, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 40, 24, 1 - createsprite gUnknown_08595C04, 130, -40, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 40, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -40, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 48, 24, 1 - createsprite gUnknown_08595C04, 130, -48, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 48, 24, 1 + createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -48, 24, 1 return GrantingStarsEffect: - createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + createsprite2 gUnknown_08592B7C, ANIM_BATTLER_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 + createsprite2 gUnknown_08592B7C, ANIM_BATTLER_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 return HealingEffect: playsewithpan SE_W071B, SOUND_PAN_ATTACKER - createsprite gUnknown_08592F2C, 2, 0, -5, 0, 0 + createsprite2 gUnknown_08592F2C, ANIM_BATTLER_ATTACKER, 2, 0, -5, 0, 0 delay 7 - createsprite gUnknown_08592F2C, 2, -15, 10, 0, 0 + createsprite2 gUnknown_08592F2C, ANIM_BATTLER_ATTACKER, 2, -15, 10, 0, 0 delay 7 - createsprite gUnknown_08592F2C, 2, -15, -15, 0, 0 + createsprite2 gUnknown_08592F2C, ANIM_BATTLER_ATTACKER, 2, -15, -15, 0, 0 delay 7 - createsprite gUnknown_08592F2C, 2, 10, -5, 0, 0 + createsprite2 gUnknown_08592F2C, ANIM_BATTLER_ATTACKER, 2, 10, -5, 0, 0 delay 7 return HealingEffect2: playsewithpan SE_W071B, SOUND_PAN_TARGET - createsprite gUnknown_08592F2C, 130, 0, -5, 1, 0 + createsprite2 gUnknown_08592F2C, ANIM_BATTLER_TARGET, 2, 0, -5, 1, 0 delay 7 - createsprite gUnknown_08592F2C, 130, -15, 10, 1, 0 + createsprite2 gUnknown_08592F2C, ANIM_BATTLER_TARGET, 2, -15, 10, 1, 0 delay 7 - createsprite gUnknown_08592F2C, 130, -15, -15, 1, 0 + createsprite2 gUnknown_08592F2C, ANIM_BATTLER_TARGET, 2, -15, -15, 1, 0 delay 7 - createsprite gUnknown_08592F2C, 130, 10, -5, 1, 0 + createsprite2 gUnknown_08592F2C, ANIM_BATTLER_TARGET, 2, 10, -5, 1, 0 delay 7 return PoisonBubblesEffect: - createsprite gPoisonBubbleSpriteTemplate, 130, 10, 10, 0 + createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, 10, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, 20, -20, 0 + createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -20, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, -20, 15, 0 + createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, 15, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, 0, 0, 0 + createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, -20, -20, 0 + createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, -20, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, 16, -8, 0 + createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, -8, 0 playsewithpan SE_W092, SOUND_PAN_TARGET return WaterBubbleEffect: - createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 0 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 0 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -20, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 0 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, 15, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 0 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 0 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, -20, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 0 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, -8, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET return WaterBubbleEffect2: - createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 1 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -28, -10, 1 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -28, -10, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 1 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -20, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 1 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, 15, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 1 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 27, 8, 1 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 8, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 1 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, -20, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 1 + createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, -8, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET return ElectricityEffect: playsewithpan SE_W085B, SOUND_PAN_TARGET - createsprite gElectricitySpriteTemplate, 130, 5, 0, 5, 0 + createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, 0, 5, 0 delay 2 - createsprite gElectricitySpriteTemplate, 130, -5, 10, 5, 1 + createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, 10, 5, 1 delay 2 - createsprite gElectricitySpriteTemplate, 130, 15, 20, 5, 2 + createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 20, 5, 2 delay 2 - createsprite gElectricitySpriteTemplate, 130, -15, -10, 5, 0 + createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -10, 5, 0 delay 2 - createsprite gElectricitySpriteTemplate, 130, 25, 0, 5, 1 + createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 25, 0, 5, 1 delay 2 - createsprite gElectricitySpriteTemplate, 130, -8, 8, 5, 2 + createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -8, 8, 5, 2 delay 2 - createsprite gElectricitySpriteTemplate, 130, 2, -8, 5, 0 + createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 2, -8, 5, 0 delay 2 - createsprite gElectricitySpriteTemplate, 130, -20, 15, 5, 1 + createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, 15, 5, 1 return ConfusionEffect: loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 0, 3, 90 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 51, 3, 90 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 102, 3, 90 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 153, 3, 90 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 204, 3, 90 + createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 0, 3, 90 + createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 51, 3, 90 + createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 102, 3, 90 + createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 153, 3, 90 + createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 204, 3, 90 return SetPsychicBackground: @@ -10212,7 +10212,7 @@ UnsetSolarbeamBg: Status_Poison: loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 18, 2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end @@ -10230,65 +10230,65 @@ Status_Burn: waitforvisualfinish end Burn1: - createsprite gUnknown_08595504, 130, -24, 24, 24, 24, 20, 1, 1 + createsprite2 gUnknown_08595504, ANIM_BATTLER_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 delay 4 return Status_Infatuation: loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite gUnknown_08593970, 3, 0, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 0, 20 delay 15 playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite gUnknown_08593970, 3, -20, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, -20, 20 delay 15 playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite gUnknown_08593970, 3, 20, 20 + createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 20, 20 end Status_Sleep: loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_W173, SOUND_PAN_ATTACKER - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 end Status_Paralysis: loadspritegfx ANIM_TAG_SPARK_2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 call ElectricityEffect end Status_Freeze: playsewithpan SE_W196, 0 loadspritegfx ANIM_TAG_ICE_CUBE - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 createvisualtask sub_80A9EF4, 2 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Status_Curse: loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8596DE8, 130 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 + createsprite2 gBattleAnimSpriteTemplate_8596DE8, ANIM_BATTLER_TARGET, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Status_Nightmare: loadspritegfx ANIM_TAG_DEVIL - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8596E00, 130 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 + createsprite2 gBattleAnimSpriteTemplate_8596E00, ANIM_BATTLER_TARGET, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end General_CastformChange: @@ -10296,12 +10296,12 @@ General_CastformChange: jumpreteq 1, AnimScript_82D7ECA goto AnimScript_82D7EB2 AnimScript_82D7EB2: - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 createvisualtask sub_815B7D0, 2, 1 waitforvisualfinish - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER end AnimScript_82D7ECA: createvisualtask sub_815BB58, 2, 1 @@ -10313,12 +10313,12 @@ General_StatsChange: end General_SubstituteFade: - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER createvisualtask sub_8172D98, 5 createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE waitforvisualfinish delay 1 - clearmonbg ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER delay 2 blendoff createvisualtask sub_8116620, 10, 2, 0, 0, 0, RGB_WHITE @@ -10334,17 +10334,17 @@ General_PokeblockThrow: createvisualtask sub_81732B0, 2 delay 0 waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 - createsprite gBattleAnimSpriteTemplate_85E5338, 131, -18, 12, 0, 32 + createsprite2 gBattleAnimSpriteTemplate_85E5338, ANIM_BATTLER_TARGET, 3, -18, 12, 0, 32 delay 50 loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 - createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_BATTLER_TARGET waitforvisualfinish createvisualtask sub_81732E4, 2 end General_ItemKnockoff: loadspritegfx ANIM_TAG_ITEM_BAG - createsprite gBattleAnimSpriteTemplate_8592628, 130 + createsprite2 gBattleAnimSpriteTemplate_8592628, ANIM_BATTLER_TARGET, 2 end General_TurnTrap: @@ -10357,11 +10357,11 @@ General_TurnTrap: Status_BindWrap: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 - createsprite gUnknown_08592494, 132, 0, 16, 0, 1 + createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 4, 0, 16, 0, 1 delay 7 - createsprite gUnknown_08592494, 130, 0, 8, 1, 1 + createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 2, 0, 8, 1, 1 delay 3 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 delay 20 setarg 7, -1 playsewithpan SE_W020, SOUND_PAN_TARGET @@ -10370,7 +10370,7 @@ Status_BindWrap: Status_FireSpin: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 30, 1 call FireSpinEffect call FireSpinEffect waitforvisualfinish @@ -10378,46 +10378,46 @@ Status_FireSpin: end Status_Whrilpool: loadspritegfx ANIM_TAG_WATER_ORB - monbg ANIM_DEF_PARTNER - monbgprio_28 ANIM_TARGET + monbg ANIM_BATTLER_DEF_PARTNER + monbgprio_28 ANIM_BATTLER_TARGET setalpha 12, 8 delay 0 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 30, 1 call WhirlpoolEffect call WhirlpoolEffect delay 12 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish stopsound - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER end Status_Clamp: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10 + createsprite2 gUnknown_08597098, ANIM_BATTLER_ATTACKER, 2, -32, 0, 2, 819, 0, 10 + createsprite2 gUnknown_08597098, ANIM_BATTLER_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 5, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff waitforvisualfinish end Status_SandTomb: loadspritegfx ANIM_TAG_MUD_SAND - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 30, 1 playsewithpan SE_W328, SOUND_PAN_TARGET call SandTombEffect call SandTombEffect delay 22 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish stopsound end @@ -10439,58 +10439,58 @@ General_ItemEffect: call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 3, 7, 0, RGB(17, 31, 25) - createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 3, 7, 0, RGB(17, 31, 25) + createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish end General_SmokeballEscape: loadspritegfx ANIM_TAG_PINK_CLOUD - monbg ANIM_ATTACKER + monbg ANIM_BATTLER_ATTACKER setalpha 12, 4 delay 0 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gUnknown_085CE734, 128, 0, 32, 28, 30 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_TARGET, 0, 0, 32, 28, 30 delay 4 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gUnknown_085CE734, 127, 2, 12, 20, 30 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 127, 2, 12, 20, 30 delay 12 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gUnknown_085CE734, 0x7E, 2, -28, 4, 30 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 126, 2, -28, 4, 30 delay 12 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gUnknown_085CE734, 0x7C, 2, 14, -20, 30 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 124, 2, 14, -20, 30 delay 4 playsewithpan SE_BOWA2, SOUND_PAN_TARGET createvisualtask sub_81136E8, 2, 2 - createsprite gUnknown_085CE734, 0x7B, 3, 4, 4, 30 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 123, 3, 4, 4, 30 delay 14 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gUnknown_085CE734, 0x7A, 3, -14, 18, 46 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 122, 3, -14, 18, 46 delay 0 - createsprite gUnknown_085CE734, 0x79, 3, 14, -14, 46 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 121, 3, 14, -14, 46 delay 0 - createsprite gUnknown_085CE734, 120, 3, -12, -10, 46 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 120, 3, -12, -10, 46 delay 0 - createsprite gUnknown_085CE734, 0x77, 3, 14, 14, 46 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 119, 3, 14, 14, 46 delay 0 - createsprite gUnknown_085CE734, 0x76, 3, 0, 0, 46 + createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 118, 3, 0, 0, 46 waitforvisualfinish - clearmonbg ANIM_ATTACKER - invisible ANIM_ATTACKER + clearmonbg ANIM_BATTLER_ATTACKER + invisible ANIM_BATTLER_ATTACKER delay 0 blendoff end General_HangedOn: - createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 7, 0, 9, RGB_RED + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 2, 7, 0, 9, RGB_RED playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 4, 9, 0, RGB_RED + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 2, 4, 9, 0, RGB_RED waitforvisualfinish delay 6 - createsprite gSlideMonToOriginalPosSpriteTemplate, 0, 0, 0, 15 + createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 0, 0, 15 end General_Rain: @@ -10522,13 +10522,13 @@ General_LeechSeedDrain: General_MonHit: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_TARGET + monbg ANIM_BATTLER_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_TARGET + clearmonbg ANIM_BATTLER_TARGET blendoff end @@ -10537,7 +10537,7 @@ General_ItemSteal: createvisualtask sub_8117F30, 2 createvisualtask sub_8172ED0, 2 delay 1 - createsprite gUnknown_08592670, 2, 0, -5, 10, 2, -1 + createsprite2 gUnknown_08592670, ANIM_BATTLER_ATTACKER, 2, 0, -5, 10, 2, -1 end General_SnatchMove: @@ -10545,7 +10545,7 @@ General_SnatchMove: createvisualtask sub_8117E94, 2 call AnimScript_82D85A3 delay 1 - createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_TARGET + createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_BATTLER_TARGET waitforvisualfinish createvisualtask AnimTask_IsTargetSameSide, 2 jumpretfalse SnatchOpposingMonMove @@ -10565,18 +10565,18 @@ SnatchPartnerMonMove: General_FutureSightHit: createvisualtask sub_8117F10, 2 - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_TARGET waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 24, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 24, 1 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff waitforvisualfinish delay 1 @@ -10586,7 +10586,7 @@ General_FutureSightHit: General_DoomDesireHit: createvisualtask sub_8117F10, 2 loadspritegfx ANIM_TAG_EXPLOSION - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_WHITE + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 createvisualtask sub_815C0A4, 5 @@ -10597,23 +10597,23 @@ General_DoomDesireHit: delay 9 playsewithpan SE_W109, SOUND_PAN_TARGET delay 25 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 20, 1 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 + createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end @@ -10623,7 +10623,7 @@ General_FocusPunchSetUp: call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 call EndureEffect delay 8 call EndureEffect @@ -10633,9 +10633,9 @@ General_FocusPunchSetUp: General_IngrainHeal: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish delay 3 call AbsorbEffect @@ -10643,15 +10643,15 @@ General_IngrainHeal: delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end General_WishHeal: loadspritegfx ANIM_TAG_SPARKLE_2 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W025, SOUND_PAN_ATTACKER call GrantingStarsEffect @@ -10660,7 +10660,7 @@ General_WishHeal: loadspritegfx ANIM_TAG_BLUE_STAR call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK + createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK end AnimScript_82D85A3: @@ -10720,13 +10720,13 @@ BallThrowEnd: BallThrowTrainerBlock: loadspritegfx ANIM_TAG_IMPACT delay 25 - monbg ANIM_DEF_PARTNER + monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 0 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2 + createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish - clearmonbg ANIM_DEF_PARTNER + clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff goto BallThrowEnd diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 496a5ed0a..709f4b7b2 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -298,10 +298,10 @@ #define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // battlers -#define ANIM_ATTACKER 0 -#define ANIM_TARGET 1 -#define ANIM_ATK_PARTNER 2 -#define ANIM_DEF_PARTNER 3 +#define ANIM_BATTLER_ATTACKER 0 +#define ANIM_BATTLER_TARGET 1 +#define ANIM_BATTLER_ATK_PARTNER 2 +#define ANIM_BATTLER_DEF_PARTNER 3 // stereo panning constants [0-255] // diff --git a/src/battle_anim.c b/src/battle_anim.c index aa9637889..d9eefd510 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1862,7 +1862,7 @@ static void ScriptCmd_monbg(void) sBattleAnimScriptPtr++; animBattler = sBattleAnimScriptPtr[0]; - if (animBattler & ANIM_TARGET) + if (animBattler & ANIM_BATTLER_TARGET) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -2119,12 +2119,12 @@ static void ScriptCmd_clearmonbg(void) sBattleAnimScriptPtr++; animBattlerId = sBattleAnimScriptPtr[0]; - if (animBattlerId == ANIM_ATTACKER) - animBattlerId = ANIM_ATK_PARTNER; - else if (animBattlerId == ANIM_TARGET) - animBattlerId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_BATTLER_ATTACKER) + animBattlerId = ANIM_BATTLER_ATK_PARTNER; + else if (animBattlerId == ANIM_BATTLER_TARGET) + animBattlerId = ANIM_BATTLER_DEF_PARTNER; - if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; @@ -2181,12 +2181,12 @@ static void ScriptCmd_monbg_22(void) animBattlerId = sBattleAnimScriptPtr[0]; - if (animBattlerId == ANIM_ATTACKER) - animBattlerId = ANIM_ATK_PARTNER; - else if (animBattlerId == ANIM_TARGET) - animBattlerId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_BATTLER_ATTACKER) + animBattlerId = ANIM_BATTLER_ATK_PARTNER; + else if (animBattlerId == ANIM_BATTLER_TARGET) + animBattlerId = ANIM_BATTLER_DEF_PARTNER; - if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; @@ -2226,12 +2226,12 @@ static void ScriptCmd_clearmonbg_23(void) sBattleAnimScriptPtr++; animBattlerId = sBattleAnimScriptPtr[0]; - if (animBattlerId == ANIM_ATTACKER) - animBattlerId = ANIM_ATK_PARTNER; - else if (animBattlerId == ANIM_TARGET) - animBattlerId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_BATTLER_ATTACKER) + animBattlerId = ANIM_BATTLER_ATK_PARTNER; + else if (animBattlerId == ANIM_BATTLER_TARGET) + animBattlerId = ANIM_BATTLER_DEF_PARTNER; - if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; @@ -2956,7 +2956,7 @@ static void ScriptCmd_monbgprio_28(void) wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; - if (wantedBattler != ANIM_ATTACKER) + if (wantedBattler != ANIM_BATTLER_ATTACKER) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -2989,7 +2989,7 @@ static void ScriptCmd_monbgprio_2A(void) sBattleAnimScriptPtr += 2; if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget)) { - if (wantedBattler != ANIM_ATTACKER) + if (wantedBattler != ANIM_BATTLER_ATTACKER) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -3036,15 +3036,15 @@ static void ScriptCmd_doublebattle_2D(void) if (!IsContest() && IsDoubleBattle() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (wantedBattler == ANIM_ATTACKER) + if (wantedBattler == ANIM_BATTLER_ATTACKER) { r4 = sub_80A8364(gBattleAnimAttacker); - spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); + spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); } else { r4 = sub_80A8364(gBattleAnimTarget); - spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); + spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET); } if (spriteId != 0xFF) { @@ -3071,15 +3071,15 @@ static void ScriptCmd_doublebattle_2E(void) if (!IsContest() && IsDoubleBattle() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (wantedBattler == ANIM_ATTACKER) + if (wantedBattler == ANIM_BATTLER_ATTACKER) { r4 = sub_80A8364(gBattleAnimAttacker); - spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); + spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); } else { r4 = sub_80A8364(gBattleAnimTarget); - spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); + spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET); } if (spriteId != 0xFF && r4 == 2) diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index ebe1718b7..351a5c20d 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -395,7 +395,7 @@ u8 GetAnimBattlerSpriteId(u8 which) { u8 *sprites; - if (which == ANIM_ATTACKER) + if (which == ANIM_BATTLER_ATTACKER) { if (IsBattlerSpritePresent(gBattleAnimAttacker)) { @@ -407,7 +407,7 @@ u8 GetAnimBattlerSpriteId(u8 which) return 0xff; } } - else if (which == ANIM_TARGET) + else if (which == ANIM_BATTLER_TARGET) { if (IsBattlerSpritePresent(gBattleAnimTarget)) { @@ -419,7 +419,7 @@ u8 GetAnimBattlerSpriteId(u8 which) return 0xff; } } - else if (which == ANIM_ATK_PARTNER) + else if (which == ANIM_BATTLER_ATK_PARTNER) { if (!IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) return 0xff; @@ -1236,7 +1236,7 @@ bool8 sub_80A7238(void) { if (IsContest()) { - if (gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].data[2] == SPECIES_UNOWN) + if (gSprites[GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER)].data[2] == SPECIES_UNOWN) return FALSE; else return TRUE; @@ -2334,7 +2334,7 @@ void sub_80A8BC4(u8 taskId) u16 dest; struct Task *task = &gTasks[taskId]; - task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER); + task->data[0] = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); task->data[1] = ((GetBattlerSide(gBattleAnimAttacker)) != B_SIDE_PLAYER) ? -8 : 8; task->data[2] = 0; task->data[3] = 0; diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 7b8eb4ed7..c178a57dc 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -130,7 +130,7 @@ void sub_8158D8C(u8 taskId) s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); if (IsContest()) { - if (gBattleAnimArgs[0] == ANIM_ATTACKER) + if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER) species = gContestResources->field_18->unk0; else DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. @@ -140,17 +140,17 @@ void sub_8158D8C(u8 taskId) u8 battlerId; // Get wanted battler. - if (gBattleAnimArgs[0] == ANIM_ATTACKER) + if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER) battlerId = gBattleAnimAttacker; - else if (gBattleAnimArgs[0] == ANIM_TARGET) + else if (gBattleAnimArgs[0] == ANIM_BATTLER_TARGET) battlerId = gBattleAnimTarget; - else if (gBattleAnimArgs[0] == ANIM_ATK_PARTNER) + else if (gBattleAnimArgs[0] == ANIM_BATTLER_ATK_PARTNER) battlerId = BATTLE_PARTNER(gBattleAnimAttacker); else battlerId = BATTLE_PARTNER(gBattleAnimTarget); // Check if battler is visible. - if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) + if ((gBattleAnimArgs[0] == ANIM_BATTLER_TARGET || gBattleAnimArgs[0] == ANIM_BATTLER_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) { DestroyAnimVisualTask(taskId); return; @@ -176,7 +176,7 @@ void sub_8158E9C(u8 taskId) s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); if (IsContest()) { - if (gBattleAnimArgs[0] == ANIM_ATTACKER) + if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER) species = gContestResources->field_18->unk0; else DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. @@ -186,17 +186,17 @@ void sub_8158E9C(u8 taskId) u8 battlerId; // Get wanted battler. - if (gBattleAnimArgs[0] == ANIM_ATTACKER) + if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER) battlerId = gBattleAnimAttacker; - else if (gBattleAnimArgs[0] == ANIM_TARGET) + else if (gBattleAnimArgs[0] == ANIM_BATTLER_TARGET) battlerId = gBattleAnimTarget; - else if (gBattleAnimArgs[0] == ANIM_ATK_PARTNER) + else if (gBattleAnimArgs[0] == ANIM_BATTLER_ATK_PARTNER) battlerId = BATTLE_PARTNER(gBattleAnimAttacker); else battlerId = BATTLE_PARTNER(gBattleAnimTarget); // Check if battler is visible. - if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) + if ((gBattleAnimArgs[0] == ANIM_BATTLER_TARGET || gBattleAnimArgs[0] == ANIM_BATTLER_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) { DestroyAnimVisualTask(taskId); return; From c6833c903ca3fafbf3b8d5afd19a53785b1633e3 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 13 Nov 2018 16:19:52 -0500 Subject: [PATCH 2/2] remove extra macro and shorten names --- asm/macros/battle_anim_script.inc | 14 +- data/battle_anim_scripts.s | 5862 ++++++++++++++--------------- include/constants/battle_anim.h | 8 +- src/battle_anim.c | 48 +- src/battle_anim_80A5C6C.c | 10 +- src/battle_anim_sound_tasks.c | 20 +- 6 files changed, 2976 insertions(+), 2986 deletions(-) diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 78cbf1725..ab27bc23d 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -10,20 +10,10 @@ .2byte \param0 .endm - .macro createsprite template, priority, argv:vararg +.macro createsprite template, anim_battler, subpriority_offset, argv:vararg .byte 0x02 .4byte \template - .byte \priority - .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 -.Lsprite_\@_1: - .2byte \argv -.Lsprite_\@_2: - .endm - -.macro createsprite2 template, anim_battler, subpriority_offset, argv:vararg - .byte 0x02 - .4byte \template - .if \anim_battler == ANIM_BATTLER_TARGET + .if \anim_battler == ANIM_TARGET .byte 0x80 | (\subpriority_offset & 0x7F) .else .byte (\subpriority_offset & 0x7F) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 82b6c265b..f0afce456 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -424,207 +424,207 @@ Move_NONE: Move_MIRROR_MOVE: Move_POUND: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_DOUBLE_SLAP: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight DoubleSlapContinue: - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end DoubleSlapLeft: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 goto DoubleSlapContinue DoubleSlapRight: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, 1, 2 goto DoubleSlapContinue Move_POISON_POWDER: loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 80, -5, 1 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 96, 5, 1 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 69, -5, 1 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, -22, 117, 80, -5, 1 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 96, 7, 2 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 90, -8, 0 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 80, -5, 1 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 89, 5, 2 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -22, 117, 112, -8, 2 - createsprite2 gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 80, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_STUN_SPORE: loadspritegfx ANIM_TAG_STUN_SPORE loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 80, -5, 1 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 96, 5, 1 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 69, -5, 1 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, -22, 117, 80, -5, 1 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 96, 7, 2 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 90, -8, 0 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 80, -5, 1 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 89, 5, 2 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -22, 117, 112, -8, 2 - createsprite2 gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SLEEP_POWDER: loadspritegfx ANIM_TAG_SLEEP_POWDER loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 80, -5, 1 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 96, 5, 1 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 69, -5, 1 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -22, 117, 112, 5, 2 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, -22, 117, 80, -5, 1 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 96, 7, 2 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, -22, 117, 90, -8, 0 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -22, 117, 80, -5, 1 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -22, 117, 89, 5, 2 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -22, 117, 112, -8, 2 - createsprite2 gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SWIFT: loadspritegfx ANIM_TAG_YELLOW_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 18, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 18, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1 delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_STRENGTH: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_BATTLER_ATTACKER, 2, 0, 96, 30 + createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 4 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_TARGET, 18, 6, 2, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 16, 12, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 16, 12, 1, 1 delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -16, -12, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, -12, 1, 1 delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 3, 4, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 3, 4, 1, 1 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_TACKLE: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_BODY_SLAM: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER waitforvisualfinish delay 11 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 26, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, -10, 0, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 delay 1 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -28, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 delay 5 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_SUPERSONIC: loadspritegfx ANIM_TAG_GOLD_RING - monbg ANIM_BATTLER_ATK_PARTNER - monbgprio_2A ANIM_BATTLER_ATTACKER + monbg ANIM_ATK_PARTNER + monbgprio_2A ANIM_ATTACKER setalpha 12, 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 call Supersonic1 call Supersonic1 call Supersonic1 @@ -632,183 +632,183 @@ Move_SUPERSONIC: call Supersonic1 call Supersonic1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff end Supersonic1: playsewithpan SE_W048, SOUND_PAN_ATTACKER - createsprite2 gSupersonicWaveSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 + createsprite gSupersonicWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return Move_SCREECH: loadspritegfx ANIM_TAG_PURPLE_RING - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 3, 0, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 call Screech1 call Screech1 delay 16 - createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_BATTLER_TARGET + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_TARGET waitforvisualfinish end Screech1: playsewithpan SE_W103, SOUND_PAN_ATTACKER - createsprite2 gScreechWaveSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 + createsprite gScreechWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return Move_FLAME_WHEEL: loadspritegfx ANIM_TAG_SMALL_EMBER - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET - createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 0 + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 0 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 4 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 4 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 8 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 8 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 12 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 12 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 16 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 16 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 20 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 20 playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 24 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 24 playsewithpan SE_W172, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 6 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 8, 1 - createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BATTLER_TARGET, RGB_RED, 12, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 playsewithpan SE_W172B, SOUND_PAN_TARGET call FireMoveEffect delay 7 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 9 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end FlameWheel1: @ Unused - createsprite2 gBattleAnimSpriteTemplate_8595584, ANIM_BATTLER_ATTACKER, 3, 0, 0, 50 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 50 delay 4 return Move_PIN_MISSILE: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite2 gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, -8, -8, 20, -32 + createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 - createsprite2 gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 8, 8, 20, -40 + createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 9 - createsprite2 gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 0, 0, 20, -32 + createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 14 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_ICICLE_SPEAR: loadspritegfx ANIM_TAG_ICICLE_SPEAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W196, SOUND_PAN_ATTACKER - createsprite2 gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, -8, -8, 20, -32 + createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 - createsprite2 gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 8, 8, 20, -40 + createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 9 - createsprite2 gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 0, 0, 20, -32 + createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 14 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_TAKE_DOWN: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -24, 8, 23, 10, 40, 10 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10 delay 35 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, -10, 0, 1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 playsewithpan SE_W025B, SOUND_PAN_TARGET delay 1 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -16, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 2 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_EDGE: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 2, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, 0, 1, 0 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -32, 0, 0, 3 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish createvisualtask sub_80D6134, 2, 8, -256, 0, 0 createvisualtask sub_80D6134, 2, 8, -256, 1, 0 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 4, 0, 12, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 12, 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, RGB_WHITE + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_WHITE waitforvisualfinish createvisualtask sub_80D6134, 2, 8, -256, 0, 1 createvisualtask sub_80D6134, 2, 8, -256, 1, 1 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 waitforvisualfinish end @@ -816,39 +816,39 @@ Move_POISON_STING: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, -8, 0, 20 + createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish call PoisonBubblesEffect waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_TWINEEDLE: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2 - createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -4, 0, -4, 20 - createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 12, 10, 12, 20 + createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 10, -4, 0, -4, 20 + createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 12, 10, 12, 20 delay 20 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 5, 1 - createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, 0, -4, 1, 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 0, -4, 1, 3 loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 delay 1 - createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, 10, 12, 1, 3 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end @@ -862,7 +862,7 @@ Move_FIRE_BLAST: createvisualtask sub_8116620, 10, 1, 3, 0, 8, RGB_BLACK waitforvisualfinish delay 19 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 20, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 20, 1 call FireBlast2 delay 3 call FireBlast2 @@ -885,31 +885,31 @@ Move_FIRE_BLAST: waitforvisualfinish end FireBlast1: - createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 0 - createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 51 - createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 102 - createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 153 - createsprite2 gUnknown_0859551C, ANIM_BATTLER_TARGET, 2, 0, 0, 204 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 0 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 51 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 102 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 153 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 204 delay 5 return FireBlast2: - createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 10, 0, -2 - createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 13, -2, 0 - createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 13, 2, 0 - createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 15, -2, 2 - createsprite2 gUnknown_0859556C, ANIM_BATTLER_TARGET, 2, 0, 0, 15, 2, 2 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 10, 0, -2 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 13, -2, 0 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 13, 2, 0 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 15, -2, 2 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 15, 2, 2 return Move_LEECH_SEED: loadspritegfx ANIM_TAG_SEED playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite2 gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, 0, 24, 35, -32 + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite2 gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, -16, 24, 35, -40 + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite2 gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, 16, 24, 35, -37 + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish @@ -918,11 +918,11 @@ Move_LEECH_SEED: Move_EMBER: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 - createsprite2 gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, -16, 24, 20, 1 + createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 - createsprite2 gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 24, 20, 1 + createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1 delay 4 - createsprite2 gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, 16, 24, 20, 1 + createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1 delay 16 playsewithpan SE_W172, SOUND_PAN_TARGET call Ember1 @@ -931,29 +931,29 @@ Move_EMBER: end Ember1: - createsprite2 gEmberFlareSpriteTemplate, ANIM_BATTLER_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 + createsprite gEmberFlareSpriteTemplate, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 delay 4 return Move_MEGA_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET delay 2 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite2 gMegaPunchKickSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 50 + createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 50 call SetImpactBackground - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 22, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff delay 2 restorebg @@ -981,22 +981,22 @@ SetImpactContestsBG: Move_MEGA_KICK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET delay 2 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite2 gMegaPunchKickSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 50 + createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 50 playsewithpan SE_W025B, SOUND_PAN_TARGET call SetImpactBackground - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 22, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff delay 2 restorebg @@ -1006,47 +1006,47 @@ Move_MEGA_KICK: Move_COMET_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim CometPunchLeft, CometPunchRight CometPunchContinue: - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end CometPunchLeft: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, -8, 1, 2 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -8, 0, 8, 1, 0 goto CometPunchContinue CometPunchRight: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, -8, 1, 2 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0 goto CometPunchContinue Move_SONIC_BOOM: loadspritegfx ANIM_TAG_AIR_WAVE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 call SonicBoom1 call SonicBoom1 call SonicBoom1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 10, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1 call SonicBoom2 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end SonicBoom1: playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite2 gSonicBoomSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 15 + createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return SonicBoom2: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 delay 4 return @@ -1092,15 +1092,15 @@ Move_THUNDERBOLT: createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 20 - createsprite2 gBattleAnimSpriteTemplate_85957E0, ANIM_BATTLER_TARGET, 3, 44, 0, 0, 3 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 + createsprite gBattleAnimSpriteTemplate_85957E0, ANIM_TARGET, 3, 44, 0, 0, 3 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 playsewithpan SE_W063, SOUND_PAN_TARGET delay 0 createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK @@ -1131,11 +1131,11 @@ Move_THUNDER_WAVE: playsewithpan SE_W086, SOUND_PAN_TARGET delay 20 loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 - createsprite2 gUnknown_08595840, ANIM_BATTLER_TARGET, 2, -16, -16 + createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, -16 delay 4 - createsprite2 gUnknown_08595840, ANIM_BATTLER_TARGET, 2, -16, 0 + createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, 0 delay 4 - createsprite2 gUnknown_08595840, ANIM_BATTLER_TARGET, 2, -16, 16 + createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, 16 waitforvisualfinish createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish @@ -1144,69 +1144,69 @@ Move_THUNDER_WAVE: Move_BEAT_UP: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim BeatUpLeft, BeatUpRight BeatUpContinue: waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end BeatUpLeft: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, -20, 1, 2 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, -20, -12, 8, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 0, 1, 2 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, 8, 8, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET goto BeatUpContinue BeatUpRight: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 12, -20, 1, 2 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 12, -12, 8, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -12, 0, 1, 2 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, -12, 8, 8, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET goto BeatUpContinue Move_STOMP: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET - createsprite2 gUnknown_08595F60, ANIM_BATTLER_ATTACKER, 3, 0, -32, 15 + createsprite gUnknown_08595F60, ANIM_ATTACKER, 3, 0, -32, 15 delay 19 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -8, 1, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 4, 9, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_TAIL_WHIP: loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 4, 2, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end Move_CUT: loadspritegfx ANIM_TAG_CUT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W015, SOUND_PAN_TARGET - createsprite2 gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 delay 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff waitforvisualfinish end @@ -1214,31 +1214,31 @@ Move_CUT: Move_HIDDEN_POWER: loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish delay 30 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB(31, 31, 19), 12, 5, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1 delay 4 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 playsewithpan SE_W179, SOUND_PAN_ATTACKER - createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 0 - createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 42 - createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 84 - createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 126 - createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 168 - createsprite2 gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 210 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210 delay 52 setarg 7, -1 playsewithpan SE_W115, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 - createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0 - createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 32 - createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 64 - createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 96 - createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 128 - createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 160 - createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 192 - createsprite2 gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 224 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 64 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 96 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 128 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 160 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 192 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224 end Move_REVERSAL: @@ -1246,32 +1246,32 @@ Move_REVERSAL: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 playsewithpan SE_W179, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 0 - createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 42 - createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 84 - createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 126 - createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 168 - createsprite2 gBattleAnimSpriteTemplate_85CE5D8, ANIM_BATTLER_ATTACKER, 2, 26, 210 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 0 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 42 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 84 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 126 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 168 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 210 waitforvisualfinish delay 20 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 8 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 10, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 end Move_PURSUIT: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein delay 0 @@ -1279,7 +1279,7 @@ Move_PURSUIT: choosetwoturnanim PursuitNormal, PursuitOnSwitchout PursuitContinue: waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff delay 0 restorebg @@ -1287,69 +1287,69 @@ PursuitContinue: end PursuitNormal: playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 goto PursuitContinue PursuitOnSwitchout: playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 goto PursuitContinue Move_SPIKE_CANNON: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 - createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -4, 0, 4, 6, 8, 4 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 - createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -8, -8, -8, 20 - createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 18, 0, 0, 0, 20 - createsprite2 gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 8, 8, 8, 20 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 10, -8, -8, -8, 20 + createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 0, 0, 20 + createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 8, 8, 20 waitforvisualfinish - createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 - createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 - createsprite2 gBattleAnimSpriteTemplate_8597370, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 7, 1 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, -8, -8, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_SWORDS_DANCE: loadspritegfx ANIM_TAG_SWORD - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 12, 8 playsewithpan SE_W014, SOUND_PAN_ATTACKER - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 16, 6, 1, 4 - createsprite2 gBattleAnimSpriteTemplate_8593380, ANIM_BATTLER_ATTACKER, 2, 0, 0 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 + createsprite gBattleAnimSpriteTemplate_8593380, ANIM_ATTACKER, 2, 0, 0 delay 22 createvisualtask sub_8115D94, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER blendoff delay 1 end Move_PSYCH_UP: loadspritegfx ANIM_TAG_SPIRAL - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10 - createsprite2 gUnknown_08596548, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, 0 - createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_BATTLER_ATTACKER + createsprite gUnknown_08596548, ANIM_ATTACKER, 2, 0, 0, 0, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER delay 127 delay 4 playsewithpan SE_W060, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 createvisualtask sub_8116620, 9, 2, 2, 10, 0, RGB_YELLOW delay 30 - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff waitforvisualfinish end @@ -1358,43 +1358,43 @@ Move_DIZZY_PUNCH: loadspritegfx ANIM_TAG_DUCK loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 call DizzyPunch1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 5, 16, 8, 20, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 16, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, 1, 1 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, 160, -32 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, -256, -40 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, 128, -16 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, 416, -38 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, -128, -22 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, 16, 8, -384, -31 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, 160, -32 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, -256, -40 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, 128, -16 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, 416, -38 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, -128, -22 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, -384, -31 delay 10 call DizzyPunch1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 5, -16, -8, 20, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -16, -16, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, 160, -32 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, -256, -40 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, 128, -16 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, 416, -38 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, -128, -22 - createsprite2 gUnknown_08595F78, ANIM_BATTLER_TARGET, 3, -16, -8, -384, -31 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, 160, -32 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, -256, -40 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, 128, -16 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, 416, -38 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, -128, -22 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, -384, -31 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end DizzyPunch1: - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 7, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 return Move_FIRE_SPIN: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 47, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 call FireSpinEffect call FireSpinEffect call FireSpinEffect @@ -1402,23 +1402,23 @@ Move_FIRE_SPIN: end FireSpinEffect: - createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 28, 528, 30, 13, 50, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 28, 528, 30, 13, 50, 1 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 32, 480, 20, 16, -46, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 32, 480, 20, 16, -46, 1 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 33, 576, 20, 8, 42, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 33, 576, 20, 8, 42, 1 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 31, 400, 25, 11, -42, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 31, 400, 25, 11, -42, 1 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 28, 512, 25, 16, 46, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 28, 512, 25, 16, 46, 1 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_TARGET, 2, 0, 33, 464, 30, 15, -50, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 33, 464, 30, 15, -50, 1 delay 2 return Move_FURY_CUTTER: loadspritegfx ANIM_TAG_CUT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_IsFuryCutterHitRight, 2 @@ -1432,26 +1432,26 @@ FuryCutterContinue: goto FuryCutterStrongest FuryCutterContinue2: delay 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff waitforvisualfinish end FuryCutterLeft: - createsprite2 gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 goto FuryCutterContinue FuryCutterRight: - createsprite2 gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 1 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1 goto FuryCutterContinue FuryCutterMedium: - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB(9, 8, 10), 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 FuryCutterStrong: - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 FuryCutterStrongest: - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 Move_SELF_DESTRUCT: @@ -1469,73 +1469,73 @@ Move_SELF_DESTRUCT: end SelfDestruct1: playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 24, -24, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -16, 16, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -24, -12, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 16, 16, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_SLAM: loadspritegfx ANIM_TAG_SLAM_HIT loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W004, SOUND_PAN_ATTACKER - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 3, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 - createsprite2 gUnknown_085928D0, ANIM_BATTLER_ATTACKER, 2, 0, 0 + createsprite gUnknown_085928D0, ANIM_ATTACKER, 2, 0, 0 delay 3 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -12, 10, 0, 3 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 waitforvisualfinish delay 5 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_VINE_WHIP: loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite2 gUnknown_085928E8, ANIM_BATTLER_TARGET, 2, 0, 0 + createsprite gUnknown_085928E8, ANIM_TARGET, 2, 0, 0 delay 6 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 end Move_DRILL_PECK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 1 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 delay 2 loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 createvisualtask sub_810EB88, 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 waitforvisualfinish - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 2 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 waitforvisualfinish end @@ -1543,86 +1543,86 @@ Move_WATERFALL: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_ICE_CRYSTALS - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 23, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 delay 5 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 10, 10, 25, 0 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 10, 10, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -15, 0, 25, 0 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -15, 0, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 20, 10, 25, 0 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 20, 10, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 0, -10, 25, 0 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 0, -10, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -10, 15, 25, 0 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -10, 15, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 25, 20, 25, 0 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 25, 20, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -20, 20, 25, 0 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -20, 20, 25, 0 delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 12, 0, 25, 0 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 5 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 5 delay 6 call UnderWaterAttack1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end UnderWaterAttack1: playsewithpan SE_W127, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 17, 1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 20, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 20 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 20 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 20, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 20 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 20 delay 2 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 15, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 15 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 15 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 15, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 15 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 15 delay 2 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 10, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 10 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 10 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 10, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 10 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 10 delay 2 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 5, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 5 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 5 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 5, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 5 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 5 delay 2 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 0 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, 0 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 0 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 0 delay 2 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, -5, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -5 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -5 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, -5, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -5 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -5 delay 2 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, -10, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -10 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -10 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, -10, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -10 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -10 delay 2 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, -15, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -15 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -15 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, -15, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -15 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -15 delay 2 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 3, 0, -20, 1, 1 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -20 - createsprite2 gUnknown_08595250, ANIM_BATTLER_ATTACKER, 4, 0, -20 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, -20, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -20 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -20 return Move_EXPLOSION: loadspritegfx ANIM_TAG_EXPLOSION - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 @@ -1637,19 +1637,19 @@ Move_EXPLOSION: end Explosion1: playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 24, -24, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -16, 16, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -24, -12, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 16, 16, 0, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1659,7 +1659,7 @@ Move_DEFENSE_CURL: createvisualtask sub_811489C, 5, 0, 0 createvisualtask sub_815B338, 5 waitforvisualfinish - createsprite2 gUnknown_085CE338, ANIM_BATTLER_ATTACKER, 2, 0, 6, 0, 1 + createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1 waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 waitforvisualfinish @@ -1667,25 +1667,25 @@ Move_DEFENSE_CURL: Move_PROTECT: loadspritegfx ANIM_TAG_PROTECT - monbg ANIM_BATTLER_ATK_PARTNER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATK_PARTNER + monbgprio_28 ANIM_ATTACKER waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 - createsprite2 gUnknown_08592ADC, ANIM_BATTLER_ATTACKER, 2, 24, 0, 90 + createsprite gUnknown_08592ADC, ANIM_ATTACKER, 2, 24, 0, 90 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER end Move_DETECT: loadspritegfx ANIM_TAG_SPARKLE_4 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 9, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE delay 18 playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0853EE84, ANIM_BATTLER_ATTACKER, 13, 20, -20 + createsprite gUnknown_0853EE84, ANIM_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 9, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 9, 0, RGB_BLACK createvisualtask sub_8116620, 10, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end @@ -1693,7 +1693,7 @@ Move_DETECT: Move_FRUSTRATION: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetFrustrationPowerLevel, 1 jumpreteq 0, Frustration_Strongest @@ -1702,135 +1702,135 @@ Move_FRUSTRATION: goto Frustration_Weak Frustration_Continue: waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Frustration_Strongest: playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_ATTACKER, 1, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 - createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_BATTLER_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_ATTACKER delay 5 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 30, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 24, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 24, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -24, -16, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -24, -16, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 4, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 4, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -16, 19, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, 19, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, -18, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Strong: playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_ATTACKER, 1, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask sub_815C3A8, 5 delay 7 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 8, 1, 1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 delay 14 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 12, -6, 1, 1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 delay 14 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -12, -6, 1, 1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Medium: playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 4, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 4, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -4, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 goto Frustration_Continue Frustration_Weak: - createsprite2 gUnknown_085CE4D0, ANIM_BATTLER_ATTACKER, 2, 20, -28 + createsprite gUnknown_085CE4D0, ANIM_ATTACKER, 2, 20, -28 waitforvisualfinish delay 10 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 2 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 delay 12 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 goto Frustration_Continue Move_SAFEGUARD: loadspritegfx ANIM_TAG_GUARD_RING - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 8, 8 playsewithpan SE_W208, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593C64, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 delay 4 - createsprite2 gUnknown_08593C64, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 delay 4 - createsprite2 gUnknown_08593C64, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff end Move_PAIN_SPLIT: loadspritegfx ANIM_TAG_PAIN_SPLIT - createsprite2 gUnknown_085CE590, ANIM_BATTLER_ATTACKER, 2, -8, -42, 0 - createsprite2 gUnknown_085CE590, ANIM_BATTLER_TARGET, 2, -8, -42, 1 + createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -8, -42, 0 + createsprite gUnknown_085CE590, ANIM_TARGET, 2, -8, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 0 createvisualtask sub_815CA20, 2, 1, 0 waitforvisualfinish - createsprite2 gUnknown_085CE590, ANIM_BATTLER_ATTACKER, 2, -24, -42, 0 - createsprite2 gUnknown_085CE590, ANIM_BATTLER_TARGET, 2, -24, -42, 1 + createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -24, -42, 0 + createsprite gUnknown_085CE590, ANIM_TARGET, 2, -24, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 1 createvisualtask sub_815CA20, 2, 1, 1 waitforvisualfinish - createsprite2 gUnknown_085CE590, ANIM_BATTLER_ATTACKER, 2, 8, -42, 0 - createsprite2 gUnknown_085CE590, ANIM_BATTLER_TARGET, 2, 8, -42, 1 + createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, 8, -42, 0 + createsprite gUnknown_085CE590, ANIM_TARGET, 2, 8, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 2 @@ -1840,39 +1840,39 @@ Move_PAIN_SPLIT: Move_VICE_GRIP: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite2 gUnknown_08593590, ANIM_BATTLER_ATTACKER, 2, 0 - createsprite2 gUnknown_08593590, ANIM_BATTLER_ATTACKER, 2, 1 + createsprite gUnknown_08593590, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_08593590, ANIM_ATTACKER, 2, 1 delay 9 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_GUILLOTINE: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite2 gUnknown_085935D0, ANIM_BATTLER_ATTACKER, 2, 0 - createsprite2 gUnknown_085935D0, ANIM_BATTLER_ATTACKER, 2, 1 + createsprite gUnknown_085935D0, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_085935D0, ANIM_ATTACKER, 2, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK delay 9 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 23, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 23, 1 delay 0x2E - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 4, 0, 8, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadein @@ -1881,18 +1881,18 @@ Move_GUILLOTINE: Move_PAY_DAY: loadspritegfx ANIM_TAG_COIN loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085934D8, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 1152 + createsprite gUnknown_085934D8, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish playsewithpan SE_W006, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 2 - createsprite2 gUnknown_085934F0, ANIM_BATTLER_ATTACKER, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 + createsprite gUnknown_085934F0, ANIM_ATTACKER, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end @@ -1900,45 +1900,45 @@ Move_OUTRAGE: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3 createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 6, 5, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, 0, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, 0, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, 0, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, 0, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 0, 1280, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 0, 1280, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 0, -1280, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 0, -1280, 3 delay 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 40, 1 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, 768, 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 40, 1 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, 768, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, 768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, 768, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, -768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, -768, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, -768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, -768, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, 0, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, 0, 3 call Outrage1 call Outrage1 waitforvisualfinish end Outrage1: delay 3 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, 0, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, 0, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 0, 1280, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 0, 1280, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 0, -1280, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 0, -1280, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, 768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, 768, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, 768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, 768, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 1280, -768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, -768, 3 delay 0 - createsprite2 gBattleAnimSpriteTemplate_8596E7C, ANIM_BATTLER_TARGET, 2, 0, 0, 30, -1280, -768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, -768, 3 return Move_SPARK: @@ -1947,40 +1947,40 @@ Move_SPARK: delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 - createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 - createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 156, 24, 121, 13, 0, 1, 1 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 156, 24, 121, 13, 0, 1, 1 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 10 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 - createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 - createsprite2 gBattleAnimSpriteTemplate_859574C, ANIM_BATTLER_ATTACKER, 0, 238, 24, 165, 10, 0, 1, 1 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 238, 24, 165, 10, 0, 1, 1 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 20 createvisualtask sub_8115A04, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0 - createsprite2 gBattleAnimSpriteTemplate_85957F8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0 delay 4 waitforvisualfinish createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 playsewithpan SE_W063, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish createvisualtask sub_8115A04, 2, 4, -31, 2, 0, 6, RGB(31, 31, 22) call ElectricityEffect @@ -1990,28 +1990,28 @@ Move_SPARK: Move_ATTRACT: loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 - createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_BATTLER_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER delay 15 - createsprite2 gUnknown_085939A0, ANIM_BATTLER_TARGET, 3, 20, -8 + createsprite gUnknown_085939A0, ANIM_TARGET, 3, 20, -8 waitforvisualfinish playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 160, -32 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -256, -40 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 128, -16 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 416, -38 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -128, -22 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -384, -31 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 160, -32 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -256, -40 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 128, -16 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 416, -38 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -128, -22 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31 waitforvisualfinish waitplaysewithpan SE_W213B, 0, 15 createvisualtask sub_81062E8, 5 - createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 16, 256, 0 - createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 224, 240, 15 - createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 126, 272, 30 - createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 80, 224, 45 - createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 170, 272, 60 - createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 40, 256, 75 - createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 112, 256, 90 - createsprite2 gUnknown_085939D0, ANIM_BATTLER_ATTACKER, 40, 200, 272, 90 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 80, 224, 45 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 170, 272, 60 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90 delay 0x4B createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end @@ -2025,22 +2025,22 @@ Move_GROWTH: Growth1: createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_BATTLER_ATTACKER, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 return Move_WHIRLWIND: loadspritegfx ANIM_TAG_WHIRLWIND_LINES - createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, -8, 1, 60, 0 - createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 60, 1 - createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1, 60, 2 - createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 16, 1, 60, 3 - createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 24, 1, 60, 4 - createsprite2 gUnknown_085963D4, ANIM_BATTLER_ATTACKER, 2, 0, 32, 1, 60, 0 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, -8, 1, 60, 0 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 0, 1, 60, 1 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 8, 1, 60, 2 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 16, 1, 60, 3 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 24, 1, 60, 4 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 32, 1, 60, 0 delay 5 loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 delay 0x1D - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_TARGET, 12, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5 delay 7 playsewithpan SE_W081, SOUND_PAN_TARGET createvisualtask sub_80D5DB0, 5, 1, 8 @@ -2049,31 +2049,31 @@ Move_WHIRLWIND: Move_CONFUSE_RAY: loadspritegfx ANIM_TAG_YELLOW_BALL - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER fadetobg BG_GHOST waitbgfadein createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_8115C80, 2, 10013, 0, 6, 0, 14, 351 - createsprite2 gUnknown_08596D14, ANIM_BATTLER_TARGET, 2, 28, 0, 288 + createsprite gUnknown_08596D14, ANIM_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite2 gUnknown_08596D2C, ANIM_BATTLER_TARGET, 2, 0, -16 + createsprite gUnknown_08596D2C, ANIM_TARGET, 2, 0, -16 waitforvisualfinish delay 0 blendoff - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadein end Move_LOCK_ON: loadspritegfx ANIM_TAG_LOCK_ON - createsprite2 gUnknown_08592CA0, ANIM_BATTLER_ATTACKER, 40 - createsprite2 gUnknown_08592CB8, ANIM_BATTLER_ATTACKER, 40, 1 - createsprite2 gUnknown_08592CB8, ANIM_BATTLER_ATTACKER, 40, 2 - createsprite2 gUnknown_08592CB8, ANIM_BATTLER_ATTACKER, 40, 3 - createsprite2 gUnknown_08592CB8, ANIM_BATTLER_ATTACKER, 40, 4 + createsprite gUnknown_08592CA0, ANIM_ATTACKER, 40 + createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 1 + createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 2 + createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 3 + createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 4 delay 120 setarg 7, -1 waitforvisualfinish @@ -2081,106 +2081,106 @@ Move_LOCK_ON: Move_MEAN_LOOK: loadspritegfx ANIM_TAG_EYE - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 0x55 - createsprite2 gUnknown_085CE104, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_085CE104, ANIM_ATTACKER, 2 delay 120 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK delay 30 - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER waitforvisualfinish end Move_ROCK_THROW: loadspritegfx ANIM_TAG_ROCKS - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_TARGET, 2, 6, 1, 15, 1 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 0, 1, 0, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_TARGET, 2, 6, 1, 15, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 0, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 19, 1, 10, 0 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 19, 1, 10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -23, 2, -10, 0 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -23, 2, -10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 5, 20, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1 delay 6 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -15, 1, -10, 0 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -15, 1, -10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 23, 2, 10, 0 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 23, 2, 10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish end Move_ROCK_SLIDE: loadspritegfx ANIM_TAG_ROCKS - monbg ANIM_BATTLER_DEF_PARTNER - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 7, 1, 11, 1 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -5, 1, -5, 1 + monbg ANIM_DEF_PARTNER + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 7, 1, 11, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -5, 1, -5, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 5, 0, 6, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 5, 0, 6, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 19, 1, 10, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 19, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -23, 2, -10, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -23, 2, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 5, 50, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_DEF_PARTNER, 0, 5, 50, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1 delay 2 call RockSlide1 call RockSlide1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end RockSlide1: - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -20, 0, -10, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -20, 0, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 28, 1, 10, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 28, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -10, 1, -5, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -10, 1, -5, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 10, 0, 6, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 10, 0, 6, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 24, 1, 10, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 24, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -32, 2, -10, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -32, 2, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, -20, 0, -10, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -20, 0, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08596B04, ANIM_BATTLER_TARGET, 2, 30, 2, 10, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 30, 2, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 return Move_THIEF: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET delay 1 fadetobg BG_DARK waitbgfadein setalpha 12, 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 playsewithpan SE_W233, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1 waitforvisualfinish delay 20 - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff restorebg waitbgfadein @@ -2189,37 +2189,37 @@ Move_THIEF: Move_BUBBLE_BEAM: loadspritegfx ANIM_TAG_BUBBLE loadspritegfx ANIM_TAG_SMALL_BUBBLES - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 delay 1 call Bulbblebeam1 - createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_BATTLER_TARGET + createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_TARGET call Bulbblebeam1 call Bulbblebeam1 waitforvisualfinish call WaterBubbleEffect waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Bulbblebeam1: - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 return @@ -2227,7 +2227,7 @@ Bulbblebeam1: Move_ICY_WIND: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_ICE_SPIKES - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE waitbgfadeout @@ -2242,89 +2242,89 @@ Move_ICY_WIND: delay 0x37 call IcyWindEffect2 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadeout createvisualtask sub_8116620, 10, 11, 4, 4, 0, RGB_BLACK waitbgfadein end IcyWind1: - createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, 0, 0, 0, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, 0, 0, 0, 72, 1 delay 5 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, 10, 0, 10, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, 10, 0, 10, 72, 1 delay 5 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, -10, 0, -10, 72, 1 delay 5 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, 15, 0, 15, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, 15, 0, 15, 72, 1 delay 5 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_TARGET, 40, 0, -5, 0, -5, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, -5, 0, -5, 72, 1 return Move_SMOKESCREEN: loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W104, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085CE050, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 35, -25 + createsprite gUnknown_085CE050, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask sub_815A160, 2 delay 2 playsewithpan SE_W028, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, -12, 104, 0, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, -12, 72, 1, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, -6, 56, 1, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, -6, 88, 0, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 0, 56, 0, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 0, 88, 1, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 6, 72, 0, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 6, 104, 1, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 12, 72, 0, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 12, 56, 1, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 18, 80, 0, 75 - createsprite2 gUnknown_085CE038, ANIM_BATTLER_TARGET, 4, 0, 18, 72, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -12, 104, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -12, 72, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -6, 56, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -6, 88, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 0, 56, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 0, 88, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 6, 72, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 6, 104, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 12, 72, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 12, 56, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 18, 80, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 18, 72, 1, 75 waitforvisualfinish end Move_CONVERSION: loadspritegfx ANIM_TAG_CONVERSION - monbg ANIM_BATTLER_ATK_PARTNER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATK_PARTNER + monbgprio_28 ANIM_ATTACKER setalpha 16, 0 delay 0 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -24, -24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, -24 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -8, -24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, -24 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 8, -24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, -24 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 24, -24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, -24 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -24, -8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, -8 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -8, -8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, -8 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 8, -8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, -8 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 24, -8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, -8 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -24, 8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, 8 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -8, 8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, 8 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 8, 8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, 8 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 24, 8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, 8 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -24, 24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, 24 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, -8, 24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, 24 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 8, 24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, 24 delay 3 - createsprite2 gUnknown_08592E74, ANIM_BATTLER_ATTACKER, 2, 24, 24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, 24 delay 20 playsewithpan SE_W112, SOUND_PAN_ATTACKER createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0 @@ -2332,33 +2332,33 @@ Move_CONVERSION: createvisualtask sub_81022D4, 5 waitforvisualfinish delay 1 - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff end Move_CONVERSION_2: loadspritegfx ANIM_TAG_CONVERSION - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET setalpha 0, 16 delay 0 playsewithpan SE_W112, SOUND_PAN_TARGET - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -24, -24, 60 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -8, -24, 65 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 8, -24, 70 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 24, -24, 75 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -24, -8, 80 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -8, -8, 85 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 8, -8, 90 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 24, -8, 95 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -24, 8, 100 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -8, 8, 105 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 8, 8, 110 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 24, 8, 115 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -24, 24, 120 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, -8, 24, 125 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 8, 24, 130 - createsprite2 gUnknown_08592EA4, ANIM_BATTLER_ATTACKER, 2, 24, 24, 135 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, -24, 60 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, -24, 65 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, -24, 70 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, -24, 75 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, -8, 80 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, -8, 85 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, -8, 90 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, -8, 95 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, 8, 100 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, 8, 105 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, 8, 110 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, 8, 115 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, 24, 120 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, 24, 125 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, 24, 130 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, 24, 135 createvisualtask sub_81023E0, 5 delay 60 playsewithpan SE_W129, SOUND_PAN_TARGET @@ -2377,44 +2377,44 @@ Move_CONVERSION_2: delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_ROLLING_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 6 playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 - createsprite2 gUnknown_08595EE0, ANIM_BATTLER_ATTACKER, 2, -24, 0, 48, 10, 160, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, ANIM_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 8 - clearmonbg ANIM_BATTLER_TARGET + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 8 + clearmonbg ANIM_TARGET blendoff end Move_HEADBUTT: loadspritegfx ANIM_TAG_IMPACT - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 1 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 4, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 2 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish end @@ -2422,17 +2422,17 @@ Move_HEADBUTT: Move_HORN_ATTACK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 1 - createsprite2 gUnknown_08592F44, ANIM_BATTLER_TARGET, 4, 0, 0, 10 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 + createsprite gUnknown_08592F44, ANIM_TARGET, 4, 0, 0, 10 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 4, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 2 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish end @@ -2443,21 +2443,21 @@ Move_FURY_ATTACK: createvisualtask sub_80D6134, 2, 4, 256, 0, 2 choosetwoturnanim FuryAttackRight, FuryAttackLeft FuryAttackContinue: - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish end FuryAttackRight: - createsprite2 gUnknown_08592F44, ANIM_BATTLER_TARGET, 4, 8, 8, 10 + createsprite gUnknown_08592F44, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET goto FuryAttackContinue FuryAttackLeft: - createsprite2 gUnknown_08592F44, ANIM_BATTLER_TARGET, 4, -8, -8, 10 + createsprite gUnknown_08592F44, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET goto FuryAttackContinue @@ -2471,50 +2471,50 @@ Move_HORN_DRILL: HornDrillContinue: waitbgfadein setalpha 12, 8 - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 1 - createsprite2 gUnknown_08592F44, ANIM_BATTLER_TARGET, 4, 0, 0, 12 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 + createsprite gUnknown_08592F44, ANIM_TARGET, 4, 0, 0, 12 waitforvisualfinish playse SE_BAN - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 40, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 40, 1 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 0, 2, 1, 3 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 2, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -4, 3, 1, 3 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -4, 3, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -8, -5, 1, 3 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -8, -5, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 4, -12, 1, 3 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 4, -12, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 16, 0, 1, 3 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 16, 0, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 5, 18, 1, 3 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 5, 18, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -17, 12, 1, 2 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -17, 12, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -21, -15, 1, 2 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -21, -15, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 8, -27, 1, 2 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 8, -27, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 32, 0, 1, 2 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 32, 0, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08592CD8, ANIM_BATTLER_ATTACKER, 2, 2 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 waitforvisualfinish restorebg waitbgfadeout @@ -2533,51 +2533,51 @@ Move_THRASH: loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask sub_8104C38, 2 createvisualtask sub_8104CA4, 2 - createsprite2 gUnknown_08595EB0, ANIM_BATTLER_TARGET, 3, 1, 10, 0 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 + createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 0 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W004, SOUND_PAN_TARGET delay 28 - createsprite2 gUnknown_08595EB0, ANIM_BATTLER_TARGET, 3, 1, 10, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 + createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 28 - createsprite2 gUnknown_08595EB0, ANIM_BATTLER_TARGET, 3, 1, 10, 3 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 8, 0, 16, 1 + createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET end Move_SING: loadspritegfx ANIM_TAG_MUSIC_NOTES - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER createvisualtask sub_8102BE8, 2 waitforvisualfinish panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 7, 0, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 7, 0, 12 delay 5 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 6, 1, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 12 delay 5 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 1, 2, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 2, 12 delay 5 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 3, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 3, 12 delay 5 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 3, 0, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 3, 0, 12 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 12 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 5, 2, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 2, 12 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 6, 3, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 3, 12 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 0, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 0, 12 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 12 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 1, 2, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 2, 12 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 5, 3, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 3, 12 delay 4 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER createvisualtask sub_8102CA0, 2 waitforvisualfinish end @@ -2585,14 +2585,14 @@ Move_SING: Move_LOW_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 - createsprite2 gUnknown_08595EE0, ANIM_BATTLER_TARGET, 2, -24, 28, 40, 8, 160, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0 delay 4 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -8, 8, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, 1, 2 createvisualtask sub_80D6134, 2, 6, 384, 1, 2 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end Move_EARTHQUAKE: @@ -2600,9 +2600,9 @@ Move_EARTHQUAKE: createvisualtask sub_81152DC, 5, 4, 10, 50 playsewithpan SE_W089, 0 delay 10 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 end Move_FISSURE: @@ -2613,11 +2613,11 @@ Move_FISSURE: delay 8 call Fissure1 delay 15 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 15 call Fissure2 delay 15 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 15 call Fissure1 delay 50 @@ -2633,18 +2633,18 @@ Move_FISSURE: end Fissure1: - createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 0, 12, -48, -16, 24 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 0, 16, -16, -10, 24 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 1, 14, -52, -18, 24 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 1, 12, -32, -16, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 0, 12, -48, -16, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 0, 16, -16, -10, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 1, 14, -52, -18, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 1, 12, -32, -16, 24 playsewithpan SE_W091, SOUND_PAN_TARGET return Fissure2: - createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 0, 12, -24, -16, 24 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 0, 16, -38, -10, 24 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 1, 14, -20, -18, 24 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_TARGET, 2, 1, 1, 12, -36, -16, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 0, 12, -24, -16, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 0, 16, -38, -10, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 1, 14, -20, -18, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 1, 12, -36, -16, 24 playsewithpan SE_W091, SOUND_PAN_TARGET return @@ -2655,9 +2655,9 @@ DigEnd: DigSetUp: loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_DIRT_MOUND - createsprite2 gUnknown_08597214, ANIM_BATTLER_ATTACKER, 1, 0, 0, 180 - createsprite2 gUnknown_08597214, ANIM_BATTLER_ATTACKER, 1, 0, 1, 180 - monbg_22 ANIM_BATTLER_ATTACKER + createsprite gUnknown_08597214, ANIM_ATTACKER, 1, 0, 0, 180 + createsprite gUnknown_08597214, ANIM_ATTACKER, 1, 0, 1, 180 + monbg_22 ANIM_ATTACKER delay 1 createvisualtask sub_8114CBC, 2, 0 delay 6 @@ -2667,7 +2667,7 @@ DigSetUp: call DigSetUp1 call DigSetUp1 waitforvisualfinish - clearmonbg_23 ANIM_BATTLER_ATTACKER + clearmonbg_23 ANIM_ATTACKER delay 1 createvisualtask sub_8114CBC, 2, 1 goto DigEnd @@ -2676,22 +2676,22 @@ DigUnleash: loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_8114F14, 2, 0 waitforvisualfinish - monbg ANIM_BATTLER_ATTACKER - createsprite2 gUnknown_08597214, ANIM_BATTLER_ATTACKER, 1, 0, 0, 48 - createsprite2 gUnknown_08597214, ANIM_BATTLER_ATTACKER, 1, 0, 1, 48 + monbg ANIM_ATTACKER + createsprite gUnknown_08597214, ANIM_ATTACKER, 1, 0, 0, 48 + createsprite gUnknown_08597214, ANIM_ATTACKER, 1, 0, 1, 48 delay 1 createvisualtask sub_8114F14, 2, 1 delay 16 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 playsewithpan SE_W025B, SOUND_PAN_ATTACKER - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER goto DigEnd DigSetUp1: - createsprite2 gUnknown_085971FC, ANIM_BATTLER_ATTACKER, 2, 0, 0, 12, 4, -16, 18 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_ATTACKER, 2, 0, 0, 16, 4, -10, 18 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_ATTACKER, 2, 0, 1, 14, 4, -18, 18 - createsprite2 gUnknown_085971FC, ANIM_BATTLER_ATTACKER, 2, 0, 1, 12, 4, -16, 18 + createsprite gUnknown_085971FC, ANIM_ATTACKER, 2, 0, 0, 12, 4, -16, 18 + createsprite gUnknown_085971FC, ANIM_ATTACKER, 2, 0, 0, 16, 4, -10, 18 + createsprite gUnknown_085971FC, ANIM_ATTACKER, 2, 0, 1, 14, 4, -18, 18 + createsprite gUnknown_085971FC, ANIM_ATTACKER, 2, 0, 1, 12, 4, -16, 18 playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 return @@ -2707,9 +2707,9 @@ Move_MEDITATE: end Move_AGILITY: - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 4, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4 createvisualtask sub_81169C0, 2, 0, 4, 7, 10 playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 @@ -2722,24 +2722,24 @@ Move_AGILITY: playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff delay 1 end Move_QUICK_ATTACK: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 createvisualtask sub_81169C0, 2, 0, 4, 7, 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 4 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff waitforvisualfinish end @@ -2747,22 +2747,22 @@ Move_QUICK_ATTACK: Move_RAGE: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BATTLER_ATTACKER, RGB_RED, 10, 0, 2 - createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, -20, -28 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, -20, -28 playsewithpan SE_W207B, SOUND_PAN_ATTACKER delay 20 - createsprite2 gUnknown_0859368C, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_80D6388, 2, 1, 1, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET end Move_TELEPORT: @@ -2777,7 +2777,7 @@ Move_TELEPORT: Move_DOUBLE_TEAM: createvisualtask sub_81029B4, 2 setalpha 12, 8 - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 32 playsewithpan SE_W104, SOUND_PAN_ATTACKER @@ -2796,7 +2796,7 @@ Move_DOUBLE_TEAM: delay 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff delay 1 end @@ -2812,10 +2812,10 @@ Move_MINIMIZE: Move_METRONOME: loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE - createsprite2 gUnknown_08593114, ANIM_BATTLER_ATTACKER, 11, 0, 100 + createsprite gUnknown_08593114, ANIM_ATTACKER, 11, 0, 100 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 - createsprite2 gUnknown_085931BC, ANIM_BATTLER_ATTACKER, 12, 0 + createsprite gUnknown_085931BC, ANIM_ATTACKER, 12, 0 delay 24 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish @@ -2831,12 +2831,12 @@ SkullBashSetUp: waitforvisualfinish goto SkullBashEnd SkullBashSetUp1: - createsprite2 gUnknown_0857FE88, ANIM_BATTLER_ATTACKER, 2, 0, -24, 0, 0, 10, 0 + createsprite gUnknown_0857FE88, ANIM_ATTACKER, 2, 0, -24, 0, 0, 10, 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D6134, 2, 16, 96, 0, 2 waitforvisualfinish - createsprite2 gUnknown_0857FE88, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 10, 1 + createsprite gUnknown_0857FE88, ANIM_ATTACKER, 2, 0, 24, 0, 0, 10, 1 waitforvisualfinish return SkullBashAttack: @@ -2845,10 +2845,10 @@ SkullBashAttack: playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish playse SE_BAN - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 40, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 40, 1 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_085973E8, ANIM_TARGET, 4, 0, 0, 1, 0 loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish createvisualtask sub_8101C94, 2, 1 @@ -2858,7 +2858,7 @@ Move_AMNESIA: loadspritegfx ANIM_TAG_AMNESIA call SetPsychicBackground delay 8 - createsprite2 gUnknown_08596744, ANIM_BATTLER_ATTACKER, 20 + createsprite gUnknown_08596744, ANIM_ATTACKER, 20 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 54 loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 @@ -2871,9 +2871,9 @@ Move_KINESIS: loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground - createsprite2 gUnknown_085966DC, ANIM_BATTLER_ATTACKER, 20 - createsprite2 gUnknown_08593344, ANIM_BATTLER_ATTACKER, 19, 32, -8, 0 - createsprite2 gUnknown_08593344, ANIM_BATTLER_ATTACKER, 19, 32, 16, 1 + createsprite gUnknown_085966DC, ANIM_ATTACKER, 20 + createsprite gUnknown_08593344, ANIM_ATTACKER, 19, 32, -8, 0 + createsprite gUnknown_08593344, ANIM_ATTACKER, 19, 32, 16, 1 loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 delay 60 playsewithpan SE_W146, SOUND_PAN_ATTACKER @@ -2893,8 +2893,8 @@ Move_GLARE: waitforvisualfinish createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, -16, -8 - createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, 16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 createvisualtask sub_81064F8, 5 playsewithpan SE_W043, SOUND_PAN_ATTACKER delay 2 @@ -2908,9 +2908,9 @@ Move_BARRAGE: createvisualtask sub_815E47C, 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 24 - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 8, 1, 40, 1 - createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 0, 4, 20, 1 - createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_DEF_PARTNER, 0, 4, 20, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1 loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2 end @@ -2919,7 +2919,7 @@ Move_SKY_ATTACK: SkyAttackEnd: end SkyAttackSetUp: - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 11 createvisualtask AnimTask_IsTargetPartner, 5, ARG_RET_ID jumpretfalse SkyAttackSetUpAgainstOpponent @@ -2937,7 +2937,7 @@ SkyAttackSetUpAgainstOpponent: waitforvisualfinish createvisualtask sub_8116620, 10, 25, 1, 8, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff goto SkyAttackEnd SkyAttackSetUpAgainstPartner: @@ -2954,29 +2954,29 @@ SkyAttackSetUpAgainstPartner: waitforvisualfinish createvisualtask sub_8116664, 10, 4, 1, 8, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff goto SkyAttackEnd SkyAttackUnleash: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BIRD call SetFlyingBg - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE delay 4 createvisualtask sub_81136E8, 5, 0 waitforvisualfinish createvisualtask sub_8159244, 5, 238, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596514, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_08596514, ANIM_TARGET, 2 delay 14 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 10, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 20 createvisualtask sub_81137E4, 5, 1 delay 2 createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER call UnsetFlyingBg goto SkyAttackEnd @@ -2994,49 +2994,49 @@ Move_SPLASH: end Move_ACID_ARMOR: - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 15, 0 createvisualtask sub_815D240, 2, 0 playsewithpan SE_W151, SOUND_PAN_ATTACKER waitforvisualfinish blendoff - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER delay 1 end Move_SHARPEN: loadspritegfx ANIM_TAG_SPHERE_TO_CUBE - createsprite2 gUnknown_08592DE4, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08592DE4, ANIM_ATTACKER, 2 waitforvisualfinish end Move_SUPER_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 1, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 3, 0, 48, 1 - createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATTACKER, RGB(31, 6, 1), 12, 4, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1 waitforvisualfinish delay 20 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - createsprite2 gUnknown_08592F74, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_08592F74, ANIM_TARGET, 2 playsewithpan SE_W044, SOUND_PAN_TARGET delay 8 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 7, 12, 1 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1 waitforvisualfinish blendoff end Move_SLASH: loadspritegfx ANIM_TAG_SLASH - createsprite2 gUnknown_08592D2C, ANIM_BATTLER_TARGET, 2, 1, -8, 0 + createsprite gUnknown_08592D2C, ANIM_TARGET, 2, 1, -8, 0 playsewithpan SE_W013, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08592D2C, ANIM_BATTLER_TARGET, 2, 1, 8, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 + createsprite gUnknown_08592D2C, ANIM_TARGET, 2, 1, 8, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish end @@ -3044,28 +3044,28 @@ Move_SLASH: Move_STRUGGLE: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MOVEMENT_WAVES - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 3, 0, 12, 4 - createsprite2 gUnknown_08593B80, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 - createsprite2 gUnknown_08593B80, ANIM_BATTLER_ATTACKER, 2, 0, 1, 2 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 + createsprite gUnknown_08593B80, ANIM_ATTACKER, 2, 0, 0, 2 + createsprite gUnknown_08593B80, ANIM_ATTACKER, 2, 0, 1, 2 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_SKETCH: loadspritegfx ANIM_TAG_PENCIL - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET createvisualtask sub_8104E74, 2 - createsprite2 gUnknown_085936D4, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_085936D4, ANIM_TARGET, 2 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET createvisualtask sub_8104938, 2, 0, 2 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 end @@ -3074,18 +3074,18 @@ Move_NIGHTMARE: fadetobg BG_GHOST waitbgfadein jumpifcontest NightmareInContest - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER createvisualtask sub_8111C50, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 40, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1 playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadein end NightmareInContest: - createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATTACKER, RGB_WHITE, 10, 2, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 3, 0, 32, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1 playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg @@ -3094,16 +3094,16 @@ NightmareInContest: Move_FLAIL: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 createvisualtask sub_815C770, 2, 0 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 3 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3 createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end @@ -3111,20 +3111,20 @@ Move_SPITE: fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER createvisualtask sub_8115A04, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask sub_8111E50, 2 loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg waitbgfadein - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET end Move_MACH_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue MachPunchAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -3137,12 +3137,12 @@ MachPunchContinue: createvisualtask sub_80A8BC4, 2, 28968, 10 playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff restorebg waitbgfadeout @@ -3155,21 +3155,21 @@ MachPunchAgainstPlayer: Move_FORESIGHT: loadspritegfx ANIM_TAG_MAGNIFYING_GLASS - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 16, 0 - createsprite2 gUnknown_085CE8C4, ANIM_BATTLER_TARGET, 2, 1 + createsprite gUnknown_085CE8C4, ANIM_TARGET, 2, 1 delay 17 loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 delay 48 delay 24 playsewithpan SE_W166, SOUND_PAN_TARGET delay 10 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_TARGET, RGB_WHITE, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1 playsewithpan SE_W197, SOUND_PAN_TARGET waitforvisualfinish blendoff - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Move_DESTINY_BOND: @@ -3180,7 +3180,7 @@ Move_DESTINY_BOND: createvisualtask sub_81123C4, 5, 0, 48 playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 48 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 24, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 createvisualtask sub_8116664, 2, 6, 1, 0, 12, RGB(29, 29, 29) delay 24 createvisualtask sub_8116664, 2, 6, 1, 12, 0, RGB(29, 29, 29) @@ -3198,7 +3198,7 @@ Move_ENDURE: call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 call EndureEffect delay 8 call EndureEffect @@ -3206,27 +3206,27 @@ Move_ENDURE: end EndureEffect: - createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 26, 2 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -24, 26, 2 delay 4 - createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, 14, 28, 1 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, 14, 28, 1 delay 4 - createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, -5, 10, 2 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -5, 10, 2 delay 4 - createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, 28, 26, 3 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, 28, 26, 3 delay 4 - createsprite2 gUnknown_08592D8C, ANIM_BATTLER_ATTACKER, 2, 0, -12, 0, 1 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -12, 0, 1 return Move_CHARM: loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_815C478, 5, 0, 2, 0 - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 0, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, -20, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 20, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish end @@ -3235,43 +3235,43 @@ Move_ROLLOUT: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_ROCKS - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask sub_8110F74, 2 waitforvisualfinish createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 1, 2 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_FALSE_SWIPE: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT - createsprite2 gUnknown_08592D44, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_08592D44, ANIM_TARGET, 2 playsewithpan SE_W233, SOUND_PAN_TARGET delay 16 - createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 0 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 0 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 16 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 16 delay 2 - createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 32 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 32 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 48 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 48 delay 2 - createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 64 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 64 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite2 gUnknown_08592D5C, ANIM_BATTLER_TARGET, 2, 80 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET end @@ -3281,14 +3281,14 @@ Move_SWAGGER: createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gUnknown_08593658, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08593658, ANIM_ATTACKER, 2 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 - createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, -20, -28 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET delay 12 - createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, 20, -28 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish end @@ -3297,8 +3297,8 @@ Move_MILK_DRINK: loadspritegfx ANIM_TAG_MILK_BOTTLE loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_BATTLER_TARGET - createsprite2 gUnknown_08592B3C, ANIM_BATTLER_ATTACKER, 2 + monbg ANIM_TARGET + createsprite gUnknown_08592B3C, ANIM_ATTACKER, 2 delay 40 playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 12 @@ -3306,10 +3306,10 @@ Move_MILK_DRINK: delay 20 playsewithpan SE_W152, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 1, 0 playsewithpan SE_W208, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET call HealingEffect2 waitforvisualfinish end @@ -3331,20 +3331,20 @@ MagnitudeIntense: createvisualtask sub_81152DC, 5, 4, 0, 50 loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 delay 10 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 goto MagnitudeEnd Move_RAPID_SPIN: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_RAPID_SPIN - monbg ANIM_BATTLER_ATTACKER - createsprite2 gUnknown_085CE288, ANIM_BATTLER_ATTACKER, 2, 0, 0, 32, -32, 40, -2 + monbg ANIM_ATTACKER + createsprite gUnknown_085CE288, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_815ADB0, 2, 0, 2, 0 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish @@ -3352,7 +3352,7 @@ Move_RAPID_SPIN: createvisualtask sub_815ADB0, 2, 0, 2, 1 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER end Move_MOONLIGHT: @@ -3360,21 +3360,21 @@ Move_MOONLIGHT: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK waitforvisualfinish - createsprite2 gUnknown_08592EBC, ANIM_BATTLER_ATTACKER, 2, 120, 56 + createsprite gUnknown_08592EBC, ANIM_ATTACKER, 2, 120, 56 createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 delay 30 - createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, -12, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, -12, 0 delay 30 - createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, -24, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, -24, 0 delay 30 - createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, 21, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 21, 0 delay 30 - createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, 0, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 0, 0 delay 30 - createsprite2 gBattleAnimSpriteTemplate_8592EEC, ANIM_BATTLER_ATTACKER, 40, 10, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 10, 0 delay 20 createvisualtask sub_81025C0, 2 waitforvisualfinish @@ -3397,19 +3397,19 @@ ExtremeSpeedContinue: waitforvisualfinish delay 1 createvisualtask sub_8117F60, 2 - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 delay 18 createvisualtask sub_8105810, 2 delay 2 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_85973B8, ANIM_BATTLER_TARGET, 2, 1, 0, -12, 3 + createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, -12, 3 delay 10 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_85973B8, ANIM_BATTLER_TARGET, 2, 1, 0, 12, 3 + createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, 12, 3 delay 10 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_85973B8, ANIM_BATTLER_TARGET, 2, 1, 0, 0, 3 + createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish createvisualtask sub_8105AAC, 2 delay 10 @@ -3420,7 +3420,7 @@ ExtremeSpeedContinue: waitbgfadeout setarg 7, -1 waitbgfadein - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff delay 1 setarg 7, 0x1000 @@ -3433,26 +3433,26 @@ ExtremeSpeedAgainstPlayer: Move_UPROAR: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER createvisualtask sub_8106D90, 2, 0 - createsprite2 gBattleAnimSpriteTemplate_8593898, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, 29, -12, 0 - createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, -12, -29, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 29, -12, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask sub_8106D90, 2, 0 - createsprite2 gBattleAnimSpriteTemplate_8593898, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, 12, -29, 1 - createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, -29, -12, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 12, -29, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask sub_8106D90, 2, 0 - createsprite2 gBattleAnimSpriteTemplate_8593898, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, 24, -24, 1 - createsprite2 gBattleAnimSpriteTemplate_8593BB8, ANIM_BATTLER_ATTACKER, 2, 0, -24, -24, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 24, -24, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Move_HEAT_WAVE: @@ -3464,19 +3464,19 @@ Move_HEAT_WAVE: delay 4 createvisualtask sub_8109DBC, 5 delay 12 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 10, 2304, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 10, 2304, 96, 1 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 90, 2048, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 90, 2048, 96, 1 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 50, 2560, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 50, 2560, 96, 1 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 20, 2304, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 20, 2304, 96, 1 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 70, 1984, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 70, 1984, 96, 1 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 0, 2816, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 0, 2816, 96, 1 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 60, 2560, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 60, 2560, 96, 1 end Move_HAIL: @@ -3495,11 +3495,11 @@ Move_TORMENT: loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask sub_815AFF0, 2 waitforvisualfinish - createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_TARGET, RGB_RED, 10, 1, 1 - createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, -20, -28 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET delay 20 - createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, 20, -28 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET end @@ -3517,11 +3517,11 @@ Move_MEMENTO: delay 12 setalpha 0, 16 delay 1 - monbg_22 ANIM_BATTLER_TARGET + monbg_22 ANIM_TARGET createvisualtask sub_8113E78, 5 playsewithpan SE_W060, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg_23 ANIM_BATTLER_TARGET + clearmonbg_23 ANIM_TARGET delay 1 blendoff delay 1 @@ -3537,21 +3537,21 @@ Move_FACADE: Move_SMELLING_SALT: loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT - createsprite2 gUnknown_085CE864, ANIM_BATTLER_TARGET, 2, 1, 0, 2 - createsprite2 gUnknown_085CE864, ANIM_BATTLER_TARGET, 2, 1, 1, 2 + createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 0, 2 + createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 1, 2 delay 32 createvisualtask sub_815E840, 3, 1, 2 loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish delay 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 6, 2 - createsprite2 gUnknown_085CE894, ANIM_BATTLER_TARGET, 2, 1, 8, 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 + createsprite gUnknown_085CE894, ANIM_TARGET, 2, 1, 8, 3 loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: loadspritegfx ANIM_TAG_FINGER - createsprite2 gUnknown_085931D4, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite gUnknown_085931D4, ANIM_ATTACKER, 2, 0 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 18 playsewithpan SE_W213, SOUND_PAN_ATTACKER @@ -3563,9 +3563,9 @@ Move_CHARGE: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_810AAFC, 2, 0, 60, 2, 12 playsewithpan SE_W268, SOUND_PAN_ATTACKER @@ -3573,7 +3573,7 @@ Move_CHARGE: playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 30 playsewithpan SE_W268, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0859595C, ANIM_BATTLER_ATTACKER, 2, 0 + createsprite gUnknown_0859595C, ANIM_ATTACKER, 2, 0 delay 25 playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 20 @@ -3584,13 +3584,13 @@ Move_CHARGE: delay 6 loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish - createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 0, 16, 16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 - createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 0, -16, -16 playsewithpan SE_W085B, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK - clearmonbg ANIM_BATTLER_ATTACKER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK + clearmonbg ANIM_ATTACKER blendoff end @@ -3598,53 +3598,53 @@ Move_TAUNT: loadspritegfx ANIM_TAG_FINGER_2 loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER - createsprite2 gUnknown_08593114, ANIM_BATTLER_ATTACKER, 11, 0, 45 + createsprite gUnknown_08593114, ANIM_ATTACKER, 11, 0, 45 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 - createsprite2 gUnknown_0859324C, ANIM_BATTLER_ATTACKER, 12, 0 + createsprite gUnknown_0859324C, ANIM_ATTACKER, 12, 0 delay 4 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 - createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, -20, -28 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish delay 12 - createsprite2 gUnknown_0859368C, ANIM_BATTLER_TARGET, 2, 1, 20, -28 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_HELPING_HAND: loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_815EC48, 5 - createsprite2 gUnknown_085CE8AC, ANIM_BATTLER_ATTACKER, 40, 0 - createsprite2 gUnknown_085CE8AC, ANIM_BATTLER_ATTACKER, 40, 1 + createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 0 + createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 1 delay 19 playsewithpan SE_W227, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 delay 14 playsewithpan SE_W227, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 delay 20 playsewithpan SE_W227, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 3, 0, 10, 1 - createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 end Move_ASSIST: loadspritegfx ANIM_TAG_PAW_PRINT - createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, 112, -16, 140, 128, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 - createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, 208, 128, -16, 48, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 playsewithpan SE_W010, 0 delay 2 - createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, -16, 112, 256, -16, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36 playsewithpan SE_W010, 0 delay 2 - createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, 108, 128, 84, -16, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36 playsewithpan SE_W010, 0 delay 2 - createsprite2 gUnknown_085CE804, ANIM_BATTLER_ATTACKER, 50, -16, 56, 256, 56, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36 playsewithpan SE_W010, 0 end @@ -3652,49 +3652,49 @@ Move_SUPERPOWER: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_METEOR loadspritegfx ANIM_TAG_FLAT_ROCK - monbg ANIM_BATTLER_ATK_PARTNER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATK_PARTNER + monbgprio_28 ANIM_ATTACKER setalpha 12, 8 - createsprite2 gUnknown_08595FEC, ANIM_BATTLER_TARGET, 2, 0 + createsprite gUnknown_08595FEC, ANIM_TARGET, 2, 0 playsewithpan SE_W025, SOUND_PAN_ATTACKER delay 20 - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 4, 1, 180, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 4, 1, 180, 1 createvisualtask sub_8159244, 5, 234, 0 delay 40 - createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 200, 96, 1, 120 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 200, 96, 1, 120 delay 8 - createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 20, 248, 4, 112 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 20, 248, 4, 112 delay 8 - createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 130, 160, 2, 104 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 130, 160, 2, 104 delay 8 - createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 160, 192, 0, 96 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 160, 192, 0, 96 delay 8 - createsprite2 gUnknown_08596004, ANIM_BATTLER_ATTACKER, 41, 60, 288, 3, 88 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 60, 288, 3, 88 delay 74 - createsprite2 gUnknown_0859601C, ANIM_BATTLER_TARGET, 3, 0 + createsprite gUnknown_0859601C, ANIM_TARGET, 3, 0 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 16 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 8, 0, 16, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff delay 1 end Move_RECYCLE: loadspritegfx ANIM_TAG_RECYCLE - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 0, 16 delay 1 - createsprite2 gUnknown_085CE9B0, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_085CE9B0, ANIM_ATTACKER, 2 loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB_WHITE, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish blendoff - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER delay 1 end @@ -3705,61 +3705,61 @@ Move_BRICK_BREAK: loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall BrickBreakNormal: - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 4 delay 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -18, -18, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, 18, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createvisualtask AnimTask_WindUpLunge, 2, ANIM_BATTLER_ATTACKER, -24, 0, 24, 10, 24, 3 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK + createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET end BrickBreakShatteredWall: - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 4 - createsprite2 gUnknown_08595F90, ANIM_BATTLER_ATTACKER, 3, 1, 0, 0, 90, 10 + createsprite gUnknown_08595F90, ANIM_ATTACKER, 3, 1, 0, 0, 90, 10 delay 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -18, -18, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, 18, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createvisualtask AnimTask_WindUpLunge, 2, ANIM_BATTLER_ATTACKER, -24, 0, 24, 10, 24, 3 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK + createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gUnknown_08595FA8, ANIM_BATTLER_ATTACKER, 2, 1, 0, -8, -12 - createsprite2 gUnknown_08595FA8, ANIM_BATTLER_ATTACKER, 2, 1, 1, 8, -12 - createsprite2 gUnknown_08595FA8, ANIM_BATTLER_ATTACKER, 2, 1, 2, -8, 12 - createsprite2 gUnknown_08595FA8, ANIM_BATTLER_ATTACKER, 2, 1, 3, 8, 12 + createsprite gUnknown_08595FA8, ANIM_ATTACKER, 2, 1, 0, -8, -12 + createsprite gUnknown_08595FA8, ANIM_ATTACKER, 2, 1, 1, 8, -12 + createsprite gUnknown_08595FA8, ANIM_ATTACKER, 2, 1, 2, -8, 12 + createsprite gUnknown_08595FA8, ANIM_ATTACKER, 2, 1, 3, 8, 12 playsewithpan SE_W280, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET end Move_YAWN: @@ -3767,12 +3767,12 @@ Move_YAWN: createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gUnknown_085CE68C, ANIM_BATTLER_TARGET, 5, 2 + createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 2 playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 4 - createsprite2 gUnknown_085CE68C, ANIM_BATTLER_TARGET, 5, 1 + createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 1 delay 4 - createsprite2 gUnknown_085CE68C, ANIM_BATTLER_TARGET, 5, 0 + createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 0 waitforvisualfinish createvisualtask sub_815D64C, 2, 1 playsewithpan SE_W281, SOUND_PAN_TARGET @@ -3783,20 +3783,20 @@ Move_ENDEAVOR: loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_815DCA4, 2, 0, 2 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB(31, 21, 0), 12, 1, 2 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 delay 6 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 12, -12, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -12, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET delay 24 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -12, 12, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 12, 1, 2 playsewithpan SE_W004, SOUND_PAN_TARGET end Move_ERUPTION: loadspritegfx ANIM_TAG_WARM_ROCK - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 2, 0, 4, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask sub_8109460, 2 waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 @@ -3805,29 +3805,29 @@ Move_ERUPTION: waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 waitforvisualfinish delay 30 - createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 200, -32, 0, 100, 0 - createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 30, -32, 16, 90, 1 - createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 150, -32, 32, 60, 2 - createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 90, -32, 48, 80, 3 - createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 110, -32, 64, 50, 0 - createsprite2 gUnknown_085955E8, ANIM_BATTLER_ATTACKER, 40, 60, -32, 80, 70, 1 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 200, -32, 0, 100, 0 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 30, -32, 16, 90, 1 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 150, -32, 32, 60, 2 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 90, -32, 48, 80, 3 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 110, -32, 64, 50, 0 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 60, -32, 80, 70, 1 delay 22 createvisualtask sub_81152DC, 5, 5, 8, 60 createvisualtask sub_81152DC, 5, 4, 8, 60 loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12 delay 80 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 40, 31, 4, 4, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, RGB_RED end Move_SKILL_SWAP: loadspritegfx ANIM_TAG_BLUEGREEN_ORB call SetPsychicBackground createvisualtask sub_810FBF0, 3, 1 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_TARGET, RGB_WHITE, 12, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 delay 16 createvisualtask sub_810FBF0, 3, 0 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB_WHITE, 12, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1 waitforvisualfinish call UnsetPsychicBackground end @@ -3836,22 +3836,22 @@ Move_IMPRISON: loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_X_SIGN call SetPsychicBackground - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER createvisualtask sub_810F940, 5 delay 8 loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish delay 4 - createsprite2 gUnknown_085967AC, ANIM_BATTLER_ATTACKER, 5, 0, 40 + createsprite gUnknown_085967AC, ANIM_ATTACKER, 5, 0, 40 createvisualtask sub_81152DC, 5, 4, 1, 10 playsewithpan SE_W063, SOUND_PAN_ATTACKER - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBackground end Move_GRUDGE: loadspritegfx ANIM_TAG_PURPLE_FLAME - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER @@ -3864,12 +3864,12 @@ Move_GRUDGE: waitforvisualfinish restorebg waitbgfadein - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER end Move_CAMOUFLAGE: - monbg ANIM_BATTLER_ATK_PARTNER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATK_PARTNER + monbgprio_28 ANIM_ATTACKER setalpha 16, 0 createvisualtask sub_811675C, 5, 2, 3, 0, 14 delay 16 @@ -3882,21 +3882,21 @@ Move_CAMOUFLAGE: createvisualtask sub_81137E4, 2, 1 waitforvisualfinish blendoff - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER end Move_TAIL_GLOW: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createsprite2 gUnknown_08596AC8, ANIM_BATTLER_ATTACKER, 66, 0 + createsprite gUnknown_08596AC8, ANIM_ATTACKER, 66, 0 delay 18 loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK - clearmonbg ANIM_BATTLER_ATTACKER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK + clearmonbg ANIM_ATTACKER blendoff delay 1 end @@ -3908,38 +3908,38 @@ Move_LUSTER_PURGE: waitbgfadeout createvisualtask sub_815A5C8, 5 waitbgfadein - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 12, 8 playsewithpan SE_W076, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596898, ANIM_BATTLER_ATTACKER, 41, 0, 0, 0, 0 + createsprite gUnknown_08596898, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, RGB_WHITEALPHA waitforvisualfinish createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 2 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116664, 5, 5, 2, 16, 0, RGB_WHITEALPHA createvisualtask sub_81152DC, 5, 1, 5, 14 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER blendoff call UnsetPsychicBackground end @@ -3949,60 +3949,60 @@ Move_MIST_BALL: loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 playsewithpan SE_W081, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595C70, ANIM_BATTLER_TARGET, 0, 0, 0, 0, 0, 30, 0 + createsprite gUnknown_08595C70, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 10, 0 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 delay 0 playsewithpan SE_W114, 0 createvisualtask sub_810C324, 5 createvisualtask sub_8116620, 10, 4, 3, 0, 16, RGB_WHITE delay 8 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 70, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0 delay 70 createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE end Move_FEATHER_DANCE: loadspritegfx ANIM_TAG_WHITE_FEATHER - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, SOUND_PAN_TARGET delay 0 - createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 - createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 32, 2, 104, 11304, 32, 1 - createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 0, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 32, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 0, 2, 104, 11304, 32, 1 delay 6 - createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 224, 2, 104, 11304, 32, 1 - createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 128, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 224, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 128, 2, 104, 11304, 32, 1 delay 6 - createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 192, 2, 104, 11304, 32, 1 - createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 160, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 192, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 160, 2, 104, 11304, 32, 1 delay 6 - createsprite2 gUnknown_08596388, ANIM_BATTLER_TARGET, 0, 0, -16, 96, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 96, 2, 104, 11304, 32, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Move_TEETER_DANCE: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_DUCK createvisualtask sub_8160164, 5 - createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 0, 16, -2 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 0, 0, -2 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 0, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 0, -16, -2 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, -16, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 1, -8, -2 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 1, -8, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite2 gUnknown_08593050, ANIM_BATTLER_ATTACKER, 2, 2, 8, -2 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 2, 8, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER end @@ -4010,46 +4010,46 @@ Move_MUD_SPORT: loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_8104938, 2, 0, 6 delay 24 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, -4, -16 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, 4, -12 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, -4, -16 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, 4, -12 playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, -3, -12 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, 5, -14 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, -3, -12 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, 5, -14 playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, -5, -18 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 0, 3, -14 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, -5, -18 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, 3, -14 playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 16 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 220, 60 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 220, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 60, 100 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 60, 100 waitplaysewithpan SE_W145B, 0, 25 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 140, 55 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 140, 55 waitplaysewithpan SE_W145B, 0, 14 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 180, 50 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 180, 50 waitplaysewithpan SE_W145B, 0, 10 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 20, 90 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 20, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 90, 90 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 90, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 160, 60 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 160, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 30, 90 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 30, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 120, 60 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 120, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite2 gUnknown_085971E4, ANIM_BATTLER_TARGET, 2, 1, 200, 40 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 200, 40 waitplaysewithpan SE_W145B, 0, 10 end @@ -4058,42 +4058,42 @@ Move_NEEDLE_ARM: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 0, -32, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 22, -22, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 22, -22, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 30, 0, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 30, 0, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 20, 20, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 20, 20, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 0, 28, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 0, 28, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, -19, 19, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -19, 19, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, -27, 0, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -27, 0, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, -18, -18, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -18, -18, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 0, -25, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 0, -25, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 17, -17, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 17, -17, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 23, 0, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 23, 0, 16 delay 2 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 0, 16, 16, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 16, 16, 16 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 0, -24, 10 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 17, -17, 10 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 24, 0, 10 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 17, 17, 10 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, 0, 24, 10 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, -17, 17, 10 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, -24, 0, 10 - createsprite2 gUnknown_08592888, ANIM_BATTLER_TARGET, 2, 1, 1, -17, -17, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 0, -24, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 17, -17, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 24, 0, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 17, 17, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 0, 24, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -17, 17, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -24, 0, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -17, -17, 10 end Move_SLACK_OFF: @@ -4109,21 +4109,21 @@ Move_CRUSH_CLAW: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_TORN_METAL - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 18, 1 - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, -10, 0 - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, 10, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, 10, 0 playsewithpan SE_W013, SOUND_PAN_TARGET delay 12 - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, -10, 1 - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, 10, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish blendoff - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET end Move_AROMATHERAPY: @@ -4131,37 +4131,37 @@ Move_AROMATHERAPY: loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 0, 0, 7, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 0, 7, RGB(13, 31, 12) delay 1 - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER delay 1 - createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 0, 24, 16, 0, 2, 2, 0, 0 - createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 66, 64, 24, 0, 3, 1, 1, 0 - createsprite2 gUnknown_085927C4, ANIM_BATTLER_ATTACKER, 0, 16, 24, 0, 2, 1, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 24, 16, 0, 2, 2, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 64, 24, 0, 3, 1, 1, 0 + createsprite gUnknown_085927C4, ANIM_ATTACKER, 0, 16, 24, 0, 2, 1, 0, 0 delay 20 - createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 66, 48, 12, 0, 4, 3, 1, 0 - createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 0, 100, 16, 0, 3, 2, 0, 0 - createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 0, 74, 24, 180, 3, 2, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 48, 12, 0, 4, 3, 1, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 100, 16, 0, 3, 2, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 74, 24, 180, 3, 2, 0, 0 delay 10 - createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 66, 80, 30, 0, 4, 1, 1, 0 - createsprite2 gUnknown_085927AC, ANIM_BATTLER_ATTACKER, 0, 128, 12, 0, 3, 3, 0, 0 - createsprite2 gUnknown_085927C4, ANIM_BATTLER_ATTACKER, 0, 90, 16, 0, 2, 1, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 80, 30, 0, 4, 1, 1, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 128, 12, 0, 3, 3, 0, 0 + createsprite gUnknown_085927C4, ANIM_ATTACKER, 0, 90, 16, 0, 2, 1, 0, 0 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER delay 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 0, 7, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 7, 0, RGB(13, 31, 12) delay 1 playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 2, 1 waitforvisualfinish playsewithpan SE_W234, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592B94, ANIM_BATTLER_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite2 gUnknown_08592B94, ANIM_BATTLER_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 43, 3, 10, 0, RGB(13, 31, 12) - createsprite2 gUnknown_08593868, ANIM_BATTLER_ATTACKER, 16, 0, 0, 0, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, RGB(13, 31, 12) + createsprite gUnknown_08593868, ANIM_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish end @@ -4174,17 +4174,17 @@ Move_FAKE_TEARS: createvisualtask sub_815C478, 5, 0, 2, 1 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 delay 8 - createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 0 - createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 1 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 1 delay 8 - createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 2 - createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 3 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 2 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 3 delay 8 - createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 0 - createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 1 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 1 delay 8 - createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 2 - createsprite2 gUnknown_085970E8, ANIM_BATTLER_ATTACKER, 2, 0, 3 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 2 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 3 waitforvisualfinish end @@ -4193,87 +4193,87 @@ Move_AIR_CUTTER: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT delay 0 - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128 waitforvisualfinish playsewithpan SE_W015, SOUND_PAN_TARGET - createsprite2 gUnknown_08592A34, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0, 2 + createsprite gUnknown_08592A34, ANIM_ATTACKER, 2, 40, -32, 0, 2 delay 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish blendoff - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER delay 0 end Move_ODOR_SLEUTH: - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET createvisualtask sub_815F620, 5 delay 24 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 6 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET delay 1 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 playsewithpan SE_W043, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: loadspritegfx ANIM_TAG_MUSIC_NOTES - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, RGB(18, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish createvisualtask sub_8102BE8, 2 waitforvisualfinish panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 7, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 7, 1, 0 delay 5 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 6, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 0 delay 5 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 1, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 1, 0 delay 5 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 delay 5 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 3, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 3, 1, 0 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 5, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 1, 0 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 6, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 0 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 2, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 1, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 1, 0 delay 4 - createsprite2 gUnknown_08593008, ANIM_BATTLER_TARGET, 2, 5, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 1, 0 delay 4 waitforvisualfinish createvisualtask sub_8102CA0, 2 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, RGB(18, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB(18, 31, 12) waitforvisualfinish end Move_TICKLE: loadspritegfx ANIM_TAG_EYE_SPARKLE - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, -16, -8 - createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, 16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 playsewithpan SE_W197, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish delay 20 - createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_BATTLER_ATTACKER + createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER delay 12 createvisualtask sub_815C478, 3, 1, 6, 2 loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 @@ -4283,7 +4283,7 @@ Move_TICKLE: Move_WATER_SPOUT: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_81080E4, 5 playsewithpan SE_W029, SOUND_PAN_ATTACKER @@ -4293,7 +4293,7 @@ Move_WATER_SPOUT: delay 16 createvisualtask sub_81085C8, 5 playsewithpan SE_W057, SOUND_PAN_TARGET - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -4302,17 +4302,17 @@ Move_SHADOW_PUNCH: loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg BG_GHOST waitbgfadein - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 9, 8 createvisualtask sub_80A8BC4, 2, 0, 13 playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff restorebg waitbgfadein @@ -4320,13 +4320,13 @@ Move_SHADOW_PUNCH: Move_EXTRASENSORY: call SetPsychicBackground - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB(27, 27, 0), 12, 1, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask sub_810FE14, 5, 0 playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, RGB(27, 27, 0), 12, 1, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask sub_810FE14, 5, 1 playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish @@ -4335,37 +4335,37 @@ Move_EXTRASENSORY: playsewithpan SE_W043, SOUND_PAN_ATTACKER waitforvisualfinish blendoff - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBackground end Move_AERIAL_ACE: loadspritegfx ANIM_TAG_CUT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 createvisualtask sub_81169C0, 2, 0, 4, 7, 3 - createsprite2 gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 playsewithpan SE_W013B, SOUND_PAN_ATTACKER delay 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_IRON_DEFENSE: loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 waitforvisualfinish end Move_BLOCK: loadspritegfx ANIM_TAG_X_SIGN - createsprite2 gUnknown_085CE90C, ANIM_BATTLER_TARGET, 66 + createsprite gUnknown_085CE90C, ANIM_TARGET, 66 playsewithpan SE_W207, SOUND_PAN_TARGET end @@ -4384,7 +4384,7 @@ Move_BULK_UP: createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gUnknown_08593658, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08593658, ANIM_ATTACKER, 2 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end @@ -4393,16 +4393,16 @@ Move_COVET: loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_815C478, 5, 0, 2, 0 - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 0, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, -20, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 20, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 end @@ -4410,14 +4410,14 @@ Move_VOLT_TACKLE: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 12, 8 createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish - createsprite2 gUnknown_085959A4, ANIM_BATTLER_ATTACKER, 1 + createsprite gUnknown_085959A4, ANIM_ATTACKER, 1 playsewithpan SE_W268, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER blendoff delay 8 createvisualtask sub_810AFCC, 5, 0 @@ -4435,19 +4435,19 @@ Move_VOLT_TACKLE: createvisualtask sub_810AFCC, 5, 4 playsewithpan SE_W085, SOUND_PAN_ATTACKER delay 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 10, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 1, 16, 16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 1, 16, 16 delay 2 - createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 1, -16, -16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 1, -16, -16 delay 8 createvisualtask sub_810AE5C, 5 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 3, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 0, 16, 16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 - createsprite2 gUnknown_0859598C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 0, -16, -16 waitforvisualfinish createvisualtask sub_8116620, 10, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish @@ -4468,25 +4468,25 @@ Move_WATER_SPORT: Move_CALM_MIND: loadspritegfx ANIM_TAG_THIN_RING - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK waitforvisualfinish createvisualtask sub_81177E4, 5, 1 waitforvisualfinish - createsprite2 gUnknown_08593850, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 + createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 - createsprite2 gUnknown_08593850, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 + createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 - createsprite2 gUnknown_08593850, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 + createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_81177E4, 5, 0 waitforvisualfinish createvisualtask sub_8116664, 5, 0, 0, 16, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER end Move_LEAF_BLADE: @@ -4494,47 +4494,47 @@ Move_LEAF_BLADE: loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask sub_80FFFC0, 5 delay 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET delay 50 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET delay 50 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET waitforvisualfinish - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 delay 12 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 8, 0, 18, 1 - createsprite2 gUnknown_085973D0, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 36 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 + createsprite gUnknown_085973D0, ANIM_TARGET, 2, 0, 0, 1, 36 playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_DRAGON_DANCE: loadspritegfx ANIM_TAG_HOLLOW_ORB - monbg ANIM_BATTLER_ATTACKER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER + monbgprio_28 ANIM_ATTACKER delay 1 createvisualtask sub_81133E8, 5 playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80A7CB4, 5, 10249, 19456, 14, 0, 3 - createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 0 - createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 43 - createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 85 - createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 128 - createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 170 - createsprite2 gUnknown_08596F98, ANIM_BATTLER_ATTACKER, 2, 213 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 43 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 85 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 128 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 170 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 213 delay 30 playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 30 playsewithpan SE_W100, SOUND_PAN_ATTACKER waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER delay 1 end @@ -4543,14 +4543,14 @@ Move_SHOCK_WAVE: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_LIGHTNING - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_810AAFC, 2, 0, 20, 0, 2 playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 12 - createsprite2 gUnknown_08595A18, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08595A18, ANIM_ATTACKER, 2 delay 30 createvisualtask sub_810B29C, 5 delay 12 @@ -4558,13 +4558,13 @@ Move_SHOCK_WAVE: createvisualtask sub_810B55C, 5 playsewithpan SE_W161B, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 6, 18, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1 createvisualtask sub_8116620, 5, 1, 3, 16, 0, RGB_WHITE createvisualtask sub_8116620, 5, 4, 0, 16, 16, RGB_BLACK delay 4 createvisualtask sub_8116620, 5, 4, 0, 0, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER blendoff end @@ -4580,27 +4580,27 @@ Move_BELLY_DRUM: createvisualtask sub_8102BE8, 2 waitforvisualfinish call BellyDrum1 - createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, 0 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 0, 0, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call BellyDrum2 - createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 1, 1, 1, 0 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 1, 1, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call BellyDrum1 - createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 0, 3, 3, 128 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 3, 3, 128 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum2 - createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 128 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 2, 0, 128 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum1 - createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 0, 1, 1, 0 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 1, 1, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum2 - createsprite2 gUnknown_0859309C, ANIM_BATTLER_ATTACKER, 2, 1, 0, 3, 0 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 0, 3, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8102CA0, 2 @@ -4608,132 +4608,132 @@ Move_BELLY_DRUM: end BellyDrum2: - createsprite2 gUnknown_08593068, ANIM_BATTLER_ATTACKER, 3, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 8, 2, 1 + createsprite gUnknown_08593068, ANIM_ATTACKER, 3, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return BellyDrum1: - createsprite2 gUnknown_08593068, ANIM_BATTLER_ATTACKER, 3, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 8, 2, 1 + createsprite gUnknown_08593068, ANIM_ATTACKER, 3, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return Move_MIND_READER: loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER playsewithpan SE_W109, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE07C, ANIM_BATTLER_ATTACKER, 5, 0, 0, 1, 0 - createsprite2 gUnknown_085CE094, ANIM_BATTLER_ATTACKER, 5 + createsprite gUnknown_085CE07C, ANIM_ATTACKER, 5, 0, 0, 1, 0 + createsprite gUnknown_085CE094, ANIM_ATTACKER, 5 delay 40 playsewithpan SE_W043, SOUND_PAN_TARGET createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK call MindReaderEffect waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end MindReaderEffect: - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 70, 0, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 40, 40, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 10, -60, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -50, -40, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -40, 40, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 50, -50, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 70, 0, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 40, 40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 10, -60, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -50, -40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -40, 40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -50, 6 delay 2 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 50, -30, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 60, 10, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 0, 60, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 0, -40, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -60, 20, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -60, -30, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -30, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 60, 10, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 0, 60, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 0, -40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, 20, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, -30, 6 delay 2 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -50, 50, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -60, 20, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, -40, -40, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 20, -60, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 50, -50, 6 - createsprite2 gUnknown_085CE0AC, ANIM_BATTLER_ATTACKER, 4, 35, 40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -50, 50, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, 20, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -40, -40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 20, -60, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -50, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 35, 40, 6 delay 2 return Move_ICE_PUNCH: - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 playsewithpan SE_W081, SOUND_PAN_TARGET - createsprite2 gUnknown_08595AE8, ANIM_BATTLER_ATTACKER, 2, 0 - createsprite2 gUnknown_08595AE8, ANIM_BATTLER_ATTACKER, 2, 64 - createsprite2 gUnknown_08595AE8, ANIM_BATTLER_ATTACKER, 2, 128 - createsprite2 gUnknown_08595AE8, ANIM_BATTLER_ATTACKER, 2, 192 + createsprite gUnknown_08595AE8, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_08595AE8, ANIM_ATTACKER, 2, 64 + createsprite gUnknown_08595AE8, ANIM_ATTACKER, 2, 128 + createsprite gUnknown_08595AE8, ANIM_ATTACKER, 2, 192 delay 5 - createsprite2 gUnknown_08595AD0, ANIM_BATTLER_ATTACKER, 2, 32 - createsprite2 gUnknown_08595AD0, ANIM_BATTLER_ATTACKER, 2, 96 - createsprite2 gUnknown_08595AD0, ANIM_BATTLER_ATTACKER, 2, 160 - createsprite2 gUnknown_08595AD0, ANIM_BATTLER_ATTACKER, 2, 224 + createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 32 + createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 96 + createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 160 + createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 224 delay 17 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, -10, 8, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -10, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, 1, 1 playsewithpan SE_W004, SOUND_PAN_TARGET delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 3, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 waitforvisualfinish delay 15 call FreezeEffect1 delay 5 createvisualtask sub_8116620, 10, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_REST: playsewithpan SE_W173, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z - createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 waitforvisualfinish end Move_CONFUSION: - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER call SetPsychicBackground setalpha 8, 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish playsewithpan SE_W048, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 15, 1 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_TARGET, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff delay 1 call UnsetPsychicBackground end Move_PSYCHIC: - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER call SetPsychicBackground setalpha 8, 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0) waitforvisualfinish loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 15, 1 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BATTLER_TARGET, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff delay 1 call UnsetPsychicBackground @@ -4747,15 +4747,15 @@ FutureSightContinue: call UnsetPsychicBackground end FutureSight: - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE - createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_ATTACKER, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff goto FutureSightContinue @@ -4765,43 +4765,43 @@ Move_THUNDER: waitbgfadeout createvisualtask sub_8117660, 5, -256, 0, 1, -1 waitbgfadein - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W086, SOUND_PAN_TARGET delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 16, -36 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 16, -36 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 16, -20 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 16, -20 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 16, 12 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 16, 12 delay 20 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 6, -16, -32 + createsprite gUnknown_085956C0, ANIM_TARGET, 6, -16, -32 playsewithpan SE_W086, SOUND_PAN_TARGET delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 6, -16, -16 + createsprite gUnknown_085956C0, ANIM_TARGET, 6, -16, -16 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 6, -16, 16 + createsprite gUnknown_085956C0, ANIM_TARGET, 6, -16, 16 playsewithpan SE_W086, SOUND_PAN_TARGET delay 5 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 24, -32 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 24, -32 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 24, -16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 24, -16 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 24, 16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 24, 16 delay 30 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 5 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -32 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -32 playsewithpan SE_W161B, SOUND_PAN_TARGET delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -16 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, 16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, 16 delay 10 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 @@ -4809,7 +4809,7 @@ Move_THUNDER: delay 2 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 2, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_TARGET, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish restorebg waitbgfadeout @@ -4821,32 +4821,32 @@ Move_THUNDER_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_LIGHTNING - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -48 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -48 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_ATTACKER, 2, 0, -16 + createsprite gUnknown_085956C0, ANIM_ATTACKER, 2, 0, -16 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_ATTACKER, 2, 0, 16 + createsprite gUnknown_085956C0, ANIM_ATTACKER, 2, 0, 16 delay 1 playsewithpan SE_W161B, SOUND_PAN_TARGET createvisualtask sub_8115F10, 2, 257, 257, 257 delay 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 15, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 delay 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK delay 20 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end @@ -4854,34 +4854,34 @@ Move_SACRED_FIRE: loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -32, 0, 50, 5, -2, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, -20, -10, 50, 5, -1, -1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, -20, -10, 50, 5, -1, -1 delay 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 0, -16, 50, 5, 0, -1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 0, -16, 50, 5, 0, -1 delay 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 20, -10, 50, 5, 1, -1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 20, -10, 50, 5, 1, -1 delay 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 32, 0, 50, 5, 2, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 32, 0, 50, 5, 2, 0 delay 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 20, 10, 50, 5, 1, 1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 20, 10, 50, 5, 1, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 0, 16, 50, 5, 0, 1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 0, 16, 50, 5, 0, 1 delay 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -20, 10, 50, 5, -1, 1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -20, 10, 50, 5, -1, 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 waitforvisualfinish playsewithpan SE_W221B, SOUND_PAN_TARGET - createsprite2 gUnknown_085953F8, ANIM_BATTLER_TARGET, 2, -16, 0, 70, 16, 0, 1 + createsprite gUnknown_085953F8, ANIM_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 playsewithpan SE_W221B, SOUND_PAN_TARGET - createsprite2 gUnknown_085953F8, ANIM_BATTLER_TARGET, 2, 0, 0, 70, 16, 0, 1 + createsprite gUnknown_085953F8, ANIM_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 playsewithpan SE_W221B, SOUND_PAN_TARGET - createsprite2 gUnknown_085953F8, ANIM_BATTLER_TARGET, 2, 16, 0, 80, 16, 0, 1 + createsprite gUnknown_085953F8, ANIM_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 @@ -4889,83 +4889,83 @@ Move_SACRED_FIRE: createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 playsewithpan SE_W172B, SOUND_PAN_TARGET - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 0 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 0, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, -1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 2, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 2, 1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 1, -1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 1, -2 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -2 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 3, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 3, 1 waitforvisualfinish end Move_SCRATCH: loadspritegfx ANIM_TAG_SCRATCH - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE020, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gUnknown_085CE020, ANIM_ATTACKER, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff waitforvisualfinish end Move_DRAGON_BREATH: loadspritegfx ANIM_TAG_SMALL_EMBER - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createvisualtask sub_8116620, 10, 4, 1, 0, 9, RGB_RED - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 21, 1 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 21, 1 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite2 gUnknown_08596EF4, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 waitforvisualfinish createvisualtask sub_8116620, 10, 4, 1, 9, 0, RGB_RED waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Move_ROAR: loadspritegfx ANIM_TAG_NOISE_LINE - monbg ANIM_BATTLER_ATTACKER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER + monbgprio_28 ANIM_ATTACKER setalpha 8, 8 createvisualtask sub_8158E9C, 2, 0, 2 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 call RoarEffect delay 20 createvisualtask sub_80D5DB0, 5, 1, 2 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER blendoff waitforvisualfinish createvisualtask sub_8159078, 5 @@ -4973,13 +4973,13 @@ Move_ROAR: end RoarEffect: - createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, -8, 0 - createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, 0, 2 - createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, 8, 1 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1 delay 15 - createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, -8, 0 - createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, 0, 2 - createsprite2 gUnknown_085CE7D4, ANIM_BATTLER_ATTACKER, 2, 24, 8, 1 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1 return Move_GROWL: @@ -4987,8 +4987,8 @@ Move_GROWL: createvisualtask sub_8158E9C, 2, 0, 255 call RoarEffect delay 10 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 9, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish createvisualtask sub_8159078, 5 waitforvisualfinish @@ -4996,23 +4996,23 @@ Move_GROWL: Move_SNORE: loadspritegfx ANIM_TAG_SNORE_Z - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 8, 8 call Snore1 delay 30 call Snore1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff end Snore1: playsewithpan SE_W173, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_BATTLER_ATTACKER, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 6, 1, 14, 0, 0 - createsprite2 gUnknown_085936EC, ANIM_BATTLER_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 - createsprite2 gUnknown_085936EC, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 - createsprite2 gUnknown_085936EC, ANIM_BATTLER_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 + createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 + createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 + createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 return Move_LIGHT_SCREEN: @@ -5020,7 +5020,7 @@ Move_LIGHT_SCREEN: loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 - createsprite2 gUnknown_08596560, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10166 + createsprite gUnknown_08596560, ANIM_ATTACKER, 1, 40, 0, 10166 delay 10 call SpecialScreenEffect waitforvisualfinish @@ -5029,24 +5029,24 @@ Move_LIGHT_SCREEN: end SpecialScreenEffect: - createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 23, 0, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 23, 0, 0, 1 delay 6 - createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 31, -8, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 31, -8, 0, 1 delay 5 - createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 30, 20, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 30, 20, 0, 1 delay 7 - createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 10, -15, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 10, -15, 0, 1 delay 6 - createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 20, 10, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 20, 10, 0, 1 delay 6 - createsprite2 gUnknown_08596624, ANIM_BATTLER_ATTACKER, 2, 10, 18, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 10, 18, 0, 1 return Move_MIRROR_COAT: loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 - createsprite2 gUnknown_08596590, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10168 + createsprite gUnknown_08596590, ANIM_ATTACKER, 1, 40, 0, 10168 delay 10 playsewithpan SE_W115, SOUND_PAN_ATTACKER call SpecialScreenEffect @@ -5060,13 +5060,13 @@ Move_REFLECT: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 - createsprite2 gUnknown_08596578, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10167 + createsprite gUnknown_08596578, ANIM_ATTACKER, 1, 40, 0, 10167 delay 20 - createsprite2 gUnknown_085965F4, ANIM_BATTLER_ATTACKER, 2, 30, 0, 0, 1 + createsprite gUnknown_085965F4, ANIM_ATTACKER, 2, 30, 0, 0, 1 delay 7 - createsprite2 gUnknown_085965F4, ANIM_BATTLER_ATTACKER, 2, 19, -12, 0, 1 + createsprite gUnknown_085965F4, ANIM_ATTACKER, 2, 19, -12, 0, 1 delay 7 - createsprite2 gUnknown_085965F4, ANIM_BATTLER_ATTACKER, 2, 10, 20, 0, 1 + createsprite gUnknown_085965F4, ANIM_ATTACKER, 2, 10, 20, 0, 1 waitforvisualfinish delay 1 blendoff @@ -5076,7 +5076,7 @@ Move_BARRIER: loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 - createsprite2 gUnknown_085965A8, ANIM_BATTLER_ATTACKER, 3, 40, 0, 10169 + createsprite gUnknown_085965A8, ANIM_ATTACKER, 3, 40, 0, 10169 waitforvisualfinish delay 1 blendoff @@ -5085,42 +5085,42 @@ Move_BARRIER: Move_BUBBLE: loadspritegfx ANIM_TAG_BUBBLE loadspritegfx ANIM_TAG_SMALL_BUBBLES - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 delay 1 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite2 gBattleAnimSpriteTemplate_8595068, ANIM_BATTLER_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 waitforvisualfinish call WaterBubbleEffect2 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_SMOG: loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 @@ -5135,47 +5135,47 @@ Move_SMOG: loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) delay 10 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Smog1: - createsprite2 gUnknown_08595C44, ANIM_BATTLER_ATTACKER, 2, 0, -24, 48, 240, 1, 0 + createsprite gUnknown_08595C44, ANIM_ATTACKER, 2, 0, -24, 48, 240, 1, 0 delay 7 return Move_FAINT_ATTACK: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER fadetobg BG_DARK waitbgfadein delay 0 playsewithpan SE_W185, SOUND_PAN_ATTACKER - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 createvisualtask sub_81136E8, 2, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER - invisible ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER + invisible ANIM_ATTACKER delay 1 createvisualtask sub_8117F60, 2 setalpha 12, 8 - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 9, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff delay 1 setarg 7, 0x1000 delay 32 createvisualtask sub_8113888, 2 - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER createvisualtask sub_81137E4, 2, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER delay 1 restorebg waitbgfadein @@ -5183,13 +5183,13 @@ Move_FAINT_ATTACK: Move_SAND_ATTACK: loadspritegfx ANIM_TAG_MUD_SAND - monbg ANIM_BATTLER_ATK_PARTNER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATK_PARTNER + monbgprio_28 ANIM_ATTACKER setalpha 12, 8 playsewithpan SE_W028, SOUND_PAN_ATTACKER - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 call SandAttack1 call SandAttack1 call SandAttack1 @@ -5197,24 +5197,24 @@ Move_SAND_ATTACK: call SandAttack1 call SandAttack1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff end SandAttack1: - createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 0, 0 - createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 10, 10 - createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, -10, -10 - createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 20, 5 - createsprite2 gUnknown_085971A8, ANIM_BATTLER_TARGET, 2, 15, 15, 20, -20, -5 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, 0, 0 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, 10, 10 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, -10, -10 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, 20, 5 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, -20, -5 delay 2 return Move_MUD_SLAP: loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_W028, SOUND_PAN_ATTACKER - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 call MudSlap1 call MudSlap1 call MudSlap1 @@ -5224,11 +5224,11 @@ Move_MUD_SLAP: waitforvisualfinish end MudSlap1: - createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 0, 0 - createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 10, 5 - createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, -10, -5 - createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, 20, 10 - createsprite2 gUnknown_085971CC, ANIM_BATTLER_TARGET, 2, 15, 15, 20, -20, -10 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, 0, 0 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, 10, 5 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, -10, -5 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, 20, 10 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, -20, -10 delay 2 return @@ -5236,31 +5236,31 @@ Move_DRAGON_RAGE: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 40, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 waitforvisualfinish - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 15, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, 0, 15, 0, 0, 4 waitforvisualfinish - createsprite2 gUnknown_08596F80, ANIM_BATTLER_TARGET, 2, 30, 15, 0, 10, 10 + createsprite gUnknown_08596F80, ANIM_TARGET, 2, 30, 15, 0, 10, 10 waitforvisualfinish loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 3, 25, 1 - createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, 5, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, 5, 0 delay 1 - createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, -10, -15 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, -10, -15 delay 1 - createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 2, 1, 0, 25 + createsprite gUnknown_08596F28, ANIM_TARGET, 2, 1, 0, 25 delay 1 - createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, 15, 5 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, 15, 5 delay 1 - createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, -25, 0 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, -25, 0 delay 1 - createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 2, 1, 30, 30 + createsprite gUnknown_08596F28, ANIM_TARGET, 2, 1, 30, 30 delay 1 - createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 2, 1, -27, 25 + createsprite gUnknown_08596F28, ANIM_TARGET, 2, 1, -27, 25 delay 1 - createsprite2 gUnknown_08596F28, ANIM_BATTLER_TARGET, 66, 1, 0, 8 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, 0, 8 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_TARGET, 66, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 66, 0, 0, 4 waitforvisualfinish end @@ -5281,16 +5281,16 @@ Move_RAIN_DANCE: Move_BITE: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, 0, -32, 0, 0, 819, 10 - createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, 0, 32, 4, 0, -819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 4, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff delay 1 end @@ -5298,25 +5298,25 @@ Move_BITE: Move_CRUNCH: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, -32, -32, 1, 819, 819, 10 - createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, 32, 32, 5, -819, -819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, -32, -32, 1, 819, 819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 32, 32, 5, -819, -819, 10 delay 10 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 7, 5, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2 waitforvisualfinish playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, 32, -32, 7, -819, 819, 10 - createsprite2 gUnknown_08597080, ANIM_BATTLER_ATTACKER, 2, -32, 32, 3, 819, -819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 32, -32, 7, -819, 819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 8, 4, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff delay 1 restorebg @@ -5326,36 +5326,36 @@ Move_CRUNCH: Move_CLAMP: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite2 gUnknown_08597098, ANIM_BATTLER_ATTACKER, 2, -32, 0, 2, 819, 0, 10 - createsprite2 gUnknown_08597098, ANIM_BATTLER_ATTACKER, 2, 32, 0, 6, -819, 0, 10 + createsprite gUnknown_08597098, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff waitforvisualfinish end Move_ICE_BEAM: - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 loadspritegfx ANIM_TAG_ICE_CRYSTALS - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 - createsprite2 gUnknown_08595B2C, ANIM_BATTLER_ATTACKER, 2, 20, 12, 0, 12, 20 - createsprite2 gUnknown_08595B2C, ANIM_BATTLER_ATTACKER, 2, 20, -12, 0, -12, 20 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20 delay 1 call IceBeam1 call IceBeam1 call IceBeam1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, -31, 0, 7, RGB(0, 20, 31) - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 25, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 4, -31, 0, 7, RGB(0, 20, 31) + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1 call IceBeam1 call IceBeam1 call IceBeam1 @@ -5364,23 +5364,23 @@ Move_ICE_BEAM: call IceBeam1 call IceBeam1 call IceBeam1 - createsprite2 gUnknown_08595B14, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 11 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, 20, 0, 0, 0, 11 delay 1 - createsprite2 gUnknown_08595B14, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 11 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, 20, 0, 0, 0, 11 waitforvisualfinish delay 20 call FreezeEffect1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 5, 7, 0, RGB(0, 20, 31) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 4, 5, 7, 0, RGB(0, 20, 31) waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end IceBeam1: - createsprite2 gUnknown_08595B2C, ANIM_BATTLER_ATTACKER, 2, 20, 12, 0, 12, 20 - createsprite2 gUnknown_08595B2C, ANIM_BATTLER_ATTACKER, 2, 20, -12, 0, -12, 20 - createsprite2 gUnknown_08595B14, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 11 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, 20, 0, 0, 0, 11 delay 1 return @@ -5398,13 +5398,13 @@ Move_AURORA_BEAM: setarg 7, 0 createvisualtask sub_8107528, 10, 130 call AuroraBeam1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 1, 0, 17, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 17, 1 call AuroraBeam1 call AuroraBeam1 call AuroraBeam1 setarg 7, -1 createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1 call AuroraBeam1 call AuroraBeam1 call AuroraBeam1 @@ -5416,13 +5416,13 @@ Move_AURORA_BEAM: waitbgfadein end AuroraBeam1: - createsprite2 gUnknown_085950B4, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 17 + createsprite gUnknown_085950B4, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite2 gUnknown_085950B4, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 17 + createsprite gUnknown_085950B4, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite2 gUnknown_085950B4, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 17 + createsprite gUnknown_085950B4, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite2 gUnknown_085950B4, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 17 + createsprite gUnknown_085950B4, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 return @@ -5433,64 +5433,64 @@ SolarBeamEnd: waitforvisualfinish end SolarBeamSetUp: - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) playsewithpan SE_W025, SOUND_PAN_ATTACKER call SolarBeamSetUp1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff goto SolarBeamEnd SolarBeamSetUp1: - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, 40, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 40, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, -40, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -40, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 0, 40, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, 40, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 0, -40, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, -40, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, -20, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -20, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, 20, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 20, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, -20, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, 20, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 20, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -20, 30, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, 30, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 20, -30, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, -30, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -20, -30, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, -30, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 20, 30, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, 30, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, 0, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 0, 16 delay 2 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, 0, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 0, 16 delay 2 return SolarBeamUnleash: call SetSolarbeamBg panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask sub_80FEA58, 5 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 0 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 1 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0) - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 2 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 65, 1 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 3 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 4 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 5 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 6 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 call SolarBeamUnleash1 call SolarBeamUnleash1 @@ -5499,25 +5499,25 @@ SolarBeamUnleash: call UnsetSolarbeamBg goto SolarBeamEnd SolarBeamUnleash1: - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 0 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 1 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 2 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 3 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 4 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 5 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite2 gUnknown_085921F8, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 6 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 return Move_BLIZZARD: loadspritegfx ANIM_TAG_ICE_CRYSTALS - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue BlizzardAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -5538,29 +5538,29 @@ BlizzardContinue: waitbgfadeout setarg 7, -1 waitbgfadein - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Blizzard1: - createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -10, 0, -10, 72, 1 - createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, 0, 0, 0, 80, 0, 0, 1 delay 3 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -15, 0, -15, 72, 1 - createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, -10, 0, -10, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -15, 0, -15, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, -10, 0, -10, 80, 0, 0, 1 delay 3 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -5, 0, -5, 72, 1 - createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, 10, 0, 10, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -5, 0, -5, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, 10, 0, 10, 80, 0, 0, 1 delay 3 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -10, 0, -10, 72, 1 - createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 72, 1 - createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, 15, 0, 15, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -20, 0, -20, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, 15, 0, 15, 80, 0, 0, 1 delay 3 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -15, 0, -15, 72, 1 - createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -15, 0, -15, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite2 gUnknown_08595B98, ANIM_BATTLER_ATTACKER, 40, 0, -25, 0, -25, 72, 1 - createsprite2 gUnknown_08595BB0, ANIM_BATTLER_ATTACKER, 40, 0, 20, 0, 20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -25, 0, -25, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, 20, 0, 20, 80, 0, 0, 1 delay 3 return BlizzardAgainstPlayer: @@ -5569,8 +5569,8 @@ BlizzardAgainstPlayer: Move_POWDER_SNOW: loadspritegfx ANIM_TAG_ICE_CRYSTALS - monbg ANIM_BATTLER_DEF_PARTNER - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 1, 0, 3, RGB_BLACK + monbg ANIM_DEF_PARTNER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call PowderSnow1 @@ -5580,41 +5580,41 @@ Move_POWDER_SNOW: waitsound call FreezeEffect2 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER delay 20 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 1, 3, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 3, 0, RGB_BLACK end PowderSnow1: - createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, 0, 0, 0, 56, 4, 4, 1 delay 3 - createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, -10, 0, -10, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, -10, 0, -10, 56, 4, 4, 1 delay 3 - createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, 10, 0, 10, 56, -4, 3, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, 10, 0, 10, 56, -4, 3, 1 delay 3 - createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 56, -4, 5, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, -20, 0, -20, 56, -4, 5, 1 delay 3 - createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, 15, 0, 15, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, 15, 0, 15, 56, 4, 4, 1 delay 3 - createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, -20, 0, -20, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, -20, 0, -20, 56, 4, 4, 1 delay 3 - createsprite2 gUnknown_08595BC8, ANIM_BATTLER_ATTACKER, 40, 0, 20, 0, 20, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, 20, 0, 20, 56, 4, 4, 1 delay 3 return Move_HYDRO_PUMP: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 40, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 delay 6 panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask sub_81076C8, 5, 100 call HydroPump1 call HydroPump1 call HydroPump1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 37, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 37, 1 call HydroPump2 call HydroPump1 call HydroPump1 @@ -5632,27 +5632,27 @@ Move_HYDRO_PUMP: delay 1 call HydroPump2 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end HydroPump1: - createsprite2 gUnknown_085950E4, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 - createsprite2 gUnknown_085950E4, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, -16 + createsprite gUnknown_085950E4, ANIM_ATTACKER, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, ANIM_ATTACKER, 3, 10, 10, 0, -16 delay 1 - createsprite2 gUnknown_085950E4, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 - createsprite2 gUnknown_085950E4, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, -16 + createsprite gUnknown_085950E4, ANIM_ATTACKER, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, ANIM_ATTACKER, 3, 10, 10, 0, -16 delay 1 return HydroPump2: - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 4, 0, 15, 1, 1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 4, 0, -15, 1, 1 + createsprite gUnknown_08597388, ANIM_ATTACKER, 4, 0, 15, 1, 1 + createsprite gUnknown_08597388, ANIM_ATTACKER, 4, 0, -15, 1, 1 return Move_SIGNAL_BEAM: loadspritegfx ANIM_TAG_GLOWY_RED_ORB loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB loadspritegfx ANIM_TAG_DUCK - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 25, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 delay 6 panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 createvisualtask sub_81076C8, 5, 100 @@ -5662,8 +5662,8 @@ Move_SIGNAL_BEAM: call SignalBeam1 call SignalBeam1 call SignalBeam1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 25, 1 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 8, 5, RGB_RED, 8, 961, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 25, 1 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 4, 8, 5, RGB_RED, 8, 961, 8 call SignalBeam1 call SignalBeam1 call SignalBeam1 @@ -5684,8 +5684,8 @@ Move_SIGNAL_BEAM: waitforvisualfinish end SignalBeam1: - createsprite2 gUnknown_08595114, ANIM_BATTLER_TARGET, 3, 10, 10, 0, 16 - createsprite2 gUnknown_0859512C, ANIM_BATTLER_TARGET, 3, 10, 10, 0, -16 + createsprite gUnknown_08595114, ANIM_TARGET, 3, 10, 10, 0, 16 + createsprite gUnknown_0859512C, ANIM_TARGET, 3, 10, 10, 0, -16 delay 1 return @@ -5693,15 +5693,15 @@ Move_ABSORB: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish delay 3 call AbsorbEffect @@ -5709,36 +5709,36 @@ Move_ABSORB: delay 15 call HealingEffect waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end AbsorbEffect: playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5746,15 +5746,15 @@ Move_MEGA_DRAIN: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 8, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish delay 3 call MegaDrainEffect @@ -5762,44 +5762,44 @@ Move_MEGA_DRAIN: delay 15 call HealingEffect waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 8, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 8, 0, RGB(13, 31, 12) waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end MegaDrainEffect: playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5807,15 +5807,15 @@ Move_GIGA_DRAIN: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 12, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish delay 3 call GigaDrainEffect @@ -5823,52 +5823,52 @@ Move_GIGA_DRAIN: delay 15 call HealingEffect waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 12, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 12, 0, RGB(13, 31, 12) waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end GigaDrainEffect: playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -40, 35 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 28, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 40, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -32, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -40, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 36, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5878,27 +5878,27 @@ Move_LEECH_LIFE: delay 1 loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET setalpha 12, 8 delay 1 - createsprite2 gUnknown_085969C8, ANIM_BATTLER_ATTACKER, 2, -20, 15, 12 + createsprite gUnknown_085969C8, ANIM_ATTACKER, 2, -20, 15, 12 waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 playsewithpan SE_W071, SOUND_PAN_TARGET delay 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish call AbsorbEffect waitforvisualfinish delay 15 call HealingEffect waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 7, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -5926,16 +5926,16 @@ Move_TOXIC: waitforvisualfinish end Toxic1: - createsprite2 gUnknown_08596134, ANIM_BATTLER_TARGET, 2, -24, 16, 1, 1 + createsprite gUnknown_08596134, ANIM_TARGET, 2, -24, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite2 gUnknown_08596134, ANIM_BATTLER_TARGET, 2, 8, 16, 1, 1 + createsprite gUnknown_08596134, ANIM_TARGET, 2, 8, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite2 gUnknown_08596134, ANIM_BATTLER_TARGET, 2, -8, 16, 1, 1 + createsprite gUnknown_08596134, ANIM_TARGET, 2, -8, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite2 gUnknown_08596134, ANIM_BATTLER_TARGET, 2, 24, 16, 1, 1 + createsprite gUnknown_08596134, ANIM_TARGET, 2, 24, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 return @@ -5943,9 +5943,9 @@ Toxic1: Move_SLUDGE: loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085961A8, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 0 + createsprite gUnknown_085961A8, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 5, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) call PoisonBubblesEffect waitforvisualfinish @@ -5963,24 +5963,24 @@ Move_SLUDGE_BOMB: call SludgeBomb1 call SludgeBomb1 call SludgeBomb1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 3, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1 createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 42, 27, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -27, 44, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 39, -28, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -42, -42, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 42, 27, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -27, 44, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 39, -28, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -42, -42, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 0, 40, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -8, -44, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -46, -28, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 46, 9, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 0, 40, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -8, -44, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -46, -28, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 46, 9, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 42, 0, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -43, -12, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, 16, -46, 20 - createsprite2 gUnknown_085961D8, ANIM_BATTLER_TARGET, 2, -16, 44, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 42, 0, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -43, -12, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 16, -46, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -16, 44, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 0 waitsound @@ -5990,118 +5990,118 @@ Move_SLUDGE_BOMB: end SludgeBomb1: playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085961A8, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 0 + createsprite gUnknown_085961A8, ANIM_TARGET, 2, 20, 0, 40, 0 delay 3 return Move_ACID: loadspritegfx ANIM_TAG_POISON_BUBBLE - monbg ANIM_BATTLER_DEF_PARTNER - createsprite2 gUnknown_085961C0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, 0, 0 + monbg ANIM_DEF_PARTNER + createsprite gUnknown_085961C0, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite2 gUnknown_085961C0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, 24, 0 + createsprite gUnknown_085961C0, ANIM_TARGET, 2, 20, 0, 40, 1, 24, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite2 gUnknown_085961C0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, -24, 0 + createsprite gUnknown_085961C0, ANIM_TARGET, 2, 20, 0, 40, 1, -24, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 15 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 2, 0, 10, 1 - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_DEF_PARTNER, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1 createvisualtask sub_8115A04, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31) - createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, 0, -22, 0, 15, 55 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, 0, -22, 0, 15, 55 playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, -26, -24, 0, 15, 55 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, -26, -24, 0, 15, 55 playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, 15, -27, 0, 15, 50 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, 15, -27, 0, 15, 50 playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, -15, -17, 0, 10, 45 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, -15, -17, 0, 10, 45 playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_0859620C, ANIM_BATTLER_TARGET, 2, 27, -22, 0, 15, 50 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, 27, -22, 0, 15, 50 playsewithpan SE_W145, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Move_BONEMERANG: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08597178, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08597178, ANIM_ATTACKER, 2 delay 20 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 5, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1 delay 17 playsewithpan SE_W233, SOUND_PAN_ATTACKER - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, -4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, -4 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_BONE_CLUB: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET - createsprite2 gUnknown_08597190, ANIM_BATTLER_ATTACKER, 2, -42, -25, 0, 0, 15 + createsprite gUnknown_08597190, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 5, 1 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_BONE_RUSH: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET - createsprite2 gUnknown_08597190, ANIM_BATTLER_ATTACKER, 2, -42, -25, 0, 0, 15 + createsprite gUnknown_08597190, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 3, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_SPIKES: loadspritegfx ANIM_TAG_SPIKES - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER playsewithpan SE_W026, SOUND_PAN_ATTACKER waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 - createsprite2 gUnknown_085CE11C, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 24, 30 + createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, 0, 24, 30 delay 10 playsewithpan SE_W026, SOUND_PAN_ATTACKER waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 - createsprite2 gUnknown_085CE11C, ANIM_BATTLER_TARGET, 2, 20, 0, -24, 24, 30 + createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, -24, 24, 30 delay 10 waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 - createsprite2 gUnknown_085CE11C, ANIM_BATTLER_TARGET, 2, 20, 0, 24, 24, 30 + createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Move_MEGAHORN: loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER playsewithpan SE_W082, SOUND_PAN_ATTACKER jumpifcontest MegahornInContest fadetobg BG_DRILL @@ -6110,25 +6110,25 @@ Move_MEGAHORN: MegahornContinue: waitbgfadein setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 2, 0, 15, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish delay 10 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 6 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6 delay 3 - createsprite2 gUnknown_08596974, ANIM_BATTLER_ATTACKER, 3, -42, 25, 0, 0, 6 + createsprite gUnknown_08596974, ANIM_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -16, 4, 1, 4 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, -4, 1, 12, 1 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 delay 10 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 delay 3 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadeout @@ -6144,42 +6144,42 @@ MegahornInContest: Move_GUST: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W016, SOUND_PAN_TARGET - createsprite2 gUnknown_08596270, ANIM_BATTLER_ATTACKER, 2, 0, -16 + createsprite gUnknown_08596270, ANIM_ATTACKER, 2, 0, -16 createvisualtask sub_810DED8, 5, 1, 70 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 1, 0, 7, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_WING_ATTACK: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 5, 1, 70 - createsprite2 gBattleAnimSpriteTemplate_85962A4, ANIM_BATTLER_ATTACKER, 2, -25, 0, 0, 0, 20 - createsprite2 gBattleAnimSpriteTemplate_85962A4, ANIM_BATTLER_ATTACKER, 2, 25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, ANIM_ATTACKER, 2, 25, 0, 0, 0, 20 delay 24 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 9 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 9 delay 17 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 0, 1, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 1, 1 loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -6187,109 +6187,109 @@ Move_PECK: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W030, SOUND_PAN_TARGET createvisualtask sub_80D622C, 2, 3, -768, 1, 2 - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -12, 0, 1, 3 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -12, 0, 1, 3 waitforvisualfinish end Move_AEROBLAST: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER call SetFlyingBg - monbgprio_28 ANIM_BATTLER_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 call Aeroblast1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 5, 0, 50, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 50, 1 call Aeroblast1 call Aeroblast1 call Aeroblast1 call Aeroblast1 waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff delay 0 call UnsetFlyingBg end Aeroblast1: playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 return Move_WATER_GUN: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 - createsprite2 gUnknown_08595208, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 40, -25 + createsprite gUnknown_08595208, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 1, 0, 8, 1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 2 - createsprite2 gUnknown_08595220, ANIM_BATTLER_ATTACKER, 2, 0, -15, 0, 15, 55 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1 + createsprite gUnknown_08597388, ANIM_ATTACKER, 4, 0, 0, 1, 2 + createsprite gUnknown_08595220, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55 playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_08595220, ANIM_BATTLER_ATTACKER, 2, 15, -20, 0, 15, 50 + createsprite gUnknown_08595220, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50 playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_08595220, ANIM_BATTLER_ATTACKER, 2, -15, -10, 0, 10, 45 + createsprite gUnknown_08595220, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45 playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_CRABHAMMER: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createsprite2 gUnknown_08597388, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_ATTACKER, 4, 0, 0, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -24, 0, 0, 4 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 8 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4 waitforvisualfinish loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 4, 8, 1 - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 10, 10, 20, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 10, 10, 20, 1 delay 4 - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 20, -20, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 20, -20, 20, 1 delay 4 - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -15, 15, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -15, 15, 20, 1 delay 4 - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 0, 0, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 0, 0, 20, 1 delay 4 - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -10, -20, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -10, -20, 20, 1 delay 4 - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 16, -8, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 16, -8, 20, 1 delay 4 - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, 5, 8, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 5, 8, 20, 1 delay 4 - createsprite2 gUnknown_08595238, ANIM_BATTLER_ATTACKER, 2, -16, 0, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -16, 0, 20, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -6302,17 +6302,17 @@ Move_SURF: Move_FLAMETHROWER: loadspritegfx ANIM_TAG_SMALL_EMBER - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 46, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask sub_81076C8, 5, 100 panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call Flamethrower1 call Flamethrower1 call Flamethrower1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 43, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1 call Flamethrower1 call Flamethrower1 call Flamethrower1 @@ -6322,14 +6322,14 @@ Move_FLAMETHROWER: call Flamethrower1 call Flamethrower1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Flamethrower1: - createsprite2 gUnknown_08595158, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 + createsprite gUnknown_08595158, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 - createsprite2 gUnknown_08595158, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 + createsprite gUnknown_08595158, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 return @@ -6338,51 +6338,51 @@ Move_SANDSTORM: playsewithpan SE_W201, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 10, 2304, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 10, 2304, 96, 0 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 90, 2048, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 90, 2048, 96, 0 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 50, 2560, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 50, 2560, 96, 0 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 20, 2304, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 20, 2304, 96, 0 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 70, 1984, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 70, 1984, 96, 0 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 0, 2816, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 0, 2816, 96, 0 delay 10 - createsprite2 gBattleAnimSpriteTemplate_8596BA0, ANIM_BATTLER_ATTACKER, 40, 60, 2560, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 60, 2560, 96, 0 end Move_WHIRLPOOL: loadspritegfx ANIM_TAG_WATER_ORB - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 delay 0 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 50, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1 call WhirlpoolEffect call WhirlpoolEffect call WhirlpoolEffect delay 12 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 7, 0, RGB(0, 13, 23) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end WhirlpoolEffect: - createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 28, 384, 50, 8, 50, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 28, 384, 50, 8, 50, 1 delay 2 - createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 32, 240, 40, 11, -46, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 32, 240, 40, 11, -46, 1 delay 2 - createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 33, 416, 40, 4, 42, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 33, 416, 40, 4, 42, 1 delay 2 - createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 31, 288, 45, 6, -42, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 31, 288, 45, 6, -42, 1 delay 2 - createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 28, 448, 45, 11, 46, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 28, 448, 45, 11, 46, 1 delay 2 - createsprite2 gUnknown_08596B70, ANIM_BATTLER_TARGET, 2, 0, 33, 464, 50, 10, -50, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 33, 464, 50, 10, -50, 1 delay 2 return @@ -6396,20 +6396,20 @@ FlyEnd: FlySetUp: playsewithpan SE_W019, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596340, ANIM_BATTLER_ATTACKER, 2, 0, 0, 13, 336 + createsprite gUnknown_08596340, ANIM_ATTACKER, 2, 0, 0, 13, 336 goto FlyEnd FlyUnleash: - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596358, ANIM_BATTLER_ATTACKER, 2, 20 + createsprite gUnknown_08596358, ANIM_ATTACKER, 2, 20 delay 20 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff goto FlyEnd @@ -6422,119 +6422,119 @@ BounceEnd: BounceSetUp: playsewithpan SE_W100, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596420, ANIM_BATTLER_ATTACKER, 2, 0, 0 + createsprite gUnknown_08596420, ANIM_ATTACKER, 2, 0, 0 goto BounceEnd BounceUnleash: - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_0859644C, ANIM_BATTLER_TARGET, 3 + createsprite gUnknown_0859644C, ANIM_TARGET, 3 delay 7 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 5, 11, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff goto BounceEnd Move_KARATE_CHOP: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET - createsprite2 gUnknown_08595E68, ANIM_BATTLER_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 + createsprite gUnknown_08595E68, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_CROSS_CHOP: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_CROSS_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite2 gUnknown_08595EC8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 - createsprite2 gUnknown_08595EC8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1 + createsprite gUnknown_08595EC8, ANIM_ATTACKER, 2, 0, 0, 0 + createsprite gUnknown_08595EC8, ANIM_ATTACKER, 2, 0, 0, 1 delay 40 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 - createsprite2 gUnknown_085973D0, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 20 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 7, 0, 9, 1 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 + createsprite gUnknown_085973D0, ANIM_ATTACKER, 3, 0, 0, 1, 20 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_JUMP_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 3 - createsprite2 gUnknown_08595E80, ANIM_BATTLER_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 + createsprite gUnknown_08595E80, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 5, 0, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_HI_JUMP_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -24, 0, 0, 8 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 0, 8 waitforvisualfinish delay 10 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 3 delay 2 - createsprite2 gUnknown_08595E80, ANIM_BATTLER_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 + createsprite gUnknown_08595E80, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -28, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 11, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 waitforvisualfinish delay 5 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createsprite2 gUnknown_08595EB0, ANIM_BATTLER_ATTACKER, 3, 1, 20, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createsprite gUnknown_08595EB0, ANIM_ATTACKER, 3, 1, 20, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_TRIPLE_KICK: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET jumpifmoveturn 0, TripleKickLeft @@ -6542,26 +6542,26 @@ Move_TRIPLE_KICK: goto TripleKickCenter TripleKickContinue: waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end TripleKickLeft: - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, -16, -8, 20, 1, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -16, -16, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, -16, -8, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -16, -16, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 goto TripleKickContinue TripleKickRight: - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 8, 8, 20, 1, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 8, 8, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 goto TripleKickContinue TripleKickCenter: - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 20, 1, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, -8, 1, 1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 goto TripleKickContinue Move_DYNAMIC_PUNCH: @@ -6570,86 +6570,86 @@ Move_DYNAMIC_PUNCH: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_UNUSED_EXPLOSION delay 1 - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 20, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 5, 0, 7, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 delay 1 waitsound playsewithpan SE_W120, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 5, ANIM_BATTLER_TARGET, 5, 0, 28, 1 - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_COUNTER: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W233, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -15, 18, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -15, 18, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 25, 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -15, 18, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -4, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -4, 8, 1, 0 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 15, 9, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 15, 9, 8, 1, 0 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_VITAL_THROW: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233, SOUND_PAN_ATTACKER - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 4, 1, 2 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2 waitforvisualfinish - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 3 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 delay 11 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 10 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -6657,32 +6657,32 @@ Move_ROCK_SMASH: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish playsewithpan SE_W088, SOUND_PAN_TARGET - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 20, 24, 14, 2 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 5, 0, -20, 24, 14, 1 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 5, 20, -24, 14, 2 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, -5, 0, -20, -24, 14, 2 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, -5, 30, 18, 8, 2 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 30, -18, 8, 2 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 0, -30, 18, 8, 2 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_ATTACKER, 2, 0, 0, -30, -18, 8, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 7, 1 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 0, 20, 24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 5, 0, -20, 24, 14, 1 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 5, 20, -24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, -5, 0, -20, -24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, -5, 30, 18, 8, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 0, 30, -18, 8, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 0, -30, 18, 8, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 0, -30, -18, 8, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 7, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_SUBMISSION: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 @@ -6700,22 +6700,22 @@ Move_SUBMISSION: call Submission1 call Submission1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Submission1: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -12, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -12, 1, 1 delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -12, 8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, 8, 1, 1 delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 12, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, 0, 1, 1 delay 8 return Move_SUNNY_DAY: loadspritegfx ANIM_TAG_SUNLIGHT - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 13, 3 createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish @@ -6727,39 +6727,39 @@ Move_SUNNY_DAY: waitforvisualfinish createvisualtask sub_8116620, 10, 0x781, 1, 6, 0, RGB_WHITE waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff end SunnyDay1: - createsprite2 gUnknown_085954A0, ANIM_BATTLER_ATTACKER, 40 + createsprite gUnknown_085954A0, ANIM_ATTACKER, 40 delay 6 return Move_COTTON_SPORE: loadspritegfx ANIM_TAG_SPORE - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 call CottonSpore1 call CottonSpore1 call CottonSpore1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end CottonSpore1: - createsprite2 gUnknown_085922EC, ANIM_BATTLER_ATTACKER, 2, 0, -20, 85, 80, 0 + createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 delay 12 - createsprite2 gUnknown_085922EC, ANIM_BATTLER_ATTACKER, 2, 0, -10, 170, 80, 0 + createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 delay 12 - createsprite2 gUnknown_085922EC, ANIM_BATTLER_ATTACKER, 2, 0, -15, 0, 80, 0 + createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 delay 12 return Move_SPORE: loadspritegfx ANIM_TAG_SPORE - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80FEE1C, 2 loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 @@ -6768,54 +6768,54 @@ Move_SPORE: call Spore1 waitforvisualfinish delay 1 - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Spore1: - createsprite2 gUnknown_085922EC, ANIM_BATTLER_TARGET, 2, 0, -20, 85, 80, 1 + createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -20, 85, 80, 1 delay 12 - createsprite2 gUnknown_085922EC, ANIM_BATTLER_TARGET, 2, 0, -10, 170, 80, 1 + createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -10, 170, 80, 1 delay 12 - createsprite2 gUnknown_085922EC, ANIM_BATTLER_TARGET, 2, 0, -15, 0, 80, 1 + createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -15, 0, 80, 1 delay 12 return Move_PETAL_DANCE: loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W080, SOUND_PAN_ATTACKER - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 6, 6, 3 - createsprite2 gUnknown_0859231C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 8, 140 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 16, -24, 8, 100 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -16, -24, 8, 100 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 + createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 8, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 8, 100 delay 15 - createsprite2 gUnknown_0859231C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 8, 140 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 32, -24, 8, 100 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -32, -24, 8, 100 + createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 32, -24, 8, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -32, -24, 8, 100 delay 15 - createsprite2 gUnknown_0859231C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 8, 140 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 24, -24, 8, 100 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -24, -24, 8, 100 + createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 24, -24, 8, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -24, -24, 8, 100 delay 30 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 16, -24, 0, 100 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -16, -24, 0, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 0, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 0, 100 delay 30 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, 20, -16, 14, 80 - createsprite2 gUnknown_08592334, ANIM_BATTLER_ATTACKER, 2, -20, -14, 16, 80 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 20, -16, 14, 80 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -20, -14, 16, 80 waitforvisualfinish - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 8 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -6823,39 +6823,39 @@ Move_RAZOR_LEAF: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -2, 10 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -1, -1, 15 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -4, -4, 7 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 3, -3, 11 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -1, -6, 8 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 2, -1, 12 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -4, 13 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 4, -5, 7 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 2, -6, 11 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -5, 8 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085923D8, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 - createsprite2 gUnknown_085923D8, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 + createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 + createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 playsewithpan SE_W013, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -6863,33 +6863,33 @@ Move_NATURE_POWER: Move_ANCIENT_POWER: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, 4, 1, 10, 1 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 20, 32, -48, 50, 2 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 0, 32, -38, 25, 5 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 32, 32, -28, 40, 3 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, -20, 32, -48, 50, 2 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 20, 32, -28, 60, 1 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 0, 32, -28, 30, 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 30, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 4, 1, 10, 1 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 20, 32, -48, 50, 2 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 0, 32, -38, 25, 5 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 32, 32, -28, 40, 3 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, -20, 32, -48, 50, 2 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 20, 32, -28, 60, 1 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 0, 32, -28, 30, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER delay 10 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 15, 32, -48, 25, 5 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, -10, 32, -42, 30, 4 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 15, 32, -48, 25, 5 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, -10, 32, -42, 30, 4 delay 10 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, 0, 32, -42, 25, 5 - createsprite2 gUnknown_08596C10, ANIM_BATTLER_ATTACKER, 2, -25, 32, -48, 30, 4 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 0, 32, -42, 25, 5 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, -25, 32, -48, 30, 4 waitforvisualfinish - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 16, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -6897,22 +6897,22 @@ Move_OCTAZOOKA: loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W025B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592DFC, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 20, 0 + createsprite gUnknown_08592DFC, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gUnknown_08592E30, ANIM_BATTLER_TARGET, 2, 8, 8, 1, 0 + createsprite gUnknown_08592E30, ANIM_TARGET, 2, 8, 8, 1, 0 delay 2 - createsprite2 gUnknown_08592E30, ANIM_BATTLER_TARGET, 2, -8, -8, 1, 0 + createsprite gUnknown_08592E30, ANIM_TARGET, 2, -8, -8, 1, 0 delay 2 - createsprite2 gUnknown_08592E30, ANIM_BATTLER_TARGET, 2, 8, -8, 1, 0 + createsprite gUnknown_08592E30, ANIM_TARGET, 2, 8, -8, 1, 0 delay 2 - createsprite2 gUnknown_08592E30, ANIM_BATTLER_TARGET, 2, -8, 8, 1, 0 + createsprite gUnknown_08592E30, ANIM_TARGET, 2, -8, 8, 1, 0 waitforvisualfinish end Move_MIST: loadspritegfx ANIM_TAG_MIST_CLOUD - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 call Mist1 @@ -6925,12 +6925,12 @@ Move_MIST: delay 32 createvisualtask sub_8115A04, 2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff end Mist1: - createsprite2 gUnknown_08595C2C, ANIM_BATTLER_ATTACKER, 2, 0, -24, 48, 240, 0, 1 + createsprite gUnknown_08595C2C, ANIM_ATTACKER, 2, 0, -24, 48, 240, 0, 1 delay 7 return @@ -6948,52 +6948,52 @@ Move_FIRE_PUNCH: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED - createsprite2 gUnknown_08595368, ANIM_BATTLER_TARGET, 1, 0 - createsprite2 gUnknown_08595368, ANIM_BATTLER_TARGET, 1, 64 - createsprite2 gUnknown_08595368, ANIM_BATTLER_TARGET, 1, 128 - createsprite2 gUnknown_08595368, ANIM_BATTLER_TARGET, 1, 196 + createsprite gUnknown_08595368, ANIM_TARGET, 1, 0 + createsprite gUnknown_08595368, ANIM_TARGET, 1, 64 + createsprite gUnknown_08595368, ANIM_TARGET, 1, 128 + createsprite gUnknown_08595368, ANIM_TARGET, 1, 196 playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 8, 1, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 15, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 call FireMoveEffect delay 4 playsewithpan SE_W007, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116620, 10, 4, 0, 9, 0, RGB_RED waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end FireMoveEffect: - createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, 192, 176, 40 - createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, -192, 240, 40 - createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, 192, -160, 40 - createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, -192, -112, 40 - createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, 160, 48, 40 - createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, -224, -32, 40 - createsprite2 gUnknown_08595380, ANIM_BATTLER_TARGET, 1, 0, 10, 112, -128, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, 192, 176, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, -192, 240, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, 192, -160, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, -192, -112, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, 160, 48, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, -224, -32, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, 112, -128, 40 return Move_LEER: loadspritegfx ANIM_TAG_LEER - monbg ANIM_BATTLER_ATTACKER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER + monbgprio_28 ANIM_ATTACKER setalpha 8, 8 playsewithpan SE_W043, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085CE150, ANIM_BATTLER_ATTACKER, 2, 24, -12 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 + createsprite gUnknown_085CE150, ANIM_ATTACKER, 2, 24, -12 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 waitforvisualfinish delay 10 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 9, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER blendoff delay 1 waitforvisualfinish @@ -7002,67 +7002,67 @@ Move_LEER: Move_DREAM_EATER: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W107, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 15, 1 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BATTLER_TARGET, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 2, 25, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 2, 25, 1 call DreamEaterEffect waitforvisualfinish delay 15 call HealingEffect waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff delay 1 call UnsetPsychicBackground end DreamEaterEffect: playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -40, 35 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 28, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 40, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -32, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -40, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -5, 15, 36, 33 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 - createsprite2 gUnknown_08592270, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -7070,38 +7070,38 @@ Move_POISON_GAS: loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 delay 0 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595C9C, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6 createvisualtask sub_8115A04, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER delay 0 end Move_BIND: - createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_BATTLER_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_ATTACKER goto BindWrap BindWrap: @@ -7111,12 +7111,12 @@ BindWrap: waitforvisualfinish end BindWrap1: - createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_BATTLER_TARGET, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_TARGET, 0 delay 16 return Move_WRAP: - createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 6, 4, 2, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 6, 4, 2, 4 goto BindWrap Move_PSYBEAM: @@ -7126,7 +7126,7 @@ Move_PSYBEAM: createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 call Psybeam1 call Psybeam1 - createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_BATTLER_TARGET + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31) call Psybeam1 call Psybeam1 @@ -7142,7 +7142,7 @@ Move_PSYBEAM: call UnsetPsychicBackground end Psybeam1: - createsprite2 gUnknown_0859663C, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 13, 0 + createsprite gUnknown_0859663C, ANIM_TARGET, 2, 16, 0, 0, 0, 13, 0 delay 4 return @@ -7159,8 +7159,8 @@ Move_HYPNOSIS: end Hypnosis1: playsewithpan SE_W048, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0859663C, ANIM_BATTLER_TARGET, 2, 0, 8, 0, 8, 27, 0 - createsprite2 gUnknown_0859663C, ANIM_BATTLER_TARGET, 2, 16, -8, 0, -8, 27, 0 + createsprite gUnknown_0859663C, ANIM_TARGET, 2, 0, 8, 0, 8, 27, 0 + createsprite gUnknown_0859663C, ANIM_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 return @@ -7182,9 +7182,9 @@ Move_PSYWAVE: call UnsetPsychicBackground end Psywave1: - createsprite2 gUnknown_08595170, ANIM_BATTLER_TARGET, 3, 10, 10, 0, 16 + createsprite gUnknown_08595170, ANIM_TARGET, 3, 10, 10, 0, 16 delay 4 - createsprite2 gUnknown_08595170, ANIM_BATTLER_TARGET, 3, 10, 10, 0, 16 + createsprite gUnknown_08595170, ANIM_TARGET, 3, 10, 10, 0, 16 delay 4 return @@ -7192,17 +7192,17 @@ Move_ZAP_CANNON: loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595764, ANIM_BATTLER_TARGET, 3, 10, 0, 0, 0, 30, 0 - createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 - createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 - createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 128, 40, 0 - createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 192, 40, 2 - createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 8, 30, 32, 40, 0 - createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 8, 30, 96, 40, 1 - createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 8, 30, 160, 40, 0 - createsprite2 gUnknown_08595790, ANIM_BATTLER_TARGET, 4, 10, 0, 8, 30, 224, 40, 2 + createsprite gUnknown_08595764, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 128, 40, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 192, 40, 2 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 32, 40, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 96, 40, 1 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 160, 40, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 224, 40, 2 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 delay 15 waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 call ElectricityEffect @@ -7215,24 +7215,24 @@ Move_STEEL_WING: loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 5, 1, 70 - createsprite2 gBattleAnimSpriteTemplate_85962A4, ANIM_BATTLER_ATTACKER, 2, -25, 0, 0, 0, 20 - createsprite2 gBattleAnimSpriteTemplate_85962A4, ANIM_BATTLER_ATTACKER, 2, 25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, ANIM_ATTACKER, 2, 25, 0, 0, 0, 20 delay 24 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 9 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 9 delay 17 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 0, 1, 1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 1, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -7241,16 +7241,16 @@ Move_IRON_TAIL: loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff waitforvisualfinish end @@ -7261,16 +7261,16 @@ Move_POISON_TAIL: loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff call PoisonBubblesEffect waitforvisualfinish @@ -7281,25 +7281,25 @@ Move_METAL_CLAW: loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, -10, 0 - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, 10, 0 - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 delay 8 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, -10, 1 - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, 10, 1 - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 waitforvisualfinish end Move_NIGHT_SHADE: - monbg ANIM_BATTLER_ATTACKER - monbgprio_28 ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER + monbgprio_28 ANIM_ATTACKER playsewithpan SE_W060, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein @@ -7307,10 +7307,10 @@ Move_NIGHT_SHADE: playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_811188C, 5, 85 delay 70 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 createvisualtask sub_8115A04, 2, 4, 0, 2, 0, 13, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER delay 1 restorebg waitbgfadein @@ -7320,22 +7320,22 @@ Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593488, ANIM_BATTLER_TARGET, 2, 10, 0, 0, 0, 25, -32 + createsprite gUnknown_08593488, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 16, 1 - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, 6, 5, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 6, 5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, -16, -15, 1, 0 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -16, -15, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, 16, -5, 1, 0 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 16, -5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, -12, 18, 1, 0 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -12, 18, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 4, 0, 5, 1, 0 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 0, 5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 waitforvisualfinish @@ -7347,10 +7347,10 @@ Move_SHADOW_BALL: waitbgfadein delay 15 createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5 - createsprite2 gUnknown_08596D58, ANIM_BATTLER_TARGET, 2, 16, 16, 8 + createsprite gUnknown_08596D58, ANIM_TARGET, 2, 16, 16, 8 waitforvisualfinish playsewithpan SE_W028, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg waitbgfadein @@ -7360,8 +7360,8 @@ Move_LICK: loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_W122, SOUND_PAN_TARGET - createsprite2 gUnknown_08596D8C, ANIM_BATTLER_TARGET, 2, 0, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 16, 1 + createsprite gUnknown_08596D8C, ANIM_TARGET, 2, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 waitforvisualfinish end @@ -7371,7 +7371,7 @@ Move_FOCUS_ENERGY: call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_WHITE - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 call EndureEffect delay 8 call EndureEffect @@ -7384,46 +7384,46 @@ Move_BIDE: BideSetUp: loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish end BideUnleash: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_8116620, 10, 2, 2, 0, 11, RGB_RED - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 4 waitforvisualfinish - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 12, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 16, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 18, -8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 18, -8, 1, 1 delay 5 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, -18, 8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -18, 8, 1, 1 delay 5 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, -8, -5, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 waitforvisualfinish createvisualtask sub_8116620, 10, 2, 2, 11, 0, RGB_RED waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end Move_STRING_SHOT: loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER delay 0 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 call StringShot1 @@ -7446,31 +7446,31 @@ Move_STRING_SHOT: call StringShot1 waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite2 gUnknown_085969F8, ANIM_BATTLER_TARGET, 2, 0, 10 + createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, 10 delay 4 - createsprite2 gUnknown_085969F8, ANIM_BATTLER_TARGET, 2, 0, -2 + createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, -2 delay 4 - createsprite2 gUnknown_085969F8, ANIM_BATTLER_TARGET, 2, 0, 22 + createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, 22 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER delay 1 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end StringShot1: - createsprite2 gUnknown_085969E0, ANIM_BATTLER_TARGET, 2, 20, 0, 512, 20, 1 + createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 1 delay 1 return Move_SPIDER_WEB: loadspritegfx ANIM_TAG_SPIDER_WEB loadspritegfx ANIM_TAG_WEB_THREAD - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER delay 0 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - monbgprio_28 ANIM_BATTLER_TARGET + monbgprio_28 ANIM_TARGET loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 call SpiderWeb1 call SpiderWeb1 @@ -7488,15 +7488,15 @@ Move_SPIDER_WEB: call SpiderWeb1 waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite2 gUnknown_08596A2C, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER delay 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end SpiderWeb1: - createsprite2 gUnknown_085969E0, ANIM_BATTLER_TARGET, 2, 20, 0, 512, 20, 0 + createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 0 delay 1 return @@ -7509,9 +7509,9 @@ RazorWindContinue: RazorWindSetUp: loadspritegfx ANIM_TAG_GUST playsewithpan SE_W016, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593550, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 - createsprite2 gUnknown_08593550, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 - createsprite2 gUnknown_08593550, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 + createsprite gUnknown_08593550, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 + createsprite gUnknown_08593550, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 + createsprite gUnknown_08593550, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish playsewithpan SE_W016B, SOUND_PAN_ATTACKER goto RazorWindContinue @@ -7519,45 +7519,45 @@ RazorWindSetUp: RazorWindUnleash: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085962D4, ANIM_BATTLER_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 playsewithpan SE_W013, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 10, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff goto RazorWindContinue Move_DISABLE: loadspritegfx ANIM_TAG_SPARKLE_4 - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 8, 8 playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0853EE84, ANIM_BATTLER_ATTACKER, 13, 24, -16 + createsprite gUnknown_0853EE84, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask sub_81045B0, 5 loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_RECOVER: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) @@ -7565,7 +7565,7 @@ Move_RECOVER: call Recover1 call Recover1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff delay 1 call HealingEffect @@ -7573,52 +7573,52 @@ Move_RECOVER: end Recover1: - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 40, -10, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -10, 13 delay 3 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -35, -10, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -35, -10, 13 delay 3 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 15, -40, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 15, -40, 13 delay 3 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -10, -32, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -10, -32, 13 delay 3 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 25, -20, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 25, -20, 13 delay 3 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, -40, -20, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 13 delay 3 - createsprite2 gUnknown_085921E0, ANIM_BATTLER_ATTACKER, 2, 5, -40, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 5, -40, 13 delay 3 return Move_MIMIC: loadspritegfx ANIM_TAG_ORBS setalpha 11, 5 - monbg_22 ANIM_BATTLER_DEF_PARTNER + monbg_22 ANIM_DEF_PARTNER monbgprio_29 panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createvisualtask sub_80FF458, 5, 128, 24 delay 15 - createsprite2 gUnknown_085924DC, ANIM_BATTLER_TARGET, 2, -12, 24 + createsprite gUnknown_085924DC, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, -1 waitforvisualfinish playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish - clearmonbg_23 ANIM_BATTLER_DEF_PARTNER + clearmonbg_23 ANIM_DEF_PARTNER blendoff end Move_CONSTRICT: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 - createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 4, 0, 16, 0, 2 + createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 - createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 3, 0, 0, 0, 2 - createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 2, 0, 8, 1, 2 + createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, 0, 0, 2 + createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 2 delay 7 - createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 3, 0, -8, 1, 2 + createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, -8, 1, 2 delay 8 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 delay 20 playsewithpan SE_W020, SOUND_PAN_TARGET setarg 7, -1 @@ -7630,11 +7630,11 @@ Move_CURSE: CurseGhost: loadspritegfx ANIM_TAG_NAIL loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER createvisualtask sub_8112758, 5 waitforvisualfinish delay 20 - createsprite2 gUnknown_08596DD0, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08596DD0, ANIM_ATTACKER, 2 delay 60 call CurseGhost1 delay 41 @@ -7642,23 +7642,23 @@ CurseGhost: delay 41 call CurseGhost1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER delay 1 - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_8596DE8, ANIM_BATTLER_TARGET, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596DE8, ANIM_TARGET, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 16, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end CurseGhost1: - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 4, 0, 10, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0 playsewithpan SE_W020, SOUND_PAN_ATTACKER return CurseStats: - createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_BATTLER_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER waitforvisualfinish delay 10 call CurseStats1 @@ -7674,22 +7674,22 @@ Move_SOFT_BOILED: loadspritegfx ANIM_TAG_BREAKING_EGG loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER playsewithpan SE_W039, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 2, 6, 1 - createsprite2 gUnknown_085937B0, ANIM_BATTLER_ATTACKER, 4, 0, 16, 0 - createsprite2 gUnknown_085937B0, ANIM_BATTLER_ATTACKER, 4, 0, 16, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 + createsprite gUnknown_085937B0, ANIM_ATTACKER, 4, 0, 16, 0 + createsprite gUnknown_085937B0, ANIM_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 playsewithpan SE_W030, SOUND_PAN_ATTACKER - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 31, 16, 0, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 8 - createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 31, 16, 0, 1 + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 60 setarg 7, -1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER call HealingEffect2 end @@ -7700,24 +7700,24 @@ Move_HEAL_BELL: createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_8105CB4, 5 - createsprite2 gUnknown_08593938, ANIM_BATTLER_ATTACKER, 2, 0, -24, 0, 1 + createsprite gUnknown_08593938, ANIM_ATTACKER, 2, 0, -24, 0, 1 delay 12 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 call HealBell1 delay 0x21 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 call HealBell1 delay 0x21 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 - createsprite2 gUnknown_08593958, ANIM_BATTLER_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 call HealBell1 waitforvisualfinish createvisualtask sub_8105D60, 5 @@ -7727,21 +7727,21 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592B94, ANIM_BATTLER_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite2 gUnknown_08592B94, ANIM_BATTLER_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE - createsprite2 gUnknown_08593868, ANIM_BATTLER_ATTACKER, 16, 0, 0, 0, 1 + createsprite gUnknown_08593868, ANIM_ATTACKER, 16, 0, 0, 0, 1 end HealBell1: createvisualtask sub_8116664, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE - createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 40, 0, -24, 0, 1 + createsprite gUnknown_0859381C, ANIM_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_W215, SOUND_PAN_ATTACKER return @@ -7750,102 +7750,102 @@ Move_FAKE_OUT: createvisualtask sub_8105EB0, 5 waitforvisualfinish playsewithpan SE_W166, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask sub_8106020, 3 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE end Move_SCARY_FACE: loadspritegfx ANIM_TAG_EYE_SPARKLE - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 3, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish delay 10 playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_81064F8, 5 delay 13 - createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, -16, -8 - createsprite2 gUnknown_08593A84, ANIM_BATTLER_ATTACKER, 0, 16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask sub_810A094, 3, 20, 1, 0 playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 3, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 16, 0, RGB_BLACK waitforvisualfinish end Move_SWEET_KISS: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL - createsprite2 gUnknown_08593AA8, ANIM_BATTLER_TARGET, 2, 16, -48 + createsprite gUnknown_08593AA8, ANIM_TARGET, 2, 16, -48 playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 playsewithpan SE_W215, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 160, -30 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 160, -30 playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -256, -42 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 128, -14 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, 416, -38 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -128, -22 - createsprite2 gBattleAnimSpriteTemplate_85939B8, ANIM_BATTLER_TARGET, 3, -384, -31 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -256, -42 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 128, -14 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 416, -38 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -128, -22 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31 end Move_LOVELY_KISS: loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL - createsprite2 gUnknown_08593AF0, ANIM_BATTLER_TARGET, 2, 0, -24 + createsprite gUnknown_08593AF0, ANIM_TARGET, 2, 0, -24 playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite2 gUnknown_08593AC0, ANIM_BATTLER_TARGET, 3, -256, -42 - createsprite2 gUnknown_08593AC0, ANIM_BATTLER_TARGET, 3, 128, -14 - createsprite2 gUnknown_08593AC0, ANIM_BATTLER_TARGET, 3, 416, -38 - createsprite2 gUnknown_08593AC0, ANIM_BATTLER_TARGET, 3, -128, -22 + createsprite gUnknown_08593AC0, ANIM_TARGET, 3, -256, -42 + createsprite gUnknown_08593AC0, ANIM_TARGET, 3, 128, -14 + createsprite gUnknown_08593AC0, ANIM_TARGET, 3, 416, -38 + createsprite gUnknown_08593AC0, ANIM_TARGET, 3, -128, -22 end Move_FURY_SWIPES: loadspritegfx ANIM_TAG_SWIPE - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 5 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite2 gUnknown_08593B38, ANIM_BATTLER_TARGET, 2, 16, 0, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 + createsprite gUnknown_08593B38, ANIM_TARGET, 2, 16, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 delay 10 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, 5 + createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite2 gUnknown_08593B38, ANIM_BATTLER_TARGET, 2, -16, 0, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 + createsprite gUnknown_08593B38, ANIM_TARGET, 2, -16, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end Move_INGRAIN: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS - createsprite2 gUnknown_0859254C, ANIM_BATTLER_ATTACKER, 2, 16, 26, -1, 2, 150 + createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite2 gUnknown_0859254C, ANIM_BATTLER_ATTACKER, 2, -32, 20, 1, 1, 140 + createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite2 gUnknown_0859254C, ANIM_BATTLER_ATTACKER, 2, 32, 22, 1, 0, 130 + createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite2 gUnknown_0859254C, ANIM_BATTLER_ATTACKER, 2, -16, 25, -1, 3, 120 + createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 40 - createsprite2 gUnknown_0859258C, ANIM_BATTLER_ATTACKER, 3, 32, 26, -1, 3, 30 + createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite2 gUnknown_0859258C, ANIM_BATTLER_ATTACKER, 3, -48, 20, 1, 2, 30 + createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite2 gUnknown_0859258C, ANIM_BATTLER_ATTACKER, 3, 48, 26, -2, 3, 18 + createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish @@ -7854,7 +7854,7 @@ Move_INGRAIN: Move_PRESENT: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 - createsprite2 gUnknown_08592610, ANIM_BATTLER_TARGET, 2, 0, -5, 10, 2, -1 + createsprite gUnknown_08592610, ANIM_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 14 playsewithpan SE_W145B, SOUND_PAN_ATTACKER @@ -7870,42 +7870,42 @@ Move_PRESENT: PresentDamage: loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, 24, -24, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, -16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, -24, -12, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_TARGET, 3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 16, 16, 1, 1 end PresentHeal: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, SOUND_PAN_TARGET - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -16, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, 16, 32, -3, -1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, 16, 32, -3, -1 delay 3 - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, 32, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, 32, 32, -3, 1 delay 3 - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -32, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -32, 32, -3, 1 delay 3 - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, 0, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, 0, 32, -3, 1 delay 3 - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -8, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -8, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, 24, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, 24, 32, -3, 1 delay 3 - createsprite2 gUnknown_08592658, ANIM_BATTLER_TARGET, 4, -24, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -24, 32, -3, 1 waitforvisualfinish waitsound call HealingEffect2 @@ -7915,38 +7915,38 @@ Move_BATON_PASS: loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_W226, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) - createsprite2 gUnknown_085CE370, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_085CE370, ANIM_ATTACKER, 2 end Move_PERISH_SONG: loadspritegfx ANIM_TAG_MUSIC_NOTES_2 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 0, 0, 0 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 1, 1, 16 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 2, 1, 32 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 3, 2, 48 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 4, 2, 64 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 5, 0, 80 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 6, 0, 96 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 7, 1, 112 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 8, 2, 128 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 9, 0, 144 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 10, 2, 160 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 11, 0, 176 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 12, 1, 192 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 13, 3, 208 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 14, 3, 224 - createsprite2 gUnknown_08593C0C, ANIM_BATTLER_ATTACKER, 4, 15, 0, 240 - createsprite2 gUnknown_08593C24, ANIM_BATTLER_ATTACKER, 4, 15, 0, 0 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 0, 0, 0 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 1, 1, 16 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 2, 1, 32 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 3, 2, 48 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 4, 2, 64 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 5, 0, 80 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 6, 0, 96 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 7, 1, 112 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 8, 2, 128 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 9, 0, 144 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 10, 2, 160 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 11, 0, 176 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 12, 1, 192 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 13, 3, 208 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 14, 3, 224 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 15, 0, 240 + createsprite gUnknown_08593C24, ANIM_ATTACKER, 4, 15, 0, 0 delay 20 panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 80 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK createvisualtask sub_811489C, 5, 4, 0 createvisualtask sub_811489C, 5, 5, 0 createvisualtask sub_811489C, 5, 6, 0 createvisualtask sub_811489C, 5, 7, 0 delay 100 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK createvisualtask sub_811489C, 5, 4, 1 createvisualtask sub_811489C, 5, 5, 1 createvisualtask sub_811489C, 5, 6, 1 @@ -7956,28 +7956,28 @@ Move_PERISH_SONG: Move_SLEEP_TALK: loadspritegfx ANIM_TAG_LETTER_Z - createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_BATTLER_ATTACKER + createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER delay 20 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 delay 6 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 delay 20 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 delay 6 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 delay 20 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 delay 6 - createsprite2 gUnknown_085CE190, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 waitforvisualfinish end @@ -7993,9 +7993,9 @@ Move_HYPER_FANG: goto HyperFangOnPlayer HyperFangContinue: waitbgfadeout - createsprite2 gUnknown_085CE1DC, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_085CE1DC, ANIM_TARGET, 2 waitbgfadein - createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 0, 10, 10, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 playsewithpan SE_W043, SOUND_PAN_TARGET delay 20 restorebg @@ -8014,42 +8014,42 @@ HyperFangInContest: Move_TRI_ATTACK: loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE - createsprite2 gUnknown_085CE2F8, ANIM_BATTLER_TARGET, 2, 16, 0 + createsprite gUnknown_085CE2F8, ANIM_TARGET, 2, 16, 0 playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 20 playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 20 createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 loadspritegfx ANIM_TAG_FIRE - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 0 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, SOUND_PAN_TARGET - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 0, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, -1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 2, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 2, 1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 1, -1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 1 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 1, -2 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -2 delay 1 - createsprite2 gUnknown_08595410, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 3, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 3, 1 delay 2 createvisualtask sub_810A094, 2, 20, 3, 1, 1 waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W161B, SOUND_PAN_TARGET - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -48 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -48 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, -16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -16 delay 1 - createsprite2 gUnknown_085956C0, ANIM_BATTLER_TARGET, 2, 0, 16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, 16 delay 20 createvisualtask sub_810A094, 2, 20, 3, 1, 0 delay 2 @@ -8057,39 +8057,39 @@ Move_TRI_ATTACK: waitforvisualfinish loadspritegfx ANIM_TAG_ICE_CRYSTALS call FreezeEffect1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish end Move_WILL_O_WISP: loadspritegfx ANIM_TAG_WISP_FIRE loadspritegfx ANIM_TAG_WISP_ORB - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET playsewithpan SE_W052, SOUND_PAN_ATTACKER waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_ATTACKER, 1, 0 - createsprite2 gUnknown_0859563C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 + createsprite gUnknown_0859563C, ANIM_ATTACKER, 2, 0, 0, 0 delay 3 - createsprite2 gUnknown_0859563C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1 + createsprite gUnknown_0859563C, ANIM_ATTACKER, 3, 0, 0, 1 delay 3 - createsprite2 gUnknown_0859563C, ANIM_BATTLER_ATTACKER, 4, 0, 0, 2 + createsprite gUnknown_0859563C, ANIM_ATTACKER, 4, 0, 0, 2 delay 3 - createsprite2 gUnknown_0859563C, ANIM_BATTLER_ATTACKER, 4, 0, 0, 3 + createsprite gUnknown_0859563C, ANIM_ATTACKER, 4, 0, 0, 3 delay 40 createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish monbgprio_29 playsewithpan SE_W172B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 13, 1 - createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 0 - createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 42 - createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 84 - createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 126 - createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 168 - createsprite2 gUnknown_0859566C, ANIM_BATTLER_ATTACKER, 2, 210 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 42 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 84 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 126 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 168 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 210 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Move_ENCORE: @@ -8098,14 +8098,14 @@ Move_ENCORE: createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite2 gUnknown_085CE22C, ANIM_BATTLER_TARGET, 2, 0, -8 - createsprite2 gUnknown_085CE244, ANIM_BATTLER_ATTACKER, 2, -2, 0, 0, 0, 9 - createsprite2 gUnknown_085CE244, ANIM_BATTLER_ATTACKER, 2, 2, 0, 1, 0, 9 - createsprite2 gUnknown_085CE25C, ANIM_BATTLER_ATTACKER, 3, -2, 0, 0, 0, 9 - createsprite2 gUnknown_085CE25C, ANIM_BATTLER_ATTACKER, 3, 2, 0, 1, 0, 9 + createsprite gUnknown_085CE22C, ANIM_TARGET, 2, 0, -8 + createsprite gUnknown_085CE244, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 + createsprite gUnknown_085CE244, ANIM_ATTACKER, 2, 2, 0, 1, 0, 9 + createsprite gUnknown_085CE25C, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9 + createsprite gUnknown_085CE25C, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9 delay 16 createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET - createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_BATTLER_TARGET + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET waitforvisualfinish createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 waitforvisualfinish @@ -8115,8 +8115,8 @@ Move_ENCORE: Move_TRICK: loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_SPEED_DUST - createsprite2 gUnknown_085926E8, ANIM_BATTLER_ATTACKER, 2, -40, 80 - createsprite2 gUnknown_085926E8, ANIM_BATTLER_ATTACKER, 2, -40, 208 + createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 80 + createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 208 delay 16 playsewithpan SE_W166, 0 createvisualtask sub_8106020, 3 @@ -8135,24 +8135,24 @@ Move_TRICK: playsewithpan SE_W104, 0 delay 16 playsewithpan SE_W213, 0 - createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_ATTACKER, 5, 0, 7, 2 - createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 5, 0, 7, 2 + createvisualtask AnimTask_ShakeMon, 3, ANIM_ATTACKER, 5, 0, 7, 2 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 5, 0, 7, 2 waitforvisualfinish end Move_WISH: loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_SPARKLE_2 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 - createsprite2 gUnknown_085CE388, ANIM_BATTLER_ATTACKER, 40 + createsprite gUnknown_085CE388, ANIM_ATTACKER, 40 waitforvisualfinish delay 60 loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 call GrantingStarsEffect waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK waitforvisualfinish end @@ -8164,24 +8164,24 @@ Move_STOCKPILE: call Stockpile1 call Stockpile1 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end Stockpile1: - createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 55, 55, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 55, 13 delay 1 - createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, -55, -55, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -55, 13 delay 1 - createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 0, 55, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, 55, 13 delay 1 - createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 0, -55, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, -55, 13 delay 1 - createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 55, -34, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, -34, 13 delay 1 - createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, 55, 34, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 34, 13 delay 1 - createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, -55, -34, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -34, 13 delay 1 - createsprite2 gUnknown_08592244, ANIM_BATTLER_ATTACKER, 2, -55, 34, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, 34, 13 delay 1 return @@ -8190,18 +8190,18 @@ Move_SPIT_UP: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B6B4, 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 8, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 45 playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 3 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 0, 12 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 32, 12 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 64, 12 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 96, 12 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 128, 12 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 160, 12 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 192, 12 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 224, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 0, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 32, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 64, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 96, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 128, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 160, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 192, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 224, 12 delay 5 jumpifmoveturn 2, SpitUpStrong jumpifmoveturn 3, SpitUpStrongest @@ -8209,27 +8209,27 @@ SpitUpContinue: delay 5 createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, -12, 10, 1, 1 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -12, 10, 1, 1 delay 5 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite2 gUnknown_085973E8, ANIM_BATTLER_TARGET, 3, 12, -10, 1, 1 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 12, -10, 1, 1 waitforvisualfinish end SpitUpStrong: - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 16 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 80 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 144 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 208 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 16 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 80 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 144 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 208 goto SpitUpContinue SpitUpStrongest: - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 16 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 48 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 80 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 112 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 144 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 176 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 208 - createsprite2 gUnknown_08593A50, ANIM_BATTLER_ATTACKER, 2, 240 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 16 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 48 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 80 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 112 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 144 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 176 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 208 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 240 goto SpitUpContinue Move_SWALLOW: @@ -8237,10 +8237,10 @@ Move_SWALLOW: loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B778, 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 8, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 38 playsewithpan SE_W255, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 call SwallowEffect jumpifmoveturn 2, SwallowGood jumpifmoveturn 3, SwallowBest @@ -8249,15 +8249,15 @@ SwallowContinue: call HealingEffect end SwallowEffect: - createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, 0, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 0, -8 delay 1 - createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, -24, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, -24, -8 delay 1 - createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, 16, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 16, -8 delay 1 - createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, -16, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, -16, -8 delay 1 - createsprite2 gUnknown_085CE418, ANIM_BATTLER_ATTACKER, 2, 24, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 24, -8 delay 1 return SwallowGood: @@ -8269,12 +8269,12 @@ SwallowBest: goto SwallowContinue Move_TRANSFORM: - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 createvisualtask sub_815B7D0, 2, 0 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER end Move_MORNING_SUN: @@ -8305,66 +8305,66 @@ Move_MORNING_SUN: call HealingEffect end MorningSun1: - createsprite2 gUnknown_085CE48C, ANIM_BATTLER_ATTACKER, 2, 30, 640 + createsprite gUnknown_085CE48C, ANIM_ATTACKER, 2, 30, 640 delay 5 return Move_SWEET_SCENT: loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_W230, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 100, 0, 100 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 call SweetScentEffect - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 55, 0 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 55, 0 setpan SOUND_PAN_TARGET createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21) call SweetScentEffect waitforvisualfinish end SweetScentEffect: - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 70, 1, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 70, 1, 64 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 60, 0, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 60, 0, 64 delay 5 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 80, 1, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 80, 1, 64 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 58, 0, 120 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 58, 0, 120 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 100, 0, 120 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 90, 0, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 90, 0, 64 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 48, 0, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 48, 0, 64 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 95, 1, 80 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 95, 1, 80 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 100, 0, 120 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 75, 1, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 75, 1, 64 delay 2 - createsprite2 gUnknown_085CE544, ANIM_BATTLER_ATTACKER, 2, 85, 0, 120 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 85, 0, 120 delay 2 return Move_HYPER_BEAM: loadspritegfx ANIM_TAG_ORBS - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 playsewithpan SE_W063, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 4, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 4, 50, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0 call HyperBeam1 call HyperBeam1 call HyperBeam1 call HyperBeam1 call HyperBeam1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 50, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 11, RGB(25, 25, 25) call HyperBeam1 call HyperBeam1 @@ -8389,11 +8389,11 @@ Move_HYPER_BEAM: call HyperBeam1 createvisualtask sub_8116620, 10, 4, 2, 11, 0, RGB(25, 25, 25) waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 16, 0, RGB_BLACK end HyperBeam1: - createsprite2 gUnknown_08592288, ANIM_BATTLER_TARGET, 2 - createsprite2 gUnknown_08592288, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_08592288, ANIM_TARGET, 2 + createsprite gUnknown_08592288, ANIM_TARGET, 2 delay 1 return @@ -8404,11 +8404,11 @@ Move_FLATTER: createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite2 gUnknown_085CE5C0, ANIM_BATTLER_TARGET, 2, 0, -8, 80 + createsprite gUnknown_085CE5C0, ANIM_TARGET, 2, 0, -8, 80 delay 0 - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 2, ANIM_BATTLER_TARGET + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET delay 10 - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 2, ANIM_BATTLER_TARGET + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET delay 0 createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER call Flatter1 @@ -8438,23 +8438,23 @@ Move_FLATTER: createvisualtask sub_815AC8C, 2 end Flatter1: - createsprite2 gUnknown_085CE5A8, ANIM_BATTLER_ATTACKER, 40, 0 - createsprite2 gUnknown_085CE5A8, ANIM_BATTLER_ATTACKER, 40, 1 + createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 0 + createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 1 return Move_ROLE_PLAY: - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_WHITE - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 10, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W161, SOUND_PAN_ATTACKER waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 createvisualtask sub_815CED8, 2 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE delay 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 10, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 10, 0, RGB_BLACK end Move_REFRESH: @@ -8467,28 +8467,28 @@ Move_REFRESH: call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 0, 0 end Move_BLAZE_KICK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W172, SOUND_PAN_TARGET - createsprite2 gUnknown_08595F14, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 30 + createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 1, 30 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 30 playsewithpan SE_W007, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 14, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 call FireMoveEffect waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end @@ -8503,40 +8503,40 @@ Move_HYPER_VOICE: waitforvisualfinish end HyperVoiceEffect: - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 8, 0, RGB_YELLOW - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_BATTLER_ATTACKER, 0 - createsprite2 gUnknown_08593880, ANIM_BATTLER_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 1, 0, 6, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 8, 0, RGB_YELLOW + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0 + createsprite gUnknown_08593880, 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 createvisualtask sub_81162A4, 2, 1, 0, 6, 1 createvisualtask sub_8159078, 5 return Move_SAND_TOMB: loadspritegfx ANIM_TAG_MUD_SAND - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 43, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 playsewithpan SE_W328, SOUND_PAN_TARGET call SandTombEffect call SandTombEffect call SandTombEffect delay 22 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish end SandTombEffect: - createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 32, 528, 30, 10, 50, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 32, 528, 30, 10, 50, 1 delay 2 - createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 36, 480, 20, 13, -46, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 36, 480, 20, 13, -46, 1 delay 2 - createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 37, 576, 20, 5, 42, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 37, 576, 20, 5, 42, 1 delay 2 - createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 35, 400, 25, 8, -42, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 35, 400, 25, 8, -42, 1 delay 2 - createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 32, 512, 25, 13, 46, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 32, 512, 25, 13, 46, 1 delay 2 - createsprite2 gUnknown_08596B34, ANIM_BATTLER_TARGET, 2, 0, 37, 464, 30, 12, -50, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 37, 464, 30, 12, -50, 1 delay 2 return @@ -8546,13 +8546,13 @@ Move_SHEER_COLD: playsewithpan SE_W196, 0 waitbgfadein loadspritegfx ANIM_TAG_ICE_CUBE - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask sub_80A9EF4, 2 waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadein @@ -8561,28 +8561,28 @@ Move_SHEER_COLD: Move_ARM_THRUST: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - monbgprio_28 ANIM_BATTLER_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask sub_80D6134, 5, 8, 5, 0, 0 delay 6 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 3 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08596034, ANIM_BATTLER_TARGET, 2, 10, -8, 14, 3 + createsprite gUnknown_08596034, ANIM_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask sub_80D6134, 5, 8, 5, 0, 1 playsewithpan SE_W003, SOUND_PAN_TARGET choosetwoturnanim ArmThrustRight, ArmThrustLeft ArmThrustContinue: - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish blendoff end ArmThrustRight: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2 goto ArmThrustContinue ArmThrustLeft: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 0, 1, 2 goto ArmThrustContinue Move_MUDDY_WATER: @@ -8593,26 +8593,26 @@ Move_MUDDY_WATER: Move_BULLET_SEED: loadspritegfx ANIM_TAG_SEED - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 30, 1 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite2 gUnknown_0859351C, ANIM_BATTLER_TARGET, 2, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 waitforvisualfinish end @@ -8621,57 +8621,57 @@ Move_DRAGON_CLAW: loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_W221B, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0) - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 15, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1 call DragonClawEffect call DragonClawEffect - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 createvisualtask sub_8159210, 5, 136, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, -10, 0 - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, -10, 10, 0 - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 createvisualtask sub_8159210, 5, 136, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, -10, 1 - createsprite2 gBattleAnimSpriteTemplate_8597138, ANIM_BATTLER_TARGET, 2, 10, 10, 1 - createsprite2 gBattleAnimSpriteTemplate_85972D8, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 createvisualtask sub_8116620, 10, 2, 4, 8, 0, RGB(31, 19, 0) waitforvisualfinish end DragonClawEffect: - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 - createsprite2 gUnknown_08596B88, ANIM_BATTLER_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 delay 2 return @@ -8680,17 +8680,17 @@ End: Move_MUD_SHOT: loadspritegfx ANIM_TAG_BROWN_ORB - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 0, 2, 46, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask sub_81076C8, 5, 100 panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call MudShot1 call MudShot1 call MudShot1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 43, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1 call MudShot1 call MudShot1 call MudShot1 @@ -8700,13 +8700,13 @@ Move_MUD_SHOT: call MudShot1 call MudShot1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end MudShot1: - createsprite2 gUnknown_085950FC, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 + createsprite gUnknown_085950FC, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 - createsprite2 gUnknown_085950FC, ANIM_BATTLER_ATTACKER, 3, 10, 10, 0, 16 + createsprite gUnknown_085950FC, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 return @@ -8718,16 +8718,16 @@ Move_METEOR_MASH: fadetobg BG_COSMIC waitbgfadein waitforvisualfinish - createsprite2 gUnknown_085CE8DC, ANIM_BATTLER_TARGET, 3, -48, SOUND_PAN_ATTACKER, 72, 32, 30 + createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -48, SOUND_PAN_ATTACKER, 72, 32, 30 delay 10 - createsprite2 gUnknown_085CE8DC, ANIM_BATTLER_TARGET, 3, -112, SOUND_PAN_ATTACKER, 8, 32, 30 + createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -112, SOUND_PAN_ATTACKER, 8, 32, 30 delay 40 - createsprite2 gUnknown_08595F14, ANIM_BATTLER_TARGET, 3, 0, 0, 0, 30 - createsprite2 gUnknown_085CE8DC, ANIM_BATTLER_TARGET, 3, -80, SOUND_PAN_ATTACKER, 40, 32, 30 + createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 0, 30 + createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -80, SOUND_PAN_ATTACKER, 40, 32, 30 delay 20 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 5, 0, 20, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1 waitforvisualfinish delay 10 restorebg @@ -8737,30 +8737,30 @@ Move_METEOR_MASH: Move_REVENGE: loadspritegfx ANIM_TAG_PURPLE_SCRATCH - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596088, ANIM_BATTLER_ATTACKER, 2, 10, -10 + createsprite gUnknown_08596088, ANIM_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SCRATCH loadspritegfx ANIM_TAG_PURPLE_SWIPE - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_085960D0, ANIM_BATTLER_TARGET, 2, 10, -10 + createsprite gUnknown_085960D0, ANIM_TARGET, 2, 10, -10 waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SWIPE loadspritegfx ANIM_TAG_IMPACT - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 10, 1 - createsprite2 gUnknown_08597400, ANIM_BATTLER_TARGET, 3, -10, -8, 1, 1, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 + createsprite gUnknown_08597400, ANIM_TARGET, 3, -10, -8, 1, 1, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite2 gUnknown_08597400, ANIM_BATTLER_TARGET, 3, 10, 8, 1, 1, 8 + createsprite gUnknown_08597400, ANIM_TARGET, 3, 10, 8, 1, 1, 8 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end @@ -8768,9 +8768,9 @@ Move_POISON_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE1DC, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_085CE1DC, ANIM_TARGET, 2 delay 10 - createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 3, 0, 10, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 waitforvisualfinish createvisualtask sub_8115A04, 2, 4, 0, 4, 0, 12, RGB(26, 0, 26) call PoisonBubblesEffect @@ -8785,80 +8785,80 @@ Move_SUBSTITUTE: Move_FRENZY_PLANT: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 10, 8, 2, 0, 0, 100 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 5 - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 20, -8, -2, 0, 1, 95 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 delay 5 - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 30, 8, -4, 0, 0, 90 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, -22 delay 5 - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 40, -8, 4, 0, 1, 85 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 delay 5 - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 50, 8, 0, 0, 0, 85 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, +21 delay 5 - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 60, -8, -2, 0, 1, 85 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, +42 delay 5 - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 75, 8, 0, 0, 0, 85 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 85, 16, 6, 0, 3, 80 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite2 gUnknown_08592564, ANIM_BATTLER_ATTACKER, 2, 85, -16, -6, 0, 2, 75 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -10, 1, 3 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, 1, 3 playsewithpan SE_W003, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 3, ANIM_BATTLER_TARGET, 8, 0, 20, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1 delay 3 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 8, 1, 3 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 1, 3 playsewithpan SE_W003, SOUND_PAN_TARGET delay 3 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -3, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -3, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET delay 3 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -3, 1, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -3, 1, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET delay 2 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, 1, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 1, 1, 1 playsewithpan SE_W003, SOUND_PAN_TARGET delay 2 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 10, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, 1, 1 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 2, 5, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 5, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end Move_METAL_SOUND: loadspritegfx ANIM_TAG_METAL_SOUND_WAVES - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_2A ANIM_BATTLER_TARGET - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1 + monbg ANIM_DEF_PARTNER + monbgprio_2A ANIM_TARGET + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 call MetalSound1 call MetalSound1 call MetalSound1 call MetalSound1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER delay 0 waitforvisualfinish end MetalSound1: panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite2 gUnknown_08593458, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 + createsprite gUnknown_08593458, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -8878,26 +8878,26 @@ FocusPunch: jumprettrue FocusPunchOnPlayer FocusPunchContinue: waitbgfadein - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite2 gUnknown_08596104, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_08596104, ANIM_TARGET, 2 delay 10 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 8, 0, 24, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 2, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 2, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -6, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -6, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, 1, 0 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff goto FocusPunchEnd FocusPunchOnOpponent: @@ -8912,7 +8912,7 @@ FocusPunchInContest: Move_RETURN: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetReturnPowerLevel, 2 delay 2 @@ -8922,127 +8922,127 @@ Move_RETURN: jumpreteq 3, ReturnStrongest ReturnContinue: waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end ReturnWeak: - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 139, SOUND_PAN_TARGET goto ReturnContinue ReturnMedium: - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish delay 11 - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 4 delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET goto ReturnContinue ReturnStrong: - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, -5, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -5, 3, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 goto ReturnContinue ReturnStrongest: - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 6, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, -5, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 12, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 12, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 4 - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 2 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 2, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 2, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish call ReturnStrongest1 call ReturnStrongest1 call ReturnStrongest1 call ReturnStrongest1 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 0 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 8, 0, 24, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1, 0 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, -5, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, 1, 0 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -5, 3, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, 1, 0 createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6, 0, RGB_BLACK goto ReturnContinue ReturnStrongest1: - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 3, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 3, ANIM_ATTACKER createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish return @@ -9059,9 +9059,9 @@ Move_COSMIC_POWER: waitbgfadein delay 70 createvisualtask sub_8159210, 5, 228, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592B7C, ANIM_BATTLER_ATTACKER, 2, -15, 0, 0, 0, 32, 60 + createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite2 gUnknown_08592B7C, ANIM_BATTLER_ATTACKER, 2, 12, -5, 0, 0, 32, 60 + createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 40 createvisualtask sub_8117610, 2, 0, 15, 0, 0 waitforvisualfinish @@ -9075,45 +9075,45 @@ Move_COSMIC_POWER: Move_BLAST_BURN: loadspritegfx ANIM_TAG_FIRE_PLUME loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W221, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -32, 0, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -20, -10, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 0, -16, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 20, -10, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 32, 0, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 20, 10, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 0, 16, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -20, 10, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -32, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -20, -10, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 0, -16, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 20, -10, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 32, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 20, 10, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 0, 16, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -20, 10, 24, 0, 0, 0 delay 25 playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -64, 0, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 6, -40, -20, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 70, 0, -32, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 70, 40, -20, 24, 0, 0, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 6, 0, 8, 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 64, 0, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 40, 20, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 0, 32, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -40, 20, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -64, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 6, -40, -20, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 70, 0, -32, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 70, 40, -20, 24, 0, 0, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 64, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 40, 20, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 0, 32, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 25 playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -96, 0, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 6, -60, -30, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 70, 0, -48, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 70, 60, -30, 24, 0, 0, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -4, 3, 1, 0 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 12, 0, 20, 1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -96, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 6, -60, -30, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 70, 0, -48, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 70, 60, -30, 24, 0, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, 3, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 12, 0, 20, 1 createvisualtask sub_81162A4, 2, 2, 0, 10, 1 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 96, 0, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 66, 60, 30, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, 0, 48, 24, 0, 0, 0 - createsprite2 gUnknown_08595428, ANIM_BATTLER_ATTACKER, 2, -60, 30, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 96, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 60, 30, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 0, 48, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -60, 30, 24, 0, 0, 0 createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -9122,29 +9122,29 @@ Move_ROCK_TOMB: loadspritegfx ANIM_TAG_ROCKS createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish - createsprite2 gUnknown_08596C58, ANIM_BATTLER_TARGET, 2, 20, 12, 64, 114, 0 + createsprite gUnknown_08596C58, ANIM_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite2 gUnknown_08596C58, ANIM_BATTLER_TARGET, 2, -20, 12, 64, 98, 0 + createsprite gUnknown_08596C58, ANIM_TARGET, 2, -20, 12, 64, 98, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite2 gUnknown_08596C58, ANIM_BATTLER_TARGET, 66, 3, 6, 64, 82, 0 + createsprite gUnknown_08596C58, ANIM_TARGET, 66, 3, 6, 64, 82, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite2 gUnknown_08596C58, ANIM_BATTLER_TARGET, 2, -3, 13, 64, 66, 0 + createsprite gUnknown_08596C58, ANIM_TARGET, 2, -3, 13, 64, 66, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET delay 24 playsewithpan SE_W063, SOUND_PAN_TARGET - createsprite2 gUnknown_085967AC, ANIM_BATTLER_TARGET, 5, 1, 50 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 20, 1 + createsprite gUnknown_085967AC, ANIM_TARGET, 5, 1, 50 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish end @@ -9154,7 +9154,7 @@ Move_SILVER_WIND: panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 playsewithpan SE_W234, 0 delay 0 - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER monbgprio_29 delay 0 createvisualtask sub_8116664, 10, 1, 0, 0, 4, RGB_BLACK @@ -9167,32 +9167,32 @@ SilverWindContinue: delay 0 createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein - createsprite2 gUnknown_08592830, ANIM_BATTLER_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite2 gUnknown_08592830, ANIM_BATTLER_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite2 gUnknown_08592830, ANIM_BATTLER_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite2 gUnknown_08592830, ANIM_BATTLER_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gUnknown_08592830, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592830, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592830, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592830, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite2 gUnknown_08592848, ANIM_BATTLER_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite2 gUnknown_08592848, ANIM_BATTLER_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite2 gUnknown_08592848, ANIM_BATTLER_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite2 gUnknown_08592848, ANIM_BATTLER_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gUnknown_08592848, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592848, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592848, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592848, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite2 gUnknown_08592860, ANIM_BATTLER_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite2 gUnknown_08592860, ANIM_BATTLER_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite2 gUnknown_08592860, ANIM_BATTLER_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite2 gUnknown_08592860, ANIM_BATTLER_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gUnknown_08592860, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592860, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592860, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592860, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 6 - createsprite2 gUnknown_08592830, ANIM_BATTLER_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite2 gUnknown_08592830, ANIM_BATTLER_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592830, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592830, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite2 gUnknown_08592848, ANIM_BATTLER_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite2 gUnknown_08592848, ANIM_BATTLER_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592848, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592848, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite2 gUnknown_08592860, ANIM_BATTLER_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite2 gUnknown_08592860, ANIM_BATTLER_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592860, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592860, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish playsewithpan SE_W016B, SOUND_PAN_TARGET - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER delay 0 restorebg waitbgfadeout @@ -9208,7 +9208,7 @@ SilverWindOnPlayer: Move_SNATCH: playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -12, 4, 10, 10, 12, 6 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 end Move_DIVE: @@ -9218,10 +9218,10 @@ Move_DIVE: DiveSetUp: loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_W029, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596490, ANIM_BATTLER_ATTACKER, 2, 0, 0, 13, 336 + createsprite gUnknown_08596490, ANIM_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish playsewithpan SE_W291, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085964CC, ANIM_BATTLER_ATTACKER, 3, 0 + createsprite gUnknown_085964CC, ANIM_ATTACKER, 3, 0 call DiveSetUp1 call DiveSetUp1 call DiveSetUp1 @@ -9229,16 +9229,16 @@ DiveSetUp: call DiveSetUp1 end DiveSetUp1: - createsprite2 gUnknown_085964E4, ANIM_BATTLER_ATTACKER, 5, 0, 0 - createsprite2 gUnknown_085964E4, ANIM_BATTLER_ATTACKER, 5, 1, 0 + createsprite gUnknown_085964E4, ANIM_ATTACKER, 5, 0, 0 + createsprite gUnknown_085964E4, ANIM_ATTACKER, 5, 1, 0 return DiveAttack: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W153, SOUND_PAN_TARGET - createsprite2 gUnknown_085964CC, ANIM_BATTLER_TARGET, 3, 1 + createsprite gUnknown_085964CC, ANIM_TARGET, 3, 1 call DiveAttack1 call DiveAttack1 call DiveAttack1 @@ -9247,39 +9247,39 @@ DiveAttack: delay 12 call UnderWaterAttack1 waitforvisualfinish - visible ANIM_BATTLER_ATTACKER - clearmonbg ANIM_BATTLER_DEF_PARTNER + visible ANIM_ATTACKER + clearmonbg ANIM_DEF_PARTNER blendoff end DiveAttack1: - createsprite2 gUnknown_085964E4, ANIM_BATTLER_TARGET, 5, 0, 1 - createsprite2 gUnknown_085964E4, ANIM_BATTLER_TARGET, 5, 1, 1 + createsprite gUnknown_085964E4, ANIM_TARGET, 5, 0, 1 + createsprite gUnknown_085964E4, ANIM_TARGET, 5, 1, 1 return Move_ROCK_BLAST: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596C98, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 25, 257 + createsprite gUnknown_08596C98, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_TARGET, 2, 0, 0, 20, 24, 14, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_TARGET, 2, 5, 0, -20, 24, 14, 1 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_TARGET, 2, 0, 5, 20, -24, 14, 2 - createsprite2 gUnknown_08596B1C, ANIM_BATTLER_TARGET, 2, -5, 0, -20, -24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_TARGET, 2, 0, 0, 20, 24, 14, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 + createsprite gUnknown_08596B1C, ANIM_TARGET, 2, 5, 0, -20, 24, 14, 1 + createsprite gUnknown_08596B1C, ANIM_TARGET, 2, 0, 5, 20, -24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_TARGET, 2, -5, 0, -20, -24, 14, 2 waitforvisualfinish end Move_OVERHEAT: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 18 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 5, RGB(28, 0, 0) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 5, RGB(28, 0, 0) waitforvisualfinish createvisualtask sub_8117C44, 5 waitforvisualfinish @@ -9290,66 +9290,66 @@ Move_OVERHEAT: playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_8117CA0, 5, 1, 0 delay 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 1, 0, 13, RGB(28, 0, 0) - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 2, 0, 15, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 1, 0, 13, RGB(28, 0, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 0, 30, 25, -20 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 32, 30, 25, -20 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 64, 30, 25, -20 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 96, 30, 25, -20 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 128, 30, 25, -20 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 160, 30, 25, -20 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 192, 30, 25, -20 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 224, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 0, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 32, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 64, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 96, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 128, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 160, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 192, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 224, 30, 25, -20 delay 5 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 0, 30, 25, 0 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 32, 30, 25, 0 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 64, 30, 25, 0 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 96, 30, 25, 0 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 128, 30, 25, 0 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 160, 30, 25, 0 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 192, 30, 25, 0 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 224, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 0, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 32, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 64, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 96, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 128, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 160, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 192, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 224, 30, 25, 0 delay 5 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 0, 30, 25, 10 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 32, 30, 25, 10 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 64, 30, 25, 10 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 96, 30, 25, 10 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 2, 1, 128, 30, 25, 10 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 160, 30, 25, 10 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 192, 30, 25, 10 - createsprite2 gUnknown_08596FB0, ANIM_BATTLER_ATTACKER, 66, 1, 224, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 0, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 32, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 64, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 96, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 128, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 160, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 192, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 224, 30, 25, 10 delay 5 waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -5, 3, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 10, 0, 25, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 delay 6 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, -5, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -5, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 10, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 10, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET delay 8 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET createvisualtask sub_8117DD8, 5, 1 delay 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, -1, 0, 13, RGB(18, 18, 18) - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_ATTACKER, 3, 0, 15, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 0, 13, RGB(18, 18, 18) + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 3, 0, 15, 1 waitforvisualfinish createvisualtask sub_8117D3C, 5, 0, 1 delay 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 5, 0, RGB(28, 0, 0) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 5, 0, RGB(28, 0, 0) waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish delay 15 createvisualtask sub_8117D3C, 5, 1, 0 delay 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 13, 0, RGB(18, 18, 18) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 13, 0, RGB(18, 18, 18) waitforvisualfinish createvisualtask sub_8117C70, 5 waitforvisualfinish @@ -9358,54 +9358,54 @@ Move_OVERHEAT: Move_HYDRO_CANNON: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085951C0, ANIM_BATTLER_TARGET, 2 + createsprite gUnknown_085951C0, ANIM_TARGET, 2 delay 10 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 30 panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call HydroCannon1 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 10, 0, 40, 1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite2 gUnknown_08597388, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 waitforvisualfinish createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end HydroCannon1: - createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite2 gUnknown_085951D8, ANIM_BATTLER_TARGET, 2, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 return Move_ASTONISH: loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_W227, SOUND_PAN_ATTACKER - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 25 - createsprite2 gUnknown_085964E4, ANIM_BATTLER_TARGET, 5, 0, 1 + createsprite gUnknown_085964E4, ANIM_TARGET, 5, 0, 1 playsewithpan SE_W166, SOUND_PAN_TARGET - createsprite2 gUnknown_085964E4, ANIM_BATTLER_TARGET, 5, 1, 1 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 + createsprite gUnknown_085964E4, ANIM_TARGET, 5, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask sub_8106020, 3 waitforvisualfinish end @@ -9414,7 +9414,7 @@ Move_SEISMIC_TOSS: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 waitforvisualfinish createvisualtask AnimTask_GetSeismicTossDamageLevel, 3 @@ -9434,7 +9434,7 @@ SeismicTossContinue: waitbgfadeout setarg 7, 0xFFF waitbgfadein - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end SeismicTossWeak: @@ -9459,29 +9459,29 @@ SeismicTossStrong: call SeismicToss1 goto SeismicTossContinue SeismicToss1: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -10, -8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, 1, 1 playsewithpan SE_W070, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 5, 1 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -12, 27, 2, 3 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 8, 28, 3, 4 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -4, 30, 2, 3 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 12, 25, 4, 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -12, 27, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 8, 28, 3, 4 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -4, 30, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 12, 25, 4, 4 return SeismicToss2: - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 10, -8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, 1, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 5, 1 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -12, 32, 3, 4 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 8, 31, 2, 2 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -4, 28, 2, 3 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 12, 30, 4, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -12, 32, 3, 4 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 8, 31, 2, 2 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -4, 28, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 12, 30, 4, 3 return Move_MAGIC_COAT: loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 - createsprite2 gUnknown_085965C0, ANIM_BATTLER_ATTACKER, 3, 40, 0, 10170 + createsprite gUnknown_085965C0, ANIM_ATTACKER, 3, 40, 0, 10170 waitforvisualfinish delay 1 blendoff @@ -9490,37 +9490,37 @@ Move_MAGIC_COAT: Move_WATER_PULSE: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_BLUE_RING_2 - monbg ANIM_BATTLER_TARGET - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 7, RGB(0, 25, 28) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 7, RGB(0, 25, 28) delay 10 - createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 - createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 20, 100, 16, 2, 10, 35, 1 - createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 - createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 - createsprite2 gUnknown_085952F8, ANIM_BATTLER_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 20, 100, 16, 2, 10, 35, 1 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593470, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 + createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593470, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 + createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593470, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 + createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 delay 13 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 8, 18, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 7, 0, RGB(0, 25, 28) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 7, 0, RGB(0, 25, 28) waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Move_PSYCHO_BOOST: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_815A5C8, 5 @@ -9528,19 +9528,19 @@ Move_PSYCHO_BOOST: delay 6 createvisualtask sub_8115A04, 2, 1, 2, 8, 0, 10, RGB_BLACK delay 0 - monbgprio_28 ANIM_BATTLER_ATTACKER + monbgprio_28 ANIM_ATTACKER setalpha 8, 8 delay 10 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 3, 0, 240, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 - createsprite2 gUnknown_08596920, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_08596920, ANIM_ATTACKER, 2 delay 110 loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, -8, 1, 24, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff call UnsetPsychicBackground end @@ -9548,20 +9548,20 @@ Move_PSYCHO_BOOST: Move_KNOCK_OFF: loadspritegfx ANIM_TAG_SLAM_HIT_2 loadspritegfx ANIM_TAG_IMPACT - createsprite2 gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 playsewithpan SE_W233, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE984, ANIM_BATTLER_TARGET, 2, -16, -16 + createsprite gUnknown_085CE984, ANIM_TARGET, 2, -16, -16 delay 8 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 2 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -12, 10, 0, 3 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 delay 5 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 delay 10 waitforvisualfinish end @@ -9569,26 +9569,26 @@ Move_KNOCK_OFF: Move_DOOM_DESIRE: createvisualtask sub_8114960, 2 delay 1 - monbg ANIM_BATTLER_ATK_PARTNER + monbg ANIM_ATK_PARTNER createvisualtask sub_811489C, 5, 1, 0 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK waitforvisualfinish setalpha 8, 8 playsewithpan SE_W060, SOUND_PAN_ATTACKER - createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_ATTACKER, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish delay 20 createvisualtask sub_811489C, 5, 1, 1 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK waitforvisualfinish - clearmonbg ANIM_BATTLER_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER blendoff end Move_SKY_UPPERCUT: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout playsewithpan SE_W327, SOUND_PAN_ATTACKER @@ -9596,32 +9596,32 @@ Move_SKY_UPPERCUT: waitbgfadein setalpha 12, 8 delay 38 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 28, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -28, 28, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -28, 28, 1, 1 delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -15, 8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -15, 8, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -5, -12, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, -12, 1, 1 delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, -32, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -32, 1, 1 delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 5, -52, 1, 1 - createsprite2 gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -26, 16, 1, 4 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, -52, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 delay 30 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 delay 4 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 6 - clearmonbg ANIM_BATTLER_DEF_PARTNER + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 + clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadeout @@ -9646,45 +9646,45 @@ Move_TWISTER: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET playsewithpan SE_W239, SOUND_PAN_TARGET - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 120, 70, 5, 70, 30 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 55, 6, 60, 25 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 6, 60, 25 delay 1 - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 60, 7, 60, 30 - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 55, 10, 60, 30 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 60, 7, 60, 30 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 10, 60, 30 delay 3 - createsprite2 gUnknown_08596CC8, ANIM_BATTLER_TARGET, 2, 100, 50, 4, 50, 26 + createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 100, 50, 4, 50, 26 delay 1 - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 105, 25, 8, 60, 20 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 105, 25, 8, 60, 20 delay 1 - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 40, 10, 48, 30 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 40, 10, 48, 30 delay 3 - createsprite2 gUnknown_08596CC8, ANIM_BATTLER_TARGET, 2, 120, 30, 6, 45, 25 - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 115, 35, 10, 60, 30 + createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 120, 30, 6, 45, 25 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 35, 10, 60, 30 delay 3 - createsprite2 gUnknown_08596CC8, ANIM_BATTLER_TARGET, 2, 105, 20, 8, 40, 0 + createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 105, 20, 8, 40, 0 delay 3 - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 20, 255, 15, 32, 0 - createsprite2 gUnknown_085923A8, ANIM_BATTLER_TARGET, 2, 110, 10, 8, 32, 20 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 20, 255, 15, 32, 0 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -32, -16, 1, 3 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 12, 1 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_DEF_PARTNER, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 delay 4 - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 3 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_085973A0, ANIM_BATTLER_TARGET, 3, 1, 3 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET delay 4 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 32, 20, 1, 3 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -9692,43 +9692,43 @@ Move_MAGICAL_LEAF: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 createvisualtask sub_81007C4, 5 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -2, 10 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -1, -1, 15 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -4, -4, 7 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 3, -3, 11 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -1, -6, 8 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 2, -1, 12 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -4, 13 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 4, -5, 7 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, 2, -6, 11 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite2 gUnknown_08592390, ANIM_BATTLER_ATTACKER, 2, -3, -5, 8 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_085923D8, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 - createsprite2 gUnknown_085923D8, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 + createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 + createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, -4, 1, 2 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 10, 4, 1, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 10, 4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 setarg 7, -1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end @@ -9739,7 +9739,7 @@ Move_ICE_BALL: jumpargeq 0, 4, IceBallSetIceBg IceBallContinue: playsewithpan SE_W196, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08595DE4, ANIM_BATTLER_TARGET, 2, 15, 0, -12, -16, 30, -40 + createsprite gUnknown_08595DE4, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 playsewithpan SE_W280, SOUND_PAN_TARGET createvisualtask AnimTask_GetRolloutCounter, 5, 0 @@ -9819,19 +9819,19 @@ IceBallStrongest: call IceBall1 goto IceBallContinue2 IceBall1: - createsprite2 gUnknown_08595DFC, ANIM_BATTLER_TARGET, 4, -12, -16 + createsprite gUnknown_08595DFC, ANIM_TARGET, 4, -12, -16 return Move_WEATHER_BALL: loadspritegfx ANIM_TAG_WEATHER_BALL - createsprite2 gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 1, ANIM_BATTLER_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER delay 8 playsewithpan SE_W207, SOUND_PAN_ATTACKER - createsprite2 gUnknown_0853EE38, ANIM_BATTLER_ATTACKER, 2 + createsprite gUnknown_0853EE38, ANIM_ATTACKER, 2 waitforvisualfinish delay 15 playsewithpan SE_W197, 0 - createsprite2 gComplexPaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2 delay 1 @@ -9842,75 +9842,75 @@ Move_WEATHER_BALL: jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce WeatherBallNormal: loadspritegfx ANIM_TAG_IMPACT - createsprite2 gUnknown_0853EE50, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 + createsprite gUnknown_0853EE50, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end WeatherBallFire: loadspritegfx ANIM_TAG_SMALL_EMBER - createsprite2 gUnknown_0859559C, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 40, 10 + createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_0859559C, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -40, 20 + createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_0859559C, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 + createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W172B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end WeatherBallWater: loadspritegfx ANIM_TAG_SMALL_BUBBLES - createsprite2 gUnknown_08595328, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 50, 10 + createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, SOUND_PAN_TARGET delay 8 - createsprite2 gUnknown_08595328, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -20, 20 + createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20 playsewithpan SE_W152, SOUND_PAN_TARGET delay 13 - createsprite2 gUnknown_08595328, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 + createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 playsewithpan SE_W202, SOUND_PAN_TARGET waitforvisualfinish end WeatherBallSandstorm: loadspritegfx ANIM_TAG_ROCKS - createsprite2 gUnknown_08596CE0, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 30, 0 + createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 5 - createsprite2 gUnknown_08596CE0, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -40, 20 + createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 playsewithpan SE_W088, SOUND_PAN_TARGET delay 14 - createsprite2 gUnknown_08596CE0, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 + createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W070, SOUND_PAN_TARGET - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -12, 27, 2, 3 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 8, 28, 3, 4 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, -4, 30, 2, 3 - createsprite2 gUnknown_08596CB0, ANIM_BATTLER_TARGET, 2, 12, 25, 4, 4 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -12, 27, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 8, 28, 3, 4 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -4, 30, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 12, 25, 4, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish end WeatherBallIce: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS - createsprite2 gUnknown_08595D44, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, -40, 20 + createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_08595D44, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, 40, 0 + createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 - createsprite2 gUnknown_08595D44, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, 0, 0 + createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0 playsewithpan SE_W258, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W196, SOUND_PAN_TARGET call FreezeEffect1 waitforvisualfinish @@ -9918,237 +9918,237 @@ WeatherBallIce: Move_COUNT: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end FreezeEffect1: - createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -10, -10, 0 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -10, -10, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 10, 20, 0 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 10, 20, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -5, 10, 0 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -5, 10, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 17, -12, 0 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 17, -12, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, -15, 15, 0 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, -15, 15, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 0, 0, 0 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 0, 0, 0 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, 20, 2, 0 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, 20, 2, 0 playsewithpan SE_W196, SOUND_PAN_TARGET return FreezeEffect2: - createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -10, -10, 1 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -10, -10, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 10, 20, 1 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 10, 20, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -29, 0, 1 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -29, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 29, -20, 1 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 29, -20, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -5, 10, 1 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -5, 10, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 17, -12, 1 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 17, -12, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, -20, 0, 1 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -20, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, -15, 15, 1 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, -15, 15, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 26, -5, 1 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 26, -5, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B80, ANIM_BATTLER_TARGET, 2, 0, 0, 1 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 0, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite2 gUnknown_08595B68, ANIM_BATTLER_TARGET, 2, 20, 2, 1 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, 20, 2, 1 playsewithpan SE_W196, SOUND_PAN_TARGET return IcyWindEffect1: @ Unused loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 0, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 0, 24, 0 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 8, 24, 0 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -8, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 8, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -8, 24, 0 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 16, 24, 0 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -16, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 16, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -16, 24, 0 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 24, 24, 0 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -24, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 24, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -24, 24, 0 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 32, 24, 0 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -32, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 32, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -32, 24, 0 return IcyWindEffect2: loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 0, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 0, 24, 1 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 8, 24, 1 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -8, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 8, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -8, 24, 1 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 16, 24, 1 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -16, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 16, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -16, 24, 1 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 24, 24, 1 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -24, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 24, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -24, 24, 1 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 32, 24, 1 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -32, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 32, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -32, 24, 1 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 40, 24, 1 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -40, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 40, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -40, 24, 1 delay 4 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, 48, 24, 1 - createsprite2 gUnknown_08595C04, ANIM_BATTLER_TARGET, 2, -48, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 48, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -48, 24, 1 return GrantingStarsEffect: - createsprite2 gUnknown_08592B7C, ANIM_BATTLER_ATTACKER, 2, -15, 0, 0, 0, 32, 60 + createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite2 gUnknown_08592B7C, ANIM_BATTLER_ATTACKER, 2, 12, -5, 0, 0, 32, 60 + createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 return HealingEffect: playsewithpan SE_W071B, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592F2C, ANIM_BATTLER_ATTACKER, 2, 0, -5, 0, 0 + createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 - createsprite2 gUnknown_08592F2C, ANIM_BATTLER_ATTACKER, 2, -15, 10, 0, 0 + createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, -15, 10, 0, 0 delay 7 - createsprite2 gUnknown_08592F2C, ANIM_BATTLER_ATTACKER, 2, -15, -15, 0, 0 + createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, -15, -15, 0, 0 delay 7 - createsprite2 gUnknown_08592F2C, ANIM_BATTLER_ATTACKER, 2, 10, -5, 0, 0 + createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, 10, -5, 0, 0 delay 7 return HealingEffect2: playsewithpan SE_W071B, SOUND_PAN_TARGET - createsprite2 gUnknown_08592F2C, ANIM_BATTLER_TARGET, 2, 0, -5, 1, 0 + createsprite gUnknown_08592F2C, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 - createsprite2 gUnknown_08592F2C, ANIM_BATTLER_TARGET, 2, -15, 10, 1, 0 + createsprite gUnknown_08592F2C, ANIM_TARGET, 2, -15, 10, 1, 0 delay 7 - createsprite2 gUnknown_08592F2C, ANIM_BATTLER_TARGET, 2, -15, -15, 1, 0 + createsprite gUnknown_08592F2C, ANIM_TARGET, 2, -15, -15, 1, 0 delay 7 - createsprite2 gUnknown_08592F2C, ANIM_BATTLER_TARGET, 2, 10, -5, 1, 0 + createsprite gUnknown_08592F2C, ANIM_TARGET, 2, 10, -5, 1, 0 delay 7 return PoisonBubblesEffect: - createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, 10, 0 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -20, 0 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, 15, 0 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 0 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, -20, 0 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0 playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite2 gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, -8, 0 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0 playsewithpan SE_W092, SOUND_PAN_TARGET return WaterBubbleEffect: - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 0 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -20, 0 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, 15, 0 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, -20, 0 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, -8, 0 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET return WaterBubbleEffect2: - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 1 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -28, -10, 1 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -20, 1 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, 15, 1 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 8, 1 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, -20, 1 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite2 gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, -8, 1 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET return ElectricityEffect: playsewithpan SE_W085B, SOUND_PAN_TARGET - createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, 0, 5, 0 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0 delay 2 - createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, 10, 5, 1 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1 delay 2 - createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 20, 5, 2 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2 delay 2 - createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, -10, 5, 0 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0 delay 2 - createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 25, 0, 5, 1 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1 delay 2 - createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -8, 8, 5, 2 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2 delay 2 - createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 2, -8, 5, 0 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0 delay 2 - createsprite2 gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, 15, 5, 1 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1 return ConfusionEffect: loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6 - createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 0, 3, 90 - createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 51, 3, 90 - createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 102, 3, 90 - createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 153, 3, 90 - createsprite2 gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 204, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 51, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 102, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 153, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 204, 3, 90 return SetPsychicBackground: @@ -10212,7 +10212,7 @@ UnsetSolarbeamBg: Status_Poison: loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 18, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end @@ -10230,65 +10230,65 @@ Status_Burn: waitforvisualfinish end Burn1: - createsprite2 gUnknown_08595504, ANIM_BATTLER_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 + createsprite gUnknown_08595504, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 delay 4 return Status_Infatuation: loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 0, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20 delay 15 playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, -20, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20 delay 15 playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08593970, ANIM_BATTLER_ATTACKER, 3, 20, 20 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20 end Status_Sleep: loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_W173, SOUND_PAN_ATTACKER - createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 - createsprite2 gUnknown_08592C88, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 end Status_Paralysis: loadspritegfx ANIM_TAG_SPARK_2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 call ElectricityEffect end Status_Freeze: playsewithpan SE_W196, 0 loadspritegfx ANIM_TAG_ICE_CUBE - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 createvisualtask sub_80A9EF4, 2 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Status_Curse: loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_8596DE8, ANIM_BATTLER_TARGET, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596DE8, ANIM_TARGET, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Status_Nightmare: loadspritegfx ANIM_TAG_DEVIL - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_8596E00, ANIM_BATTLER_TARGET, 2 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596E00, ANIM_TARGET, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end General_CastformChange: @@ -10296,12 +10296,12 @@ General_CastformChange: jumpreteq 1, AnimScript_82D7ECA goto AnimScript_82D7EB2 AnimScript_82D7EB2: - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 createvisualtask sub_815B7D0, 2, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER end AnimScript_82D7ECA: createvisualtask sub_815BB58, 2, 1 @@ -10313,12 +10313,12 @@ General_StatsChange: end General_SubstituteFade: - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER createvisualtask sub_8172D98, 5 createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE waitforvisualfinish delay 1 - clearmonbg ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER delay 2 blendoff createvisualtask sub_8116620, 10, 2, 0, 0, 0, RGB_WHITE @@ -10334,17 +10334,17 @@ General_PokeblockThrow: createvisualtask sub_81732B0, 2 delay 0 waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 - createsprite2 gBattleAnimSpriteTemplate_85E5338, ANIM_BATTLER_TARGET, 3, -18, 12, 0, 32 + createsprite gBattleAnimSpriteTemplate_85E5338, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 - createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_BATTLER_TARGET + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET waitforvisualfinish createvisualtask sub_81732E4, 2 end General_ItemKnockoff: loadspritegfx ANIM_TAG_ITEM_BAG - createsprite2 gBattleAnimSpriteTemplate_8592628, ANIM_BATTLER_TARGET, 2 + createsprite gBattleAnimSpriteTemplate_8592628, ANIM_TARGET, 2 end General_TurnTrap: @@ -10357,11 +10357,11 @@ General_TurnTrap: Status_BindWrap: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 - createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 4, 0, 16, 0, 1 + createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 - createsprite2 gUnknown_08592494, ANIM_BATTLER_TARGET, 2, 0, 8, 1, 1 + createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 1 delay 3 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 setarg 7, -1 playsewithpan SE_W020, SOUND_PAN_TARGET @@ -10370,7 +10370,7 @@ Status_BindWrap: Status_FireSpin: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 30, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call FireSpinEffect call FireSpinEffect waitforvisualfinish @@ -10378,46 +10378,46 @@ Status_FireSpin: end Status_Whrilpool: loadspritegfx ANIM_TAG_WATER_ORB - monbg ANIM_BATTLER_DEF_PARTNER - monbgprio_28 ANIM_BATTLER_TARGET + monbg ANIM_DEF_PARTNER + monbgprio_28 ANIM_TARGET setalpha 12, 8 delay 0 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 30, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call WhirlpoolEffect call WhirlpoolEffect delay 12 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 7, 0, RGB(0, 13, 23) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish stopsound - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER end Status_Clamp: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite2 gUnknown_08597098, ANIM_BATTLER_ATTACKER, 2, -32, 0, 2, 819, 0, 10 - createsprite2 gUnknown_08597098, ANIM_BATTLER_ATTACKER, 2, 32, 0, 6, -819, 0, 10 + createsprite gUnknown_08597098, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 3, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff waitforvisualfinish end Status_SandTomb: loadspritegfx ANIM_TAG_MUD_SAND - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask AnimTask_ShakeMon, 5, ANIM_BATTLER_TARGET, 0, 2, 30, 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 playsewithpan SE_W328, SOUND_PAN_TARGET call SandTombEffect call SandTombEffect delay 22 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish stopsound end @@ -10439,58 +10439,58 @@ General_ItemEffect: call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 3, 7, 0, RGB(17, 31, 25) - createsprite2 gUnknown_0859381C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, RGB(17, 31, 25) + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish end General_SmokeballEscape: loadspritegfx ANIM_TAG_PINK_CLOUD - monbg ANIM_BATTLER_ATTACKER + monbg ANIM_ATTACKER setalpha 12, 4 delay 0 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE734, ANIM_BATTLER_TARGET, 0, 0, 32, 28, 30 + createsprite gUnknown_085CE734, ANIM_TARGET, 0, 0, 32, 28, 30 delay 4 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 127, 2, 12, 20, 30 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 127, 2, 12, 20, 30 delay 12 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 126, 2, -28, 4, 30 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 126, 2, -28, 4, 30 delay 12 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 124, 2, 14, -20, 30 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 124, 2, 14, -20, 30 delay 4 playsewithpan SE_BOWA2, SOUND_PAN_TARGET createvisualtask sub_81136E8, 2, 2 - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 123, 3, 4, 4, 30 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 123, 3, 4, 4, 30 delay 14 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 122, 3, -14, 18, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 122, 3, -14, 18, 46 delay 0 - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 121, 3, 14, -14, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 121, 3, 14, -14, 46 delay 0 - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 120, 3, -12, -10, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 120, 3, -12, -10, 46 delay 0 - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 119, 3, 14, 14, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 119, 3, 14, 14, 46 delay 0 - createsprite2 gUnknown_085CE734, ANIM_BATTLER_ATTACKER, 118, 3, 0, 0, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 118, 3, 0, 0, 46 waitforvisualfinish - clearmonbg ANIM_BATTLER_ATTACKER - invisible ANIM_BATTLER_ATTACKER + clearmonbg ANIM_ATTACKER + invisible ANIM_ATTACKER delay 0 blendoff end General_HangedOn: - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 2, 7, 0, 9, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, RGB_RED playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 2, 4, 9, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, RGB_RED waitforvisualfinish delay 6 - createsprite2 gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 0, 0, 15 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 0, 0, 0, 15 end General_Rain: @@ -10522,13 +10522,13 @@ General_LeechSeedDrain: General_MonHit: loadspritegfx ANIM_TAG_IMPACT - monbg ANIM_BATTLER_TARGET + monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_TARGET + clearmonbg ANIM_TARGET blendoff end @@ -10537,7 +10537,7 @@ General_ItemSteal: createvisualtask sub_8117F30, 2 createvisualtask sub_8172ED0, 2 delay 1 - createsprite2 gUnknown_08592670, ANIM_BATTLER_ATTACKER, 2, 0, -5, 10, 2, -1 + createsprite gUnknown_08592670, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end General_SnatchMove: @@ -10545,7 +10545,7 @@ General_SnatchMove: createvisualtask sub_8117E94, 2 call AnimScript_82D85A3 delay 1 - createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_BATTLER_TARGET + createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_TARGET waitforvisualfinish createvisualtask AnimTask_IsTargetSameSide, 2 jumpretfalse SnatchOpposingMonMove @@ -10565,18 +10565,18 @@ SnatchPartnerMonMove: General_FutureSightHit: createvisualtask sub_8117F10, 2 - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_TARGET waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 - createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_BATTLER_TARGET, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1 waitforvisualfinish - createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 24, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 24, 1 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish delay 1 @@ -10586,7 +10586,7 @@ General_FutureSightHit: General_DoomDesireHit: createvisualtask sub_8117F10, 2 loadspritegfx ANIM_TAG_EXPLOSION - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 createvisualtask sub_815C0A4, 5 @@ -10597,23 +10597,23 @@ General_DoomDesireHit: delay 9 playsewithpan SE_W109, SOUND_PAN_TARGET delay 25 - createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite2 gBattleAnimSpriteTemplate_859371C, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end @@ -10623,7 +10623,7 @@ General_FocusPunchSetUp: call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 call EndureEffect delay 8 call EndureEffect @@ -10633,9 +10633,9 @@ General_FocusPunchSetUp: General_IngrainHeal: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish delay 3 call AbsorbEffect @@ -10643,15 +10643,15 @@ General_IngrainHeal: delay 15 call HealingEffect waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff end General_WishHeal: loadspritegfx ANIM_TAG_SPARKLE_2 - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W025, SOUND_PAN_ATTACKER call GrantingStarsEffect @@ -10660,7 +10660,7 @@ General_WishHeal: loadspritegfx ANIM_TAG_BLUE_STAR call HealingEffect waitforvisualfinish - createsprite2 gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK end AnimScript_82D85A3: @@ -10720,13 +10720,13 @@ BallThrowEnd: BallThrowTrainerBlock: loadspritegfx ANIM_TAG_IMPACT delay 25 - monbg ANIM_BATTLER_DEF_PARTNER + monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -4, -20, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish - clearmonbg ANIM_BATTLER_DEF_PARTNER + clearmonbg ANIM_DEF_PARTNER blendoff goto BallThrowEnd diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 709f4b7b2..34a45395c 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -298,10 +298,10 @@ #define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // battlers -#define ANIM_BATTLER_ATTACKER 0 -#define ANIM_BATTLER_TARGET 1 -#define ANIM_BATTLER_ATK_PARTNER 2 -#define ANIM_BATTLER_DEF_PARTNER 3 +#define ANIM_ATTACKER 0 +#define ANIM_TARGET 1 +#define ANIM_ATK_PARTNER 2 +#define ANIM_DEF_PARTNER 3 // stereo panning constants [0-255] // diff --git a/src/battle_anim.c b/src/battle_anim.c index d9eefd510..aa9637889 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1862,7 +1862,7 @@ static void ScriptCmd_monbg(void) sBattleAnimScriptPtr++; animBattler = sBattleAnimScriptPtr[0]; - if (animBattler & ANIM_BATTLER_TARGET) + if (animBattler & ANIM_TARGET) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -2119,12 +2119,12 @@ static void ScriptCmd_clearmonbg(void) sBattleAnimScriptPtr++; animBattlerId = sBattleAnimScriptPtr[0]; - if (animBattlerId == ANIM_BATTLER_ATTACKER) - animBattlerId = ANIM_BATTLER_ATK_PARTNER; - else if (animBattlerId == ANIM_BATTLER_TARGET) - animBattlerId = ANIM_BATTLER_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; @@ -2181,12 +2181,12 @@ static void ScriptCmd_monbg_22(void) animBattlerId = sBattleAnimScriptPtr[0]; - if (animBattlerId == ANIM_BATTLER_ATTACKER) - animBattlerId = ANIM_BATTLER_ATK_PARTNER; - else if (animBattlerId == ANIM_BATTLER_TARGET) - animBattlerId = ANIM_BATTLER_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; @@ -2226,12 +2226,12 @@ static void ScriptCmd_clearmonbg_23(void) sBattleAnimScriptPtr++; animBattlerId = sBattleAnimScriptPtr[0]; - if (animBattlerId == ANIM_BATTLER_ATTACKER) - animBattlerId = ANIM_BATTLER_ATK_PARTNER; - else if (animBattlerId == ANIM_BATTLER_TARGET) - animBattlerId = ANIM_BATTLER_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; @@ -2956,7 +2956,7 @@ static void ScriptCmd_monbgprio_28(void) wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; - if (wantedBattler != ANIM_BATTLER_ATTACKER) + if (wantedBattler != ANIM_ATTACKER) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -2989,7 +2989,7 @@ static void ScriptCmd_monbgprio_2A(void) sBattleAnimScriptPtr += 2; if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget)) { - if (wantedBattler != ANIM_BATTLER_ATTACKER) + if (wantedBattler != ANIM_ATTACKER) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -3036,15 +3036,15 @@ static void ScriptCmd_doublebattle_2D(void) if (!IsContest() && IsDoubleBattle() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (wantedBattler == ANIM_BATTLER_ATTACKER) + if (wantedBattler == ANIM_ATTACKER) { r4 = sub_80A8364(gBattleAnimAttacker); - spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); + spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); } else { r4 = sub_80A8364(gBattleAnimTarget); - spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET); + spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } if (spriteId != 0xFF) { @@ -3071,15 +3071,15 @@ static void ScriptCmd_doublebattle_2E(void) if (!IsContest() && IsDoubleBattle() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (wantedBattler == ANIM_BATTLER_ATTACKER) + if (wantedBattler == ANIM_ATTACKER) { r4 = sub_80A8364(gBattleAnimAttacker); - spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); + spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); } else { r4 = sub_80A8364(gBattleAnimTarget); - spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET); + spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } if (spriteId != 0xFF && r4 == 2) diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index 351a5c20d..ebe1718b7 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -395,7 +395,7 @@ u8 GetAnimBattlerSpriteId(u8 which) { u8 *sprites; - if (which == ANIM_BATTLER_ATTACKER) + if (which == ANIM_ATTACKER) { if (IsBattlerSpritePresent(gBattleAnimAttacker)) { @@ -407,7 +407,7 @@ u8 GetAnimBattlerSpriteId(u8 which) return 0xff; } } - else if (which == ANIM_BATTLER_TARGET) + else if (which == ANIM_TARGET) { if (IsBattlerSpritePresent(gBattleAnimTarget)) { @@ -419,7 +419,7 @@ u8 GetAnimBattlerSpriteId(u8 which) return 0xff; } } - else if (which == ANIM_BATTLER_ATK_PARTNER) + else if (which == ANIM_ATK_PARTNER) { if (!IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) return 0xff; @@ -1236,7 +1236,7 @@ bool8 sub_80A7238(void) { if (IsContest()) { - if (gSprites[GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER)].data[2] == SPECIES_UNOWN) + if (gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].data[2] == SPECIES_UNOWN) return FALSE; else return TRUE; @@ -2334,7 +2334,7 @@ void sub_80A8BC4(u8 taskId) u16 dest; struct Task *task = &gTasks[taskId]; - task->data[0] = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); + task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[1] = ((GetBattlerSide(gBattleAnimAttacker)) != B_SIDE_PLAYER) ? -8 : 8; task->data[2] = 0; task->data[3] = 0; diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index c178a57dc..7b8eb4ed7 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -130,7 +130,7 @@ void sub_8158D8C(u8 taskId) s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); if (IsContest()) { - if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER) + if (gBattleAnimArgs[0] == ANIM_ATTACKER) species = gContestResources->field_18->unk0; else DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. @@ -140,17 +140,17 @@ void sub_8158D8C(u8 taskId) u8 battlerId; // Get wanted battler. - if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER) + if (gBattleAnimArgs[0] == ANIM_ATTACKER) battlerId = gBattleAnimAttacker; - else if (gBattleAnimArgs[0] == ANIM_BATTLER_TARGET) + else if (gBattleAnimArgs[0] == ANIM_TARGET) battlerId = gBattleAnimTarget; - else if (gBattleAnimArgs[0] == ANIM_BATTLER_ATK_PARTNER) + else if (gBattleAnimArgs[0] == ANIM_ATK_PARTNER) battlerId = BATTLE_PARTNER(gBattleAnimAttacker); else battlerId = BATTLE_PARTNER(gBattleAnimTarget); // Check if battler is visible. - if ((gBattleAnimArgs[0] == ANIM_BATTLER_TARGET || gBattleAnimArgs[0] == ANIM_BATTLER_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) + if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) { DestroyAnimVisualTask(taskId); return; @@ -176,7 +176,7 @@ void sub_8158E9C(u8 taskId) s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); if (IsContest()) { - if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER) + if (gBattleAnimArgs[0] == ANIM_ATTACKER) species = gContestResources->field_18->unk0; else DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. @@ -186,17 +186,17 @@ void sub_8158E9C(u8 taskId) u8 battlerId; // Get wanted battler. - if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER) + if (gBattleAnimArgs[0] == ANIM_ATTACKER) battlerId = gBattleAnimAttacker; - else if (gBattleAnimArgs[0] == ANIM_BATTLER_TARGET) + else if (gBattleAnimArgs[0] == ANIM_TARGET) battlerId = gBattleAnimTarget; - else if (gBattleAnimArgs[0] == ANIM_BATTLER_ATK_PARTNER) + else if (gBattleAnimArgs[0] == ANIM_ATK_PARTNER) battlerId = BATTLE_PARTNER(gBattleAnimAttacker); else battlerId = BATTLE_PARTNER(gBattleAnimTarget); // Check if battler is visible. - if ((gBattleAnimArgs[0] == ANIM_BATTLER_TARGET || gBattleAnimArgs[0] == ANIM_BATTLER_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) + if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) { DestroyAnimVisualTask(taskId); return;