From 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 15:57:19 -0400 Subject: use sound panning constants in battle_anim_scripts --- data/battle_anim_scripts.s | 1976 ++++++++++++++++++++++---------------------- 1 file changed, 988 insertions(+), 988 deletions(-) (limited to 'data/battle_anim_scripts.s') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 624a5c69f..92aa51deb 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -422,7 +422,7 @@ Move_POUND: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -438,7 +438,7 @@ Move_DOUBLE_SLAP: AnimScript_82C93DA: createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -455,7 +455,7 @@ AnimScript_82C9408: Move_POISON_POWDER: loadspritegfx 0x2751 loadspritegfx 0x27A6 - loopsewithpan SE_W077, +63, 0xA, 0x6 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 0xA, 0x6 createsprite gUnknown_08592148, 0x82, -30, -22, 117, 80, 5, 1 createsprite gUnknown_08592148, 0x82, 10, -22, 117, 80, -5, 1 createsprite gUnknown_08592148, 0x82, -25, -22, 117, 112, 5, 3 @@ -479,7 +479,7 @@ Move_POISON_POWDER: Move_STUN_SPORE: loadspritegfx 0x2754 - loopsewithpan SE_W077, +63, 0xA, 0x6 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 0xA, 0x6 createsprite gUnknown_08592130, 0x82, -30, -22, 117, 80, 5, 1 createsprite gUnknown_08592130, 0x82, 10, -22, 117, 80, -5, 1 createsprite gUnknown_08592130, 0x82, -25, -22, 117, 112, 5, 3 @@ -503,7 +503,7 @@ Move_STUN_SPORE: Move_SLEEP_POWDER: loadspritegfx 0x2753 - loopsewithpan SE_W077, +63, 0xA, 0x6 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 0xA, 0x6 createsprite gUnknown_08592118, 0x82, -30, -22, 117, 80, 5, 1 createsprite gUnknown_08592118, 0x82, 10, -22, 117, 80, -5, 1 createsprite gUnknown_08592118, 0x82, -25, -22, 117, 112, 5, 3 @@ -530,21 +530,21 @@ Move_SWIFT: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 20, 1 delay 0x5 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592404, 0x83, 20, -10, 20, 5, 22, -18, 1 delay 0x5 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592404, 0x83, 20, -10, 20, -10, 22, 15, 1 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1 createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 18, 1 delay 0x5 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, -20, 1 delay 0x5 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 12, 1 delay 0x5 waitforvisualfinish @@ -556,20 +556,20 @@ Move_STRENGTH: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D5644, 0x5, 0, 2, 0, 96, 30 waitforvisualfinish delay 0xA createsprite gUnknown_0857FE58, 0x2, 0, 0, 4 createvisualtask sub_80D5830, 0x2, 1, 18, 6, 2, 4 delay 0x4 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 16, 12, 1, 1 delay 0x4 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, -16, -12, 1, 1 delay 0x4 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 3, 4, 1, 1 waitforvisualfinish createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 @@ -586,7 +586,7 @@ Move_TACKLE: delay 0x6 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -596,14 +596,14 @@ Move_BODY_SLAM: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 waitforvisualfinish delay 0xB createsprite gUnknown_0857FE70, 0x2, 0, 26, 0, 0, 5 delay 0x6 createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0 - loopsewithpan SE_W025B, +63, 0xA, 0x2 + loopsewithpan SE_W025B, SOUND_PAN_TARGET, 0xA, 0x2 delay 0x1 createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3 waitforvisualfinish @@ -636,7 +636,7 @@ Move_SUPERSONIC: end AnimScript_82C99FF: - playsewithpan SE_W048, -64 + playsewithpan SE_W048, SOUND_PAN_ATTACKER createsprite gUnknown_08593428, 0x82, 16, 0, 0, 0, 30, 0 delay 0x2 return @@ -652,7 +652,7 @@ Move_SCREECH: end AnimScript_82C9A4C: - playsewithpan SE_W103, -64 + playsewithpan SE_W103, SOUND_PAN_ATTACKER createsprite gUnknown_08593440, 0x82, 16, 0, 0, 0, 30, 0 delay 0x2 return @@ -662,31 +662,31 @@ Move_FLAME_WHEEL: monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createsprite gUnknown_08595584, 0x3, 0, 0, 56, 0 - playsewithpan SE_W172, -64 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 0x2 createsprite gUnknown_08595584, 0x3, 0, 0, 56, 4 - playsewithpan SE_W172, -64 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 0x2 createsprite gUnknown_08595584, 0x3, 0, 0, 56, 8 - playsewithpan SE_W172, -64 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 0x2 createsprite gUnknown_08595584, 0x3, 0, 0, 56, 12 - playsewithpan SE_W172, -64 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 0x2 createsprite gUnknown_08595584, 0x3, 0, 0, 56, 16 - playsewithpan SE_W172, -64 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 0x2 createsprite gUnknown_08595584, 0x3, 0, 0, 56, 20 - playsewithpan SE_W172, -64 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 0x2 createsprite gUnknown_08595584, 0x3, 0, 0, 56, 24 - playsewithpan SE_W172, -64 + playsewithpan SE_W172, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6 delay 0x4 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1 createvisualtask sub_80A7B98, 0x3, 1, RGB_RED, 12, 1, 1 - playsewithpan SE_W172B, +63 + playsewithpan SE_W172B, SOUND_PAN_TARGET call AnimScript_82D2D18 delay 0x7 createsprite gUnknown_0857FE58, 0x2, 0, 0, 9 @@ -705,22 +705,22 @@ Move_PIN_MISSILE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 0x80C - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gUnknown_08596A5C, 0x2, 20, -8, -8, -8, 20, -32 delay 0xF createsprite gUnknown_08596A5C, 0x2, 20, -8, 8, 8, 20, -40 delay 0x4 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 delay 0x9 createsprite gUnknown_08596A5C, 0x2, 20, -8, 0, 0, 20, -32 delay 0x4 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 delay 0xE - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 waitforvisualfinish @@ -734,22 +734,22 @@ Move_ICICLE_SPEAR: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 0x80C - playsewithpan SE_W196, -64 + playsewithpan SE_W196, SOUND_PAN_ATTACKER createsprite gUnknown_08596A74, 0x2, 20, -8, -8, -8, 20, -32 delay 0xF createsprite gUnknown_08596A74, 0x2, 20, -8, 8, 8, 20, -40 delay 0x4 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 delay 0x9 createsprite gUnknown_08596A74, 0x2, 20, -8, 0, 0, 20, -32 delay 0x4 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 delay 0xE - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 waitforvisualfinish @@ -765,7 +765,7 @@ Move_TAKE_DOWN: delay 0x23 createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0 createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET delay 0x1 createsprite gUnknown_0857FE70, 0x2, 1, -16, 0, 0, 4 waitforvisualfinish @@ -782,19 +782,19 @@ Move_TAKE_DOWN: Move_DOUBLE_EDGE: loadspritegfx 0x2797 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_0859728C, 0x2, 2, 4, 2, 0x7FFF, 10, 0, 0 waitforvisualfinish delay 0xA - playsewithpan SE_W207, -64 - waitplaysewithpan SE_W207, -64, 0x8 + playsewithpan SE_W207, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 0x8 createvisualtask sub_80D5830, 0x2, 0, 18, 6, 2, 4 waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, RGB_WHITE createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 delay 0x3 waitforvisualfinish - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x84, -10, 0, 1, 0 createsprite gUnknown_0857FE70, 0x2, 1, -32, 0, 0, 3 waitforvisualfinish @@ -820,12 +820,12 @@ Move_POISON_STING: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 0x80C - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gUnknown_08596A44, 0x82, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish call AnimScript_82D7A71 waitforvisualfinish @@ -839,13 +839,13 @@ Move_TWINEEDLE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 0x80C - loopsewithpan SE_W013B, -64, 0x6, 0x2 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x6, 0x2 createsprite gUnknown_08596A44, 0x82, 10, -4, 0, -4, 20 createsprite gUnknown_08596A44, 0x82, 20, 12, 10, 12, 20 delay 0x14 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 createsprite gUnknown_08597370, 0x3, 0, -4, 1, 3 - loopsewithpan SE_W030, +63, 0x5, 0x2 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 0x5, 0x2 delay 0x1 createsprite gUnknown_08597370, 0x3, 10, 12, 1, 3 waitforvisualfinish @@ -905,29 +905,29 @@ AnimScript_82CA02D: Move_LEECH_SEED: loadspritegfx 0x2716 - playsewithpan SE_W077, -64 + playsewithpan SE_W077, SOUND_PAN_ATTACKER createsprite gUnknown_085922BC, 0x82, 15, 0, 0, 24, 35, -32 delay 0x8 - playsewithpan SE_W077, -64 + playsewithpan SE_W077, SOUND_PAN_ATTACKER createsprite gUnknown_085922BC, 0x82, 15, 0, -16, 24, 35, -40 delay 0x8 - playsewithpan SE_W077, -64 + playsewithpan SE_W077, SOUND_PAN_ATTACKER createsprite gUnknown_085922BC, 0x82, 15, 0, 16, 24, 35, -37 delay 0xC - loopsewithpan SE_W039, +63, 0xA, 0x8 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 0xA, 0x8 waitforvisualfinish end Move_EMBER: loadspritegfx 0x272D - loopsewithpan SE_W052, -64, 0x5, 0x2 + loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 0x5, 0x2 createsprite gUnknown_085954D4, 0x82, 20, 0, -16, 24, 20, 1 delay 0x4 createsprite gUnknown_085954D4, 0x82, 20, 0, 0, 24, 20, 1 delay 0x4 createsprite gUnknown_085954D4, 0x82, 20, 0, 16, 24, 20, 1 delay 0x10 - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET call AnimScript_82CA135 call AnimScript_82CA135 call AnimScript_82CA135 @@ -945,7 +945,7 @@ Move_MEGA_PUNCH: delay 0x2 createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK setalpha 0x80C - playsewithpan SE_W025, +63 + playsewithpan SE_W025, SOUND_PAN_TARGET createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50 createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF delay 0x32 @@ -954,7 +954,7 @@ Move_MEGA_PUNCH: createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -993,11 +993,11 @@ Move_MEGA_KICK: delay 0x2 createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK setalpha 0x80C - playsewithpan SE_W025, +63 + playsewithpan SE_W025, SOUND_PAN_TARGET createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50 createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF delay 0x32 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET call AnimScript_82CA1E9 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 @@ -1020,7 +1020,7 @@ Move_COMET_PUNCH: AnimScript_82CA2D7: createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1053,7 +1053,7 @@ Move_SONIC_BOOM: end AnimScript_82CA372: - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gUnknown_08593398, 0x82, 16, 0, 0, 0, 15 delay 0x4 return @@ -1070,7 +1070,7 @@ Move_THUNDER_SHOCK: waitforvisualfinish delay 0xA createvisualtask sub_810A7DC, 0x5, 0, -44, 0 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 0x9 createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, 0 waitforvisualfinish @@ -1092,13 +1092,13 @@ Move_THUNDERBOLT: waitforvisualfinish delay 0xA createvisualtask sub_810A7DC, 0x5, 24, -52, 0 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 0x7 createvisualtask sub_810A7DC, 0x5, -24, -52, 0 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 0x7 createvisualtask sub_810A7DC, 0x5, 0, -60, 1 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 0x9 createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, 0 waitforvisualfinish @@ -1114,7 +1114,7 @@ Move_THUNDERBOLT: createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 96, 40, 1, -32765 createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 160, 40, 0, -32765 createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 224, 40, 2, -32765 - playsewithpan SE_W063, +63 + playsewithpan SE_W063, SOUND_PAN_TARGET delay 0x0 createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, 0 delay 0x6 @@ -1125,7 +1125,7 @@ Move_THUNDERBOLT: createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, 0 waitforvisualfinish delay 0x14 - waitplaysewithpan SE_W085B, +63, 0x13 + waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 0x13 call AnimScript_82D7BEA waitforvisualfinish delay 0x14 @@ -1141,9 +1141,9 @@ Move_THUNDER_WAVE: waitforvisualfinish delay 0xA createvisualtask sub_810A7DC, 0x5, 0, -48, 0 - playsewithpan SE_W086, +63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 0x14 - loopsewithpan SE_W085B, +63, 0xA, 0x4 + loopsewithpan SE_W085B, SOUND_PAN_TARGET, 0xA, 0x4 createsprite gUnknown_08595840, 0x82, -16, -16 delay 0x4 createsprite gUnknown_08595840, 0x82, -16, 0 @@ -1171,24 +1171,24 @@ AnimScript_82CA648: createsprite gUnknown_08597358, 0x82, -20, -20, 1, 2 createsprite gUnknown_08595E98, 0x83, -20, -12, 8, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2 createsprite gUnknown_08595E98, 0x83, 8, 8, 8, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET goto AnimScript_82CA643 AnimScript_82CA6B9: createsprite gUnknown_08597358, 0x82, 12, -20, 1, 2 createsprite gUnknown_08595E98, 0x83, 12, -12, 8, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08597358, 0x82, -12, 0, 1, 2 createsprite gUnknown_08595E98, 0x83, -12, 8, 8, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET goto AnimScript_82CA643 Move_STOMP: @@ -1196,19 +1196,19 @@ Move_STOMP: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W104, +63 + playsewithpan SE_W104, SOUND_PAN_TARGET createsprite gUnknown_08595F60, 0x3, 0, -32, 15 delay 0x13 createsprite gUnknown_08597358, 0x2, 0, -8, 1, 1 createvisualtask sub_80D51AC, 0x2, 1, 0, 4, 9, 1 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_TAIL_WHIP: - loopsewithpan SE_W039, -64, 0x18, 0x3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x18, 0x3 createvisualtask sub_80D5830, 0x2, 0, 12, 4, 2, 3 waitforvisualfinish end @@ -1217,7 +1217,7 @@ Move_CUT: loadspritegfx 0x279A monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W015, +63 + playsewithpan SE_W015, SOUND_PAN_TARGET createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 delay 0x5 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 @@ -1229,14 +1229,14 @@ Move_CUT: Move_HIDDEN_POWER: loadspritegfx 0x27E9 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 waitforvisualfinish delay 0x1E createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 31, 19), 12, 5, 1 delay 0x4 createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 - playsewithpan SE_W179, -64 + playsewithpan SE_W179, SOUND_PAN_ATTACKER createsprite gUnknown_08593A04, 0x2, 26, 0 createsprite gUnknown_08593A04, 0x2, 26, 42 createsprite gUnknown_08593A04, 0x2, 26, 84 @@ -1245,7 +1245,7 @@ Move_HIDDEN_POWER: createsprite gUnknown_08593A04, 0x2, 26, 210 delay 0x34 setarg 0x7, 0xFFFF - playsewithpan SE_W115, -64 + playsewithpan SE_W115, SOUND_PAN_ATTACKER createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 createsprite gUnknown_08593A1C, 0x82, 0 createsprite gUnknown_08593A1C, 0x82, 32 @@ -1261,13 +1261,13 @@ Move_REVERSAL: loadspritegfx 0x27FC loadspritegfx 0x279F loadspritegfx 0x2797 - playsewithpan SE_W197, -64 + playsewithpan SE_W197, SOUND_PAN_ATTACKER createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 0x7FFF, 8, 0, 0 waitforvisualfinish delay 0x1E createvisualtask sub_8115A04, 0x2, 31, 3, 2, 0, 10, 0x7FFF delay 0xA - playsewithpan SE_W179, -64 + playsewithpan SE_W179, SOUND_PAN_ATTACKER createsprite gUnknown_085CE5D8, 0x2, 26, 0 createsprite gUnknown_085CE5D8, 0x2, 26, 42 createsprite gUnknown_085CE5D8, 0x2, 26, 84 @@ -1278,7 +1278,7 @@ Move_REVERSAL: delay 0x14 createsprite gUnknown_0857FE28, 0x2, 6, 4 delay 0x8 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 8, 0, 0 createsprite gUnknown_08595E98, 0x84, 0, 0, 10, 1, 0 createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 @@ -1304,13 +1304,13 @@ AnimScript_82CA996: end AnimScript_82CA99F: - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 goto AnimScript_82CA996 AnimScript_82CA9C8: - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 goto AnimScript_82CA996 @@ -1323,7 +1323,7 @@ Move_SPIKE_CANNON: setalpha 0x80C createvisualtask sub_80D5C50, 0x5, 0, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, -64, 0x5, 0x3 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x5, 0x3 createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 createsprite gUnknown_08596A44, 0x2, 10, -8, -8, -8, 20 createsprite gUnknown_08596A44, 0x2, 18, 0, 0, 0, 20 @@ -1333,7 +1333,7 @@ Move_SPIKE_CANNON: createsprite gUnknown_08597370, 0x3, 0, 0, 1, 2 createsprite gUnknown_08597370, 0x3, 8, 8, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1 - loopsewithpan SE_W030, +63, 0x5, 0x3 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 0x5, 0x3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1343,7 +1343,7 @@ Move_SWORDS_DANCE: loadspritegfx 0x2715 monbg ANIM_ATTACKER setalpha 0x80C - playsewithpan SE_W014, -64 + playsewithpan SE_W014, SOUND_PAN_ATTACKER createvisualtask sub_80D5830, 0x2, 0, 16, 6, 1, 4 createsprite gUnknown_08593380, 0x2, 0, 0 delay 0x16 @@ -1359,12 +1359,12 @@ Move_PSYCH_UP: monbg ANIM_ATK_PARTNER createvisualtask sub_8115B0C, 0x2, 1, 2, 6, 1, 11, 0 setalpha 0x80C - loopsewithpan SE_W060B, -64, 0x5, 0xA + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 0x5, 0xA createsprite gUnknown_08596548, 0x2, 0, 0, 0, 0 createvisualtask sub_80D5EB8, 0x5, 0, 5, 2560, 8, 0 delay 0x7F delay 0x4 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 createvisualtask sub_8116620, 0x9, 2, 2, 10, 0, 1023 delay 0x1E @@ -1382,7 +1382,7 @@ Move_DIZZY_PUNCH: call AnimScript_82CAC77 createsprite gUnknown_08595E98, 0x85, 16, 8, 20, 1, 0 createsprite gUnknown_08597358, 0x84, 16, 0, 1, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08595F78, 0x83, 16, 8, 160, -32 createsprite gUnknown_08595F78, 0x83, 16, 8, -256, -40 createsprite gUnknown_08595F78, 0x83, 16, 8, 128, -16 @@ -1393,7 +1393,7 @@ Move_DIZZY_PUNCH: call AnimScript_82CAC77 createsprite gUnknown_08595E98, 0x85, -16, -8, 20, 1, 0 createsprite gUnknown_08597358, 0x84, -16, -16, 1, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08595F78, 0x83, -16, -8, 160, -32 createsprite gUnknown_08595F78, 0x83, -16, -8, -256, -40 createsprite gUnknown_08595F78, 0x83, -16, -8, 128, -16 @@ -1413,7 +1413,7 @@ AnimScript_82CAC77: Move_FIRE_SPIN: loadspritegfx 0x272D - playsewithpan SE_W221B, +63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 47, 1 call AnimScript_82CACBF call AnimScript_82CACBF @@ -1440,7 +1440,7 @@ Move_FURY_CUTTER: loadspritegfx 0x279A monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask sub_8107144, 0x2 jumpargeq 0x7, 0x0, AnimScript_82CADA7 goto AnimScript_82CADB9 @@ -1496,19 +1496,19 @@ Move_SELF_DESTRUCT: end AnimScript_82CAE9F: - playsewithpan SE_W120, -64 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 delay 0x6 - playsewithpan SE_W120, -64 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1 delay 0x6 - playsewithpan SE_W120, -64 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1 delay 0x6 - playsewithpan SE_W120, -64 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1 delay 0x6 - playsewithpan SE_W120, -64 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1 delay 0x6 return @@ -1518,12 +1518,12 @@ Move_SLAM: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W004, -64 + playsewithpan SE_W004, SOUND_PAN_ATTACKER createsprite gUnknown_0857FE70, 0x2, 0, 20, 3, 0, 4 delay 0x1 createsprite gUnknown_085928D0, 0x2, 0, 0 delay 0x3 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3 createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 @@ -1539,10 +1539,10 @@ Move_SLAM: Move_VINE_WHIP: loadspritegfx 0x282F - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gUnknown_0857FE28, 0x2, 4, 6 delay 0x6 - playsewithpan SE_W010, +63 + playsewithpan SE_W010, SOUND_PAN_TARGET createsprite gUnknown_085928E8, 0x82, 0, 0 delay 0x6 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 1 @@ -1552,12 +1552,12 @@ Move_DRILL_PECK: loadspritegfx 0x2797 loadspritegfx 0x27B2 createsprite gUnknown_08592CD8, 0x2, 0 - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 0x2 createsprite gUnknown_08592CD8, 0x2, 1 delay 0x2 - loopsewithpan SE_W030, +63, 0x4, 0x8 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 0x4, 0x8 createvisualtask sub_810EB88, 0x5 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 waitforvisualfinish @@ -1575,28 +1575,28 @@ Move_WATERFALL: setalpha 0x80C createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 23, 1 delay 0x5 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gUnknown_08595238, 0x2, 10, 10, 25, 0 delay 0x4 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gUnknown_08595238, 0x2, -15, 0, 25, 0 delay 0x4 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gUnknown_08595238, 0x2, 20, 10, 25, 0 delay 0x4 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gUnknown_08595238, 0x2, 0, -10, 25, 0 delay 0x4 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gUnknown_08595238, 0x2, -10, 15, 25, 0 delay 0x4 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gUnknown_08595238, 0x2, 25, 20, 25, 0 delay 0x4 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gUnknown_08595238, 0x2, -20, 20, 25, 0 delay 0x4 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gUnknown_08595238, 0x2, 12, 0, 25, 0 waitforvisualfinish delay 0xA @@ -1609,7 +1609,7 @@ Move_WATERFALL: end AnimScript_82CB102: - playsewithpan SE_W127, +63 + playsewithpan SE_W127, SOUND_PAN_TARGET createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 17, 1 createsprite gUnknown_08597388, 0x3, 0, 20, 1, 1 createsprite gUnknown_08595250, 0x4, 0, 20 @@ -1665,26 +1665,26 @@ Move_EXPLOSION: end AnimScript_82CB312: - playsewithpan SE_W153, -64 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 delay 0x6 - playsewithpan SE_W153, -64 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1 delay 0x6 - playsewithpan SE_W153, -64 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1 delay 0x6 - playsewithpan SE_W153, -64 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1 delay 0x6 - playsewithpan SE_W153, -64 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1 delay 0x6 return Move_DEFENSE_CURL: loadspritegfx 0x27FA - loopsewithpan SE_W161, -64, 0x12, 0x3 + loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 0x12, 0x3 createvisualtask sub_811489C, 0x5, 0, 0 createvisualtask sub_815B338, 0x5 waitforvisualfinish @@ -1698,7 +1698,7 @@ Move_PROTECT: loadspritegfx 0x2828 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - waitplaysewithpan SE_W115, -64, 0x10 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 0x10 createsprite gUnknown_08592ADC, 0x2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1710,7 +1710,7 @@ Move_DETECT: waitforvisualfinish createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 0x7FFF delay 0x12 - playsewithpan SE_W197, -64 + playsewithpan SE_W197, SOUND_PAN_ATTACKER createsprite gUnknown_0853EE84, 0xD, 20, -20 waitforvisualfinish delay 0xA @@ -1737,15 +1737,15 @@ AnimScript_82CB45F: end AnimScript_82CB464: - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 waitforvisualfinish delay 0x14 - playsewithpan SE_W207B, -64 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER createsprite gUnknown_0859368C, 0x2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, -64 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER createsprite gUnknown_0859368C, 0x2, 0, 20, -28 waitforvisualfinish delay 0xA @@ -1753,47 +1753,47 @@ AnimScript_82CB464: delay 0x5 createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 30, 1 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08597358, 0x3, 24, 8, 1, 0 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08597358, 0x3, -24, -16, 1, 0 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08597358, 0x3, 8, 4, 1, 0 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08597358, 0x3, -16, 19, 1, 0 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08597358, 0x3, 18, -18, 1, 0 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 goto AnimScript_82CB45F AnimScript_82CB56A: - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 waitforvisualfinish delay 0x14 - playsewithpan SE_W207B, -64 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER createsprite gUnknown_0859368C, 0x2, 0, 20, -28 waitforvisualfinish delay 0x5 createvisualtask sub_815C3A8, 0x5 delay 0x7 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 8, 1, 1 createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 delay 0xE - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 12, -6, 1, 1 createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 delay 0xE - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, -12, -6, 1, 1 createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -1801,19 +1801,19 @@ AnimScript_82CB56A: goto AnimScript_82CB45F AnimScript_82CB637: - playsewithpan SE_W207B, -64 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER createsprite gUnknown_0859368C, 0x2, 0, 20, -28 waitforvisualfinish delay 0x5 createsprite gUnknown_0857FE28, 0x2, 4, 4 delay 0x6 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 10, 4, 1, 1 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish createsprite gUnknown_0857FE28, 0x2, 4, 4 delay 0x6 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, -10, -4, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 goto AnimScript_82CB45F @@ -1824,7 +1824,7 @@ AnimScript_82CB6B3: delay 0xA createsprite gUnknown_0857FE28, 0x2, 10, 2 delay 0xC - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 goto AnimScript_82CB45F @@ -1833,14 +1833,14 @@ Move_SAFEGUARD: loadspritegfx 0x2804 monbg ANIM_ATK_PARTNER setalpha 0x808 - playsewithpan SE_W208, -64 + playsewithpan SE_W208, SOUND_PAN_ATTACKER createsprite gUnknown_08593C64, 0x2 delay 0x4 createsprite gUnknown_08593C64, 0x2 delay 0x4 createsprite gUnknown_08593C64, 0x2 waitforvisualfinish - playsewithpan SE_REAPOKE, -64 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 0x2, 10, 0, 2, 0, 10, 0x7FFF waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1876,7 +1876,7 @@ Move_VICE_GRIP: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W011, +63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gUnknown_08593590, 0x2, 0 createsprite gUnknown_08593590, 0x2, 1 delay 0x9 @@ -1894,7 +1894,7 @@ Move_GUILLOTINE: setalpha 0x80C fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein - playsewithpan SE_W011, +63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gUnknown_085935D0, 0x2, 0 createsprite gUnknown_085935D0, 0x2, 1 createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, 0 @@ -1904,7 +1904,7 @@ Move_GUILLOTINE: createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 8, 1 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -1918,10 +1918,10 @@ Move_PAY_DAY: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 0x80C - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gUnknown_085934D8, 0x2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, +63 + playsewithpan SE_W006, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2 createsprite gUnknown_085934F0, 0x2 createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 @@ -1932,7 +1932,7 @@ Move_PAY_DAY: Move_OUTRAGE: loadspritegfx 0x272D - loopsewithpan SE_W082, -64, 0x8, 0x3 + loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 0x8, 0x3 createvisualtask sub_8115A04, 0x2, 7, 2, 5, 3, 8, 430 createvisualtask sub_80D5830, 0x2, 0, 12, 6, 5, 4 delay 0x0 @@ -1981,7 +1981,7 @@ Move_SPARK: loadspritegfx 0x271B delay 0x0 createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, -64 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER createsprite gUnknown_0859574C, 0x0, 32, 24, 190, 12, 0, 1, 0 delay 0x0 createsprite gUnknown_0859574C, 0x0, 80, 24, 22, 12, 0, 1, 0 @@ -1990,7 +1990,7 @@ Move_SPARK: createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 delay 0xA createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, -64 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER createsprite gUnknown_0859574C, 0x0, 100, 24, 60, 10, 0, 1, 0 createsprite gUnknown_0859574C, 0x0, 170, 24, 42, 11, 0, 1, 1 delay 0x0 @@ -1999,7 +1999,7 @@ Move_SPARK: createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 delay 0x14 createvisualtask sub_8115A04, 0x2, 3, -31, 1, 7, 7, 23551 - playsewithpan SE_W085B, -64 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 64, 20, 1, 0 createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 128, 20, 0, 0 @@ -2013,7 +2013,7 @@ Move_SPARK: createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 createsprite gUnknown_0857FE28, 0x2, 4, 4 delay 0x4 - playsewithpan SE_W063, +63 + playsewithpan SE_W063, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -2024,12 +2024,12 @@ Move_SPARK: Move_ATTRACT: loadspritegfx 0x27E8 - loopsewithpan SE_W204, -64, 0xC, 0x3 + loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 0xC, 0x3 createvisualtask sub_80D5EB8, 0x5, 0, 12, 4096, 4, 0 delay 0xF createsprite gUnknown_085939A0, 0x83, 20, -8 waitforvisualfinish - playsewithpan SE_W213, +63 + playsewithpan SE_W213, SOUND_PAN_TARGET createsprite gUnknown_085939B8, 0x83, 160, -32 createsprite gUnknown_085939B8, 0x83, -256, -40 createsprite gUnknown_085939B8, 0x83, 128, -16 @@ -2060,7 +2060,7 @@ Move_GROWTH: AnimScript_82CBDC0: createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D6064, 0x5, -3, -3, 16, 0, 0 return @@ -2073,12 +2073,12 @@ Move_WHIRLWIND: createsprite gUnknown_085963D4, 0x2, 0, 24, 1, 60, 4 createsprite gUnknown_085963D4, 0x2, 0, 32, 1, 60, 0 delay 0x5 - loopsewithpan SE_W104, +63, 0xA, 0x4 + loopsewithpan SE_W104, SOUND_PAN_TARGET, 0xA, 0x4 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 15, 1 delay 0x1D createvisualtask sub_80D5830, 0x2, 1, 12, 6, 1, 5 delay 0x7 - playsewithpan SE_W081, +63 + playsewithpan SE_W081, SOUND_PAN_TARGET createvisualtask sub_80D5DB0, 0x5, 1, 8 waitforvisualfinish end @@ -2093,7 +2093,7 @@ Move_CONFUSE_RAY: createsprite gUnknown_08596D14, 0x82, 28, 0, 288 waitforvisualfinish setalpha 0x808 - playsewithpan SE_W081B, +63 + playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gUnknown_08596D2C, 0x82, 0, -16 waitforvisualfinish delay 0x0 @@ -2118,10 +2118,10 @@ Move_LOCK_ON: Move_MEAN_LOOK: loadspritegfx 0x27CB monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK - loopsewithpan SE_W109, +63, 0xF, 0x4 - waitplaysewithpan SE_W043, +63, 0x55 + loopsewithpan SE_W109, SOUND_PAN_TARGET, 0xF, 0x4 + waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 0x55 createsprite gUnknown_085CE104, 0x2 delay 0x78 createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK @@ -2134,20 +2134,20 @@ Move_ROCK_THROW: loadspritegfx 0x274A createsprite gUnknown_085972D8, 0x82, 6, 1, 15, 1 createsprite gUnknown_08596B04, 0x82, 0, 1, 0, 0 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 0 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 0 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 20, 1 delay 0x6 createsprite gUnknown_08596B04, 0x82, -15, 1, -10, 0 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596B04, 0x82, 23, 2, 10, 0 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish end @@ -2156,16 +2156,16 @@ Move_ROCK_SLIDE: monbg ANIM_DEF_PARTNER createsprite gUnknown_085972D8, 0x2, 7, 1, 11, 1 createsprite gUnknown_08596B04, 0x82, -5, 1, -5, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, 5, 0, 6, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 50, 1 createvisualtask sub_80D51AC, 0x2, 3, 0, 5, 50, 1 delay 0x2 @@ -2177,28 +2177,28 @@ Move_ROCK_SLIDE: AnimScript_82CC083: createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, 28, 1, 10, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, -10, 1, -5, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, 10, 0, 6, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, 24, 1, 10, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, -32, 2, -10, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08596B04, 0x82, 30, 2, 10, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x2 return @@ -2211,7 +2211,7 @@ Move_THIEF: setalpha 0x80C createsprite gUnknown_0857FE28, 0x2, 6, 4 delay 0x6 - playsewithpan SE_W233, +63 + playsewithpan SE_W233, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 8, 1 waitforvisualfinish @@ -2242,22 +2242,22 @@ Move_BUBBLE_BEAM: AnimScript_82CC1AD: createsprite gUnknown_08595068, 0x2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, -64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 0x3 createsprite gUnknown_08595068, 0x2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, -64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 0x3 createsprite gUnknown_08595068, 0x2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, -64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 0x3 createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, -64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 0x3 createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, -64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 0x3 createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, -64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 0x3 return @@ -2271,11 +2271,11 @@ Move_ICY_WIND: playsewithpan SE_W196, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, -64, +63, +2, 0x0 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 call AnimScript_82CC2A8 delay 0x5 call AnimScript_82CC2A8 - playsewithpan SE_W016B, +63 + playsewithpan SE_W016B, SOUND_PAN_TARGET delay 0x37 call AnimScript_82D78F8 waitforvisualfinish @@ -2301,12 +2301,12 @@ AnimScript_82CC2A8: Move_SMOKESCREEN: loadspritegfx 0x2720 loadspritegfx 0x2721 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createsprite gUnknown_085CE050, 0x82, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask sub_815A160, 0x2 delay 0x2 - playsewithpan SE_W028, +63 + playsewithpan SE_W028, SOUND_PAN_TARGET createsprite gUnknown_085CE038, 0x84, 0, -12, 104, 0, 75 createsprite gUnknown_085CE038, 0x84, 0, -12, 72, 1, 75 createsprite gUnknown_085CE038, 0x84, 0, -6, 56, 1, 75 @@ -2328,7 +2328,7 @@ Move_CONVERSION: monbgprio_28 ANIM_ATTACKER setalpha 0x10 delay 0x0 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592E74, 0x2, -24, -24 delay 0x3 createsprite gUnknown_08592E74, 0x2, -8, -24 @@ -2337,7 +2337,7 @@ Move_CONVERSION: delay 0x3 createsprite gUnknown_08592E74, 0x2, 24, -24 delay 0x3 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592E74, 0x2, -24, -8 delay 0x3 createsprite gUnknown_08592E74, 0x2, -8, -8 @@ -2346,7 +2346,7 @@ Move_CONVERSION: delay 0x3 createsprite gUnknown_08592E74, 0x2, 24, -8 delay 0x3 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592E74, 0x2, -24, 8 delay 0x3 createsprite gUnknown_08592E74, 0x2, -8, 8 @@ -2355,7 +2355,7 @@ Move_CONVERSION: delay 0x3 createsprite gUnknown_08592E74, 0x2, 24, 8 delay 0x3 - playsewithpan SE_W129, -64 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gUnknown_08592E74, 0x2, -24, 24 delay 0x3 createsprite gUnknown_08592E74, 0x2, -8, 24 @@ -2364,7 +2364,7 @@ Move_CONVERSION: delay 0x3 createsprite gUnknown_08592E74, 0x2, 24, 24 delay 0x14 - playsewithpan SE_W112, -64 + playsewithpan SE_W112, SOUND_PAN_ATTACKER createvisualtask sub_8115D94, 0x2, 10018, 1, 1, 14335, 12, 0, 0 delay 0x6 createvisualtask sub_81022D4, 0x5 @@ -2380,7 +2380,7 @@ Move_CONVERSION_2: monbgprio_2A ANIM_TARGET setalpha 0x1000 delay 0x0 - playsewithpan SE_W112, +63 + playsewithpan SE_W112, SOUND_PAN_TARGET createsprite gUnknown_08592EA4, 0x2, -24, -24, 60 createsprite gUnknown_08592EA4, 0x2, -8, -24, 65 createsprite gUnknown_08592EA4, 0x2, 8, -24, 70 @@ -2399,21 +2399,21 @@ Move_CONVERSION_2: createsprite gUnknown_08592EA4, 0x2, 24, 24, 135 createvisualtask sub_81023E0, 0x5 delay 0x3C - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 0xA - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 0xA - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 0xA - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 0xA - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 0xA - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 0xA - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 0xA - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -2425,14 +2425,14 @@ Move_ROLLING_KICK: monbg ANIM_TARGET setalpha 0x80C createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x6 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 createsprite gUnknown_08595EE0, 0x2, -24, 0, 48, 10, 160, 0 delay 0x5 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 waitforvisualfinish @@ -2444,7 +2444,7 @@ Move_ROLLING_KICK: Move_HEADBUTT: loadspritegfx 0x2797 createsprite gUnknown_08592CD8, 0x2, 0 - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 0x2 createsprite gUnknown_08592CD8, 0x2, 1 @@ -2453,7 +2453,7 @@ Move_HEADBUTT: createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 createsprite gUnknown_08592CD8, 0x2, 2 createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish end @@ -2461,7 +2461,7 @@ Move_HORN_ATTACK: loadspritegfx 0x2797 loadspritegfx 0x2724 createsprite gUnknown_08592CD8, 0x2, 0 - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 0x2 createsprite gUnknown_08592CD8, 0x2, 1 @@ -2471,7 +2471,7 @@ Move_HORN_ATTACK: createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 createsprite gUnknown_08592CD8, 0x2, 2 createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish end @@ -2490,14 +2490,14 @@ AnimScript_82CC7B8: createsprite gUnknown_08592F44, 0x84, 8, 8, 10 waitforvisualfinish createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET goto AnimScript_82CC7A5 AnimScript_82CC7DE: createsprite gUnknown_08592F44, 0x84, -8, -8, 10 waitforvisualfinish createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET goto AnimScript_82CC7A5 Move_HORN_DRILL: @@ -2512,7 +2512,7 @@ AnimScript_82CC821: waitbgfadein setalpha 0x80C createsprite gUnknown_08592CD8, 0x2, 0 - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 0x2 createsprite gUnknown_08592CD8, 0x2, 1 @@ -2522,37 +2522,37 @@ AnimScript_82CC821: createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1 createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1 createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 3 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, 0, 2, 1, 3 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, -4, 3, 1, 3 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, -8, -5, 1, 3 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, 4, -12, 1, 3 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, 16, 0, 1, 3 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, 5, 18, 1, 3 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, -17, 12, 1, 2 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, -21, -15, 1, 2 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, 8, -27, 1, 2 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973E8, 0x83, 32, 0, 1, 2 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08592CD8, 0x2, 2 waitforvisualfinish @@ -2575,15 +2575,15 @@ Move_THRASH: createvisualtask sub_8104CA4, 0x2 createsprite gUnknown_08595EB0, 0x83, 1, 10, 0 createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x1C createsprite gUnknown_08595EB0, 0x83, 1, 10, 1 createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x1C createsprite gUnknown_08595EB0, 0x83, 1, 10, 3 createvisualtask sub_80D5484, 0x2, 1, 8, 0, 16, 1 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET end Move_SING: @@ -2591,7 +2591,7 @@ Move_SING: monbg ANIM_DEF_PARTNER createvisualtask sub_8102BE8, 0x2 waitforvisualfinish - panse_1B SE_W047, -64, +63, +2, 0x0 + panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 createsprite gUnknown_08593008, 0x82, 7, 0, 12 delay 0x5 createsprite gUnknown_08593008, 0x82, 6, 1, 12 @@ -2630,7 +2630,7 @@ Move_LOW_KICK: delay 0x4 createsprite gUnknown_08597358, 0x82, -8, 8, 1, 2 createvisualtask sub_80D6134, 0x2, 6, 384, 1, 2 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_0857FE58, 0x2, 0, 1, 4 end @@ -2649,7 +2649,7 @@ Move_FISSURE: loadspritegfx 0x275A createvisualtask sub_81152DC, 0x3, 5, 10, 50 createvisualtask sub_81152DC, 0x3, 1, 10, 50 - playsewithpan SE_W089, +63 + playsewithpan SE_W089, SOUND_PAN_TARGET delay 0x8 call AnimScript_82CCBFF delay 0xF @@ -2677,7 +2677,7 @@ AnimScript_82CCBFF: createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -16, -10, 24 createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -52, -18, 24 createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -32, -16, 24 - playsewithpan SE_W091, +63 + playsewithpan SE_W091, SOUND_PAN_TARGET return AnimScript_82CCC50: @@ -2685,7 +2685,7 @@ AnimScript_82CCC50: createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -38, -10, 24 createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -20, -18, 24 createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -36, -16, 24 - playsewithpan SE_W091, +63 + playsewithpan SE_W091, SOUND_PAN_TARGET return Move_DIG: @@ -2727,7 +2727,7 @@ AnimScript_82CCD06: delay 0x10 createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - playsewithpan SE_W025B, -64 + playsewithpan SE_W025B, SOUND_PAN_ATTACKER clearmonbg ANIM_ATTACKER goto AnimScript_82CCCAA @@ -2736,16 +2736,16 @@ AnimScript_82CCD6A: createsprite gUnknown_085971FC, 0x2, 0, 0, 16, 4, -10, 18 createsprite gUnknown_085971FC, 0x2, 0, 1, 14, 4, -18, 18 createsprite gUnknown_085971FC, 0x2, 0, 1, 12, 4, -16, 18 - playsewithpan SE_W091, -64 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 0x20 return Move_MEDITATE: call AnimScript_82D7CD1 createvisualtask sub_810F7D4, 0x2 - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER delay 0x10 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish call AnimScript_82D7CDD end @@ -2755,15 +2755,15 @@ Move_AGILITY: setalpha 0x80C createvisualtask sub_80D5830, 0x2, 0, 24, 6, 4, 4 createvisualtask sub_81169C0, 0x2, 0, 4, 7, 10 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0xC - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0xC - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0xC - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0xC - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0xC waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2777,11 +2777,11 @@ Move_QUICK_ATTACK: setalpha 0x80C createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5 createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 0x4 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 createsprite gUnknown_08597358, 0x84, 0, 0, 1, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2795,16 +2795,16 @@ Move_RAGE: setalpha 0x80C createvisualtask sub_80A7B98, 0x3, 0, RGB_RED, 10, 0, 2 createsprite gUnknown_0859368C, 0x2, 0, -20, -28 - playsewithpan SE_W207B, -64 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER delay 0x14 createsprite gUnknown_0859368C, 0x2, 0, 20, -28 - playsewithpan SE_W207B, -64 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_0857FE28, 0x2, 4, 6 delay 0x4 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D6388, 0x2, 1, 1, 10, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET end @@ -2812,7 +2812,7 @@ Move_RAGE: Move_TELEPORT: call AnimScript_82D7CD1 createvisualtask sub_810F83C, 0x2 - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 0xF call AnimScript_82D7CDD waitforvisualfinish @@ -2822,23 +2822,23 @@ Move_DOUBLE_TEAM: createvisualtask sub_81029B4, 0x2 setalpha 0x80C monbg ANIM_ATK_PARTNER - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x20 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x18 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x10 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 0x8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2848,7 +2848,7 @@ Move_DOUBLE_TEAM: Move_MINIMIZE: setalpha 0x80A createvisualtask sub_8104674, 0x2 - loopsewithpan SE_W107, -64, 0x22, 0x3 + loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 0x22, 0x3 waitforvisualfinish blendoff end @@ -2857,11 +2857,11 @@ Move_METRONOME: loadspritegfx 0x2750 loadspritegfx 0x27E1 createsprite gUnknown_08593114, 0xB, 0, 100 - playsewithpan SE_W118, -64 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 0x6 createsprite gUnknown_085931BC, 0xC, 0 delay 0x18 - loopsewithpan SE_W039, -64, 0x16, 0x3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x16, 0x3 waitforvisualfinish end @@ -2879,7 +2879,7 @@ AnimScript_82CCF99: AnimScript_82CCFA9: createsprite gUnknown_0857FE88, 0x2, 0, -24, 0, 0, 10, 0 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D6134, 0x2, 16, 96, 0, 2 waitforvisualfinish @@ -2890,14 +2890,14 @@ AnimScript_82CCFA9: AnimScript_82CCFE6: loadspritegfx 0x2797 createvisualtask sub_8101C94, 0x2, 0 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish playse SE_BAN createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1 createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1 createsprite gUnknown_085973E8, 0x84, 0, 0, 1, 0 - loopsewithpan SE_W025B, +63, 0x8, 0x3 + loopsewithpan SE_W025B, SOUND_PAN_TARGET, 0x8, 0x3 waitforvisualfinish createvisualtask sub_8101C94, 0x2, 1 goto AnimScript_82CCF98 @@ -2907,9 +2907,9 @@ Move_AMNESIA: call AnimScript_82D7CD1 delay 0x8 createsprite gUnknown_08596744, 0x14 - playsewithpan SE_W118, -64 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 0x36 - loopsewithpan SE_W118, -64, 0x10, 0x3 + loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 0x10, 0x3 waitforvisualfinish call AnimScript_82D7CDD end @@ -2917,18 +2917,18 @@ Move_AMNESIA: Move_KINESIS: loadspritegfx 0x275B loadspritegfx 0x2771 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call AnimScript_82D7CD1 createsprite gUnknown_085966DC, 0x14 createsprite gUnknown_08593344, 0x13, 32, -8, 0 createsprite gUnknown_08593344, 0x13, 32, 16, 1 - loopsewithpan SE_W109, -64, 0x15, 0x2 + loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 0x15, 0x2 delay 0x3C - playsewithpan SE_W146, -64 + playsewithpan SE_W146, SOUND_PAN_ATTACKER delay 0x1E - loopsewithpan SE_W146, -64, 0x14, 0x2 + loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 0x14, 0x2 delay 0x46 - playsewithpan SE_W207B, -64 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish call AnimScript_82D7CDD end @@ -2937,14 +2937,14 @@ Move_GLARE: loadspritegfx 0x2808 loadspritegfx 0x27EA createvisualtask sub_815E114, 0x5, 0 - playsewithpan SE_W060B, -64 + playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8116620, 0x5, 1, 0, 0, 16, 0 waitforvisualfinish createsprite gUnknown_08593A84, 0x0, -16, -8 createsprite gUnknown_08593A84, 0x0, 16, -8 createvisualtask sub_81064F8, 0x5 - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER delay 0x2 createvisualtask sub_810A094, 0x3, 20, 1, 0 waitforvisualfinish @@ -2954,12 +2954,12 @@ Move_GLARE: Move_BARRAGE: loadspritegfx 0x280E createvisualtask sub_815E47C, 0x3 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 0x18 createsprite gUnknown_085972D8, 0x2, 8, 1, 40, 1 createvisualtask sub_80D51AC, 0x3, 1, 0, 4, 20, 1 createvisualtask sub_80D51AC, 0x3, 3, 0, 4, 20, 1 - loopsewithpan SE_W070, +63, 0x8, 0x2 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 0x8, 0x2 end Move_SKY_ATTACK: @@ -2981,7 +2981,7 @@ AnimScript_82CD1A0: delay 0xC createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, 0 createvisualtask sub_81152DC, 0x5, 0, 2, 16 - loopsewithpan SE_W287, -64, 0x4, 0x8 + loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 0x4, 0x8 createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, 0x7FFF delay 0x14 createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, 0x7FFF @@ -2998,7 +2998,7 @@ AnimScript_82CD217: delay 0xC createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, 0 createvisualtask sub_81152DC, 0x5, 0, 2, 16 - playsewithpan SE_W287, -64 + playsewithpan SE_W287, SOUND_PAN_ATTACKER delay 0x8 createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, 0x7FFF delay 0x14 @@ -3034,7 +3034,7 @@ AnimScript_82CD28E: goto AnimScript_82CD184 Move_FLASH: - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_8117494, 0x2 waitforvisualfinish end @@ -3042,7 +3042,7 @@ Move_FLASH: Move_SPLASH: createvisualtask sub_8104938, 0x2, 0, 3 delay 0x8 - loopsewithpan SE_W039, -64, 0x26, 0x3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x26, 0x3 waitforvisualfinish end @@ -3050,7 +3050,7 @@ Move_ACID_ARMOR: monbg ANIM_ATTACKER setalpha 0xF createvisualtask sub_815D240, 0x2, 0 - playsewithpan SE_W151, -64 + playsewithpan SE_W151, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3066,7 +3066,7 @@ Move_SHARPEN: Move_SUPER_FANG: loadspritegfx 0x27D0 createvisualtask sub_80D5484, 0x2, 0, 1, 0, 20, 1 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D5484, 0x2, 0, 3, 0, 48, 1 createvisualtask sub_80A7B98, 0x2, 0, RGB(31, 6, 1), 12, 4, 1 @@ -3075,7 +3075,7 @@ Move_SUPER_FANG: createsprite gUnknown_0857FE28, 0x2, 4, 4 delay 0x4 createsprite gUnknown_08592F74, 0x82 - playsewithpan SE_W044, +63 + playsewithpan SE_W044, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 2143, 14, 0x7FFF, 14 createvisualtask sub_80D51AC, 0x2, 1, 0, 7, 12, 1 @@ -3086,11 +3086,11 @@ Move_SUPER_FANG: Move_SLASH: loadspritegfx 0x27C7 createsprite gUnknown_08592D2C, 0x82, 1, -8, 0 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08592D2C, 0x82, 1, 8, 0 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish end @@ -3102,11 +3102,11 @@ Move_STRUGGLE: createvisualtask sub_80D5484, 0x2, 0, 3, 0, 12, 4 createsprite gUnknown_08593B80, 0x2, 0, 0, 2 createsprite gUnknown_08593B80, 0x2, 0, 1, 2 - loopsewithpan SE_W029, -64, 0xC, 0x4 + loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 0xC, 0x4 waitforvisualfinish createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createvisualtask sub_80D5484, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -3120,7 +3120,7 @@ Move_SKETCH: waitforvisualfinish clearmonbg ANIM_TARGET createvisualtask sub_8104938, 0x2, 0, 2 - loopsewithpan SE_W039, -64, 0x26, 0x2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x26, 0x2 end Move_NIGHTMARE: @@ -3130,7 +3130,7 @@ Move_NIGHTMARE: monbg ANIM_DEF_PARTNER createvisualtask sub_8111C50, 0x2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 40, 1 - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg @@ -3140,7 +3140,7 @@ Move_NIGHTMARE: AnimScript_82CD4CF: createvisualtask sub_80A7B98, 0x2, 0, RGB_WHITE, 10, 2, 1 createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1 - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3151,11 +3151,11 @@ Move_FLAIL: monbg ANIM_TARGET setalpha 0x80C createvisualtask sub_815C770, 0x2, 0 - loopsewithpan SE_W029, -64, 0x8, 0x2 + loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 0x8, 0x2 waitforvisualfinish createsprite gUnknown_085973A0, 0x83, 1, 3 createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -3163,12 +3163,12 @@ Move_FLAIL: Move_SPITE: fadetobg BG_GHOST - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein monbg ANIM_DEF_PARTNER createvisualtask sub_8115A04, 0x2, 2, 2, 6, 0, 8, 0x7FFF createvisualtask sub_8111E50, 0x2 - loopsewithpan SE_W060, +63, 0x14, 0x3 + loopsewithpan SE_W060, SOUND_PAN_TARGET, 0x14, 0x3 waitforvisualfinish restorebg waitbgfadein @@ -3190,11 +3190,11 @@ AnimScript_82CD57E: delay 0x0 setalpha 0x809 createvisualtask sub_80A8BC4, 0x2, 28968, 10 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 0x6 createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -3216,13 +3216,13 @@ Move_FORESIGHT: setalpha 0x10 createsprite gUnknown_085CE8C4, 0x82, 1 delay 0x11 - loopsewithpan SE_W166, +63, 0x10, 0x4 + loopsewithpan SE_W166, SOUND_PAN_TARGET, 0x10, 0x4 delay 0x30 delay 0x18 - playsewithpan SE_W166, +63 + playsewithpan SE_W166, SOUND_PAN_TARGET delay 0xA createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W197, +63 + playsewithpan SE_W197, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -3231,16 +3231,16 @@ Move_FORESIGHT: Move_DESTINY_BOND: loadspritegfx 0x27CC fadetobg BG_GHOST - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_81123C4, 0x5, 0, 48 - playsewithpan SE_W109, -64 + playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 0x30 createvisualtask sub_80D5484, 0x2, 0, 2, 0, 24, 1 createvisualtask sub_8116664, 0x2, 6, 1, 0, 12, 30653 delay 0x18 createvisualtask sub_8116664, 0x2, 6, 1, 12, 0, 30653 - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3250,7 +3250,7 @@ Move_DESTINY_BOND: Move_ENDURE: loadspritegfx 0x27C8 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER call AnimScript_82CD6C7 delay 0x8 createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 @@ -3277,13 +3277,13 @@ Move_CHARM: loadspritegfx 0x27E2 createvisualtask sub_815C478, 0x5, 0, 2, 0 createsprite gUnknown_08593970, 0x3, 0, 20 - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 0xF createsprite gUnknown_08593970, 0x3, -20, 20 - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 0xF createsprite gUnknown_08593970, 0x3, 20, 20 - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish end @@ -3298,7 +3298,7 @@ Move_ROLLOUT: waitforvisualfinish createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 createsprite gUnknown_08597358, 0x4, 0, 0, 1, 2 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -3308,44 +3308,44 @@ Move_FALSE_SWIPE: loadspritegfx 0x282E loadspritegfx 0x2797 createsprite gUnknown_08592D44, 0x82 - playsewithpan SE_W233, +63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 0x10 createsprite gUnknown_08592D5C, 0x82, 0 - playsewithpan SE_W104, +63 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08592D5C, 0x82, 16 delay 0x2 createsprite gUnknown_08592D5C, 0x82, 32 - playsewithpan SE_W104, +63 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08592D5C, 0x82, 48 delay 0x2 createsprite gUnknown_08592D5C, 0x82, 64 - playsewithpan SE_W104, +63 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08592D5C, 0x82, 80 delay 0x2 waitforvisualfinish createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 createsprite gUnknown_08597358, 0x84, 0, 0, 1, 3 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET end Move_SWAGGER: loadspritegfx 0x2766 loadspritegfx 0x2767 createvisualtask sub_8104AB4, 0x2 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_08593658, 0x2 - loopsewithpan SE_W207, -64, 0x4, 0x2 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 0x4, 0x2 waitforvisualfinish delay 0x18 createsprite gUnknown_0859368C, 0x82, 1, -20, -28 - playsewithpan SE_W207B, +63 + playsewithpan SE_W207B, SOUND_PAN_TARGET delay 0xC createsprite gUnknown_0859368C, 0x82, 1, 20, -28 - playsewithpan SE_W207B, +63 + playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish end @@ -3356,14 +3356,14 @@ Move_MILK_DRINK: monbg ANIM_TARGET createsprite gUnknown_08592B3C, 0x2 delay 0x28 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 0xC - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 0x14 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_0859381C, 0x3, 0, 0, 1, 0 - playsewithpan SE_W208, -64 + playsewithpan SE_W208, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET call AnimScript_82D7A28 @@ -3382,13 +3382,13 @@ AnimScript_82CD8C8: AnimScript_82CD8C9: createvisualtask sub_81152DC, 0x5, 5, 0, 50 createvisualtask sub_81152DC, 0x5, 4, 0, 50 - loopsewithpan SE_W070, +63, 0x8, 0xA + loopsewithpan SE_W070, SOUND_PAN_TARGET, 0x8, 0xA goto AnimScript_82CD8C8 AnimScript_82CD8EE: createvisualtask sub_81152DC, 0x5, 5, 0, 50 createvisualtask sub_81152DC, 0x5, 4, 0, 50 - loopsewithpan SE_W070, +63, 0x8, 0xA + loopsewithpan SE_W070, SOUND_PAN_TARGET, 0x8, 0xA delay 0xA createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 delay 0x10 @@ -3401,15 +3401,15 @@ Move_RAPID_SPIN: monbg ANIM_ATTACKER createsprite gUnknown_085CE288, 0x2, 0, 0, 32, -32, 40, -2 createvisualtask sub_815ADB0, 0x2, 0, 2, 0 - loopsewithpan SE_W013B, -64, 0x8, 0x4 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x8, 0x4 waitforvisualfinish createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish delay 0x8 createvisualtask sub_815ADB0, 0x2, 0, 2, 1 - loopsewithpan SE_W013B, -64, 0x8, 0x4 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x8, 0x4 waitforvisualfinish clearmonbg ANIM_ATTACKER end @@ -3453,7 +3453,7 @@ AnimScript_82CDA55: createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 waitbgfadein createvisualtask sub_810577C, 0x2 - loopsewithpan SE_W013B, -64, 0x8, 0x3 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x8, 0x3 waitforvisualfinish delay 0x1 createvisualtask sub_8117F60, 0x2 @@ -3462,19 +3462,19 @@ AnimScript_82CDA55: delay 0x12 createvisualtask sub_8105810, 0x2 delay 0x2 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_085973B8, 0x82, 1, 0, -12, 3 delay 0xA - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_085973B8, 0x82, 1, 0, 12, 3 delay 0xA - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_085973B8, 0x82, 1, 0, 0, 3 waitforvisualfinish createvisualtask sub_8105AAC, 0x2 delay 0xA createvisualtask sub_810599C, 0x2 - loopsewithpan SE_W104, -64, 0x8, 0x4 + loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 0x8, 0x4 waitforvisualfinish restorebg waitbgfadeout @@ -3497,19 +3497,19 @@ Move_UPROAR: monbg ANIM_DEF_PARTNER createvisualtask sub_8106D90, 0x2, 0 createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, -64 + playsewithpan SE_W253, SOUND_PAN_ATTACKER createsprite gUnknown_08593BB8, 0x2, 0, 29, -12, 0 createsprite gUnknown_08593BB8, 0x2, 0, -12, -29, 1 delay 0x10 createvisualtask sub_8106D90, 0x2, 0 createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, -64 + playsewithpan SE_W253, SOUND_PAN_ATTACKER createsprite gUnknown_08593BB8, 0x2, 0, 12, -29, 1 createsprite gUnknown_08593BB8, 0x2, 0, -29, -12, 0 delay 0x10 createvisualtask sub_8106D90, 0x2, 0 createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, -64 + playsewithpan SE_W253, SOUND_PAN_ATTACKER createsprite gUnknown_08593BB8, 0x2, 0, 24, -24, 1 createsprite gUnknown_08593BB8, 0x2, 0, -24, -24, 0 waitforvisualfinish @@ -3521,7 +3521,7 @@ Move_HEAT_WAVE: createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, RGB_RED createvisualtask sub_8110BCC, 0x5, 1 createvisualtask sub_810A060, 0x6, 6, 31 - panse_1B SE_W257, -64, +63, +2, 0x0 + panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 delay 0x4 createvisualtask sub_8109DBC, 0x5 delay 0xC @@ -3558,10 +3558,10 @@ Move_TORMENT: waitforvisualfinish createvisualtask sub_80A7B98, 0x2, 1, RGB_RED, 10, 1, 1 createsprite gUnknown_0859368C, 0x82, 1, -20, -28 - playsewithpan SE_W207B, +63 + playsewithpan SE_W207B, SOUND_PAN_TARGET delay 0x14 createsprite gUnknown_0859368C, 0x82, 1, 20, -28 - playsewithpan SE_W207B, +63 + playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_MEMENTO: @@ -3570,9 +3570,9 @@ Move_MEMENTO: createvisualtask sub_81143C0, 0x2 delay 0x1 createvisualtask sub_8113BAC, 0x5 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER delay 0x30 - playsewithpan SE_W060B, -64 + playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8114470, 0x2 delay 0xC @@ -3580,7 +3580,7 @@ Move_MEMENTO: delay 0x1 monbg_22 ANIM_TARGET createvisualtask sub_8113E78, 0x5 - playsewithpan SE_W060, +63 + playsewithpan SE_W060, SOUND_PAN_TARGET waitforvisualfinish clearmonbg_23 ANIM_TARGET delay 0x1 @@ -3592,7 +3592,7 @@ Move_FACADE: loadspritegfx 0x2803 createvisualtask sub_815DCA4, 0x2, 0, 3 createvisualtask sub_815DF0C, 0x2, 0, 72 - loopsewithpan SE_W207, -64, 0x18, 0x3 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 0x18, 0x3 end Move_SMELLING_SALT: @@ -3602,22 +3602,22 @@ Move_SMELLING_SALT: createsprite gUnknown_085CE864, 0x82, 1, 1, 2 delay 0x20 createvisualtask sub_815E840, 0x3, 1, 2 - loopsewithpan SE_W003, +63, 0xC, 0x2 + loopsewithpan SE_W003, SOUND_PAN_TARGET, 0xC, 0x2 waitforvisualfinish delay 0x4 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 2 createsprite gUnknown_085CE894, 0x82, 1, 8, 3 - loopsewithpan SE_W207B, +63, 0x10, 0x3 + loopsewithpan SE_W207B, SOUND_PAN_TARGET, 0x10, 0x3 end Move_FOLLOW_ME: loadspritegfx 0x2750 createsprite gUnknown_085931D4, 0x2, 0 - playsewithpan SE_W039, -64 + playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 0x12 - playsewithpan SE_W213, -64 + playsewithpan SE_W213, SOUND_PAN_ATTACKER delay 0x47 - loopsewithpan SE_W039, -64, 0x16, 0x3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x16, 0x3 end Move_CHARGE: @@ -3629,26 +3629,26 @@ Move_CHARGE: createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_810AAFC, 0x2, 0, 60, 2, 12 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 0x1E - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 0x1E - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER createsprite gUnknown_0859595C, 0x2, 0 delay 0x19 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 0x14 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 0xF - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 0xA delay 0x6 - loopsewithpan SE_W268, -64, 0x6, 0x5 + loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 0x6, 0x5 waitforvisualfinish createsprite gUnknown_0859598C, 0x2, 0, 16, 16 delay 0x2 createsprite gUnknown_0859598C, 0x2, 0, -16, -16 - playsewithpan SE_W085B, -64 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER @@ -3660,19 +3660,19 @@ Move_TAUNT: loadspritegfx 0x27E1 loadspritegfx 0x2767 createsprite gUnknown_08593114, 0xB, 0, 45 - playsewithpan SE_W118, -64 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 0x6 createsprite gUnknown_0859324C, 0xC, 0 delay 0x4 - loopsewithpan SE_W039, -64, 0x10, 0x2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x10, 0x2 waitforvisualfinish delay 0x8 createsprite gUnknown_0859368C, 0x82, 1, -20, -28 - playsewithpan SE_W207B, +63 + playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish delay 0xC createsprite gUnknown_0859368C, 0x82, 1, 20, -28 - playsewithpan SE_W207B, +63 + playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_HELPING_HAND: @@ -3717,7 +3717,7 @@ Move_SUPERPOWER: monbgprio_28 ANIM_ATTACKER setalpha 0x80C createsprite gUnknown_08595FEC, 0x82, 0 - playsewithpan SE_W025, -64 + playsewithpan SE_W025, SOUND_PAN_ATTACKER delay 0x14 createsprite gUnknown_085972D8, 0x2, 4, 1, 180, 1 createvisualtask sub_8159244, 0x5, 234, 0 @@ -3733,10 +3733,10 @@ Move_SUPERPOWER: createsprite gUnknown_08596004, 0x29, 60, 288, 3, 88 delay 0x4A createsprite gUnknown_0859601C, 0x83, 0 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 0x10 createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 16, 1 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -3749,10 +3749,10 @@ Move_RECYCLE: setalpha 0x1000 delay 0x1 createsprite gUnknown_085CE9B0, 0x2 - loopsewithpan SE_W036, -64, 0x18, 0x3 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 0x18, 0x3 waitforvisualfinish createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3773,19 +3773,19 @@ AnimScript_82CE0A7: delay 0x4 delay 0x1 createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1 - playsewithpan SE_W233, +63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 0x14 createsprite gUnknown_0857FE28, 0x2, 3, 8 delay 0x5 createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1 - playsewithpan SE_W233, +63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 0x14 createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK delay 0x25 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish @@ -3800,25 +3800,25 @@ AnimScript_82CE154: createsprite gUnknown_08595F90, 0x3, 1, 0, 0, 90, 10 delay 0x1 createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1 - playsewithpan SE_W233, +63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 0x14 createsprite gUnknown_0857FE28, 0x2, 3, 8 delay 0x5 createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1 - playsewithpan SE_W233, +63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 0x14 createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK delay 0x25 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_08595FA8, 0x2, 1, 0, -8, -12 createsprite gUnknown_08595FA8, 0x2, 1, 1, 8, -12 createsprite gUnknown_08595FA8, 0x2, 1, 2, -8, 12 createsprite gUnknown_08595FA8, 0x2, 1, 3, 8, 12 - playsewithpan SE_W280, +63 + playsewithpan SE_W280, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish @@ -3828,33 +3828,33 @@ AnimScript_82CE154: Move_YAWN: loadspritegfx 0x2802 createvisualtask sub_815D64C, 0x2, 0 - playsewithpan SE_W281, -64 + playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_085CE68C, 0x85, 2 - playsewithpan SE_W255, -64 + playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 0x4 createsprite gUnknown_085CE68C, 0x85, 1 delay 0x4 createsprite gUnknown_085CE68C, 0x85, 0 waitforvisualfinish createvisualtask sub_815D64C, 0x2, 1 - playsewithpan SE_W281, +63 + playsewithpan SE_W281, SOUND_PAN_TARGET end Move_ENDEAVOR: loadspritegfx 0x2803 loadspritegfx 0x2797 createvisualtask sub_815DCA4, 0x2, 0, 2 - loopsewithpan SE_W039, -64, 0x18, 0x2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x18, 0x2 createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 21, 0), 12, 1, 2 delay 0x6 createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 createsprite gUnknown_08597358, 0x82, 12, -12, 1, 2 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 0x18 createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 createsprite gUnknown_08597358, 0x82, -12, 12, 1, 2 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET end Move_ERUPTION: @@ -3862,10 +3862,10 @@ Move_ERUPTION: createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask sub_8109460, 0x2 - waitplaysewithpan SE_W153, -64, 0x3C + waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 0x3C waitforvisualfinish createvisualtask sub_8109460, 0x2 - waitplaysewithpan SE_W153, -64, 0x3C + waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 0x3C waitforvisualfinish delay 0x1E createsprite gUnknown_085955E8, 0x28, 200, -32, 0, 100, 0 @@ -3877,7 +3877,7 @@ Move_ERUPTION: delay 0x16 createvisualtask sub_81152DC, 0x5, 5, 8, 60 createvisualtask sub_81152DC, 0x5, 4, 8, 60 - loopsewithpan SE_W088, +63, 0x10, 0xC + loopsewithpan SE_W088, SOUND_PAN_TARGET, 0x10, 0xC delay 0x50 createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, RGB_RED end @@ -3887,7 +3887,7 @@ Move_SKILL_SWAP: call AnimScript_82D7CD1 createvisualtask sub_810FBF0, 0x3, 1 createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 3, 1 - loopsewithpan SE_W179, -64, 0x18, 0x3 + loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 0x18, 0x3 delay 0x10 createvisualtask sub_810FBF0, 0x3, 0 createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 3, 1 @@ -3902,12 +3902,12 @@ Move_IMPRISON: monbg ANIM_DEF_PARTNER createvisualtask sub_810F940, 0x5 delay 0x8 - loopsewithpan SE_W030, -64, 0x8, 0x5 + loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 0x8, 0x5 waitforvisualfinish delay 0x4 createsprite gUnknown_085967AC, 0x5, 0, 40 createvisualtask sub_81152DC, 0x5, 4, 1, 10 - playsewithpan SE_W063, -64 + playsewithpan SE_W063, SOUND_PAN_ATTACKER clearmonbg ANIM_DEF_PARTNER call AnimScript_82D7CDD end @@ -3917,13 +3917,13 @@ Move_GRUDGE: monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_8112C6C, 0x3 - loopsewithpan SE_W052, -64, 0x10, 0x4 + loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 0x10, 0x4 delay 0xA delay 0x50 - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3937,7 +3937,7 @@ Move_CAMOUFLAGE: createvisualtask sub_811675C, 0x5, 2, 3, 0, 14 delay 0x10 createvisualtask sub_81136E8, 0x2, 4 - playsewithpan SE_W185, -64 + playsewithpan SE_W185, SOUND_PAN_ATTACKER waitforvisualfinish delay 0x8 createvisualtask sub_811675C, 0x5, 2, 0, 0, 0 @@ -3956,7 +3956,7 @@ Move_TAIL_GLOW: waitforvisualfinish createsprite gUnknown_08596AC8, 0x42, 0 delay 0x12 - loopsewithpan SE_W234, -64, 0x10, 0x6 + loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 0x10, 0x6 waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER @@ -3973,7 +3973,7 @@ Move_LUSTER_PURGE: waitbgfadein monbg ANIM_ATTACKER setalpha 0x80C - playsewithpan SE_W076, -64 + playsewithpan SE_W076, SOUND_PAN_ATTACKER createsprite gUnknown_08596898, 0x29, 0, 0, 0, 0 delay 0x14 createvisualtask sub_8116664, 0x5, 5, 2, 0, 16, -1 @@ -4011,10 +4011,10 @@ Move_MIST_BALL: loadspritegfx 0x27AB loadspritegfx 0x281E delay 0x0 - playsewithpan SE_W081, -64 + playsewithpan SE_W081, SOUND_PAN_ATTACKER createsprite gUnknown_08595C70, 0x80, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, +63 + playsewithpan SE_W028, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 10, 0 createsprite gUnknown_0859728C, 0x0, 1, 1, 1, 32279, 16, 0x7FFF, 16 delay 0x0 @@ -4031,7 +4031,7 @@ Move_FEATHER_DANCE: loadspritegfx 0x281E monbg ANIM_DEF_PARTNER monbgprio_29 - playsewithpan SE_W080, +63 + playsewithpan SE_W080, SOUND_PAN_TARGET delay 0x0 createsprite gUnknown_08596388, 0x80, 0, -16, 64, 2, 104, 11304, 32, 1 delay 0x6 @@ -4054,19 +4054,19 @@ Move_TEETER_DANCE: loadspritegfx 0x2759 createvisualtask sub_8160164, 0x5 createsprite gUnknown_08593050, 0x2, 0, 16, -2 - playsewithpan SE_W298, -64 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 0x18 createsprite gUnknown_08593050, 0x2, 0, 0, -2 - playsewithpan SE_W298, -64 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 0x18 createsprite gUnknown_08593050, 0x2, 0, -16, -2 - playsewithpan SE_W298, -64 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 0x18 createsprite gUnknown_08593050, 0x2, 1, -8, -2 - playsewithpan SE_W298, -64 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 0x18 createsprite gUnknown_08593050, 0x2, 2, 8, -2 - playsewithpan SE_W298, -64 + playsewithpan SE_W298, SOUND_PAN_ATTACKER end Move_MUD_SPORT: @@ -4075,15 +4075,15 @@ Move_MUD_SPORT: delay 0x18 createsprite gUnknown_085971E4, 0x82, 0, -4, -16 createsprite gUnknown_085971E4, 0x82, 0, 4, -12 - playsewithpan SE_W091, -64 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 0x20 createsprite gUnknown_085971E4, 0x82, 0, -3, -12 createsprite gUnknown_085971E4, 0x82, 0, 5, -14 - playsewithpan SE_W091, -64 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 0x20 createsprite gUnknown_085971E4, 0x82, 0, -5, -18 createsprite gUnknown_085971E4, 0x82, 0, 3, -14 - playsewithpan SE_W091, -64 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 0x10 createsprite gUnknown_085971E4, 0x82, 1, 220, 60 waitplaysewithpan SE_W145B, 0, 0xF @@ -4120,7 +4120,7 @@ Move_NEEDLE_ARM: loadspritegfx 0x281A loadspritegfx 0x2797 loadspritegfx 0x279F - loopsewithpan SE_W030, +63, 0x2, 0x10 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 0x2, 0x10 createsprite gUnknown_08592888, 0x82, 1, 0, 0, -32, 16 delay 0x2 createsprite gUnknown_08592888, 0x82, 1, 0, 22, -22, 16 @@ -4148,7 +4148,7 @@ Move_NEEDLE_ARM: createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08592888, 0x82, 1, 1, 0, -24, 10 createsprite gUnknown_08592888, 0x82, 1, 1, 17, -17, 10 createsprite gUnknown_08592888, 0x82, 1, 1, 24, 0, 10 @@ -4162,7 +4162,7 @@ Move_NEEDLE_ARM: Move_SLACK_OFF: loadspritegfx 0x272F createvisualtask sub_8160544, 0x2, 0 - playsewithpan SE_W281, -64 + playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish call AnimScript_82D79DF waitforvisualfinish @@ -4179,11 +4179,11 @@ Move_CRUSH_CLAW: createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1 createsprite gUnknown_08597138, 0x82, -10, -10, 0 createsprite gUnknown_08597138, 0x82, -10, 10, 0 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET delay 0xC createsprite gUnknown_08597138, 0x82, 10, -10, 1 createsprite gUnknown_08597138, 0x82, 10, 10, 1 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_TARGET @@ -4214,15 +4214,15 @@ Move_AROMATHERAPY: delay 0x1 createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, RGB(13, 31, 12) delay 0x1 - playsewithpan SE_W287, -64 + playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 0x2, 1 waitforvisualfinish - playsewithpan SE_W234, -64 + playsewithpan SE_W234, SOUND_PAN_ATTACKER createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1 delay 0x8 createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, -64 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, RGB(13, 31, 12) createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 waitforvisualfinish @@ -4235,7 +4235,7 @@ Move_FAKE_TEARS: createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask sub_815C478, 0x5, 0, 2, 1 - loopsewithpan SE_W039, -64, 0xC, 0x4 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0xC, 0x4 delay 0x8 createsprite gUnknown_085970E8, 0x2, 0, 0 createsprite gUnknown_085970E8, 0x2, 0, 1 @@ -4261,7 +4261,7 @@ Move_AIR_CUTTER: delay 0x0 createvisualtask sub_8103CF0, 0x2, 32, -24, 1536, 2, 128 waitforvisualfinish - playsewithpan SE_W015, +63 + playsewithpan SE_W015, SOUND_PAN_TARGET createsprite gUnknown_08592A34, 0x2, 40, -32, 0, 2 delay 0x5 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 @@ -4277,15 +4277,15 @@ Move_ODOR_SLEUTH: createvisualtask sub_815F620, 0x5 delay 0x18 createsprite gUnknown_0857FE28, 0x2, 3, 4 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 0x6 createsprite gUnknown_0857FE28, 0x2, 3, 4 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET delay 0x1 createsprite gUnknown_0859728C, 0x2, 1, 3, 1, -1, 16, -1, 0 - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: @@ -4294,7 +4294,7 @@ Move_GRASS_WHISTLE: waitforvisualfinish createvisualtask sub_8102BE8, 0x2 waitforvisualfinish - panse_1B SE_W320, -64, +63, +2, 0x0 + panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 createsprite gUnknown_08593008, 0x82, 7, 1, 0 delay 0x5 createsprite gUnknown_08593008, 0x82, 6, 1, 0 @@ -4331,7 +4331,7 @@ Move_TICKLE: waitforvisualfinish createsprite gUnknown_08593A84, 0x0, -16, -8 createsprite gUnknown_08593A84, 0x0, 16, -8 - playsewithpan SE_W197, -64 + playsewithpan SE_W197, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish @@ -4339,7 +4339,7 @@ Move_TICKLE: createvisualtask sub_80D5EB8, 0x3, 0, 6, 1280, 3, 0 delay 0xC createvisualtask sub_815C478, 0x3, 1, 6, 2 - loopsewithpan SE_W039, +63, 0x8, 0x8 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 0x8, 0x8 waitforvisualfinish end @@ -4349,13 +4349,13 @@ Move_WATER_SPOUT: monbg ANIM_DEF_PARTNER setalpha 0x80C createvisualtask sub_81080E4, 0x5 - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER delay 0x2C - playsewithpan SE_W291, -64 + playsewithpan SE_W291, SOUND_PAN_ATTACKER waitforvisualfinish delay 0x10 createvisualtask sub_81085C8, 0x5 - playsewithpan SE_W057, +63 + playsewithpan SE_W057, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER blendoff end @@ -4368,11 +4368,11 @@ Move_SHADOW_PUNCH: monbg ANIM_ATK_PARTNER setalpha 0x809 createvisualtask sub_80A8BC4, 0x2, 0, 13 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 0x6 createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -4387,15 +4387,15 @@ Move_EXTRASENSORY: setalpha 0x80C createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 createvisualtask sub_810FE14, 0x5, 0 - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 createvisualtask sub_810FE14, 0x5, 1 - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8110034, 0x5, 0 createvisualtask sub_810FE14, 0x5, 2 - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -4409,18 +4409,18 @@ Move_AERIAL_ACE: createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5 createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3 createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER delay 0x5 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_IRON_DEFENSE: - loopsewithpan SE_REAPOKE, -64, 0x1C, 0x2 + loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 0x1C, 0x2 createvisualtask sub_81144F8, 0x5, 0, 0, 0 createsprite gUnknown_0859728C, 0x2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish @@ -4429,7 +4429,7 @@ Move_IRON_DEFENSE: Move_BLOCK: loadspritegfx 0x280A createsprite gUnknown_085CE90C, 0xC2 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET end Move_HOWL: @@ -4445,10 +4445,10 @@ Move_HOWL: Move_BULK_UP: loadspritegfx 0x2766 createvisualtask sub_8104AB4, 0x2 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_08593658, 0x2 - loopsewithpan SE_W207, -64, 0x4, 0x2 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 0x4, 0x2 waitforvisualfinish end @@ -4457,16 +4457,16 @@ Move_COVET: loadspritegfx 0x27F0 createvisualtask sub_815C478, 0x5, 0, 2, 0 createsprite gUnknown_08593970, 0x3, 0, 20 - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 0xF createsprite gUnknown_08593970, 0x3, -20, 20 - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 0xF createsprite gUnknown_08593970, 0x3, 20, 20 - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - loopsewithpan SE_W146, +63, 0x4, 0x3 + loopsewithpan SE_W146, SOUND_PAN_TARGET, 0x4, 0x3 end Move_VOLT_TACKLE: @@ -4478,28 +4478,28 @@ Move_VOLT_TACKLE: createvisualtask sub_8116620, 0xA, 1, 0, 0, 8, 0 waitforvisualfinish createsprite gUnknown_085959A4, 0x1 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff delay 0x8 createvisualtask sub_810AFCC, 0x5, 0 - playsewithpan SE_W085, -64 + playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_810AFCC, 0x5, 1 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_810AFCC, 0x5, 2 - playsewithpan SE_W085, -64 + playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_810AFCC, 0x5, 3 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_810AFCC, 0x5, 4 - playsewithpan SE_W085, -64 + playsewithpan SE_W085, SOUND_PAN_ATTACKER delay 0x8 createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859598C, 0x2, 1, 16, 16 delay 0x2 createsprite gUnknown_0859598C, 0x2, 1, -16, -16 @@ -4507,7 +4507,7 @@ Move_VOLT_TACKLE: createvisualtask sub_810AE5C, 0x5 waitforvisualfinish createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 9, 1 - playsewithpan SE_W085B, -64 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER createsprite gUnknown_0859598C, 0x2, 0, 16, 16 delay 0x2 createsprite gUnknown_0859598C, 0x2, 0, -16, -16 @@ -4520,13 +4520,13 @@ Move_WATER_SPORT: loadspritegfx 0x281C createvisualtask sub_81088E4, 0x5 delay 0x8 - playsewithpan SE_W057, -64 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 0x2C - playsewithpan SE_W057, -64 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 0x2C - playsewithpan SE_W057, -64 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 0x2C - panse_1B SE_W057, -64, +63, +2, 0x0 + panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 end Move_CALM_MIND: @@ -4537,13 +4537,13 @@ Move_CALM_MIND: createvisualtask sub_81177E4, 0x5, 1 waitforvisualfinish createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 - playsewithpan SE_W048, -64 + playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 0xE createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 - playsewithpan SE_W048, -64 + playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 0xE createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 - playsewithpan SE_W048, -64 + playsewithpan SE_W048, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_81177E4, 0x5, 0 waitforvisualfinish @@ -4558,20 +4558,20 @@ Move_LEAF_BLADE: createvisualtask sub_80FFFC0, 0x5 delay 0x2 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, +63 + playsewithpan SE_W015, SOUND_PAN_TARGET delay 0x32 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, +63 + playsewithpan SE_W015, SOUND_PAN_TARGET delay 0x32 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, +63 + playsewithpan SE_W015, SOUND_PAN_TARGET waitforvisualfinish monbg ANIM_TARGET setalpha 0x80C delay 0xC createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 18, 1 createsprite gUnknown_085973D0, 0x82, 0, 0, 1, 36 - playsewithpan SE_W043, +63 + playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4583,7 +4583,7 @@ Move_DRAGON_DANCE: monbgprio_28 ANIM_ATTACKER delay 0x1 createvisualtask sub_81133E8, 0x5 - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 0x8 createvisualtask sub_80A7CB4, 0x5, 10249, 19456, 14, 0, 3 createsprite gUnknown_08596F98, 0x2, 0 @@ -4593,9 +4593,9 @@ Move_DRAGON_DANCE: createsprite gUnknown_08596F98, 0x2, 170 createsprite gUnknown_08596F98, 0x2, 213 delay 0x1E - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 0x1E - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER delay 0x1 @@ -4611,7 +4611,7 @@ Move_SHOCK_WAVE: createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_810AAFC, 0x2, 0, 20, 0, 2 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 0xC createsprite gUnknown_08595A18, 0x2 delay 0x1E @@ -4619,7 +4619,7 @@ Move_SHOCK_WAVE: delay 0xC waitforvisualfinish createvisualtask sub_810B55C, 0x5 - playsewithpan SE_W161B, +63 + playsewithpan SE_W161B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D51AC, 0x2, 1, 0, 6, 18, 1 createvisualtask sub_8116620, 0x5, 1, 3, 16, 0, 0x7FFF @@ -4632,7 +4632,7 @@ Move_SHOCK_WAVE: end Move_HARDEN: - loopsewithpan SE_W231, -64, 0x1C, 0x2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 createvisualtask sub_81144F8, 0x5, 0, 0, 0 waitforvisualfinish end @@ -4644,27 +4644,27 @@ Move_BELLY_DRUM: waitforvisualfinish call AnimScript_82CF5A6 createsprite gUnknown_0859309C, 0x2, 0, 0, 0, 0 - playsewithpan SE_W187, -64 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 0xF call AnimScript_82CF58B createsprite gUnknown_0859309C, 0x2, 1, 1, 1, 0 - playsewithpan SE_W187, -64 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 0xF call AnimScript_82CF5A6 createsprite gUnknown_0859309C, 0x2, 0, 3, 3, 128 - playsewithpan SE_W187, -64 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 0x7 call AnimScript_82CF58B createsprite gUnknown_0859309C, 0x2, 1, 2, 0, 128 - playsewithpan SE_W187, -64 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 0x7 call AnimScript_82CF5A6 createsprite gUnknown_0859309C, 0x2, 0, 1, 1, 0 - playsewithpan SE_W187, -64 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 0x7 call AnimScript_82CF58B createsprite gUnknown_0859309C, 0x2, 1, 0, 3, 0 - playsewithpan SE_W187, -64 + playsewithpan SE_W187, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8102CA0, 0x2 waitforvisualfinish @@ -4685,11 +4685,11 @@ Move_MIND_READER: loadspritegfx 0x27CE loadspritegfx 0x27CF monbg ANIM_DEF_PARTNER - playsewithpan SE_W109, +63 + playsewithpan SE_W109, SOUND_PAN_TARGET createsprite gUnknown_085CE07C, 0x5, 0, 0, 1, 0 createsprite gUnknown_085CE094, 0x5 delay 0x28 - playsewithpan SE_W043, +63 + playsewithpan SE_W043, SOUND_PAN_TARGET createvisualtask sub_8115A04, 0x2, 1, 1, 2, 0, 10, 0 call AnimScript_82CF608 waitforvisualfinish @@ -4729,7 +4729,7 @@ Move_ICE_PUNCH: createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 32588 delay 0x14 - playsewithpan SE_W081, +63 + playsewithpan SE_W081, SOUND_PAN_TARGET createsprite gUnknown_08595AE8, 0x2, 0 createsprite gUnknown_08595AE8, 0x2, 64 createsprite gUnknown_08595AE8, 0x2, 128 @@ -4742,7 +4742,7 @@ Move_ICE_PUNCH: delay 0x11 createsprite gUnknown_08595E98, 0x4, 0, -10, 8, 1, 0 createsprite gUnknown_08597358, 0x3, 0, -10, 1, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x2 createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 3, 1 waitforvisualfinish @@ -4758,7 +4758,7 @@ Move_ICE_PUNCH: end Move_REST: - playsewithpan SE_W173, -64 + playsewithpan SE_W173, SOUND_PAN_ATTACKER loadspritegfx 0x27F4 createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 delay 0x14 @@ -4775,7 +4775,7 @@ Move_CONFUSION: createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF waitforvisualfinish - playsewithpan SE_W048, +63 + playsewithpan SE_W048, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 15, 1 createvisualtask sub_80D6064, 0x5, -4, -4, 15, 1, 1 waitforvisualfinish @@ -4792,7 +4792,7 @@ Move_PSYCHIC: createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 767 waitforvisualfinish - loopsewithpan SE_W048, +63, 0xA, 0x3 + loopsewithpan SE_W048, SOUND_PAN_TARGET, 0xA, 0x3 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1 waitforvisualfinish @@ -4813,10 +4813,10 @@ AnimScript_82CF8ED: AnimScript_82CF8F6: monbg ANIM_ATK_PARTNER - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call AnimScript_82D7CD1 setalpha 0x808 - playsewithpan SE_W048, -64 + playsewithpan SE_W048, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 waitforvisualfinish @@ -4833,7 +4833,7 @@ Move_THUNDER: createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK delay 0x10 createvisualtask sub_8115F10, 0x2, 257, 257, 257 - playsewithpan SE_W086, +63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 0x1 createsprite gUnknown_085956C0, 0x82, 16, -36 delay 0x1 @@ -4842,12 +4842,12 @@ Move_THUNDER: createsprite gUnknown_085956C0, 0x82, 16, 12 delay 0x14 createsprite gUnknown_085956C0, 0x86, -16, -32 - playsewithpan SE_W086, +63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 0x1 createsprite gUnknown_085956C0, 0x86, -16, -16 delay 0x1 createsprite gUnknown_085956C0, 0x86, -16, 16 - playsewithpan SE_W086, +63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 0x5 createvisualtask sub_8115F10, 0x2, 257, 257, 257 delay 0x1 @@ -4862,7 +4862,7 @@ Move_THUNDER: createvisualtask sub_8115F10, 0x2, 257, 257, 257 delay 0x1 createsprite gUnknown_085956C0, 0x82, 0, -32 - playsewithpan SE_W161B, +63 + playsewithpan SE_W161B, SOUND_PAN_TARGET delay 0x1 createsprite gUnknown_085956C0, 0x82, 0, -16 delay 0x1 @@ -4890,7 +4890,7 @@ Move_THUNDER_PUNCH: setalpha 0x80C createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 delay 0x1 @@ -4902,7 +4902,7 @@ Move_THUNDER_PUNCH: delay 0x1 createsprite gUnknown_085956C0, 0x2, 0, 16 delay 0x1 - playsewithpan SE_W161B, +63 + playsewithpan SE_W161B, SOUND_PAN_TARGET createvisualtask sub_8115F10, 0x2, 257, 257, 257 delay 0x2 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 @@ -4918,7 +4918,7 @@ Move_THUNDER_PUNCH: Move_SACRED_FIRE: loadspritegfx 0x2731 loadspritegfx 0x2733 - loopsewithpan SE_W221, -64, 0x7, 0x5 + loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 0x7, 0x5 createsprite gUnknown_08595428, 0x2, -32, 0, 50, 5, -2, 0 delay 0x1 createsprite gUnknown_08595428, 0x42, -20, -10, 50, 5, -1, -1 @@ -4939,13 +4939,13 @@ Move_SACRED_FIRE: createvisualtask sub_8115F10, 0x2, 257, 257, 257 delay 0x1 waitforvisualfinish - playsewithpan SE_W221B, +63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createsprite gUnknown_085953F8, 0x82, -16, 0, 70, 16, 0, 1 delay 0xA - playsewithpan SE_W221B, +63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createsprite gUnknown_085953F8, 0x82, 0, 0, 70, 16, 0, 1 delay 0xA - playsewithpan SE_W221B, +63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createsprite gUnknown_085953F8, 0x82, 16, 0, 80, 16, 0, 1 delay 0x1 createvisualtask sub_8115F10, 0x2, 257, 257, 257 @@ -4953,7 +4953,7 @@ Move_SACRED_FIRE: waitforvisualfinish createvisualtask sub_8115F10, 0x2, 257, 257, 257 delay 0x1 - playsewithpan SE_W172B, +63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0 delay 0x1 createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1 @@ -4976,7 +4976,7 @@ Move_SCRATCH: loadspritegfx 0x2799 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W010, +63 + playsewithpan SE_W010, SOUND_PAN_TARGET createsprite gUnknown_085CE020, 0x2, 0, 0, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -4989,7 +4989,7 @@ Move_DRAGON_BREATH: loadspritegfx 0x272D monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W172, -64, 0x7, 0x7 + loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 0x7, 0x7 createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 delay 0x2 createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 @@ -5072,7 +5072,7 @@ Move_SNORE: end AnimScript_82CFF76: - playsewithpan SE_W173, -64 + playsewithpan SE_W173, SOUND_PAN_ATTACKER createvisualtask sub_80D6064, 0x5, -7, -7, 7, 0, 1 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 createsprite gUnknown_085972D8, 0x2, 6, 1, 14, 0, 0 @@ -5085,7 +5085,7 @@ Move_LIGHT_SCREEN: loadspritegfx 0x2756 loadspritegfx 0x27B6 setalpha 0x1000 - waitplaysewithpan SE_W115, -64, 0xF + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 0xF createsprite gUnknown_08596560, 0x1, 40, 0, 10166 delay 0xA call AnimScript_82D0014 @@ -5114,7 +5114,7 @@ Move_MIRROR_COAT: setalpha 0x1000 createsprite gUnknown_08596590, 0x1, 40, 0, 10168 delay 0xA - playsewithpan SE_W115, -64 + playsewithpan SE_W115, SOUND_PAN_ATTACKER call AnimScript_82D0014 waitforvisualfinish delay 0x1 @@ -5125,7 +5125,7 @@ Move_REFLECT: loadspritegfx 0x2757 loadspritegfx 0x27B7 setalpha 0x1000 - waitplaysewithpan SE_W115, -64, 0xF + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 0xF createsprite gUnknown_08596578, 0x1, 40, 0, 10167 delay 0x14 createsprite gUnknown_085965F4, 0x2, 30, 0, 0, 1 @@ -5141,7 +5141,7 @@ Move_REFLECT: Move_BARRIER: loadspritegfx 0x27B9 setalpha 0x1000 - waitplaysewithpan SE_W112, -64, 0xF + waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 0xF createsprite gUnknown_085965A8, 0x3, 40, 0, 10169 waitforvisualfinish delay 0x1 @@ -5155,28 +5155,28 @@ Move_BUBBLE: setalpha 0x80C delay 0x1 createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 delay 0x6 createsprite gUnknown_08595068, 0x2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 delay 0x6 createsprite gUnknown_08595068, 0x2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 delay 0x6 createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 delay 0x6 createsprite gUnknown_08595068, 0x2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 delay 0x6 createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 waitforvisualfinish call AnimScript_82D7B53 waitforvisualfinish @@ -5189,7 +5189,7 @@ Move_SMOG: monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 0x80C - loopsewithpan SE_W054, +63, 0x11, 0xA + loopsewithpan SE_W054, SOUND_PAN_TARGET, 0x11, 0xA call AnimScript_82D024A call AnimScript_82D024A call AnimScript_82D024A @@ -5198,7 +5198,7 @@ Move_SMOG: call AnimScript_82D024A call AnimScript_82D024A delay 0x78 - loopsewithpan SE_W092, +63, 0x12, 0x2 + loopsewithpan SE_W092, SOUND_PAN_TARGET, 0x12, 0x2 createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 26650 delay 0xA createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 15, 1 @@ -5218,7 +5218,7 @@ Move_FAINT_ATTACK: fadetobg BG_DARK waitbgfadein delay 0x0 - playsewithpan SE_W185, -64 + playsewithpan SE_W185, SOUND_PAN_ATTACKER createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 3 createvisualtask sub_81136E8, 0x2, 1 waitforvisualfinish @@ -5229,7 +5229,7 @@ Move_FAINT_ATTACK: setalpha 0x80C monbg ANIM_TARGET delay 0x1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 9, 1 waitforvisualfinish @@ -5253,7 +5253,7 @@ Move_SAND_ATTACK: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 0x80C - playsewithpan SE_W028, -64 + playsewithpan SE_W028, SOUND_PAN_ATTACKER createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 @@ -5279,7 +5279,7 @@ AnimScript_82D0337: Move_MUD_SLAP: loadspritegfx 0x275A - playsewithpan SE_W028, -64 + playsewithpan SE_W028, SOUND_PAN_ATTACKER createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 @@ -5304,14 +5304,14 @@ AnimScript_82D03D5: Move_DRAGON_RAGE: loadspritegfx 0x272D loadspritegfx 0x2733 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1 waitforvisualfinish createsprite gUnknown_0857FE70, 0x82, 0, 15, 0, 0, 4 waitforvisualfinish createsprite gUnknown_08596F80, 0x82, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, +63, 0xB, 0x3 + loopsewithpan SE_W172B, SOUND_PAN_TARGET, 0xB, 0x3 createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 25, 1 createsprite gUnknown_08596F28, 0xC2, 1, 5, 0 delay 0x1 @@ -5335,7 +5335,7 @@ Move_DRAGON_RAGE: Move_RAIN_DANCE: loadspritegfx 0x2783 - playsewithpan SE_W240, -64 + playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 0xA, 1921, 2, 0, 4, 0 waitforvisualfinish createvisualtask sub_8107188, 0x2, 0, 3, 120 @@ -5352,7 +5352,7 @@ Move_BITE: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W044, +63 + playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gUnknown_08597080, 0x2, 0, -32, 0, 0, 819, 10 createsprite gUnknown_08597080, 0x2, 0, 32, 4, 0, -819, 10 delay 0xA @@ -5371,14 +5371,14 @@ Move_CRUNCH: fadetobg BG_DARK waitbgfadein setalpha 0x80C - playsewithpan SE_W044, +63 + playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gUnknown_08597080, 0x2, -32, -32, 1, 819, 819, 10 createsprite gUnknown_08597080, 0x2, 32, 32, 5, -819, -819, 10 delay 0xA createsprite gUnknown_08597358, 0x2, -8, 0, 1, 1 createvisualtask sub_80D51AC, 0x5, 1, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, +63 + playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gUnknown_08597080, 0x2, 32, -32, 7, -819, 819, 10 createsprite gUnknown_08597080, 0x2, -32, 32, 3, 819, -819, 10 delay 0xA @@ -5397,7 +5397,7 @@ Move_CLAMP: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W011, +63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10 createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10 delay 0xA @@ -5455,7 +5455,7 @@ AnimScript_82D07C1: return Move_WITHDRAW: - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER createvisualtask sub_81036A0, 0x5 waitforvisualfinish end @@ -5464,7 +5464,7 @@ Move_AURORA_BEAM: loadspritegfx 0x279C fadetobg BG_AURORABEAM waitbgfadein - playsewithpan SE_W062, -64 + playsewithpan SE_W062, SOUND_PAN_ATTACKER setarg 0x7, 0x0 createvisualtask sub_8107528, 0xA, 130 call AnimScript_82D088B @@ -5509,7 +5509,7 @@ AnimScript_82D08E6: monbg ANIM_ATK_PARTNER setalpha 0x80C createvisualtask sub_8115A04, 0x2, 2, 1, 4, 0, 11, 12287 - playsewithpan SE_W025, -64 + playsewithpan SE_W025, SOUND_PAN_ATTACKER call AnimScript_82D0910 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -5549,7 +5549,7 @@ AnimScript_82D0910: AnimScript_82D09E3: call AnimScript_82D7D1D - panse_1B SE_W076, -64, +63, +2, 0x0 + panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 createvisualtask sub_80FEA58, 0x5 createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 delay 0x4 @@ -5603,10 +5603,10 @@ AnimScript_82D0B43: createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, -64, +63, +2, 0x0 + panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 call AnimScript_82D0B7D call AnimScript_82D0B7D - playsewithpan SE_W059B, +63 + playsewithpan SE_W059B, SOUND_PAN_TARGET waitforvisualfinish call AnimScript_82D77A4 waitforvisualfinish @@ -5651,10 +5651,10 @@ Move_POWDER_SNOW: monbg ANIM_DEF_PARTNER createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish - panse_1B SE_W016, -64, +63, +2, 0x0 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 call AnimScript_82D0D03 call AnimScript_82D0D03 - playsewithpan SE_W016B, +63 + playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish waitsound call AnimScript_82D77A4 @@ -5689,7 +5689,7 @@ Move_HYDRO_PUMP: setalpha 0x80C createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1 delay 0x6 - panse_1B SE_W056, -64, +63, +2, 0x0 + panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 createvisualtask sub_81076C8, 0x5, 100 call AnimScript_82D0E52 call AnimScript_82D0E52 @@ -5736,7 +5736,7 @@ Move_SIGNAL_BEAM: loadspritegfx 0x2759 createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 25, 1 delay 0x6 - panse_1B SE_W062, -64, +63, +1, 0x0 + panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0x0 createvisualtask sub_81076C8, 0x5, 100 call AnimScript_82D0F79 call AnimScript_82D0F79 @@ -5781,7 +5781,7 @@ Move_ABSORB: setalpha 0x80C createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, +63 + playsewithpan SE_W071, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 delay 0x2 createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 @@ -5799,28 +5799,28 @@ Move_ABSORB: end AnimScript_82D1009: - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 delay 0x4 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 delay 0x4 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 delay 0x4 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 delay 0x4 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 delay 0x4 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 delay 0x4 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 delay 0x4 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 delay 0x4 return @@ -5834,7 +5834,7 @@ Move_MEGA_DRAIN: setalpha 0x80C createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, +63 + playsewithpan SE_W071, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 delay 0x2 createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 @@ -5852,35 +5852,35 @@ Move_MEGA_DRAIN: end AnimScript_82D1121: - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 delay 0x4 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 delay 0x4 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 delay 0x4 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 delay 0x4 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 delay 0x4 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 delay 0x4 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 delay 0x4 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 delay 0x4 @@ -5895,7 +5895,7 @@ Move_GIGA_DRAIN: setalpha 0x80C createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, +63 + playsewithpan SE_W071, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 delay 0x2 createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 @@ -5913,42 +5913,42 @@ Move_GIGA_DRAIN: end AnimScript_82D12B1: - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 delay 0x4 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26 createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39 delay 0x4 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26 delay 0x4 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 delay 0x4 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 delay 0x4 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26 delay 0x4 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33 createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 delay 0x4 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 @@ -5968,7 +5968,7 @@ Move_LEECH_LIFE: createsprite gUnknown_085969C8, 0x2, -20, 15, 12 waitforvisualfinish createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - playsewithpan SE_W071, +63 + playsewithpan SE_W071, SOUND_PAN_TARGET delay 0x2 createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 waitforvisualfinish @@ -5988,7 +5988,7 @@ Move_LEECH_LIFE: Move_SYNTHESIS: loadspritegfx 0x2741 createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 16, 19451 - playsewithpan SE_W025, -64 + playsewithpan SE_W025, SOUND_PAN_ATTACKER call AnimScript_82D79B4 waitforvisualfinish unloadspritegfx 0x2741 @@ -6011,22 +6011,22 @@ Move_TOXIC: AnimScript_82D1515: createsprite gUnknown_08596134, 0x82, -24, 16, 1, 1 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0xF createsprite gUnknown_08596134, 0x82, 8, 16, 1, 1 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0xF createsprite gUnknown_08596134, 0x82, -8, 16, 1, 1 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0xF createsprite gUnknown_08596134, 0x82, 24, 16, 1, 1 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0xF return Move_SLUDGE: loadspritegfx 0x27A6 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 waitforvisualfinish createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 @@ -6053,19 +6053,19 @@ Move_SLUDGE_BOMB: createsprite gUnknown_085961D8, 0x82, -27, 44, 20 createsprite gUnknown_085961D8, 0x82, 39, -28, 20 createsprite gUnknown_085961D8, 0x82, -42, -42, 20 - playsewithpan SE_W091, +63 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_085961D8, 0x82, 0, 40, 20 createsprite gUnknown_085961D8, 0x82, -8, -44, 20 createsprite gUnknown_085961D8, 0x82, -46, -28, 20 createsprite gUnknown_085961D8, 0x82, 46, 9, 20 - playsewithpan SE_W091, +63 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_085961D8, 0x82, 42, 0, 20 createsprite gUnknown_085961D8, 0x82, -43, -12, 20 createsprite gUnknown_085961D8, 0x82, 16, -46, 20 createsprite gUnknown_085961D8, 0x82, -16, 44, 20 - playsewithpan SE_W091, +63 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 0x0 waitsound waitforvisualfinish @@ -6074,7 +6074,7 @@ Move_SLUDGE_BOMB: end AnimScript_82D16BC: - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 delay 0x3 return @@ -6083,31 +6083,31 @@ Move_ACID: loadspritegfx 0x27A6 monbg ANIM_DEF_PARTNER createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 0x5 createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 0x5 createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 0xF createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 10, 1 createvisualtask sub_80D52D0, 0x5, 3, 2, 0, 10, 1 createvisualtask sub_8115A04, 0x2, 20, 2, 2, 0, 12, 31774 createsprite gUnknown_0859620C, 0x82, 0, -22, 0, 15, 55 - playsewithpan SE_W145, +63 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_0859620C, 0x82, -26, -24, 0, 15, 55 - playsewithpan SE_W145, +63 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_0859620C, 0x82, 15, -27, 0, 15, 50 - playsewithpan SE_W145, +63 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_0859620C, 0x82, -15, -17, 0, 10, 45 - playsewithpan SE_W145, +63 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_0859620C, 0x82, 27, -22, 0, 15, 50 - playsewithpan SE_W145, +63 + playsewithpan SE_W145, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -6118,14 +6118,14 @@ Move_BONEMERANG: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 0x80C - playsewithpan SE_W155, -64 + playsewithpan SE_W155, SOUND_PAN_ATTACKER createsprite gUnknown_08597178, 0x2 delay 0x14 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 5, 1 delay 0x11 - playsewithpan SE_W233, -64 + playsewithpan SE_W233, SOUND_PAN_ATTACKER createsprite gUnknown_0857FE28, 0x2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6138,13 +6138,13 @@ Move_BONE_CLUB: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 0x80C - playsewithpan SE_W155, +63 + playsewithpan SE_W155, SOUND_PAN_TARGET createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15 delay 0xC createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0, 10, 0, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6155,12 +6155,12 @@ Move_BONE_RUSH: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W155, +63 + playsewithpan SE_W155, SOUND_PAN_TARGET createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15 delay 0xC createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 5, 1 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6169,15 +6169,15 @@ Move_BONE_RUSH: Move_SPIKES: loadspritegfx 0x27A8 monbg ANIM_DEF_PARTNER - playsewithpan SE_W026, -64 - waitplaysewithpan SE_W030, +63, 0x1C + playsewithpan SE_W026, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 0x1C createsprite gUnknown_085CE11C, 0x82, 20, 0, 0, 24, 30 delay 0xA - playsewithpan SE_W026, -64 - waitplaysewithpan SE_W030, +63, 0x1C + playsewithpan SE_W026, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 0x1C createsprite gUnknown_085CE11C, 0x82, 20, 0, -24, 24, 30 delay 0xA - waitplaysewithpan SE_W030, +63, 0x1C + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 0x1C createsprite gUnknown_085CE11C, 0x82, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6187,7 +6187,7 @@ Move_MEGAHORN: loadspritegfx 0x27A9 loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER jumpifcontest AnimScript_82D19FA fadetobg BG_DRILL waitbgfadeout @@ -6203,7 +6203,7 @@ AnimScript_82D1947: delay 0x3 createsprite gUnknown_08596974, 0x3, -42, 25, 0, 0, 6 delay 0x4 - playsewithpan SE_W011, +63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 createsprite gUnknown_0857FE70, 0x2, 1, -16, 4, 1, 4 waitforvisualfinish @@ -6234,13 +6234,13 @@ Move_GUST: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 0x80C - playsewithpan SE_W016, +63 + playsewithpan SE_W016, SOUND_PAN_TARGET createsprite gUnknown_08596270, 0x2, 0, -16 createvisualtask sub_810DED8, 0x5, 1, 70 waitforvisualfinish createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 7, 1 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - playsewithpan SE_W016B, +63 + playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6252,7 +6252,7 @@ Move_WING_ATTACK: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 0x80C - loopsewithpan SE_W017, -64, 0x14, 0x2 + loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 0x14, 0x2 createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 0x5, 1, 70 createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20 @@ -6262,7 +6262,7 @@ Move_WING_ATTACK: delay 0x11 createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1 createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1 - loopsewithpan SE_W003, +63, 0x5, 0x2 + loopsewithpan SE_W003, SOUND_PAN_TARGET, 0x5, 0x2 waitforvisualfinish createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 waitforvisualfinish @@ -6272,7 +6272,7 @@ Move_WING_ATTACK: Move_PECK: loadspritegfx 0x2797 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET createvisualtask sub_80D622C, 0x2, 3, -768, 1, 2 createsprite gUnknown_085973E8, 0x83, -12, 0, 1, 3 waitforvisualfinish @@ -6293,7 +6293,7 @@ Move_AEROBLAST: call AnimScript_82D1B82 waitforvisualfinish createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6302,19 +6302,19 @@ Move_AEROBLAST: end AnimScript_82D1B82: - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 0, 0 createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 0, 0 delay 0x3 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 1, 0 createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 1, 0 delay 0x3 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 2, 0 createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 2, 0 delay 0x3 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 3, 0 createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 3, 0 delay 0x3 @@ -6327,18 +6327,18 @@ Move_WATER_GUN: monbgprio_28 ANIM_TARGET setalpha 0x80C createsprite gUnknown_08595208, 0x2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, -64 + playsewithpan SE_W145, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 8, 1 createsprite gUnknown_08597388, 0x4, 0, 0, 1, 2 createsprite gUnknown_08595220, 0x2, 0, -15, 0, 15, 55 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_08595220, 0x2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_08595220, 0x2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6350,7 +6350,7 @@ Move_CRABHAMMER: monbg ANIM_DEF_PARTNER setalpha 0x80C createsprite gUnknown_08597388, 0x4, 0, 0, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x1 createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 32429, 10, 0, 0 createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4 @@ -6359,7 +6359,7 @@ Move_CRABHAMMER: waitforvisualfinish createsprite gUnknown_0857FE58, 0x2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, +63, 0x14, 0x3 + loopsewithpan SE_W152, SOUND_PAN_TARGET, 0x14, 0x3 createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 8, 1 createsprite gUnknown_08595238, 0x2, 10, 10, 20, 1 delay 0x4 @@ -6384,7 +6384,7 @@ Move_CRABHAMMER: Move_SURF: createvisualtask sub_8107954, 0x2, 0 delay 0x18 - panse_1B SE_W057, -64, +63, +2, 0x0 + panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 waitforvisualfinish end @@ -6396,7 +6396,7 @@ Move_FLAMETHROWER: createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1 delay 0x6 createvisualtask sub_81076C8, 0x5, 100 - panse_1B SE_W053, -64, +63, +2, 0x0 + panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 call AnimScript_82D1E58 call AnimScript_82D1E58 call AnimScript_82D1E58 @@ -6448,7 +6448,7 @@ Move_WHIRLPOOL: setalpha 0x80C delay 0x0 createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) - playsewithpan SE_W250, +63 + playsewithpan SE_W250, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1 call AnimScript_82D1F5B call AnimScript_82D1F5B @@ -6484,19 +6484,19 @@ AnimScript_82D1FF5: end AnimScript_82D1FF7: - playsewithpan SE_W019, -64 + playsewithpan SE_W019, SOUND_PAN_ATTACKER createsprite gUnknown_08596340, 0x2, 0, 0, 13, 336 goto AnimScript_82D1FF5 AnimScript_82D200F: monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createsprite gUnknown_08596358, 0x2, 20 delay 0x14 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6511,17 +6511,17 @@ AnimScript_82D205F: end AnimScript_82D2060: - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER createsprite gUnknown_08596420, 0x2, 0, 0 goto AnimScript_82D205F AnimScript_82D2074: monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_0859644C, 0x83 delay 0x7 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 11, 1 waitforvisualfinish @@ -6535,10 +6535,10 @@ Move_KARATE_CHOP: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 0x80C - playsewithpan SE_W104, +63 + playsewithpan SE_W104, SOUND_PAN_TARGET createsprite gUnknown_08595E68, 0x2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -6551,11 +6551,11 @@ Move_CROSS_CHOP: loadspritegfx 0x282D monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W025, +63 + playsewithpan SE_W025, SOUND_PAN_TARGET createsprite gUnknown_08595EC8, 0x2, 0, 0, 0 createsprite gUnknown_08595EC8, 0x2, 0, 0, 1 delay 0x28 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 10, 0, 10 createsprite gUnknown_085973D0, 0x3, 0, 0, 1, 20 createvisualtask sub_80D51AC, 0x5, 1, 7, 0, 9, 1 @@ -6572,11 +6572,11 @@ Move_JUMP_KICK: createsprite gUnknown_0857FE28, 0x2, 4, 4 delay 0x3 createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, +63 + playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_08597358, 0x1, 0, 0, 1, 1 createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6593,10 +6593,10 @@ Move_HI_JUMP_KICK: createsprite gUnknown_0857FE58, 0x2, 0, 0, 3 delay 0x2 createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, +63 + playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3 delay 0x3 createvisualtask sub_80D5484, 0x2, 1, 3, 0, 11, 1 @@ -6615,7 +6615,7 @@ Move_DOUBLE_KICK: setalpha 0x80C createsprite gUnknown_08595EB0, 0x3, 1, 20, 1 createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6626,7 +6626,7 @@ Move_TRIPLE_KICK: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET jumpifmoveturn 0x0, AnimScript_82D22B8 jumpifmoveturn 0x1, AnimScript_82D22EE goto AnimScript_82D2324 @@ -6663,26 +6663,26 @@ Move_DYNAMIC_PUNCH: delay 0x1 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08595E98, 0x83, 0, 0, 20, 1, 0 createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1 delay 0x1 waitsound - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createvisualtask sub_80D52D0, 0x5, 1, 5, 0, 28, 1 createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6695,23 +6695,23 @@ Move_COUNTER: monbg ANIM_DEF_PARTNER setalpha 0x80C createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4 - playsewithpan SE_W233, -64 + playsewithpan SE_W233, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 delay 0x4 createsprite gUnknown_08597358, 0x2, -15, 18, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x1 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 25, 1 createsprite gUnknown_08595E98, 0x3, -15, 18, 8, 1, 0 delay 0x3 createsprite gUnknown_08597358, 0x2, 0, -4, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x1 createsprite gUnknown_08595E98, 0x3, 0, -4, 8, 1, 0 delay 0x3 createsprite gUnknown_08597358, 0x2, 15, 9, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x1 createsprite gUnknown_08595E98, 0x3, 15, 9, 8, 1, 0 delay 0x5 @@ -6725,13 +6725,13 @@ Move_VITAL_THROW: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W233, -64 + playsewithpan SE_W233, SOUND_PAN_ATTACKER createvisualtask sub_80D5830, 0x2, 0, 12, 4, 1, 2 waitforvisualfinish createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 delay 0x2 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x1 createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4 waitforvisualfinish @@ -6753,10 +6753,10 @@ Move_ROCK_SMASH: delay 0x1 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createsprite gUnknown_08595E98, 0x2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET createsprite gUnknown_08596B1C, 0x2, 0, 0, 20, 24, 14, 2 createsprite gUnknown_08596B1C, 0x2, 5, 0, -20, 24, 14, 1 createsprite gUnknown_08596B1C, 0x2, 0, 5, 20, -24, 14, 2 @@ -6775,16 +6775,16 @@ Move_SUBMISSION: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W104, -64 - waitplaysewithpan SE_W004, +63, 0xA - waitplaysewithpan SE_W104, -64, 0x14 - waitplaysewithpan SE_W004, +63, 0x1E - waitplaysewithpan SE_W104, -64, 0x28 - waitplaysewithpan SE_W004, +63, 0x32 - waitplaysewithpan SE_W104, -64, 0x3C - waitplaysewithpan SE_W004, +63, 0x46 - waitplaysewithpan SE_W104, -64, 0x50 - waitplaysewithpan SE_W004, +63, 0x5A + playsewithpan SE_W104, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0xA + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 0x14 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x1E + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 0x28 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x32 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 0x3C + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x46 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 0x50 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x5A createvisualtask sub_80D5738, 0x2, 0, -18, 6, 6, 4 createvisualtask sub_80D5738, 0x2, 1, 18, 6, 6, 4 call AnimScript_82D26D3 @@ -6810,7 +6810,7 @@ Move_SUNNY_DAY: setalpha 0x30D createvisualtask sub_8116620, 0xA, 1921, 1, 0, 6, 0x7FFF waitforvisualfinish - panse_26 SE_W080, -64, +63, +1, 0x0 + panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0x0 call AnimScript_82D2753 call AnimScript_82D2753 call AnimScript_82D2753 @@ -6831,7 +6831,7 @@ Move_COTTON_SPORE: loadspritegfx 0x27AE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W077, +63, 0x12, 0xA + loopsewithpan SE_W077, SOUND_PAN_TARGET, 0x12, 0xA call AnimScript_82D277D call AnimScript_82D277D call AnimScript_82D277D @@ -6853,7 +6853,7 @@ Move_SPORE: monbg ANIM_DEF_PARTNER setalpha 0x80C createvisualtask sub_80FEE1C, 0x2 - loopsewithpan SE_W077, +63, 0x10, 0xB + loopsewithpan SE_W077, SOUND_PAN_TARGET, 0x10, 0xB call AnimScript_82D27E2 call AnimScript_82D27E2 call AnimScript_82D27E2 @@ -6877,7 +6877,7 @@ Move_PETAL_DANCE: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W080, -64 + playsewithpan SE_W080, SOUND_PAN_ATTACKER createvisualtask sub_80D5830, 0x2, 0, 12, 6, 6, 3 createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 createsprite gUnknown_08592334, 0x2, 16, -24, 8, 100 @@ -6899,7 +6899,7 @@ Move_PETAL_DANCE: waitforvisualfinish createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 5 delay 0x3 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 6, 0, 8, 1 waitforvisualfinish @@ -6917,7 +6917,7 @@ Move_RAZOR_LEAF: monbg ANIM_DEF_PARTNER setalpha 0x80C delay 0x1 - loopsewithpan SE_W077, -64, 0xA, 0x5 + loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 0xA, 0x5 createsprite gUnknown_08592390, 0x2, -3, -2, 10 delay 0x2 createsprite gUnknown_08592390, 0x2, -1, -1, 15 @@ -6938,11 +6938,11 @@ Move_RAZOR_LEAF: delay 0x2 createsprite gUnknown_08592390, 0x2, -3, -5, 8 delay 0x3C - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, 20, 1 createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, -20, 1 delay 0x14 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 8, 1 waitforvisualfinish @@ -6964,7 +6964,7 @@ Move_ANCIENT_POWER: createsprite gUnknown_08596C10, 0x2, 20, 32, -28, 60, 1 createsprite gUnknown_08596C10, 0x2, 0, 32, -28, 30, 4 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 30, 1 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER delay 0xA createsprite gUnknown_08596C10, 0x2, 15, 32, -48, 25, 5 createsprite gUnknown_08596C10, 0x2, -10, 32, -42, 30, 4 @@ -6974,7 +6974,7 @@ Move_ANCIENT_POWER: waitforvisualfinish createsprite gUnknown_0857FE70, 0x2, 0, 16, 0, 0, 4 delay 0x3 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -6987,10 +6987,10 @@ Move_ANCIENT_POWER: Move_OCTAZOOKA: loadspritegfx 0x272E loadspritegfx 0x2721 - playsewithpan SE_W025B, -64 + playsewithpan SE_W025B, SOUND_PAN_ATTACKER createsprite gUnknown_08592DFC, 0x82, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_08592E30, 0x82, 8, 8, 1, 0 delay 0x2 createsprite gUnknown_08592E30, 0x82, -8, -8, 1, 0 @@ -7005,7 +7005,7 @@ Move_MIST: loadspritegfx 0x27A0 monbg ANIM_ATK_PARTNER setalpha 0x80C - loopsewithpan SE_W054, -64, 0x14, 0xF + loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 0x14, 0xF call AnimScript_82D2C34 call AnimScript_82D2C34 call AnimScript_82D2C34 @@ -7046,14 +7046,14 @@ Move_FIRE_PUNCH: createsprite gUnknown_08595368, 0x81, 64 createsprite gUnknown_08595368, 0x81, 128 createsprite gUnknown_08595368, 0x81, 196 - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_08595E98, 0x83, 0, 0, 8, 1, 0 createsprite gUnknown_08597358, 0x82, 0, 0, 1, 1 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 call AnimScript_82D2D18 delay 0x4 - playsewithpan SE_W007, +63 + playsewithpan SE_W007, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116620, 0xA, 4, 0, 9, 0, 31 waitforvisualfinish @@ -7076,7 +7076,7 @@ Move_LEER: monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 0x808 - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createsprite gUnknown_085CE150, 0x2, 24, -12 createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 waitforvisualfinish @@ -7095,10 +7095,10 @@ Move_DREAM_EATER: loadspritegfx 0x272F monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call AnimScript_82D7CD1 setalpha 0x808 - playsewithpan SE_W107, +63 + playsewithpan SE_W107, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1 waitforvisualfinish @@ -7116,42 +7116,42 @@ Move_DREAM_EATER: end AnimScript_82D2E51: - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26 createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33 createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 @@ -7166,25 +7166,25 @@ Move_POISON_GAS: monbgprio_29 setalpha 0x80C delay 0x0 - playsewithpan SE_W054, -64 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x4 - playsewithpan SE_W054, -64 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x4 - playsewithpan SE_W054, -64 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x4 - playsewithpan SE_W054, -64 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x4 - playsewithpan SE_W054, -64 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x4 - playsewithpan SE_W054, -64 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x28 - loopsewithpan SE_W054, +63, 0x1C, 0x6 + loopsewithpan SE_W054, SOUND_PAN_TARGET, 0x1C, 0x6 createvisualtask sub_8115A04, 0x2, 4, 6, 2, 0, 12, 26650 waitforvisualfinish blendoff @@ -7197,7 +7197,7 @@ Move_BIND: goto AnimScript_82D30DE AnimScript_82D30DE: - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET call AnimScript_82D30EE call AnimScript_82D30EE waitforvisualfinish @@ -7214,7 +7214,7 @@ Move_WRAP: Move_PSYBEAM: loadspritegfx 0x27B3 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call AnimScript_82D7CD1 createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15 call AnimScript_82D319C @@ -7253,7 +7253,7 @@ Move_HYPNOSIS: end AnimScript_82D31E5: - playsewithpan SE_W048, -64 + playsewithpan SE_W048, SOUND_PAN_ATTACKER createsprite gUnknown_0859663C, 0x82, 0, 8, 0, 8, 27, 0 createsprite gUnknown_0859663C, 0x82, 16, -8, 0, -8, 27, 0 delay 0x6 @@ -7261,7 +7261,7 @@ AnimScript_82D31E5: Move_PSYWAVE: loadspritegfx 0x27B5 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call AnimScript_82D7CD1 createvisualtask sub_81076C8, 0x5, 100 createsoundtask sub_8158C58, 203, -64, 63, 2, 9, 0, 10 @@ -7287,7 +7287,7 @@ AnimScript_82D3275: Move_ZAP_CANNON: loadspritegfx 0x27BB loadspritegfx 0x271B - playsewithpan SE_W086, -64 + playsewithpan SE_W086, SOUND_PAN_ATTACKER createsprite gUnknown_08595764, 0x83, 10, 0, 0, 0, 30, 0 createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 0, 40, 0 createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 64, 40, 1 @@ -7300,7 +7300,7 @@ Move_ZAP_CANNON: waitforvisualfinish createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 delay 0xF - waitplaysewithpan SE_W085B, +63, 0x13 + waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 0x13 call AnimScript_82D7BEA waitforvisualfinish end @@ -7308,13 +7308,13 @@ Move_ZAP_CANNON: Move_STEEL_WING: loadspritegfx 0x2719 loadspritegfx 0x2797 - loopsewithpan SE_W231, -64, 0x1C, 0x2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 createvisualtask sub_81144F8, 0x5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 0x80C - loopsewithpan SE_W017, -64, 0x14, 0x2 + loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 0x14, 0x2 createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 0x5, 1, 70 createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20 @@ -7324,7 +7324,7 @@ Move_STEEL_WING: delay 0x11 createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1 createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 waitforvisualfinish @@ -7334,7 +7334,7 @@ Move_STEEL_WING: Move_IRON_TAIL: loadspritegfx 0x2797 - loopsewithpan SE_W231, -64, 0x1C, 0x2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 createvisualtask sub_81144F8, 0x5, 1, 0, 0 waitforvisualfinish monbg ANIM_TARGET @@ -7343,7 +7343,7 @@ Move_IRON_TAIL: delay 0x6 createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_811489C, 0x5, 0, 1 clearmonbg ANIM_TARGET @@ -7354,7 +7354,7 @@ Move_IRON_TAIL: Move_POISON_TAIL: loadspritegfx 0x2797 loadspritegfx 0x27A6 - loopsewithpan SE_W231, -64, 0x1C, 0x2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 createvisualtask sub_81144F8, 0x5, 1, 1, RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET @@ -7363,7 +7363,7 @@ Move_POISON_TAIL: delay 0x6 createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_811489C, 0x5, 0, 1 clearmonbg ANIM_TARGET @@ -7374,19 +7374,19 @@ Move_POISON_TAIL: Move_METAL_CLAW: loadspritegfx 0x2737 - loopsewithpan SE_W231, -64, 0x1C, 0x2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 createvisualtask sub_81144F8, 0x5, 0, 0, 0 waitforvisualfinish createsprite gUnknown_0857FE28, 0x2, 6, 4 delay 0x2 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gUnknown_08597138, 0x82, -10, -10, 0 createsprite gUnknown_08597138, 0x82, -10, 10, 0 createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 delay 0x8 createsprite gUnknown_0857FE28, 0x2, 6, 4 delay 0x2 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gUnknown_08597138, 0x82, 10, -10, 1 createsprite gUnknown_08597138, 0x82, 10, 10, 1 createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 @@ -7396,11 +7396,11 @@ Move_METAL_CLAW: Move_NIGHT_SHADE: monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein delay 0xA - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_811188C, 0x5, 85 delay 0x46 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 12, 1 @@ -7415,24 +7415,24 @@ Move_NIGHT_SHADE: Move_EGG_BOMB: loadspritegfx 0x27D6 loadspritegfx 0x27BF - playsewithpan SE_W039, -64 + playsewithpan SE_W039, SOUND_PAN_ATTACKER createsprite gUnknown_08593488, 0x82, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 16, 1 createsprite gUnknown_0859371C, 0x84, 6, 5, 1, 0 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 0x3 createsprite gUnknown_0859371C, 0x84, -16, -15, 1, 0 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 0x3 createsprite gUnknown_0859371C, 0x84, 16, -5, 1, 0 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 0x3 createsprite gUnknown_0859371C, 0x84, -12, 18, 1, 0 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 0x3 createsprite gUnknown_0859371C, 0x84, 0, 5, 1, 0 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 0x3 waitforvisualfinish end @@ -7445,7 +7445,7 @@ Move_SHADOW_BALL: createsoundtask sub_8158C58, 168, -64, 63, 5, 5, 0, 5 createsprite gUnknown_08596D58, 0x82, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, +63 + playsewithpan SE_W028, SOUND_PAN_TARGET createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7455,7 +7455,7 @@ Move_SHADOW_BALL: Move_LICK: loadspritegfx 0x27C1 delay 0xF - playsewithpan SE_W122, +63 + playsewithpan SE_W122, SOUND_PAN_TARGET createsprite gUnknown_08596D8C, 0x82, 0, 0 createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 16, 1 waitforvisualfinish @@ -7463,7 +7463,7 @@ Move_LICK: Move_FOCUS_ENERGY: loadspritegfx 0x27C8 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER call AnimScript_82CD6C7 delay 0x8 createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 0x7FFF @@ -7479,7 +7479,7 @@ Move_BIDE: end AnimScript_82D3719: - loopsewithpan SE_W036, -64, 0x9, 0x2 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 0x9, 0x2 createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 waitforvisualfinish @@ -7489,7 +7489,7 @@ AnimScript_82D3745: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - loopsewithpan SE_W036, -64, 0x9, 0x2 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 0x9, 0x2 createvisualtask sub_8116620, 0xA, 2, 2, 0, 11, 31 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 waitforvisualfinish @@ -7497,13 +7497,13 @@ AnimScript_82D3745: waitforvisualfinish createvisualtask sub_80D5484, 0x2, 0, 2, 0, 12, 1 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 16, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x1, 18, -8, 1, 1 delay 0x5 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x1, -18, 8, 1, 1 delay 0x5 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x1, -8, -5, 1, 1 waitforvisualfinish delay 0x5 @@ -7522,7 +7522,7 @@ Move_STRING_SHOT: delay 0x0 createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 waitforvisualfinish - loopsewithpan SE_W081, -64, 0x9, 0x6 + loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 0x9, 0x6 call AnimScript_82D38CC call AnimScript_82D38CC call AnimScript_82D38CC @@ -7542,7 +7542,7 @@ Move_STRING_SHOT: call AnimScript_82D38CC call AnimScript_82D38CC waitforvisualfinish - playsewithpan SE_W081B, +63 + playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gUnknown_085969F8, 0x82, 0, 10 delay 0x4 createsprite gUnknown_085969F8, 0x82, 0, -2 @@ -7568,7 +7568,7 @@ Move_SPIDER_WEB: createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 waitforvisualfinish monbgprio_28 ANIM_TARGET - loopsewithpan SE_W081, -64, 0x9, 0x6 + loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 0x9, 0x6 call AnimScript_82D396D call AnimScript_82D396D call AnimScript_82D396D @@ -7584,7 +7584,7 @@ Move_SPIDER_WEB: call AnimScript_82D396D call AnimScript_82D396D waitforvisualfinish - playsewithpan SE_W081B, +63 + playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gUnknown_08596A2C, 0x2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -7606,12 +7606,12 @@ AnimScript_82D398A: AnimScript_82D398C: loadspritegfx 0x2719 - playsewithpan SE_W016, -64 + playsewithpan SE_W016, SOUND_PAN_ATTACKER createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 0, 7, 40 createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 85, 7, 40 createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish - playsewithpan SE_W016B, -64 + playsewithpan SE_W016B, SOUND_PAN_ATTACKER goto AnimScript_82D398A AnimScript_82D39DC: @@ -7619,16 +7619,16 @@ AnimScript_82D39DC: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gUnknown_085962D4, 0x2, 14, 8, 0, 0, 22, 2, 1 delay 0x2 - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gUnknown_085962D4, 0x2, 14, -8, 16, 14, 22, 1, 1 delay 0x2 - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gUnknown_085962D4, 0x2, 14, 12, -16, -14, 22, 0, 1 delay 0x11 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 10, 1 createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 10, 1 waitforvisualfinish @@ -7641,11 +7641,11 @@ Move_DISABLE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 0x808 - playsewithpan SE_W197, -64 + playsewithpan SE_W197, SOUND_PAN_ATTACKER createsprite gUnknown_0853EE84, 0xD, 24, -16 waitforvisualfinish createvisualtask sub_81045B0, 0x5 - loopsewithpan SE_W020, +63, 0xF, 0x4 + loopsewithpan SE_W020, SOUND_PAN_TARGET, 0xF, 0x4 waitforvisualfinish delay 0x1 clearmonbg ANIM_TARGET @@ -7657,7 +7657,7 @@ Move_RECOVER: loadspritegfx 0x272F monbg ANIM_ATK_PARTNER setalpha 0x80C - loopsewithpan SE_W025, -64, 0xD, 0x3 + loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 0xD, 0x3 createvisualtask sub_8115A04, 0x2, 2, 0, 6, 0, 11, 12287 call AnimScript_82D3AD5 call AnimScript_82D3AD5 @@ -7692,14 +7692,14 @@ Move_MIMIC: setalpha 0x50B monbg_22 ANIM_DEF_PARTNER monbgprio_29 - panse_1B SE_W107, +63, -64, -3, 0x0 + panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0x0 createvisualtask sub_80FF458, 0x5, 128, 24 delay 0xF createsprite gUnknown_085924DC, 0x82, -12, 24 delay 0xA setarg 0x7, 0xFFFF waitforvisualfinish - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 11, 0x7FFF waitforvisualfinish clearmonbg_23 ANIM_DEF_PARTNER @@ -7708,7 +7708,7 @@ Move_MIMIC: Move_CONSTRICT: loadspritegfx 0x27CA - loopsewithpan SE_W010, +63, 0x6, 0x4 + loopsewithpan SE_W010, SOUND_PAN_TARGET, 0x6, 0x4 createsprite gUnknown_08592494, 0x84, 0, 16, 0, 2 delay 0x7 createsprite gUnknown_08592494, 0x83, 0, 0, 0, 2 @@ -7718,7 +7718,7 @@ Move_CONSTRICT: delay 0x8 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 delay 0x14 - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET setarg 0x7, 0xFFFF waitforvisualfinish end @@ -7744,7 +7744,7 @@ AnimScript_82D3BFB: clearmonbg ANIM_ATK_PARTNER delay 0x1 monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gUnknown_08596DE8, 0x82 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -7755,7 +7755,7 @@ AnimScript_82D3BFB: AnimScript_82D3C62: createvisualtask sub_80D52D0, 0x2, 0, 4, 0, 10, 0 - playsewithpan SE_W020, -64 + playsewithpan SE_W020, SOUND_PAN_ATTACKER return AnimScript_82D3C78: @@ -7767,7 +7767,7 @@ AnimScript_82D3C78: end AnimScript_82D3C93: - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_8116B14, 0x5 createvisualtask sub_8115A04, 0x5, 2, 4, 2, 0, 10, 31 return @@ -7777,13 +7777,13 @@ Move_SOFT_BOILED: loadspritegfx 0x27DB loadspritegfx 0x272F monbg ANIM_ATK_PARTNER - playsewithpan SE_W039, -64 + playsewithpan SE_W039, SOUND_PAN_ATTACKER createvisualtask sub_80D51AC, 0x2, 0, 0, 2, 6, 1 createsprite gUnknown_085937B0, 0x4, 0, 16, 0 createsprite gUnknown_085937B0, 0x4, 0, 16, 1 delay 0x78 delay 0x7 - playsewithpan SE_W030, -64 + playsewithpan SE_W030, SOUND_PAN_ATTACKER createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 delay 0x8 @@ -7828,14 +7828,14 @@ Move_HEAL_BELL: unloadspritegfx 0x27DE unloadspritegfx 0x27DB loadspritegfx 0x2741 - playsewithpan SE_W234, -64 + playsewithpan SE_W234, SOUND_PAN_ATTACKER createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1 delay 0x8 createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx 0x2741 loadspritegfx 0x27DB - playsewithpan SE_REAPOKE, -64 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8116664, 0xA, 4, 3, 10, 0, 31500 createvisualtask sub_8116620, 0xA, 10, 3, 10, 0, 0x7FFF createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 @@ -7845,14 +7845,14 @@ AnimScript_82D3EF8: createvisualtask sub_8116664, 0xA, 4, 3, 8, 0, 31500 createvisualtask sub_8116620, 0xA, 10, 3, 2, 10, 0x7FFF createsprite gUnknown_0859381C, 0x28, 0, -24, 0, 1 - playsewithpan SE_W215, -64 + playsewithpan SE_W215, SOUND_PAN_ATTACKER return Move_FAKE_OUT: playsewithpan SE_W260, 0 createvisualtask sub_8105EB0, 0x5 waitforvisualfinish - playsewithpan SE_W166, +63 + playsewithpan SE_W166, SOUND_PAN_TARGET createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 createvisualtask sub_8106020, 0x3 waitforvisualfinish @@ -7862,17 +7862,17 @@ Move_FAKE_OUT: Move_SCARY_FACE: loadspritegfx 0x27EA createsprite gUnknown_08597274, 0x2, 27, 3, 0, 16, 0 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish delay 0xA - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_81064F8, 0x5 delay 0xD createsprite gUnknown_08593A84, 0x0, -16, -8 createsprite gUnknown_08593A84, 0x0, 16, -8 waitforvisualfinish createvisualtask sub_810A094, 0x3, 20, 1, 0 - playsewithpan SE_W081B, +63 + playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gUnknown_08597274, 0x2, 27, 3, 16, 0, 0 waitforvisualfinish end @@ -7881,14 +7881,14 @@ Move_SWEET_KISS: loadspritegfx 0x27E8 loadspritegfx 0x27EC createsprite gUnknown_08593AA8, 0x82, 16, -48 - playsewithpan SE_W215, +63 + playsewithpan SE_W215, SOUND_PAN_TARGET delay 0x17 - playsewithpan SE_W215, +63 + playsewithpan SE_W215, SOUND_PAN_TARGET delay 0x17 - playsewithpan SE_W215, +63 + playsewithpan SE_W215, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_085939B8, 0x83, 160, -30 - playsewithpan SE_W213, +63 + playsewithpan SE_W213, SOUND_PAN_TARGET createsprite gUnknown_085939B8, 0x83, -256, -42 createsprite gUnknown_085939B8, 0x83, 128, -14 createsprite gUnknown_085939B8, 0x83, 416, -38 @@ -7900,9 +7900,9 @@ Move_LOVELY_KISS: loadspritegfx 0x27EB loadspritegfx 0x27ED createsprite gUnknown_08593AF0, 0x82, 0, -24 - playsewithpan SE_W060B, +63 + playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W213, +63 + playsewithpan SE_W213, SOUND_PAN_TARGET createsprite gUnknown_08593AC0, 0x83, -256, -42 createsprite gUnknown_08593AC0, 0x83, 128, -14 createsprite gUnknown_08593AC0, 0x83, 416, -38 @@ -7913,13 +7913,13 @@ Move_FURY_SWIPES: loadspritegfx 0x27EE createsprite gUnknown_0857FE28, 0x2, 5, 5 delay 0x4 - playsewithpan SE_W010, +63 + playsewithpan SE_W010, SOUND_PAN_TARGET createsprite gUnknown_08593B38, 0x82, 16, 0, 1 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 5, 1 delay 0xA createsprite gUnknown_0857FE28, 0x82, 5, 5 delay 0x4 - playsewithpan SE_W010, +63 + playsewithpan SE_W010, SOUND_PAN_TARGET createsprite gUnknown_08593B38, 0x82, -16, 0, 0 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 end @@ -7928,28 +7928,28 @@ Move_INGRAIN: loadspritegfx 0x27EF loadspritegfx 0x27A3 createsprite gUnknown_0859254C, 0x2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, -64 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 0xA createsprite gUnknown_0859254C, 0x2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, -64 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 0xA createsprite gUnknown_0859254C, 0x2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, -64 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 0xA createsprite gUnknown_0859254C, 0x2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, -64 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 0x28 createsprite gUnknown_0859258C, 0x3, 32, 26, -1, 3, 30 delay 0x5 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 0x5 createsprite gUnknown_0859258C, 0x3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 0x5 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 0x5 createsprite gUnknown_0859258C, 0x3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 0xA waitforvisualfinish end @@ -7958,13 +7958,13 @@ Move_PRESENT: loadspritegfx 0x27F0 createvisualtask sub_815A904, 0x2 createsprite gUnknown_08592610, 0x82, 0, -5, 10, 2, -1 - playsewithpan SE_W039, -64 + playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 0xE - playsewithpan SE_W145B, -64 + playsewithpan SE_W145B, SOUND_PAN_ATTACKER delay 0xE playsewithpan SE_W145B, 0 delay 0x14 - playsewithpan SE_W145B, +63 + playsewithpan SE_W145B, SOUND_PAN_TARGET waitforvisualfinish jumpargeq 0x7, 0x0, AnimScript_82D41D4 jumpargeq 0x7, 0x1, AnimScript_82D423F @@ -7972,26 +7972,26 @@ Move_PRESENT: AnimScript_82D41D4: loadspritegfx 0x27D6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x83, 0, 0, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x83, 24, -24, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x83, -16, 16, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x83, -24, -12, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x83, 16, 16, 1, 1 end AnimScript_82D423F: loadspritegfx 0x27D3 loadspritegfx 0x272F - playsewithpan SE_W234, +63 + playsewithpan SE_W234, SOUND_PAN_TARGET createsprite gUnknown_08592658, 0x84, -16, 32, -3, 1 delay 0x3 createsprite gUnknown_08592658, 0x84, 16, 32, -3, -1 @@ -8016,7 +8016,7 @@ AnimScript_82D423F: Move_BATON_PASS: loadspritegfx 0x27F2 - playsewithpan SE_W226, -64 + playsewithpan SE_W226, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 0x2, 31, 1, 2, 0, 11, 31455 createsprite gUnknown_085CE370, 0x2 end @@ -8041,7 +8041,7 @@ Move_PERISH_SONG: createsprite gUnknown_08593C0C, 0x4, 15, 0, 240 createsprite gUnknown_08593C24, 0x4, 15, 0, 0 delay 0x14 - panse_1B SE_W195, -64, +63, +2, 0x0 + panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 delay 0x50 createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, 0 createvisualtask sub_811489C, 0x5, 4, 0 @@ -8062,21 +8062,21 @@ Move_SLEEP_TALK: createvisualtask sub_80D5EB8, 0x5, 0, 4, 4096, 2, 0 delay 0x14 createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 - playsewithpan SE_W173, -64 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 0x6 createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 delay 0x6 createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 delay 0x14 createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 - playsewithpan SE_W173, -64 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 0x6 createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 delay 0x6 createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 delay 0x14 createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 - playsewithpan SE_W173, -64 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 0x6 createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 delay 0x6 @@ -8086,7 +8086,7 @@ Move_SLEEP_TALK: Move_HYPER_FANG: loadspritegfx 0x27D0 - playsewithpan SE_W044, +63 + playsewithpan SE_W044, SOUND_PAN_TARGET delay 0x1 delay 0x2 createvisualtask sub_8117E60, 0x2 @@ -8100,7 +8100,7 @@ AnimScript_82D455C: createsprite gUnknown_085CE1DC, 0x82 waitbgfadein createvisualtask sub_80D51AC, 0x3, 1, 0, 10, 10, 1 - playsewithpan SE_W043, +63 + playsewithpan SE_W043, SOUND_PAN_TARGET delay 0x14 restorebg waitbgfadein @@ -8122,9 +8122,9 @@ AnimScript_82D458E: Move_TRI_ATTACK: loadspritegfx 0x27F6 createsprite gUnknown_085CE2F8, 0x82, 16, 0 - playsewithpan SE_W161, -64 + playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 0x14 - playsewithpan SE_W161, -64 + playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 0x14 createsoundtask sub_8158C58, 220, -64, 63, 5, 6, 0, 7 waitforvisualfinish @@ -8132,7 +8132,7 @@ Move_TRI_ATTACK: delay 0x10 loadspritegfx 0x2731 createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, +63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1 delay 0x1 createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1 @@ -8151,7 +8151,7 @@ Move_TRI_ATTACK: waitforvisualfinish loadspritegfx 0x2735 createvisualtask sub_8115F10, 0x2, 257, 257, 257 - playsewithpan SE_W161B, +63 + playsewithpan SE_W161B, SOUND_PAN_TARGET createsprite gUnknown_085956C0, 0x82, 0, -48 delay 0x1 createsprite gUnknown_085956C0, 0x82, 0, -16 @@ -8173,8 +8173,8 @@ Move_WILL_O_WISP: loadspritegfx 0x27F7 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - playsewithpan SE_W052, -64 - waitplaysewithpan SE_W052, -64, 0xA + playsewithpan SE_W052, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 0xA createvisualtask sub_8159278, 0x2, -64, -64, 1, 0 createsprite gUnknown_0859563C, 0x2, 0, 0, 0 delay 0x3 @@ -8187,7 +8187,7 @@ Move_WILL_O_WISP: createvisualtask sub_8159278, 0x2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, +63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 13, 1 createsprite gUnknown_0859566C, 0x2, 0 createsprite gUnknown_0859566C, 0x2, 42 @@ -8252,11 +8252,11 @@ Move_WISH: loadspritegfx 0x2741 createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 waitforvisualfinish - panse_27 SE_W115, +63, -64, -3, 0x0 + panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0x0 createsprite gUnknown_085CE388, 0x28 waitforvisualfinish delay 0x3C - loopsewithpan SE_W215, -64, 0x10, 0x3 + loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 0x10, 0x3 call AnimScript_82D79B4 waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 @@ -8265,7 +8265,7 @@ Move_WISH: Move_STOCKPILE: loadspritegfx 0x27FB - playsewithpan SE_W025, -64 + playsewithpan SE_W025, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 0x2, 2, 8, 1, 0, 12, 0x7FFF createvisualtask sub_815B65C, 0x5 call AnimScript_82D4972 @@ -8296,11 +8296,11 @@ AnimScript_82D4972: Move_SPIT_UP: loadspritegfx 0x27FD loadspritegfx 0x2797 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B6B4, 0x5 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2 delay 0x2D - playsewithpan SE_W255, -64 + playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 0x3 createsprite gUnknown_08593A50, 0x2, 0, 12 createsprite gUnknown_08593A50, 0x2, 32, 12 @@ -8317,10 +8317,10 @@ Move_SPIT_UP: AnimScript_82D4A7B: delay 0x5 createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gUnknown_085973E8, 0x83, -12, 10, 1, 1 delay 0x5 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gUnknown_085973E8, 0x83, 12, -10, 1, 1 waitforvisualfinish end @@ -8346,11 +8346,11 @@ AnimScript_82D4AE1: Move_SWALLOW: loadspritegfx 0x27FC loadspritegfx 0x272F - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B778, 0x5 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2 delay 0x26 - playsewithpan SE_W255, -64 + playsewithpan SE_W255, SOUND_PAN_ATTACKER createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 12, 1 call AnimScript_82D4B7F jumpifmoveturn 0x2, AnimScript_82D4BC1 @@ -8385,8 +8385,8 @@ AnimScript_82D4BCB: Move_TRANSFORM: monbg ANIM_ATTACKER - playsewithpan SE_W100, -64 - waitplaysewithpan SE_W107, -64, 0x30 + playsewithpan SE_W100, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 0x30 createvisualtask sub_815B7D0, 0x2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -8427,13 +8427,13 @@ AnimScript_82D4C78: Move_SWEET_SCENT: loadspritegfx 0x27FE - playsewithpan SE_W230, -64 + playsewithpan SE_W230, SOUND_PAN_ATTACKER createsprite gUnknown_085CE544, 0x2, 100, 0, 100 delay 0x19 setpan 0 call AnimScript_82D4CCA createsprite gUnknown_085CE544, 0x2, 55, 0 - setpan +63 + setpan SOUND_PAN_TARGET createvisualtask sub_8115A04, 0x2, 20, 1, 5, 5, 13, 22207 call AnimScript_82D4CCA waitforvisualfinish @@ -8469,7 +8469,7 @@ Move_HYPER_BEAM: createsprite gUnknown_08597274, 0x2, 1, 4, 0, 16, 0 waitforvisualfinish delay 0xA - playsewithpan SE_W063, -64 + playsewithpan SE_W063, SOUND_PAN_ATTACKER createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 4, 1 waitforvisualfinish delay 0x1E @@ -8566,8 +8566,8 @@ Move_ROLE_PLAY: createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, 0x7FFF createsprite gUnknown_08597274, 0x2, 1, 2, 0, 10, 0 waitforvisualfinish - playsewithpan SE_W161, -64 - waitplaysewithpan SE_W197, -64, 0x1E + playsewithpan SE_W161, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 0x1E createvisualtask sub_815CED8, 0x2 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -8579,13 +8579,13 @@ Move_ROLE_PLAY: Move_REFRESH: loadspritegfx 0x27DB loadspritegfx 0x2741 - playsewithpan SE_W287, -64 + playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 0x2, 0 waitforvisualfinish - playsewithpan SE_W234, -64 + playsewithpan SE_W234, SOUND_PAN_ATTACKER call AnimScript_82D79B4 waitforvisualfinish - playsewithpan SE_REAPOKE, -64 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 end @@ -8596,11 +8596,11 @@ Move_BLAZE_KICK: loadspritegfx 0x272D monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET createsprite gUnknown_08595F14, 0x83, 0, 0, 1, 30 createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF delay 0x1E - playsewithpan SE_W007, +63 + playsewithpan SE_W007, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 14, 1 createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF @@ -8636,7 +8636,7 @@ Move_SAND_TOMB: loadspritegfx 0x275A createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1 - playsewithpan SE_W328, +63 + playsewithpan SE_W328, SOUND_PAN_TARGET call AnimScript_82D51B7 call AnimScript_82D51B7 call AnimScript_82D51B7 @@ -8670,7 +8670,7 @@ Move_SHEER_COLD: monbgprio_28 ANIM_TARGET setalpha 0x80C createvisualtask sub_80A9EF4, 0x2 - waitplaysewithpan SE_W258, +63, 0x11 + waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 0x11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8687,11 +8687,11 @@ Move_ARM_THRUST: delay 0x6 createsprite gUnknown_0857FE28, 0x2, 4, 3 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08596034, 0x82, 10, -8, 14, 3 waitforvisualfinish createvisualtask sub_80D6134, 0x5, 8, 5, 0, 1 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET choosetwoturnanim AnimScript_82D52D4, AnimScript_82D52E8 AnimScript_82D52C0: @@ -8709,7 +8709,7 @@ AnimScript_82D52E8: goto AnimScript_82D52C0 Move_MUDDY_WATER: - panse_1B SE_W250, -64, +63, +2, 0x0 + panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 createvisualtask sub_8107954, 0x2, 1 waitforvisualfinish end @@ -8742,7 +8742,7 @@ Move_BULLET_SEED: Move_DRAGON_CLAW: loadspritegfx 0x272D loadspritegfx 0x2737 - playsewithpan SE_W221B, -64 + playsewithpan SE_W221B, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 0xA, 2, 4, 0, 8, 639 createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 15, 1 call AnimScript_82D5581 @@ -8810,7 +8810,7 @@ Move_MUD_SHOT: createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1 delay 0x6 createvisualtask sub_81076C8, 0x5, 100 - panse_1B SE_W250, -64, +63, +1, 0x0 + panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0x0 call AnimScript_82D5687 call AnimScript_82D5687 call AnimScript_82D5687 @@ -8839,7 +8839,7 @@ Move_METEOR_MASH: loadspritegfx 0x27F9 loadspritegfx 0x2797 loadspritegfx 0x279F - panse_1B SE_W112, -64, +63, +3, 0x0 + panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0x0 fadetobg BG_COSMIC waitbgfadein waitforvisualfinish @@ -8850,7 +8850,7 @@ Move_METEOR_MASH: createsprite gUnknown_08595F14, 0x83, 0, 0, 0, 30 createsprite gUnknown_085CE8DC, 0x83, -80, -64, 40, 32, 30 delay 0x14 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 createvisualtask sub_80D52D0, 0x2, 1, 5, 0, 20, 1 waitforvisualfinish @@ -8864,7 +8864,7 @@ Move_REVENGE: loadspritegfx 0x2805 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createsprite gUnknown_08596088, 0x2, 10, -10 waitforvisualfinish createvisualtask sub_8115A04, 0x2, 2, 0, 4, 2, 8, 31 @@ -8873,17 +8873,17 @@ Move_REVENGE: loadspritegfx 0x2806 createsprite gUnknown_0857FE28, 0x2, 6, 4 delay 0x4 - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_085960D0, 0x82, 10, -10 waitforvisualfinish unloadspritegfx 0x2806 loadspritegfx 0x2797 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 10, 1 createsprite gUnknown_08597400, 0x83, -10, -8, 1, 1, 8 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08597400, 0x83, 10, 8, 1, 1, 8 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -8892,7 +8892,7 @@ Move_REVENGE: Move_POISON_FANG: loadspritegfx 0x27D0 loadspritegfx 0x27A6 - playsewithpan SE_W044, +63 + playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gUnknown_085CE1DC, 0x82 delay 0xA createvisualtask sub_80D51AC, 0x3, 1, 3, 0, 10, 1 @@ -8903,7 +8903,7 @@ Move_POISON_FANG: end Move_SUBSTITUTE: - playsewithpan SE_W213, -64 + playsewithpan SE_W213, SOUND_PAN_ATTACKER createvisualtask sub_815F20C, 0x2 end @@ -8916,7 +8916,7 @@ Move_FRENZY_PLANT: createsprite gUnknown_08597274, 0x0, 1, 2, 0, 5, 0 waitforvisualfinish createsprite gUnknown_08592564, 0x2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, -64 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 0x5 createsprite gUnknown_08592564, 0x2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 @@ -8934,32 +8934,32 @@ Move_FRENZY_PLANT: playsewithpan SE_W010, +42 delay 0x5 createsprite gUnknown_08592564, 0x2, 75, 8, 0, 0, 0, 85 - playsewithpan SE_W010, +63 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08592564, 0x2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, +63 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08592564, 0x2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, +63 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08597358, 0x2, -10, -10, 1, 3 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x3, 1, 8, 0, 20, 1 delay 0x3 createsprite gUnknown_08597358, 0x2, 10, 8, 1, 3 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 0x3 createsprite gUnknown_08597358, 0x2, 10, -3, 1, 2 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 0x3 createsprite gUnknown_08597358, 0x2, -3, 1, 1, 2 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08597358, 0x2, -10, 1, 1, 1 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 0x2 createsprite gUnknown_08597358, 0x2, 0, 10, 1, 1 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish createsprite gUnknown_08597274, 0x0, 1, 2, 5, 0, 0 waitforvisualfinish @@ -8983,7 +8983,7 @@ Move_METAL_SOUND: end AnimScript_82D59EA: - panse_1B SE_W103, -64, +63, +2, 0x0 + panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 createsprite gUnknown_08593458, 0x82, 16, 0, 0, 0, 30, 0 delay 0x2 return @@ -9009,20 +9009,20 @@ AnimScript_82D5A3C: waitbgfadein monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W207, +63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_08596104, 0x82 delay 0xA createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0 createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1 delay 0x8 createsprite gUnknown_08597358, 0x2, 10, 2, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08597358, 0x2, 10, -6, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08597358, 0x2, 0, 8, 1, 0 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -9215,7 +9215,7 @@ Move_BLAST_BURN: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W221, -64 + playsewithpan SE_W221, SOUND_PAN_ATTACKER createsprite gUnknown_08595428, 0x2, -32, 0, 24, 0, 0, 0 createsprite gUnknown_08595428, 0x2, -20, -10, 24, 0, 0, 0 createsprite gUnknown_08595428, 0x42, 0, -16, 24, 0, 0, 0 @@ -9225,7 +9225,7 @@ Move_BLAST_BURN: createsprite gUnknown_08595428, 0x2, 0, 16, 24, 0, 0, 0 createsprite gUnknown_08595428, 0x2, -20, 10, 24, 0, 0, 0 delay 0x19 - playsewithpan SE_W172B, -64 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER createsprite gUnknown_08595428, 0x2, -64, 0, 24, 0, 0, 0 createsprite gUnknown_08595428, 0x6, -40, -20, 24, 0, 0, 0 createsprite gUnknown_08595428, 0x46, 0, -32, 24, 0, 0, 0 @@ -9237,7 +9237,7 @@ Move_BLAST_BURN: createsprite gUnknown_08595428, 0x2, -40, 20, 24, 0, 0, 0 createvisualtask sub_8115F10, 0x2, 257, 257, 257 delay 0x19 - playsewithpan SE_W172B, -64 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER createsprite gUnknown_08595428, 0x2, -96, 0, 24, 0, 0, 0 createsprite gUnknown_08595428, 0x6, -60, -30, 24, 0, 0, 0 createsprite gUnknown_08595428, 0x46, 0, -48, 24, 0, 0, 0 @@ -9263,24 +9263,24 @@ Move_ROCK_TOMB: createsprite gUnknown_08596C58, 0x82, 20, 12, 64, 114, 0 delay 0x8 createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08596C58, 0x82, -20, 12, 64, 98, 0 delay 0x8 createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08596C58, 0xC2, 3, 6, 64, 82, 0 delay 0x8 createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08596C58, 0x82, -3, 13, 64, 66, 0 delay 0x8 createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 0x18 - playsewithpan SE_W063, +63 + playsewithpan SE_W063, SOUND_PAN_TARGET createsprite gUnknown_085967AC, 0x85, 1, 50 createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 20, 1 createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 @@ -9289,7 +9289,7 @@ Move_ROCK_TOMB: Move_SILVER_WIND: loadspritegfx 0x281F - panse_1B SE_W016, -64, +63, +2, 0x0 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 playsewithpan SE_W234, 0 delay 0x0 monbg ANIM_DEF_PARTNER @@ -9330,7 +9330,7 @@ AnimScript_82D6352: createsprite gUnknown_08592860, 0xC2, -4, 16, 0, 6, 1, 2, 1 createsprite gUnknown_08592860, 0xC2, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish - playsewithpan SE_W016B, +63 + playsewithpan SE_W016B, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER delay 0x0 restorebg @@ -9347,7 +9347,7 @@ AnimScript_82D650C: goto AnimScript_82D6352 Move_SNATCH: - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D5C50, 0x5, 0, -12, 4, 10, 10, 12, 6 end @@ -9358,10 +9358,10 @@ Move_DIVE: AnimScript_82D654C: loadspritegfx 0x27AC - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER createsprite gUnknown_08596490, 0x2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, -64 + playsewithpan SE_W291, SOUND_PAN_ATTACKER createsprite gUnknown_085964CC, 0x3, 0 call AnimScript_82D658A call AnimScript_82D658A @@ -9380,7 +9380,7 @@ AnimScript_82D65A1: loadspritegfx 0x27AB monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W153, +63 + playsewithpan SE_W153, SOUND_PAN_TARGET createsprite gUnknown_085964CC, 0x83, 1 call AnimScript_82D65E0 call AnimScript_82D65E0 @@ -9405,11 +9405,11 @@ Move_ROCK_BLAST: loadspritegfx 0x2797 createsprite gUnknown_0857FE28, 0x2, 4, 6 delay 0x3 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER createsprite gUnknown_08596C98, 0x82, 16, 0, 0, 0, 25, 257 waitforvisualfinish createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET createsprite gUnknown_08596B1C, 0x82, 0, 0, 20, 24, 14, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1 createsprite gUnknown_08596B1C, 0x82, 5, 0, -20, 24, 14, 1 @@ -9431,13 +9431,13 @@ Move_OVERHEAT: delay 0x1 createvisualtask sub_8117DD8, 0x5, 0 delay 0x1 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_8117CA0, 0x5, 1, 0 delay 0x1 createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, RGB(28, 0, 0) createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, -64 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, -20 createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, -20 createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, -20 @@ -9467,17 +9467,17 @@ Move_OVERHEAT: delay 0x5 waitforvisualfinish createsprite gUnknown_08597358, 0x83, -5, 3, 1, 0 - playsewithpan SE_W007, +63 + playsewithpan SE_W007, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 10, 0, 25, 1 delay 0x6 createsprite gUnknown_08597358, 0x83, 8, -5, 1, 0 - playsewithpan SE_W007, +63 + playsewithpan SE_W007, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08597358, 0x83, 10, 10, 1, 0 - playsewithpan SE_W007, +63 + playsewithpan SE_W007, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08597358, 0x83, 0, 0, 1, 0 - playsewithpan SE_W007, +63 + playsewithpan SE_W007, SOUND_PAN_TARGET createvisualtask sub_8117DD8, 0x5, 1 delay 0x1 createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, RGB(18, 18, 18) @@ -9504,12 +9504,12 @@ Move_HYDRO_CANNON: loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER setalpha 0x80C - playsewithpan SE_W057, -64 + playsewithpan SE_W057, SOUND_PAN_ATTACKER createsprite gUnknown_085951C0, 0x82 delay 0xA createvisualtask sub_8115F10, 0x2, 257, 257, 257 delay 0x1E - panse_1B SE_W056, -64, +63, +2, 0x0 + panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 call AnimScript_82D6A50 createvisualtask sub_80D51AC, 0x5, 1, 10, 0, 40, 1 createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 @@ -9544,11 +9544,11 @@ AnimScript_82D6A50: Move_ASTONISH: loadspritegfx 0x2821 - playsewithpan SE_W227, -64 + playsewithpan SE_W227, SOUND_PAN_ATTACKER createsprite gUnknown_0857FE28, 0x2, 4, 6 delay 0x19 createsprite gUnknown_085964E4, 0x85, 0, 1 - playsewithpan SE_W166, +63 + playsewithpan SE_W166, SOUND_PAN_TARGET createsprite gUnknown_085964E4, 0x85, 1, 1 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 createvisualtask sub_8106020, 0x3 @@ -9610,7 +9610,7 @@ AnimScript_82D6B7C: AnimScript_82D6B9B: createsprite gUnknown_08597358, 0x83, -10, -8, 1, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3 createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4 @@ -9620,7 +9620,7 @@ AnimScript_82D6B9B: AnimScript_82D6BFC: createsprite gUnknown_08597358, 0x83, 10, -8, 1, 1 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 createsprite gUnknown_08596CB0, 0x82, -12, 32, 3, 4 createsprite gUnknown_08596CB0, 0x82, 8, 31, 2, 2 @@ -9631,7 +9631,7 @@ AnimScript_82D6BFC: Move_MAGIC_COAT: loadspritegfx 0x27BA setalpha 0x1000 - waitplaysewithpan SE_W112, -64, 0xF + waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 0xF createsprite gUnknown_085965C0, 0x3, 40, 0, 10170 waitforvisualfinish delay 0x1 @@ -9643,7 +9643,7 @@ Move_WATER_PULSE: loadspritegfx 0x2830 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, RGB(0, 25, 28) delay 0xA createsprite gUnknown_085952F8, 0x42, 100, 100, 8, 1, 20, 40, 0 @@ -9651,15 +9651,15 @@ Move_WATER_PULSE: createsprite gUnknown_085952F8, 0x42, 200, 80, 8, 1, 40, 20, 0 createsprite gUnknown_085952F8, 0x42, 80, 60, 10, 3, 20, 50, 0 createsprite gUnknown_085952F8, 0x42, 140, 100, 16, 1, 20, 30, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W202, -64 + playsewithpan SE_W202, SOUND_PAN_ATTACKER createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 delay 0x5 - playsewithpan SE_W202, -64 + playsewithpan SE_W202, SOUND_PAN_ATTACKER createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 delay 0x5 - playsewithpan SE_W202, -64 + playsewithpan SE_W202, SOUND_PAN_ATTACKER createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 delay 0xD createvisualtask sub_80D51AC, 0x2, 1, 0, 8, 18, 1 @@ -9683,13 +9683,13 @@ Move_PSYCHO_BOOST: setalpha 0x808 delay 0xA createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 240, 0 - loopsewithpan SE_W060B, -64, 0xE, 0xA + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 0xE, 0xA createsprite gUnknown_08596920, 0x2 delay 0x6E - loopsewithpan SE_W060B, -64, 0x7, 0xA + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 0x7, 0xA waitforvisualfinish createvisualtask sub_80D52D0, 0x2, 1, -8, 1, 24, 1 - playsewithpan SE_W043, +63 + playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -9701,12 +9701,12 @@ Move_KNOCK_OFF: loadspritegfx 0x2797 createsprite gUnknown_0857FE28, 0x2, 4, 6 delay 0x4 - playsewithpan SE_W233, +63 + playsewithpan SE_W233, SOUND_PAN_TARGET createsprite gUnknown_085CE984, 0x82, -16, -16 delay 0x8 createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0 createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3 createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 delay 0x3 @@ -9725,7 +9725,7 @@ Move_DOOM_DESIRE: createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 0 waitforvisualfinish setalpha 0x808 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 waitforvisualfinish delay 0x14 @@ -9742,7 +9742,7 @@ Move_SKY_UPPERCUT: monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout - playsewithpan SE_W327, -64 + playsewithpan SE_W327, SOUND_PAN_ATTACKER createvisualtask sub_810DABC, 0x5, 55 waitbgfadein setalpha 0x80C @@ -9750,20 +9750,20 @@ Move_SKY_UPPERCUT: createsprite gUnknown_0857FE70, 0x2, 0, 28, 0, 0, 5 delay 0x4 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x83, -28, 28, 1, 1 delay 0x1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x83, -15, 8, 1, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 0x1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x83, -5, -12, 1, 1 delay 0x1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x83, 0, -32, 1, 1 delay 0x1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x83, 5, -52, 1, 1 createsprite gUnknown_0857FE70, 0x2, 1, -26, 16, 1, 4 delay 0x4 @@ -9799,7 +9799,7 @@ Move_TWISTER: loadspritegfx 0x274A monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - playsewithpan SE_W239, +63 + playsewithpan SE_W239, SOUND_PAN_TARGET createsprite gUnknown_085923A8, 0x82, 120, 70, 5, 70, 30 delay 0x1 createsprite gUnknown_085923A8, 0x82, 115, 55, 6, 60, 25 @@ -9822,18 +9822,18 @@ Move_TWISTER: createsprite gUnknown_085923A8, 0x82, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gUnknown_08597358, 0x83, -32, -16, 1, 3 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET createvisualtask sub_80D5484, 0x2, 1, 3, 0, 12, 1 createvisualtask sub_80D5484, 0x2, 3, 3, 0, 12, 1 delay 0x4 createsprite gUnknown_085973A0, 0x83, 1, 3 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_085973A0, 0x83, 1, 3 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08597358, 0x83, 32, 20, 1, 3 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -9846,7 +9846,7 @@ Move_MAGICAL_LEAF: monbg ANIM_DEF_PARTNER setalpha 0x80C delay 0x1 - loopsewithpan SE_W077, -64, 0xA, 0x5 + loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 0xA, 0x5 createvisualtask sub_81007C4, 0x5 createsprite gUnknown_08592390, 0x2, -3, -2, 10 delay 0x2 @@ -9868,11 +9868,11 @@ Move_MAGICAL_LEAF: delay 0x2 createsprite gUnknown_08592390, 0x2, -3, -5, 8 delay 0x3C - playsewithpan SE_W013B, -64 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, 20, 0 createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, -20, 0 delay 0x1E - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x84, -10, -4, 1, 2 createsprite gUnknown_08597358, 0x84, 10, 4, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 @@ -9890,10 +9890,10 @@ Move_ICE_BALL: jumpargeq 0x0, 0x4, AnimScript_82D731B AnimScript_82D72BB: - playsewithpan SE_W196, -64 + playsewithpan SE_W196, SOUND_PAN_ATTACKER createsprite gUnknown_08595DE4, 0x82, 15, 0, -12, -16, 30, -40 delay 0x1C - playsewithpan SE_W280, +63 + playsewithpan SE_W280, SOUND_PAN_TARGET createvisualtask sub_810CDFC, 0x5, 0 jumpargeq 0x0, 0x0, AnimScript_82D732C jumpargeq 0x0, 0x1, AnimScript_82D735B @@ -9988,7 +9988,7 @@ Move_WEATHER_BALL: loadspritegfx 0x282B createsprite gUnknown_0857FE40, 0x2, 8, 1, 0 delay 0x8 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER createsprite gUnknown_0853EE38, 0x2 waitforvisualfinish delay 0xF @@ -10007,7 +10007,7 @@ AnimScript_82D74DE: loadspritegfx 0x2797 createsprite gUnknown_0853EE50, 0x82, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x84, -10, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 waitforvisualfinish @@ -10016,15 +10016,15 @@ AnimScript_82D74DE: AnimScript_82D751B: loadspritegfx 0x272D createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W172B, +63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 waitforvisualfinish end @@ -10032,31 +10032,31 @@ AnimScript_82D751B: AnimScript_82D757F: loadspritegfx 0x27AB createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 0x8 createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 0xD createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, +63 + playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET waitforvisualfinish end AnimScript_82D75E3: loadspritegfx 0x274A createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0x5 createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 0xE createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, +63 + playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3 createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4 createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3 @@ -10069,16 +10069,16 @@ AnimScript_82D7683: loadspritegfx 0x2817 loadspritegfx 0x279D createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, +63 + playsewithpan SE_W258, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, +63 + playsewithpan SE_W258, SOUND_PAN_TARGET delay 0xA createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, +63 + playsewithpan SE_W258, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET call AnimScript_82D7720 waitforvisualfinish end @@ -10087,7 +10087,7 @@ Move_COUNT: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -10097,64 +10097,64 @@ Move_COUNT: AnimScript_82D7720: createsprite gUnknown_08595B68, 0x82, -10, -10, 0 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, 10, 20, 0 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B68, 0x82, -5, 10, 0 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, 17, -12, 0 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, -15, 15, 0 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, 0, 0, 0 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B68, 0x82, 20, 2, 0 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET return AnimScript_82D77A4: createsprite gUnknown_08595B68, 0x82, -10, -10, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, 10, 20, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B68, 0x82, -29, 0, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, 29, -20, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B68, 0x82, -5, 10, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, 17, -12, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B68, 0x82, -20, 0, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, -15, 15, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, 26, -5, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B80, 0x82, 0, 0, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 0x4 createsprite gUnknown_08595B68, 0x82, 20, 2, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET return AnimScript_82D7874: - loopsewithpan SE_W196, +63, 0x6, 0x4 + loopsewithpan SE_W196, SOUND_PAN_TARGET, 0x6, 0x4 createsprite gUnknown_08595C04, 0x82, 0, 24, 0 delay 0x4 createsprite gUnknown_08595C04, 0x82, 8, 24, 0 @@ -10171,7 +10171,7 @@ AnimScript_82D7874: return AnimScript_82D78F8: - loopsewithpan SE_W196, +63, 0x6, 0x4 + loopsewithpan SE_W196, SOUND_PAN_TARGET, 0x6, 0x4 createsprite gUnknown_08595C04, 0x82, 0, 24, 1 delay 0x4 createsprite gUnknown_08595C04, 0x82, 8, 24, 1 @@ -10201,7 +10201,7 @@ AnimScript_82D79B4: return AnimScript_82D79DF: - playsewithpan SE_W071B, -64 + playsewithpan SE_W071B, SOUND_PAN_ATTACKER createsprite gUnknown_08592F2C, 0x2, 0, -5, 0, 0 delay 0x7 createsprite gUnknown_08592F2C, 0x2, -15, 10, 0, 0 @@ -10213,7 +10213,7 @@ AnimScript_82D79DF: return AnimScript_82D7A28: - playsewithpan SE_W071B, +63 + playsewithpan SE_W071B, SOUND_PAN_TARGET createsprite gUnknown_08592F2C, 0x82, 0, -5, 1, 0 delay 0x7 createsprite gUnknown_08592F2C, 0x82, -15, 10, 1, 0 @@ -10226,72 +10226,72 @@ AnimScript_82D7A28: AnimScript_82D7A71: createsprite gUnknown_08596240, 0x82, 10, 10, 0 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596240, 0x82, 20, -20, 0 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596240, 0x82, -20, 15, 0 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596240, 0x82, 0, 0, 0 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596240, 0x82, -20, -20, 0 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596240, 0x82, 16, -8, 0 - playsewithpan SE_W092, +63 + playsewithpan SE_W092, SOUND_PAN_TARGET return AnimScript_82D7AE2: createsprite gUnknown_08596258, 0x2, 10, 10, 0 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, 20, -20, 0 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, -20, 15, 0 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, 0, 0, 0 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, -20, -20, 0 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, 16, -8, 0 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET return AnimScript_82D7B53: createsprite gUnknown_08596258, 0x2, 10, 10, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, -28, -10, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, 20, -20, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, -20, 15, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, 0, 0, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, 27, 8, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, -20, -20, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 0x6 createsprite gUnknown_08596258, 0x2, 16, -8, 1 - playsewithpan SE_W145C, +63 + playsewithpan SE_W145C, SOUND_PAN_TARGET return AnimScript_82D7BEA: - playsewithpan SE_W085B, +63 + playsewithpan SE_W085B, SOUND_PAN_TARGET createsprite gUnknown_08595810, 0x82, 5, 0, 5, 0 delay 0x2 createsprite gUnknown_08595810, 0x82, -5, 10, 5, 1 @@ -10310,7 +10310,7 @@ AnimScript_82D7BEA: return AnimScript_82D7C75: - loopsewithpan SE_W146, +63, 0xD, 0x6 + loopsewithpan SE_W146, SOUND_PAN_TARGET, 0xD, 0x6 createsprite gUnknown_0859725C, 0x82, 0, -15, 0, 3, 90 createsprite gUnknown_0859725C, 0x82, 0, -15, 51, 3, 90 createsprite gUnknown_0859725C, 0x82, 0, -15, 102, 3, 90 @@ -10384,7 +10384,7 @@ AnimScript_82D7D57: return Status_Poison: - loopsewithpan SE_W092, +63, 0xD, 0x6 + loopsewithpan SE_W092, SOUND_PAN_TARGET, 0xD, 0x6 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 18, 2 createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 12, 31774 end @@ -10396,7 +10396,7 @@ Status_Confusion: Status_Burn: loadspritegfx 0x272D - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET call AnimScript_82D7DA6 call AnimScript_82D7DA6 call AnimScript_82D7DA6 @@ -10410,19 +10410,19 @@ AnimScript_82D7DA6: Status_Infatuation: loadspritegfx 0x27E2 - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gUnknown_08593970, 0x3, 0, 20 delay 0xF - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gUnknown_08593970, 0x3, -20, 20 delay 0xF - playsewithpan SE_W204, -64 + playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gUnknown_08593970, 0x3, 20, 20 end Status_Sleep: loadspritegfx 0x27F4 - playsewithpan SE_W173, -64 + playsewithpan SE_W173, SOUND_PAN_ATTACKER createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 delay 0x1E createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 @@ -10439,7 +10439,7 @@ Status_Freeze: loadspritegfx 0x271A monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - waitplaysewithpan SE_W258, +63, 0x11 + waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 0x11 createvisualtask sub_80A9EF4, 0x2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10448,7 +10448,7 @@ Status_Freeze: Status_Curse: loadspritegfx 0x27D8 monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gUnknown_08596DE8, 0x82 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -10458,7 +10458,7 @@ Status_Curse: Status_Nightmare: loadspritegfx 0x27ED monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gUnknown_08596E00, 0x82 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -10472,8 +10472,8 @@ Anim_CastformTransform: AnimScript_82D7EB2: monbg ANIM_ATTACKER - playsewithpan SE_W100, -64 - waitplaysewithpan SE_W107, -64, 0x30 + playsewithpan SE_W100, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 0x30 createvisualtask sub_815B7D0, 0x2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -10509,10 +10509,10 @@ Anim_Table_4: createvisualtask sub_817345C, 0x2, 0 createvisualtask sub_81732B0, 0x2 delay 0x0 - waitplaysewithpan SE_W026, -64, 0x16 + waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 0x16 createsprite gUnknown_085E5338, 0x83, -18, 12, 0, 32 delay 0x32 - loopsewithpan SE_W039, +63, 0x13, 0x2 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 0x13, 0x2 createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 2, 1 waitforvisualfinish createvisualtask sub_81732E4, 0x2 @@ -10533,7 +10533,7 @@ Status_Wrap: AnimScript_82D7FA1: loadspritegfx 0x27CA - loopsewithpan SE_W010, +63, 0x6, 0x2 + loopsewithpan SE_W010, SOUND_PAN_TARGET, 0x6, 0x2 createsprite gUnknown_08592494, 0x84, 0, 16, 0, 1 delay 0x7 createsprite gUnknown_08592494, 0x82, 0, 8, 1, 1 @@ -10541,13 +10541,13 @@ AnimScript_82D7FA1: createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 delay 0x14 setarg 0x7, 0xFFFF - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish end AnimScript_82D7FE9: loadspritegfx 0x272D - playsewithpan SE_W221B, +63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 call AnimScript_82CACBF call AnimScript_82CACBF @@ -10562,7 +10562,7 @@ AnimScript_82D800E: setalpha 0x80C delay 0x0 createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) - playsewithpan SE_W250, +63 + playsewithpan SE_W250, SOUND_PAN_TARGET createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 call AnimScript_82D1F5B call AnimScript_82D1F5B @@ -10578,7 +10578,7 @@ AnimScript_82D8062: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W011, +63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10 createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10 delay 0xA @@ -10594,7 +10594,7 @@ AnimScript_82D80BF: loadspritegfx 0x275A createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - playsewithpan SE_W328, +63 + playsewithpan SE_W328, SOUND_PAN_TARGET call AnimScript_82D51B7 call AnimScript_82D51B7 delay 0x16 @@ -10607,19 +10607,19 @@ Anim_ItemEffect: loadspritegfx 0x27DB loadspritegfx 0x2741 delay 0x0 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W234, -64 + playsewithpan SE_W234, SOUND_PAN_ATTACKER call AnimScript_82D79B4 waitforvisualfinish - playsewithpan SE_REAPOKE, -64 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, RGB(17, 31, 25) createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 waitforvisualfinish @@ -10630,23 +10630,23 @@ Anim_SmokeBallEscape: monbg ANIM_ATTACKER setalpha 0x40C delay 0x0 - playsewithpan SE_BOWA2, +63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gUnknown_085CE734, 0x80, 0, 32, 28, 30 delay 0x4 - playsewithpan SE_BOWA2, +63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gUnknown_085CE734, 0x7F, 2, 12, 20, 30 delay 0xC - playsewithpan SE_BOWA2, +63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gUnknown_085CE734, 0x7E, 2, -28, 4, 30 delay 0xC - playsewithpan SE_BOWA2, +63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gUnknown_085CE734, 0x7C, 2, 14, -20, 30 delay 0x4 - playsewithpan SE_BOWA2, +63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createvisualtask sub_81136E8, 0x2, 2 createsprite gUnknown_085CE734, 0x7B, 3, 4, 4, 30 delay 0xE - playsewithpan SE_BOWA2, +63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gUnknown_085CE734, 0x7A, 3, -14, 18, 46 delay 0x0 createsprite gUnknown_085CE734, 0x79, 3, 14, -14, 46 @@ -10665,7 +10665,7 @@ Anim_SmokeBallEscape: Anim_HangedOn: createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, RGB_RED - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_815DB90, 0x5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, RGB_RED @@ -10676,7 +10676,7 @@ Anim_HangedOn: Anim_Rain: loadspritegfx 0x2783 - playsewithpan SE_W240, -64 + playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 0xA, 1921, 2, 0, 4, 0 waitforvisualfinish createvisualtask sub_8107188, 0x2, 0, 3, 60 @@ -10705,7 +10705,7 @@ Anim_Hit: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -10738,23 +10738,23 @@ AnimScript_82D8398: end AnimScript_82D839F: - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createvisualtask sub_815F8F4, 0x2 goto AnimScript_82D8398 AnimScript_82D83AF: - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createvisualtask sub_815FFC4, 0x2 goto AnimScript_82D8398 Anim_FutureSightHit: createvisualtask sub_8117F10, 0x2 monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call AnimScript_82D7CD1 setalpha 0x808 - playsewithpan SE_W048, +63 - waitplaysewithpan SE_W048, +63, 0x8 + playsewithpan SE_W048, SOUND_PAN_TARGET + waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 0x8 createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 15, 1 createvisualtask sub_80D6064, 0x5, -5, -5, 15, 1, 1 waitforvisualfinish @@ -10775,26 +10775,26 @@ Anim_DoomDesireHit: delay 0xA createvisualtask sub_815C0A4, 0x5 delay 0x9 - playsewithpan SE_W109, -64 + playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 0x9 playsewithpan SE_W109, 0 delay 0x9 - playsewithpan SE_W109, +63 + playsewithpan SE_W109, SOUND_PAN_TARGET delay 0x19 createvisualtask sub_80D5484, 0x2, 1, 10, 0, 20, 1 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1 delay 0x6 - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE @@ -10803,7 +10803,7 @@ Anim_DoomDesireHit: Anim_Table_x14: loadspritegfx 0x27C8 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER call AnimScript_82CD6C7 delay 0x8 createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 @@ -10837,7 +10837,7 @@ Anim_WishHeal: loadspritegfx 0x2741 createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 waitforvisualfinish - playsewithpan SE_W025, -64 + playsewithpan SE_W025, SOUND_PAN_ATTACKER call AnimScript_82D79B4 waitforvisualfinish unloadspritegfx 0x2741 @@ -10913,7 +10913,7 @@ AnimScript_82D8652: monbg ANIM_DEF_PARTNER setalpha 0x80C delay 0x0 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gUnknown_08597358, 0x82, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER -- cgit v1.2.3 From ecd482fa2cda82887893f9eb9e02196537bc414f Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 16:19:36 -0400 Subject: fix merge conflicts in battle_anim_scripts --- data/battle_anim_scripts.s | 13512 +++++++++++++++++++++---------------------- 1 file changed, 6661 insertions(+), 6851 deletions(-) (limited to 'data/battle_anim_scripts.s') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 92aa51deb..1d9ff20ae 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,16 +1,20 @@ +#include "constants/battle.h" #include "constants/battle_anim.h" #include "constants/rgb.h" #include "constants/songs.h" +#include "constants/moves.h" + .include "asm/macros.inc" .include "asm/macros/battle_anim_script.inc" + .include "constants/constants.inc" .section script_data, "aw", %progbits -.align 2 -gUnknown_082C8D64:: @ 82C8D64 - .2byte 0x2F, 0xC3, 0x140, 0xFFFF + .align 2 +gMovesWithQuietBGM:: + .2byte MOVE_SING, MOVE_PERISH_SONG, MOVE_GRASS_WHISTLE, 0xFFFF -.align 2 -gBattleAnims_Moves:: @ 82C8D6C + .align 2 +gBattleAnims_Moves:: .4byte Move_NONE .4byte Move_POUND .4byte Move_KARATE_CHOP @@ -368,8 +372,8 @@ gBattleAnims_Moves:: @ 82C8D6C .4byte Move_PSYCHO_BOOST .4byte Move_COUNT @ cannot be reached, because last move is Psycho Boost -.align 2 -gBattleAnims_Statuses:: @ 82C92FC + .align 2 +gBattleAnims_StatusConditions:: .4byte Status_Poison .4byte Status_Confusion .4byte Status_Burn @@ -380,212 +384,209 @@ gBattleAnims_Statuses:: @ 82C92FC .4byte Status_Curse .4byte Status_Nightmare -.align 2 -gBattleAnims_VariousTable:: @ 82C9320 - .4byte Anim_CastformTransform - .4byte Anim_StatChange - .4byte Anim_SubsituteOff - .4byte Anim_SubsituteOn - .4byte Anim_Table_4 - .4byte Anim_ItemKnockOff - .4byte Status_Wrap - .4byte Anim_ItemEffect - .4byte Anim_SmokeBallEscape - .4byte Anim_HangedOn - .4byte Anim_Rain - .4byte Anim_Sun - .4byte Anim_Sandstorm - .4byte Anim_Hail - .4byte Status_LeechSeed - .4byte Anim_Hit - .4byte Anim_ItemSteal - .4byte Anim_SnatchMove - .4byte Anim_FutureSightHit - .4byte Anim_DoomDesireHit - .4byte Anim_Table_x14 - .4byte Status_Ingrain - .4byte Anim_WishHeal - -.align 2 -gBattleAnims_Special:: @ 82C937C - .4byte Anim_LevelUp - .4byte Anim_SwitchOutPlayer - .4byte Anim_SwitchOutOpponent - .4byte Anim_BallThrow - .4byte Anim_SafariBallThrow - .4byte Anim_SubstituteToMon - .4byte Anim_MonToSubstitute + .align 2 +gBattleAnims_General:: + .4byte General_CastformChange + .4byte General_StatsChange + .4byte General_SubstituteFade + .4byte General_SubstituteAppear + .4byte General_PokeblockThrow + .4byte General_ItemKnockoff + .4byte General_TurnTrap + .4byte General_ItemEffect + .4byte General_SmokeballEscape + .4byte General_HangedOn + .4byte General_Rain + .4byte General_Sun + .4byte General_Sandstorm + .4byte General_Hail + .4byte General_LeechSeedDrain + .4byte General_MonHit + .4byte General_ItemSteal + .4byte General_SnatchMove + .4byte General_FutureSightHit + .4byte General_DoomDesireHit + .4byte General_FocusPunchSetUp + .4byte General_IngrainHeal + .4byte General_WishHeal + + .align 2 +gBattleAnims_Special:: + .4byte Special_LevelUp + .4byte Special_SwitchOutPlayerMon + .4byte Special_SwitchOutOpponentMon + .4byte Special_BallThrow + .4byte Special_SafariBallThrow + .4byte Special_SubstituteToMon + .4byte Special_MonToSubstitute Move_NONE: Move_MIRROR_MOVE: Move_POUND: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_DOUBLE_SLAP: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim AnimScript_82C93F4, AnimScript_82C9408 - -AnimScript_82C93DA: - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + choosetwoturnanim DoubleSlapLeft, DoubleSlapRight +DoubleSlapContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -AnimScript_82C93F4: - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - goto AnimScript_82C93DA - -AnimScript_82C9408: - createsprite gUnknown_08597358, 0x2, 8, 0, 1, 2 - goto AnimScript_82C93DA +DoubleSlapLeft: + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + goto DoubleSlapContinue +DoubleSlapRight: + createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 2 + goto DoubleSlapContinue Move_POISON_POWDER: - loadspritegfx 0x2751 - loadspritegfx 0x27A6 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 0xA, 0x6 - createsprite gUnknown_08592148, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592148, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592148, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592148, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592148, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592148, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592148, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592148, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592148, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592148, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592148, 0x82, 5, -22, 117, 80, 5, 1 + loadspritegfx ANIM_TAG_065 + 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 + 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 + 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 + 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 waitforvisualfinish end Move_STUN_SPORE: - loadspritegfx 0x2754 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 0xA, 0x6 - createsprite gUnknown_08592130, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592130, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592130, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592130, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592130, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592130, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592130, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592130, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592130, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592130, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592130, 0x82, 5, -22, 117, 80, 5, 1 + loadspritegfx ANIM_TAG_068 + 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 + 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 + 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 + 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 waitforvisualfinish end Move_SLEEP_POWDER: - loadspritegfx 0x2753 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 0xA, 0x6 - createsprite gUnknown_08592118, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592118, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592118, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592118, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592118, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592118, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592118, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592118, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592118, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592118, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592118, 0x82, 5, -22, 117, 80, 5, 1 + loadspritegfx ANIM_TAG_067 + 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 + 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 + 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 + 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 waitforvisualfinish end Move_SWIFT: - loadspritegfx 0x27BE - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_174 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 20, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1 + delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 5, 22, -18, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1 + delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592404, 0x83, 20, -10, 20, -10, 22, 15, 1 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 18, 1 - delay 0x5 + 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 + delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, -20, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1 + delay 5 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 12, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1 + delay 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_STRENGTH: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_80D5644, 0x5, 0, 2, 0, 96, 30 + createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 4 - createvisualtask sub_80D5830, 0x2, 1, 18, 6, 2, 4 - delay 0x4 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 + delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 16, 12, 1, 1 - delay 0x4 + createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1 + delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, -16, -12, 1, 1 - delay 0x4 + createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1 + delay 4 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 3, 4, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_TACKLE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET @@ -593,614 +594,597 @@ Move_TACKLE: end Move_BODY_SLAM: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER waitforvisualfinish - delay 0xB - createsprite gUnknown_0857FE70, 0x2, 0, 26, 0, 0, 5 - delay 0x6 - createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 0xA, 0x2 - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3 + delay 11 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 26, 0, 0, 5 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 + loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SUPERSONIC: - loadspritegfx 0x27B3 + loadspritegfx ANIM_TAG_163 monbg ANIM_ATK_PARTNER monbgprio_2A ANIM_ATTACKER - setalpha 0x80C - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1 - call AnimScript_82C99FF - call AnimScript_82C99FF - call AnimScript_82C99FF - call AnimScript_82C99FF - call AnimScript_82C99FF - call AnimScript_82C99FF + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end - -AnimScript_82C99FF: +Supersonic1: playsewithpan SE_W048, SOUND_PAN_ATTACKER - createsprite gUnknown_08593428, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 + createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_SCREECH: - loadspritegfx 0x27B4 - createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 2, 1 - call AnimScript_82C9A4C - call AnimScript_82C9A4C - delay 0x10 - createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 2, 1 + loadspritegfx ANIM_TAG_164 + 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_TARGET waitforvisualfinish end - -AnimScript_82C9A4C: +Screech1: playsewithpan SE_W103, SOUND_PAN_ATTACKER - createsprite gUnknown_08593440, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 + createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_FLAME_WHEEL: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 0 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0 playsewithpan SE_W172, SOUND_PAN_ATTACKER - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 4 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 4 playsewithpan SE_W172, SOUND_PAN_ATTACKER - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 8 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 8 playsewithpan SE_W172, SOUND_PAN_ATTACKER - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 12 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 12 playsewithpan SE_W172, SOUND_PAN_ATTACKER - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 16 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 16 playsewithpan SE_W172, SOUND_PAN_ATTACKER - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 20 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 20 playsewithpan SE_W172, SOUND_PAN_ATTACKER - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 24 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 24 playsewithpan SE_W172, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6 - delay 0x4 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1 - createvisualtask sub_80A7B98, 0x3, 1, RGB_RED, 12, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 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 playsewithpan SE_W172B, SOUND_PAN_TARGET - call AnimScript_82D2D18 - delay 0x7 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 9 + call FireMoveEffect + delay 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82C9B50: - createsprite gUnknown_08595584, 0x3, 0, 0, 50 - delay 0x4 +FlameWheel1: @ Unused + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 50 + delay 4 return Move_PIN_MISSILE: - loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_161 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_08596A5C, 0x2, 20, -8, -8, -8, 20, -32 - delay 0xF - createsprite gUnknown_08596A5C, 0x2, 20, -8, 8, 8, 20, -40 - delay 0x4 + createsprite gPinMissileSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 + delay 15 + createsprite gPinMissileSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 + delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 - delay 0x9 - createsprite gUnknown_08596A5C, 0x2, 20, -8, 0, 0, 20, -32 - delay 0x4 + createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + delay 9 + createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + delay 14 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_ICICLE_SPEAR: - loadspritegfx 0x2816 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_262 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W196, SOUND_PAN_ATTACKER - createsprite gUnknown_08596A74, 0x2, 20, -8, -8, -8, 20, -32 - delay 0xF - createsprite gUnknown_08596A74, 0x2, 20, -8, 8, 8, 20, -40 - delay 0x4 + createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 + delay 15 + createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 + delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 - delay 0x9 - createsprite gUnknown_08596A74, 0x2, 20, -8, 0, 0, 20, -32 - delay 0x4 + createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + delay 9 + createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + delay 4 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + delay 14 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_TAKE_DOWN: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D5C50, 0x5, 0, -24, 8, 23, 10, 40, 10 - delay 0x23 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0 - createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0 + setalpha 12, 8 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_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 playsewithpan SE_W025B, SOUND_PAN_TARGET - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -16, 0, 0, 4 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish - delay 0x2 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + delay 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_EDGE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_0859728C, 0x2, 2, 4, 2, 0x7FFF, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W207, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 0x8 - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 2, 4 + waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, RGB_WHITE - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 16, 16, RGB_WHITE + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 3 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x84, -10, 0, 1, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -32, 0, 0, 3 + createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3 waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 8, -256, 0, 0 - createvisualtask sub_80D6134, 0x2, 8, -256, 1, 0 - createvisualtask sub_80D5484, 0x2, 0, 4, 0, 12, 1 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_WHITE + 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 waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 8, -256, 0, 1 - createvisualtask sub_80D6134, 0x2, 8, -256, 1, 1 + createvisualtask sub_80D6134, 2, 8, -256, 0, 1 + createvisualtask sub_80D6134, 2, 8, -256, 1, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish end Move_POISON_STING: - loadspritegfx 0x27B1 - loadspritegfx 0x2797 - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_161 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_08596A44, 0x82, 20, 0, -8, 0, 20 + createsprite gLinearStingerSpriteTemplate, 130, 20, 0, -8, 0, 20 waitforvisualfinish - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish - call AnimScript_82D7A71 + call PoisonBubblesEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_TWINEEDLE: - loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_161 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x6, 0x2 - createsprite gUnknown_08596A44, 0x82, 10, -4, 0, -4, 20 - createsprite gUnknown_08596A44, 0x82, 20, 12, 10, 12, 20 - delay 0x14 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 - createsprite gUnknown_08597370, 0x3, 0, -4, 1, 3 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 0x5, 0x2 - delay 0x1 - createsprite gUnknown_08597370, 0x3, 10, 12, 1, 3 + 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 + delay 20 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, -4, 1, 3 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 + delay 1 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 10, 12, 1, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_FIRE_BLAST: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_SMALL_EMBER createsoundtask sub_8158B30, 144, 145 - call AnimScript_82C9FE9 - call AnimScript_82C9FE9 - call AnimScript_82C9FE9 - delay 0x18 - createvisualtask sub_8116620, 0xA, 1, 3, 0, 8, 0 - waitforvisualfinish - delay 0x13 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 20, 1 - call AnimScript_82CA02D - delay 0x3 - call AnimScript_82CA02D - delay 0x3 - call AnimScript_82CA02D - delay 0x3 - call AnimScript_82CA02D - delay 0x3 - call AnimScript_82CA02D - delay 0x3 - call AnimScript_82CA02D - delay 0x3 - call AnimScript_82CA02D - delay 0x3 - call AnimScript_82CA02D - delay 0x3 - call AnimScript_82CA02D - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 2, 8, 0, 0 - waitforvisualfinish - end - -AnimScript_82C9FE9: - createsprite gUnknown_0859551C, 0x82, 0, 0, 0 - createsprite gUnknown_0859551C, 0x82, 0, 0, 51 - createsprite gUnknown_0859551C, 0x82, 0, 0, 102 - createsprite gUnknown_0859551C, 0x82, 0, 0, 153 - createsprite gUnknown_0859551C, 0x82, 0, 0, 204 - delay 0x5 + call FireBlast1 + call FireBlast1 + call FireBlast1 + delay 24 + createvisualtask sub_8116620, 10, 1, 3, 0, 8, RGB_BLACK + waitforvisualfinish + delay 19 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 20, 1 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + waitforvisualfinish + createvisualtask sub_8116620, 10, 1, 2, 8, 0, RGB_BLACK + 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 + delay 5 return - -AnimScript_82CA02D: - createsprite gUnknown_0859556C, 0x82, 0, 0, 10, 0, -2 - createsprite gUnknown_0859556C, 0x82, 0, 0, 13, -2, 0 - createsprite gUnknown_0859556C, 0x82, 0, 0, 13, 2, 0 - createsprite gUnknown_0859556C, 0x82, 0, 0, 15, -2, 2 - createsprite gUnknown_0859556C, 0x82, 0, 0, 15, 2, 2 +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 return Move_LEECH_SEED: - loadspritegfx 0x2716 + loadspritegfx ANIM_TAG_SEED playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite gUnknown_085922BC, 0x82, 15, 0, 0, 24, 35, -32 - delay 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 + delay 8 playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite gUnknown_085922BC, 0x82, 15, 0, -16, 24, 35, -40 - delay 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, -16, 24, 35, -40 + delay 8 playsewithpan SE_W077, SOUND_PAN_ATTACKER - createsprite gUnknown_085922BC, 0x82, 15, 0, 16, 24, 35, -37 - delay 0xC - loopsewithpan SE_W039, SOUND_PAN_TARGET, 0xA, 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 16, 24, 35, -37 + delay 12 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish end Move_EMBER: - loadspritegfx 0x272D - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 0x5, 0x2 - createsprite gUnknown_085954D4, 0x82, 20, 0, -16, 24, 20, 1 - delay 0x4 - createsprite gUnknown_085954D4, 0x82, 20, 0, 0, 24, 20, 1 - delay 0x4 - createsprite gUnknown_085954D4, 0x82, 20, 0, 16, 24, 20, 1 - delay 0x10 + loadspritegfx ANIM_TAG_SMALL_EMBER + loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 + createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1 + delay 4 + createsprite gEmberSpriteTemplate, 130, 20, 0, 0, 24, 20, 1 + delay 4 + createsprite gEmberSpriteTemplate, 130, 20, 0, 16, 24, 20, 1 + delay 16 playsewithpan SE_W172, SOUND_PAN_TARGET - call AnimScript_82CA135 - call AnimScript_82CA135 - call AnimScript_82CA135 + call Ember1 + call Ember1 + call Ember1 end -AnimScript_82CA135: - createsprite gUnknown_085954EC, 0x82, -24, 24, 24, 24, 20, 1, 1 - delay 0x4 +Ember1: + createsprite gEmberFlareSpriteTemplate, 130, -24, 24, 24, 24, 20, 1, 1 + delay 4 return Move_MEGA_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - delay 0x2 - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK - setalpha 0x80C + delay 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK + setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF - delay 0x32 - call AnimScript_82CA1E9 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + createsprite gMegaPunchKickSpriteTemplate, 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 + createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x2 + delay 2 restorebg waitbgfadein end - -AnimScript_82CA1E9: - delay 0x2 - createvisualtask sub_8117E60, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82CA220 - createvisualtask sub_815A8C8, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82CA212 - jumpargeq 0x7, 0x1, AnimScript_82CA219 - -AnimScript_82CA211: +SetImpactBackground: + delay 2 + createvisualtask AnimTask_IsContest, 2 + jumprettrue SetImpactContestsBG + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse SetImpactOpponentBG + jumprettrue SetImpactPlayerBG +SetImpactBackgroundRet: return - -AnimScript_82CA212: +SetImpactOpponentBG: changebg BG_IMPACT_OPPONENT - goto AnimScript_82CA211 - -AnimScript_82CA219: + goto SetImpactBackgroundRet +SetImpactPlayerBG: changebg BG_IMPACT_PLAYER - goto AnimScript_82CA211 - -AnimScript_82CA220: + goto SetImpactBackgroundRet +SetImpactContestsBG: changebg BG_IMPACT_CONTESTS - goto AnimScript_82CA211 + goto SetImpactBackgroundRet Move_MEGA_KICK: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - delay 0x2 - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK - setalpha 0x80C + delay 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK + setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF - delay 0x32 + createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 1, 50 + createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE + delay 50 playsewithpan SE_W025B, SOUND_PAN_TARGET - call AnimScript_82CA1E9 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + call SetImpactBackground + createsprite gBasicHitSplatSpriteTemplate, 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 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x2 + delay 2 restorebg waitbgfadein end Move_COMET_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim AnimScript_82CA2F1, AnimScript_82CA316 - -AnimScript_82CA2D7: - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + choosetwoturnanim CometPunchLeft, CometPunchRight +CometPunchContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -AnimScript_82CA2F1: - createsprite gUnknown_08597358, 0x2, -8, -8, 1, 2 - createsprite gUnknown_08595E98, 0x3, -8, 0, 8, 1, 0 - goto AnimScript_82CA2D7 - -AnimScript_82CA316: - createsprite gUnknown_08597358, 0x2, 8, -8, 1, 2 - createsprite gUnknown_08595E98, 0x3, 8, 0, 8, 1, 0 - goto AnimScript_82CA2D7 +CometPunchLeft: + createsprite gBasicHitSplatSpriteTemplate, 2, -8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, 3, -8, 0, 8, 1, 0 + goto CometPunchContinue +CometPunchRight: + createsprite gBasicHitSplatSpriteTemplate, 2, 8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, 3, 8, 0, 8, 1, 0 + goto CometPunchContinue Move_SONIC_BOOM: - loadspritegfx 0x2713 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - call AnimScript_82CA372 - call AnimScript_82CA372 - call AnimScript_82CA372 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 10, 1 - call AnimScript_82CA38A + setalpha 12, 8 + call SonicBoom1 + call SonicBoom1 + call SonicBoom1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1 + call SonicBoom2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82CA372: +SonicBoom1: playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_08593398, 0x82, 16, 0, 0, 0, 15 - delay 0x4 + createsprite gSonicBoomSpriteTemplate, 130, 16, 0, 0, 0, 15 + delay 4 return - -AnimScript_82CA38A: - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2 - delay 0x4 +SonicBoom2: + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 + delay 4 return Move_THUNDER_SHOCK: - loadspritegfx 0x2711 - loadspritegfx 0x271B - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 0, -44, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 0, -44, 0 playsewithpan SE_W085, SOUND_PAN_TARGET - delay 0x9 - createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, 0 + delay 9 + createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, 0 + createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish - delay 0x14 - call AnimScript_82D7BEA + delay 20 + call ElectricityEffect waitforvisualfinish - delay 0x14 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0 + delay 20 + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDERBOLT: - loadspritegfx 0x2711 - loadspritegfx 0x282A - loadspritegfx 0x271B - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_282 + loadspritegfx ANIM_TAG_SPARK_2 + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 24, -52, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 24, -52, 0 playsewithpan SE_W085, SOUND_PAN_TARGET - delay 0x7 - createvisualtask sub_810A7DC, 0x5, -24, -52, 0 + delay 7 + createvisualtask sub_810A7DC, 5, -24, -52, 0 playsewithpan SE_W085, SOUND_PAN_TARGET - delay 0x7 - createvisualtask sub_810A7DC, 0x5, 0, -60, 1 + delay 7 + createvisualtask sub_810A7DC, 5, 0, -60, 1 playsewithpan SE_W085, SOUND_PAN_TARGET - delay 0x9 - createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, 0 - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, 0 - waitforvisualfinish - delay 0x14 - createsprite gUnknown_085957E0, 0x83, 44, 0, 0, 3 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 0, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 64, 40, 1, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 128, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 192, 40, 2, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 32, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 96, 40, 1, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 160, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 224, 40, 2, -32765 + delay 9 + createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK + waitforvisualfinish + 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 playsewithpan SE_W063, SOUND_PAN_TARGET - delay 0x0 - createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, 0 - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, 0 - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, 0 - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, 0 + delay 0 + createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish - delay 0x14 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 0x13 - call AnimScript_82D7BEA + delay 20 + waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + call ElectricityEffect waitforvisualfinish - delay 0x14 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0 + delay 20 + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDER_WAVE: - loadspritegfx 0x2711 - loadspritegfx 0x271B - loadspritegfx 0x27BD - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 + loadspritegfx ANIM_TAG_173 + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 0, -48, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 0, -48, 0 playsewithpan SE_W086, SOUND_PAN_TARGET - delay 0x14 - loopsewithpan SE_W085B, SOUND_PAN_TARGET, 0xA, 0x4 - createsprite gUnknown_08595840, 0x82, -16, -16 - delay 0x4 - createsprite gUnknown_08595840, 0x82, -16, 0 - delay 0x4 - createsprite gUnknown_08595840, 0x82, -16, 16 + delay 20 + loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 + createsprite gUnknown_08595840, 130, -16, -16 + delay 4 + createsprite gUnknown_08595840, 130, -16, 0 + delay 4 + createsprite gUnknown_08595840, 130, -16, 16 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0 + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_BEAT_UP: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim AnimScript_82CA648, AnimScript_82CA6B9 - -AnimScript_82CA643: + setalpha 12, 8 + choosetwoturnanim BeatUpLeft, BeatUpRight +BeatUpContinue: waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -AnimScript_82CA648: - createsprite gUnknown_08597358, 0x82, -20, -20, 1, 2 - createsprite gUnknown_08595E98, 0x83, -20, -12, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 +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 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2 - createsprite gUnknown_08595E98, 0x83, 8, 8, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + 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 playsewithpan SE_W233B, SOUND_PAN_TARGET - goto AnimScript_82CA643 - -AnimScript_82CA6B9: - createsprite gUnknown_08597358, 0x82, 12, -20, 1, 2 - createsprite gUnknown_08595E98, 0x83, 12, -12, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + 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 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08597358, 0x82, -12, 0, 1, 2 - createsprite gUnknown_08595E98, 0x83, -12, 8, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + 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 playsewithpan SE_W233B, SOUND_PAN_TARGET - goto AnimScript_82CA643 + goto BeatUpContinue Move_STOMP: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET - createsprite gUnknown_08595F60, 0x3, 0, -32, 15 - delay 0x13 - createsprite gUnknown_08597358, 0x2, 0, -8, 1, 1 - createvisualtask sub_80D51AC, 0x2, 1, 0, 4, 9, 1 + createsprite gUnknown_08595F60, 3, 0, -32, 15 + delay 19 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET @@ -1208,19 +1192,19 @@ Move_STOMP: end Move_TAIL_WHIP: - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x18, 0x3 - createvisualtask sub_80D5830, 0x2, 0, 12, 4, 2, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end Move_CUT: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W015, SOUND_PAN_TARGET - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1228,682 +1212,664 @@ Move_CUT: end Move_HIDDEN_POWER: - loadspritegfx 0x27E9 + loadspritegfx ANIM_TAG_217 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish - delay 0x1E - createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 31, 19), 12, 5, 1 - delay 0x4 - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 + delay 30 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1 + delay 4 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 playsewithpan SE_W179, SOUND_PAN_ATTACKER - createsprite gUnknown_08593A04, 0x2, 26, 0 - createsprite gUnknown_08593A04, 0x2, 26, 42 - createsprite gUnknown_08593A04, 0x2, 26, 84 - createsprite gUnknown_08593A04, 0x2, 26, 126 - createsprite gUnknown_08593A04, 0x2, 26, 168 - createsprite gUnknown_08593A04, 0x2, 26, 210 - delay 0x34 - setarg 0x7, 0xFFFF + 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 + delay 52 + setarg 7, -1 playsewithpan SE_W115, SOUND_PAN_ATTACKER - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 - createsprite gUnknown_08593A1C, 0x82, 0 - createsprite gUnknown_08593A1C, 0x82, 32 - createsprite gUnknown_08593A1C, 0x82, 64 - createsprite gUnknown_08593A1C, 0x82, 96 - createsprite gUnknown_08593A1C, 0x82, 128 - createsprite gUnknown_08593A1C, 0x82, 160 - createsprite gUnknown_08593A1C, 0x82, 192 - createsprite gUnknown_08593A1C, 0x82, 224 + 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 end Move_REVERSAL: - loadspritegfx 0x27FC - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_236 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 0x7FFF, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish - delay 0x1E - createvisualtask sub_8115A04, 0x2, 31, 3, 2, 0, 10, 0x7FFF - delay 0xA + delay 30 + createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE + delay 10 playsewithpan SE_W179, SOUND_PAN_ATTACKER - createsprite gUnknown_085CE5D8, 0x2, 26, 0 - createsprite gUnknown_085CE5D8, 0x2, 26, 42 - createsprite gUnknown_085CE5D8, 0x2, 26, 84 - createsprite gUnknown_085CE5D8, 0x2, 26, 126 - createsprite gUnknown_085CE5D8, 0x2, 26, 168 - createsprite gUnknown_085CE5D8, 0x2, 26, 210 - waitforvisualfinish - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x8 + 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 + waitforvisualfinish + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 8 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 8, 0, 0 - createsprite gUnknown_08595E98, 0x84, 0, 0, 10, 1, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 + 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 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 end Move_PURSUIT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein - delay 0x0 - setalpha 0x80C - choosetwoturnanim AnimScript_82CA99F, AnimScript_82CA9C8 - -AnimScript_82CA996: + delay 0 + setalpha 12, 8 + choosetwoturnanim PursuitNormal, PursuitOnSwitchout +PursuitContinue: waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x0 + delay 0 restorebg waitbgfadein end - -AnimScript_82CA99F: +PursuitNormal: playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 - goto AnimScript_82CA996 - -AnimScript_82CA9C8: + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 + goto PursuitContinue +PursuitOnSwitchout: playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 - goto AnimScript_82CA996 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 + goto PursuitContinue Move_SPIKE_CANNON: - loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_161 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5C50, 0x5, 0, -4, 0, 4, 6, 8, 4 + setalpha 12, 8 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x5, 0x3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - createsprite gUnknown_08596A44, 0x2, 10, -8, -8, -8, 20 - createsprite gUnknown_08596A44, 0x2, 18, 0, 0, 0, 20 - createsprite gUnknown_08596A44, 0x2, 26, 8, 8, 8, 20 + 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 waitforvisualfinish - createsprite gUnknown_08597370, 0x3, -8, -8, 1, 2 - createsprite gUnknown_08597370, 0x3, 0, 0, 1, 2 - createsprite gUnknown_08597370, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 0x5, 0x3 + 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 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_SWORDS_DANCE: - loadspritegfx 0x2715 + loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W014, SOUND_PAN_ATTACKER - createvisualtask sub_80D5830, 0x2, 0, 16, 6, 1, 4 - createsprite gUnknown_08593380, 0x2, 0, 0 - delay 0x16 - createvisualtask sub_8115D94, 0x2, 10005, 2, 2, 32754, 16, 0, 0 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 + createsprite gBattleAnimSpriteTemplate_8593380, 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 blendoff - delay 0x1 + delay 1 end Move_PSYCH_UP: - loadspritegfx 0x27D4 + loadspritegfx ANIM_TAG_196 monbg ANIM_ATK_PARTNER - createvisualtask sub_8115B0C, 0x2, 1, 2, 6, 1, 11, 0 - setalpha 0x80C - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 0x5, 0xA - createsprite gUnknown_08596548, 0x2, 0, 0, 0, 0 - createvisualtask sub_80D5EB8, 0x5, 0, 5, 2560, 8, 0 - delay 0x7F - delay 0x4 + 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 + delay 127 + delay 4 playsewithpan SE_W060, SOUND_PAN_ATTACKER - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 - createvisualtask sub_8116620, 0x9, 2, 2, 10, 0, 1023 - delay 0x1E + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 + createvisualtask sub_8116620, 9, 2, 2, 10, 0, RGB_YELLOW + delay 30 clearmonbg ANIM_ATK_PARTNER blendoff waitforvisualfinish end Move_DIZZY_PUNCH: - loadspritegfx 0x2759 - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_DUCK + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - call AnimScript_82CAC77 - createsprite gUnknown_08595E98, 0x85, 16, 8, 20, 1, 0 - createsprite gUnknown_08597358, 0x84, 16, 0, 1, 1 + setalpha 12, 8 + call DizzyPunch1 + createsprite gFistFootSpriteTemplate, 133, 16, 8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08595F78, 0x83, 16, 8, 160, -32 - createsprite gUnknown_08595F78, 0x83, 16, 8, -256, -40 - createsprite gUnknown_08595F78, 0x83, 16, 8, 128, -16 - createsprite gUnknown_08595F78, 0x83, 16, 8, 416, -38 - createsprite gUnknown_08595F78, 0x83, 16, 8, -128, -22 - createsprite gUnknown_08595F78, 0x83, 16, 8, -384, -31 - delay 0xA - call AnimScript_82CAC77 - createsprite gUnknown_08595E98, 0x85, -16, -8, 20, 1, 0 - createsprite gUnknown_08597358, 0x84, -16, -16, 1, 1 + 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 + delay 10 + call DizzyPunch1 + createsprite gFistFootSpriteTemplate, 133, -16, -8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08595F78, 0x83, -16, -8, 160, -32 - createsprite gUnknown_08595F78, 0x83, -16, -8, -256, -40 - createsprite gUnknown_08595F78, 0x83, -16, -8, 128, -16 - createsprite gUnknown_08595F78, 0x83, -16, -8, 416, -38 - createsprite gUnknown_08595F78, 0x83, -16, -8, -128, -22 - createsprite gUnknown_08595F78, 0x83, -16, -8, -384, -31 + 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 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -AnimScript_82CAC77: - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x6 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1 +DizzyPunch1: + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 return Move_FIRE_SPIN: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 47, 1 - call AnimScript_82CACBF - call AnimScript_82CACBF - call AnimScript_82CACBF - waitforvisualfinish - end - -AnimScript_82CACBF: - createsprite gUnknown_08596B88, 0x82, 0, 28, 528, 30, 13, 50, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 32, 480, 20, 16, -46, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 33, 576, 20, 8, 42, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 31, 400, 25, 11, -42, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 28, 512, 25, 16, 46, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 33, 464, 30, 15, -50, 1 - delay 0x2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 + call FireSpinEffect + call FireSpinEffect + call FireSpinEffect + waitforvisualfinish + end + +FireSpinEffect: + createsprite gUnknown_08596B88, 130, 0, 28, 528, 30, 13, 50, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 32, 480, 20, 16, -46, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 33, 576, 20, 8, 42, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 31, 400, 25, 11, -42, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 28, 512, 25, 16, 46, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 33, 464, 30, 15, -50, 1 + delay 2 return Move_FURY_CUTTER: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013, SOUND_PAN_TARGET - createvisualtask sub_8107144, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82CADA7 - goto AnimScript_82CADB9 - -AnimScript_82CAD6A: - createvisualtask sub_8107168, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82CAD8E - jumpargeq 0x7, 0x2, AnimScript_82CADCB - jumpargeq 0x7, 0x3, AnimScript_82CADE5 - goto AnimScript_82CADFF - -AnimScript_82CAD8E: - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 + createvisualtask AnimTask_IsFuryCutterHitRight, 2 + jumpretfalse FuryCutterLeft + goto FuryCutterRight +FuryCutterContinue: + createvisualtask AnimTask_GetFuryCutterHitCount, 2 + jumpreteq 1, FuryCutterContinue2 + jumpreteq 2, FuryCutterMedium + jumpreteq 3, FuryCutterStrong + goto FuryCutterStrongest +FuryCutterContinue2: + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff waitforvisualfinish end - -AnimScript_82CADA7: - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 - goto AnimScript_82CAD6A - -AnimScript_82CADB9: - createsprite gUnknown_08592A1C, 0x2, 40, -32, 1 - goto AnimScript_82CAD6A - -AnimScript_82CADCB: - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 10505, 4, 0, 0 - goto AnimScript_82CAD8E - -AnimScript_82CADE5: - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0 - goto AnimScript_82CAD8E - -AnimScript_82CADFF: - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0 - goto AnimScript_82CAD8E +FuryCutterLeft: + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + goto FuryCutterContinue +FuryCutterRight: + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 1 + goto FuryCutterContinue +FuryCutterMedium: + createsprite gComplexPaletteBlendSpriteTemplate, 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 + goto FuryCutterContinue2 +FuryCutterStrongest: + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 + goto FuryCutterContinue2 Move_SELF_DESTRUCT: - loadspritegfx 0x27D6 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 31 - createvisualtask sub_80D52D0, 0x5, 4, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 5, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 6, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 7, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 8, 6, 0, 38, 1 - call AnimScript_82CAE9F - call AnimScript_82CAE9F - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 1, 9, 0, 31 - end - -AnimScript_82CAE9F: + loadspritegfx ANIM_TAG_EXPLOSION + createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_RED + createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1 + call SelfDestruct1 + call SelfDestruct1 + waitforvisualfinish + createvisualtask sub_8116620, 10, 2, 1, 9, 0, RGB_RED + end +SelfDestruct1: playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + delay 6 return Move_SLAM: - loadspritegfx 0x2748 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_056 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W004, SOUND_PAN_ATTACKER - createsprite gUnknown_0857FE70, 0x2, 0, 20, 3, 0, 4 - delay 0x1 - createsprite gUnknown_085928D0, 0x2, 0, 0 - delay 0x3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4 + delay 1 + createsprite gUnknown_085928D0, 2, 0, 0 + delay 3 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_VINE_WHIP: - loadspritegfx 0x282F + loadspritegfx ANIM_TAG_287 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 6 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_085928E8, 0x82, 0, 0 - delay 0x6 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 1 + createsprite gUnknown_085928E8, 130, 0, 0 + delay 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 end Move_DRILL_PECK: - loadspritegfx 0x2797 - loadspritegfx 0x27B2 - createsprite gUnknown_08592CD8, 0x2, 0 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_162 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - delay 0x2 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 0x4, 0x8 - createvisualtask sub_810EB88, 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 + delay 2 + createsprite gUnknown_08592CD8, 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 waitforvisualfinish - createsprite gUnknown_08592CD8, 0x2, 2 + createsprite gUnknown_08592CD8, 2, 2 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 waitforvisualfinish end Move_WATERFALL: - loadspritegfx 0x27A4 - loadspritegfx 0x27AB - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 23, 1 - delay 0x5 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 + delay 5 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 0x2, 10, 10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 10, 10, 25, 0 + delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 0x2, -15, 0, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -15, 0, 25, 0 + delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 0x2, 20, 10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 20, 10, 25, 0 + delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 0x2, 0, -10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 0, -10, 25, 0 + delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 0x2, -10, 15, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -10, 15, 25, 0 + delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 0x2, 25, 20, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 25, 20, 25, 0 + delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 0x2, -20, 20, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -20, 20, 25, 0 + delay 4 playsewithpan SE_W152, SOUND_PAN_ATTACKER - createsprite gUnknown_08595238, 0x2, 12, 0, 25, 0 + createsprite gUnknown_08595238, 2, 12, 0, 25, 0 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE28, 0x2, 6, 5 - delay 0x6 - call AnimScript_82CB102 + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 5 + delay 6 + call UnderWaterAttack1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82CB102: +UnderWaterAttack1: playsewithpan SE_W127, SOUND_PAN_TARGET - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 17, 1 - createsprite gUnknown_08597388, 0x3, 0, 20, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 20 - createsprite gUnknown_08595250, 0x4, 0, 20 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 15, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 15 - createsprite gUnknown_08595250, 0x4, 0, 15 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 10, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 10 - createsprite gUnknown_08595250, 0x4, 0, 10 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 5, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 5 - createsprite gUnknown_08595250, 0x4, 0, 5 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 0 - createsprite gUnknown_08595250, 0x4, 0, 0 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -5, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -5 - createsprite gUnknown_08595250, 0x4, 0, -5 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -10, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -10 - createsprite gUnknown_08595250, 0x4, 0, -10 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -15, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -15 - createsprite gUnknown_08595250, 0x4, 0, -15 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -20, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -20 - createsprite gUnknown_08595250, 0x4, 0, -20 + 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 + delay 2 + createsprite gUnknown_08597388, 3, 0, 15, 1, 1 + createsprite gUnknown_08595250, 4, 0, 15 + createsprite gUnknown_08595250, 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 + delay 2 + createsprite gUnknown_08597388, 3, 0, 5, 1, 1 + createsprite gUnknown_08595250, 4, 0, 5 + createsprite gUnknown_08595250, 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 + delay 2 + createsprite gUnknown_08597388, 3, 0, -5, 1, 1 + createsprite gUnknown_08595250, 4, 0, -5 + createsprite gUnknown_08595250, 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 + delay 2 + createsprite gUnknown_08597388, 3, 0, -15, 1, 1 + createsprite gUnknown_08595250, 4, 0, -15 + createsprite gUnknown_08595250, 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 return Move_EXPLOSION: - loadspritegfx 0x27D6 - createsprite gUnknown_0859728C, 0x2, 1, 8, 9, 8474, 8, 0, 8 - createvisualtask sub_80D52D0, 0x5, 4, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 5, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 6, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 7, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 8, 8, 0, 40, 1 - call AnimScript_82CB312 - call AnimScript_82CB312 - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 1, 16, 16, 0x7FFF - delay 0x32 - createvisualtask sub_8116620, 0xA, 1, 3, 16, 0, 0x7FFF - end - -AnimScript_82CB312: + loadspritegfx ANIM_TAG_EXPLOSION + createsprite gComplexPaletteBlendSpriteTemplate, 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 + createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1 + call Explosion1 + call Explosion1 + waitforvisualfinish + createvisualtask sub_8116620, 10, 1, 1, 16, 16, RGB_WHITE + delay 50 + createvisualtask sub_8116620, 10, 1, 3, 16, 0, RGB_WHITE + end +Explosion1: playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + delay 6 return Move_DEFENSE_CURL: - loadspritegfx 0x27FA - loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 0x12, 0x3 - createvisualtask sub_811489C, 0x5, 0, 0 - createvisualtask sub_815B338, 0x5 + loadspritegfx ANIM_TAG_234 + loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 + createvisualtask sub_811489C, 5, 0, 0 + createvisualtask sub_815B338, 5 waitforvisualfinish - createsprite gUnknown_085CE338, 0x2, 0, 6, 0, 1 + createsprite gUnknown_085CE338, 2, 0, 6, 0, 1 waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 waitforvisualfinish end Move_PROTECT: - loadspritegfx 0x2828 + loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 0x10 - createsprite gUnknown_08592ADC, 0x2, 24, 0, 90 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 + createsprite gUnknown_08592ADC, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end Move_DETECT: - loadspritegfx 0x2757 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, RGB_BLACK + loadspritegfx ANIM_TAG_071 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 0x7FFF - delay 0x12 + createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE + delay 18 playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite gUnknown_0853EE84, 0xD, 20, -20 + createsprite gUnknown_0853EE84, 13, 20, -20 waitforvisualfinish - delay 0xA - createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, RGB_BLACK - createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, 0x7FFF + delay 10 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 9, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end Move_FRUSTRATION: - loadspritegfx 0x2797 - loadspritegfx 0x2767 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80A8140, 0x1 - jumpargeq 0x7, 0x0, AnimScript_82CB464 - jumpargeq 0x7, 0x1, AnimScript_82CB56A - jumpargeq 0x7, 0x2, AnimScript_82CB637 - goto AnimScript_82CB6B3 - -AnimScript_82CB45F: + setalpha 12, 8 + createvisualtask AnimTask_GetFrustrationPowerLevel, 1 + jumpreteq 0, Frustration_Strongest + jumpreteq 1, Frustration_Strong + jumpreteq 2, Frustration_Medium + goto Frustration_Weak +Frustration_Continue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82CB464: +Frustration_Strongest: playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 - createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 + createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish - delay 0x14 + delay 20 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0xA - createvisualtask sub_80D5EB8, 0x5, 0, 16, 6144, 8, 0 - delay 0x5 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 30, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 + delay 10 + createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_ATTACKER + delay 5 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08597358, 0x3, 24, 8, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08597358, 0x3, -24, -16, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08597358, 0x3, 8, 4, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08597358, 0x3, -16, 19, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, -18, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 - goto AnimScript_82CB45F - -AnimScript_82CB56A: + createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 + goto Frustration_Continue +Frustration_Strong: playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 - createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 + createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish - delay 0x14 + delay 20 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0x5 - createvisualtask sub_815C3A8, 0x5 - delay 0x7 + delay 5 + createvisualtask sub_815C3A8, 5 + delay 7 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 8, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + delay 14 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 12, -6, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + delay 14 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, -12, -6, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 - goto AnimScript_82CB45F - -AnimScript_82CB637: + createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 + goto Frustration_Continue +Frustration_Medium: playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 + delay 5 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 10, 4, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, -10, -4, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 - goto AnimScript_82CB45F - -AnimScript_82CB6B3: - createsprite gUnknown_085CE4D0, 0x2, 20, -28 - waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE28, 0x2, 10, 2 - delay 0xC + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + goto Frustration_Continue +Frustration_Weak: + createsprite gUnknown_085CE4D0, 2, 20, -28 + waitforvisualfinish + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2 + delay 12 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 - goto AnimScript_82CB45F + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 + goto Frustration_Continue Move_SAFEGUARD: - loadspritegfx 0x2804 + loadspritegfx ANIM_TAG_244 monbg ANIM_ATK_PARTNER - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W208, SOUND_PAN_ATTACKER - createsprite gUnknown_08593C64, 0x2 - delay 0x4 - createsprite gUnknown_08593C64, 0x2 - delay 0x4 - createsprite gUnknown_08593C64, 0x2 + createsprite gUnknown_08593C64, 2 + delay 4 + createsprite gUnknown_08593C64, 2 + delay 4 + createsprite gUnknown_08593C64, 2 waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createvisualtask sub_8115A04, 0x2, 10, 0, 2, 0, 10, 0x7FFF + createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end Move_PAIN_SPLIT: - loadspritegfx 0x27FF - createsprite gUnknown_085CE590, 0x2, -8, -42, 0 - createsprite gUnknown_085CE590, 0x82, -8, -42, 1 - delay 0xA + loadspritegfx ANIM_TAG_239 + createsprite gUnknown_085CE590, 2, -8, -42, 0 + createsprite gUnknown_085CE590, 130, -8, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 0 - createvisualtask sub_815CA20, 0x2, 1, 0 + createvisualtask sub_815CA20, 2, 0, 0 + createvisualtask sub_815CA20, 2, 1, 0 waitforvisualfinish - createsprite gUnknown_085CE590, 0x2, -24, -42, 0 - createsprite gUnknown_085CE590, 0x82, -24, -42, 1 - delay 0xA + createsprite gUnknown_085CE590, 2, -24, -42, 0 + createsprite gUnknown_085CE590, 130, -24, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 1 - createvisualtask sub_815CA20, 0x2, 1, 1 + createvisualtask sub_815CA20, 2, 0, 1 + createvisualtask sub_815CA20, 2, 1, 1 waitforvisualfinish - createsprite gUnknown_085CE590, 0x2, 8, -42, 0 - createsprite gUnknown_085CE590, 0x82, 8, -42, 1 - delay 0xA + createsprite gUnknown_085CE590, 2, 8, -42, 0 + createsprite gUnknown_085CE590, 130, 8, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 2 - createvisualtask sub_815CA20, 0x2, 1, 2 + createvisualtask sub_815CA20, 2, 0, 2 + createvisualtask sub_815CA20, 2, 1, 2 end Move_VICE_GRIP: - loadspritegfx 0x279A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_08593590, 0x2, 0 - createsprite gUnknown_08593590, 0x2, 1 - delay 0x9 - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 5, 1 + createsprite gUnknown_08593590, 2, 0 + createsprite gUnknown_08593590, 2, 1 + delay 9 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_GUILLOTINE: - loadspritegfx 0x279A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_085935D0, 0x2, 0 - createsprite gUnknown_085935D0, 0x2, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, 0 - delay 0x9 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 23, 1 + createsprite gUnknown_085935D0, 2, 0 + createsprite gUnknown_085935D0, 2, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK + delay 9 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 23, 1 delay 0x2E - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 8, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + 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 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -1913,190 +1879,188 @@ Move_GUILLOTINE: end Move_PAY_DAY: - loadspritegfx 0x2774 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_100 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085934D8, 0x2, 20, 0, 0, 0, 1152 + createsprite gUnknown_085934D8, 2, 20, 0, 0, 0, 1152 waitforvisualfinish playsewithpan SE_W006, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2 - createsprite gUnknown_085934F0, 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 + createsprite gUnknown_085934F0, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_OUTRAGE: - loadspritegfx 0x272D - loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 0x8, 0x3 - createvisualtask sub_8115A04, 0x2, 7, 2, 5, 3, 8, 430 - createvisualtask sub_80D5830, 0x2, 0, 12, 6, 5, 4 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, 1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, -1280, 3 - delay 0x0 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 40, 1 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3 - call AnimScript_82CBA0F - call AnimScript_82CBA0F - waitforvisualfinish - end - -AnimScript_82CBA0F: - delay 0x3 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, 1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, -1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3 + 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 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 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 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 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 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 return Move_SPARK: - loadspritegfx 0x2797 - loadspritegfx 0x271B - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, 23551 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SPARK_2 + delay 0 + createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859574C, 0x0, 32, 24, 190, 12, 0, 1, 0 - delay 0x0 - createsprite gUnknown_0859574C, 0x0, 80, 24, 22, 12, 0, 1, 0 - createsprite gUnknown_0859574C, 0x0, 156, 24, 121, 13, 0, 1, 1 - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 - delay 0xA - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, 23551 + createsprite gBattleAnimSpriteTemplate_859574C, 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 + 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 gUnknown_0859574C, 0x0, 100, 24, 60, 10, 0, 1, 0 - createsprite gUnknown_0859574C, 0x0, 170, 24, 42, 11, 0, 1, 1 - delay 0x0 - createsprite gUnknown_0859574C, 0x0, 238, 24, 165, 10, 0, 1, 1 - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 - delay 0x14 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 7, 7, 23551 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 100, 24, 60, 10, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 170, 24, 42, 11, 0, 1, 1 + delay 0 + createsprite gBattleAnimSpriteTemplate_859574C, 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 gUnknown_085957F8, 0x4, 0, 0, 32, 12, 0, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 64, 20, 1, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 128, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 192, 20, 2, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 32, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 96, 20, 1, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 160, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 224, 20, 2, 0 - delay 0x4 - waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x4 + 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 + delay 4 + waitforvisualfinish + createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 4 playsewithpan SE_W063, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 4, -31, 2, 0, 6, 23551 - call AnimScript_82D7BEA + createvisualtask sub_8115A04, 2, 4, -31, 2, 0, 6, RGB(31, 31, 22) + call ElectricityEffect waitforvisualfinish end Move_ATTRACT: - loadspritegfx 0x27E8 - loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 0xC, 0x3 - createvisualtask sub_80D5EB8, 0x5, 0, 12, 4096, 4, 0 - delay 0xF - createsprite gUnknown_085939A0, 0x83, 20, -8 + loadspritegfx ANIM_TAG_216 + loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 + createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER + delay 15 + createsprite gUnknown_085939A0, 131, 20, -8 waitforvisualfinish playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gUnknown_085939B8, 0x83, 160, -32 - createsprite gUnknown_085939B8, 0x83, -256, -40 - createsprite gUnknown_085939B8, 0x83, 128, -16 - createsprite gUnknown_085939B8, 0x83, 416, -38 - createsprite gUnknown_085939B8, 0x83, -128, -22 - createsprite gUnknown_085939B8, 0x83, -384, -31 - waitforvisualfinish - waitplaysewithpan SE_W213B, 0, 0xF - createvisualtask sub_81062E8, 0x5 - createsprite gUnknown_085939D0, 0x28, 16, 256, 0 - createsprite gUnknown_085939D0, 0x28, 224, 240, 15 - createsprite gUnknown_085939D0, 0x28, 126, 272, 30 - createsprite gUnknown_085939D0, 0x28, 80, 224, 45 - createsprite gUnknown_085939D0, 0x28, 170, 272, 60 - createsprite gUnknown_085939D0, 0x28, 40, 256, 75 - createsprite gUnknown_085939D0, 0x28, 112, 256, 90 - createsprite gUnknown_085939D0, 0x28, 200, 272, 90 + 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 + 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 delay 0x4B - createvisualtask sub_8115A04, 0x2, 4, 4, 4, 0, 10, 28479 + createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end Move_GROWTH: - call AnimScript_82CBDC0 + call Growth1 waitforvisualfinish - call AnimScript_82CBDC0 + call Growth1 waitforvisualfinish end - -AnimScript_82CBDC0: - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF +Growth1: + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_80D6064, 0x5, -3, -3, 16, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 return Move_WHIRLWIND: - loadspritegfx 0x27B2 - createsprite gUnknown_085963D4, 0x2, 0, -8, 1, 60, 0 - createsprite gUnknown_085963D4, 0x2, 0, 0, 1, 60, 1 - createsprite gUnknown_085963D4, 0x2, 0, 8, 1, 60, 2 - createsprite gUnknown_085963D4, 0x2, 0, 16, 1, 60, 3 - createsprite gUnknown_085963D4, 0x2, 0, 24, 1, 60, 4 - createsprite gUnknown_085963D4, 0x2, 0, 32, 1, 60, 0 - delay 0x5 - loopsewithpan SE_W104, SOUND_PAN_TARGET, 0xA, 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 15, 1 + loadspritegfx ANIM_TAG_162 + 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 + delay 5 + loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 delay 0x1D - createvisualtask sub_80D5830, 0x2, 1, 12, 6, 1, 5 - delay 0x7 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5 + delay 7 playsewithpan SE_W081, SOUND_PAN_TARGET - createvisualtask sub_80D5DB0, 0x5, 1, 8 + createvisualtask sub_80D5DB0, 5, 1, 8 waitforvisualfinish end Move_CONFUSE_RAY: - loadspritegfx 0x271D + loadspritegfx ANIM_TAG_YELLOW_BALL monbg ANIM_DEF_PARTNER fadetobg BG_GHOST waitbgfadein - createvisualtask sub_8159278, 0x2, -64, 63, 2, 0 - createvisualtask sub_8115C80, 0x2, 10013, 0, 6, 0, 14, 351 - createsprite gUnknown_08596D14, 0x82, 28, 0, 288 + 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 waitforvisualfinish - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_08596D2C, 0x82, 0, -16 + createsprite gUnknown_08596D2C, 130, 0, -16 waitforvisualfinish - delay 0x0 + delay 0 blendoff clearmonbg ANIM_DEF_PARTNER restorebg @@ -2104,118 +2068,118 @@ Move_CONFUSE_RAY: end Move_LOCK_ON: - loadspritegfx 0x271E - createsprite gUnknown_08592CA0, 0x28 - createsprite gUnknown_08592CB8, 0x28, 1 - createsprite gUnknown_08592CB8, 0x28, 2 - createsprite gUnknown_08592CB8, 0x28, 3 - createsprite gUnknown_08592CB8, 0x28, 4 - delay 0x78 - setarg 0x7, 0xFFFF + 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 + delay 120 + setarg 7, -1 waitforvisualfinish end Move_MEAN_LOOK: - loadspritegfx 0x27CB + loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK - loopsewithpan SE_W109, SOUND_PAN_TARGET, 0xF, 0x4 + createsprite gSimplePaletteBlendSpriteTemplate, 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, 0x2 - delay 0x78 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK - delay 0x1E + createsprite gUnknown_085CE104, 2 + delay 120 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + delay 30 clearmonbg ANIM_DEF_PARTNER waitforvisualfinish end Move_ROCK_THROW: - loadspritegfx 0x274A - createsprite gUnknown_085972D8, 0x82, 6, 1, 15, 1 - createsprite gUnknown_08596B04, 0x82, 0, 1, 0, 0 + loadspritegfx ANIM_TAG_058 + createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1 + createsprite gUnknown_08596B04, 130, 0, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, 19, 1, 10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, -23, 2, -10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 20, 1 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, -15, 1, -10, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1 + delay 6 + createsprite gUnknown_08596B04, 130, -15, 1, -10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596B04, 0x82, 23, 2, 10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, 23, 2, 10, 0 playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish end Move_ROCK_SLIDE: - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER - createsprite gUnknown_085972D8, 0x2, 7, 1, 11, 1 - createsprite gUnknown_08596B04, 0x82, -5, 1, -5, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1 + createsprite gUnknown_08596B04, 130, -5, 1, -5, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 5, 0, 6, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 5, 0, 6, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 19, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -23, 2, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 50, 1 - createvisualtask sub_80D51AC, 0x2, 3, 0, 5, 50, 1 - delay 0x2 - call AnimScript_82CC083 - call AnimScript_82CC083 + 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_DEF_PARTNER end -AnimScript_82CC083: - createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 +RockSlide1: + createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 28, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 28, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -10, 1, -5, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -10, 1, -5, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 10, 0, 6, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 10, 0, 6, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 24, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 24, 1, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -32, 2, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -32, 2, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 30, 2, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 30, 2, 10, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x2 + delay 2 return Move_THIEF: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - delay 0x1 + delay 1 fadetobg BG_DARK waitbgfadein - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x6 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 6 playsewithpan SE_W233, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1 waitforvisualfinish - delay 0x14 + delay 20 clearmonbg ANIM_TARGET blendoff restorebg @@ -2223,196 +2187,194 @@ Move_THIEF: end Move_BUBBLE_BEAM: - loadspritegfx 0x27A2 - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_146 + loadspritegfx ANIM_TAG_155 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x1 - call AnimScript_82CC1AD - createvisualtask sub_80D5EB8, 0x5, 0, 3, 3072, 8, 1 - call AnimScript_82CC1AD - call AnimScript_82CC1AD + setalpha 12, 8 + delay 1 + call Bulbblebeam1 + createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_TARGET + call Bulbblebeam1 + call Bulbblebeam1 waitforvisualfinish - call AnimScript_82D7AE2 + call WaterBubbleEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -AnimScript_82CC1AD: - createsprite gUnknown_08595068, 0x2, 18, 0, 35, 70, 0, 256, 50 +Bulbblebeam1: + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 70, 0, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 20, 40, -10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 40, -10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 10, -60, 0, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -60, 0, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, -10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, -10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 256, 50 playsewithpan SE_W145, SOUND_PAN_ATTACKER - delay 0x3 + delay 3 return Move_ICY_WIND: - loadspritegfx 0x279D - loadspritegfx 0x279E + loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_142 monbg ANIM_DEF_PARTNER - createvisualtask sub_8116620, 0xA, 11, 4, 0, 4, 0 + createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - call AnimScript_82CC2A8 - delay 0x5 - call AnimScript_82CC2A8 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + call IcyWind1 + delay 5 + call IcyWind1 playsewithpan SE_W016B, SOUND_PAN_TARGET delay 0x37 - call AnimScript_82D78F8 + call IcyWindEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadeout - createvisualtask sub_8116620, 0xA, 11, 4, 4, 0, 0 + createvisualtask sub_8116620, 10, 11, 4, 4, 0, RGB_BLACK waitbgfadein end - -AnimScript_82CC2A8: +IcyWind1: createsprite gUnknown_08595B98, 0xA8, 0, 0, 0, 0, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, 10, 0, 10, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, -10, 0, -10, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, 15, 0, 15, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, -5, 0, -5, 72, 1 return Move_SMOKESCREEN: - loadspritegfx 0x2720 - loadspritegfx 0x2721 + loadspritegfx ANIM_TAG_BLACK_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W104, SOUND_PAN_ATTACKER - createsprite gUnknown_085CE050, 0x82, 20, 0, 0, 0, 35, -25 + createsprite gUnknown_085CE050, 130, 20, 0, 0, 0, 35, -25 waitforvisualfinish - createvisualtask sub_815A160, 0x2 - delay 0x2 + createvisualtask sub_815A160, 2 + delay 2 playsewithpan SE_W028, SOUND_PAN_TARGET - createsprite gUnknown_085CE038, 0x84, 0, -12, 104, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, -12, 72, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, -6, 56, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, -6, 88, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 0, 56, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 0, 88, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 6, 72, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 6, 104, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 12, 72, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 12, 56, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 18, 80, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 18, 72, 1, 75 + 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 waitforvisualfinish end Move_CONVERSION: - loadspritegfx 0x2722 + loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x10 - delay 0x0 + setalpha 16, 0 + delay 0 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, 0x2, -24, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, -24 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, -24 + delay 3 + createsprite gUnknown_08592E74, 2, -8, -24 + delay 3 + createsprite gUnknown_08592E74, 2, 8, -24 + delay 3 + createsprite gUnknown_08592E74, 2, 24, -24 + delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, 0x2, -24, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, -8 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, -8 + delay 3 + createsprite gUnknown_08592E74, 2, -8, -8 + delay 3 + createsprite gUnknown_08592E74, 2, 8, -8 + delay 3 + createsprite gUnknown_08592E74, 2, 24, -8 + delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, 0x2, -24, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, 8 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, 8 + delay 3 + createsprite gUnknown_08592E74, 2, -8, 8 + delay 3 + createsprite gUnknown_08592E74, 2, 8, 8 + delay 3 + createsprite gUnknown_08592E74, 2, 24, 8 + delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, 0x2, -24, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, 24 - delay 0x14 + createsprite gUnknown_08592E74, 2, -24, 24 + delay 3 + createsprite gUnknown_08592E74, 2, -8, 24 + delay 3 + createsprite gUnknown_08592E74, 2, 8, 24 + delay 3 + createsprite gUnknown_08592E74, 2, 24, 24 + delay 20 playsewithpan SE_W112, SOUND_PAN_ATTACKER - createvisualtask sub_8115D94, 0x2, 10018, 1, 1, 14335, 12, 0, 0 - delay 0x6 - createvisualtask sub_81022D4, 0x5 + createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0 + delay 6 + createvisualtask sub_81022D4, 5 waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_ATK_PARTNER blendoff end Move_CONVERSION_2: - loadspritegfx 0x2722 + loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x1000 - delay 0x0 + setalpha 0, 16 + delay 0 playsewithpan SE_W112, SOUND_PAN_TARGET - createsprite gUnknown_08592EA4, 0x2, -24, -24, 60 - createsprite gUnknown_08592EA4, 0x2, -8, -24, 65 - createsprite gUnknown_08592EA4, 0x2, 8, -24, 70 - createsprite gUnknown_08592EA4, 0x2, 24, -24, 75 - createsprite gUnknown_08592EA4, 0x2, -24, -8, 80 - createsprite gUnknown_08592EA4, 0x2, -8, -8, 85 - createsprite gUnknown_08592EA4, 0x2, 8, -8, 90 - createsprite gUnknown_08592EA4, 0x2, 24, -8, 95 - createsprite gUnknown_08592EA4, 0x2, -24, 8, 100 - createsprite gUnknown_08592EA4, 0x2, -8, 8, 105 - createsprite gUnknown_08592EA4, 0x2, 8, 8, 110 - createsprite gUnknown_08592EA4, 0x2, 24, 8, 115 - createsprite gUnknown_08592EA4, 0x2, -24, 24, 120 - createsprite gUnknown_08592EA4, 0x2, -8, 24, 125 - createsprite gUnknown_08592EA4, 0x2, 8, 24, 130 - createsprite gUnknown_08592EA4, 0x2, 24, 24, 135 - createvisualtask sub_81023E0, 0x5 - delay 0x3C + 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 + createvisualtask sub_81023E0, 5 + delay 60 playsewithpan SE_W129, SOUND_PAN_TARGET - delay 0xA + delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET - delay 0xA + delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET - delay 0xA + delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET - delay 0xA + delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET - delay 0xA + delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET - delay 0xA + delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET - delay 0xA + delay 10 playsewithpan SE_W129, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -2420,367 +2382,361 @@ Move_CONVERSION_2: end Move_ROLLING_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x6 + delay 6 playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 0x2, -24, 0, 48, 10, 160, 0 - delay 0x5 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, 2, -24, 0, 48, 10, 160, 0 + delay 5 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 1, 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 8 clearmonbg ANIM_TARGET blendoff end Move_HEADBUTT: - loadspritegfx 0x2797 - createsprite gUnknown_08592CD8, 0x2, 0 + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 4, 1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 0x2, 2 - createsprite gUnknown_085973E8, 0x83, 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, 2, 2 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish end Move_HORN_ATTACK: - loadspritegfx 0x2797 - loadspritegfx 0x2724 - createsprite gUnknown_08592CD8, 0x2, 0 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HORN_HIT + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - createsprite gUnknown_08592F44, 0x84, 0, 0, 10 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 + createsprite gUnknown_08592F44, 132, 0, 0, 10 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 4, 1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 0x2, 2 - createsprite gUnknown_085973E8, 0x83, 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, 2, 2 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish end Move_FURY_ATTACK: - loadspritegfx 0x2797 - loadspritegfx 0x2724 - createvisualtask sub_80D6134, 0x2, 4, 256, 0, 2 - choosetwoturnanim AnimScript_82CC7B8, AnimScript_82CC7DE - -AnimScript_82CC7A5: - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HORN_HIT + createvisualtask sub_80D6134, 2, 4, 256, 0, 2 + choosetwoturnanim FuryAttackRight, FuryAttackLeft +FuryAttackContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish end -AnimScript_82CC7B8: - createsprite gUnknown_08592F44, 0x84, 8, 8, 10 +FuryAttackRight: + createsprite gUnknown_08592F44, 132, 8, 8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET - goto AnimScript_82CC7A5 + goto FuryAttackContinue -AnimScript_82CC7DE: - createsprite gUnknown_08592F44, 0x84, -8, -8, 10 +FuryAttackLeft: + createsprite gUnknown_08592F44, 132, -8, -8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET - goto AnimScript_82CC7A5 + goto FuryAttackContinue Move_HORN_DRILL: - loadspritegfx 0x2797 - loadspritegfx 0x2724 - jumpifcontest AnimScript_82CC96A + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HORN_HIT + jumpifcontest HornDrillInContest fadetobg BG_DRILL waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 - -AnimScript_82CC821: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +HornDrillContinue: waitbgfadein - setalpha 0x80C - createsprite gUnknown_08592CD8, 0x2, 0 + setalpha 12, 8 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - createsprite gUnknown_08592F44, 0x84, 0, 0, 12 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 + createsprite gUnknown_08592F44, 132, 0, 0, 12 waitforvisualfinish playse SE_BAN - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 0x83, 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, 131, 0, 0, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 0, 2, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 0, 2, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -4, 3, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, -4, 3, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -8, -5, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, -8, -5, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 4, -12, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 4, -12, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 16, 0, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 16, 0, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 5, 18, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 5, 18, 1, 3 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -17, 12, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, -17, 12, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -21, -15, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, -21, -15, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 8, -27, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, 8, -27, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 32, 0, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, 32, 0, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08592CD8, 0x2, 2 + delay 4 + createsprite gUnknown_08592CD8, 2, 2 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein end -AnimScript_82CC96A: +HornDrillInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto AnimScript_82CC821 + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto HornDrillContinue Move_THRASH: - loadspritegfx 0x2797 - loadspritegfx 0x279F - createvisualtask sub_8104C38, 0x2 - createvisualtask sub_8104CA4, 0x2 - createsprite gUnknown_08595EB0, 0x83, 1, 10, 0 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + 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 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x1C - createsprite gUnknown_08595EB0, 0x83, 1, 10, 1 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1 + delay 28 + createsprite gUnknown_08595EB0, 131, 1, 10, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x1C - createsprite gUnknown_08595EB0, 0x83, 1, 10, 3 - createvisualtask sub_80D5484, 0x2, 1, 8, 0, 16, 1 + delay 28 + createsprite gUnknown_08595EB0, 131, 1, 10, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET end Move_SING: - loadspritegfx 0x2758 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 monbg ANIM_DEF_PARTNER - createvisualtask sub_8102BE8, 0x2 - waitforvisualfinish - panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - createsprite gUnknown_08593008, 0x82, 7, 0, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 6, 1, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 1, 2, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 2, 3, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 3, 0, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 2, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 6, 3, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 0, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 1, 2, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 3, 12 - delay 0x4 + createvisualtask sub_8102BE8, 2 + waitforvisualfinish + panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + createsprite gUnknown_08593008, 130, 7, 0, 12 + delay 5 + createsprite gUnknown_08593008, 130, 6, 1, 12 + delay 5 + createsprite gUnknown_08593008, 130, 1, 2, 12 + delay 5 + createsprite gUnknown_08593008, 130, 2, 3, 12 + delay 5 + createsprite gUnknown_08593008, 130, 3, 0, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 12 + delay 4 + createsprite gUnknown_08593008, 130, 5, 2, 12 + delay 4 + createsprite gUnknown_08593008, 130, 6, 3, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 0, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 12 + delay 4 + createsprite gUnknown_08593008, 130, 1, 2, 12 + delay 4 + createsprite gUnknown_08593008, 130, 5, 3, 12 + delay 4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - createvisualtask sub_8102CA0, 0x2 + createvisualtask sub_8102CA0, 2 waitforvisualfinish end Move_LOW_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 0x82, -24, 28, 40, 8, 160, 0 - delay 0x4 - createsprite gUnknown_08597358, 0x82, -8, 8, 1, 2 - createvisualtask sub_80D6134, 0x2, 6, 384, 1, 2 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, 130, -24, 28, 40, 8, 160, 0 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2 + createvisualtask sub_80D6134, 2, 6, 384, 1, 2 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4 end Move_EARTHQUAKE: - createvisualtask sub_81152DC, 0x5, 5, 10, 50 - createvisualtask sub_81152DC, 0x5, 4, 10, 50 + createvisualtask sub_81152DC, 5, 5, 10, 50 + createvisualtask sub_81152DC, 5, 4, 10, 50 playsewithpan SE_W089, 0 - delay 0xA - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0x10 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 10 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + delay 16 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 end Move_FISSURE: - loadspritegfx 0x275A - createvisualtask sub_81152DC, 0x3, 5, 10, 50 - createvisualtask sub_81152DC, 0x3, 1, 10, 50 + loadspritegfx ANIM_TAG_074 + createvisualtask sub_81152DC, 3, 5, 10, 50 + createvisualtask sub_81152DC, 3, 1, 10, 50 playsewithpan SE_W089, SOUND_PAN_TARGET - delay 0x8 - call AnimScript_82CCBFF - delay 0xF - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0xF - call AnimScript_82CCC50 - delay 0xF - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0xF - call AnimScript_82CCBFF - delay 0x32 + delay 8 + call Fissure1 + delay 15 + createsprite gComplexPaletteBlendSpriteTemplate, 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 + delay 15 + call Fissure1 + delay 50 fadetobg BG_FISSURE waitbgfadeout - createvisualtask sub_8115628, 0x5, 1, 5, -1 + createvisualtask sub_8115628, 5, 1, 5, -1 waitbgfadein - delay 0x28 + delay 40 restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein end -AnimScript_82CCBFF: - createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -48, -16, 24 - createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -16, -10, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -52, -18, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -32, -16, 24 +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 playsewithpan SE_W091, SOUND_PAN_TARGET return -AnimScript_82CCC50: - createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -24, -16, 24 - createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -38, -10, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -20, -18, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -36, -16, 24 +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 playsewithpan SE_W091, SOUND_PAN_TARGET return Move_DIG: - choosetwoturnanim AnimScript_82CCCAB, AnimScript_82CCD06 - -AnimScript_82CCCAA: - end - -AnimScript_82CCCAB: - loadspritegfx 0x275A - loadspritegfx 0x2829 - createsprite gUnknown_08597214, 0x1, 0, 0, 180 - createsprite gUnknown_08597214, 0x1, 0, 1, 180 + choosetwoturnanim DigSetUp, DigUnleash +DigEnd: + end +DigSetUp: + loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_281 + createsprite gUnknown_08597214, 1, 0, 0, 180 + createsprite gUnknown_08597214, 1, 0, 1, 180 monbg_22 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8114CBC, 0x2, 0 - delay 0x6 - call AnimScript_82CCD6A - call AnimScript_82CCD6A - call AnimScript_82CCD6A - call AnimScript_82CCD6A - call AnimScript_82CCD6A + delay 1 + createvisualtask sub_8114CBC, 2, 0 + delay 6 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 waitforvisualfinish clearmonbg_23 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8114CBC, 0x2, 1 - goto AnimScript_82CCCAA - -AnimScript_82CCD06: - loadspritegfx 0x2797 - loadspritegfx 0x2829 - createvisualtask sub_8114F14, 0x2, 0 + delay 1 + createvisualtask sub_8114CBC, 2, 1 + goto DigEnd +DigUnleash: + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_281 + createvisualtask sub_8114F14, 2, 0 waitforvisualfinish monbg ANIM_ATTACKER - createsprite gUnknown_08597214, 0x1, 0, 0, 48 - createsprite gUnknown_08597214, 0x1, 0, 1, 48 - delay 0x1 - createvisualtask sub_8114F14, 0x2, 1 - delay 0x10 - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + createsprite gUnknown_08597214, 1, 0, 0, 48 + createsprite gUnknown_08597214, 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 playsewithpan SE_W025B, SOUND_PAN_ATTACKER clearmonbg ANIM_ATTACKER - goto AnimScript_82CCCAA - -AnimScript_82CCD6A: - createsprite gUnknown_085971FC, 0x2, 0, 0, 12, 4, -16, 18 - createsprite gUnknown_085971FC, 0x2, 0, 0, 16, 4, -10, 18 - createsprite gUnknown_085971FC, 0x2, 0, 1, 14, 4, -18, 18 - createsprite gUnknown_085971FC, 0x2, 0, 1, 12, 4, -16, 18 + 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 playsewithpan SE_W091, SOUND_PAN_ATTACKER - delay 0x20 + delay 32 return Move_MEDITATE: - call AnimScript_82D7CD1 - createvisualtask sub_810F7D4, 0x2 + call SetPsychicBackground + createvisualtask sub_810F7D4, 2 playsewithpan SE_W029, SOUND_PAN_ATTACKER - delay 0x10 + delay 16 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish - call AnimScript_82D7CDD + call UnsetPsychicBackground end Move_AGILITY: monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 4, 4 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 10 + setalpha 12, 8 + 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 0xC + delay 12 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0xC + delay 12 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0xC + delay 12 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0xC + delay 12 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0xC + delay 12 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_QUICK_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3 + setalpha 12, 8 + 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 0x4 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08597358, 0x84, 0, 0, 1, 1 + delay 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2789,323 +2745,314 @@ Move_QUICK_ATTACK: end Move_RAGE: - loadspritegfx 0x2797 - loadspritegfx 0x2767 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ANGER monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80A7B98, 0x3, 0, RGB_RED, 10, 0, 2 - createsprite gUnknown_0859368C, 0x2, 0, -20, -28 + setalpha 12, 8 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 + createsprite gUnknown_0859368C, 2, 0, -20, -28 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - delay 0x14 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + delay 20 + createsprite gUnknown_0859368C, 2, 0, 20, -28 playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x4 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x2, 1, 1, 10, 1, 0 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 1, 1, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET end Move_TELEPORT: - call AnimScript_82D7CD1 - createvisualtask sub_810F83C, 0x2 + call SetPsychicBackground + createvisualtask sub_810F83C, 2 playsewithpan SE_W100, SOUND_PAN_ATTACKER - delay 0xF - call AnimScript_82D7CDD + delay 15 + call UnsetPsychicBackground waitforvisualfinish end Move_DOUBLE_TEAM: - createvisualtask sub_81029B4, 0x2 - setalpha 0x80C + createvisualtask sub_81029B4, 2 + setalpha 12, 8 monbg ANIM_ATK_PARTNER playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x20 + delay 32 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x18 + delay 24 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x10 + delay 16 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x8 + delay 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x8 + delay 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x8 + delay 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x8 + delay 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER - delay 0x8 + delay 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_MINIMIZE: - setalpha 0x80A - createvisualtask sub_8104674, 0x2 - loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 0x22, 0x3 + setalpha 10, 8 + createvisualtask sub_8104674, 2 + loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3 waitforvisualfinish blendoff end Move_METRONOME: - loadspritegfx 0x2750 - loadspritegfx 0x27E1 - createsprite gUnknown_08593114, 0xB, 0, 100 + loadspritegfx ANIM_TAG_064 + loadspritegfx ANIM_TAG_209 + createsprite gUnknown_08593114, 11, 0, 100 playsewithpan SE_W118, SOUND_PAN_ATTACKER - delay 0x6 - createsprite gUnknown_085931BC, 0xC, 0 - delay 0x18 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x16, 0x3 + delay 6 + createsprite gUnknown_085931BC, 12, 0 + delay 24 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish end Move_SKULL_BASH: - choosetwoturnanim AnimScript_82CCF99, AnimScript_82CCFE6 - -AnimScript_82CCF98: + choosetwoturnanim SkullBashSetUp, SkullBashAttack +SkullBashEnd: end - -AnimScript_82CCF99: - call AnimScript_82CCFA9 - call AnimScript_82CCFA9 +SkullBashSetUp: + call SkullBashSetUp1 + call SkullBashSetUp1 waitforvisualfinish - goto AnimScript_82CCF98 - -AnimScript_82CCFA9: - createsprite gUnknown_0857FE88, 0x2, 0, -24, 0, 0, 10, 0 + goto SkullBashEnd +SkullBashSetUp1: + createsprite gUnknown_0857FE88, 2, 0, -24, 0, 0, 10, 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 16, 96, 0, 2 + createvisualtask sub_80D6134, 2, 16, 96, 0, 2 waitforvisualfinish - createsprite gUnknown_0857FE88, 0x2, 0, 24, 0, 0, 10, 1 + createsprite gUnknown_0857FE88, 2, 0, 24, 0, 0, 10, 1 waitforvisualfinish return - -AnimScript_82CCFE6: - loadspritegfx 0x2797 - createvisualtask sub_8101C94, 0x2, 0 +SkullBashAttack: + loadspritegfx ANIM_TAG_135 + createvisualtask sub_8101C94, 2, 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish playse SE_BAN - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 0x84, 0, 0, 1, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 0x8, 0x3 + 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 + loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish - createvisualtask sub_8101C94, 0x2, 1 - goto AnimScript_82CCF98 + createvisualtask sub_8101C94, 2, 1 + goto SkullBashEnd Move_AMNESIA: - loadspritegfx 0x276D - call AnimScript_82D7CD1 - delay 0x8 - createsprite gUnknown_08596744, 0x14 + loadspritegfx ANIM_TAG_093 + call SetPsychicBackground + delay 8 + createsprite gUnknown_08596744, 20 playsewithpan SE_W118, SOUND_PAN_ATTACKER - delay 0x36 - loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 0x10, 0x3 + delay 54 + loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 waitforvisualfinish - call AnimScript_82D7CDD + call UnsetPsychicBackground end Move_KINESIS: - loadspritegfx 0x275B - loadspritegfx 0x2771 + loadspritegfx ANIM_TAG_075 + loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, SOUND_PAN_ATTACKER - call AnimScript_82D7CD1 - createsprite gUnknown_085966DC, 0x14 - createsprite gUnknown_08593344, 0x13, 32, -8, 0 - createsprite gUnknown_08593344, 0x13, 32, 16, 1 - loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 0x15, 0x2 - delay 0x3C + call SetPsychicBackground + createsprite gUnknown_085966DC, 20 + createsprite gUnknown_08593344, 19, 32, -8, 0 + createsprite gUnknown_08593344, 19, 32, 16, 1 + loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 + delay 60 playsewithpan SE_W146, SOUND_PAN_ATTACKER - delay 0x1E - loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 0x14, 0x2 - delay 0x46 + delay 30 + loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2 + delay 70 playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish - call AnimScript_82D7CDD + call UnsetPsychicBackground end Move_GLARE: - loadspritegfx 0x2808 - loadspritegfx 0x27EA - createvisualtask sub_815E114, 0x5, 0 + loadspritegfx ANIM_TAG_248 + loadspritegfx ANIM_TAG_218 + createvisualtask sub_815E114, 5, 0 playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_8116620, 0x5, 1, 0, 0, 16, 0 + createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 - createvisualtask sub_81064F8, 0x5 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 + createvisualtask sub_81064F8, 5 playsewithpan SE_W043, SOUND_PAN_ATTACKER - delay 0x2 - createvisualtask sub_810A094, 0x3, 20, 1, 0 + delay 2 + createvisualtask sub_810A094, 3, 20, 1, 0 waitforvisualfinish - createvisualtask sub_8116620, 0x5, 1, 0, 16, 0, 0 + createvisualtask sub_8116620, 5, 1, 0, 16, 0, RGB_BLACK end Move_BARRAGE: - loadspritegfx 0x280E - createvisualtask sub_815E47C, 0x3 + loadspritegfx ANIM_TAG_254 + createvisualtask sub_815E47C, 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER - delay 0x18 - createsprite gUnknown_085972D8, 0x2, 8, 1, 40, 1 - createvisualtask sub_80D51AC, 0x3, 1, 0, 4, 20, 1 - createvisualtask sub_80D51AC, 0x3, 3, 0, 4, 20, 1 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 0x8, 0x2 + 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 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2 end Move_SKY_ATTACK: - choosetwoturnanim AnimScript_82CD185, AnimScript_82CD28E - -AnimScript_82CD184: + choosetwoturnanim SkyAttackSetUp, SkyAttackUnleash +SkyAttackEnd: end - -AnimScript_82CD185: +SkyAttackSetUp: monbg ANIM_DEF_PARTNER - setalpha 0xB0C - createvisualtask sub_81177AC, 0x5, 7 - jumpargeq 0x7, 0x0, AnimScript_82CD1A0 - goto AnimScript_82CD217 - -AnimScript_82CD1A0: - createvisualtask sub_8116620, 0xA, 27, 1, 0, 12, 0 - waitforvisualfinish - delay 0xC - createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, 0 - createvisualtask sub_81152DC, 0x5, 0, 2, 16 - loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 0x4, 0x8 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, 0x7FFF - delay 0x14 - createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, 0x7FFF - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 25, 1, 8, 0, 0 + setalpha 12, 11 + createvisualtask AnimTask_IsTargetPartner, 5, ARG_RET_ID + jumpretfalse SkyAttackSetUpAgainstOpponent + goto SkyAttackSetUpAgainstPartner +SkyAttackSetUpAgainstOpponent: + createvisualtask sub_8116620, 10, 27, 1, 0, 12, RGB_BLACK + waitforvisualfinish + delay 12 + createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK + createvisualtask sub_81152DC, 5, 0, 2, 16 + loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8 + createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE + delay 20 + createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE + waitforvisualfinish + createvisualtask sub_8116620, 10, 25, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82CD184 - -AnimScript_82CD217: - createvisualtask sub_8116664, 0xA, 1, 1, 0, 12, 0 + goto SkyAttackEnd +SkyAttackSetUpAgainstPartner: + createvisualtask sub_8116664, 10, 1, 1, 0, 12, RGB_BLACK waitforvisualfinish - delay 0xC - createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, 0 - createvisualtask sub_81152DC, 0x5, 0, 2, 16 + delay 12 + createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK + createvisualtask sub_81152DC, 5, 0, 2, 16 playsewithpan SE_W287, SOUND_PAN_ATTACKER - delay 0x8 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, 0x7FFF - delay 0x14 - createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, 0x7FFF + delay 8 + createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE + delay 20 + createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_8116664, 0xA, 4, 1, 8, 0, 0 + createvisualtask sub_8116664, 10, 4, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82CD184 - -AnimScript_82CD28E: - loadspritegfx 0x2797 - loadspritegfx 0x282C - call AnimScript_82D7CE5 + goto SkyAttackEnd +SkyAttackUnleash: + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_284 + call SetFlyingBg monbg ANIM_ATTACKER - createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, 0x7FFF - delay 0x4 - createvisualtask sub_81136E8, 0x5, 0 - waitforvisualfinish - createvisualtask sub_8159244, 0x5, 238, -64 - createsprite gUnknown_08596514, 0x82 - delay 0xE - createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x14 - createvisualtask sub_81137E4, 0x5, 1 - delay 0x2 - createvisualtask sub_8116620, 0xA, 2, 0, 15, 0, 0x7FFF + 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 + delay 14 + 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_ATTACKER - call AnimScript_82D7D15 - goto AnimScript_82CD184 + call UnsetFlyingBg + goto SkyAttackEnd Move_FLASH: playsewithpan SE_W043, SOUND_PAN_ATTACKER - createvisualtask sub_8117494, 0x2 + createvisualtask sub_8117494, 2 waitforvisualfinish end Move_SPLASH: - createvisualtask sub_8104938, 0x2, 0, 3 - delay 0x8 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x26, 0x3 + createvisualtask sub_8104938, 2, 0, 3 + delay 8 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish end Move_ACID_ARMOR: monbg ANIM_ATTACKER - setalpha 0xF - createvisualtask sub_815D240, 0x2, 0 + setalpha 15, 0 + createvisualtask sub_815D240, 2, 0 playsewithpan SE_W151, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 end Move_SHARPEN: - loadspritegfx 0x27C9 - createsprite gUnknown_08592DE4, 0x2 + loadspritegfx ANIM_TAG_185 + createsprite gUnknown_08592DE4, 2 waitforvisualfinish end Move_SUPER_FANG: - loadspritegfx 0x27D0 - createvisualtask sub_80D5484, 0x2, 0, 1, 0, 20, 1 + loadspritegfx ANIM_TAG_192 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 3, 0, 48, 1 - createvisualtask sub_80A7B98, 0x2, 0, 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 0x14 - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x4 - createsprite gUnknown_08592F74, 0x82 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 4 + createsprite gUnknown_08592F74, 130 playsewithpan SE_W044, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 2143, 14, 0x7FFF, 14 - createvisualtask sub_80D51AC, 0x2, 1, 0, 7, 12, 1 + 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 waitforvisualfinish blendoff end Move_SLASH: - loadspritegfx 0x27C7 - createsprite gUnknown_08592D2C, 0x82, 1, -8, 0 + loadspritegfx ANIM_TAG_183 + createsprite gUnknown_08592D2C, 130, 1, -8, 0 playsewithpan SE_W013, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08592D2C, 0x82, 1, 8, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 + delay 4 + createsprite gUnknown_08592D2C, 130, 1, 8, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish end Move_STRUGGLE: - loadspritegfx 0x2797 - loadspritegfx 0x27E7 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_215 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5484, 0x2, 0, 3, 0, 12, 4 - createsprite gUnknown_08593B80, 0x2, 0, 0, 2 - createsprite gUnknown_08593B80, 0x2, 0, 1, 2 - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 0xC, 0x4 - waitforvisualfinish - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 6, 1 + 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 + 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 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET @@ -3113,33 +3060,32 @@ Move_STRUGGLE: end Move_SKETCH: - loadspritegfx 0x2712 + loadspritegfx ANIM_TAG_PENCIL monbg ANIM_TARGET - createvisualtask sub_8104E74, 0x2 - createsprite gUnknown_085936D4, 0x82 + createvisualtask sub_8104E74, 2 + createsprite gUnknown_085936D4, 130 waitforvisualfinish clearmonbg ANIM_TARGET - createvisualtask sub_8104938, 0x2, 0, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x26, 0x2 + createvisualtask sub_8104938, 2, 0, 2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 end Move_NIGHTMARE: fadetobg BG_GHOST waitbgfadein - jumpifcontest AnimScript_82CD4CF + jumpifcontest NightmareInContest monbg ANIM_DEF_PARTNER - createvisualtask sub_8111C50, 0x2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 40, 1 + createvisualtask sub_8111C50, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1 playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadein end - -AnimScript_82CD4CF: - createvisualtask sub_80A7B98, 0x2, 0, RGB_WHITE, 10, 2, 1 - createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1 +NightmareInContest: + 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 @@ -3147,14 +3093,14 @@ AnimScript_82CD4CF: end Move_FLAIL: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_815C770, 0x2, 0 - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 0x8, 0x2 + setalpha 12, 8 + createvisualtask sub_815C770, 2, 0 + loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish - createsprite gUnknown_085973A0, 0x83, 1, 3 - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 + createsprite gUnknown_085973A0, 131, 1, 3 + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET @@ -3166,9 +3112,9 @@ Move_SPITE: playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein monbg ANIM_DEF_PARTNER - createvisualtask sub_8115A04, 0x2, 2, 2, 6, 0, 8, 0x7FFF - createvisualtask sub_8111E50, 0x2 - loopsewithpan SE_W060, SOUND_PAN_TARGET, 0x14, 0x3 + 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 @@ -3176,52 +3122,50 @@ Move_SPITE: end Move_MACH_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_ATK_PARTNER - createvisualtask sub_8117754, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82CD5E6 + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue MachPunchAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT - -AnimScript_82CD57E: +MachPunchContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein - delay 0x0 - setalpha 0x809 - createvisualtask sub_80A8BC4, 0x2, 28968, 10 + delay 0 + setalpha 9, 8 + createvisualtask sub_80A8BC4, 2, 28968, 10 playsewithpan SE_W026, SOUND_PAN_ATTACKER - delay 0x6 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein end - -AnimScript_82CD5E6: +MachPunchAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto AnimScript_82CD57E + goto MachPunchContinue Move_FORESIGHT: - loadspritegfx 0x2812 + loadspritegfx ANIM_TAG_MAGNIFYING_GLASS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x10 - createsprite gUnknown_085CE8C4, 0x82, 1 - delay 0x11 - loopsewithpan SE_W166, SOUND_PAN_TARGET, 0x10, 0x4 - delay 0x30 - delay 0x18 + setalpha 16, 0 + createsprite gUnknown_085CE8C4, 130, 1 + delay 17 + loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 + delay 48 + delay 24 playsewithpan SE_W166, SOUND_PAN_TARGET - delay 0xA - createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 2, 1 + delay 10 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1 playsewithpan SE_W197, SOUND_PAN_TARGET waitforvisualfinish blendoff @@ -3229,17 +3173,17 @@ Move_FORESIGHT: end Move_DESTINY_BOND: - loadspritegfx 0x27CC + loadspritegfx ANIM_TAG_188 fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein - createvisualtask sub_81123C4, 0x5, 0, 48 + createvisualtask sub_81123C4, 5, 0, 48 playsewithpan SE_W109, SOUND_PAN_ATTACKER - delay 0x30 - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 24, 1 - createvisualtask sub_8116664, 0x2, 6, 1, 0, 12, 30653 - delay 0x18 - createvisualtask sub_8116664, 0x2, 6, 1, 12, 0, 30653 + delay 48 + 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) playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg @@ -3249,55 +3193,55 @@ Move_DESTINY_BOND: end Move_ENDURE: - loadspritegfx 0x27C8 + loadspritegfx ANIM_TAG_184 playsewithpan SE_W082, SOUND_PAN_ATTACKER - call AnimScript_82CD6C7 - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call AnimScript_82CD6C7 - delay 0x8 - call AnimScript_82CD6C7 - waitforvisualfinish - end - -AnimScript_82CD6C7: - createsprite gUnknown_08592D8C, 0x2, 0, -24, 26, 2 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, 14, 28, 1 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, -5, 10, 2 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, 28, 26, 3 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, -12, 0, 1 + 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 + call EndureEffect + delay 8 + call EndureEffect + waitforvisualfinish + end + +EndureEffect: + createsprite gUnknown_08592D8C, 2, 0, -24, 26, 2 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, 14, 28, 1 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, -5, 10, 2 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, 28, 26, 3 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, -12, 0, 1 return Move_CHARM: - loadspritegfx 0x27E2 - createvisualtask sub_815C478, 0x5, 0, 2, 0 - createsprite gUnknown_08593970, 0x3, 0, 20 + loadspritegfx ANIM_TAG_PURPLE_HEART + createvisualtask sub_815C478, 5, 0, 2, 0 + createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER - delay 0xF - createsprite gUnknown_08593970, 0x3, -20, 20 + delay 15 + createsprite gUnknown_08593970, 3, -20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER - delay 0xF - createsprite gUnknown_08593970, 0x3, 20, 20 + delay 15 + createsprite gUnknown_08593970, 3, 20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish end Move_ROLLOUT: - loadspritegfx 0x2797 - loadspritegfx 0x275A - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_8110F74, 0x2 + setalpha 12, 8 + createvisualtask sub_8110F74, 2 waitforvisualfinish - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 - createsprite gUnknown_08597358, 0x4, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -3305,624 +3249,617 @@ Move_ROLLOUT: end Move_FALSE_SWIPE: - loadspritegfx 0x282E - loadspritegfx 0x2797 - createsprite gUnknown_08592D44, 0x82 + loadspritegfx ANIM_TAG_286 + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_08592D44, 130 playsewithpan SE_W233, SOUND_PAN_TARGET - delay 0x10 - createsprite gUnknown_08592D5C, 0x82, 0 + delay 16 + createsprite gUnknown_08592D5C, 130, 0 playsewithpan SE_W104, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 16 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 32 + delay 2 + createsprite gUnknown_08592D5C, 130, 16 + delay 2 + createsprite gUnknown_08592D5C, 130, 32 playsewithpan SE_W104, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 48 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 64 + delay 2 + createsprite gUnknown_08592D5C, 130, 48 + delay 2 + createsprite gUnknown_08592D5C, 130, 64 playsewithpan SE_W104, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 80 - delay 0x2 + delay 2 + createsprite gUnknown_08592D5C, 130, 80 + delay 2 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08597358, 0x84, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET end Move_SWAGGER: - loadspritegfx 0x2766 - loadspritegfx 0x2767 - createvisualtask sub_8104AB4, 0x2 + loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_ANGER + createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08593658, 0x2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 0x4, 0x2 + createsprite gUnknown_08593658, 2 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish - delay 0x18 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + delay 24 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET - delay 0xC - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 12 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish end Move_MILK_DRINK: - loadspritegfx 0x2773 - loadspritegfx 0x27DB - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_MILK_BOTTLE + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET - createsprite gUnknown_08592B3C, 0x2 - delay 0x28 + createsprite gUnknown_08592B3C, 2 + delay 40 playsewithpan SE_W152, SOUND_PAN_ATTACKER - delay 0xC + delay 12 playsewithpan SE_W152, SOUND_PAN_ATTACKER - delay 0x14 + delay 20 playsewithpan SE_W152, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_0859381C, 0x3, 0, 0, 1, 0 + createsprite gUnknown_0859381C, 3, 0, 0, 1, 0 playsewithpan SE_W208, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET - call AnimScript_82D7A28 + call HealingEffect2 waitforvisualfinish end Move_MAGNITUDE: - createvisualtask sub_8115600, 0x2 - waitforvisualfinish - jumpargeq 0xF, 0x0, AnimScript_82CD8C9 - jumpargeq 0xF, 0x1, AnimScript_82CD8EE - -AnimScript_82CD8C8: - end - -AnimScript_82CD8C9: - createvisualtask sub_81152DC, 0x5, 5, 0, 50 - createvisualtask sub_81152DC, 0x5, 4, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 0x8, 0xA - goto AnimScript_82CD8C8 - -AnimScript_82CD8EE: - createvisualtask sub_81152DC, 0x5, 5, 0, 50 - createvisualtask sub_81152DC, 0x5, 4, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 0x8, 0xA - delay 0xA - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0x10 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - goto AnimScript_82CD8C8 + createvisualtask AnimTask_IsPowerOver99, 2 + waitforvisualfinish + jumpargeq 15, FALSE, MagnitudeRegular + jumpargeq 15, TRUE, MagnitudeIntense +MagnitudeEnd: + end +MagnitudeRegular: + createvisualtask sub_81152DC, 5, 5, 0, 50 + createvisualtask sub_81152DC, 5, 4, 0, 50 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + goto MagnitudeEnd +MagnitudeIntense: + createvisualtask sub_81152DC, 5, 5, 0, 50 + 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 + delay 16 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + goto MagnitudeEnd Move_RAPID_SPIN: - loadspritegfx 0x2797 - loadspritegfx 0x27F5 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_229 monbg ANIM_ATTACKER - createsprite gUnknown_085CE288, 0x2, 0, 0, 32, -32, 40, -2 - createvisualtask sub_815ADB0, 0x2, 0, 2, 0 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x8, 0x4 + createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2 + createvisualtask sub_815ADB0, 2, 0, 2, 0 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish - delay 0x8 - createvisualtask sub_815ADB0, 0x2, 0, 2, 1 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x8, 0x4 + delay 8 + createvisualtask sub_815ADB0, 2, 0, 2, 1 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish clearmonbg ANIM_ATTACKER end Move_MOONLIGHT: - loadspritegfx 0x27D2 - loadspritegfx 0x27D3 - loadspritegfx 0x272F - setalpha 0x1000 - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK - waitforvisualfinish - createsprite gUnknown_08592EBC, 0x2, 120, 56 - createvisualtask sub_80A7A74, 0x3, 0, 16, 16, 0, 1 + loadspritegfx ANIM_TAG_MOON + loadspritegfx ANIM_TAG_GREEN_SPARKLE + loadspritegfx ANIM_TAG_BLUE_STAR + setalpha 0, 16 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK + waitforvisualfinish + createsprite gUnknown_08592EBC, 2, 120, 56 + createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, -12, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, -24, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 21, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 0, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 10, 0 - delay 0x14 - createvisualtask sub_81025C0, 0x2 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -12, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -24, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 21, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 0, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 10, 0 + delay 20 + createvisualtask sub_81025C0, 2 waitforvisualfinish - call AnimScript_82D79DF + call HealingEffect waitforvisualfinish end Move_EXTREME_SPEED: - loadspritegfx 0x27DF - loadspritegfx 0x2797 - createvisualtask sub_8117754, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82CDAF5 + loadspritegfx ANIM_TAG_207 + loadspritegfx ANIM_TAG_135 + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT - -AnimScript_82CDA55: +ExtremeSpeedContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein - createvisualtask sub_810577C, 0x2 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 0x8, 0x3 + createvisualtask sub_810577C, 2 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 waitforvisualfinish - delay 0x1 - createvisualtask sub_8117F60, 0x2 + delay 1 + createvisualtask sub_8117F60, 2 monbg ANIM_TARGET - setalpha 0x80C - delay 0x12 - createvisualtask sub_8105810, 0x2 - delay 0x2 + setalpha 12, 8 + delay 18 + createvisualtask sub_8105810, 2 + delay 2 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_085973B8, 0x82, 1, 0, -12, 3 - delay 0xA + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, -12, 3 + delay 10 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_085973B8, 0x82, 1, 0, 12, 3 - delay 0xA + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 12, 3 + delay 10 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_085973B8, 0x82, 1, 0, 0, 3 + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 0, 3 waitforvisualfinish - createvisualtask sub_8105AAC, 0x2 - delay 0xA - createvisualtask sub_810599C, 0x2 - loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 0x8, 0x4 + createvisualtask sub_8105AAC, 2 + delay 10 + createvisualtask sub_810599C, 2 + loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein clearmonbg ANIM_TARGET blendoff - delay 0x1 - setarg 0x7, 0x1000 - delay 0x1 + delay 1 + setarg 7, 0x1000 + delay 1 end - -AnimScript_82CDAF5: +ExtremeSpeedAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto AnimScript_82CDA55 + goto ExtremeSpeedContinue Move_UPROAR: - loadspritegfx 0x27F1 - loadspritegfx 0x27DB + loadspritegfx ANIM_TAG_225 + loadspritegfx ANIM_TAG_203 monbg ANIM_DEF_PARTNER - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gUnknown_08593BB8, 0x2, 0, 29, -12, 0 - createsprite gUnknown_08593BB8, 0x2, 0, -12, -29, 1 - delay 0x10 - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 29, -12, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -12, -29, 1 + delay 16 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gUnknown_08593BB8, 0x2, 0, 12, -29, 1 - createsprite gUnknown_08593BB8, 0x2, 0, -29, -12, 0 - delay 0x10 - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 12, -29, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -29, -12, 0 + delay 16 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gUnknown_08593BB8, 0x2, 0, 24, -24, 1 - createsprite gUnknown_08593BB8, 0x2, 0, -24, -24, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 24, -24, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -24, -24, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_HEAT_WAVE: - loadspritegfx 0x2815 - createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, RGB_RED - createvisualtask sub_8110BCC, 0x5, 1 - createvisualtask sub_810A060, 0x6, 6, 31 - panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - delay 0x4 - createvisualtask sub_8109DBC, 0x5 - delay 0xC - createsprite gUnknown_08596BA0, 0x28, 10, 2304, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 90, 2048, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 50, 2560, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 20, 2304, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 70, 1984, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 0, 2816, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 60, 2560, 96, 1 + loadspritegfx ANIM_TAG_261 + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_261, 0, 6, 6, RGB_RED + createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE + createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED + panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + delay 4 + createvisualtask sub_8109DBC, 5 + delay 12 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 1 end Move_HAIL: - loadspritegfx 0x2817 - loadspritegfx 0x279D - createvisualtask sub_8116620, 0xA, 1, 3, 0, 6, 0 + loadspritegfx ANIM_TAG_263 + loadspritegfx ANIM_TAG_141 + createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish - createvisualtask sub_810C918, 0x5 - loopsewithpan SE_W258, 0, 0x8, 0xA + createvisualtask sub_810C918, 5 + loopsewithpan SE_W258, 0, 8, 10 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 3, 6, 0, 0 + createvisualtask sub_8116620, 10, 1, 3, 6, 0, RGB_BLACK end Move_TORMENT: - loadspritegfx 0x2767 - loadspritegfx 0x27E1 - createvisualtask sub_815AFF0, 0x2 + loadspritegfx ANIM_TAG_ANGER + loadspritegfx ANIM_TAG_209 + createvisualtask sub_815AFF0, 2 waitforvisualfinish - createvisualtask sub_80A7B98, 0x2, 1, RGB_RED, 10, 1, 1 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET - delay 0x14 - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 20 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_MEMENTO: - setalpha 0x1000 - delay 0x1 - createvisualtask sub_81143C0, 0x2 - delay 0x1 - createvisualtask sub_8113BAC, 0x5 + setalpha 0, 16 + delay 1 + createvisualtask sub_81143C0, 2 + delay 1 + createvisualtask sub_8113BAC, 5 playsewithpan SE_W060, SOUND_PAN_ATTACKER - delay 0x30 + delay 48 playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_8114470, 0x2 - delay 0xC - setalpha 0x1000 - delay 0x1 + createvisualtask sub_8114470, 2 + delay 12 + setalpha 0, 16 + delay 1 monbg_22 ANIM_TARGET - createvisualtask sub_8113E78, 0x5 + createvisualtask sub_8113E78, 5 playsewithpan SE_W060, SOUND_PAN_TARGET waitforvisualfinish clearmonbg_23 ANIM_TARGET - delay 0x1 + delay 1 blendoff - delay 0x1 + delay 1 end Move_FACADE: - loadspritegfx 0x2803 - createvisualtask sub_815DCA4, 0x2, 0, 3 - createvisualtask sub_815DF0C, 0x2, 0, 72 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 0x18, 0x3 + loadspritegfx ANIM_TAG_243 + createvisualtask sub_815DCA4, 2, 0, 3 + createvisualtask sub_815DF0C, 2, 0, 72 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: - loadspritegfx 0x2807 - loadspritegfx 0x280F - createsprite gUnknown_085CE864, 0x82, 1, 0, 2 - createsprite gUnknown_085CE864, 0x82, 1, 1, 2 - delay 0x20 - createvisualtask sub_815E840, 0x3, 1, 2 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 0xC, 0x2 + loadspritegfx ANIM_TAG_HAND + loadspritegfx ANIM_TAG_255 + createsprite gUnknown_085CE864, 130, 1, 0, 2 + createsprite gUnknown_085CE864, 130, 1, 1, 2 + delay 32 + createvisualtask sub_815E840, 3, 1, 2 + loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 2 - createsprite gUnknown_085CE894, 0x82, 1, 8, 3 - loopsewithpan SE_W207B, SOUND_PAN_TARGET, 0x10, 0x3 + delay 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 + createsprite gUnknown_085CE894, 130, 1, 8, 3 + loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: - loadspritegfx 0x2750 - createsprite gUnknown_085931D4, 0x2, 0 + loadspritegfx ANIM_TAG_064 + createsprite gUnknown_085931D4, 2, 0 playsewithpan SE_W039, SOUND_PAN_ATTACKER - delay 0x12 + delay 18 playsewithpan SE_W213, SOUND_PAN_ATTACKER - delay 0x47 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x16, 0x3 + delay 71 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 end Move_CHARGE: - loadspritegfx 0x27E3 - loadspritegfx 0x27E4 - loadspritegfx 0x27E5 + loadspritegfx ANIM_TAG_211 + loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_213 monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_810AAFC, 0x2, 0, 60, 2, 12 + createvisualtask sub_810AAFC, 2, 0, 60, 2, 12 playsewithpan SE_W268, SOUND_PAN_ATTACKER - delay 0x1E + delay 30 playsewithpan SE_W268, SOUND_PAN_ATTACKER - delay 0x1E + delay 30 playsewithpan SE_W268, SOUND_PAN_ATTACKER - createsprite gUnknown_0859595C, 0x2, 0 - delay 0x19 + createsprite gUnknown_0859595C, 2, 0 + delay 25 playsewithpan SE_W268, SOUND_PAN_ATTACKER - delay 0x14 + delay 20 playsewithpan SE_W268, SOUND_PAN_ATTACKER - delay 0xF + delay 15 playsewithpan SE_W268, SOUND_PAN_ATTACKER - delay 0xA - delay 0x6 - loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 0x6, 0x5 + delay 10 + delay 6 + loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish - createsprite gUnknown_0859598C, 0x2, 0, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 0, -16, -16 + createsprite gUnknown_0859598C, 2, 0, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 0, -16, -16 playsewithpan SE_W085B, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER blendoff end Move_TAUNT: - loadspritegfx 0x27E6 - loadspritegfx 0x27E1 - loadspritegfx 0x2767 - createsprite gUnknown_08593114, 0xB, 0, 45 + loadspritegfx ANIM_TAG_214 + loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_ANGER + createsprite gUnknown_08593114, 11, 0, 45 playsewithpan SE_W118, SOUND_PAN_ATTACKER - delay 0x6 - createsprite gUnknown_0859324C, 0xC, 0 - delay 0x4 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x10, 0x2 + delay 6 + createsprite gUnknown_0859324C, 12, 0 + delay 4 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish - delay 0x8 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + delay 8 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish - delay 0xC - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 12 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_HELPING_HAND: - loadspritegfx 0x2807 - createvisualtask sub_815EC48, 0x5 - createsprite gUnknown_085CE8AC, 0x28, 0 - createsprite gUnknown_085CE8AC, 0x28, 1 - delay 0x13 + loadspritegfx ANIM_TAG_HAND + createvisualtask sub_815EC48, 5 + createsprite gUnknown_085CE8AC, 40, 0 + createsprite gUnknown_085CE8AC, 40, 1 + delay 19 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 2, 0, 5, 1 - delay 0xE + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 + delay 14 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 2, 0, 5, 1 - delay 0x14 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 + delay 20 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 3, 0, 10, 1 - createvisualtask sub_80A7B98, 0x2, 2, 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 0x280C - createsprite gUnknown_085CE804, 0x32, 112, -16, 140, 128, 36 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, 208, 128, -16, 48, 36 + loadspritegfx ANIM_TAG_252 + createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 + delay 2 + createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, -16, 112, 256, -16, 36 + delay 2 + createsprite gUnknown_085CE804, 50, -16, 112, 256, -16, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, 108, 128, 84, -16, 36 + delay 2 + createsprite gUnknown_085CE804, 50, 108, 128, 84, -16, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, -16, 56, 256, 56, 36 + delay 2 + createsprite gUnknown_085CE804, 50, -16, 56, 256, 56, 36 playsewithpan SE_W010, 0 end Move_SUPERPOWER: - loadspritegfx 0x27E4 - loadspritegfx 0x2810 - loadspritegfx 0x2811 + loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_256 + loadspritegfx ANIM_TAG_257 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08595FEC, 0x82, 0 + setalpha 12, 8 + createsprite gUnknown_08595FEC, 130, 0 playsewithpan SE_W025, SOUND_PAN_ATTACKER - delay 0x14 - createsprite gUnknown_085972D8, 0x2, 4, 1, 180, 1 - createvisualtask sub_8159244, 0x5, 234, 0 - delay 0x28 - createsprite gUnknown_08596004, 0x29, 200, 96, 1, 120 - delay 0x8 - createsprite gUnknown_08596004, 0x29, 20, 248, 4, 112 - delay 0x8 - createsprite gUnknown_08596004, 0x29, 130, 160, 2, 104 - delay 0x8 - createsprite gUnknown_08596004, 0x29, 160, 192, 0, 96 - delay 0x8 - createsprite gUnknown_08596004, 0x29, 60, 288, 3, 88 - delay 0x4A - createsprite gUnknown_0859601C, 0x83, 0 + delay 20 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1 + createvisualtask sub_8159244, 5, 234, 0 + delay 40 + createsprite gUnknown_08596004, 41, 200, 96, 1, 120 + delay 8 + createsprite gUnknown_08596004, 41, 20, 248, 4, 112 + delay 8 + createsprite gUnknown_08596004, 41, 130, 160, 2, 104 + delay 8 + createsprite gUnknown_08596004, 41, 160, 192, 0, 96 + delay 8 + createsprite gUnknown_08596004, 41, 60, 288, 3, 88 + delay 74 + createsprite gUnknown_0859601C, 131, 0 playsewithpan SE_W207, SOUND_PAN_ATTACKER - delay 0x10 - createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 16, 1 + delay 16 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_RECYCLE: - loadspritegfx 0x2826 + loadspritegfx ANIM_TAG_RECYCLE monbg ANIM_ATTACKER - setalpha 0x1000 - delay 0x1 - createsprite gUnknown_085CE9B0, 0x2 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 0x18, 0x3 + setalpha 0, 16 + delay 1 + createsprite gUnknown_085CE9B0, 2 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish - createvisualtask sub_80A7B98, 0x5, 0, 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_ATTACKER - delay 0x1 + delay 1 end Move_BRICK_BREAK: - loadspritegfx 0x27B7 - loadspritegfx 0x2797 - loadspritegfx 0x279F - loadspritegfx 0x27E0 - choosetwoturnanim AnimScript_82CE0A7, AnimScript_82CE154 - -AnimScript_82CE0A7: + loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_208 + choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall +BrickBreakNormal: monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x4 - delay 0x1 - createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 4 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET - delay 0x14 - createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK - delay 0x25 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 + delay 20 + createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK + delay 37 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET end - -AnimScript_82CE154: +BrickBreakShatteredWall: monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x4 - createsprite gUnknown_08595F90, 0x3, 1, 0, 0, 90, 10 - delay 0x1 - createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 4 + createsprite gUnknown_08595F90, 3, 1, 0, 0, 90, 10 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 playsewithpan SE_W233, SOUND_PAN_TARGET - delay 0x14 - createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK - delay 0x25 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 + delay 20 + createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK + delay 37 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08595FA8, 0x2, 1, 0, -8, -12 - createsprite gUnknown_08595FA8, 0x2, 1, 1, 8, -12 - createsprite gUnknown_08595FA8, 0x2, 1, 2, -8, 12 - createsprite gUnknown_08595FA8, 0x2, 1, 3, 8, 12 + 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 playsewithpan SE_W280, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET end Move_YAWN: - loadspritegfx 0x2802 - createvisualtask sub_815D64C, 0x2, 0 + loadspritegfx ANIM_TAG_242 + createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_085CE68C, 0x85, 2 + createsprite gUnknown_085CE68C, 133, 2 playsewithpan SE_W255, SOUND_PAN_ATTACKER - delay 0x4 - createsprite gUnknown_085CE68C, 0x85, 1 - delay 0x4 - createsprite gUnknown_085CE68C, 0x85, 0 + delay 4 + createsprite gUnknown_085CE68C, 133, 1 + delay 4 + createsprite gUnknown_085CE68C, 133, 0 waitforvisualfinish - createvisualtask sub_815D64C, 0x2, 1 + createvisualtask sub_815D64C, 2, 1 playsewithpan SE_W281, SOUND_PAN_TARGET end Move_ENDEAVOR: - loadspritegfx 0x2803 - loadspritegfx 0x2797 - createvisualtask sub_815DCA4, 0x2, 0, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0x18, 0x2 - createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 21, 0), 12, 1, 2 - delay 0x6 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, 12, -12, 1, 2 + loadspritegfx ANIM_TAG_243 + loadspritegfx ANIM_TAG_135 + 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 + delay 6 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET - delay 0x18 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, -12, 12, 1, 2 + delay 24 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2 playsewithpan SE_W004, SOUND_PAN_TARGET end Move_ERUPTION: - loadspritegfx 0x27D9 - createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, RGB_RED - waitforvisualfinish - createvisualtask sub_8109460, 0x2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 0x3C - waitforvisualfinish - createvisualtask sub_8109460, 0x2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 0x3C - waitforvisualfinish - delay 0x1E - createsprite gUnknown_085955E8, 0x28, 200, -32, 0, 100, 0 - createsprite gUnknown_085955E8, 0x28, 30, -32, 16, 90, 1 - createsprite gUnknown_085955E8, 0x28, 150, -32, 32, 60, 2 - createsprite gUnknown_085955E8, 0x28, 90, -32, 48, 80, 3 - createsprite gUnknown_085955E8, 0x28, 110, -32, 64, 50, 0 - createsprite gUnknown_085955E8, 0x28, 60, -32, 80, 70, 1 - delay 0x16 - createvisualtask sub_81152DC, 0x5, 5, 8, 60 - createvisualtask sub_81152DC, 0x5, 4, 8, 60 - loopsewithpan SE_W088, SOUND_PAN_TARGET, 0x10, 0xC - delay 0x50 - createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, RGB_RED + loadspritegfx ANIM_TAG_201 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED + waitforvisualfinish + createvisualtask sub_8109460, 2 + waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitforvisualfinish + createvisualtask sub_8109460, 2 + 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 + 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 end Move_SKILL_SWAP: - loadspritegfx 0x280B - call AnimScript_82D7CD1 - createvisualtask sub_810FBF0, 0x3, 1 - createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 3, 1 - loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 0x18, 0x3 - delay 0x10 - createvisualtask sub_810FBF0, 0x3, 0 - createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 3, 1 + loadspritegfx ANIM_TAG_251 + call SetPsychicBackground + createvisualtask sub_810FBF0, 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_ATTACKER, RGB_WHITE, 12, 3, 1 waitforvisualfinish - call AnimScript_82D7CDD + call UnsetPsychicBackground end Move_IMPRISON: - loadspritegfx 0x2809 - loadspritegfx 0x280A - call AnimScript_82D7CD1 + loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_X_SIGN + call SetPsychicBackground monbg ANIM_DEF_PARTNER - createvisualtask sub_810F940, 0x5 - delay 0x8 - loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 0x8, 0x5 + createvisualtask sub_810F940, 5 + delay 8 + loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish - delay 0x4 - createsprite gUnknown_085967AC, 0x5, 0, 40 - createvisualtask sub_81152DC, 0x5, 4, 1, 10 + delay 4 + createsprite gUnknown_085967AC, 5, 0, 40 + createvisualtask sub_81152DC, 5, 4, 1, 10 playsewithpan SE_W063, SOUND_PAN_ATTACKER clearmonbg ANIM_DEF_PARTNER - call AnimScript_82D7CDD + call UnsetPsychicBackground end Move_GRUDGE: - loadspritegfx 0x280D + loadspritegfx ANIM_TAG_253 monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein - createvisualtask sub_8112C6C, 0x3 - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 0x10, 0x4 - delay 0xA - delay 0x50 + createvisualtask sub_8112C6C, 3 + loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4 + delay 10 + delay 80 playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg @@ -3933,256 +3870,256 @@ Move_GRUDGE: Move_CAMOUFLAGE: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x10 - createvisualtask sub_811675C, 0x5, 2, 3, 0, 14 - delay 0x10 - createvisualtask sub_81136E8, 0x2, 4 + setalpha 16, 0 + createvisualtask sub_811675C, 5, 2, 3, 0, 14 + delay 16 + createvisualtask sub_81136E8, 2, 4 playsewithpan SE_W185, SOUND_PAN_ATTACKER waitforvisualfinish - delay 0x8 - createvisualtask sub_811675C, 0x5, 2, 0, 0, 0 + delay 8 + createvisualtask sub_811675C, 5, 2, 0, 0, 0 waitforvisualfinish - createvisualtask sub_81137E4, 0x2, 1 + createvisualtask sub_81137E4, 2, 1 waitforvisualfinish blendoff clearmonbg ANIM_ATK_PARTNER end Move_TAIL_GLOW: - loadspritegfx 0x27E4 + loadspritegfx ANIM_TAG_212 monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08596AC8, 0x42, 0 - delay 0x12 - loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 0x10, 0x6 + createsprite gUnknown_08596AC8, 66, 0 + delay 18 + loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER blendoff - delay 0x1 + delay 1 end Move_LUSTER_PURGE: - loadspritegfx 0x281B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_267 + loadspritegfx ANIM_TAG_135 fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A5C8, 0x5 + createvisualtask sub_815A5C8, 5 waitbgfadein monbg ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W076, SOUND_PAN_ATTACKER - createsprite gUnknown_08596898, 0x29, 0, 0, 0, 0 - delay 0x14 - createvisualtask sub_8116664, 0x5, 5, 2, 0, 16, -1 - createvisualtask sub_8116848, 0x5, 10267, 2, 0, 16, -1 - waitforvisualfinish - createvisualtask sub_8116848, 0x5, 10135, 0, 12, 12, 23552 - waitforvisualfinish - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - waitforvisualfinish - createvisualtask sub_8116664, 0x5, 5, 2, 16, 0, -1 - createvisualtask sub_81152DC, 0x5, 1, 5, 14 + createsprite gUnknown_08596898, 41, 0, 0, 0, 0 + delay 20 + createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_267, 2, 0, 16, RGB_WHITEALPHA + waitforvisualfinish + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_135, 0, 12, 12, RGB(0, 0, 23) + waitforvisualfinish + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET + delay 3 + createsprite gUnknown_085973A0, 131, 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 blendoff - call AnimScript_82D7CDD + call UnsetPsychicBackground end Move_MIST_BALL: - loadspritegfx 0x27AB - loadspritegfx 0x281E - delay 0x0 + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_270 + delay 0 playsewithpan SE_W081, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C70, 0x80, 0, 0, 0, 0, 30, 0 + createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 10, 0 - createsprite gUnknown_0859728C, 0x0, 1, 1, 1, 32279, 16, 0x7FFF, 16 - delay 0x0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 + delay 0 playsewithpan SE_W114, 0 - createvisualtask sub_810C324, 0x5 - createvisualtask sub_8116620, 0xA, 4, 3, 0, 16, 0x7FFF - delay 0x8 - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 70, 0 - delay 0x46 - createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, 0x7FFF + 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 + delay 70 + createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE end Move_FEATHER_DANCE: - loadspritegfx 0x281E + loadspritegfx ANIM_TAG_270 monbg ANIM_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, SOUND_PAN_TARGET - delay 0x0 - createsprite gUnknown_08596388, 0x80, 0, -16, 64, 2, 104, 11304, 32, 1 - delay 0x6 - createsprite gUnknown_08596388, 0x80, 0, -16, 32, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 0x80, 0, -16, 0, 2, 104, 11304, 32, 1 - delay 0x6 - createsprite gUnknown_08596388, 0x80, 0, -16, 224, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 0x80, 0, -16, 128, 2, 104, 11304, 32, 1 - delay 0x6 - createsprite gUnknown_08596388, 0x80, 0, -16, 192, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 0x80, 0, -16, 160, 2, 104, 11304, 32, 1 - delay 0x6 - createsprite gUnknown_08596388, 0x80, 0, -16, 96, 2, 104, 11304, 32, 1 + delay 0 + createsprite gUnknown_08596388, 128, 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 + 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 + 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 + delay 6 + createsprite gUnknown_08596388, 128, 0, -16, 96, 2, 104, 11304, 32, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_TEETER_DANCE: - loadspritegfx 0x2758 - loadspritegfx 0x2759 - createvisualtask sub_8160164, 0x5 - createsprite gUnknown_08593050, 0x2, 0, 16, -2 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_DUCK + createvisualtask sub_8160164, 5 + createsprite gUnknown_08593050, 2, 0, 16, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER - delay 0x18 - createsprite gUnknown_08593050, 0x2, 0, 0, -2 + delay 24 + createsprite gUnknown_08593050, 2, 0, 0, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER - delay 0x18 - createsprite gUnknown_08593050, 0x2, 0, -16, -2 + delay 24 + createsprite gUnknown_08593050, 2, 0, -16, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER - delay 0x18 - createsprite gUnknown_08593050, 0x2, 1, -8, -2 + delay 24 + createsprite gUnknown_08593050, 2, 1, -8, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER - delay 0x18 - createsprite gUnknown_08593050, 0x2, 2, 8, -2 + delay 24 + createsprite gUnknown_08593050, 2, 2, 8, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER end Move_MUD_SPORT: - loadspritegfx 0x275A - createvisualtask sub_8104938, 0x2, 0, 6 - delay 0x18 - createsprite gUnknown_085971E4, 0x82, 0, -4, -16 - createsprite gUnknown_085971E4, 0x82, 0, 4, -12 + loadspritegfx ANIM_TAG_074 + createvisualtask sub_8104938, 2, 0, 6 + delay 24 + createsprite gUnknown_085971E4, 130, 0, -4, -16 + createsprite gUnknown_085971E4, 130, 0, 4, -12 playsewithpan SE_W091, SOUND_PAN_ATTACKER - delay 0x20 - createsprite gUnknown_085971E4, 0x82, 0, -3, -12 - createsprite gUnknown_085971E4, 0x82, 0, 5, -14 + delay 32 + createsprite gUnknown_085971E4, 130, 0, -3, -12 + createsprite gUnknown_085971E4, 130, 0, 5, -14 playsewithpan SE_W091, SOUND_PAN_ATTACKER - delay 0x20 - createsprite gUnknown_085971E4, 0x82, 0, -5, -18 - createsprite gUnknown_085971E4, 0x82, 0, 3, -14 + delay 32 + createsprite gUnknown_085971E4, 130, 0, -5, -18 + createsprite gUnknown_085971E4, 130, 0, 3, -14 playsewithpan SE_W091, SOUND_PAN_ATTACKER - delay 0x10 - createsprite gUnknown_085971E4, 0x82, 1, 220, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 60, 100 - waitplaysewithpan SE_W145B, 0, 0x19 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 140, 55 - waitplaysewithpan SE_W145B, 0, 0xE - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 180, 50 - waitplaysewithpan SE_W145B, 0, 0xA - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 20, 90 - waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 90, 90 - waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 160, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 30, 90 - waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 120, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 200, 40 - waitplaysewithpan SE_W145B, 0, 0xA + delay 16 + createsprite gUnknown_085971E4, 130, 1, 220, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 60, 100 + waitplaysewithpan SE_W145B, 0, 25 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 140, 55 + waitplaysewithpan SE_W145B, 0, 14 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 180, 50 + waitplaysewithpan SE_W145B, 0, 10 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 20, 90 + waitplaysewithpan SE_W145B, 0, 22 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 90, 90 + waitplaysewithpan SE_W145B, 0, 22 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 160, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 30, 90 + waitplaysewithpan SE_W145B, 0, 22 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 120, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 200, 40 + waitplaysewithpan SE_W145B, 0, 10 end Move_NEEDLE_ARM: - loadspritegfx 0x281A - loadspritegfx 0x2797 - loadspritegfx 0x279F - loopsewithpan SE_W030, SOUND_PAN_TARGET, 0x2, 0x10 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, -32, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 22, -22, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 30, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 20, 20, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, 28, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -19, 19, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -27, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -18, -18, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, -25, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 17, -17, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 23, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 16, 16, 16 - waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + loadspritegfx ANIM_TAG_266 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 + createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 22, -22, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 30, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 20, 20, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 0, 28, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -19, 19, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -27, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -18, -18, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 0, -25, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 17, -17, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 23, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 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 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08592888, 0x82, 1, 1, 0, -24, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 17, -17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 24, 0, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 17, 17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 0, 24, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, -17, 17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, -24, 0, 10 - createsprite gUnknown_08592888, 0x82, 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 + 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 end Move_SLACK_OFF: - loadspritegfx 0x272F - createvisualtask sub_8160544, 0x2, 0 + loadspritegfx ANIM_TAG_BLUE_STAR + createvisualtask sub_8160544, 2, 0 playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish - call AnimScript_82D79DF + call HealingEffect waitforvisualfinish end Move_CRUSH_CLAW: - loadspritegfx 0x27B7 - loadspritegfx 0x2737 - loadspritegfx 0x27E0 + loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_CLAW_SLASH + loadspritegfx ANIM_TAG_208 monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1 - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 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 playsewithpan SE_W013, SOUND_PAN_TARGET - delay 0xC - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 + delay 12 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish blendoff @@ -4191,189 +4128,189 @@ Move_CRUSH_CLAW: Move_AROMATHERAPY: playsewithpan SE_W080, 0 - loadspritegfx 0x27AF - loadspritegfx 0x27DB - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x0, 1, 0, 0, 7, RGB(13, 31, 12) - delay 0x1 + loadspritegfx ANIM_TAG_159 + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_SPARKLE + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12) + delay 1 monbg ANIM_ATTACKER - delay 0x1 - createsprite gUnknown_085927AC, 0x0, 24, 16, 0, 2, 2, 0, 0 - createsprite gUnknown_085927AC, 0x42, 64, 24, 0, 3, 1, 1, 0 - createsprite gUnknown_085927C4, 0x0, 16, 24, 0, 2, 1, 0, 0 - delay 0x14 - createsprite gUnknown_085927AC, 0x42, 48, 12, 0, 4, 3, 1, 0 - createsprite gUnknown_085927AC, 0x0, 100, 16, 0, 3, 2, 0, 0 - createsprite gUnknown_085927AC, 0x0, 74, 24, 180, 3, 2, 0, 0 - delay 0xA - createsprite gUnknown_085927AC, 0x42, 80, 30, 0, 4, 1, 1, 0 - createsprite gUnknown_085927AC, 0x0, 128, 12, 0, 3, 3, 0, 0 - createsprite gUnknown_085927C4, 0x0, 90, 16, 0, 2, 1, 0, 0 + 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 + 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 + 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 waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 - createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, RGB(13, 31, 12) - delay 0x1 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 7, 0, RGB(13, 31, 12) + delay 1 playsewithpan SE_W287, SOUND_PAN_ATTACKER - createvisualtask sub_815DFCC, 0x2, 1 + createvisualtask sub_815DFCC, 2, 1 waitforvisualfinish playsewithpan SE_W234, SOUND_PAN_ATTACKER - createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1 - delay 0x8 - createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + delay 8 + createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, RGB(13, 31, 12) - createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 43, 3, 10, 0, RGB(13, 31, 12) + createsprite gUnknown_08593868, 16, 0, 0, 0, 1 waitforvisualfinish end Move_FAKE_TEARS: - loadspritegfx 0x27AB - loadspritegfx 0x27E1 - loadspritegfx 0x2758 - createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, RGB(12, 11, 31) - waitforvisualfinish - createvisualtask sub_815C478, 0x5, 0, 2, 1 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 0xC, 0x4 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 0 - createsprite gUnknown_085970E8, 0x2, 0, 1 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 2 - createsprite gUnknown_085970E8, 0x2, 0, 3 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 0 - createsprite gUnknown_085970E8, 0x2, 0, 1 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 2 - createsprite gUnknown_085970E8, 0x2, 0, 3 + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31) + waitforvisualfinish + 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 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 2 + createsprite gUnknown_085970E8, 2, 0, 3 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 0 + createsprite gUnknown_085970E8, 2, 0, 1 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 2 + createsprite gUnknown_085970E8, 2, 0, 3 waitforvisualfinish end Move_AIR_CUTTER: - loadspritegfx 0x2713 - loadspritegfx 0x279A - loadspritegfx 0x2797 - delay 0x0 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 + delay 0 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x0 - createvisualtask sub_8103CF0, 0x2, 32, -24, 1536, 2, 128 + setalpha 12, 8 + delay 0 + createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128 waitforvisualfinish playsewithpan SE_W015, SOUND_PAN_TARGET - createsprite gUnknown_08592A34, 0x2, 40, -32, 0, 2 - delay 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 8, 1 + createsprite gUnknown_08592A34, 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 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 end Move_ODOR_SLEUTH: monbg ANIM_TARGET - createvisualtask sub_815F620, 0x5 - delay 0x18 - createsprite gUnknown_0857FE28, 0x2, 3, 4 + createvisualtask sub_815F620, 5 + delay 24 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 playsewithpan SE_W207, SOUND_PAN_ATTACKER - delay 0x6 - createsprite gUnknown_0857FE28, 0x2, 3, 4 + delay 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET - delay 0x1 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, -1, 16, -1, 0 + delay 1 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 playsewithpan SE_W043, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: - loadspritegfx 0x2758 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB(18, 31, 12) - waitforvisualfinish - createvisualtask sub_8102BE8, 0x2 - waitforvisualfinish - panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - createsprite gUnknown_08593008, 0x82, 7, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 6, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 1, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 3, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 6, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 1, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 1, 0 - delay 0x4 - waitforvisualfinish - createvisualtask sub_8102CA0, 0x2 - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB(18, 31, 12) + loadspritegfx ANIM_TAG_MUSIC_NOTES2 + createsprite gSimplePaletteBlendSpriteTemplate, 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 + delay 5 + createsprite gUnknown_08593008, 130, 6, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 1, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 3, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 5, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 6, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 1, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 5, 1, 0 + delay 4 + waitforvisualfinish + createvisualtask sub_8102CA0, 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB(18, 31, 12) waitforvisualfinish end Move_TICKLE: - loadspritegfx 0x27EA - createsprite gUnknown_08597274, 0x2, 2, 0, 0, 16, RGB_BLACK + loadspritegfx ANIM_TAG_218 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 playsewithpan SE_W197, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish - delay 0x14 - createvisualtask sub_80D5EB8, 0x3, 0, 6, 1280, 3, 0 - delay 0xC - createvisualtask sub_815C478, 0x3, 1, 6, 2 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 0x8, 0x8 + delay 20 + 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 waitforvisualfinish end Move_WATER_SPOUT: - loadspritegfx 0x281C - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_268 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_81080E4, 0x5 + setalpha 12, 8 + createvisualtask sub_81080E4, 5 playsewithpan SE_W029, SOUND_PAN_ATTACKER - delay 0x2C + delay 44 playsewithpan SE_W291, SOUND_PAN_ATTACKER waitforvisualfinish - delay 0x10 - createvisualtask sub_81085C8, 0x5 + delay 16 + createvisualtask sub_81085C8, 5 playsewithpan SE_W057, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER blendoff end Move_SHADOW_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 fadetobg BG_GHOST waitbgfadein monbg ANIM_ATK_PARTNER - setalpha 0x809 - createvisualtask sub_80A8BC4, 0x2, 0, 13 + setalpha 9, 8 + createvisualtask sub_80A8BC4, 2, 0, 13 playsewithpan SE_W026, SOUND_PAN_ATTACKER - delay 0x6 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -4382,37 +4319,37 @@ Move_SHADOW_PUNCH: end Move_EXTRASENSORY: - call AnimScript_82D7CD1 + call SetPsychicBackground monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 - createvisualtask sub_810FE14, 0x5, 0 + setalpha 12, 8 + 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 sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 - createvisualtask sub_810FE14, 0x5, 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 - createvisualtask sub_8110034, 0x5, 0 - createvisualtask sub_810FE14, 0x5, 2 + createvisualtask sub_8110034, 5, 0 + createvisualtask sub_810FE14, 5, 2 playsewithpan SE_W043, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - call AnimScript_82D7CDD + call UnsetPsychicBackground end Move_AERIAL_ACE: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3 - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 + createvisualtask sub_81169C0, 2, 0, 4, 7, 3 + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0 + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET @@ -4420,157 +4357,157 @@ Move_AERIAL_ACE: end Move_IRON_DEFENSE: - loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 - createsprite gUnknown_0859728C, 0x2, 1, 8, 2, -1, 14, -1, 0 + 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 waitforvisualfinish end Move_BLOCK: - loadspritegfx 0x280A - createsprite gUnknown_085CE90C, 0xC2 + loadspritegfx ANIM_TAG_X_SIGN + createsprite gUnknown_085CE90C, 194 playsewithpan SE_W207, SOUND_PAN_TARGET end Move_HOWL: - loadspritegfx 0x2745 - createvisualtask sub_815D64C, 0x2, 0 - delay 0xC - call AnimScript_82CFECB - createvisualtask sub_8158D8C, 0x2, 0, 3 + loadspritegfx ANIM_TAG_053 + createvisualtask sub_815D64C, 2, 0 + delay 12 + call RoarEffect + createvisualtask sub_8158D8C, 2, 0, 3 waitforvisualfinish - delay 0x1E + delay 30 end Move_BULK_UP: - loadspritegfx 0x2766 - createvisualtask sub_8104AB4, 0x2 + loadspritegfx ANIM_TAG_086 + createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08593658, 0x2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 0x4, 0x2 + createsprite gUnknown_08593658, 2 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end Move_COVET: - loadspritegfx 0x27E2 - loadspritegfx 0x27F0 - createvisualtask sub_815C478, 0x5, 0, 2, 0 - createsprite gUnknown_08593970, 0x3, 0, 20 + loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_ITEM_BAG + createvisualtask sub_815C478, 5, 0, 2, 0 + createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER - delay 0xF - createsprite gUnknown_08593970, 0x3, -20, 20 + delay 15 + createsprite gUnknown_08593970, 3, -20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER - delay 0xF - createsprite gUnknown_08593970, 0x3, 20, 20 + delay 15 + createsprite gUnknown_08593970, 3, 20, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - loopsewithpan SE_W146, SOUND_PAN_TARGET, 0x4, 0x3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 end Move_VOLT_TACKLE: - loadspritegfx 0x2711 - loadspritegfx 0x27E4 - loadspritegfx 0x27E5 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_213 monbg ANIM_ATTACKER - setalpha 0x80C - createvisualtask sub_8116620, 0xA, 1, 0, 0, 8, 0 + setalpha 12, 8 + createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish - createsprite gUnknown_085959A4, 0x1 + createsprite gUnknown_085959A4, 1 playsewithpan SE_W268, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - delay 0x8 - createvisualtask sub_810AFCC, 0x5, 0 + delay 8 + createvisualtask sub_810AFCC, 5, 0 playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 1 + createvisualtask sub_810AFCC, 5, 1 playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 2 + createvisualtask sub_810AFCC, 5, 2 playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 3 + createvisualtask sub_810AFCC, 5, 3 playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 4 + createvisualtask sub_810AFCC, 5, 4 playsewithpan SE_W085, SOUND_PAN_ATTACKER - delay 0x8 - createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1 + delay 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859598C, 0x2, 1, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 1, -16, -16 - delay 0x8 - createvisualtask sub_810AE5C, 0x5 + createsprite gUnknown_0859598C, 2, 1, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 1, -16, -16 + delay 8 + createvisualtask sub_810AE5C, 5 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859598C, 0x2, 0, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 0, -16, -16 + createsprite gUnknown_0859598C, 2, 0, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 0, -16, -16 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 0, 8, 0, 0 + createvisualtask sub_8116620, 10, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish end Move_WATER_SPORT: - loadspritegfx 0x281C - createvisualtask sub_81088E4, 0x5 - delay 0x8 + loadspritegfx ANIM_TAG_268 + createvisualtask sub_81088E4, 5 + delay 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER - delay 0x2C + delay 44 playsewithpan SE_W057, SOUND_PAN_ATTACKER - delay 0x2C + delay 44 playsewithpan SE_W057, SOUND_PAN_ATTACKER - delay 0x2C - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 + delay 44 + panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 end Move_CALM_MIND: - loadspritegfx 0x27DB + loadspritegfx ANIM_TAG_203 monbg ANIM_ATK_PARTNER - createvisualtask sub_8116664, 0x5, 0, 0, 0, 16, 0 + createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK waitforvisualfinish - createvisualtask sub_81177E4, 0x5, 1 + createvisualtask sub_81177E4, 5, 1 waitforvisualfinish - createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 + createsprite gUnknown_08593850, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER - delay 0xE - createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 + delay 14 + createsprite gUnknown_08593850, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER - delay 0xE - createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 + delay 14 + createsprite gUnknown_08593850, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_81177E4, 0x5, 0 + createvisualtask sub_81177E4, 5, 0 waitforvisualfinish - createvisualtask sub_8116664, 0x5, 0, 0, 16, 0, 0 + createvisualtask sub_8116664, 5, 0, 0, 16, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end Move_LEAF_BLADE: - loadspritegfx 0x274F - loadspritegfx 0x282D - createvisualtask sub_80FFFC0, 0x5 - delay 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_285 + createvisualtask sub_80FFFC0, 5 + delay 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET - delay 0x32 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + delay 50 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET - delay 0x32 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + delay 50 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - delay 0xC - createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 18, 1 - createsprite gUnknown_085973D0, 0x82, 0, 0, 1, 36 + setalpha 12, 8 + delay 12 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 + createsprite gUnknown_085973D0, 130, 0, 0, 1, 36 playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET @@ -4578,180 +4515,180 @@ Move_LEAF_BLADE: end Move_DRAGON_DANCE: - loadspritegfx 0x2809 + loadspritegfx ANIM_TAG_249 monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_81133E8, 0x5 + delay 1 + createvisualtask sub_81133E8, 5 playsewithpan SE_W100, SOUND_PAN_ATTACKER - delay 0x8 - createvisualtask sub_80A7CB4, 0x5, 10249, 19456, 14, 0, 3 - createsprite gUnknown_08596F98, 0x2, 0 - createsprite gUnknown_08596F98, 0x2, 43 - createsprite gUnknown_08596F98, 0x2, 85 - createsprite gUnknown_08596F98, 0x2, 128 - createsprite gUnknown_08596F98, 0x2, 170 - createsprite gUnknown_08596F98, 0x2, 213 - delay 0x1E + 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 + delay 30 playsewithpan SE_W100, SOUND_PAN_ATTACKER - delay 0x1E + delay 30 playsewithpan SE_W100, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 end Move_SHOCK_WAVE: - loadspritegfx 0x27E3 - loadspritegfx 0x27E4 - loadspritegfx 0x2711 - loadspritegfx 0x2735 + loadspritegfx ANIM_TAG_211 + loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_810AAFC, 0x2, 0, 20, 0, 2 + createvisualtask sub_810AAFC, 2, 0, 20, 0, 2 playsewithpan SE_W268, SOUND_PAN_ATTACKER - delay 0xC - createsprite gUnknown_08595A18, 0x2 - delay 0x1E - createvisualtask sub_810B29C, 0x5 - delay 0xC + delay 12 + createsprite gUnknown_08595A18, 2 + delay 30 + createvisualtask sub_810B29C, 5 + delay 12 waitforvisualfinish - createvisualtask sub_810B55C, 0x5 + createvisualtask sub_810B55C, 5 playsewithpan SE_W161B, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 0, 6, 18, 1 - createvisualtask sub_8116620, 0x5, 1, 3, 16, 0, 0x7FFF - createvisualtask sub_8116620, 0x5, 4, 0, 16, 16, 0 - delay 0x4 - createvisualtask sub_8116620, 0x5, 4, 0, 0, 0, 0 + 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_ATTACKER blendoff end Move_HARDEN: - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish end Move_BELLY_DRUM: - loadspritegfx 0x2758 - loadspritegfx 0x27D1 - createvisualtask sub_8102BE8, 0x2 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_193 + createvisualtask sub_8102BE8, 2 waitforvisualfinish - call AnimScript_82CF5A6 - createsprite gUnknown_0859309C, 0x2, 0, 0, 0, 0 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 0, 0, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER - delay 0xF - call AnimScript_82CF58B - createsprite gUnknown_0859309C, 0x2, 1, 1, 1, 0 + delay 15 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 1, 1, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER - delay 0xF - call AnimScript_82CF5A6 - createsprite gUnknown_0859309C, 0x2, 0, 3, 3, 128 + delay 15 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 3, 3, 128 playsewithpan SE_W187, SOUND_PAN_ATTACKER - delay 0x7 - call AnimScript_82CF58B - createsprite gUnknown_0859309C, 0x2, 1, 2, 0, 128 + delay 7 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 2, 0, 128 playsewithpan SE_W187, SOUND_PAN_ATTACKER - delay 0x7 - call AnimScript_82CF5A6 - createsprite gUnknown_0859309C, 0x2, 0, 1, 1, 0 + delay 7 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 1, 1, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER - delay 0x7 - call AnimScript_82CF58B - createsprite gUnknown_0859309C, 0x2, 1, 0, 3, 0 + delay 7 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 0, 3, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_8102CA0, 0x2 + createvisualtask sub_8102CA0, 2 waitforvisualfinish end -AnimScript_82CF58B: - createsprite gUnknown_08593068, 0x3, 0 - createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1 +BellyDrum2: + createsprite gUnknown_08593068, 3, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return -AnimScript_82CF5A6: - createsprite gUnknown_08593068, 0x3, 1 - createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1 +BellyDrum1: + createsprite gUnknown_08593068, 3, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return Move_MIND_READER: - loadspritegfx 0x27CD - loadspritegfx 0x27CE - loadspritegfx 0x27CF + loadspritegfx ANIM_TAG_189 + loadspritegfx ANIM_TAG_OPENING_EYE + loadspritegfx ANIM_TAG_191 monbg ANIM_DEF_PARTNER playsewithpan SE_W109, SOUND_PAN_TARGET - createsprite gUnknown_085CE07C, 0x5, 0, 0, 1, 0 - createsprite gUnknown_085CE094, 0x5 - delay 0x28 + createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 + createsprite gUnknown_085CE094, 5 + delay 40 playsewithpan SE_W043, SOUND_PAN_TARGET - createvisualtask sub_8115A04, 0x2, 1, 1, 2, 0, 10, 0 - call AnimScript_82CF608 + createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK + call MindReaderEffect waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82CF608: - createsprite gUnknown_085CE0AC, 0x4, 70, 0, 6 - createsprite gUnknown_085CE0AC, 0x4, 40, 40, 6 - createsprite gUnknown_085CE0AC, 0x4, 10, -60, 6 - createsprite gUnknown_085CE0AC, 0x4, -50, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, -40, 40, 6 - createsprite gUnknown_085CE0AC, 0x4, 50, -50, 6 - delay 0x2 - createsprite gUnknown_085CE0AC, 0x4, 50, -30, 6 - createsprite gUnknown_085CE0AC, 0x4, 60, 10, 6 - createsprite gUnknown_085CE0AC, 0x4, 0, 60, 6 - createsprite gUnknown_085CE0AC, 0x4, 0, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, -30, 6 - delay 0x2 - createsprite gUnknown_085CE0AC, 0x4, -50, 50, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 0x4, -40, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, 20, -60, 6 - createsprite gUnknown_085CE0AC, 0x4, 50, -50, 6 - createsprite gUnknown_085CE0AC, 0x4, 35, 40, 6 - delay 0x2 +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 + 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 + 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 + delay 2 return Move_ICE_PUNCH: monbg ANIM_DEF_PARTNER - setalpha 0x80C - loadspritegfx 0x279D - loadspritegfx 0x2797 - loadspritegfx 0x279F - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK - createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 32588 - delay 0x14 + setalpha 12, 8 + loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + createsprite gSimplePaletteBlendSpriteTemplate, 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, 0x2, 0 - createsprite gUnknown_08595AE8, 0x2, 64 - createsprite gUnknown_08595AE8, 0x2, 128 - createsprite gUnknown_08595AE8, 0x2, 192 - delay 0x5 - createsprite gUnknown_08595AD0, 0x2, 32 - createsprite gUnknown_08595AD0, 0x2, 96 - createsprite gUnknown_08595AD0, 0x2, 160 - createsprite gUnknown_08595AD0, 0x2, 224 - delay 0x11 - createsprite gUnknown_08595E98, 0x4, 0, -10, 8, 1, 0 - createsprite gUnknown_08597358, 0x3, 0, -10, 1, 1 + createsprite gUnknown_08595AE8, 2, 0 + createsprite gUnknown_08595AE8, 2, 64 + createsprite gUnknown_08595AE8, 2, 128 + createsprite gUnknown_08595AE8, 2, 192 + delay 5 + createsprite gUnknown_08595AD0, 2, 32 + createsprite gUnknown_08595AD0, 2, 96 + createsprite gUnknown_08595AD0, 2, 160 + createsprite gUnknown_08595AD0, 2, 224 + delay 17 + createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 3, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 waitforvisualfinish - delay 0xF - call AnimScript_82D7720 - delay 0x5 - createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, 32588 + delay 15 + call FreezeEffect1 + delay 5 + createvisualtask sub_8116620, 10, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -4759,226 +4696,224 @@ Move_ICE_PUNCH: Move_REST: playsewithpan SE_W173, SOUND_PAN_ATTACKER - loadspritegfx 0x27F4 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x14 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x14 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 + loadspritegfx ANIM_TAG_LETTER_Z + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 20 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 20 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 waitforvisualfinish end Move_CONFUSION: monbg ANIM_DEF_PARTNER - call AnimScript_82D7CD1 - setalpha 0x808 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF + call SetPsychicBackground + setalpha 8, 8 + 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 sub_80D51AC, 0x2, 1, 3, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call AnimScript_82D7CDD + delay 1 + call UnsetPsychicBackground end Move_PSYCHIC: monbg ANIM_DEF_PARTNER - call AnimScript_82D7CD1 - setalpha 0x808 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 767 + call SetPsychicBackground + setalpha 8, 8 + 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, 0xA, 0x3 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1 + 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 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call AnimScript_82D7CDD + delay 1 + call UnsetPsychicBackground end Move_FUTURE_SIGHT: - goto AnimScript_82CF8F6 - -AnimScript_82CF8ED: + goto FutureSight +FutureSightContinue: waitforvisualfinish - delay 0x1 - call AnimScript_82D7CDD + delay 1 + call UnsetPsychicBackground end - -AnimScript_82CF8F6: +FutureSight: monbg ANIM_ATK_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER - call AnimScript_82D7CD1 - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_ATTACKER - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - goto AnimScript_82CF8ED + goto FutureSightContinue Move_THUNDER: - loadspritegfx 0x2735 + loadspritegfx ANIM_TAG_LIGHTNING fadetobg BG_THUNDER waitbgfadeout - createvisualtask sub_8117660, 0x5, -256, 0, 1, -1 + createvisualtask sub_8117660, 5, -256, 0, 1, -1 waitbgfadein - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK - delay 0x10 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + delay 16 + createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W086, SOUND_PAN_TARGET - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, -36 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, -20 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, 12 - delay 0x14 + delay 1 + createsprite gUnknown_085956C0, 130, 16, -36 + delay 1 + createsprite gUnknown_085956C0, 130, 16, -20 + delay 1 + createsprite gUnknown_085956C0, 130, 16, 12 + delay 20 createsprite gUnknown_085956C0, 0x86, -16, -32 playsewithpan SE_W086, SOUND_PAN_TARGET - delay 0x1 + delay 1 createsprite gUnknown_085956C0, 0x86, -16, -16 - delay 0x1 + delay 1 createsprite gUnknown_085956C0, 0x86, -16, 16 playsewithpan SE_W086, SOUND_PAN_TARGET - delay 0x5 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, -32 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, 16 - delay 0x1E - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x5 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -32 + delay 5 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, 130, 24, -32 + delay 1 + createsprite gUnknown_085956C0, 130, 24, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 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 playsewithpan SE_W161B, SOUND_PAN_TARGET - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, 16 - delay 0xA - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createvisualtask sub_810A094, 0x2, 30, 3, 1, 0 - delay 0x2 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_08597274, 0x82, 1, 2, 16, 0, RGB_BLACK + delay 1 + createsprite gUnknown_085956C0, 130, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 0, 16 + delay 10 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createvisualtask sub_810A094, 2, 30, 3, 1, 0 + delay 2 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 130, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein end Move_THUNDER_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F - loadspritegfx 0x2735 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -48 - delay 0x1 - createsprite gUnknown_085956C0, 0x2, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x2, 0, 16 - delay 0x1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + delay 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, 130, 0, -48 + delay 1 + createsprite gUnknown_085956C0, 2, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 2, 0, 16 + delay 1 playsewithpan SE_W161B, SOUND_PAN_TARGET - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK - delay 0x14 + 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 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + delay 20 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_SACRED_FIRE: - loadspritegfx 0x2731 - loadspritegfx 0x2733 - loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 0x7, 0x5 - createsprite gUnknown_08595428, 0x2, -32, 0, 50, 5, -2, 0 - delay 0x1 - createsprite gUnknown_08595428, 0x42, -20, -10, 50, 5, -1, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x42, 0, -16, 50, 5, 0, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x42, 20, -10, 50, 5, 1, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 32, 0, 50, 5, 2, 0 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 20, 10, 50, 5, 1, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 0, 16, 50, 5, 0, 1 - delay 0x1 - createsprite gUnknown_08595428, 0x2, -20, 10, 50, 5, -1, 1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + loadspritegfx ANIM_TAG_FIRE + loadspritegfx ANIM_TAG_035 + loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 + createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0 + delay 1 + createsprite gUnknown_08595428, 66, -20, -10, 50, 5, -1, -1 + delay 1 + createsprite gUnknown_08595428, 66, 0, -16, 50, 5, 0, -1 + delay 1 + createsprite gUnknown_08595428, 66, 20, -10, 50, 5, 1, -1 + delay 1 + createsprite gUnknown_08595428, 2, 32, 0, 50, 5, 2, 0 + delay 1 + createsprite gUnknown_08595428, 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 + delay 1 + createsprite gUnknown_08595428, 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, 0x82, -16, 0, 70, 16, 0, 1 - delay 0xA + createsprite gUnknown_085953F8, 130, -16, 0, 70, 16, 0, 1 + delay 10 playsewithpan SE_W221B, SOUND_PAN_TARGET - createsprite gUnknown_085953F8, 0x82, 0, 0, 70, 16, 0, 1 - delay 0xA + createsprite gUnknown_085953F8, 130, 0, 0, 70, 16, 0, 1 + delay 10 playsewithpan SE_W221B, SOUND_PAN_TARGET - createsprite gUnknown_085953F8, 0x82, 16, 0, 80, 16, 0, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + createsprite gUnknown_085953F8, 130, 16, 0, 80, 16, 0, 1 + delay 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 waitforvisualfinish - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 playsewithpan SE_W172B, SOUND_PAN_TARGET - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 2, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -2 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 3, 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 waitforvisualfinish end Move_SCRATCH: - loadspritegfx 0x2799 + loadspritegfx ANIM_TAG_137 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_085CE020, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gUnknown_085CE020, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4986,423 +4921,419 @@ Move_SCRATCH: end Move_DRAGON_BREATH: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 0x7, 0x7 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createvisualtask sub_8116620, 0xA, 4, 1, 0, 9, 31 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 21, 1 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 1, 9, 0, 31 + loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 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 + delay 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 21, 1 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + waitforvisualfinish + createvisualtask sub_8116620, 10, 4, 1, 9, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_ROAR: - loadspritegfx 0x2745 + loadspritegfx ANIM_TAG_053 monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - setalpha 0x808 - createvisualtask sub_8158E9C, 0x2, 0, 2 - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 - call AnimScript_82CFECB - delay 0x14 - createvisualtask sub_80D5DB0, 0x5, 1, 2 + setalpha 8, 8 + createvisualtask sub_8158E9C, 2, 0, 2 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 + call RoarEffect + delay 20 + createvisualtask sub_80D5DB0, 5, 1, 2 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff waitforvisualfinish - createvisualtask sub_8159078, 0x5 + createvisualtask sub_8159078, 5 waitforvisualfinish end -AnimScript_82CFECB: - createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1 - delay 0xF - createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1 +RoarEffect: + createsprite gUnknown_085CE7D4, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, 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 return Move_GROWL: - loadspritegfx 0x2745 - createvisualtask sub_8158E9C, 0x2, 0, 255 - call AnimScript_82CFECB - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1 + loadspritegfx ANIM_TAG_053 + 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 waitforvisualfinish - createvisualtask sub_8159078, 0x5 + createvisualtask sub_8159078, 5 waitforvisualfinish end Move_SNORE: - loadspritegfx 0x27D5 + loadspritegfx ANIM_TAG_197 monbg ANIM_ATK_PARTNER - setalpha 0x808 - call AnimScript_82CFF76 - delay 0x1E - call AnimScript_82CFF76 + setalpha 8, 8 + call Snore1 + delay 30 + call Snore1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end - -AnimScript_82CFF76: +Snore1: playsewithpan SE_W173, SOUND_PAN_ATTACKER - createvisualtask sub_80D6064, 0x5, -7, -7, 7, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 - createsprite gUnknown_085972D8, 0x2, 6, 1, 14, 0, 0 - createsprite gUnknown_085936EC, 0x2, 0, 0, -42, -38, 24, 0, 0 - createsprite gUnknown_085936EC, 0x2, 0, 0, 0, -42, 24, 0, 0 - createsprite gUnknown_085936EC, 0x2, 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, 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 return Move_LIGHT_SCREEN: - loadspritegfx 0x2756 - loadspritegfx 0x27B6 - setalpha 0x1000 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 0xF - createsprite gUnknown_08596560, 0x1, 40, 0, 10166 - delay 0xA - call AnimScript_82D0014 - waitforvisualfinish - delay 0x1 - blendoff - end - -AnimScript_82D0014: - createsprite gUnknown_08596624, 0x2, 23, 0, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 31, -8, 0, 1 - delay 0x5 - createsprite gUnknown_08596624, 0x2, 30, 20, 0, 1 - delay 0x7 - createsprite gUnknown_08596624, 0x2, 10, -15, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 20, 10, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 10, 18, 0, 1 + loadspritegfx ANIM_TAG_070 + loadspritegfx ANIM_TAG_166 + setalpha 0, 16 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + createsprite gUnknown_08596560, 1, 40, 0, 10166 + delay 10 + call SpecialScreenEffect + waitforvisualfinish + delay 1 + blendoff + end + +SpecialScreenEffect: + createsprite gUnknown_08596624, 2, 23, 0, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 31, -8, 0, 1 + delay 5 + createsprite gUnknown_08596624, 2, 30, 20, 0, 1 + delay 7 + createsprite gUnknown_08596624, 2, 10, -15, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 20, 10, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 10, 18, 0, 1 return Move_MIRROR_COAT: - loadspritegfx 0x2756 - loadspritegfx 0x27B8 - setalpha 0x1000 - createsprite gUnknown_08596590, 0x1, 40, 0, 10168 - delay 0xA + loadspritegfx ANIM_TAG_070 + loadspritegfx ANIM_TAG_168 + setalpha 0, 16 + createsprite gUnknown_08596590, 1, 40, 0, 10168 + delay 10 playsewithpan SE_W115, SOUND_PAN_ATTACKER - call AnimScript_82D0014 + call SpecialScreenEffect waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_REFLECT: - loadspritegfx 0x2757 - loadspritegfx 0x27B7 - setalpha 0x1000 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 0xF - createsprite gUnknown_08596578, 0x1, 40, 0, 10167 - delay 0x14 - createsprite gUnknown_085965F4, 0x2, 30, 0, 0, 1 - delay 0x7 - createsprite gUnknown_085965F4, 0x2, 19, -12, 0, 1 - delay 0x7 - createsprite gUnknown_085965F4, 0x2, 10, 20, 0, 1 + loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_167 + setalpha 0, 16 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + createsprite gUnknown_08596578, 1, 40, 0, 10167 + delay 20 + createsprite gUnknown_085965F4, 2, 30, 0, 0, 1 + delay 7 + createsprite gUnknown_085965F4, 2, 19, -12, 0, 1 + delay 7 + createsprite gUnknown_085965F4, 2, 10, 20, 0, 1 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_BARRIER: - loadspritegfx 0x27B9 - setalpha 0x1000 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 0xF - createsprite gUnknown_085965A8, 0x3, 40, 0, 10169 + loadspritegfx ANIM_TAG_169 + setalpha 0, 16 + waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + createsprite gUnknown_085965A8, 3, 40, 0, 10169 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_BUBBLE: - loadspritegfx 0x27A2 - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_146 + loadspritegfx ANIM_TAG_155 monbg ANIM_TARGET - setalpha 0x80C - delay 0x1 - createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 128, 100 + setalpha 12, 8 + delay 1 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 35, 37, 40, 128, 100 + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 37, 40, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 10, -37, 30, 128, 100 + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -37, 30, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, 15, 128, 100 + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, 15, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 20, 33, 20, 128, 100 + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 33, 20, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 128, 100 + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 128, 100 playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 0x64 + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 waitforvisualfinish - call AnimScript_82D7B53 + call WaterBubbleEffect2 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_SMOG: - loadspritegfx 0x27BC + loadspritegfx ANIM_TAG_172 monbg ANIM_DEF_PARTNER monbgprio_29 - setalpha 0x80C - loopsewithpan SE_W054, SOUND_PAN_TARGET, 0x11, 0xA - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - delay 0x78 - loopsewithpan SE_W092, SOUND_PAN_TARGET, 0x12, 0x2 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 26650 - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 15, 1 + setalpha 12, 8 + loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + delay 120 + 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 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82D024A: - createsprite gUnknown_08595C44, 0x2, 0, -24, 48, 240, 1, 0 - delay 0x7 +Smog1: + createsprite gUnknown_08595C44, 2, 0, -24, 48, 240, 1, 0 + delay 7 return Move_FAINT_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_ATTACKER fadetobg BG_DARK waitbgfadein - delay 0x0 + delay 0 playsewithpan SE_W185, SOUND_PAN_ATTACKER - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 3 - createvisualtask sub_81136E8, 0x2, 1 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 + createvisualtask sub_81136E8, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER invisible ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8117F60, 0x2 - setalpha 0x80C + delay 1 + createvisualtask sub_8117F60, 2 + setalpha 12, 8 monbg ANIM_TARGET - delay 0x1 + delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 9, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 - setarg 0x7, 0x1000 - delay 0x20 - createvisualtask sub_8113888, 0x2 + delay 1 + setarg 7, 0x1000 + delay 32 + createvisualtask sub_8113888, 2 monbg ANIM_ATTACKER - createvisualtask sub_81137E4, 0x2, 1 + createvisualtask sub_81137E4, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 restorebg waitbgfadein end Move_SAND_ATTACK: - loadspritegfx 0x275A + loadspritegfx ANIM_TAG_074 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W028, SOUND_PAN_ATTACKER - createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 - call AnimScript_82D0337 - call AnimScript_82D0337 - call AnimScript_82D0337 - call AnimScript_82D0337 - call AnimScript_82D0337 - call AnimScript_82D0337 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end - -AnimScript_82D0337: - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 0, 0 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 10, 10 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -10, -10 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 20, 5 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -20, -5 - delay 0x2 +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 + delay 2 return Move_MUD_SLAP: - loadspritegfx 0x275A + loadspritegfx ANIM_TAG_074 playsewithpan SE_W028, SOUND_PAN_ATTACKER - createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 - waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - waitforvisualfinish - end - -AnimScript_82D03D5: - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 0, 0 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 10, 5 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -10, -5 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 20, 10 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -20, -10 - delay 0x2 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 + waitforvisualfinish + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 + 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 + delay 2 return Move_DRAGON_RAGE: - loadspritegfx 0x272D - loadspritegfx 0x2733 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_035 playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x82, 0, 15, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4 waitforvisualfinish - createsprite gUnknown_08596F80, 0x82, 30, 15, 0, 10, 10 + createsprite gUnknown_08596F80, 130, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, SOUND_PAN_TARGET, 0xB, 0x3 - createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 25, 1 - createsprite gUnknown_08596F28, 0xC2, 1, 5, 0 - delay 0x1 - createsprite gUnknown_08596F28, 0xC2, 1, -10, -15 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, 0, 25 - delay 0x1 - createsprite gUnknown_08596F28, 0xC2, 1, 15, 5 - delay 0x1 - createsprite gUnknown_08596F28, 0xC2, 1, -25, 0 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, 30, 30 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, -27, 25 - delay 0x1 - createsprite gUnknown_08596F28, 0xC2, 1, 0, 8 + 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 + delay 1 + createsprite gUnknown_08596F28, 194, 1, -10, -15 + delay 1 + createsprite gUnknown_08596F28, 130, 1, 0, 25 + delay 1 + createsprite gUnknown_08596F28, 194, 1, 15, 5 + delay 1 + createsprite gUnknown_08596F28, 194, 1, -25, 0 + delay 1 + createsprite gUnknown_08596F28, 130, 1, 30, 30 + delay 1 + createsprite gUnknown_08596F28, 130, 1, -27, 25 + delay 1 + createsprite gUnknown_08596F28, 194, 1, 0, 8 waitforvisualfinish - createsprite gUnknown_0857FE58, 0xC2, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 194, 0, 0, 4 waitforvisualfinish end Move_RAIN_DANCE: - loadspritegfx 0x2783 + loadspritegfx ANIM_TAG_115 playsewithpan SE_W240, SOUND_PAN_ATTACKER - createvisualtask sub_8116620, 0xA, 1921, 2, 0, 4, 0 + createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_8107188, 0x2, 0, 3, 120 - createvisualtask sub_8107188, 0x2, 0, 3, 120 - delay 0x78 - delay 0x1E + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 + delay 120 + delay 30 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1921, 2, 4, 0, 0 + createvisualtask sub_8116620, 10, 0x781, 2, 4, 0, RGB_BLACK waitforvisualfinish end Move_BITE: - loadspritegfx 0x279B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_139 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite gUnknown_08597080, 0x2, 0, -32, 0, 0, 819, 10 - createsprite gUnknown_08597080, 0x2, 0, 32, 4, 0, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 7, 1 + createsprite gUnknown_08597080, 2, 0, -32, 0, 0, 819, 10 + createsprite gUnknown_08597080, 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 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 + delay 1 end Move_CRUNCH: - loadspritegfx 0x279B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_139 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite gUnknown_08597080, 0x2, -32, -32, 1, 819, 819, 10 - createsprite gUnknown_08597080, 0x2, 32, 32, 5, -819, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 7, 5, 2 + createsprite gUnknown_08597080, 2, -32, -32, 1, 819, 819, 10 + createsprite gUnknown_08597080, 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 waitforvisualfinish playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite gUnknown_08597080, 0x2, 32, -32, 7, -819, 819, 10 - createsprite gUnknown_08597080, 0x2, -32, 32, 3, 819, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 8, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 8, 4, 2 + createsprite gUnknown_08597080, 2, 32, -32, 7, -819, 819, 10 + createsprite gUnknown_08597080, 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 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 + delay 1 restorebg waitbgfadein end Move_CLAMP: - loadspritegfx 0x27A1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_145 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 + createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, 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 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -5412,738 +5343,722 @@ Move_CLAMP: Move_ICE_BEAM: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - loadspritegfx 0x279D - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK - waitforvisualfinish - createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10 - createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20 - delay 0x1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, RGB(0, 20, 31) - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 25, 1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 - delay 0x1 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 - waitforvisualfinish - delay 0x14 - call AnimScript_82D7720 - createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, RGB(0, 20, 31) - waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK + setalpha 12, 8 + loadspritegfx ANIM_TAG_141 + createsprite gSimplePaletteBlendSpriteTemplate, 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 + 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 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + delay 1 + createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + waitforvisualfinish + delay 20 + call FreezeEffect1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, 5, 7, 0, RGB(0, 20, 31) + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -AnimScript_82D07C1: - createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 - delay 0x1 +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 + delay 1 return Move_WITHDRAW: playsewithpan SE_W029, SOUND_PAN_ATTACKER - createvisualtask sub_81036A0, 0x5 + createvisualtask sub_81036A0, 5 waitforvisualfinish end Move_AURORA_BEAM: - loadspritegfx 0x279C + loadspritegfx ANIM_TAG_140 fadetobg BG_AURORABEAM waitbgfadein playsewithpan SE_W062, SOUND_PAN_ATTACKER - setarg 0x7, 0x0 - createvisualtask sub_8107528, 0xA, 130 - call AnimScript_82D088B - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 17, 1 - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B - setarg 0x7, 0xFFFF - createsoundtask sub_8158C58, 183, -64, 63, 3, 6, 0, 10 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 40, 1 - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B + setarg 7, 0 + createvisualtask sub_8107528, 10, 130 + call AuroraBeam1 + 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_TARGET, 2, 0, 40, 1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 waitforvisualfinish restorebg waitbgfadein end - -AnimScript_82D088B: - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 +AuroraBeam1: + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 return Move_SOLAR_BEAM: - loadspritegfx 0x27A3 - choosetwoturnanim AnimScript_82D08E6, AnimScript_82D09E3 - -AnimScript_82D08E4: + loadspritegfx ANIM_TAG_147 + choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash +SolarBeamEnd: waitforvisualfinish end - -AnimScript_82D08E6: +SolarBeamSetUp: monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_8115A04, 0x2, 2, 1, 4, 0, 11, 12287 + setalpha 12, 8 + createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) playsewithpan SE_W025, SOUND_PAN_ATTACKER - call AnimScript_82D0910 + call SolarBeamSetUp1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - goto AnimScript_82D08E4 - -AnimScript_82D0910: - createsprite gUnknown_085921E0, 0x2, 40, 40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, -40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 0, 40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 0, -40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, -20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, 20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, -20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, 20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -20, 30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 20, -30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -20, -30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 20, 30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, 0, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, 0, 16 - delay 0x2 + goto SolarBeamEnd +SolarBeamSetUp1: + createsprite gUnknown_085921E0, 2, 40, 40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, -40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 0, 40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 0, -40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, -20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, 20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, -20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, 20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -20, 30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 20, -30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -20, -30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 20, 30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, 0, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, 0, 16 + delay 2 return - -AnimScript_82D09E3: - call AnimScript_82D7D1D - panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - createvisualtask sub_80FEA58, 0x5 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1 - delay 0x4 - createvisualtask sub_8116620, 0xA, 4, 1, 0, 10, 1017 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2 - delay 0x4 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 65, 1 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 3 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 4 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 5 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6 - delay 0x4 - call AnimScript_82D0AB5 - call AnimScript_82D0AB5 - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 1, 10, 0, 1017 - call AnimScript_82D7D57 - goto AnimScript_82D08E4 - -AnimScript_82D0AB5: - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 3 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 4 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 5 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6 - delay 0x4 +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 + delay 4 + createsprite gUnknown_085921F8, 131, 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 + delay 4 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + delay 4 + call SolarBeamUnleash1 + call SolarBeamUnleash1 + waitforvisualfinish + createvisualtask sub_8116620, 10, 4, 1, 10, 0, RGB(25, 31, 0) + call UnsetSolarbeamBg + goto SolarBeamEnd +SolarBeamUnleash1: + createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + delay 4 return Move_BLIZZARD: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - createvisualtask sub_8117754, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D0CB2 + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue BlizzardAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT - -AnimScript_82D0B43: +BlizzardContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - call AnimScript_82D0B7D - call AnimScript_82D0B7D + panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + call Blizzard1 + call Blizzard1 playsewithpan SE_W059B, SOUND_PAN_TARGET waitforvisualfinish - call AnimScript_82D77A4 + call FreezeEffect2 waitforvisualfinish - delay 0x14 + delay 20 restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein clearmonbg ANIM_DEF_PARTNER end - -AnimScript_82D0B7D: - createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, 0, 0, 0, 80, 0, 0, 1 - delay 0x3 - createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, -10, 0, -10, 80, 0, 0, 1 - delay 0x3 - createsprite gUnknown_08595B98, 0x28, 0, -5, 0, -5, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, 10, 0, 10, 80, 0, 0, 1 - delay 0x3 - createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1 - delay 0x3 - createsprite gUnknown_08595B98, 0x28, 0, -20, 0, -20, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, 15, 0, 15, 80, 0, 0, 1 - delay 0x3 - createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1 - delay 0x3 - createsprite gUnknown_08595B98, 0x28, 0, -25, 0, -25, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, 20, 0, 20, 80, 0, 0, 1 - delay 0x3 +Blizzard1: + createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595BB0, 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 + delay 3 + createsprite gUnknown_08595B98, 40, 0, -5, 0, -5, 72, 1 + createsprite gUnknown_08595BB0, 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 + delay 3 + createsprite gUnknown_08595B98, 40, 0, -20, 0, -20, 72, 1 + createsprite gUnknown_08595BB0, 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 + delay 3 + createsprite gUnknown_08595B98, 40, 0, -25, 0, -25, 72, 1 + createsprite gUnknown_08595BB0, 40, 0, 20, 0, 20, 80, 0, 0, 1 + delay 3 return - -AnimScript_82D0CB2: +BlizzardAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto AnimScript_82D0B43 + goto BlizzardContinue Move_POWDER_SNOW: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - call AnimScript_82D0D03 - call AnimScript_82D0D03 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + call PowderSnow1 + call PowderSnow1 playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish waitsound - call AnimScript_82D77A4 + call FreezeEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x14 - createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, RGB_BLACK - end - -AnimScript_82D0D03: - createsprite gUnknown_08595BC8, 0x28, 0, 0, 0, 0, 56, 4, 4, 1 - delay 0x3 - createsprite gUnknown_08595BC8, 0x28, 0, -10, 0, -10, 56, 4, 4, 1 - delay 0x3 - createsprite gUnknown_08595BC8, 0x28, 0, 10, 0, 10, 56, -4, 3, 1 - delay 0x3 - createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, -4, 5, 1 - delay 0x3 - createsprite gUnknown_08595BC8, 0x28, 0, 15, 0, 15, 56, 4, 4, 1 - delay 0x3 - createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, 4, 4, 1 - delay 0x3 - createsprite gUnknown_08595BC8, 0x28, 0, 20, 0, 20, 56, 4, 4, 1 - delay 0x3 + delay 20 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 3, 0, RGB_BLACK + end +PowderSnow1: + createsprite gUnknown_08595BC8, 40, 0, 0, 0, 0, 56, 4, 4, 1 + delay 3 + createsprite gUnknown_08595BC8, 40, 0, -10, 0, -10, 56, 4, 4, 1 + delay 3 + createsprite gUnknown_08595BC8, 40, 0, 10, 0, 10, 56, -4, 3, 1 + delay 3 + createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, -4, 5, 1 + delay 3 + createsprite gUnknown_08595BC8, 40, 0, 15, 0, 15, 56, 4, 4, 1 + delay 3 + createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, 4, 4, 1 + delay 3 + createsprite gUnknown_08595BC8, 40, 0, 20, 0, 20, 56, 4, 4, 1 + delay 3 return Move_HYDRO_PUMP: - loadspritegfx 0x27A5 - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1 - delay 0x6 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - createvisualtask sub_81076C8, 0x5, 100 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 37, 1 - call AnimScript_82D0E93 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E93 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E93 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E93 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E93 - delay 0x1 - delay 0x1 - call AnimScript_82D0E93 + setalpha 12, 8 + 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_TARGET, 3, 0, 37, 1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + delay 1 + delay 1 + call HydroPump2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82D0E52: - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16 - delay 0x1 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16 - delay 0x1 +HydroPump1: + createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + delay 1 + createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + delay 1 return - -AnimScript_82D0E93: - createsprite gUnknown_08597388, 0x4, 0, 15, 1, 1 - createsprite gUnknown_08597388, 0x4, 0, -15, 1, 1 +HydroPump2: + createsprite gUnknown_08597388, 4, 0, 15, 1, 1 + createsprite gUnknown_08597388, 4, 0, -15, 1, 1 return Move_SIGNAL_BEAM: - loadspritegfx 0x2818 - loadspritegfx 0x2819 - loadspritegfx 0x2759 - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 25, 1 - delay 0x6 - panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0x0 - createvisualtask sub_81076C8, 0x5, 100 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 25, 1 - createsprite gUnknown_0859728C, 0x2, 4, 8, 5, 31, 8, 961, 8 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - waitforvisualfinish - end - -AnimScript_82D0F79: - createsprite gUnknown_08595114, 0x83, 10, 10, 0, 16 - createsprite gUnknown_0859512C, 0x83, 10, 10, 0, -16 - delay 0x1 + loadspritegfx ANIM_TAG_264 + loadspritegfx ANIM_TAG_265 + loadspritegfx ANIM_TAG_DUCK + 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 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + 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 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + waitforvisualfinish + end +SignalBeam1: + createsprite gUnknown_08595114, 131, 10, 10, 0, 16 + createsprite gUnknown_0859512C, 131, 10, 10, 0, -16 + delay 1 return Move_ABSORB: - loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call AnimScript_82D1009 + delay 3 + call AbsorbEffect waitforvisualfinish - delay 0xF - call AnimScript_82D79DF + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D1009: +AbsorbEffect: playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_MEGA_DRAIN: - loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call AnimScript_82D1121 + delay 3 + call MegaDrainEffect waitforvisualfinish - delay 0xF - call AnimScript_82D79DF + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 8, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D1121: +MegaDrainEffect: playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_GIGA_DRAIN: - loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call AnimScript_82D12B1 + delay 3 + call GigaDrainEffect waitforvisualfinish - delay 0xF - call AnimScript_82D79DF + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 12, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D12B1: +GigaDrainEffect: playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 40, 39 + delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -32, 26 + delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -40, 26 + delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_LEECH_LIFE: - loadspritegfx 0x27B1 - loadspritegfx 0x27A3 - delay 0x1 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_161 + loadspritegfx ANIM_TAG_147 + delay 1 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - delay 0x1 - createsprite gUnknown_085969C8, 0x2, -20, 15, 12 + setalpha 12, 8 + delay 1 + createsprite gUnknown_085969C8, 2, -20, 15, 12 waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 playsewithpan SE_W071, SOUND_PAN_TARGET - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish - call AnimScript_82D1009 + call AbsorbEffect waitforvisualfinish - delay 0xF - call AnimScript_82D79DF + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SYNTHESIS: - loadspritegfx 0x2741 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 16, 19451 + loadspritegfx ANIM_TAG_SPARKLE + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18) playsewithpan SE_W025, SOUND_PAN_ATTACKER - call AnimScript_82D79B4 + call GrantingStarsEffect waitforvisualfinish - unloadspritegfx 0x2741 - delay 0x1 - loadspritegfx 0x272F - call AnimScript_82D79DF + unloadspritegfx ANIM_TAG_SPARKLE + delay 1 + loadspritegfx ANIM_TAG_BLUE_STAR + call HealingEffect waitforvisualfinish end Move_TOXIC: - loadspritegfx 0x27A7 - loadspritegfx 0x27A6 - call AnimScript_82D1515 - call AnimScript_82D1515 + loadspritegfx ANIM_TAG_TOXIC_BUBBLE + loadspritegfx ANIM_TAG_POISON_BUBBLE + call Toxic1 + call Toxic1 waitforvisualfinish - delay 0xF - call AnimScript_82D7A71 + delay 15 + call PoisonBubblesEffect waitforvisualfinish end - -AnimScript_82D1515: - createsprite gUnknown_08596134, 0x82, -24, 16, 1, 1 +Toxic1: + createsprite gUnknown_08596134, 130, -24, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0xF - createsprite gUnknown_08596134, 0x82, 8, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, 8, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0xF - createsprite gUnknown_08596134, 0x82, -8, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, -8, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0xF - createsprite gUnknown_08596134, 0x82, 24, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, 24, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0xF + delay 15 return Move_SLUDGE: - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 + createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 waitforvisualfinish - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 - createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, 31774 - call AnimScript_82D7A71 + 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 end Move_SLUDGE_BOMB: - loadspritegfx 0x27A6 - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - createvisualtask sub_80D52D0, 0x5, 1, 3, 0, 15, 1 - createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, 31774 - createsprite gUnknown_085961D8, 0x82, 42, 27, 20 - createsprite gUnknown_085961D8, 0x82, -27, 44, 20 - createsprite gUnknown_085961D8, 0x82, 39, -28, 20 - createsprite gUnknown_085961D8, 0x82, -42, -42, 20 + loadspritegfx ANIM_TAG_POISON_BUBBLE + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_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 playsewithpan SE_W091, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_085961D8, 0x82, 0, 40, 20 - createsprite gUnknown_085961D8, 0x82, -8, -44, 20 - createsprite gUnknown_085961D8, 0x82, -46, -28, 20 - createsprite gUnknown_085961D8, 0x82, 46, 9, 20 + 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 playsewithpan SE_W091, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_085961D8, 0x82, 42, 0, 20 - createsprite gUnknown_085961D8, 0x82, -43, -12, 20 - createsprite gUnknown_085961D8, 0x82, 16, -46, 20 - createsprite gUnknown_085961D8, 0x82, -16, 44, 20 + 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 playsewithpan SE_W091, SOUND_PAN_TARGET - delay 0x0 + delay 0 waitsound waitforvisualfinish - call AnimScript_82D7A71 + call PoisonBubblesEffect waitforvisualfinish end - -AnimScript_82D16BC: +SludgeBomb1: playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 - delay 0x3 + createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 + delay 3 return Move_ACID: - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 0, 0 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER - delay 0x5 - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 24, 0 + delay 5 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 24, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER - delay 0x5 - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, -24, 0 + delay 5 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, -24, 0 playsewithpan SE_W145C, SOUND_PAN_ATTACKER - delay 0xF - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 10, 1 - createvisualtask sub_80D52D0, 0x5, 3, 2, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 20, 2, 2, 0, 12, 31774 - createsprite gUnknown_0859620C, 0x82, 0, -22, 0, 15, 55 + delay 15 + 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) + createsprite gUnknown_0859620C, 130, 0, -22, 0, 15, 55 playsewithpan SE_W145, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_0859620C, 0x82, -26, -24, 0, 15, 55 + delay 10 + createsprite gUnknown_0859620C, 130, -26, -24, 0, 15, 55 playsewithpan SE_W145, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_0859620C, 0x82, 15, -27, 0, 15, 50 + delay 10 + createsprite gUnknown_0859620C, 130, 15, -27, 0, 15, 50 playsewithpan SE_W145, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_0859620C, 0x82, -15, -17, 0, 10, 45 + delay 10 + createsprite gUnknown_0859620C, 130, -15, -17, 0, 10, 45 playsewithpan SE_W145, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_0859620C, 0x82, 27, -22, 0, 15, 50 + delay 10 + createsprite gUnknown_0859620C, 130, 27, -22, 0, 15, 50 playsewithpan SE_W145, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_BONEMERANG: - loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_ATTACKER - createsprite gUnknown_08597178, 0x2 - delay 0x14 + createsprite gUnknown_08597178, 2 + delay 20 playsewithpan SE_W030, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 5, 1 - delay 0x11 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1 + delay 17 playsewithpan SE_W233, SOUND_PAN_ATTACKER - createsprite gUnknown_0857FE28, 0x2, 6, -4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_BONE_CLUB: - loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET - createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15 - delay 0xC - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 - createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0, 10, 0, 0 + createsprite gUnknown_08597190, 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 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6151,15 +6066,15 @@ Move_BONE_CLUB: end Move_BONE_RUSH: - loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET - createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15 - delay 0xC - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 5, 1 + createsprite gUnknown_08597190, 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 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6167,79 +6082,77 @@ Move_BONE_RUSH: end Move_SPIKES: - loadspritegfx 0x27A8 + loadspritegfx ANIM_TAG_152 monbg ANIM_DEF_PARTNER playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, 0, 24, 30 - delay 0xA + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gUnknown_085CE11C, 130, 20, 0, 0, 24, 30 + delay 10 playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, -24, 24, 30 - delay 0xA - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, 24, 24, 30 + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gUnknown_085CE11C, 130, 20, 0, -24, 24, 30 + delay 10 + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gUnknown_085CE11C, 130, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_MEGAHORN: - loadspritegfx 0x27A9 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_153 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER playsewithpan SE_W082, SOUND_PAN_ATTACKER - jumpifcontest AnimScript_82D19FA + jumpifcontest MegahornInContest fadetobg BG_DRILL waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 - -AnimScript_82D1947: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +MegahornContinue: waitbgfadein - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 - waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6 - delay 0x3 - createsprite gUnknown_08596974, 0x3, -42, 25, 0, 0, 6 - delay 0x4 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 + waitforvisualfinish + delay 10 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + delay 3 + createsprite gUnknown_08596974, 3, -42, 25, 0, 0, 6 + delay 4 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -16, 4, 1, 4 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, -4, 1, 12, 1 - createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0x7FFF, 10, 0, 0 - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein end - -AnimScript_82D19FA: +MegahornInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto AnimScript_82D1947 + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto MegahornContinue Move_GUST: - loadspritegfx 0x2719 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W016, SOUND_PAN_TARGET - createsprite gUnknown_08596270, 0x2, 0, -16 - createvisualtask sub_810DED8, 0x5, 1, 70 + createsprite gUnknown_08596270, 2, 0, -16 + createvisualtask sub_810DED8, 5, 1, 70 waitforvisualfinish - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 7, 1 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6247,97 +6160,96 @@ Move_GUST: end Move_WING_ATTACK: - loadspritegfx 0x2719 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 0x14, 0x2 - createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4 - createvisualtask sub_810DED8, 0x5, 1, 70 - createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20 - createsprite gUnknown_085962A4, 0x2, 25, 0, 0, 0, 20 - delay 0x18 - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 9 - delay 0x11 - createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1 - createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 0x5, 0x2 - waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 + 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 + delay 24 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + delay 17 + createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 + loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 + waitforvisualfinish + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_PECK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W030, SOUND_PAN_TARGET - createvisualtask sub_80D622C, 0x2, 3, -768, 1, 2 - createsprite gUnknown_085973E8, 0x83, -12, 0, 1, 3 + createvisualtask sub_80D622C, 2, 3, -768, 1, 2 + createsprite gUnknown_085973E8, 131, -12, 0, 1, 3 waitforvisualfinish end Move_AEROBLAST: - loadspritegfx 0x27AA - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_154 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - call AnimScript_82D7CE5 + call SetFlyingBg monbgprio_28 ANIM_TARGET - setalpha 0x80C - call AnimScript_82D1B82 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 50, 1 - call AnimScript_82D1B82 - call AnimScript_82D1B82 - call AnimScript_82D1B82 - call AnimScript_82D1B82 - waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 + setalpha 12, 8 + call Aeroblast1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 50, 1 + call Aeroblast1 + call Aeroblast1 + call Aeroblast1 + call Aeroblast1 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x0 - call AnimScript_82D7D15 + delay 0 + call UnsetFlyingBg end - -AnimScript_82D1B82: +Aeroblast1: playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 0, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 0, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 0, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 0, 0 + delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 1, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 1, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 1, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 1, 0 + delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 2, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 2, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 2, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 2, 0 + delay 3 playsewithpan SE_W026, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 3, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 3, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 3, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 3, 0 + delay 3 return Move_WATER_GUN: - loadspritegfx 0x27AB - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08595208, 0x2, 20, 0, 0, 0, 40, -25 + setalpha 12, 8 + createsprite gUnknown_08595208, 2, 20, 0, 0, 0, 40, -25 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 8, 1 - createsprite gUnknown_08597388, 0x4, 0, 0, 1, 2 - createsprite gUnknown_08595220, 0x2, 0, -15, 0, 15, 55 + 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 playsewithpan SE_W152, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_08595220, 0x2, 15, -20, 0, 15, 50 + delay 10 + createsprite gUnknown_08595220, 2, 15, -20, 0, 15, 50 playsewithpan SE_W152, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_08595220, 0x2, -15, -10, 0, 10, 45 + delay 10 + createsprite gUnknown_08595220, 2, -15, -10, 0, 10, 45 playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6345,237 +6257,235 @@ Move_WATER_GUN: end Move_CRABHAMMER: - loadspritegfx 0x279D - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08597388, 0x4, 0, 0, 1, 0 + setalpha 12, 8 + createsprite gUnknown_08597388, 4, 0, 0, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x1 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 32429, 10, 0, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4 - waitforvisualfinish - delay 0x8 - waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 1, 0, 4 - waitforvisualfinish - loopsewithpan SE_W152, SOUND_PAN_TARGET, 0x14, 0x3 - createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 8, 1 - createsprite gUnknown_08595238, 0x2, 10, 10, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 20, -20, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -15, 15, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 0, 0, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -10, -20, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 16, -8, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 5, 8, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -16, 0, 20, 1 + delay 1 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 + waitforvisualfinish + delay 8 + waitforvisualfinish + createsprite gSlideMonToOriginalPosSpriteTemplate, 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 + delay 4 + createsprite gUnknown_08595238, 2, 20, -20, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -15, 15, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 0, 0, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -10, -20, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 16, -8, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 5, 8, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -16, 0, 20, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SURF: - createvisualtask sub_8107954, 0x2, 0 - delay 0x18 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 + createvisualtask AnimTask_CreateSurfWave, 2, FALSE + delay 24 + panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 waitforvisualfinish end Move_FLAMETHROWER: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1 - delay 0x6 - createvisualtask sub_81076C8, 0x5, 100 - panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 + setalpha 12, 8 + 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_TARGET, 3, 0, 43, 1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D1E58: - createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16 - delay 0x2 - createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16 - delay 0x2 +Flamethrower1: + createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + delay 2 + createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + delay 2 return Move_SANDSTORM: - loadspritegfx 0x2815 + loadspritegfx ANIM_TAG_261 playsewithpan SE_W201, 0 - createvisualtask sub_8110BCC, 0x5, 0 - delay 0x10 - createsprite gUnknown_08596BA0, 0x28, 10, 2304, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 90, 2048, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 50, 2560, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 20, 2304, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 70, 1984, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 0, 2816, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 60, 2560, 96, 0 + createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE + delay 16 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 0 end Move_WHIRLPOOL: - loadspritegfx 0x27A5 + loadspritegfx ANIM_TAG_149 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x0 - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) + setalpha 12, 8 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1 - call AnimScript_82D1F5B - call AnimScript_82D1F5B - call AnimScript_82D1F5B - delay 0xC - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1 + call WhirlpoolEffect + call WhirlpoolEffect + call WhirlpoolEffect + delay 12 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82D1F5B: - createsprite gUnknown_08596B70, 0x82, 0, 28, 384, 50, 8, 50, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 32, 240, 40, 11, -46, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 33, 416, 40, 4, 42, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 31, 288, 45, 6, -42, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 28, 448, 45, 11, 46, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 33, 464, 50, 10, -50, 1 - delay 0x2 +WhirlpoolEffect: + createsprite gUnknown_08596B70, 130, 0, 28, 384, 50, 8, 50, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 32, 240, 40, 11, -46, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 33, 416, 40, 4, 42, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 31, 288, 45, 6, -42, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 28, 448, 45, 11, 46, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 33, 464, 50, 10, -50, 1 + delay 2 return Move_FLY: - loadspritegfx 0x27AC - loadspritegfx 0x2797 - choosetwoturnanim AnimScript_82D1FF7, AnimScript_82D200F - -AnimScript_82D1FF5: + loadspritegfx ANIM_TAG_156 + loadspritegfx ANIM_TAG_135 + choosetwoturnanim FlySetUp, FlyUnleash +FlyEnd: waitforvisualfinish end -AnimScript_82D1FF7: +FlySetUp: playsewithpan SE_W019, SOUND_PAN_ATTACKER - createsprite gUnknown_08596340, 0x2, 0, 0, 13, 336 - goto AnimScript_82D1FF5 + createsprite gUnknown_08596340, 2, 0, 0, 13, 336 + goto FlyEnd -AnimScript_82D200F: +FlyUnleash: monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER - createsprite gUnknown_08596358, 0x2, 20 - delay 0x14 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 + createsprite gUnknown_08596358, 2, 20 + delay 20 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82D1FF5 + goto FlyEnd Move_BOUNCE: - loadspritegfx 0x27AC - loadspritegfx 0x2797 - choosetwoturnanim AnimScript_82D2060, AnimScript_82D2074 - -AnimScript_82D205F: + loadspritegfx ANIM_TAG_156 + loadspritegfx ANIM_TAG_135 + choosetwoturnanim BounceSetUp, BounceUnleash +BounceEnd: end -AnimScript_82D2060: +BounceSetUp: playsewithpan SE_W100, SOUND_PAN_ATTACKER - createsprite gUnknown_08596420, 0x2, 0, 0 - goto AnimScript_82D205F + createsprite gUnknown_08596420, 2, 0, 0 + goto BounceEnd -AnimScript_82D2074: +BounceUnleash: monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_0859644C, 0x83 - delay 0x7 + createsprite gUnknown_0859644C, 131 + delay 7 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 11, 1 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82D205F + goto BounceEnd Move_KARATE_CHOP: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET - createsprite gUnknown_08595E68, 0x2, -16, 0, 0, 0, 10, 1, 3, 0 + createsprite gUnknown_08595E68, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_CROSS_CHOP: - loadspritegfx 0x279F - loadspritegfx 0x282D + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_285 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET - createsprite gUnknown_08595EC8, 0x2, 0, 0, 0 - createsprite gUnknown_08595EC8, 0x2, 0, 0, 1 - delay 0x28 + createsprite gUnknown_08595EC8, 2, 0, 0, 0 + createsprite gUnknown_08595EC8, 2, 0, 0, 1 + delay 40 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 10, 0, 10 - createsprite gUnknown_085973D0, 0x3, 0, 0, 1, 20 - createvisualtask sub_80D51AC, 0x5, 1, 7, 0, 9, 1 + 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 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_JUMP_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x3 - createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 3 + createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6583,38 +6493,38 @@ Move_JUMP_KICK: end Move_HI_JUMP_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_0857FE70, 0x2, 0, -24, 0, 0, 8 + setalpha 12, 8 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 3 - delay 0x2 - createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3 + delay 2 + createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 11, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08595EB0, 0x3, 1, 20, 1 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + setalpha 12, 8 + createsprite gUnknown_08595EB0, 3, 1, 20, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6622,329 +6532,328 @@ Move_DOUBLE_KICK: end Move_TRIPLE_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET - jumpifmoveturn 0x0, AnimScript_82D22B8 - jumpifmoveturn 0x1, AnimScript_82D22EE - goto AnimScript_82D2324 - -AnimScript_82D22B3: + jumpifmoveturn 0, TripleKickLeft + jumpifmoveturn 1, TripleKickRight + goto TripleKickCenter +TripleKickContinue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D22B8: - createsprite gUnknown_08595E98, 0x84, -16, -8, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, -16, -16, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - goto AnimScript_82D22B3 +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 + goto TripleKickContinue -AnimScript_82D22EE: - createsprite gUnknown_08595E98, 0x84, 8, 8, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, 8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - goto AnimScript_82D22B3 +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 + goto TripleKickContinue -AnimScript_82D2324: - createsprite gUnknown_08595E98, 0x84, 0, 0, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, 0, -8, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - goto AnimScript_82D22B3 +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 + goto TripleKickContinue Move_DYNAMIC_PUNCH: - loadspritegfx 0x279F - loadspritegfx 0x2797 - loadspritegfx 0x27D6 - loadspritegfx 0x2717 - delay 0x1 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_007 + delay 1 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08595E98, 0x83, 0, 0, 20, 1, 0 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1 - delay 0x1 + 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 + delay 1 waitsound playsewithpan SE_W120, SOUND_PAN_TARGET - createvisualtask sub_80D52D0, 0x5, 1, 5, 0, 28, 1 - createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1 - delay 0x6 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_COUNTER: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W233, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x4 - createsprite gUnknown_08597358, 0x2, -15, 18, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 25, 1 - createsprite gUnknown_08595E98, 0x3, -15, 18, 8, 1, 0 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 0, -4, 1, 0 + delay 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1 + createsprite gFistFootSpriteTemplate, 3, -15, 18, 8, 1, 0 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, -4, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x1 - createsprite gUnknown_08595E98, 0x3, 0, -4, 8, 1, 0 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 15, 9, 1, 0 + delay 1 + createsprite gFistFootSpriteTemplate, 3, 0, -4, 8, 1, 0 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x1 - createsprite gUnknown_08595E98, 0x3, 15, 9, 8, 1, 0 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 + delay 1 + createsprite gFistFootSpriteTemplate, 3, 15, 9, 8, 1, 0 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_VITAL_THROW: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233, SOUND_PAN_ATTACKER - createvisualtask sub_80D5830, 0x2, 0, 12, 4, 1, 2 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x2 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 waitforvisualfinish - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 - delay 0xB - createsprite gUnknown_0857FE58, 0x2, 1, 0, 10 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + delay 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 10 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_ROCK_SMASH: - loadspritegfx 0x274A - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x2, 0, 0, 8, 1, 0 + setalpha 12, 8 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 2, 0, 0, 8, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish playsewithpan SE_W088, SOUND_PAN_TARGET - createsprite gUnknown_08596B1C, 0x2, 0, 0, 20, 24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 0x2, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, -5, 0, -20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, 0, -5, 30, 18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, 30, -18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, -30, 18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, -30, -18, 8, 2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 7, 1 + 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 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SUBMISSION: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0xA - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 0x14 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x1E - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 0x28 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x32 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 0x3C - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x46 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 0x50 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80 waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x5A - createvisualtask sub_80D5738, 0x2, 0, -18, 6, 6, 4 - createvisualtask sub_80D5738, 0x2, 1, 18, 6, 6, 4 - call AnimScript_82D26D3 - call AnimScript_82D26D3 - call AnimScript_82D26D3 + createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4 + call Submission1 + call Submission1 + call Submission1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D26D3: - createsprite gUnknown_08597358, 0x3, 0, -12, 1, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x3, -12, 8, 1, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x3, 12, 0, 1, 1 - delay 0x8 +Submission1: + createsprite gBasicHitSplatSpriteTemplate, 3, 0, -12, 1, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 3, -12, 8, 1, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 3, 12, 0, 1, 1 + delay 8 return Move_SUNNY_DAY: - loadspritegfx 0x27AD + loadspritegfx ANIM_TAG_157 monbg ANIM_ATK_PARTNER - setalpha 0x30D - createvisualtask sub_8116620, 0xA, 1921, 1, 0, 6, 0x7FFF + setalpha 13, 3 + createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish - panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0x0 - call AnimScript_82D2753 - call AnimScript_82D2753 - call AnimScript_82D2753 - call AnimScript_82D2753 + panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 + call SunnyDay1 + call SunnyDay1 + call SunnyDay1 + call SunnyDay1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1921, 1, 6, 0, 0x7FFF + createvisualtask sub_8116620, 10, 0x781, 1, 6, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -AnimScript_82D2753: - createsprite gUnknown_085954A0, 0x28 - delay 0x6 +SunnyDay1: + createsprite gUnknown_085954A0, 40 + delay 6 return Move_COTTON_SPORE: - loadspritegfx 0x27AE + loadspritegfx ANIM_TAG_158 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W077, SOUND_PAN_TARGET, 0x12, 0xA - call AnimScript_82D277D - call AnimScript_82D277D - call AnimScript_82D277D + loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 + call CottonSpore1 + call CottonSpore1 + call CottonSpore1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82D277D: - createsprite gUnknown_085922EC, 0x2, 0, -20, 85, 80, 0 - delay 0xC - createsprite gUnknown_085922EC, 0x2, 0, -10, 170, 80, 0 - delay 0xC - createsprite gUnknown_085922EC, 0x2, 0, -15, 0, 80, 0 - delay 0xC +CottonSpore1: + createsprite gUnknown_085922EC, 2, 0, -20, 85, 80, 0 + delay 12 + createsprite gUnknown_085922EC, 2, 0, -10, 170, 80, 0 + delay 12 + createsprite gUnknown_085922EC, 2, 0, -15, 0, 80, 0 + delay 12 return Move_SPORE: - loadspritegfx 0x27AE + loadspritegfx ANIM_TAG_158 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80FEE1C, 0x2 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 0x10, 0xB - call AnimScript_82D27E2 - call AnimScript_82D27E2 - call AnimScript_82D27E2 - waitforvisualfinish - delay 0x1 + setalpha 12, 8 + createvisualtask sub_80FEE1C, 2 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 + call Spore1 + call Spore1 + call Spore1 + waitforvisualfinish + delay 1 clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D27E2: - createsprite gUnknown_085922EC, 0x82, 0, -20, 85, 80, 1 - delay 0xC - createsprite gUnknown_085922EC, 0x82, 0, -10, 170, 80, 1 - delay 0xC - createsprite gUnknown_085922EC, 0x82, 0, -15, 0, 80, 1 - delay 0xC +Spore1: + createsprite gUnknown_085922EC, 130, 0, -20, 85, 80, 1 + delay 12 + createsprite gUnknown_085922EC, 130, 0, -10, 170, 80, 1 + delay 12 + createsprite gUnknown_085922EC, 130, 0, -15, 0, 80, 1 + delay 12 return Move_PETAL_DANCE: - loadspritegfx 0x27AF - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_159 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W080, SOUND_PAN_ATTACKER - createvisualtask sub_80D5830, 0x2, 0, 12, 6, 6, 3 - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 16, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -16, -24, 8, 100 - delay 0xF - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 32, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -32, -24, 8, 100 - delay 0xF - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 24, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -24, -24, 8, 100 - delay 0x1E - createsprite gUnknown_08592334, 0x2, 16, -24, 0, 100 - createsprite gUnknown_08592334, 0x2, -16, -24, 0, 100 - delay 0x1E - createsprite gUnknown_08592334, 0x2, 20, -16, 14, 80 - createsprite gUnknown_08592334, 0x2, -20, -14, 16, 80 - waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 5 - delay 0x3 + 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 + 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 + 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 + delay 30 + createsprite gUnknown_08592334, 2, 16, -24, 0, 100 + createsprite gUnknown_08592334, 2, -16, -24, 0, 100 + delay 30 + createsprite gUnknown_08592334, 2, 20, -16, 14, 80 + createsprite gUnknown_08592334, 2, -20, -14, 16, 80 + waitforvisualfinish + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5 + delay 3 playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 6, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish - delay 0x8 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + delay 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_RAZOR_LEAF: - loadspritegfx 0x274F - loadspritegfx 0x27B0 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_160 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 0xA, 0x5 - createsprite gUnknown_08592390, 0x2, -3, -2, 10 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -1, 15 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -4, -4, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 3, -3, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -6, 8 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -1, 12 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -4, 13 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 4, -5, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -6, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -5, 8 - delay 0x3C + setalpha 12, 8 + delay 1 + loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + createsprite gUnknown_08592390, 2, -3, -2, 10 + delay 2 + createsprite gUnknown_08592390, 2, -1, -1, 15 + delay 2 + createsprite gUnknown_08592390, 2, -4, -4, 7 + delay 2 + createsprite gUnknown_08592390, 2, 3, -3, 11 + delay 2 + createsprite gUnknown_08592390, 2, -1, -6, 8 + delay 2 + createsprite gUnknown_08592390, 2, 2, -1, 12 + delay 2 + createsprite gUnknown_08592390, 2, -3, -4, 13 + delay 2 + createsprite gUnknown_08592390, 2, 4, -5, 7 + delay 2 + createsprite gUnknown_08592390, 2, 2, -6, 11 + delay 2 + createsprite gUnknown_08592390, 2, -3, -5, 8 + delay 60 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, 20, 1 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, -20, 1 - delay 0x14 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, 20, 1 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, -20, 1 + delay 20 playsewithpan SE_W013, SOUND_PAN_TARGET - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - createvisualtask sub_80D52D0, 0x2, 3, 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_DEF_PARTNER blendoff @@ -6952,116 +6861,116 @@ Move_RAZOR_LEAF: Move_NATURE_POWER: Move_ANCIENT_POWER: - loadspritegfx 0x274A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_085972D8, 0x2, 4, 1, 10, 1 - createsprite gUnknown_08596C10, 0x2, 20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 0x2, 0, 32, -38, 25, 5 - createsprite gUnknown_08596C10, 0x2, 32, 32, -28, 40, 3 - createsprite gUnknown_08596C10, 0x2, -20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 0x2, 20, 32, -28, 60, 1 - createsprite gUnknown_08596C10, 0x2, 0, 32, -28, 30, 4 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 30, 1 + 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 playsewithpan SE_W082, SOUND_PAN_ATTACKER - delay 0xA - createsprite gUnknown_08596C10, 0x2, 15, 32, -48, 25, 5 - createsprite gUnknown_08596C10, 0x2, -10, 32, -42, 30, 4 - delay 0xA - createsprite gUnknown_08596C10, 0x2, 0, 32, -42, 25, 5 - createsprite gUnknown_08596C10, 0x2, -25, 32, -48, 30, 4 - waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 16, 0, 0, 4 - delay 0x3 + delay 10 + createsprite gUnknown_08596C10, 2, 15, 32, -48, 25, 5 + createsprite gUnknown_08596C10, 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 + waitforvisualfinish + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4 + delay 3 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_OCTAZOOKA: - loadspritegfx 0x272E - loadspritegfx 0x2721 + loadspritegfx ANIM_TAG_GRAY_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W025B, SOUND_PAN_ATTACKER - createsprite gUnknown_08592DFC, 0x82, 20, 0, 0, 0, 20, 0 + createsprite gUnknown_08592DFC, 130, 20, 0, 0, 0, 20, 0 waitforvisualfinish playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_08592E30, 0x82, 8, 8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, -8, -8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, 8, -8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, -8, 8, 1, 0 + createsprite gUnknown_08592E30, 130, 8, 8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, -8, -8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, 8, -8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, -8, 8, 1, 0 waitforvisualfinish end Move_MIST: - loadspritegfx 0x27A0 + loadspritegfx ANIM_TAG_144 monbg ANIM_ATK_PARTNER - setalpha 0x80C - loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 0x14, 0xF - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - delay 0x20 - createvisualtask sub_8115A04, 0x2, 10, 8, 2, 0, 14, 0x7FFF + setalpha 12, 8 + loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + delay 32 + createvisualtask sub_8115A04, 2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -AnimScript_82D2C34: - createsprite gUnknown_08595C2C, 0x2, 0, -24, 48, 240, 0, 1 - delay 0x7 +Mist1: + createsprite gUnknown_08595C2C, 2, 0, -24, 48, 240, 0, 1 + delay 7 return Move_HAZE: waitforvisualfinish playsewithpan SE_W114, 0 - createvisualtask sub_810C0A0, 0x5 - delay 0x1E - createvisualtask sub_8116620, 0xA, 1920, 2, 0, 16, 0 + createvisualtask sub_810C0A0, 5 + delay 30 + createvisualtask sub_8116620, 10, 0x780, 2, 0, 16, RGB_BLACK delay 0x5A - createvisualtask sub_8116620, 0xA, 1920, 1, 16, 0, 0 + createvisualtask sub_8116620, 10, 0x780, 1, 16, 0, RGB_BLACK end Move_FIRE_PUNCH: - loadspritegfx 0x279F - loadspritegfx 0x272D - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 31 + 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 playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08595E98, 0x83, 0, 0, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 - call AnimScript_82D2D18 - delay 0x4 + 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 + call FireMoveEffect + delay 4 playsewithpan SE_W007, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 9, 0, 31 + createvisualtask sub_8116620, 10, 4, 0, 9, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D2D18: +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 @@ -7072,324 +6981,319 @@ AnimScript_82D2D18: return Move_LEER: - loadspritegfx 0x272B + loadspritegfx ANIM_TAG_GLARE monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W043, SOUND_PAN_ATTACKER - createsprite gUnknown_085CE150, 0x2, 24, -12 - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 + createsprite gUnknown_085CE150, 2, 24, -12 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 waitforvisualfinish - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1 + delay 10 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - delay 0x1 + delay 1 waitforvisualfinish end Move_DREAM_EATER: - loadspritegfx 0x27A3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W060, SOUND_PAN_ATTACKER - call AnimScript_82D7CD1 - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W107, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish - setalpha 0x80C - createvisualtask sub_80D51AC, 0x2, 1, 0, 2, 25, 1 - call AnimScript_82D2E51 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 2, 25, 1 + call DreamEaterEffect waitforvisualfinish - delay 0xF - call AnimScript_82D79DF + delay 15 + call HealingEffect waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call AnimScript_82D7CDD + delay 1 + call UnsetPsychicBackground end - -AnimScript_82D2E51: +DreamEaterEffect: playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 40, 39 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -32, 26 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -40, 26 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_POISON_GAS: - loadspritegfx 0x27BC - loadspritegfx 0x27A6 - delay 0x0 + loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_POISON_BUBBLE + delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 - setalpha 0x80C - delay 0x0 + setalpha 12, 8 + delay 0 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + delay 4 playsewithpan SE_W054, SOUND_PAN_ATTACKER - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x28 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 0x1C, 0x6 - createvisualtask sub_8115A04, 0x2, 4, 6, 2, 0, 12, 26650 + createsprite gUnknown_08595C9C, 128, 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 - delay 0x0 + delay 0 end Move_BIND: - createvisualtask sub_80D5EB8, 0x5, 0, 6, 3328, 4, 0 - goto AnimScript_82D30DE + createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_ATTACKER + goto BindWrap -AnimScript_82D30DE: +BindWrap: playsewithpan SE_W020, SOUND_PAN_TARGET - call AnimScript_82D30EE - call AnimScript_82D30EE + call BindWrap1 + call BindWrap1 waitforvisualfinish end - -AnimScript_82D30EE: - createvisualtask sub_80D6064, 0x5, 10, -5, 5, 1, 0 - delay 0x10 +BindWrap1: + createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_TARGET, 0 + delay 16 return Move_WRAP: - createvisualtask sub_80D5830, 0x2, 0, 6, 4, 2, 4 - goto AnimScript_82D30DE + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 6, 4, 2, 4 + goto BindWrap Move_PSYBEAM: - loadspritegfx 0x27B3 + loadspritegfx ANIM_TAG_163 playsewithpan SE_W060, SOUND_PAN_ATTACKER - call AnimScript_82D7CD1 - createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15 - call AnimScript_82D319C - call AnimScript_82D319C - createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 4, 1 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 32351 - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - waitforvisualfinish - delay 0x1 - call AnimScript_82D7CDD - end - -AnimScript_82D319C: - createsprite gUnknown_0859663C, 0x82, 16, 0, 0, 0, 13, 0 - delay 0x4 + call SetPsychicBackground + 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 sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31) + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + waitforvisualfinish + delay 1 + call UnsetPsychicBackground + end +Psybeam1: + createsprite gUnknown_0859663C, 130, 16, 0, 0, 0, 13, 0 + delay 4 return Move_HYPNOSIS: - loadspritegfx 0x27B3 - call AnimScript_82D7CD1 - call AnimScript_82D31E5 - call AnimScript_82D31E5 - call AnimScript_82D31E5 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 32351 + loadspritegfx ANIM_TAG_163 + call SetPsychicBackground + call Hypnosis1 + call Hypnosis1 + call Hypnosis1 + createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31) waitforvisualfinish - delay 0x1 - call AnimScript_82D7CDD + delay 1 + call UnsetPsychicBackground end - -AnimScript_82D31E5: +Hypnosis1: playsewithpan SE_W048, SOUND_PAN_ATTACKER - createsprite gUnknown_0859663C, 0x82, 0, 8, 0, 8, 27, 0 - createsprite gUnknown_0859663C, 0x82, 16, -8, 0, -8, 27, 0 - delay 0x6 + createsprite gUnknown_0859663C, 130, 0, 8, 0, 8, 27, 0 + createsprite gUnknown_0859663C, 130, 16, -8, 0, -8, 27, 0 + delay 6 return Move_PSYWAVE: - loadspritegfx 0x27B5 + loadspritegfx ANIM_TAG_165 playsewithpan SE_W060, SOUND_PAN_ATTACKER - call AnimScript_82D7CD1 - createvisualtask sub_81076C8, 0x5, 100 - createsoundtask sub_8158C58, 203, -64, 63, 2, 9, 0, 10 - call AnimScript_82D3275 - call AnimScript_82D3275 - createvisualtask sub_8115A04, 0x2, 4, 1, 4, 0, 12, 32351 - call AnimScript_82D3275 - call AnimScript_82D3275 - call AnimScript_82D3275 - call AnimScript_82D3275 - waitforvisualfinish - delay 0x1 - call AnimScript_82D7CDD - end - -AnimScript_82D3275: - createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16 - delay 0x4 - createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16 - delay 0x4 + call SetPsychicBackground + createvisualtask sub_81076C8, 5, 100 + createsoundtask sub_8158C58, 203, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10 + call Psywave1 + call Psywave1 + createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31) + call Psywave1 + call Psywave1 + call Psywave1 + call Psywave1 + waitforvisualfinish + delay 1 + call UnsetPsychicBackground + end +Psywave1: + createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + delay 4 + createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + delay 4 return Move_ZAP_CANNON: - loadspritegfx 0x27BB - loadspritegfx 0x271B + loadspritegfx ANIM_TAG_171 + loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, SOUND_PAN_ATTACKER - createsprite gUnknown_08595764, 0x83, 10, 0, 0, 0, 30, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 0, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 64, 40, 1 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 128, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 192, 40, 2 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 32, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 96, 40, 1 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 160, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 224, 40, 2 + 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 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - delay 0xF - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 0x13 - call AnimScript_82D7BEA + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + delay 15 + waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + call ElectricityEffect waitforvisualfinish end Move_STEEL_WING: - loadspritegfx 0x2719 - loadspritegfx 0x2797 - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_135 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 0x14, 0x2 - createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4 - createvisualtask sub_810DED8, 0x5, 1, 70 - createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20 - createsprite gUnknown_085962A4, 0x2, 25, 0, 0, 0, 20 - delay 0x18 - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 9 - delay 0x11 - createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1 - createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1 + 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 + delay 24 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + delay 17 + createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_IRON_TAIL: - loadspritegfx 0x2797 - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 1, 0, 0 + loadspritegfx ANIM_TAG_135 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 clearmonbg ANIM_TARGET blendoff waitforvisualfinish end Move_POISON_TAIL: - loadspritegfx 0x2797 - loadspritegfx 0x27A6 - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 1, 1, RGB(24, 6, 23) + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_POISON_BUBBLE + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 clearmonbg ANIM_TARGET blendoff - call AnimScript_82D7A71 + call PoisonBubblesEffect waitforvisualfinish end Move_METAL_CLAW: - loadspritegfx 0x2737 - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loadspritegfx ANIM_TAG_CLAW_SLASH + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x2 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 2 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - delay 0x8 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x2 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + delay 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 2 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 waitforvisualfinish end @@ -7399,1265 +7303,1241 @@ Move_NIGHT_SHADE: playsewithpan SE_W060, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein - delay 0xA + delay 10 playsewithpan SE_W043, SOUND_PAN_ATTACKER - createvisualtask sub_811188C, 0x5, 85 - delay 0x46 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 12, 1 - createvisualtask sub_8115A04, 0x2, 4, 0, 2, 0, 13, 0 + createvisualtask sub_811188C, 5, 85 + delay 70 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 + createvisualtask sub_8115A04, 2, 4, 0, 2, 0, 13, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 restorebg waitbgfadein end Move_EGG_BOMB: - loadspritegfx 0x27D6 - loadspritegfx 0x27BF + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_175 playsewithpan SE_W039, SOUND_PAN_ATTACKER - createsprite gUnknown_08593488, 0x82, 10, 0, 0, 0, 25, -32 + createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 16, 1 - createsprite gUnknown_0859371C, 0x84, 6, 5, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 6, 5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET - delay 0x3 - createsprite gUnknown_0859371C, 0x84, -16, -15, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, -16, -15, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET - delay 0x3 - createsprite gUnknown_0859371C, 0x84, 16, -5, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 16, -5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET - delay 0x3 - createsprite gUnknown_0859371C, 0x84, -12, 18, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, -12, 18, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET - delay 0x3 - createsprite gUnknown_0859371C, 0x84, 0, 5, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 0, 5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET - delay 0x3 + delay 3 waitforvisualfinish end Move_SHADOW_BALL: - loadspritegfx 0x27C0 + loadspritegfx ANIM_TAG_176 fadetobg BG_GHOST waitbgfadein - delay 0xF - createsoundtask sub_8158C58, 168, -64, 63, 5, 5, 0, 5 - createsprite gUnknown_08596D58, 0x82, 16, 16, 8 + delay 15 + createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5 + createsprite gUnknown_08596D58, 130, 16, 16, 8 waitforvisualfinish playsewithpan SE_W028, SOUND_PAN_TARGET - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg waitbgfadein end Move_LICK: - loadspritegfx 0x27C1 - delay 0xF + loadspritegfx ANIM_TAG_177 + delay 15 playsewithpan SE_W122, SOUND_PAN_TARGET - createsprite gUnknown_08596D8C, 0x82, 0, 0 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 16, 1 + createsprite gUnknown_08596D8C, 130, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 waitforvisualfinish end Move_FOCUS_ENERGY: - loadspritegfx 0x27C8 + loadspritegfx ANIM_TAG_184 playsewithpan SE_W082, SOUND_PAN_ATTACKER - call AnimScript_82CD6C7 - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 0x7FFF - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call AnimScript_82CD6C7 - delay 0x8 - call AnimScript_82CD6C7 + 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 + call EndureEffect + delay 8 + call EndureEffect waitforvisualfinish end Move_BIDE: - choosetwoturnanim AnimScript_82D3719, AnimScript_82D3745 + choosetwoturnanim BideSetUp, BideUnleash end - -AnimScript_82D3719: - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 0x9, 0x2 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 +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 waitforvisualfinish end -AnimScript_82D3745: - loadspritegfx 0x2797 +BideUnleash: + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 0x9, 0x2 - createvisualtask sub_8116620, 0xA, 2, 2, 0, 11, 31 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 + 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 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 12, 1 - createvisualtask sub_80D52D0, 0x2, 1, 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 - createsprite gUnknown_08597358, 0x1, 18, -8, 1, 1 - delay 0x5 + createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1 + delay 5 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x1, -18, 8, 1, 1 - delay 0x5 + createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1 + delay 5 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x1, -8, -5, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 2, 11, 0, 31 + createvisualtask sub_8116620, 10, 2, 2, 11, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_STRING_SHOT: - loadspritegfx 0x27C3 - loadspritegfx 0x27C4 + loadspritegfx ANIM_TAG_179 + loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER - delay 0x0 - createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 - waitforvisualfinish - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 0x9, 0x6 - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK + waitforvisualfinish + loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_085969F8, 0x82, 0, 10 - delay 0x4 - createsprite gUnknown_085969F8, 0x82, 0, -2 - delay 0x4 - createsprite gUnknown_085969F8, 0x82, 0, 22 + createsprite gUnknown_085969F8, 130, 0, 10 + delay 4 + createsprite gUnknown_085969F8, 130, 0, -2 + delay 4 + createsprite gUnknown_085969F8, 130, 0, 22 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x1 + delay 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK end -AnimScript_82D38CC: - createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 1 - delay 0x1 +StringShot1: + createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 1 + delay 1 return Move_SPIDER_WEB: - loadspritegfx 0x27C5 - loadspritegfx 0x27C4 + loadspritegfx ANIM_TAG_SPIDER_WEB + loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER - delay 0x0 - createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish monbgprio_28 ANIM_TARGET - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 0x9, 0x6 - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D + loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_08596A2C, 0x2 + createsprite gUnknown_08596A2C, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x1 - createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK end -AnimScript_82D396D: - createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 0 - delay 0x1 +SpiderWeb1: + createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 0 + delay 1 return Move_RAZOR_WIND: - choosetwoturnanim AnimScript_82D398C, AnimScript_82D39DC - -AnimScript_82D398A: + choosetwoturnanim RazorWindSetUp, RazorWindUnleash +RazorWindContinue: waitforvisualfinish end -AnimScript_82D398C: - loadspritegfx 0x2719 +RazorWindSetUp: + loadspritegfx ANIM_TAG_GUST playsewithpan SE_W016, SOUND_PAN_ATTACKER - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 0, 7, 40 - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 85, 7, 40 - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 170, 7, 40 + 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 waitforvisualfinish playsewithpan SE_W016B, SOUND_PAN_ATTACKER - goto AnimScript_82D398A + goto RazorWindContinue -AnimScript_82D39DC: - loadspritegfx 0x27AA - loadspritegfx 0x2797 +RazorWindUnleash: + loadspritegfx ANIM_TAG_154 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 0x2, 14, 8, 0, 0, 22, 2, 1 - delay 0x2 + createsprite gUnknown_085962D4, 2, 14, 8, 0, 0, 22, 2, 1 + delay 2 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 0x2, 14, -8, 16, 14, 22, 1, 1 - delay 0x2 + createsprite gUnknown_085962D4, 2, 14, -8, 16, 14, 22, 1, 1 + delay 2 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085962D4, 0x2, 14, 12, -16, -14, 22, 0, 1 - delay 0x11 + createsprite gUnknown_085962D4, 2, 14, 12, -16, -14, 22, 0, 1 + delay 17 playsewithpan SE_W013, SOUND_PAN_TARGET - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 10, 1 - createvisualtask sub_80D52D0, 0x2, 3, 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_TARGET blendoff - goto AnimScript_82D398A + goto RazorWindContinue Move_DISABLE: - loadspritegfx 0x2757 + loadspritegfx ANIM_TAG_071 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W197, SOUND_PAN_ATTACKER - createsprite gUnknown_0853EE84, 0xD, 24, -16 + createsprite gUnknown_0853EE84, 13, 24, -16 waitforvisualfinish - createvisualtask sub_81045B0, 0x5 - loopsewithpan SE_W020, SOUND_PAN_TARGET, 0xF, 0x4 + createvisualtask sub_81045B0, 5 + loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_TARGET blendoff end Move_RECOVER: - loadspritegfx 0x27A3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER - setalpha 0x80C - loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 0xD, 0x3 - createvisualtask sub_8115A04, 0x2, 2, 0, 6, 0, 11, 12287 - call AnimScript_82D3AD5 - call AnimScript_82D3AD5 - call AnimScript_82D3AD5 + setalpha 12, 8 + loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 + createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) + call Recover1 + call Recover1 + call Recover1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 - call AnimScript_82D79DF - waitforvisualfinish - end - -AnimScript_82D3AD5: - createsprite gUnknown_085921E0, 0x2, 40, -10, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -35, -10, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 15, -40, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -10, -32, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 25, -20, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -40, -20, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 5, -40, 13 - delay 0x3 + delay 1 + call HealingEffect + waitforvisualfinish + end + +Recover1: + createsprite gUnknown_085921E0, 2, 40, -10, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -35, -10, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 15, -40, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -10, -32, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 25, -20, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -40, -20, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 5, -40, 13 + delay 3 return Move_MIMIC: - loadspritegfx 0x27A3 - setalpha 0x50B + loadspritegfx ANIM_TAG_147 + setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 - panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0x0 - createvisualtask sub_80FF458, 0x5, 128, 24 - delay 0xF - createsprite gUnknown_085924DC, 0x82, -12, 24 - delay 0xA - setarg 0x7, 0xFFFF + 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 + delay 10 + setarg 7, -1 waitforvisualfinish playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 11, 0x7FFF + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 ANIM_DEF_PARTNER blendoff end Move_CONSTRICT: - loadspritegfx 0x27CA - loopsewithpan SE_W010, SOUND_PAN_TARGET, 0x6, 0x4 - createsprite gUnknown_08592494, 0x84, 0, 16, 0, 2 - delay 0x7 - createsprite gUnknown_08592494, 0x83, 0, 0, 0, 2 - createsprite gUnknown_08592494, 0x82, 0, 8, 1, 2 - delay 0x7 - createsprite gUnknown_08592494, 0x83, 0, -8, 1, 2 - delay 0x8 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 - delay 0x14 + loadspritegfx ANIM_TAG_186 + loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 + createsprite gUnknown_08592494, 132, 0, 16, 0, 2 + delay 7 + createsprite gUnknown_08592494, 131, 0, 0, 0, 2 + createsprite gUnknown_08592494, 130, 0, 8, 1, 2 + delay 7 + createsprite gUnknown_08592494, 131, 0, -8, 1, 2 + delay 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + delay 20 playsewithpan SE_W020, SOUND_PAN_TARGET - setarg 0x7, 0xFFFF + setarg 7, -1 waitforvisualfinish end Move_CURSE: - choosetwoturnanim AnimScript_82D3BFB, AnimScript_82D3C78 - -AnimScript_82D3BFB: - loadspritegfx 0x27D7 - loadspritegfx 0x27D8 + choosetwoturnanim CurseGhost, CurseStats +CurseGhost: + loadspritegfx ANIM_TAG_NAIL + loadspritegfx ANIM_TAG_200 monbg ANIM_ATK_PARTNER - createvisualtask sub_8112758, 0x5 + createvisualtask sub_8112758, 5 waitforvisualfinish - delay 0x14 - createsprite gUnknown_08596DD0, 0x2 - delay 0x3C - call AnimScript_82D3C62 - delay 0x29 - call AnimScript_82D3C62 - delay 0x29 - call AnimScript_82D3C62 + delay 20 + createsprite gUnknown_08596DD0, 2 + delay 60 + call CurseGhost1 + delay 41 + call CurseGhost1 + delay 41 + call CurseGhost1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - delay 0x1 + delay 1 monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite gUnknown_08596DE8, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596DE8, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 16, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 16, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - -AnimScript_82D3C62: - createvisualtask sub_80D52D0, 0x2, 0, 4, 0, 10, 0 +CurseGhost1: + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0 playsewithpan SE_W020, SOUND_PAN_ATTACKER return - -AnimScript_82D3C78: - createvisualtask sub_80D5EB8, 0x5, 0, 10, 1536, 3, 0 +CurseStats: + createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER waitforvisualfinish - delay 0xA - call AnimScript_82D3C93 + delay 10 + call CurseStats1 waitforvisualfinish end - -AnimScript_82D3C93: +CurseStats1: playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask sub_8116B14, 0x5 - createvisualtask sub_8115A04, 0x5, 2, 4, 2, 0, 10, 31 + createvisualtask sub_8116B14, 5 + createvisualtask sub_8115A04, 5, 2, 4, 2, 0, 10, RGB_RED return Move_SOFT_BOILED: - loadspritegfx 0x27DA - loadspritegfx 0x27DB - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_BREAKING_EGG + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER playsewithpan SE_W039, SOUND_PAN_ATTACKER - createvisualtask sub_80D51AC, 0x2, 0, 0, 2, 6, 1 - createsprite gUnknown_085937B0, 0x4, 0, 16, 0 - createsprite gUnknown_085937B0, 0x4, 0, 16, 1 - delay 0x78 - delay 0x7 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 + createsprite gUnknown_085937B0, 4, 0, 16, 0 + createsprite gUnknown_085937B0, 4, 0, 16, 1 + delay 120 + delay 7 playsewithpan SE_W030, SOUND_PAN_ATTACKER - createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 - delay 0x8 - createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 - delay 0x3C - setarg 0x7, 0xFFFF + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + delay 8 + createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + delay 60 + setarg 7, -1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - call AnimScript_82D7A28 + call HealingEffect2 end Move_HEAL_BELL: - loadspritegfx 0x27DD - loadspritegfx 0x27DE - loadspritegfx 0x27DB - createvisualtask sub_8116620, 0xA, 10, 0, 0, 10, 0x7FFF - waitforvisualfinish - createvisualtask sub_8105CB4, 0x5 - createsprite gUnknown_08593938, 0x2, 0, -24, 0, 1 - delay 0xC - createsprite gUnknown_08593958, 0x28, 0, -24, 48, -18, 35, 0, 0 - createsprite gUnknown_08593958, 0x28, 0, -24, -48, 20, 30, 1, 1 - createsprite gUnknown_08593958, 0x28, 0, -24, -38, -29, 30, 2, 2 - createsprite gUnknown_08593958, 0x28, 0, -24, 36, 18, 30, 3, 3 - call AnimScript_82D3EF8 + loadspritegfx ANIM_TAG_BELL + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_203 + createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE + waitforvisualfinish + createvisualtask sub_8105CB4, 5 + createsprite gUnknown_08593938, 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 + call HealBell1 delay 0x21 - createsprite gUnknown_08593958, 0x28, 0, -24, 19, 26, 35, 4, 4 - createsprite gUnknown_08593958, 0x28, 0, -24, -34, -12, 30, 5, 5 - createsprite gUnknown_08593958, 0x28, 0, -24, 41, -20, 34, 6, 2 - createsprite gUnknown_08593958, 0x28, 0, -24, -15, 26, 32, 7, 0 - call AnimScript_82D3EF8 + 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 + call HealBell1 delay 0x21 - createsprite gUnknown_08593958, 0x28, 0, -24, -48, 18, 31, 0, 2 - createsprite gUnknown_08593958, 0x28, 0, -24, 48, -20, 30, 2, 5 - createsprite gUnknown_08593958, 0x28, 0, -24, 38, 29, 33, 4, 3 - createsprite gUnknown_08593958, 0x28, 0, -24, -36, -18, 30, 6, 1 - call AnimScript_82D3EF8 - waitforvisualfinish - createvisualtask sub_8105D60, 0x5 - waitforvisualfinish - unloadspritegfx 0x27DD - unloadspritegfx 0x27DE - unloadspritegfx 0x27DB - loadspritegfx 0x2741 + 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 + call HealBell1 + waitforvisualfinish + createvisualtask sub_8105D60, 5 + waitforvisualfinish + unloadspritegfx ANIM_TAG_BELL + unloadspritegfx ANIM_TAG_MUSIC_NOTES + unloadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_SPARKLE playsewithpan SE_W234, SOUND_PAN_ATTACKER - createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1 - delay 0x8 - createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + delay 8 + createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx 0x2741 - loadspritegfx 0x27DB + unloadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_203 playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createvisualtask sub_8116664, 0xA, 4, 3, 10, 0, 31500 - createvisualtask sub_8116620, 0xA, 10, 3, 10, 0, 0x7FFF - createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 - end - -AnimScript_82D3EF8: - createvisualtask sub_8116664, 0xA, 4, 3, 8, 0, 31500 - createvisualtask sub_8116620, 0xA, 10, 3, 2, 10, 0x7FFF - createsprite gUnknown_0859381C, 0x28, 0, -24, 0, 1 + 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 + 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 playsewithpan SE_W215, SOUND_PAN_ATTACKER return Move_FAKE_OUT: playsewithpan SE_W260, 0 - createvisualtask sub_8105EB0, 0x5 + createvisualtask sub_8105EB0, 5 waitforvisualfinish playsewithpan SE_W166, SOUND_PAN_TARGET - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - createvisualtask sub_8106020, 0x3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createvisualtask sub_8106020, 3 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE end Move_SCARY_FACE: - loadspritegfx 0x27EA - createsprite gUnknown_08597274, 0x2, 27, 3, 0, 16, 0 + loadspritegfx ANIM_TAG_218 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W043, SOUND_PAN_ATTACKER - createvisualtask sub_81064F8, 0x5 - delay 0xD - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 + createvisualtask sub_81064F8, 5 + delay 13 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 waitforvisualfinish - createvisualtask sub_810A094, 0x3, 20, 1, 0 + createvisualtask sub_810A094, 3, 20, 1, 0 playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_08597274, 0x2, 27, 3, 16, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 16, 0, RGB_BLACK waitforvisualfinish end Move_SWEET_KISS: - loadspritegfx 0x27E8 - loadspritegfx 0x27EC - createsprite gUnknown_08593AA8, 0x82, 16, -48 + loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_ANGEL + createsprite gUnknown_08593AA8, 130, 16, -48 playsewithpan SE_W215, SOUND_PAN_TARGET - delay 0x17 + delay 23 playsewithpan SE_W215, SOUND_PAN_TARGET - delay 0x17 + delay 23 playsewithpan SE_W215, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_085939B8, 0x83, 160, -30 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -30 playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gUnknown_085939B8, 0x83, -256, -42 - createsprite gUnknown_085939B8, 0x83, 128, -14 - createsprite gUnknown_085939B8, 0x83, 416, -38 - createsprite gUnknown_085939B8, 0x83, -128, -22 - createsprite gUnknown_085939B8, 0x83, -384, -31 + 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 end Move_LOVELY_KISS: - loadspritegfx 0x27EB - loadspritegfx 0x27ED - createsprite gUnknown_08593AF0, 0x82, 0, -24 + loadspritegfx ANIM_TAG_219 + loadspritegfx ANIM_TAG_EVIL_ANGEL + createsprite gUnknown_08593AF0, 130, 0, -24 playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gUnknown_08593AC0, 0x83, -256, -42 - createsprite gUnknown_08593AC0, 0x83, 128, -14 - createsprite gUnknown_08593AC0, 0x83, 416, -38 - createsprite gUnknown_08593AC0, 0x83, -128, -22 + createsprite gUnknown_08593AC0, 131, -256, -42 + createsprite gUnknown_08593AC0, 131, 128, -14 + createsprite gUnknown_08593AC0, 131, 416, -38 + createsprite gUnknown_08593AC0, 131, -128, -22 end Move_FURY_SWIPES: - loadspritegfx 0x27EE - createsprite gUnknown_0857FE28, 0x2, 5, 5 - delay 0x4 + loadspritegfx ANIM_TAG_222 + createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 + delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_08593B38, 0x82, 16, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 5, 1 - delay 0xA - createsprite gUnknown_0857FE28, 0x82, 5, 5 - delay 0x4 + createsprite gUnknown_08593B38, 130, 16, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5 + delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_08593B38, 0x82, -16, 0, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 + createsprite gUnknown_08593B38, 130, -16, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end Move_INGRAIN: - loadspritegfx 0x27EF - loadspritegfx 0x27A3 - createsprite gUnknown_0859254C, 0x2, 16, 26, -1, 2, 150 + loadspritegfx ANIM_TAG_223 + loadspritegfx ANIM_TAG_147 + createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, SOUND_PAN_ATTACKER - delay 0xA - createsprite gUnknown_0859254C, 0x2, -32, 20, 1, 1, 140 + delay 10 + createsprite gUnknown_0859254C, 2, -32, 20, 1, 1, 140 playsewithpan SE_W010, SOUND_PAN_ATTACKER - delay 0xA - createsprite gUnknown_0859254C, 0x2, 32, 22, 1, 0, 130 + delay 10 + createsprite gUnknown_0859254C, 2, 32, 22, 1, 0, 130 playsewithpan SE_W010, SOUND_PAN_ATTACKER - delay 0xA - createsprite gUnknown_0859254C, 0x2, -16, 25, -1, 3, 120 + delay 10 + createsprite gUnknown_0859254C, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, SOUND_PAN_ATTACKER - delay 0x28 - createsprite gUnknown_0859258C, 0x3, 32, 26, -1, 3, 30 - delay 0x5 + delay 40 + createsprite gUnknown_0859258C, 3, 32, 26, -1, 3, 30 + delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER - delay 0x5 - createsprite gUnknown_0859258C, 0x3, -48, 20, 1, 2, 30 + delay 5 + createsprite gUnknown_0859258C, 3, -48, 20, 1, 2, 30 playsewithpan SE_W145C, SOUND_PAN_ATTACKER - delay 0x5 + delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER - delay 0x5 - createsprite gUnknown_0859258C, 0x3, 48, 26, -2, 3, 18 + delay 5 + createsprite gUnknown_0859258C, 3, 48, 26, -2, 3, 18 playsewithpan SE_W145C, SOUND_PAN_ATTACKER - delay 0xA + delay 10 waitforvisualfinish end Move_PRESENT: - loadspritegfx 0x27F0 - createvisualtask sub_815A904, 0x2 - createsprite gUnknown_08592610, 0x82, 0, -5, 10, 2, -1 + loadspritegfx ANIM_TAG_ITEM_BAG + createvisualtask AnimTask_IsHealingMove, 2 + createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1 playsewithpan SE_W039, SOUND_PAN_ATTACKER - delay 0xE + delay 14 playsewithpan SE_W145B, SOUND_PAN_ATTACKER - delay 0xE + delay 14 playsewithpan SE_W145B, 0 - delay 0x14 + delay 20 playsewithpan SE_W145B, SOUND_PAN_TARGET waitforvisualfinish - jumpargeq 0x7, 0x0, AnimScript_82D41D4 - jumpargeq 0x7, 0x1, AnimScript_82D423F + jumpretfalse PresentDamage + jumprettrue PresentHeal end -AnimScript_82D41D4: - loadspritegfx 0x27D6 +PresentDamage: + loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x83, 0, 0, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x83, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x83, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x83, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x83, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 16, 16, 1, 1 end -AnimScript_82D423F: - loadspritegfx 0x27D3 - loadspritegfx 0x272F +PresentHeal: + loadspritegfx ANIM_TAG_GREEN_SPARKLE + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, SOUND_PAN_TARGET - createsprite gUnknown_08592658, 0x84, -16, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 16, 32, -3, -1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 32, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -32, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 0, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -8, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -8, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 24, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -24, 32, -3, 1 + createsprite gUnknown_08592658, 132, -16, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 16, 32, -3, -1 + delay 3 + createsprite gUnknown_08592658, 132, 32, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -32, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 0, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 24, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -24, 32, -3, 1 waitforvisualfinish waitsound - call AnimScript_82D7A28 + call HealingEffect2 end Move_BATON_PASS: - loadspritegfx 0x27F2 + loadspritegfx ANIM_TAG_226 playsewithpan SE_W226, SOUND_PAN_ATTACKER - createvisualtask sub_8115A04, 0x2, 31, 1, 2, 0, 11, 31455 - createsprite gUnknown_085CE370, 0x2 + createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) + createsprite gUnknown_085CE370, 2 end Move_PERISH_SONG: - loadspritegfx 0x27DE - createsprite gUnknown_08593C0C, 0x4, 0, 0, 0 - createsprite gUnknown_08593C0C, 0x4, 1, 1, 16 - createsprite gUnknown_08593C0C, 0x4, 2, 1, 32 - createsprite gUnknown_08593C0C, 0x4, 3, 2, 48 - createsprite gUnknown_08593C0C, 0x4, 4, 2, 64 - createsprite gUnknown_08593C0C, 0x4, 5, 0, 80 - createsprite gUnknown_08593C0C, 0x4, 6, 0, 96 - createsprite gUnknown_08593C0C, 0x4, 7, 1, 112 - createsprite gUnknown_08593C0C, 0x4, 8, 2, 128 - createsprite gUnknown_08593C0C, 0x4, 9, 0, 144 - createsprite gUnknown_08593C0C, 0x4, 10, 2, 160 - createsprite gUnknown_08593C0C, 0x4, 11, 0, 176 - createsprite gUnknown_08593C0C, 0x4, 12, 1, 192 - createsprite gUnknown_08593C0C, 0x4, 13, 3, 208 - createsprite gUnknown_08593C0C, 0x4, 14, 3, 224 - createsprite gUnknown_08593C0C, 0x4, 15, 0, 240 - createsprite gUnknown_08593C24, 0x4, 15, 0, 0 - delay 0x14 - panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - delay 0x50 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, 0 - createvisualtask sub_811489C, 0x5, 4, 0 - createvisualtask sub_811489C, 0x5, 5, 0 - createvisualtask sub_811489C, 0x5, 6, 0 - createvisualtask sub_811489C, 0x5, 7, 0 - delay 0x64 - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, 0 - createvisualtask sub_811489C, 0x5, 4, 1 - createvisualtask sub_811489C, 0x5, 5, 1 - createvisualtask sub_811489C, 0x5, 6, 1 - createvisualtask sub_811489C, 0x5, 7, 1 + loadspritegfx ANIM_TAG_MUSIC_NOTES + 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 + 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 + 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 + createvisualtask sub_811489C, 5, 4, 1 + createvisualtask sub_811489C, 5, 5, 1 + createvisualtask sub_811489C, 5, 6, 1 + createvisualtask sub_811489C, 5, 7, 1 waitforvisualfinish end Move_SLEEP_TALK: - loadspritegfx 0x27F4 - createvisualtask sub_80D5EB8, 0x5, 0, 4, 4096, 2, 0 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 + loadspritegfx ANIM_TAG_LETTER_Z + createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 playsewithpan SE_W173, SOUND_PAN_ATTACKER - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 playsewithpan SE_W173, SOUND_PAN_ATTACKER - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 playsewithpan SE_W173, SOUND_PAN_ATTACKER - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 waitforvisualfinish end Move_HYPER_FANG: - loadspritegfx 0x27D0 + loadspritegfx ANIM_TAG_192 playsewithpan SE_W044, SOUND_PAN_TARGET - delay 0x1 - delay 0x2 - createvisualtask sub_8117E60, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D458E - createvisualtask sub_815A8C8, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D4580 - goto AnimScript_82D4587 - -AnimScript_82D455C: + delay 1 + delay 2 + createvisualtask AnimTask_IsContest, 2 + jumprettrue HyperFangInContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse HyperFangOnOpponent + goto HyperFangOnPlayer +HyperFangContinue: waitbgfadeout - createsprite gUnknown_085CE1DC, 0x82 + createsprite gUnknown_085CE1DC, 130 waitbgfadein - createvisualtask sub_80D51AC, 0x3, 1, 0, 10, 10, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 playsewithpan SE_W043, SOUND_PAN_TARGET - delay 0x14 + delay 20 restorebg waitbgfadein waitforvisualfinish end - -AnimScript_82D4580: +HyperFangOnOpponent: fadetobg BG_IMPACT_OPPONENT - goto AnimScript_82D455C - -AnimScript_82D4587: + goto HyperFangContinue +HyperFangOnPlayer: fadetobg BG_IMPACT_PLAYER - goto AnimScript_82D455C - -AnimScript_82D458E: + goto HyperFangContinue +HyperFangInContest: fadetobg BG_IMPACT_CONTESTS - goto AnimScript_82D455C + goto HyperFangContinue Move_TRI_ATTACK: - loadspritegfx 0x27F6 - createsprite gUnknown_085CE2F8, 0x82, 16, 0 + loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE + createsprite gUnknown_085CE2F8, 130, 16, 0 playsewithpan SE_W161, SOUND_PAN_ATTACKER - delay 0x14 + delay 20 playsewithpan SE_W161, SOUND_PAN_ATTACKER - delay 0x14 - createsoundtask sub_8158C58, 220, -64, 63, 5, 6, 0, 7 + delay 20 + createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, 0 - delay 0x10 - loadspritegfx 0x2731 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + delay 16 + loadspritegfx ANIM_TAG_FIRE + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, SOUND_PAN_TARGET - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 2, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -2 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 3, 1 - delay 0x2 - createvisualtask sub_810A094, 0x2, 20, 3, 1, 1 - waitforvisualfinish - loadspritegfx 0x2735 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + delay 1 + createsprite gUnknown_08595410, 130, 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, 0x82, 0, -48 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, 16 - delay 0x14 - createvisualtask sub_810A094, 0x2, 20, 3, 1, 0 - delay 0x2 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gUnknown_085956C0, 130, 0, -48 + delay 1 + createsprite gUnknown_085956C0, 130, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 0, 16 + delay 20 + createvisualtask sub_810A094, 2, 20, 3, 1, 0 + delay 2 + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx 0x279D - call AnimScript_82D7720 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0 + loadspritegfx ANIM_TAG_141 + call FreezeEffect1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish end Move_WILL_O_WISP: - loadspritegfx 0x27F8 - loadspritegfx 0x27F7 + loadspritegfx ANIM_TAG_232 + loadspritegfx ANIM_TAG_231 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W052, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 0xA - createvisualtask sub_8159278, 0x2, -64, -64, 1, 0 - createsprite gUnknown_0859563C, 0x2, 0, 0, 0 - delay 0x3 - createsprite gUnknown_0859563C, 0x3, 0, 0, 1 - delay 0x3 - createsprite gUnknown_0859563C, 0x4, 0, 0, 2 - delay 0x3 - createsprite gUnknown_0859563C, 0x4, 0, 0, 3 - delay 0x28 - createvisualtask sub_8159278, 0x2, -64, 63, 2, 0 + 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 + delay 3 + createsprite gUnknown_0859563C, 3, 0, 0, 1 + delay 3 + createsprite gUnknown_0859563C, 4, 0, 0, 2 + delay 3 + createsprite gUnknown_0859563C, 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 sub_80D52D0, 0x2, 1, 4, 0, 13, 1 - createsprite gUnknown_0859566C, 0x2, 0 - createsprite gUnknown_0859566C, 0x2, 42 - createsprite gUnknown_0859566C, 0x2, 84 - createsprite gUnknown_0859566C, 0x2, 126 - createsprite gUnknown_0859566C, 0x2, 168 - createsprite gUnknown_0859566C, 0x2, 210 + 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 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_ENCORE: - loadspritegfx 0x27F3 - loadspritegfx 0x2807 - createvisualtask sub_815ABEC, 0x2 - createvisualtask sub_8116960, 0x2, 248, 3, 0, 10, 0 + loadspritegfx ANIM_TAG_227 + loadspritegfx ANIM_TAG_HAND + createvisualtask sub_815ABEC, 2 + createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite gUnknown_085CE22C, 0x82, 0, -8 - createsprite gUnknown_085CE244, 0x2, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE244, 0x2, 2, 0, 1, 0, 9 - createsprite gUnknown_085CE25C, 0x3, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE25C, 0x3, 2, 0, 1, 0, 9 - delay 0x10 - createvisualtask sub_8159244, 0x5, 223, 63 - createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 5, 1 + 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 + delay 16 + createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET waitforvisualfinish - createvisualtask sub_8116960, 0x2, 248, 3, 10, 0, 1 + createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 waitforvisualfinish - createvisualtask sub_815AC8C, 0x2 + createvisualtask sub_815AC8C, 2 end Move_TRICK: - loadspritegfx 0x27F0 - loadspritegfx 0x27DF - createsprite gUnknown_085926E8, 0x2, -40, 80 - createsprite gUnknown_085926E8, 0x2, -40, 208 - delay 0x10 + loadspritegfx ANIM_TAG_ITEM_BAG + loadspritegfx ANIM_TAG_207 + createsprite gUnknown_085926E8, 2, -40, 80 + createsprite gUnknown_085926E8, 2, -40, 208 + delay 16 playsewithpan SE_W166, 0 - createvisualtask sub_8106020, 0x3 - createvisualtask sub_81060B0, 0x3 - delay 0x1E + createvisualtask sub_8106020, 3 + createvisualtask sub_81060B0, 3 + delay 30 playsewithpan SE_W104, 0 - delay 0x18 + delay 24 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W213, 0 - createvisualtask sub_80D51AC, 0x3, 0, 5, 0, 7, 2 - createvisualtask sub_80D51AC, 0x3, 1, 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 0x27F9 - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 + loadspritegfx ANIM_TAG_233 + loadspritegfx ANIM_TAG_SPARKLE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0x0 - createsprite gUnknown_085CE388, 0x28 + panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 + createsprite gUnknown_085CE388, 40 waitforvisualfinish - delay 0x3C - loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 0x10, 0x3 - call AnimScript_82D79B4 + delay 60 + loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 + call GrantingStarsEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK waitforvisualfinish end Move_STOCKPILE: - loadspritegfx 0x27FB + loadspritegfx ANIM_TAG_235 playsewithpan SE_W025, SOUND_PAN_ATTACKER - createvisualtask sub_8115A04, 0x2, 2, 8, 1, 0, 12, 0x7FFF - createvisualtask sub_815B65C, 0x5 - call AnimScript_82D4972 - call AnimScript_82D4972 - waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, RGB_WHITE - end - -AnimScript_82D4972: - createsprite gUnknown_08592244, 0x2, 55, 55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, -55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 0, 55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 0, -55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 55, -34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 55, 34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, -34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, 34, 13 - delay 0x1 + createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE + createvisualtask sub_815B65C, 5 + call Stockpile1 + call Stockpile1 + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 12, 0, RGB_WHITE + end +Stockpile1: + createsprite gUnknown_08592244, 2, 55, 55, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, -55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 0, 55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 0, -55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 55, -34, 13 + delay 1 + createsprite gUnknown_08592244, 2, 55, 34, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, -34, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, 34, 13 + delay 1 return Move_SPIT_UP: - loadspritegfx 0x27FD - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_237 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_815B6B4, 0x5 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2 - delay 0x2D + createvisualtask sub_815B6B4, 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 + delay 45 playsewithpan SE_W255, SOUND_PAN_ATTACKER - delay 0x3 - createsprite gUnknown_08593A50, 0x2, 0, 12 - createsprite gUnknown_08593A50, 0x2, 32, 12 - createsprite gUnknown_08593A50, 0x2, 64, 12 - createsprite gUnknown_08593A50, 0x2, 96, 12 - createsprite gUnknown_08593A50, 0x2, 128, 12 - createsprite gUnknown_08593A50, 0x2, 160, 12 - createsprite gUnknown_08593A50, 0x2, 192, 12 - createsprite gUnknown_08593A50, 0x2, 224, 12 - delay 0x5 - jumpifmoveturn 0x2, AnimScript_82D4AB8 - jumpifmoveturn 0x3, AnimScript_82D4AE1 - -AnimScript_82D4A7B: - delay 0x5 - createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 + 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 + delay 5 + jumpifmoveturn 2, SpitUpStrong + jumpifmoveturn 3, SpitUpStrongest +SpitUpContinue: + delay 5 + createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gUnknown_085973E8, 0x83, -12, 10, 1, 1 - delay 0x5 + createsprite gUnknown_085973E8, 131, -12, 10, 1, 1 + delay 5 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gUnknown_085973E8, 0x83, 12, -10, 1, 1 - waitforvisualfinish - end - -AnimScript_82D4AB8: - createsprite gUnknown_08593A50, 0x2, 16 - createsprite gUnknown_08593A50, 0x2, 80 - createsprite gUnknown_08593A50, 0x2, 144 - createsprite gUnknown_08593A50, 0x2, 208 - goto AnimScript_82D4A7B - -AnimScript_82D4AE1: - createsprite gUnknown_08593A50, 0x2, 16 - createsprite gUnknown_08593A50, 0x2, 48 - createsprite gUnknown_08593A50, 0x2, 80 - createsprite gUnknown_08593A50, 0x2, 112 - createsprite gUnknown_08593A50, 0x2, 144 - createsprite gUnknown_08593A50, 0x2, 176 - createsprite gUnknown_08593A50, 0x2, 208 - createsprite gUnknown_08593A50, 0x2, 240 - goto AnimScript_82D4A7B + createsprite gUnknown_085973E8, 131, 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 + 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 + goto SpitUpContinue Move_SWALLOW: - loadspritegfx 0x27FC - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_236 + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_815B778, 0x5 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2 - delay 0x26 + createvisualtask sub_815B778, 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 + delay 38 playsewithpan SE_W255, SOUND_PAN_ATTACKER - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 12, 1 - call AnimScript_82D4B7F - jumpifmoveturn 0x2, AnimScript_82D4BC1 - jumpifmoveturn 0x3, AnimScript_82D4BCB - -AnimScript_82D4B78: - waitforvisualfinish - call AnimScript_82D79DF - end - -AnimScript_82D4B7F: - createsprite gUnknown_085CE418, 0x2, 0, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, -24, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, 16, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, -16, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, 24, -8 - delay 0x1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 + call SwallowEffect + jumpifmoveturn 2, SwallowGood + jumpifmoveturn 3, SwallowBest +SwallowContinue: + waitforvisualfinish + call HealingEffect + end +SwallowEffect: + createsprite gUnknown_085CE418, 2, 0, -8 + delay 1 + createsprite gUnknown_085CE418, 2, -24, -8 + delay 1 + createsprite gUnknown_085CE418, 2, 16, -8 + delay 1 + createsprite gUnknown_085CE418, 2, -16, -8 + delay 1 + createsprite gUnknown_085CE418, 2, 24, -8 + delay 1 return - -AnimScript_82D4BC1: - call AnimScript_82D4B7F - goto AnimScript_82D4B78 - -AnimScript_82D4BCB: - call AnimScript_82D4B7F - call AnimScript_82D4B7F - goto AnimScript_82D4B78 +SwallowGood: + call SwallowEffect + goto SwallowContinue +SwallowBest: + call SwallowEffect + call SwallowEffect + goto SwallowContinue Move_TRANSFORM: monbg ANIM_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 0x30 - createvisualtask sub_815B7D0, 0x2, 0 + waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + createvisualtask sub_815B7D0, 2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER end Move_MORNING_SUN: - loadspritegfx 0x2801 - loadspritegfx 0x272F - createvisualtask sub_815BB84, 0x5 - delay 0x8 - createvisualtask sub_8116620, 0xA, 1921, 8, 0, 12, 0x7FFF - delay 0xE - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - createvisualtask sub_8116620, 0xA, 1921, 3, 12, 0, 0x7FFF + loadspritegfx ANIM_TAG_GREEN_STAR + loadspritegfx ANIM_TAG_BLUE_STAR + createvisualtask sub_815BB84, 5 + delay 8 + createvisualtask sub_8116620, 10, 0x781, 8, 0, 12, RGB_WHITE + delay 14 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + createvisualtask sub_8116620, 10, 0x781, 3, 12, 0, RGB_WHITE waitforvisualfinish waitsound - call AnimScript_82D79DF + call HealingEffect end - -AnimScript_82D4C78: - createsprite gUnknown_085CE48C, 0x2, 30, 640 - delay 0x5 +MorningSun1: + createsprite gUnknown_085CE48C, 2, 30, 640 + delay 5 return Move_SWEET_SCENT: - loadspritegfx 0x27FE + loadspritegfx ANIM_TAG_238 playsewithpan SE_W230, SOUND_PAN_ATTACKER - createsprite gUnknown_085CE544, 0x2, 100, 0, 100 - delay 0x19 + createsprite gUnknown_085CE544, 2, 100, 0, 100 + delay 25 setpan 0 - call AnimScript_82D4CCA - createsprite gUnknown_085CE544, 0x2, 55, 0 + call SweetScentEffect + createsprite gUnknown_085CE544, 2, 55, 0 setpan SOUND_PAN_TARGET - createvisualtask sub_8115A04, 0x2, 20, 1, 5, 5, 13, 22207 - call AnimScript_82D4CCA - waitforvisualfinish - end - -AnimScript_82D4CCA: - createsprite gUnknown_085CE544, 0x2, 70, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 60, 0, 64 - delay 0x5 - createsprite gUnknown_085CE544, 0x2, 80, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 58, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 100, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 90, 0, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 48, 0, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 95, 1, 80 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 100, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 75, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 85, 0, 120 - delay 0x2 + 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 + delay 2 + createsprite gUnknown_085CE544, 2, 60, 0, 64 + delay 5 + createsprite gUnknown_085CE544, 2, 80, 1, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 58, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 100, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 90, 0, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 48, 0, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 95, 1, 80 + delay 2 + createsprite gUnknown_085CE544, 2, 100, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 75, 1, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 85, 0, 120 + delay 2 return Move_HYPER_BEAM: - loadspritegfx 0x27A3 - createsprite gUnknown_08597274, 0x2, 1, 4, 0, 16, 0 + loadspritegfx ANIM_TAG_147 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W063, SOUND_PAN_ATTACKER - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 4, 1 - waitforvisualfinish - delay 0x1E - createsoundtask sub_8158C58, 247, -64, 63, 1, 15, 0, 5 - createvisualtask sub_80D51AC, 0x2, 0, 0, 4, 50, 1 - createvisualtask sub_8115D94, 0x2, 10147, 1, 12, 31, 16, 0, 0 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 50, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 11, 26425 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - createvisualtask sub_8116620, 0xA, 4, 2, 11, 0, 26425 - waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 16, 0, 0 - end - -AnimScript_82D4EA1: - createsprite gUnknown_08592288, 0x82 - createsprite gUnknown_08592288, 0x82 - delay 0x1 + 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_ATTACKER, 0, 4, 50, 1 + createvisualtask sub_8115D94, 2, ANIM_TAG_147, 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 sub_8116620, 10, 4, 2, 0, 11, RGB(25, 25, 25) + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + createvisualtask sub_8116620, 10, 4, 2, 11, 0, RGB(25, 25, 25) + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 16, 0, RGB_BLACK + end +HyperBeam1: + createsprite gUnknown_08592288, 130 + createsprite gUnknown_08592288, 130 + delay 1 return Move_FLATTER: - loadspritegfx 0x27F3 - loadspritegfx 0x2800 - createvisualtask sub_8159244, 0x5, 223, 63 - createvisualtask sub_815ABEC, 0x2 - createvisualtask sub_8116960, 0x2, 248, 3, 0, 10, 0 - waitforvisualfinish - createsprite gUnknown_085CE5C0, 0x82, 0, -8, 80 - delay 0x0 - createsprite gUnknown_0857FE40, 0x2, 5, 2, 1 - delay 0xA - createsprite gUnknown_0857FE40, 0x2, 5, 2, 1 - delay 0x0 - createvisualtask sub_8159210, 0x5, 229, -64 - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - delay 0x5 - createvisualtask sub_8159210, 0x5, 229, 63 - waitforvisualfinish - createvisualtask sub_8116960, 0x2, 248, 3, 10, 0, 1 - waitforvisualfinish - createvisualtask sub_815AC8C, 0x2 - end - -AnimScript_82D4F9B: - createsprite gUnknown_085CE5A8, 0x28, 0 - createsprite gUnknown_085CE5A8, 0x28, 1 + loadspritegfx ANIM_TAG_227 + loadspritegfx ANIM_TAG_240 + createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET + createvisualtask sub_815ABEC, 2 + createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 + waitforvisualfinish + createsprite gUnknown_085CE5C0, 130, 0, -8, 80 + delay 0 + createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + delay 10 + createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + delay 0 + createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + delay 5 + createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET + waitforvisualfinish + createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 + waitforvisualfinish + createvisualtask sub_815AC8C, 2 + end +Flatter1: + createsprite gUnknown_085CE5A8, 40, 0 + createsprite gUnknown_085CE5A8, 40, 1 return Move_ROLE_PLAY: monbg ANIM_ATK_PARTNER - createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, 0x7FFF - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 10, 0 + createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W161, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 0x1E - createvisualtask sub_815CED8, 0x2 + waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 + createvisualtask sub_815CED8, 2 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, 0x7FFF - delay 0x8 - createsprite gUnknown_08597274, 0x2, 1, 2, 10, 0, 0 + createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE + delay 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 10, 0, RGB_BLACK end Move_REFRESH: - loadspritegfx 0x27DB - loadspritegfx 0x2741 + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_SPARKLE playsewithpan SE_W287, SOUND_PAN_ATTACKER - createvisualtask sub_815DFCC, 0x2, 0 + createvisualtask sub_815DFCC, 2, 0 waitforvisualfinish playsewithpan SE_W234, SOUND_PAN_ATTACKER - call AnimScript_82D79B4 + call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 end Move_BLAZE_KICK: - loadspritegfx 0x2797 - loadspritegfx 0x279F - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W172, SOUND_PAN_TARGET - createsprite gUnknown_08595F14, 0x83, 0, 0, 1, 30 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF - delay 0x1E + createsprite gUnknown_08595F14, 131, 0, 0, 1, 30 + createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE + delay 30 playsewithpan SE_W007, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 14, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 - call AnimScript_82D2D18 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_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 + call FireMoveEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_HYPER_VOICE: - loadspritegfx 0x27DB - createvisualtask sub_81590B8, 0x5, 0 - call AnimScript_82D50FA - waitforvisualfinish - delay 0x8 - createvisualtask sub_81590B8, 0x5, 1 - call AnimScript_82D50FA - waitforvisualfinish - end - -AnimScript_82D50FA: - createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, RGB_YELLOW - createvisualtask sub_80D6064, 0x5, -5, -5, 5, 0, 0 - createsprite gUnknown_08593880, 0x0, 45, 0, 0, 0, 0, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 6, 1 - createvisualtask sub_81162A4, 0x2, 1, 0, 6, 1 - createvisualtask sub_8159078, 0x5 + loadspritegfx ANIM_TAG_203 + createvisualtask sub_81590B8, 5, 0 + call HyperVoiceEffect + waitforvisualfinish + delay 8 + createvisualtask sub_81590B8, 5, 1 + call HyperVoiceEffect + 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 + createvisualtask sub_81162A4, 2, 1, 0, 6, 1 + createvisualtask sub_8159078, 5 return Move_SAND_TOMB: - loadspritegfx 0x275A - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1 + loadspritegfx ANIM_TAG_074 + createsprite gSimplePaletteBlendSpriteTemplate, 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 AnimScript_82D51B7 - call AnimScript_82D51B7 - call AnimScript_82D51B7 - delay 0x16 - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0) - waitforvisualfinish - end - -AnimScript_82D51B7: - createsprite gUnknown_08596B34, 0x82, 0, 32, 528, 30, 10, 50, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 36, 480, 20, 13, -46, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 37, 576, 20, 5, 42, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 35, 400, 25, 8, -42, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 32, 512, 25, 13, 46, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 37, 464, 30, 12, -50, 1 - delay 0x2 + call SandTombEffect + call SandTombEffect + call SandTombEffect + delay 22 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) + waitforvisualfinish + end + +SandTombEffect: + createsprite gUnknown_08596B34, 130, 0, 32, 528, 30, 10, 50, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 36, 480, 20, 13, -46, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 37, 576, 20, 5, 42, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 35, 400, 25, 8, -42, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 32, 512, 25, 13, 46, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 37, 464, 30, 12, -50, 1 + delay 2 return Move_SHEER_COLD: @@ -8665,12 +8545,12 @@ Move_SHEER_COLD: waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein - loadspritegfx 0x271A + loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80A9EF4, 0x2 - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 0x11 + setalpha 12, 8 + createvisualtask sub_80A9EF4, 2 + waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8679,210 +8559,205 @@ Move_SHEER_COLD: end Move_ARM_THRUST: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D6134, 0x5, 8, 5, 0, 0 - delay 0x6 - createsprite gUnknown_0857FE28, 0x2, 4, 3 - delay 0x4 + setalpha 12, 8 + createvisualtask sub_80D6134, 5, 8, 5, 0, 0 + delay 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08596034, 0x82, 10, -8, 14, 3 + createsprite gUnknown_08596034, 130, 10, -8, 14, 3 waitforvisualfinish - createvisualtask sub_80D6134, 0x5, 8, 5, 0, 1 + createvisualtask sub_80D6134, 5, 8, 5, 0, 1 playsewithpan SE_W003, SOUND_PAN_TARGET - choosetwoturnanim AnimScript_82D52D4, AnimScript_82D52E8 - -AnimScript_82D52C0: - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + choosetwoturnanim ArmThrustRight, ArmThrustLeft +ArmThrustContinue: + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish blendoff end - -AnimScript_82D52D4: - createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2 - goto AnimScript_82D52C0 - -AnimScript_82D52E8: - createsprite gUnknown_08597358, 0x82, -8, 0, 1, 2 - goto AnimScript_82D52C0 +ArmThrustRight: + createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 + goto ArmThrustContinue +ArmThrustLeft: + createsprite gBasicHitSplatSpriteTemplate, 130, -8, 0, 1, 2 + goto ArmThrustContinue Move_MUDDY_WATER: - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - createvisualtask sub_8107954, 0x2, 1 + panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + createvisualtask AnimTask_CreateSurfWave, 2, TRUE waitforvisualfinish end Move_BULLET_SEED: - loadspritegfx 0x2716 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 30, 1 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 + loadspritegfx ANIM_TAG_SEED + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 waitforvisualfinish end Move_DRAGON_CLAW: - loadspritegfx 0x272D - loadspritegfx 0x2737 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_W221B, SOUND_PAN_ATTACKER - createvisualtask sub_8116620, 0xA, 2, 4, 0, 8, 639 - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 15, 1 - call AnimScript_82D5581 - call AnimScript_82D5581 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createvisualtask sub_8159210, 0x5, 136, 63 - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createvisualtask sub_8159210, 0x5, 136, 63 - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - createvisualtask sub_8116620, 0xA, 2, 4, 8, 0, 639 - waitforvisualfinish - end - -AnimScript_82D5581: - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - delay 0x2 + createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_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 + 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 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 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 + 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 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + delay 2 + createsprite gUnknown_08596B88, 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 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + delay 2 return -AnimScript_82D560C: +End: end Move_MUD_SHOT: - loadspritegfx 0x2813 + loadspritegfx ANIM_TAG_259 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1 - delay 0x6 - createvisualtask sub_81076C8, 0x5, 100 - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0x0 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 + setalpha 12, 8 + 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_TARGET, 3, 0, 43, 1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82D5687: - createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16 - delay 0x2 - createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16 - delay 0x2 +MudShot1: + createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + delay 2 + createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + delay 2 return Move_METEOR_MASH: - loadspritegfx 0x27F9 - loadspritegfx 0x2797 - loadspritegfx 0x279F - panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0x0 + loadspritegfx ANIM_TAG_233 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0 fadetobg BG_COSMIC waitbgfadein waitforvisualfinish - createsprite gUnknown_085CE8DC, 0x83, -48, -64, 72, 32, 30 - delay 0xA - createsprite gUnknown_085CE8DC, 0x83, -112, -64, 8, 32, 30 - delay 0x28 - createsprite gUnknown_08595F14, 0x83, 0, 0, 0, 30 - createsprite gUnknown_085CE8DC, 0x83, -80, -64, 40, 32, 30 - delay 0x14 + createsprite gUnknown_085CE8DC, 131, -48, SOUND_PAN_ATTACKER, 72, 32, 30 + delay 10 + createsprite gUnknown_085CE8DC, 131, -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 + delay 20 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 5, 0, 20, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1 waitforvisualfinish - delay 0xA + delay 10 restorebg waitbgfadein waitforvisualfinish end Move_REVENGE: - loadspritegfx 0x2805 + loadspritegfx ANIM_TAG_245 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createsprite gUnknown_08596088, 0x2, 10, -10 + createsprite gUnknown_08596088, 2, 10, -10 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 2, 0, 4, 2, 8, 31 + createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish - unloadspritegfx 0x2805 - loadspritegfx 0x2806 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x4 + unloadspritegfx ANIM_TAG_245 + loadspritegfx ANIM_TAG_246 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_085960D0, 0x82, 10, -10 + createsprite gUnknown_085960D0, 130, 10, -10 waitforvisualfinish - unloadspritegfx 0x2806 - loadspritegfx 0x2797 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 10, 1 - createsprite gUnknown_08597400, 0x83, -10, -8, 1, 1, 8 + unloadspritegfx ANIM_TAG_246 + loadspritegfx ANIM_TAG_135 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 + createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08597400, 0x83, 10, 8, 1, 1, 8 + delay 8 + createsprite gUnknown_08597400, 131, 10, 8, 1, 1, 8 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET @@ -8890,949 +8765,923 @@ Move_REVENGE: end Move_POISON_FANG: - loadspritegfx 0x27D0 - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, SOUND_PAN_TARGET - createsprite gUnknown_085CE1DC, 0x82 - delay 0xA - createvisualtask sub_80D51AC, 0x3, 1, 3, 0, 10, 1 + createsprite gUnknown_085CE1DC, 130 + delay 10 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 4, 0, 4, 0, 12, 26650 - call AnimScript_82D7A71 + createvisualtask sub_8115A04, 2, 4, 0, 4, 0, 12, RGB(26, 0, 26) + call PoisonBubblesEffect waitforvisualfinish end Move_SUBSTITUTE: playsewithpan SE_W213, SOUND_PAN_ATTACKER - createvisualtask sub_815F20C, 0x2 + createvisualtask AnimTask_MonToSubstitute, 2 end Move_FRENZY_PLANT: - loadspritegfx 0x27EF - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_223 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x0, 1, 2, 0, 5, 0 + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592564, 0x2, 10, 8, 2, 0, 0, 100 + createsprite gUnknown_08592564, 2, 10, 8, 2, 0, 0, 100 playsewithpan SE_W010, SOUND_PAN_ATTACKER - delay 0x5 - createsprite gUnknown_08592564, 0x2, 20, -8, -2, 0, 1, 95 + delay 5 + createsprite gUnknown_08592564, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 30, 8, -4, 0, 0, 90 + delay 5 + createsprite gUnknown_08592564, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, -22 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 40, -8, 4, 0, 1, 85 + delay 5 + createsprite gUnknown_08592564, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 50, 8, 0, 0, 0, 85 + delay 5 + createsprite gUnknown_08592564, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, +21 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 60, -8, -2, 0, 1, 85 + delay 5 + createsprite gUnknown_08592564, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, +42 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 75, 8, 0, 0, 0, 85 + delay 5 + createsprite gUnknown_08592564, 2, 75, 8, 0, 0, 0, 85 playsewithpan SE_W010, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08592564, 0x2, 85, 16, 6, 0, 3, 80 + delay 5 + createsprite gUnknown_08592564, 2, 85, 16, 6, 0, 3, 80 playsewithpan SE_W010, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08592564, 0x2, 85, -16, -6, 0, 2, 75 + delay 5 + createsprite gUnknown_08592564, 2, 85, -16, -6, 0, 2, 75 playsewithpan SE_W010, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -10, 1, 3 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3 playsewithpan SE_W003, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x3, 1, 8, 0, 20, 1 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 10, 8, 1, 3 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3 playsewithpan SE_W003, SOUND_PAN_TARGET - delay 0x3 - createsprite gUnknown_08597358, 0x2, 10, -3, 1, 2 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET - delay 0x3 - createsprite gUnknown_08597358, 0x2, -3, 1, 1, 2 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2 playsewithpan SE_W003, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08597358, 0x2, -10, 1, 1, 1 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1 playsewithpan SE_W003, SOUND_PAN_TARGET - delay 0x2 - createsprite gUnknown_08597358, 0x2, 0, 10, 1, 1 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1 playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08597274, 0x0, 1, 2, 5, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 5, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_METAL_SOUND: - loadspritegfx 0x2814 + loadspritegfx ANIM_TAG_260 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1 - call AnimScript_82D59EA - call AnimScript_82D59EA - call AnimScript_82D59EA - call AnimScript_82D59EA + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 + call MetalSound1 + call MetalSound1 + call MetalSound1 + call MetalSound1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 waitforvisualfinish end - -AnimScript_82D59EA: - panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - createsprite gUnknown_08593458, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 +MetalSound1: + panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + createsprite gUnknown_08593458, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_FOCUS_PUNCH: - goto AnimScript_82D5A0E - -AnimScript_82D5A0C: - waitforvisualfinish - end - -AnimScript_82D5A0E: - loadspritegfx 0x2797 - loadspritegfx 0x279F - delay 0x1 - createvisualtask sub_8117E60, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D5AC7 - createvisualtask sub_815A8C8, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D5AB9 - jumpargeq 0x7, 0x1, AnimScript_82D5AC0 - -AnimScript_82D5A3C: + goto FocusPunch +FocusPunchEnd: + waitforvisualfinish + end +FocusPunch: + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + delay 1 + createvisualtask AnimTask_IsContest, 2 + jumprettrue FocusPunchInContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse FocusPunchOnOpponent + jumprettrue FocusPunchOnPlayer +FocusPunchContinue: waitbgfadein monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08596104, 0x82 - delay 0xA - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, 2, 1, 0 + createsprite gUnknown_08596104, 130 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, -6, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08597358, 0x2, 0, 8, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0 playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82D5A0C - -AnimScript_82D5AB9: + goto FocusPunchEnd +FocusPunchOnOpponent: fadetobg BG_IMPACT_OPPONENT - goto AnimScript_82D5A3C - -AnimScript_82D5AC0: + goto FocusPunchContinue +FocusPunchOnPlayer: fadetobg BG_IMPACT_PLAYER - goto AnimScript_82D5A3C - -AnimScript_82D5AC7: + goto FocusPunchContinue +FocusPunchInContest: fadetobg BG_IMPACT_CONTESTS - goto AnimScript_82D5A3C + goto FocusPunchContinue Move_RETURN: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_815F8A0, 0x2 - delay 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D5B04 - jumpargeq 0x7, 0x1, AnimScript_82D5B56 - jumpargeq 0x7, 0x2, AnimScript_82D5BB6 - jumpargeq 0x7, 0x3, AnimScript_82D5CD1 - -AnimScript_82D5AFF: + setalpha 12, 8 + createvisualtask AnimTask_GetReturnPowerLevel, 2 + delay 2 + jumpreteq 0, ReturnWeak + jumpreteq 1, ReturnMedium + jumpreteq 2, ReturnStrong + jumpreteq 3, ReturnStrongest +ReturnContinue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82D5B04: - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 139, 63 - goto AnimScript_82D5AFF - -AnimScript_82D5B56: - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - delay 0xB - createsprite gUnknown_0857FE28, 0x2, 5, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_8159210, 0x5, 141, 63 - goto AnimScript_82D5AFF - -AnimScript_82D5BB6: - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, 10, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, -5, 3, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - goto AnimScript_82D5AFF - -AnimScript_82D5CD1: - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 6, 0 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 12, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - waitforvisualfinish - delay 0x4 - createsprite gUnknown_0857FE40, 0x2, 8, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - waitforvisualfinish - delay 0x2 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 - createsprite gUnknown_0857FE40, 0x2, 4, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 4, 2, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 - waitforvisualfinish - call AnimScript_82D5F09 - call AnimScript_82D5F09 - call AnimScript_82D5F09 - call AnimScript_82D5F09 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 10, 10, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x6 - createsprite gUnknown_08597358, 0x2, -5, 3, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 6, 0, 0 - goto AnimScript_82D5AFF - -AnimScript_82D5F09: - createsprite gUnknown_0857FE40, 0x2, 4, 3, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 +ReturnWeak: + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 139, SOUND_PAN_TARGET + goto ReturnContinue +ReturnMedium: + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + waitforvisualfinish + delay 11 + createsprite gHorizontalLungeSpriteTemplate, 2, 5, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET + goto ReturnContinue +ReturnStrong: + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + goto ReturnContinue +ReturnStrongest: + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 6, RGB_BLACK + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 12, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + waitforvisualfinish + delay 4 + createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + waitforvisualfinish + delay 2 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 + createsprite gVerticalDipSpriteTemplate, 2, 4, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 4, 2, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + 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 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 0 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 0 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 0 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 6, 0, RGB_BLACK + goto ReturnContinue +ReturnStrongest1: + createsprite gVerticalDipSpriteTemplate, 2, 4, 3, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish return Move_COSMIC_POWER: - loadspritegfx 0x2741 - createvisualtask sub_8159244, 0x5, 243, 0 + loadspritegfx ANIM_TAG_SPARKLE + createvisualtask sub_8159244, 5, 243, 0 playsewithpan SE_W322, 0 - createvisualtask sub_8117610, 0x2, 0, 0, 15, 0 + createvisualtask sub_8117610, 2, 0, 0, 15, 0 waitforvisualfinish fadetobg BG_COSMIC waitbgfadeout - createvisualtask sub_8117660, 0x2, 0, 128, 0, -1 + createvisualtask sub_8117660, 2, 0, 128, 0, -1 waitbgfadein - delay 0x46 - createvisualtask sub_8159210, 0x5, 228, -64 - createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60 - delay 0x8 - createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60 - delay 0x28 - createvisualtask sub_8117610, 0x2, 0, 15, 0, 0 + delay 70 + createvisualtask sub_8159210, 5, 228, SOUND_PAN_ATTACKER + createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + delay 8 + createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 + delay 40 + createvisualtask sub_8117610, 2, 0, 15, 0, 0 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein waitforvisualfinish end Move_BLAST_BURN: - loadspritegfx 0x2733 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W221, SOUND_PAN_ATTACKER - createsprite gUnknown_08595428, 0x2, -32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 0, -16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 20, 10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -20, 10, 24, 0, 0, 0 - delay 0x19 + 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 + delay 25 playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite gUnknown_08595428, 0x2, -64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x6, -40, -20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 0, -32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 40, -20, 24, 0, 0, 0 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createsprite gUnknown_08595428, 0x42, 64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 40, 20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -40, 20, 24, 0, 0, 0 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x19 + 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 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 25 playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite gUnknown_08595428, 0x2, -96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x6, -60, -30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 0, -48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 60, -30, 24, 0, 0, 0 - createsprite gUnknown_08597358, 0x82, -4, 3, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 12, 0, 20, 1 - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 - createsprite gUnknown_08595428, 0x42, 96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 60, 30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -60, 30, 24, 0, 0, 0 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + 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 + 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 + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_ROCK_TOMB: - loadspritegfx 0x280A - loadspritegfx 0x274A - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 + loadspritegfx ANIM_TAG_X_SIGN + loadspritegfx ANIM_TAG_058 + createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish - createsprite gUnknown_08596C58, 0x82, 20, 12, 64, 114, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08596C58, 0x82, -20, 12, 64, 98, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createsprite gUnknown_08596C58, 130, -20, 12, 64, 98, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08596C58, 0xC2, 3, 6, 64, 82, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createsprite gUnknown_08596C58, 194, 3, 6, 64, 82, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08596C58, 0x82, -3, 13, 64, 66, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createsprite gUnknown_08596C58, 130, -3, 13, 64, 66, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, SOUND_PAN_TARGET - delay 0x18 + delay 24 playsewithpan SE_W063, SOUND_PAN_TARGET - createsprite gUnknown_085967AC, 0x85, 1, 50 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 20, 1 - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 + createsprite gUnknown_085967AC, 133, 1, 50 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 + createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish end Move_SILVER_WIND: - loadspritegfx 0x281F - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 + loadspritegfx ANIM_TAG_271 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 playsewithpan SE_W234, 0 - delay 0x0 + delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 - delay 0x0 - createvisualtask sub_8116664, 0xA, 1, 0, 0, 4, 0 - createvisualtask sub_8117780, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D650C + delay 0 + createvisualtask sub_8116664, 10, 1, 0, 0, 4, RGB_BLACK + createvisualtask AnimTask_IsTargetOpponentSide, 2 + jumprettrue SilverWindOnPlayer fadetobg BG_BUG_OPPONENT waitbgfadeout - createvisualtask sub_8117660, 0x5, 1536, 0, 0, -1 - -AnimScript_82D6352: - delay 0x0 - createvisualtask sub_8116620, 0xA, 1, 0, 4, 4, 0 + createvisualtask sub_8117660, 5, 1536, 0, 0, -1 +SilverWindContinue: + delay 0 + createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein - createsprite gUnknown_08592830, 0xC2, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592830, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592830, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592830, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x0 - createsprite gUnknown_08592848, 0xC2, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592848, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592848, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592848, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x0 - createsprite gUnknown_08592860, 0xC2, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592860, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592860, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592860, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x6 - createsprite gUnknown_08592830, 0xC2, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592830, 0xC2, -16, 12, 192, 5, 2, 3, 1 - delay 0x0 - createsprite gUnknown_08592848, 0xC2, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592848, 0xC2, -16, 12, 192, 5, 2, 3, 1 - delay 0x0 - createsprite gUnknown_08592860, 0xC2, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592860, 0xC2, -16, 12, 192, 5, 2, 3, 1 + 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 + 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 + 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 + delay 6 + createsprite gUnknown_08592830, -62, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592830, -62, -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 + delay 0 + createsprite gUnknown_08592860, -62, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592860, -62, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish playsewithpan SE_W016B, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 restorebg waitbgfadeout - createvisualtask sub_8116664, 0xA, 1, 0, 4, 0, 0 - setarg 0x7, 0xFFFF + createvisualtask sub_8116664, 10, 1, 0, 4, 0, RGB_BLACK + setarg 7, -1 waitbgfadein end - -AnimScript_82D650C: +SilverWindOnPlayer: fadetobg BG_BUG_PLAYER waitbgfadeout - createvisualtask sub_8117660, 0x5, -1536, 0, 0, -1 - goto AnimScript_82D6352 + createvisualtask sub_8117660, 5, -1536, 0, 0, -1 + goto SilverWindContinue Move_SNATCH: playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_80D5C50, 0x5, 0, -12, 4, 10, 10, 12, 6 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 end Move_DIVE: - loadspritegfx 0x2820 - loadspritegfx 0x2821 - choosetwoturnanim AnimScript_82D654C, AnimScript_82D65A1 - -AnimScript_82D654C: - loadspritegfx 0x27AC + loadspritegfx ANIM_TAG_272 + loadspritegfx ANIM_TAG_273 + choosetwoturnanim DiveSetUp, DiveAttack +DiveSetUp: + loadspritegfx ANIM_TAG_156 playsewithpan SE_W029, SOUND_PAN_ATTACKER - createsprite gUnknown_08596490, 0x2, 0, 0, 13, 336 + createsprite gUnknown_08596490, 2, 0, 0, 13, 336 waitforvisualfinish playsewithpan SE_W291, SOUND_PAN_ATTACKER - createsprite gUnknown_085964CC, 0x3, 0 - call AnimScript_82D658A - call AnimScript_82D658A - call AnimScript_82D658A - call AnimScript_82D658A - call AnimScript_82D658A - end - -AnimScript_82D658A: - createsprite gUnknown_085964E4, 0x5, 0, 0 - createsprite gUnknown_085964E4, 0x5, 1, 0 + createsprite gUnknown_085964CC, 3, 0 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 + end +DiveSetUp1: + createsprite gUnknown_085964E4, 5, 0, 0 + createsprite gUnknown_085964E4, 5, 1, 0 return - -AnimScript_82D65A1: - loadspritegfx 0x27A4 - loadspritegfx 0x27AB +DiveAttack: + loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_155 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W153, SOUND_PAN_TARGET - createsprite gUnknown_085964CC, 0x83, 1 - call AnimScript_82D65E0 - call AnimScript_82D65E0 - call AnimScript_82D65E0 - call AnimScript_82D65E0 - call AnimScript_82D65E0 - delay 0xC - call AnimScript_82CB102 + createsprite gUnknown_085964CC, 131, 1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + delay 12 + call UnderWaterAttack1 waitforvisualfinish visible ANIM_ATTACKER clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82D65E0: - createsprite gUnknown_085964E4, 0x85, 0, 1 - createsprite gUnknown_085964E4, 0x85, 1, 1 +DiveAttack1: + createsprite gUnknown_085964E4, 133, 0, 1 + createsprite gUnknown_085964E4, 133, 1, 1 return Move_ROCK_BLAST: - loadspritegfx 0x274A - loadspritegfx 0x2797 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x3 + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER - createsprite gUnknown_08596C98, 0x82, 16, 0, 0, 0, 25, 257 + createsprite gUnknown_08596C98, 130, 16, 0, 0, 0, 25, 257 waitforvisualfinish - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createsprite gUnknown_08596B1C, 0x82, 0, 0, 20, 24, 14, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1 - createsprite gUnknown_08596B1C, 0x82, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 0x82, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x82, -5, 0, -20, -24, 14, 2 + 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 waitforvisualfinish end Move_OVERHEAT: - loadspritegfx 0x272D - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x120C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 5, RGB(28, 0, 0) + setalpha 12, 18 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, RGB(28, 0, 0) waitforvisualfinish - createvisualtask sub_8117C44, 0x5 + createvisualtask sub_8117C44, 5 waitforvisualfinish - createvisualtask sub_8117CA0, 0x5, 0, 1 - delay 0x1 - createvisualtask sub_8117DD8, 0x5, 0 - delay 0x1 + createvisualtask sub_8117CA0, 5, 0, 1 + delay 1 + createvisualtask sub_8117DD8, 5, 0 + delay 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask sub_8117CA0, 0x5, 1, 0 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, RGB(28, 0, 0) - createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 + 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 waitforvisualfinish playsewithpan SE_W172B, SOUND_PAN_ATTACKER - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, -20 - delay 0x5 - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, 0 - delay 0x5 - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, 10 - delay 0x5 - waitforvisualfinish - createsprite gUnknown_08597358, 0x83, -5, 3, 1, 0 + 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 + 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 + 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 + delay 5 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 10, 0, 25, 1 - delay 0x6 - createsprite gUnknown_08597358, 0x83, 8, -5, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08597358, 0x83, 10, 10, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0 playsewithpan SE_W007, SOUND_PAN_TARGET - createvisualtask sub_8117DD8, 0x5, 1 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, RGB(18, 18, 18) - createvisualtask sub_80D51AC, 0x5, 0, 3, 0, 15, 1 + 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 waitforvisualfinish - createvisualtask sub_8117D3C, 0x5, 0, 1 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 1, 1, 5, 0, RGB(28, 0, 0) + createvisualtask sub_8117D3C, 5, 0, 1 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 5, 0, RGB(28, 0, 0) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish - delay 0xF - createvisualtask sub_8117D3C, 0x5, 1, 0 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, 0, 13, 0, RGB(18, 18, 18) + delay 15 + createvisualtask sub_8117D3C, 5, 1, 0 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 13, 0, RGB(18, 18, 18) waitforvisualfinish - createvisualtask sub_8117C70, 0x5 + createvisualtask sub_8117C70, 5 waitforvisualfinish end Move_HYDRO_CANNON: - loadspritegfx 0x27A5 - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER - createsprite gUnknown_085951C0, 0x82 - delay 0xA - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1E - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0x0 - call AnimScript_82D6A50 - createvisualtask sub_80D51AC, 0x5, 1, 10, 0, 40, 1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - waitforvisualfinish - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gUnknown_085951C0, 130 + 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 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + waitforvisualfinish + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82D6A50: - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 +HydroCannon1: + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 return Move_ASTONISH: - loadspritegfx 0x2821 + loadspritegfx ANIM_TAG_273 playsewithpan SE_W227, SOUND_PAN_ATTACKER - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x19 - createsprite gUnknown_085964E4, 0x85, 0, 1 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 25 + createsprite gUnknown_085964E4, -123, 0, 1 playsewithpan SE_W166, SOUND_PAN_TARGET - createsprite gUnknown_085964E4, 0x85, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - createvisualtask sub_8106020, 0x3 + createsprite gUnknown_085964E4, -123, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createvisualtask sub_8106020, 3 waitforvisualfinish end Move_SEISMIC_TOSS: - loadspritegfx 0x2797 - loadspritegfx 0x274A - setarg 0x7, 0x0 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_058 + setarg 7, 0 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 waitforvisualfinish - createvisualtask sub_81114EC, 0x3 - delay 0x1 + createvisualtask AnimTask_GetSeismicTossDamageLevel, 3 + delay 1 fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout - createvisualtask sub_811152C, 0x3 + createvisualtask sub_811152C, 3 playsewithpan SE_W327, 0 waitbgfadein waitforvisualfinish - createvisualtask sub_8111590, 0x3 - jumpargeq 0x7, 0x0, AnimScript_82D6B53 - jumpargeq 0x7, 0x1, AnimScript_82D6B64 - jumpargeq 0x7, 0x2, AnimScript_82D6B7C - -AnimScript_82D6B48: + createvisualtask sub_8111590, 3 + jumpreteq 0, SeismicTossWeak + jumpreteq 1, SeismicTossMedium + jumpreteq 2, SeismicTossStrong +SeismicTossContinue: restorebg waitbgfadeout - setarg 0x7, 0xFFF + setarg 7, 0xFFF waitbgfadein clearmonbg ANIM_DEF_PARTNER blendoff end - -AnimScript_82D6B53: - call AnimScript_82D6B9B - delay 0x10 - call AnimScript_82D6BFC - goto AnimScript_82D6B48 - -AnimScript_82D6B64: - call AnimScript_82D6B9B - delay 0xE - call AnimScript_82D6BFC - delay 0xE - call AnimScript_82D6B9B - goto AnimScript_82D6B48 - -AnimScript_82D6B7C: - call AnimScript_82D6BFC - delay 0xA - call AnimScript_82D6B9B - delay 0xA - call AnimScript_82D6BFC - delay 0xA - call AnimScript_82D6B9B - goto AnimScript_82D6B48 - -AnimScript_82D6B9B: - createsprite gUnknown_08597358, 0x83, -10, -8, 1, 1 +SeismicTossWeak: + call SeismicToss1 + delay 16 + call SeismicToss2 + goto SeismicTossContinue +SeismicTossMedium: + call SeismicToss1 + delay 14 + call SeismicToss2 + delay 14 + call SeismicToss1 + goto SeismicTossContinue +SeismicTossStrong: + call SeismicToss2 + delay 10 + call SeismicToss1 + delay 10 + call SeismicToss2 + delay 10 + call SeismicToss1 + goto SeismicTossContinue +SeismicToss1: + createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1 playsewithpan SE_W070, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4 + 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 return - -AnimScript_82D6BFC: - createsprite gUnknown_08597358, 0x83, 10, -8, 1, 1 +SeismicToss2: + createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1 playsewithpan SE_W088, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 0x82, -12, 32, 3, 4 - createsprite gUnknown_08596CB0, 0x82, 8, 31, 2, 2 - createsprite gUnknown_08596CB0, 0x82, -4, 28, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 30, 4, 3 + 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 return Move_MAGIC_COAT: - loadspritegfx 0x27BA - setalpha 0x1000 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 0xF - createsprite gUnknown_085965C0, 0x3, 40, 0, 10170 + loadspritegfx ANIM_TAG_170 + setalpha 0, 16 + waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + createsprite gUnknown_085965C0, 3, 40, 0, 10170 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_WATER_PULSE: - loadspritegfx 0x27AB - loadspritegfx 0x2830 + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_288 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, RGB(0, 25, 28) - delay 0xA - createsprite gUnknown_085952F8, 0x42, 100, 100, 8, 1, 20, 40, 0 - createsprite gUnknown_085952F8, 0x42, 20, 100, 16, 2, 10, 35, 1 - createsprite gUnknown_085952F8, 0x42, 200, 80, 8, 1, 40, 20, 0 - createsprite gUnknown_085952F8, 0x42, 80, 60, 10, 3, 20, 50, 0 - createsprite gUnknown_085952F8, 0x42, 140, 100, 16, 1, 20, 30, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 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 playsewithpan SE_W145C, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 - delay 0x5 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + delay 5 playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 - delay 0x5 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + delay 5 playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 - delay 0xD - createvisualtask sub_80D51AC, 0x2, 1, 0, 8, 18, 1 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + delay 13 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, RGB(0, 25, 28) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB(0, 25, 28) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_PSYCHO_BOOST: - loadspritegfx 0x27E4 + loadspritegfx ANIM_TAG_212 monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A5C8, 0x5 + createvisualtask sub_815A5C8, 5 waitbgfadein - delay 0x6 - createvisualtask sub_8115A04, 0x2, 1, 2, 8, 0, 10, 0 - delay 0x0 + delay 6 + createvisualtask sub_8115A04, 2, 1, 2, 8, 0, 10, RGB_BLACK + delay 0 monbgprio_28 ANIM_ATTACKER - setalpha 0x808 - delay 0xA - createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 240, 0 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 0xE, 0xA - createsprite gUnknown_08596920, 0x2 - delay 0x6E - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 0x7, 0xA - waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, -8, 1, 24, 1 + setalpha 8, 8 + delay 10 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 + createsprite gUnknown_08596920, 2 + delay 110 + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 + waitforvisualfinish + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - call AnimScript_82D7CDD + call UnsetPsychicBackground end Move_KNOCK_OFF: - loadspritegfx 0x2825 - loadspritegfx 0x2797 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x4 + loadspritegfx ANIM_TAG_277 + loadspritegfx ANIM_TAG_135 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 4 playsewithpan SE_W233, SOUND_PAN_TARGET - createsprite gUnknown_085CE984, 0x82, -16, -16 - delay 0x8 - createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2 + createsprite gUnknown_085CE984, 130, -16, -16 + delay 8 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 playsewithpan SE_W004, SOUND_PAN_TARGET - createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 - delay 0xA + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + delay 10 waitforvisualfinish end Move_DOOM_DESIRE: - createvisualtask sub_8114960, 0x2 - delay 0x1 + createvisualtask sub_8114960, 2 + delay 1 monbg ANIM_ATK_PARTNER - createvisualtask sub_811489C, 0x5, 1, 0 - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 0 + createvisualtask sub_811489C, 5, 1, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB_BLACK waitforvisualfinish - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W060, SOUND_PAN_ATTACKER - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish - delay 0x14 - createvisualtask sub_811489C, 0x5, 1, 1 - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, 0 + delay 20 + createvisualtask sub_811489C, 5, 1, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end Move_SKY_UPPERCUT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout playsewithpan SE_W327, SOUND_PAN_ATTACKER - createvisualtask sub_810DABC, 0x5, 55 + createvisualtask sub_810DABC, 5, 55 waitbgfadein - setalpha 0x80C - delay 0x26 - createsprite gUnknown_0857FE70, 0x2, 0, 28, 0, 0, 5 - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 6, 1 + setalpha 12, 8 + delay 38 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5 + delay 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x83, -28, 28, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1 + delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x83, -15, 8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - delay 0x1 + delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x83, -5, -12, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1 + delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x83, 0, -32, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1 + delay 1 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x83, 5, -52, 1, 1 - createsprite gUnknown_0857FE70, 0x2, 1, -26, 16, 1, 4 - delay 0x4 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 - delay 0x1E - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 - delay 0x4 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4 + delay 4 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + delay 30 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + delay 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein end Move_SECRET_POWER: - createvisualtask sub_8117C24, 0x5 - jumpargeq 0x0, 0x0, Move_NEEDLE_ARM - jumpargeq 0x0, 0x1, Move_MAGICAL_LEAF - jumpargeq 0x0, 0x2, Move_MUD_SHOT - jumpargeq 0x0, 0x3, Move_WATERFALL - jumpargeq 0x0, 0x4, Move_SURF - jumpargeq 0x0, 0x5, Move_BUBBLE_BEAM - jumpargeq 0x0, 0x6, Move_ROCK_THROW - jumpargeq 0x0, 0x7, Move_BITE - jumpargeq 0x0, 0x8, Move_STRENGTH + createvisualtask AnimTask_GetBattleTerrain, 5 + jumpargeq 0, BATTLE_TERRAIN_GRASS, Move_NEEDLE_ARM + jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF + jumpargeq 0, BATTLE_TERRAIN_SAND, Move_MUD_SHOT + jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL + jumpargeq 0, BATTLE_TERRAIN_WATER, Move_SURF + jumpargeq 0, BATTLE_TERRAIN_POND, Move_BUBBLE_BEAM + jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN, Move_ROCK_THROW + jumpargeq 0, BATTLE_TERRAIN_CAVE, Move_BITE + jumpargeq 0, BATTLE_TERRAIN_BUILDING, Move_STRENGTH goto Move_SLAM Move_TWISTER: - loadspritegfx 0x274F - loadspritegfx 0x2797 - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET playsewithpan SE_W239, SOUND_PAN_TARGET - createsprite gUnknown_085923A8, 0x82, 120, 70, 5, 70, 30 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 55, 6, 60, 25 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 60, 7, 60, 30 - createsprite gUnknown_085923A8, 0x82, 115, 55, 10, 60, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 100, 50, 4, 50, 26 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 105, 25, 8, 60, 20 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 40, 10, 48, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 120, 30, 6, 45, 25 - createsprite gUnknown_085923A8, 0x82, 115, 35, 10, 60, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 105, 20, 8, 40, 0 - delay 0x3 - createsprite gUnknown_085923A8, 0x82, 20, 255, 15, 32, 0 - createsprite gUnknown_085923A8, 0x82, 110, 10, 8, 32, 20 - waitforvisualfinish - createsprite gUnknown_08597358, 0x83, -32, -16, 1, 3 + createsprite gUnknown_085923A8, 130, 120, 70, 5, 70, 30 + delay 1 + createsprite gUnknown_085923A8, 130, 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 + delay 3 + createsprite gUnknown_08596CC8, 130, 100, 50, 4, 50, 26 + delay 1 + createsprite gUnknown_085923A8, 130, 105, 25, 8, 60, 20 + delay 1 + createsprite gUnknown_085923A8, 130, 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 + delay 3 + createsprite gUnknown_08596CC8, 130, 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 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 12, 1 - createvisualtask sub_80D5484, 0x2, 3, 3, 0, 12, 1 - delay 0x4 - createsprite gUnknown_085973A0, 0x83, 1, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 + delay 4 + createsprite gUnknown_085973A0, 131, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_085973A0, 0x83, 1, 3 + delay 4 + createsprite gUnknown_085973A0, 131, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08597358, 0x83, 32, 20, 1, 3 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -9840,1098 +9689,1059 @@ Move_TWISTER: end Move_MAGICAL_LEAF: - loadspritegfx 0x274F - loadspritegfx 0x27B0 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_160 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 0xA, 0x5 - createvisualtask sub_81007C4, 0x5 - createsprite gUnknown_08592390, 0x2, -3, -2, 10 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -1, 15 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -4, -4, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 3, -3, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -6, 8 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -1, 12 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -4, 13 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 4, -5, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -6, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -5, 8 - delay 0x3C + setalpha 12, 8 + delay 1 + loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + createvisualtask sub_81007C4, 5 + createsprite gUnknown_08592390, 2, -3, -2, 10 + delay 2 + createsprite gUnknown_08592390, 2, -1, -1, 15 + delay 2 + createsprite gUnknown_08592390, 2, -4, -4, 7 + delay 2 + createsprite gUnknown_08592390, 2, 3, -3, 11 + delay 2 + createsprite gUnknown_08592390, 2, -1, -6, 8 + delay 2 + createsprite gUnknown_08592390, 2, 2, -1, 12 + delay 2 + createsprite gUnknown_08592390, 2, -3, -4, 13 + delay 2 + createsprite gUnknown_08592390, 2, 4, -5, 7 + delay 2 + createsprite gUnknown_08592390, 2, 2, -6, 11 + delay 2 + createsprite gUnknown_08592390, 2, -3, -5, 8 + delay 60 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, 20, 0 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, -20, 0 - delay 0x1E + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, 20, 0 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, -20, 0 + delay 30 playsewithpan SE_W013, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x84, -10, -4, 1, 2 - createsprite gUnknown_08597358, 0x84, 10, 4, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - delay 0x14 - setarg 0x7, 0xFFFF + createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + delay 20 + setarg 7, -1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_ICE_BALL: - loadspritegfx 0x273B - loadspritegfx 0x279D - createvisualtask sub_810CDFC, 0x5, 0 - jumpargeq 0x0, 0x4, AnimScript_82D731B - -AnimScript_82D72BB: + loadspritegfx ANIM_TAG_ICE_CHUNK + loadspritegfx ANIM_TAG_141 + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 4, IceBallSetIceBg +IceBallContinue: playsewithpan SE_W196, SOUND_PAN_ATTACKER - createsprite gUnknown_08595DE4, 0x82, 15, 0, -12, -16, 30, -40 - delay 0x1C + createsprite gUnknown_08595DE4, 130, 15, 0, -12, -16, 30, -40 + delay 28 playsewithpan SE_W280, SOUND_PAN_TARGET - createvisualtask sub_810CDFC, 0x5, 0 - jumpargeq 0x0, 0x0, AnimScript_82D732C - jumpargeq 0x0, 0x1, AnimScript_82D735B - jumpargeq 0x0, 0x2, AnimScript_82D7394 - jumpargeq 0x0, 0x3, AnimScript_82D73D7 - jumpargeq 0x0, 0x4, AnimScript_82D741F - -AnimScript_82D7309: - createvisualtask sub_810CDFC, 0x5, 0 - jumpargeq 0x0, 0x4, AnimScript_82D7322 - -AnimScript_82D731A: - end - -AnimScript_82D731B: + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 0, IceBallWeakest + jumpargeq 0, 1, IceBallWeak + jumpargeq 0, 2, IceBallMediun + jumpargeq 0, 3, IceBallStrong + jumpargeq 0, 4, IceBallStrongest +IceBallContinue2: + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 4, IceBallUnsetIceBg +IceBallEnd: + end +IceBallSetIceBg: fadetobg BG_ICE - goto AnimScript_82D72BB - -AnimScript_82D7322: + goto IceBallContinue +IceBallUnsetIceBg: waitbgfadein - delay 0x2D + delay 45 restorebg waitbgfadein - goto AnimScript_82D731A - -AnimScript_82D732C: - createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D735B: - createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D7394: - createvisualtask sub_80D6388, 0x2, 0, 1, 14, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D73D7: - createvisualtask sub_80D6388, 0x2, 0, 1, 18, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D741F: - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D7467: - createsprite gUnknown_08595DFC, 0x84, -12, -16 + goto IceBallEnd +IceBallWeakest: + createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallWeak: + createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallMediun: + createvisualtask sub_80D6388, 2, 0, 1, 14, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallStrong: + createvisualtask sub_80D6388, 2, 0, 1, 18, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallStrongest: + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBall1: + createsprite gUnknown_08595DFC, 132, -12, -16 return Move_WEATHER_BALL: - loadspritegfx 0x282B - createsprite gUnknown_0857FE40, 0x2, 8, 1, 0 - delay 0x8 + loadspritegfx ANIM_TAG_283 + createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + delay 8 playsewithpan SE_W207, SOUND_PAN_ATTACKER - createsprite gUnknown_0853EE38, 0x2 + createsprite gUnknown_0853EE38, 2 waitforvisualfinish - delay 0xF + delay 15 playsewithpan SE_W197, 0 - createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0 - waitforvisualfinish - createvisualtask sub_81604F0, 0x2 - delay 0x1 - jumpargeq 0x7, 0x0, AnimScript_82D74DE - jumpargeq 0x7, 0x1, AnimScript_82D751B - jumpargeq 0x7, 0x2, AnimScript_82D757F - jumpargeq 0x7, 0x3, AnimScript_82D75E3 - jumpargeq 0x7, 0x4, AnimScript_82D7683 - -AnimScript_82D74DE: - loadspritegfx 0x2797 - createsprite gUnknown_0853EE50, 0x82, -30, -100, 25, 1, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 + waitforvisualfinish + createvisualtask AnimTask_GetWeather, 2 + delay 1 + jumpreteq ANIM_WEATHER_NONE, WeatherBallNormal + jumpreteq ANIM_WEATHER_SUN, WeatherBallFire + jumpreteq ANIM_WEATHER_RAIN, WeatherBallWater + jumpreteq ANIM_WEATHER_SANDSTORM, WeatherBallSandstorm + jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce +WeatherBallNormal: + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x84, -10, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end - -AnimScript_82D751B: - loadspritegfx 0x272D - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 40, 10 +WeatherBallFire: + loadspritegfx ANIM_TAG_SMALL_EMBER + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, -40, 20 + delay 10 + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, -40, 20 playsewithpan SE_W172, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 0, 0 + delay 10 + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W172B, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end - -AnimScript_82D757F: - loadspritegfx 0x27AB - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 50, 10 +WeatherBallWater: + loadspritegfx ANIM_TAG_155 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, SOUND_PAN_TARGET - delay 0x8 - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, -20, 20 + delay 8 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, -20, 20 playsewithpan SE_W152, SOUND_PAN_TARGET - delay 0xD - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 0, 0 + delay 13 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 playsewithpan SE_W202, SOUND_PAN_TARGET waitforvisualfinish end - -AnimScript_82D75E3: - loadspritegfx 0x274A - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 30, 0 +WeatherBallSandstorm: + loadspritegfx ANIM_TAG_058 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0x5 - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, -40, 20 + delay 5 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, -40, 20 playsewithpan SE_W088, SOUND_PAN_TARGET - delay 0xE - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 0, 0 + delay 14 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W070, SOUND_PAN_TARGET - createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 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_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish end - -AnimScript_82D7683: - loadspritegfx 0x2817 - loadspritegfx 0x279D - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, -40, 20 +WeatherBallIce: + loadspritegfx ANIM_TAG_263 + loadspritegfx ANIM_TAG_141 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 40, 0 + delay 10 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 40, 0 playsewithpan SE_W258, SOUND_PAN_TARGET - delay 0xA - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 0, 0 + delay 10 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 0, 0 playsewithpan SE_W258, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - call AnimScript_82D7720 + call FreezeEffect1 waitforvisualfinish end Move_COUNT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -AnimScript_82D7720: - createsprite gUnknown_08595B68, 0x82, -10, -10, 0 +FreezeEffect1: + createsprite gUnknown_08595B68, 130, -10, -10, 0 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 10, 20, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 10, 20, 0 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -5, 10, 0 + delay 4 + createsprite gUnknown_08595B68, 130, -5, 10, 0 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 17, -12, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 17, -12, 0 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, -15, 15, 0 + delay 4 + createsprite gUnknown_08595B80, 130, -15, 15, 0 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 0, 0, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 0, 0, 0 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B68, 0x82, 20, 2, 0 + delay 4 + createsprite gUnknown_08595B68, 130, 20, 2, 0 playsewithpan SE_W196, SOUND_PAN_TARGET return -AnimScript_82D77A4: - createsprite gUnknown_08595B68, 0x82, -10, -10, 1 +FreezeEffect2: + createsprite gUnknown_08595B68, 130, -10, -10, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 10, 20, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 10, 20, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -29, 0, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -29, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 29, -20, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 29, -20, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -5, 10, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -5, 10, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 17, -12, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 17, -12, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -20, 0, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -20, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, -15, 15, 1 + delay 4 + createsprite gUnknown_08595B80, 130, -15, 15, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 26, -5, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 26, -5, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 0, 0, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 0, 0, 1 playsewithpan SE_W196, SOUND_PAN_TARGET - delay 0x4 - createsprite gUnknown_08595B68, 0x82, 20, 2, 1 + delay 4 + createsprite gUnknown_08595B68, 130, 20, 2, 1 playsewithpan SE_W196, SOUND_PAN_TARGET return -AnimScript_82D7874: - loopsewithpan SE_W196, SOUND_PAN_TARGET, 0x6, 0x4 - createsprite gUnknown_08595C04, 0x82, 0, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 8, 24, 0 - createsprite gUnknown_08595C04, 0x82, -8, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 16, 24, 0 - createsprite gUnknown_08595C04, 0x82, -16, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 24, 24, 0 - createsprite gUnknown_08595C04, 0x82, -24, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 32, 24, 0 - createsprite gUnknown_08595C04, 0x82, -32, 24, 0 +IcyWindEffect1: @ Unused + loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + createsprite gUnknown_08595C04, 130, 0, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 8, 24, 0 + createsprite gUnknown_08595C04, 130, -8, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 16, 24, 0 + createsprite gUnknown_08595C04, 130, -16, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 24, 24, 0 + createsprite gUnknown_08595C04, 130, -24, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 32, 24, 0 + createsprite gUnknown_08595C04, 130, -32, 24, 0 return -AnimScript_82D78F8: - loopsewithpan SE_W196, SOUND_PAN_TARGET, 0x6, 0x4 - createsprite gUnknown_08595C04, 0x82, 0, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 8, 24, 1 - createsprite gUnknown_08595C04, 0x82, -8, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 16, 24, 1 - createsprite gUnknown_08595C04, 0x82, -16, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 24, 24, 1 - createsprite gUnknown_08595C04, 0x82, -24, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 32, 24, 1 - createsprite gUnknown_08595C04, 0x82, -32, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 40, 24, 1 - createsprite gUnknown_08595C04, 0x82, -40, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 48, 24, 1 - createsprite gUnknown_08595C04, 0x82, -48, 24, 1 +IcyWindEffect2: + loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + createsprite gUnknown_08595C04, 130, 0, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 8, 24, 1 + createsprite gUnknown_08595C04, 130, -8, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 16, 24, 1 + createsprite gUnknown_08595C04, 130, -16, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 24, 24, 1 + createsprite gUnknown_08595C04, 130, -24, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 32, 24, 1 + createsprite gUnknown_08595C04, 130, -32, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 40, 24, 1 + createsprite gUnknown_08595C04, 130, -40, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 48, 24, 1 + createsprite gUnknown_08595C04, 130, -48, 24, 1 return -AnimScript_82D79B4: - createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60 - delay 0x8 - createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60 - delay 0x8 +GrantingStarsEffect: + createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + delay 8 + createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 + delay 8 return -AnimScript_82D79DF: +HealingEffect: playsewithpan SE_W071B, SOUND_PAN_ATTACKER - createsprite gUnknown_08592F2C, 0x2, 0, -5, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, -15, 10, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, -15, -15, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, 10, -5, 0, 0 - delay 0x7 + createsprite gUnknown_08592F2C, 2, 0, -5, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, -15, 10, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, -15, -15, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, 10, -5, 0, 0 + delay 7 return -AnimScript_82D7A28: +HealingEffect2: playsewithpan SE_W071B, SOUND_PAN_TARGET - createsprite gUnknown_08592F2C, 0x82, 0, -5, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, -15, 10, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, -15, -15, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, 10, -5, 1, 0 - delay 0x7 + createsprite gUnknown_08592F2C, 130, 0, -5, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, -15, 10, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, -15, -15, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, 10, -5, 1, 0 + delay 7 return -AnimScript_82D7A71: - createsprite gUnknown_08596240, 0x82, 10, 10, 0 +PoisonBubblesEffect: + createsprite gPoisonBubbleSpriteTemplate, 130, 10, 10, 0 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596240, 0x82, 20, -20, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 20, -20, 0 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596240, 0x82, -20, 15, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, -20, 15, 0 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596240, 0x82, 0, 0, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 0, 0, 0 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596240, 0x82, -20, -20, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, -20, -20, 0 playsewithpan SE_W092, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596240, 0x82, 16, -8, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 16, -8, 0 playsewithpan SE_W092, SOUND_PAN_TARGET return -AnimScript_82D7AE2: - createsprite gUnknown_08596258, 0x2, 10, 10, 0 +WaterBubbleEffect: + createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, 20, -20, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, 15, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, 0, 0, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, -20, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, 16, -8, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 0 playsewithpan SE_W145C, SOUND_PAN_TARGET return -AnimScript_82D7B53: - createsprite gUnknown_08596258, 0x2, 10, 10, 1 +WaterBubbleEffect2: + createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, -28, -10, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -28, -10, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, 20, -20, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, 15, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, 0, 0, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, 27, 8, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 27, 8, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, -20, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET - delay 0x6 - createsprite gUnknown_08596258, 0x2, 16, -8, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET return -AnimScript_82D7BEA: +ElectricityEffect: playsewithpan SE_W085B, SOUND_PAN_TARGET - createsprite gUnknown_08595810, 0x82, 5, 0, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -5, 10, 5, 1 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 15, 20, 5, 2 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -15, -10, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 25, 0, 5, 1 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -8, 8, 5, 2 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 2, -8, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -20, 15, 5, 1 + createsprite gElectricitySpriteTemplate, 130, 5, 0, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -5, 10, 5, 1 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 15, 20, 5, 2 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -15, -10, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 25, 0, 5, 1 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -8, 8, 5, 2 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 2, -8, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -20, 15, 5, 1 return -AnimScript_82D7C75: - loopsewithpan SE_W146, SOUND_PAN_TARGET, 0xD, 0x6 - createsprite gUnknown_0859725C, 0x82, 0, -15, 0, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 51, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 102, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 153, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 204, 3, 90 +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 return -AnimScript_82D7CD1: +SetPsychicBackground: fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A504, 0x5 + createvisualtask sub_815A504, 5 waitbgfadein return -AnimScript_82D7CDD: +UnsetPsychicBackground: restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein return -AnimScript_82D7CE5: - jumpifcontest AnimScript_82D7CFE +SetFlyingBg: + jumpifcontest SetBgFlyingContest fadetobg BG_FLYING waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 - -AnimScript_82D7CFC: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +SetBgFlyingContinue: waitbgfadein return - -AnimScript_82D7CFE: +SetBgFlyingContest: fadetobg BG_FLYING_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto AnimScript_82D7CFC + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto SetBgFlyingContinue -AnimScript_82D7D15: +UnsetFlyingBg: restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, -1 waitbgfadein return -AnimScript_82D7D1D: - createvisualtask sub_8117E60, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D7D42 - createvisualtask sub_815A8C8, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D7D50 - goto AnimScript_82D7D49 - -AnimScript_82D7D40: +SetSolarbeamBg: + createvisualtask AnimTask_IsContest, 2 + jumprettrue SetSolarbeamBgContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse SetSolarbeamBgOpponent + goto SetSolarbeamBgPlayer +SetSolarbeamBgContinue: waitbgfadein return - -AnimScript_82D7D42: +SetSolarbeamBgContest: fadetobg BG_SOLARBEAM_CONTESTS - goto AnimScript_82D7D40 - -AnimScript_82D7D49: + goto SetSolarbeamBgContinue +SetSolarbeamBgPlayer: fadetobg BG_SOLARBEAM_PLAYER - goto AnimScript_82D7D40 - -AnimScript_82D7D50: + goto SetSolarbeamBgContinue +SetSolarbeamBgOpponent: fadetobg BG_SOLARBEAM_OPPONENT - goto AnimScript_82D7D40 + goto SetSolarbeamBgContinue -AnimScript_82D7D57: +UnsetSolarbeamBg: restorebg waitbgfadein return Status_Poison: - loopsewithpan SE_W092, SOUND_PAN_TARGET, 0xD, 0x6 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 18, 2 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 12, 31774 + loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end Status_Confusion: - loadspritegfx 0x2759 - call AnimScript_82D7C75 + loadspritegfx ANIM_TAG_DUCK + call ConfusionEffect end Status_Burn: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W172, SOUND_PAN_TARGET - call AnimScript_82D7DA6 - call AnimScript_82D7DA6 - call AnimScript_82D7DA6 + call Burn1 + call Burn1 + call Burn1 waitforvisualfinish end - -AnimScript_82D7DA6: - createsprite gUnknown_08595504, 0x82, -24, 24, 24, 24, 20, 1, 1 - delay 0x4 +Burn1: + createsprite gUnknown_08595504, 130, -24, 24, 24, 24, 20, 1, 1 + delay 4 return Status_Infatuation: - loadspritegfx 0x27E2 + loadspritegfx ANIM_TAG_PURPLE_HEART playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite gUnknown_08593970, 0x3, 0, 20 - delay 0xF + createsprite gUnknown_08593970, 3, 0, 20 + delay 15 playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite gUnknown_08593970, 0x3, -20, 20 - delay 0xF + createsprite gUnknown_08593970, 3, -20, 20 + delay 15 playsewithpan SE_W204, SOUND_PAN_ATTACKER - createsprite gUnknown_08593970, 0x3, 20, 20 + createsprite gUnknown_08593970, 3, 20, 20 end Status_Sleep: - loadspritegfx 0x27F4 + loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_W173, SOUND_PAN_ATTACKER - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x1E - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 30 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 end Status_Paralysis: - loadspritegfx 0x271B - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - call AnimScript_82D7BEA + loadspritegfx ANIM_TAG_SPARK_2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + call ElectricityEffect end Status_Freeze: playsewithpan SE_W196, 0 - loadspritegfx 0x271A + loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 0x11 - createvisualtask sub_80A9EF4, 0x2 + waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + createvisualtask sub_80A9EF4, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Status_Curse: - loadspritegfx 0x27D8 + loadspritegfx ANIM_TAG_200 monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite gUnknown_08596DE8, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596DE8, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Status_Nightmare: - loadspritegfx 0x27ED + loadspritegfx ANIM_TAG_EVIL_ANGEL monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET - createsprite gUnknown_08596E00, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596E00, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_CastformTransform: - createvisualtask sub_815BB18, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D7ECA +General_CastformChange: + createvisualtask sub_815BB18, 2 + jumpreteq 1, AnimScript_82D7ECA goto AnimScript_82D7EB2 - AnimScript_82D7EB2: monbg ANIM_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 0x30 - createvisualtask sub_815B7D0, 0x2, 1 + waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + createvisualtask sub_815B7D0, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER end - AnimScript_82D7ECA: - createvisualtask sub_815BB58, 0x2, 1 + createvisualtask sub_815BB58, 2, 1 end -Anim_StatChange: - createvisualtask AnimTask_StatsChange, 0x5 +General_StatsChange: + createvisualtask AnimTask_StatsChange, 5 waitforvisualfinish end -Anim_SubsituteOff: +General_SubstituteFade: monbg ANIM_ATTACKER - createvisualtask sub_8172D98, 0x5 - createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, 0x7FFF + createvisualtask sub_8172D98, 5 + createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_ATTACKER - delay 0x2 - blendoff - createvisualtask sub_8116620, 0xA, 2, 0, 0, 0, 0x7FFF - createvisualtask sub_8172BF0, 0x2, 1 - end - -Anim_SubsituteOn: - createvisualtask sub_815F20C, 0x2 - end - -Anim_Table_4: - createvisualtask sub_817345C, 0x2, 0 - createvisualtask sub_81732B0, 0x2 - delay 0x0 - waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 0x16 - createsprite gUnknown_085E5338, 0x83, -18, 12, 0, 32 - delay 0x32 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 0x13, 0x2 - createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 2, 1 - waitforvisualfinish - createvisualtask sub_81732E4, 0x2 - end - -Anim_ItemKnockOff: - loadspritegfx 0x27F0 - createsprite gUnknown_08592628, 0x82 - end - -Status_Wrap: - createvisualtask sub_81734B4, 0x5 - jumpargeq 0x0, 0x1, AnimScript_82D7FE9 - jumpargeq 0x0, 0x2, AnimScript_82D800E - jumpargeq 0x0, 0x3, AnimScript_82D8062 - jumpargeq 0x0, 0x4, AnimScript_82D80BF - goto AnimScript_82D7FA1 - -AnimScript_82D7FA1: - loadspritegfx 0x27CA - loopsewithpan SE_W010, SOUND_PAN_TARGET, 0x6, 0x2 - createsprite gUnknown_08592494, 0x84, 0, 16, 0, 1 - delay 0x7 - createsprite gUnknown_08592494, 0x82, 0, 8, 1, 1 - delay 0x3 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - delay 0x14 - setarg 0x7, 0xFFFF + delay 2 + blendoff + createvisualtask sub_8116620, 10, 2, 0, 0, 0, RGB_WHITE + createvisualtask sub_8172BF0, 2, 1 + end + +General_SubstituteAppear: + createvisualtask AnimTask_MonToSubstitute, 2 + end + +General_PokeblockThrow: + createvisualtask sub_817345C, 2, 0 + createvisualtask sub_81732B0, 2 + delay 0 + waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 + createsprite gBattleAnimSpriteTemplate_85E5338, 131, -18, 12, 0, 32 + delay 50 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET + waitforvisualfinish + createvisualtask sub_81732E4, 2 + end + +General_ItemKnockoff: + loadspritegfx ANIM_TAG_ITEM_BAG + createsprite gBattleAnimSpriteTemplate_8592628, 130 + end + +General_TurnTrap: + createvisualtask AnimTask_GetTrappedMoveAnimId, 5 + jumpargeq 0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin + jumpargeq 0, TRAP_ANIM_WHIRLPOOL, Status_Whrilpool + jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp + jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb + goto Status_BindWrap +Status_BindWrap: + loadspritegfx ANIM_TAG_186 + loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 + createsprite gUnknown_08592494, 132, 0, 16, 0, 1 + delay 7 + createsprite gUnknown_08592494, 130, 0, 8, 1, 1 + delay 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + delay 20 + setarg 7, -1 playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish end - -AnimScript_82D7FE9: - loadspritegfx 0x272D +Status_FireSpin: + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - call AnimScript_82CACBF - call AnimScript_82CACBF + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + call FireSpinEffect + call FireSpinEffect waitforvisualfinish stopsound end - -AnimScript_82D800E: - loadspritegfx 0x27A5 +Status_Whrilpool: + loadspritegfx ANIM_TAG_149 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x0 - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) + setalpha 12, 8 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, SOUND_PAN_TARGET - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - call AnimScript_82D1F5B - call AnimScript_82D1F5B - delay 0xC - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + call WhirlpoolEffect + call WhirlpoolEffect + delay 12 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish stopsound clearmonbg ANIM_DEF_PARTNER end - -AnimScript_82D8062: - loadspritegfx 0x27A1 - loadspritegfx 0x2797 +Status_Clamp: + loadspritegfx ANIM_TAG_145 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 + createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, 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 waitforvisualfinish clearmonbg ANIM_TARGET blendoff waitforvisualfinish end - -AnimScript_82D80BF: - loadspritegfx 0x275A - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 +Status_SandTomb: + loadspritegfx ANIM_TAG_074 + createsprite gSimplePaletteBlendSpriteTemplate, 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 AnimScript_82D51B7 - call AnimScript_82D51B7 - delay 0x16 - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0) + call SandTombEffect + call SandTombEffect + delay 22 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish stopsound end -Anim_ItemEffect: - loadspritegfx 0x27DB - loadspritegfx 0x2741 - delay 0x0 +General_ItemEffect: + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_SPARKLE + delay 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W036, SOUND_PAN_ATTACKER - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W234, SOUND_PAN_ATTACKER - call AnimScript_82D79B4 + call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER - createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, RGB(17, 31, 25) - createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 3, 7, 0, RGB(17, 31, 25) + createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 waitforvisualfinish end -Anim_SmokeBallEscape: - loadspritegfx 0x2802 +General_SmokeballEscape: + loadspritegfx ANIM_TAG_242 monbg ANIM_ATTACKER - setalpha 0x40C - delay 0x0 + setalpha 12, 4 + delay 0 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gUnknown_085CE734, 0x80, 0, 32, 28, 30 - delay 0x4 + createsprite gUnknown_085CE734, 128, 0, 32, 28, 30 + delay 4 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gUnknown_085CE734, 0x7F, 2, 12, 20, 30 - delay 0xC + createsprite gUnknown_085CE734, 127, 2, 12, 20, 30 + delay 12 playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gUnknown_085CE734, 0x7E, 2, -28, 4, 30 - delay 0xC + delay 12 playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gUnknown_085CE734, 0x7C, 2, 14, -20, 30 - delay 0x4 + delay 4 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createvisualtask sub_81136E8, 0x2, 2 + createvisualtask sub_81136E8, 2, 2 createsprite gUnknown_085CE734, 0x7B, 3, 4, 4, 30 - delay 0xE + delay 14 playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gUnknown_085CE734, 0x7A, 3, -14, 18, 46 - delay 0x0 + delay 0 createsprite gUnknown_085CE734, 0x79, 3, 14, -14, 46 - delay 0x0 - createsprite gUnknown_085CE734, 0x78, 3, -12, -10, 46 - delay 0x0 + delay 0 + createsprite gUnknown_085CE734, 120, 3, -12, -10, 46 + delay 0 createsprite gUnknown_085CE734, 0x77, 3, 14, 14, 46 - delay 0x0 + delay 0 createsprite gUnknown_085CE734, 0x76, 3, 0, 0, 46 waitforvisualfinish clearmonbg ANIM_ATTACKER invisible ANIM_ATTACKER - delay 0x0 + delay 0 blendoff end -Anim_HangedOn: - createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, RGB_RED +General_HangedOn: + createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 7, 0, 9, RGB_RED playsewithpan SE_W082, SOUND_PAN_ATTACKER - createvisualtask sub_815DB90, 0x5, 30, 128, 0, 1, 2, 0, 1 + createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 4, 9, 0, RGB_RED waitforvisualfinish - delay 0x6 - createsprite gUnknown_0857FE58, 0x0, 0, 0, 15 + delay 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 0, 0, 0, 15 end -Anim_Rain: - loadspritegfx 0x2783 +General_Rain: + loadspritegfx ANIM_TAG_115 playsewithpan SE_W240, SOUND_PAN_ATTACKER - createvisualtask sub_8116620, 0xA, 1921, 2, 0, 4, 0 + createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_8107188, 0x2, 0, 3, 60 - createvisualtask sub_8107188, 0x2, 0, 3, 60 - delay 0x32 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 + delay 50 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1921, 2, 4, 0, 0 + createvisualtask sub_8116620, 10, 0x781, 2, 4, 0, RGB_BLACK waitforvisualfinish end -Anim_Sun: +General_Sun: goto Move_SUNNY_DAY -Anim_Sandstorm: +General_Sandstorm: goto Move_SANDSTORM -Anim_Hail: +General_Hail: goto Move_HAIL -Status_LeechSeed: - createvisualtask sub_817351C, 0x5 - delay 0x0 +General_LeechSeedDrain: + createvisualtask sub_817351C, 5 + delay 0 goto Move_ABSORB -Anim_Hit: - loadspritegfx 0x2797 +General_MonHit: + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_ItemSteal: - loadspritegfx 0x27F0 - createvisualtask sub_8117F30, 0x2 - createvisualtask sub_8172ED0, 0x2 - delay 0x1 - createsprite gUnknown_08592670, 0x2, 0, -5, 10, 2, -1 +General_ItemSteal: + loadspritegfx ANIM_TAG_ITEM_BAG + createvisualtask sub_8117F30, 2 + createvisualtask sub_8172ED0, 2 + delay 1 + createsprite gUnknown_08592670, 2, 0, -5, 10, 2, -1 end -Anim_SnatchMove: - loadspritegfx 0x27F0 - createvisualtask sub_8117E94, 0x2 +General_SnatchMove: + loadspritegfx ANIM_TAG_ITEM_BAG + createvisualtask sub_8117E94, 2 call AnimScript_82D85A3 - delay 0x1 - createvisualtask sub_80D5EB8, 0x2, 0, 5, 5120, 4, 1 + delay 1 + createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_TARGET waitforvisualfinish - createvisualtask sub_8117EC4, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D839F - goto AnimScript_82D83AF - -AnimScript_82D8398: + createvisualtask AnimTask_IsTargetSameSide, 2 + jumpretfalse SnatchOpposingMonMove + goto SnatchPartnerMonMove +SnatchMoveContinue: waitforvisualfinish call AnimScript_82D85C3 end - -AnimScript_82D839F: +SnatchOpposingMonMove: playsewithpan SE_W104, SOUND_PAN_ATTACKER - createvisualtask sub_815F8F4, 0x2 - goto AnimScript_82D8398 - -AnimScript_82D83AF: + createvisualtask sub_815F8F4, 2 + goto SnatchMoveContinue +SnatchPartnerMonMove: playsewithpan SE_W104, SOUND_PAN_ATTACKER - createvisualtask sub_815FFC4, 0x2 - goto AnimScript_82D8398 + createvisualtask sub_815FFC4, 2 + goto SnatchMoveContinue -Anim_FutureSightHit: - createvisualtask sub_8117F10, 0x2 +General_FutureSightHit: + createvisualtask sub_8117F10, 2 monbg ANIM_DEF_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER - call AnimScript_82D7CD1 - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_TARGET - waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 0x8 - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -5, -5, 15, 1, 1 + 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 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 24, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 24, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish - delay 0x1 - call AnimScript_82D7CDD + delay 1 + call UnsetPsychicBackground end -Anim_DoomDesireHit: - createvisualtask sub_8117F10, 0x2 - loadspritegfx 0x27D6 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, RGB_WHITE +General_DoomDesireHit: + createvisualtask sub_8117F10, 2 + loadspritegfx ANIM_TAG_EXPLOSION + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish - delay 0xA - createvisualtask sub_815C0A4, 0x5 - delay 0x9 + delay 10 + createvisualtask sub_815C0A4, 5 + delay 9 playsewithpan SE_W109, SOUND_PAN_ATTACKER - delay 0x9 + delay 9 playsewithpan SE_W109, 0 - delay 0x9 + delay 9 playsewithpan SE_W109, SOUND_PAN_TARGET - delay 0x19 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 20, 1 + delay 25 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end -Anim_Table_x14: - loadspritegfx 0x27C8 +General_FocusPunchSetUp: + loadspritegfx ANIM_TAG_184 playsewithpan SE_W082, SOUND_PAN_ATTACKER - call AnimScript_82CD6C7 - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call AnimScript_82CD6C7 - delay 0x8 - call AnimScript_82CD6C7 + 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 + call EndureEffect + delay 8 + call EndureEffect waitforvisualfinish end -Status_Ingrain: - loadspritegfx 0x27A3 - loadspritegfx 0x272F +General_IngrainHeal: + loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish - delay 0x3 - call AnimScript_82D1009 + delay 3 + call AbsorbEffect waitforvisualfinish - delay 0xF - call AnimScript_82D79DF + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_WishHeal: - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 +General_WishHeal: + loadspritegfx ANIM_TAG_SPARKLE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W025, SOUND_PAN_ATTACKER - call AnimScript_82D79B4 + call GrantingStarsEffect waitforvisualfinish - unloadspritegfx 0x2741 - loadspritegfx 0x272F - call AnimScript_82D79DF + unloadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_BLUE_STAR + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK end AnimScript_82D85A3: - createvisualtask sub_8172E9C, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D85B4 - + createvisualtask sub_8172E9C, 2 + jumpreteq 1, AnimScript_82D85B4 AnimScript_82D85B2: waitforvisualfinish return - AnimScript_82D85B4: - createvisualtask sub_8172BF0, 0x2, 1 + createvisualtask sub_8172BF0, 2, 1 waitforvisualfinish goto AnimScript_82D85B2 AnimScript_82D85C3: - createvisualtask sub_8172E9C, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D85D4 - + createvisualtask sub_8172E9C, 2 + jumpreteq 1, AnimScript_82D85D4 AnimScript_82D85D2: waitforvisualfinish return - AnimScript_82D85D4: - createvisualtask sub_8172BF0, 0x2, 0 + createvisualtask sub_8172BF0, 2, 0 waitforvisualfinish goto AnimScript_82D85D2 -Anim_LevelUp: +Special_LevelUp: playsewithpan SE_EXPMAX, 0 - createvisualtask sub_8170920, 0x2 - delay 0x0 - createvisualtask sub_8170A0C, 0x5, 0, 0 + createvisualtask sub_8170920, 2 + delay 0 + createvisualtask sub_8170A0C, 5, 0, 0 waitforvisualfinish - createvisualtask sub_81709EC, 0x2 + createvisualtask sub_81709EC, 2 end -Anim_SwitchOutPlayer: - createvisualtask sub_8170BB0, 0x2 - delay 0xA - createvisualtask sub_8170B04, 0x2 +Special_SwitchOutPlayerMon: + createvisualtask sub_8170BB0, 2 + delay 10 + createvisualtask sub_8170B04, 2 end -Anim_SwitchOutOpponent: - createvisualtask sub_8170BB0, 0x2 - delay 0xA - createvisualtask sub_8170B04, 0x2 +Special_SwitchOutOpponentMon: + createvisualtask sub_8170BB0, 2 + delay 10 + createvisualtask sub_8170B04, 2 end -Anim_BallThrow: - createvisualtask sub_8170CFC, 0x2 - delay 0x0 +Special_BallThrow: + createvisualtask sub_8170CFC, 2 + delay 0 playsewithpan SE_NAGERU, 0 - createvisualtask sub_8170E04, 0x2 - createvisualtask sub_8170D4C, 0x2 - jumpargeq 0x7, 0xFFFF, AnimScript_82D8652 - -AnimScript_82D8649: + createvisualtask sub_8170E04, 2 + createvisualtask AnimTask_IsBallBlockedByTrainer, 2 + jumpreteq -1, BallThrowTrainerBlock +BallThrowEnd: waitforvisualfinish - createvisualtask sub_8170D24, 0x2 + createvisualtask sub_8170D24, 2 end - -AnimScript_82D8652: - loadspritegfx 0x2797 - delay 0x19 +BallThrowTrainerBlock: + loadspritegfx ANIM_TAG_135 + delay 25 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x0 + setalpha 12, 8 + delay 0 playsewithpan SE_W003, SOUND_PAN_TARGET - createsprite gUnknown_08597358, 0x82, -4, -20, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82D8649 + goto BallThrowEnd -Anim_SafariBallThrow: - createvisualtask sub_8170CFC, 0x2 - delay 0x0 - createvisualtask sub_8170F2C, 0x2 +Special_SafariBallThrow: + createvisualtask sub_8170CFC, 2 + delay 0 + createvisualtask sub_8170F2C, 2 waitforvisualfinish - createvisualtask sub_8170D24, 0x2 + createvisualtask sub_8170D24, 2 end -Anim_SubstituteToMon: - createvisualtask sub_8172BF0, 0x2, 1 +Special_SubstituteToMon: + createvisualtask sub_8172BF0, 2, 1 end -Anim_MonToSubstitute: - createvisualtask sub_8172BF0, 0x2, 0 +Special_MonToSubstitute: + createvisualtask sub_8172BF0, 2, 0 end -- cgit v1.2.3 From 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 21 Oct 2018 15:07:10 -0400 Subject: begin ANIM_TAG port --- data/battle_anim_scripts.s | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data/battle_anim_scripts.s') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 9af3ed7a9..550f0087e 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -4130,7 +4130,7 @@ Move_AROMATHERAPY: playsewithpan SE_W080, 0 loadspritegfx ANIM_TAG_159 loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12) delay 1 monbg ANIM_ATTACKER @@ -4852,7 +4852,7 @@ Move_THUNDER_PUNCH: Move_SACRED_FIRE: loadspritegfx ANIM_TAG_FIRE - loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_W221, -64, 7, 5 createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0 delay 1 @@ -5234,7 +5234,7 @@ MudSlap1: Move_DRAGON_RAGE: loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_W082, -64 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 waitforvisualfinish @@ -5903,12 +5903,12 @@ Move_LEECH_LIFE: end Move_SYNTHESIS: - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18) playsewithpan SE_W025, -64 call GrantingStarsEffect waitforvisualfinish - unloadspritegfx ANIM_TAG_SPARKLE + unloadspritegfx ANIM_TAG_SPARKLE_2 delay 1 loadspritegfx ANIM_TAG_BLUE_STAR call HealingEffect @@ -6568,7 +6568,7 @@ Move_DYNAMIC_PUNCH: loadspritegfx ANIM_TAG_143 loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_EXPLOSION - loadspritegfx ANIM_TAG_007 + loadspritegfx ANIM_TAG_UNUSED_EXPLOSION delay 1 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6981,7 +6981,7 @@ FireMoveEffect: return Move_LEER: - loadspritegfx ANIM_TAG_GLARE + loadspritegfx ANIM_TAG_LEER monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 @@ -7725,13 +7725,13 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_BELL unloadspritegfx ANIM_TAG_MUSIC_NOTES unloadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, -64 createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx ANIM_TAG_SPARKLE + unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_203 playsewithpan SE_REAPOKE, -64 createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30) @@ -8142,7 +8142,7 @@ Move_TRICK: Move_WISH: loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish panse_27 SE_W115, +63, -64, -3, 0 @@ -8459,7 +8459,7 @@ Move_ROLE_PLAY: Move_REFRESH: loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W287, -64 createvisualtask sub_815DFCC, 2, 0 waitforvisualfinish @@ -9048,7 +9048,7 @@ ReturnStrongest1: return Move_COSMIC_POWER: - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_8159244, 5, 243, 0 playsewithpan SE_W322, 0 createvisualtask sub_8117610, 2, 0, 0, 15, 0 @@ -9073,7 +9073,7 @@ Move_COSMIC_POWER: end Move_BLAST_BURN: - loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_FIRE_PLUME loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -10424,7 +10424,7 @@ Status_SandTomb: General_ItemEffect: loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 playsewithpan SE_W036, -64 createvisualtask sub_80D622C, 2, 16, 128, 0, 2 @@ -10650,13 +10650,13 @@ General_IngrainHeal: end General_WishHeal: - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W025, -64 call GrantingStarsEffect waitforvisualfinish - unloadspritegfx ANIM_TAG_SPARKLE + unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_BLUE_STAR call HealingEffect waitforvisualfinish -- cgit v1.2.3 From f2363f598200236bd9a2a10929073f387a207459 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 21 Oct 2018 19:30:27 -0400 Subject: more tag names --- data/battle_anim_scripts.s | 98 +++++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'data/battle_anim_scripts.s') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 3a4b8a253..f0030c4ac 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -454,7 +454,7 @@ DoubleSlapRight: goto DoubleSlapContinue Move_POISON_POWDER: - loadspritegfx ANIM_TAG_065 + 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 @@ -479,7 +479,7 @@ Move_POISON_POWDER: end Move_STUN_SPORE: - loadspritegfx ANIM_TAG_068 + 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 @@ -503,7 +503,7 @@ Move_STUN_SPORE: end Move_SLEEP_POWDER: - loadspritegfx ANIM_TAG_067 + 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 @@ -1486,7 +1486,7 @@ SelfDestruct1: return Move_SLAM: - loadspritegfx ANIM_TAG_056 + loadspritegfx ANIM_TAG_SLAM_HIT loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET setalpha 12, 8 @@ -1676,7 +1676,7 @@ Move_PROTECT: end Move_DETECT: - loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_SPARKLE_4 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE @@ -1879,7 +1879,7 @@ Move_GUILLOTINE: end Move_PAY_DAY: - loadspritegfx ANIM_TAG_100 + loadspritegfx ANIM_TAG_COIN loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -2095,7 +2095,7 @@ Move_MEAN_LOOK: end Move_ROCK_THROW: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1 createsprite gUnknown_08596B04, 130, 0, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET @@ -2116,7 +2116,7 @@ Move_ROCK_THROW: end Move_ROCK_SLIDE: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1 createsprite gUnknown_08596B04, 130, -5, 1, -5, 1 @@ -2547,7 +2547,7 @@ Move_THRASH: end Move_SING: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_DEF_PARTNER createvisualtask sub_8102BE8, 2 waitforvisualfinish @@ -2606,7 +2606,7 @@ Move_EARTHQUAKE: end Move_FISSURE: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_81152DC, 3, 5, 10, 50 createvisualtask sub_81152DC, 3, 1, 10, 50 playsewithpan SE_W089, SOUND_PAN_TARGET @@ -2653,7 +2653,7 @@ Move_DIG: DigEnd: end DigSetUp: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_281 createsprite gUnknown_08597214, 1, 0, 0, 180 createsprite gUnknown_08597214, 1, 0, 1, 180 @@ -2810,7 +2810,7 @@ Move_MINIMIZE: end Move_METRONOME: - loadspritegfx ANIM_TAG_064 + loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_209 createsprite gUnknown_08593114, 11, 0, 100 playsewithpan SE_W118, SOUND_PAN_ATTACKER @@ -2855,7 +2855,7 @@ SkullBashAttack: goto SkullBashEnd Move_AMNESIA: - loadspritegfx ANIM_TAG_093 + loadspritegfx ANIM_TAG_AMNESIA call SetPsychicBackground delay 8 createsprite gUnknown_08596744, 20 @@ -2867,7 +2867,7 @@ Move_AMNESIA: end Move_KINESIS: - loadspritegfx ANIM_TAG_075 + loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground @@ -3233,8 +3233,8 @@ Move_CHARM: Move_ROLLOUT: loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_074 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -3276,7 +3276,7 @@ Move_FALSE_SWIPE: end Move_SWAGGER: - loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER @@ -3550,7 +3550,7 @@ Move_SMELLING_SALT: end Move_FOLLOW_ME: - loadspritegfx ANIM_TAG_064 + loadspritegfx ANIM_TAG_FINGER createsprite gUnknown_085931D4, 2, 0 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 18 @@ -3987,7 +3987,7 @@ Move_FEATHER_DANCE: end Move_TEETER_DANCE: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_DUCK createvisualtask sub_8160164, 5 createsprite gUnknown_08593050, 2, 0, 16, -2 @@ -4007,7 +4007,7 @@ Move_TEETER_DANCE: end Move_MUD_SPORT: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_8104938, 2, 0, 6 delay 24 createsprite gUnknown_085971E4, 130, 0, -4, -16 @@ -4168,7 +4168,7 @@ Move_AROMATHERAPY: Move_FAKE_TEARS: loadspritegfx ANIM_TAG_155 loadspritegfx ANIM_TAG_209 - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask sub_815C478, 5, 0, 2, 1 @@ -4226,7 +4226,7 @@ Move_ODOR_SLEUTH: end Move_GRASS_WHISTLE: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish createvisualtask sub_8102BE8, 2 @@ -4370,7 +4370,7 @@ Move_BLOCK: end Move_HOWL: - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_815D64C, 2, 0 delay 12 call RoarEffect @@ -4380,7 +4380,7 @@ Move_HOWL: end Move_BULK_UP: - loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_BREATH createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish @@ -4490,7 +4490,7 @@ Move_CALM_MIND: end Move_LEAF_BLADE: - loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_285 createvisualtask sub_80FFFC0, 5 delay 2 @@ -4575,7 +4575,7 @@ Move_HARDEN: end Move_BELLY_DRUM: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_193 createvisualtask sub_8102BE8, 2 waitforvisualfinish @@ -4955,7 +4955,7 @@ Move_DRAGON_BREATH: end Move_ROAR: - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 @@ -4983,7 +4983,7 @@ RoarEffect: return Move_GROWL: - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_8158E9C, 2, 0, 255 call RoarEffect delay 10 @@ -5016,7 +5016,7 @@ Snore1: return Move_LIGHT_SCREEN: - loadspritegfx ANIM_TAG_070 + loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_166 setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 @@ -5043,7 +5043,7 @@ SpecialScreenEffect: return Move_MIRROR_COAT: - loadspritegfx ANIM_TAG_070 + loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_168 setalpha 0, 16 createsprite gUnknown_08596590, 1, 40, 0, 10168 @@ -5056,7 +5056,7 @@ Move_MIRROR_COAT: end Move_REFLECT: - loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_167 setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 @@ -5182,7 +5182,7 @@ Move_FAINT_ATTACK: end Move_SAND_ATTACK: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 @@ -5210,7 +5210,7 @@ SandAttack1: return Move_MUD_SLAP: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_W028, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish @@ -6654,7 +6654,7 @@ Move_VITAL_THROW: end Move_ROCK_SMASH: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_143 monbg ANIM_DEF_PARTNER @@ -6820,7 +6820,7 @@ Move_PETAL_DANCE: end Move_RAZOR_LEAF: - loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_160 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER @@ -6861,7 +6861,7 @@ Move_RAZOR_LEAF: Move_NATURE_POWER: Move_ANCIENT_POWER: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -7539,7 +7539,7 @@ RazorWindUnleash: goto RazorWindContinue Move_DISABLE: - loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_SPARKLE_4 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 8, 8 @@ -7695,7 +7695,7 @@ Move_SOFT_BOILED: Move_HEAL_BELL: loadspritegfx ANIM_TAG_BELL - loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 loadspritegfx ANIM_TAG_203 createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish @@ -7723,7 +7723,7 @@ Move_HEAL_BELL: createvisualtask sub_8105D60, 5 waitforvisualfinish unloadspritegfx ANIM_TAG_BELL - unloadspritegfx ANIM_TAG_MUSIC_NOTES + unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 unloadspritegfx ANIM_TAG_203 loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, SOUND_PAN_ATTACKER @@ -7919,7 +7919,7 @@ Move_BATON_PASS: end Move_PERISH_SONG: - loadspritegfx ANIM_TAG_MUSIC_NOTES + 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 @@ -8513,7 +8513,7 @@ HyperVoiceEffect: return Move_SAND_TOMB: - loadspritegfx ANIM_TAG_074 + 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 playsewithpan SE_W328, SOUND_PAN_TARGET @@ -9119,7 +9119,7 @@ Move_BLAST_BURN: Move_ROCK_TOMB: loadspritegfx ANIM_TAG_X_SIGN - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0 @@ -9257,7 +9257,7 @@ DiveAttack1: return Move_ROCK_BLAST: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_135 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 3 @@ -9412,7 +9412,7 @@ Move_ASTONISH: Move_SEISMIC_TOSS: loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -9643,9 +9643,9 @@ Move_SECRET_POWER: goto Move_SLAM Move_TWISTER: - loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET playsewithpan SE_W239, SOUND_PAN_TARGET @@ -9689,7 +9689,7 @@ Move_TWISTER: end Move_MAGICAL_LEAF: - loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_160 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER @@ -9880,7 +9880,7 @@ WeatherBallWater: waitforvisualfinish end WeatherBallSandstorm: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 5 @@ -10410,7 +10410,7 @@ Status_Clamp: waitforvisualfinish end Status_SandTomb: - loadspritegfx ANIM_TAG_074 + 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 playsewithpan SE_W328, SOUND_PAN_TARGET -- cgit v1.2.3 From d267fcbfb10d3bbc4ecc560fb189986351024455 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 22 Oct 2018 10:36:43 -0400 Subject: name remaining tags --- data/battle_anim_scripts.s | 772 ++++++++++++++++++++++----------------------- 1 file changed, 386 insertions(+), 386 deletions(-) (limited to 'data/battle_anim_scripts.s') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f0030c4ac..e86c7b784 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -423,7 +423,7 @@ gBattleAnims_Special:: Move_NONE: Move_MIRROR_MOVE: Move_POUND: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -435,7 +435,7 @@ Move_POUND: end Move_DOUBLE_SLAP: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight @@ -527,8 +527,8 @@ Move_SLEEP_POWDER: end Move_SWIFT: - loadspritegfx ANIM_TAG_174 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_YELLOW_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W129, SOUND_PAN_ATTACKER @@ -554,7 +554,7 @@ Move_SWIFT: end Move_STRENGTH: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -580,7 +580,7 @@ Move_STRENGTH: end Move_TACKLE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 @@ -594,7 +594,7 @@ Move_TACKLE: end Move_BODY_SLAM: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -620,7 +620,7 @@ Move_BODY_SLAM: end Move_SUPERSONIC: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING monbg ANIM_ATK_PARTNER monbgprio_2A ANIM_ATTACKER setalpha 12, 8 @@ -642,7 +642,7 @@ Supersonic1: return Move_SCREECH: - loadspritegfx ANIM_TAG_164 + loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 call Screech1 call Screech1 @@ -699,8 +699,8 @@ FlameWheel1: @ Unused return Move_PIN_MISSILE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -728,8 +728,8 @@ Move_PIN_MISSILE: end Move_ICICLE_SPEAR: - loadspritegfx ANIM_TAG_262 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ICICLE_SPEAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -757,7 +757,7 @@ Move_ICICLE_SPEAR: end Move_TAKE_DOWN: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10 @@ -780,7 +780,7 @@ Move_TAKE_DOWN: end Move_DOUBLE_EDGE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish @@ -813,8 +813,8 @@ Move_DOUBLE_EDGE: end Move_POISON_STING: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -833,8 +833,8 @@ Move_POISON_STING: end Move_TWINEEDLE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -936,8 +936,8 @@ Ember1: return Move_MEGA_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK @@ -979,8 +979,8 @@ SetImpactContestsBG: goto SetImpactBackgroundRet Move_MEGA_KICK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK @@ -1004,8 +1004,8 @@ Move_MEGA_KICK: end Move_COMET_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim CometPunchLeft, CometPunchRight @@ -1027,7 +1027,7 @@ CometPunchRight: Move_SONIC_BOOM: loadspritegfx ANIM_TAG_AIR_WAVE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1073,7 +1073,7 @@ Move_THUNDER_SHOCK: Move_THUNDERBOLT: loadspritegfx ANIM_TAG_SPARK - loadspritegfx ANIM_TAG_282 + loadspritegfx ANIM_TAG_SHOCK_3 loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish @@ -1123,7 +1123,7 @@ Move_THUNDERBOLT: Move_THUNDER_WAVE: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 - loadspritegfx ANIM_TAG_173 + loadspritegfx ANIM_TAG_SPARK_H createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 @@ -1142,8 +1142,8 @@ Move_THUNDER_WAVE: end Move_BEAT_UP: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim BeatUpLeft, BeatUpRight @@ -1176,8 +1176,8 @@ BeatUpRight: goto BeatUpContinue Move_STOMP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET @@ -1198,7 +1198,7 @@ Move_TAIL_WHIP: end Move_CUT: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W015, SOUND_PAN_TARGET @@ -1212,7 +1212,7 @@ Move_CUT: end Move_HIDDEN_POWER: - loadspritegfx ANIM_TAG_217 + loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish @@ -1242,9 +1242,9 @@ Move_HIDDEN_POWER: end Move_REVERSAL: - loadspritegfx ANIM_TAG_236 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_BLUE_ORB + 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 waitforvisualfinish @@ -1270,7 +1270,7 @@ Move_REVERSAL: end Move_PURSUIT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein @@ -1297,8 +1297,8 @@ PursuitOnSwitchout: goto PursuitContinue Move_SPIKE_CANNON: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1336,7 +1336,7 @@ Move_SWORDS_DANCE: end Move_PSYCH_UP: - loadspritegfx ANIM_TAG_196 + loadspritegfx ANIM_TAG_SPIRAL monbg ANIM_ATK_PARTNER createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 @@ -1356,8 +1356,8 @@ Move_PSYCH_UP: Move_DIZZY_PUNCH: loadspritegfx ANIM_TAG_DUCK - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 call DizzyPunch1 @@ -1417,7 +1417,7 @@ FireSpinEffect: return Move_FURY_CUTTER: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013, SOUND_PAN_TARGET @@ -1487,7 +1487,7 @@ SelfDestruct1: Move_SLAM: loadspritegfx ANIM_TAG_SLAM_HIT - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W004, SOUND_PAN_ATTACKER @@ -1510,7 +1510,7 @@ Move_SLAM: end Move_VINE_WHIP: - loadspritegfx ANIM_TAG_287 + loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 6 @@ -1521,8 +1521,8 @@ Move_VINE_WHIP: end Move_DRILL_PECK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_162 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish @@ -1540,9 +1540,9 @@ Move_DRILL_PECK: end Move_WATERFALL: - loadspritegfx ANIM_TAG_148 - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 @@ -1654,7 +1654,7 @@ Explosion1: return Move_DEFENSE_CURL: - loadspritegfx ANIM_TAG_234 + loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 createvisualtask sub_811489C, 5, 0, 0 createvisualtask sub_815B338, 5 @@ -1691,7 +1691,7 @@ Move_DETECT: end Move_FRUSTRATION: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -1796,7 +1796,7 @@ Frustration_Weak: goto Frustration_Continue Move_SAFEGUARD: - loadspritegfx ANIM_TAG_244 + loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 playsewithpan SE_W208, SOUND_PAN_ATTACKER @@ -1814,7 +1814,7 @@ Move_SAFEGUARD: end Move_PAIN_SPLIT: - loadspritegfx ANIM_TAG_239 + loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gUnknown_085CE590, 2, -8, -42, 0 createsprite gUnknown_085CE590, 130, -8, -42, 1 delay 10 @@ -1838,8 +1838,8 @@ Move_PAIN_SPLIT: end Move_VICE_GRIP: - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -1854,8 +1854,8 @@ Move_VICE_GRIP: end Move_GUILLOTINE: - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS @@ -1880,7 +1880,7 @@ Move_GUILLOTINE: Move_PAY_DAY: loadspritegfx ANIM_TAG_COIN - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1942,7 +1942,7 @@ Outrage1: return Move_SPARK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) @@ -1988,7 +1988,7 @@ Move_SPARK: end Move_ATTRACT: - loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER delay 15 @@ -2029,7 +2029,7 @@ Growth1: return Move_WHIRLWIND: - loadspritegfx ANIM_TAG_162 + 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 @@ -2167,7 +2167,7 @@ RockSlide1: return Move_THIEF: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET delay 1 fadetobg BG_DARK @@ -2187,8 +2187,8 @@ Move_THIEF: end Move_BUBBLE_BEAM: - loadspritegfx ANIM_TAG_146 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -2225,8 +2225,8 @@ Bulbblebeam1: return Move_ICY_WIND: - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_142 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_ICE_SPIKES monbg ANIM_DEF_PARTNER createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE @@ -2382,8 +2382,8 @@ Move_CONVERSION_2: end Move_ROLLING_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 @@ -2404,7 +2404,7 @@ Move_ROLLING_KICK: end Move_HEADBUTT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2420,7 +2420,7 @@ Move_HEADBUTT: end Move_HORN_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER @@ -2438,7 +2438,7 @@ Move_HORN_ATTACK: end Move_FURY_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createvisualtask sub_80D6134, 2, 4, 256, 0, 2 choosetwoturnanim FuryAttackRight, FuryAttackLeft @@ -2462,7 +2462,7 @@ FuryAttackLeft: goto FuryAttackContinue Move_HORN_DRILL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest HornDrillInContest fadetobg BG_DRILL @@ -2529,8 +2529,8 @@ HornDrillInContest: goto HornDrillContinue Move_THRASH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask sub_8104C38, 2 createvisualtask sub_8104CA4, 2 createsprite gUnknown_08595EB0, 131, 1, 10, 0 @@ -2583,8 +2583,8 @@ Move_SING: end Move_LOW_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + 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 delay 4 @@ -2654,7 +2654,7 @@ DigEnd: end DigSetUp: loadspritegfx ANIM_TAG_MUD_SAND - loadspritegfx ANIM_TAG_281 + loadspritegfx ANIM_TAG_DIRT_MOUND createsprite gUnknown_08597214, 1, 0, 0, 180 createsprite gUnknown_08597214, 1, 0, 1, 180 monbg_22 ANIM_ATTACKER @@ -2672,8 +2672,8 @@ DigSetUp: createvisualtask sub_8114CBC, 2, 1 goto DigEnd DigUnleash: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_281 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_8114F14, 2, 0 waitforvisualfinish monbg ANIM_ATTACKER @@ -2728,7 +2728,7 @@ Move_AGILITY: end Move_QUICK_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 @@ -2745,7 +2745,7 @@ Move_QUICK_ATTACK: end Move_RAGE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_TARGET setalpha 12, 8 @@ -2811,7 +2811,7 @@ Move_MINIMIZE: Move_METRONOME: loadspritegfx ANIM_TAG_FINGER - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gUnknown_08593114, 11, 0, 100 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 @@ -2840,7 +2840,7 @@ SkullBashSetUp1: waitforvisualfinish return SkullBashAttack: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_8101C94, 2, 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2886,8 +2886,8 @@ Move_KINESIS: end Move_GLARE: - loadspritegfx ANIM_TAG_248 - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_SMALL_RED_EYE + loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask sub_815E114, 5, 0 playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2904,7 +2904,7 @@ Move_GLARE: end Move_BARRAGE: - loadspritegfx ANIM_TAG_254 + loadspritegfx ANIM_TAG_RED_BALL createvisualtask sub_815E47C, 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 24 @@ -2958,8 +2958,8 @@ SkyAttackSetUpAgainstPartner: blendoff goto SkyAttackEnd SkyAttackUnleash: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_284 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_BIRD call SetFlyingBg monbg ANIM_ATTACKER createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE @@ -3005,13 +3005,13 @@ Move_ACID_ARMOR: end Move_SHARPEN: - loadspritegfx ANIM_TAG_185 + loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gUnknown_08592DE4, 2 waitforvisualfinish end Move_SUPER_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish @@ -3031,7 +3031,7 @@ Move_SUPER_FANG: end Move_SLASH: - loadspritegfx ANIM_TAG_183 + loadspritegfx ANIM_TAG_SLASH createsprite gUnknown_08592D2C, 130, 1, -8, 0 playsewithpan SE_W013, SOUND_PAN_TARGET delay 4 @@ -3042,8 +3042,8 @@ Move_SLASH: end Move_STRUGGLE: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_215 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 @@ -3093,7 +3093,7 @@ NightmareInContest: end Move_FLAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createvisualtask sub_815C770, 2, 0 @@ -3122,8 +3122,8 @@ Move_SPITE: end Move_MACH_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_ATK_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue MachPunchAgainstPlayer @@ -3173,7 +3173,7 @@ Move_FORESIGHT: end Move_DESTINY_BOND: - loadspritegfx ANIM_TAG_188 + loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein @@ -3193,7 +3193,7 @@ Move_DESTINY_BOND: end Move_ENDURE: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -3218,7 +3218,7 @@ EndureEffect: return Move_CHARM: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER @@ -3232,7 +3232,7 @@ Move_CHARM: end Move_ROLLOUT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER @@ -3249,8 +3249,8 @@ Move_ROLLOUT: end Move_FALSE_SWIPE: - loadspritegfx ANIM_TAG_286 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLASH_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_08592D44, 130 playsewithpan SE_W233, SOUND_PAN_TARGET delay 16 @@ -3295,7 +3295,7 @@ Move_SWAGGER: Move_MILK_DRINK: loadspritegfx ANIM_TAG_MILK_BOTTLE - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET createsprite gUnknown_08592B3C, 2 @@ -3337,8 +3337,8 @@ MagnitudeIntense: goto MagnitudeEnd Move_RAPID_SPIN: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_229 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_RAPID_SPIN monbg ANIM_ATTACKER createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_815ADB0, 2, 0, 2, 0 @@ -3383,8 +3383,8 @@ Move_MOONLIGHT: end Move_EXTREME_SPEED: - loadspritegfx ANIM_TAG_207 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SPEED_DUST + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -3431,8 +3431,8 @@ ExtremeSpeedAgainstPlayer: goto ExtremeSpeedContinue Move_UPROAR: - loadspritegfx ANIM_TAG_225 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_DEF_PARTNER createvisualtask sub_8106D90, 2, 0 createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 @@ -3456,8 +3456,8 @@ Move_UPROAR: end Move_HEAT_WAVE: - loadspritegfx ANIM_TAG_261 - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_261, 0, 6, 6, RGB_RED + loadspritegfx ANIM_TAG_FLYING_DIRT + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FLYING_DIRT, 0, 6, 6, RGB_RED createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 @@ -3480,8 +3480,8 @@ Move_HEAT_WAVE: end Move_HAIL: - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask sub_810C918, 5 @@ -3492,7 +3492,7 @@ Move_HAIL: Move_TORMENT: loadspritegfx ANIM_TAG_ANGER - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask sub_815AFF0, 2 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 @@ -3528,15 +3528,15 @@ Move_MEMENTO: end Move_FACADE: - loadspritegfx ANIM_TAG_243 + loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask sub_815DCA4, 2, 0, 3 createvisualtask sub_815DF0C, 2, 0, 72 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: - loadspritegfx ANIM_TAG_HAND - loadspritegfx ANIM_TAG_255 + loadspritegfx ANIM_TAG_TAG_HAND + loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gUnknown_085CE864, 130, 1, 0, 2 createsprite gUnknown_085CE864, 130, 1, 1, 2 delay 32 @@ -3560,9 +3560,9 @@ Move_FOLLOW_ME: end Move_CHARGE: - loadspritegfx ANIM_TAG_211 - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_213 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -3595,8 +3595,8 @@ Move_CHARGE: end Move_TAUNT: - loadspritegfx ANIM_TAG_214 - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_FINGER_2 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gUnknown_08593114, 11, 0, 45 playsewithpan SE_W118, SOUND_PAN_ATTACKER @@ -3615,7 +3615,7 @@ Move_TAUNT: end Move_HELPING_HAND: - loadspritegfx ANIM_TAG_HAND + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_815EC48, 5 createsprite gUnknown_085CE8AC, 40, 0 createsprite gUnknown_085CE8AC, 40, 1 @@ -3632,7 +3632,7 @@ Move_HELPING_HAND: end Move_ASSIST: - loadspritegfx ANIM_TAG_252 + loadspritegfx ANIM_TAG_PAW_PRINT createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 delay 2 createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 @@ -3649,9 +3649,9 @@ Move_ASSIST: end Move_SUPERPOWER: - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_256 - loadspritegfx ANIM_TAG_257 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_METEOR + loadspritegfx ANIM_TAG_FLAT_ROCK monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 @@ -3699,10 +3699,10 @@ Move_RECYCLE: end Move_BRICK_BREAK: - loadspritegfx ANIM_TAG_167 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall BrickBreakNormal: monbg ANIM_TARGET @@ -3763,7 +3763,7 @@ BrickBreakShatteredWall: end Move_YAWN: - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish @@ -3779,8 +3779,8 @@ Move_YAWN: end Move_ENDEAVOR: - loadspritegfx ANIM_TAG_243 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SWEAT_DROP + 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 @@ -3795,7 +3795,7 @@ Move_ENDEAVOR: end Move_ERUPTION: - loadspritegfx ANIM_TAG_201 + loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask sub_8109460, 2 @@ -3820,7 +3820,7 @@ Move_ERUPTION: end Move_SKILL_SWAP: - loadspritegfx ANIM_TAG_251 + loadspritegfx ANIM_TAG_BLUEGREEN_ORB call SetPsychicBackground createvisualtask sub_810FBF0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 @@ -3833,7 +3833,7 @@ Move_SKILL_SWAP: end Move_IMPRISON: - loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_X_SIGN call SetPsychicBackground monbg ANIM_DEF_PARTNER @@ -3850,7 +3850,7 @@ Move_IMPRISON: end Move_GRUDGE: - loadspritegfx ANIM_TAG_253 + loadspritegfx ANIM_TAG_PURPLE_FLAME monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST @@ -3886,7 +3886,7 @@ Move_CAMOUFLAGE: end Move_TAIL_GLOW: - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -3902,8 +3902,8 @@ Move_TAIL_GLOW: end Move_LUSTER_PURGE: - loadspritegfx ANIM_TAG_267 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_IMPACT fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_815A5C8, 5 @@ -3914,9 +3914,9 @@ Move_LUSTER_PURGE: createsprite gUnknown_08596898, 41, 0, 0, 0, 0 delay 20 createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_267, 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_135, 0, 12, 12, RGB(0, 0, 23) + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish createsprite gUnknown_085973A0, 131, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET @@ -3945,8 +3945,8 @@ Move_LUSTER_PURGE: end Move_MIST_BALL: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_270 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 playsewithpan SE_W081, SOUND_PAN_ATTACKER createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0 @@ -3965,7 +3965,7 @@ Move_MIST_BALL: end Move_FEATHER_DANCE: - loadspritegfx ANIM_TAG_270 + loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, SOUND_PAN_TARGET @@ -4054,9 +4054,9 @@ Move_MUD_SPORT: end Move_NEEDLE_ARM: - loadspritegfx ANIM_TAG_266 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_GREEN_SPIKE + 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 delay 2 @@ -4106,9 +4106,9 @@ Move_SLACK_OFF: end Move_CRUSH_CLAW: - loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH - loadspritegfx ANIM_TAG_208 + loadspritegfx ANIM_TAG_TORN_METAL monbg ANIM_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 @@ -4128,8 +4128,8 @@ Move_CRUSH_CLAW: Move_AROMATHERAPY: playsewithpan SE_W080, 0 - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_203 + 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) delay 1 @@ -4166,10 +4166,10 @@ Move_AROMATHERAPY: end Move_FAKE_TEARS: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_MUSIC_NOTES - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31) + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask sub_815C478, 5, 0, 2, 1 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 @@ -4190,8 +4190,8 @@ Move_FAKE_TEARS: Move_AIR_CUTTER: loadspritegfx ANIM_TAG_AIR_WAVE - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT delay 0 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -4263,7 +4263,7 @@ Move_GRASS_WHISTLE: end Move_TICKLE: - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gUnknown_08593A84, 0, -16, -8 @@ -4281,8 +4281,8 @@ Move_TICKLE: end Move_WATER_SPOUT: - loadspritegfx ANIM_TAG_268 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_81080E4, 5 @@ -4298,8 +4298,8 @@ Move_WATER_SPOUT: end Move_SHADOW_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg BG_GHOST waitbgfadein monbg ANIM_ATK_PARTNER @@ -4340,7 +4340,7 @@ Move_EXTRASENSORY: end Move_AERIAL_ACE: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 @@ -4390,7 +4390,7 @@ Move_BULK_UP: end Move_COVET: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 @@ -4408,8 +4408,8 @@ Move_COVET: Move_VOLT_TACKLE: loadspritegfx ANIM_TAG_SPARK - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_213 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_ATTACKER setalpha 12, 8 createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK @@ -4454,7 +4454,7 @@ Move_VOLT_TACKLE: end Move_WATER_SPORT: - loadspritegfx ANIM_TAG_268 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_81088E4, 5 delay 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER @@ -4467,7 +4467,7 @@ Move_WATER_SPORT: end Move_CALM_MIND: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_ATK_PARTNER createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK waitforvisualfinish @@ -4491,7 +4491,7 @@ Move_CALM_MIND: Move_LEAF_BLADE: loadspritegfx ANIM_TAG_LEAF - loadspritegfx ANIM_TAG_285 + loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask sub_80FFFC0, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -4515,7 +4515,7 @@ Move_LEAF_BLADE: end Move_DRAGON_DANCE: - loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER delay 1 @@ -4539,8 +4539,8 @@ Move_DRAGON_DANCE: end Move_SHOCK_WAVE: - loadspritegfx ANIM_TAG_211 - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_ATTACKER @@ -4576,7 +4576,7 @@ Move_HARDEN: Move_BELLY_DRUM: loadspritegfx ANIM_TAG_MUSIC_NOTES - loadspritegfx ANIM_TAG_193 + loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask sub_8102BE8, 2 waitforvisualfinish call BellyDrum1 @@ -4618,9 +4618,9 @@ BellyDrum1: return Move_MIND_READER: - loadspritegfx ANIM_TAG_189 + loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE - loadspritegfx ANIM_TAG_191 + loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg ANIM_DEF_PARTNER playsewithpan SE_W109, SOUND_PAN_TARGET createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 @@ -4660,9 +4660,9 @@ MindReaderEffect: Move_ICE_PUNCH: monbg ANIM_DEF_PARTNER setalpha 12, 8 - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 @@ -4818,8 +4818,8 @@ Move_THUNDER: end Move_THUNDER_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_TARGET setalpha 12, 8 @@ -4908,7 +4908,7 @@ Move_SACRED_FIRE: end Move_SCRATCH: - loadspritegfx ANIM_TAG_137 + loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W010, SOUND_PAN_TARGET @@ -4995,7 +4995,7 @@ Move_GROWL: end Move_SNORE: - loadspritegfx ANIM_TAG_197 + loadspritegfx ANIM_TAG_SNORE_Z monbg ANIM_ATK_PARTNER setalpha 8, 8 call Snore1 @@ -5017,7 +5017,7 @@ Snore1: Move_LIGHT_SCREEN: loadspritegfx ANIM_TAG_SPARKLE_3 - loadspritegfx ANIM_TAG_166 + loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_08596560, 1, 40, 0, 10166 @@ -5044,7 +5044,7 @@ SpecialScreenEffect: Move_MIRROR_COAT: loadspritegfx ANIM_TAG_SPARKLE_3 - loadspritegfx ANIM_TAG_168 + loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 createsprite gUnknown_08596590, 1, 40, 0, 10168 delay 10 @@ -5057,7 +5057,7 @@ Move_MIRROR_COAT: Move_REFLECT: loadspritegfx ANIM_TAG_SPARKLE_4 - loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_08596578, 1, 40, 0, 10167 @@ -5073,7 +5073,7 @@ Move_REFLECT: end Move_BARRIER: - loadspritegfx ANIM_TAG_169 + loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_085965A8, 3, 40, 0, 10169 @@ -5083,8 +5083,8 @@ Move_BARRIER: end Move_BUBBLE: - loadspritegfx ANIM_TAG_146 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_TARGET setalpha 12, 8 delay 1 @@ -5119,7 +5119,7 @@ Move_BUBBLE: end Move_SMOG: - loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 @@ -5146,7 +5146,7 @@ Smog1: return Move_FAINT_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATTACKER fadetobg BG_DARK waitbgfadein @@ -5265,7 +5265,7 @@ Move_DRAGON_RAGE: end Move_RAIN_DANCE: - loadspritegfx ANIM_TAG_115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish @@ -5279,8 +5279,8 @@ Move_RAIN_DANCE: end Move_BITE: - loadspritegfx ANIM_TAG_139 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET @@ -5296,8 +5296,8 @@ Move_BITE: end Move_CRUNCH: - loadspritegfx ANIM_TAG_139 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein @@ -5324,8 +5324,8 @@ Move_CRUNCH: end Move_CLAMP: - loadspritegfx ANIM_TAG_145 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -5344,7 +5344,7 @@ Move_ICE_BEAM: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 @@ -5391,7 +5391,7 @@ Move_WITHDRAW: end Move_AURORA_BEAM: - loadspritegfx ANIM_TAG_140 + loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORABEAM waitbgfadein playsewithpan SE_W062, SOUND_PAN_ATTACKER @@ -5427,7 +5427,7 @@ AuroraBeam1: return Move_SOLAR_BEAM: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash SolarBeamEnd: waitforvisualfinish @@ -5516,7 +5516,7 @@ SolarBeamUnleash1: return Move_BLIZZARD: - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue BlizzardAgainstPlayer @@ -5568,7 +5568,7 @@ BlizzardAgainstPlayer: goto BlizzardContinue Move_POWDER_SNOW: - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish @@ -5602,8 +5602,8 @@ PowderSnow1: return Move_HYDRO_PUMP: - loadspritegfx ANIM_TAG_149 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -5649,8 +5649,8 @@ HydroPump2: return Move_SIGNAL_BEAM: - loadspritegfx ANIM_TAG_264 - loadspritegfx ANIM_TAG_265 + 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 delay 6 @@ -5690,9 +5690,9 @@ SignalBeam1: return Move_ABSORB: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5743,9 +5743,9 @@ AbsorbEffect: return Move_MEGA_DRAIN: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5804,9 +5804,9 @@ MegaDrainEffect: return Move_GIGA_DRAIN: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5873,11 +5873,11 @@ GigaDrainEffect: return Move_LEECH_LIFE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_ORBS delay 1 loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -6029,7 +6029,7 @@ Move_ACID: Move_BONEMERANG: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6049,7 +6049,7 @@ Move_BONEMERANG: Move_BONE_CLUB: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6067,7 +6067,7 @@ Move_BONE_CLUB: Move_BONE_RUSH: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET @@ -6082,7 +6082,7 @@ Move_BONE_RUSH: end Move_SPIKES: - loadspritegfx ANIM_TAG_152 + loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER playsewithpan SE_W026, SOUND_PAN_ATTACKER waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 @@ -6099,8 +6099,8 @@ Move_SPIKES: end Move_MEGAHORN: - loadspritegfx ANIM_TAG_153 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HORN_HIT_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER playsewithpan SE_W082, SOUND_PAN_ATTACKER jumpifcontest MegahornInContest @@ -6143,7 +6143,7 @@ MegahornInContest: Move_GUST: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6161,7 +6161,7 @@ Move_GUST: Move_WING_ATTACK: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6184,7 +6184,7 @@ Move_WING_ATTACK: end Move_PECK: - loadspritegfx ANIM_TAG_135 + 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 @@ -6192,8 +6192,8 @@ Move_PECK: end Move_AEROBLAST: - loadspritegfx ANIM_TAG_154 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER call SetFlyingBg monbgprio_28 ANIM_TARGET @@ -6233,8 +6233,8 @@ Aeroblast1: return Move_WATER_GUN: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6257,8 +6257,8 @@ Move_WATER_GUN: end Move_CRABHAMMER: - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gUnknown_08597388, 4, 0, 0, 1, 0 @@ -6334,7 +6334,7 @@ Flamethrower1: return Move_SANDSTORM: - loadspritegfx ANIM_TAG_261 + loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_W201, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 @@ -6354,7 +6354,7 @@ Move_SANDSTORM: end Move_WHIRLPOOL: - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6387,8 +6387,8 @@ WhirlpoolEffect: return Move_FLY: - loadspritegfx ANIM_TAG_156 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim FlySetUp, FlyUnleash FlyEnd: waitforvisualfinish @@ -6414,8 +6414,8 @@ FlyUnleash: goto FlyEnd Move_BOUNCE: - loadspritegfx ANIM_TAG_156 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim BounceSetUp, BounceUnleash BounceEnd: end @@ -6440,8 +6440,8 @@ BounceUnleash: goto BounceEnd Move_KARATE_CHOP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6457,8 +6457,8 @@ Move_KARATE_CHOP: end Move_CROSS_CHOP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_285 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET @@ -6475,8 +6475,8 @@ Move_CROSS_CHOP: end Move_JUMP_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 @@ -6493,8 +6493,8 @@ Move_JUMP_KICK: end Move_HI_JUMP_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 @@ -6519,8 +6519,8 @@ Move_HI_JUMP_KICK: end Move_DOUBLE_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gUnknown_08595EB0, 3, 1, 20, 1 @@ -6532,8 +6532,8 @@ Move_DOUBLE_KICK: end Move_TRIPLE_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET @@ -6565,8 +6565,8 @@ TripleKickCenter: goto TripleKickContinue Move_DYNAMIC_PUNCH: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_UNUSED_EXPLOSION delay 1 @@ -6599,8 +6599,8 @@ Move_DYNAMIC_PUNCH: end Move_COUNTER: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 @@ -6631,7 +6631,7 @@ Move_COUNTER: end Move_VITAL_THROW: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233, SOUND_PAN_ATTACKER @@ -6655,8 +6655,8 @@ Move_VITAL_THROW: Move_ROCK_SMASH: loadspritegfx ANIM_TAG_ROCKS - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -6681,7 +6681,7 @@ Move_ROCK_SMASH: end Move_SUBMISSION: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER @@ -6714,7 +6714,7 @@ Submission1: return Move_SUNNY_DAY: - loadspritegfx ANIM_TAG_157 + loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_ATK_PARTNER setalpha 13, 3 createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE @@ -6737,7 +6737,7 @@ SunnyDay1: return Move_COTTON_SPORE: - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 @@ -6758,7 +6758,7 @@ CottonSpore1: return Move_SPORE: - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80FEE1C, 2 @@ -6782,8 +6782,8 @@ Spore1: return Move_PETAL_DANCE: - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W080, SOUND_PAN_ATTACKER @@ -6821,8 +6821,8 @@ Move_PETAL_DANCE: Move_RAZOR_LEAF: loadspritegfx ANIM_TAG_LEAF - loadspritegfx ANIM_TAG_160 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -6862,7 +6862,7 @@ Move_RAZOR_LEAF: Move_NATURE_POWER: Move_ANCIENT_POWER: loadspritegfx ANIM_TAG_ROCKS - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 10, 1 @@ -6911,7 +6911,7 @@ Move_OCTAZOOKA: end Move_MIST: - loadspritegfx ANIM_TAG_144 + loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 @@ -6945,9 +6945,9 @@ Move_HAZE: end Move_FIRE_PUNCH: - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED @@ -7000,7 +7000,7 @@ Move_LEER: end Move_DREAM_EATER: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET @@ -7067,7 +7067,7 @@ DreamEaterEffect: return Move_POISON_GAS: - loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 monbg ANIM_DEF_PARTNER @@ -7120,7 +7120,7 @@ Move_WRAP: goto BindWrap Move_PSYBEAM: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 @@ -7147,7 +7147,7 @@ Psybeam1: return Move_HYPNOSIS: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING call SetPsychicBackground call Hypnosis1 call Hypnosis1 @@ -7165,7 +7165,7 @@ Hypnosis1: return Move_PSYWAVE: - loadspritegfx ANIM_TAG_165 + loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground createvisualtask sub_81076C8, 5, 100 @@ -7189,7 +7189,7 @@ Psywave1: return Move_ZAP_CANNON: - loadspritegfx ANIM_TAG_171 + 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 @@ -7211,7 +7211,7 @@ Move_ZAP_CANNON: Move_STEEL_WING: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish @@ -7237,7 +7237,7 @@ Move_STEEL_WING: end Move_IRON_TAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish @@ -7256,7 +7256,7 @@ Move_IRON_TAIL: end Move_POISON_TAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) @@ -7318,7 +7318,7 @@ Move_NIGHT_SHADE: Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION - loadspritegfx ANIM_TAG_175 + loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, SOUND_PAN_ATTACKER createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish @@ -7342,7 +7342,7 @@ Move_EGG_BOMB: end Move_SHADOW_BALL: - loadspritegfx ANIM_TAG_176 + loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg BG_GHOST waitbgfadein delay 15 @@ -7357,7 +7357,7 @@ Move_SHADOW_BALL: end Move_LICK: - loadspritegfx ANIM_TAG_177 + loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_W122, SOUND_PAN_TARGET createsprite gUnknown_08596D8C, 130, 0, 0 @@ -7366,7 +7366,7 @@ Move_LICK: end Move_FOCUS_ENERGY: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -7389,7 +7389,7 @@ BideSetUp: end BideUnleash: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 @@ -7419,7 +7419,7 @@ BideUnleash: end Move_STRING_SHOT: - loadspritegfx ANIM_TAG_179 + loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER delay 0 @@ -7517,8 +7517,8 @@ RazorWindSetUp: goto RazorWindContinue RazorWindUnleash: - loadspritegfx ANIM_TAG_154 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER @@ -7555,7 +7555,7 @@ Move_DISABLE: end Move_RECOVER: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -7590,7 +7590,7 @@ Recover1: return Move_MIMIC: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 @@ -7609,7 +7609,7 @@ Move_MIMIC: end Move_CONSTRICT: - loadspritegfx ANIM_TAG_186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 createsprite gUnknown_08592494, 132, 0, 16, 0, 2 delay 7 @@ -7629,7 +7629,7 @@ Move_CURSE: choosetwoturnanim CurseGhost, CurseStats CurseGhost: loadspritegfx ANIM_TAG_NAIL - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_ATK_PARTNER createvisualtask sub_8112758, 5 waitforvisualfinish @@ -7672,7 +7672,7 @@ CurseStats1: Move_SOFT_BOILED: loadspritegfx ANIM_TAG_BREAKING_EGG - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER playsewithpan SE_W039, SOUND_PAN_ATTACKER @@ -7696,7 +7696,7 @@ Move_SOFT_BOILED: Move_HEAL_BELL: loadspritegfx ANIM_TAG_BELL loadspritegfx ANIM_TAG_MUSIC_NOTES_2 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_8105CB4, 5 @@ -7724,7 +7724,7 @@ Move_HEAL_BELL: waitforvisualfinish unloadspritegfx ANIM_TAG_BELL unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 - unloadspritegfx ANIM_TAG_203 + 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 @@ -7732,7 +7732,7 @@ Move_HEAL_BELL: createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 - loadspritegfx ANIM_TAG_203 + 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 @@ -7757,7 +7757,7 @@ Move_FAKE_OUT: end Move_SCARY_FACE: - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish @@ -7775,7 +7775,7 @@ Move_SCARY_FACE: end Move_SWEET_KISS: - loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gUnknown_08593AA8, 130, 16, -48 playsewithpan SE_W215, SOUND_PAN_TARGET @@ -7794,8 +7794,8 @@ Move_SWEET_KISS: end Move_LOVELY_KISS: - loadspritegfx ANIM_TAG_219 - loadspritegfx ANIM_TAG_EVIL_ANGEL + loadspritegfx ANIM_TAG_PINK_HEART + loadspritegfx ANIM_TAG_DEVIL createsprite gUnknown_08593AF0, 130, 0, -24 playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish @@ -7807,7 +7807,7 @@ Move_LOVELY_KISS: end Move_FURY_SWIPES: - loadspritegfx ANIM_TAG_222 + loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET @@ -7822,8 +7822,8 @@ Move_FURY_SWIPES: end Move_INGRAIN: - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_ORBS createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 @@ -7912,7 +7912,7 @@ PresentHeal: end Move_BATON_PASS: - loadspritegfx ANIM_TAG_226 + 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 @@ -7982,7 +7982,7 @@ Move_SLEEP_TALK: end Move_HYPER_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK playsewithpan SE_W044, SOUND_PAN_TARGET delay 1 delay 2 @@ -8055,15 +8055,15 @@ Move_TRI_ATTACK: delay 2 createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS call FreezeEffect1 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish end Move_WILL_O_WISP: - loadspritegfx ANIM_TAG_232 - loadspritegfx ANIM_TAG_231 + loadspritegfx ANIM_TAG_WISP_FIRE + loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W052, SOUND_PAN_ATTACKER @@ -8093,8 +8093,8 @@ Move_WILL_O_WISP: end Move_ENCORE: - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_HAND + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8114,7 +8114,7 @@ Move_ENCORE: Move_TRICK: loadspritegfx ANIM_TAG_ITEM_BAG - loadspritegfx ANIM_TAG_207 + loadspritegfx ANIM_TAG_SPEED_DUST createsprite gUnknown_085926E8, 2, -40, 80 createsprite gUnknown_085926E8, 2, -40, 208 delay 16 @@ -8141,7 +8141,7 @@ Move_TRICK: end Move_WISH: - loadspritegfx ANIM_TAG_233 + loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish @@ -8157,7 +8157,7 @@ Move_WISH: end Move_STOCKPILE: - loadspritegfx ANIM_TAG_235 + loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_W025, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask sub_815B65C, 5 @@ -8186,8 +8186,8 @@ Stockpile1: return Move_SPIT_UP: - loadspritegfx ANIM_TAG_237 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_RED_ORB_2 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B6B4, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 @@ -8233,7 +8233,7 @@ SpitUpStrongest: goto SpitUpContinue Move_SWALLOW: - loadspritegfx ANIM_TAG_236 + loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B778, 5 @@ -8310,7 +8310,7 @@ MorningSun1: return Move_SWEET_SCENT: - loadspritegfx ANIM_TAG_238 + loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_W230, SOUND_PAN_ATTACKER createsprite gUnknown_085CE544, 2, 100, 0, 100 delay 25 @@ -8348,7 +8348,7 @@ SweetScentEffect: return Move_HYPER_BEAM: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 @@ -8358,7 +8358,7 @@ Move_HYPER_BEAM: 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 sub_8115D94, 2, ANIM_TAG_147, 1, 12, 31, 16, 0, 0 + createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0 call HyperBeam1 call HyperBeam1 call HyperBeam1 @@ -8398,8 +8398,8 @@ HyperBeam1: return Move_FLATTER: - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_240 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_CONFETTI createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 @@ -8458,7 +8458,7 @@ Move_ROLE_PLAY: end Move_REFRESH: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 2, 0 @@ -8472,8 +8472,8 @@ Move_REFRESH: end Move_BLAZE_KICK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET setalpha 12, 8 @@ -8493,7 +8493,7 @@ Move_BLAZE_KICK: end Move_HYPER_VOICE: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING createvisualtask sub_81590B8, 5, 0 call HyperVoiceEffect waitforvisualfinish @@ -8559,8 +8559,8 @@ Move_SHEER_COLD: end Move_ARM_THRUST: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask sub_80D6134, 5, 8, 5, 0, 0 @@ -8679,7 +8679,7 @@ End: end Move_MUD_SHOT: - loadspritegfx ANIM_TAG_259 + loadspritegfx ANIM_TAG_BROWN_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8711,9 +8711,9 @@ MudShot1: return Move_METEOR_MASH: - loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0 fadetobg BG_COSMIC waitbgfadein @@ -8736,7 +8736,7 @@ Move_METEOR_MASH: end Move_REVENGE: - loadspritegfx ANIM_TAG_245 + loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -8744,15 +8744,15 @@ Move_REVENGE: waitforvisualfinish createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish - unloadspritegfx ANIM_TAG_245 - loadspritegfx ANIM_TAG_246 + unloadspritegfx ANIM_TAG_PURPLE_SCRATCH + loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_085960D0, 130, 10, -10 waitforvisualfinish - unloadspritegfx ANIM_TAG_246 - loadspritegfx ANIM_TAG_135 + 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 playsewithpan SE_W233B, SOUND_PAN_TARGET @@ -8765,7 +8765,7 @@ Move_REVENGE: end Move_POISON_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gUnknown_085CE1DC, 130 @@ -8783,8 +8783,8 @@ Move_SUBSTITUTE: end Move_FRENZY_PLANT: - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8843,7 +8843,7 @@ Move_FRENZY_PLANT: end Move_METAL_SOUND: - loadspritegfx ANIM_TAG_260 + loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 @@ -8868,8 +8868,8 @@ FocusPunchEnd: waitforvisualfinish end FocusPunch: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 createvisualtask AnimTask_IsContest, 2 jumprettrue FocusPunchInContest @@ -8911,7 +8911,7 @@ FocusPunchInContest: goto FocusPunchContinue Move_RETURN: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetReturnPowerLevel, 2 @@ -9074,7 +9074,7 @@ Move_COSMIC_POWER: Move_BLAST_BURN: loadspritegfx ANIM_TAG_FIRE_PLUME - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W221, SOUND_PAN_ATTACKER @@ -9150,7 +9150,7 @@ Move_ROCK_TOMB: end Move_SILVER_WIND: - loadspritegfx ANIM_TAG_271 + loadspritegfx ANIM_TAG_SPARKLE_6 panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 playsewithpan SE_W234, 0 delay 0 @@ -9212,11 +9212,11 @@ Move_SNATCH: end Move_DIVE: - loadspritegfx ANIM_TAG_272 - loadspritegfx ANIM_TAG_273 + loadspritegfx ANIM_TAG_SPLASH + loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim DiveSetUp, DiveAttack DiveSetUp: - loadspritegfx ANIM_TAG_156 + loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_W029, SOUND_PAN_ATTACKER createsprite gUnknown_08596490, 2, 0, 0, 13, 336 waitforvisualfinish @@ -9233,8 +9233,8 @@ DiveSetUp1: createsprite gUnknown_085964E4, 5, 1, 0 return DiveAttack: - loadspritegfx ANIM_TAG_148 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W153, SOUND_PAN_TARGET @@ -9258,7 +9258,7 @@ DiveAttack1: Move_ROCK_BLAST: loadspritegfx ANIM_TAG_ROCKS - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER @@ -9276,7 +9276,7 @@ Move_ROCK_BLAST: Move_OVERHEAT: loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 18 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, RGB(28, 0, 0) @@ -9356,8 +9356,8 @@ Move_OVERHEAT: end Move_HYDRO_CANNON: - loadspritegfx ANIM_TAG_149 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER @@ -9398,7 +9398,7 @@ HydroCannon1: return Move_ASTONISH: - loadspritegfx ANIM_TAG_273 + loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_W227, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 25 @@ -9411,7 +9411,7 @@ Move_ASTONISH: end Move_SEISMIC_TOSS: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 monbg ANIM_DEF_PARTNER @@ -9478,7 +9478,7 @@ SeismicToss2: return Move_MAGIC_COAT: - loadspritegfx ANIM_TAG_170 + loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_085965C0, 3, 40, 0, 10170 @@ -9488,8 +9488,8 @@ Move_MAGIC_COAT: end Move_WATER_PULSE: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_288 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET playsewithpan SE_W145C, SOUND_PAN_ATTACKER @@ -9519,7 +9519,7 @@ Move_WATER_PULSE: end Move_PSYCHO_BOOST: - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout @@ -9546,8 +9546,8 @@ Move_PSYCHO_BOOST: end Move_KNOCK_OFF: - loadspritegfx ANIM_TAG_277 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLAM_HIT_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 4 playsewithpan SE_W233, SOUND_PAN_TARGET @@ -9586,7 +9586,7 @@ Move_DOOM_DESIRE: end Move_SKY_UPPERCUT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT @@ -9644,7 +9644,7 @@ Move_SECRET_POWER: Move_TWISTER: loadspritegfx ANIM_TAG_LEAF - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -9690,8 +9690,8 @@ Move_TWISTER: Move_MAGICAL_LEAF: loadspritegfx ANIM_TAG_LEAF - loadspritegfx ANIM_TAG_160 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -9734,7 +9734,7 @@ Move_MAGICAL_LEAF: Move_ICE_BALL: loadspritegfx ANIM_TAG_ICE_CHUNK - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg IceBallContinue: @@ -9823,7 +9823,7 @@ IceBall1: return Move_WEATHER_BALL: - loadspritegfx ANIM_TAG_283 + loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER delay 8 playsewithpan SE_W207, SOUND_PAN_ATTACKER @@ -9841,7 +9841,7 @@ Move_WEATHER_BALL: jumpreteq ANIM_WEATHER_SANDSTORM, WeatherBallSandstorm jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce WeatherBallNormal: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET @@ -9865,7 +9865,7 @@ WeatherBallFire: waitforvisualfinish end WeatherBallWater: - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, SOUND_PAN_TARGET delay 8 @@ -9899,8 +9899,8 @@ WeatherBallSandstorm: waitforvisualfinish end WeatherBallIce: - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 @@ -9917,7 +9917,7 @@ WeatherBallIce: end Move_COUNT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -10235,7 +10235,7 @@ Burn1: return Status_Infatuation: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gUnknown_08593970, 3, 0, 20 delay 15 @@ -10272,7 +10272,7 @@ Status_Freeze: end Status_Curse: - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8596DE8, 130 @@ -10282,7 +10282,7 @@ Status_Curse: end Status_Nightmare: - loadspritegfx ANIM_TAG_EVIL_ANGEL + loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8596E00, 130 @@ -10355,7 +10355,7 @@ General_TurnTrap: jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap Status_BindWrap: - loadspritegfx ANIM_TAG_186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 createsprite gUnknown_08592494, 132, 0, 16, 0, 1 delay 7 @@ -10377,7 +10377,7 @@ Status_FireSpin: stopsound end Status_Whrilpool: - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -10394,8 +10394,8 @@ Status_Whrilpool: clearmonbg ANIM_DEF_PARTNER end Status_Clamp: - loadspritegfx ANIM_TAG_145 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -10423,7 +10423,7 @@ Status_SandTomb: end General_ItemEffect: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -10445,7 +10445,7 @@ General_ItemEffect: end General_SmokeballEscape: - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_ATTACKER setalpha 12, 4 delay 0 @@ -10494,7 +10494,7 @@ General_HangedOn: end General_Rain: - loadspritegfx ANIM_TAG_115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish @@ -10521,7 +10521,7 @@ General_LeechSeedDrain: goto Move_ABSORB General_MonHit: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -10618,7 +10618,7 @@ General_DoomDesireHit: end General_FocusPunchSetUp: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -10631,7 +10631,7 @@ General_FocusPunchSetUp: end General_IngrainHeal: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -10718,7 +10718,7 @@ BallThrowEnd: createvisualtask sub_8170D24, 2 end BallThrowTrainerBlock: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT delay 25 monbg ANIM_DEF_PARTNER setalpha 12, 8 -- cgit v1.2.3 From 269aebaca762b91f7b455dba2534d26b54187ec5 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 13 Nov 2018 15:35:46 -0500 Subject: update createsprite macro and rename BANK to BATTLER --- data/battle_anim_scripts.s | 5888 ++++++++++++++++++++++---------------------- 1 file changed, 2944 insertions(+), 2944 deletions(-) (limited to 'data/battle_anim_scripts.s') 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 - 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 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 + 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 - delay 2 - createsprite gUnknown_08597388, 3, 0, 15, 1, 1 - createsprite gUnknown_08595250, 4, 0, 15 - createsprite gUnknown_08595250, 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 - delay 2 - createsprite gUnknown_08597388, 3, 0, 5, 1, 1 - createsprite gUnknown_08595250, 4, 0, 5 - createsprite gUnknown_08595250, 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 - delay 2 - createsprite gUnknown_08597388, 3, 0, -5, 1, 1 - createsprite gUnknown_08595250, 4, 0, -5 - createsprite gUnknown_08595250, 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 - delay 2 - createsprite gUnknown_08597388, 3, 0, -15, 1, 1 - createsprite gUnknown_08595250, 4, 0, -15 - createsprite gUnknown_08595250, 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 - 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 - 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, 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 + 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 + 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 - 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 + monbg ANIM_BATTLER_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 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 - waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + 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_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 -- cgit v1.2.3 From c6833c903ca3fafbf3b8d5afd19a53785b1633e3 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 13 Nov 2018 16:19:52 -0500 Subject: remove extra macro and shorten names --- data/battle_anim_scripts.s | 5888 ++++++++++++++++++++++---------------------- 1 file changed, 2944 insertions(+), 2944 deletions(-) (limited to 'data/battle_anim_scripts.s') 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 - 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 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 + 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 - 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 - 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, 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 + 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 + 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 - 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 + monbg ANIM_DEF_PARTNER + setalpha 12, 8 + 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 - waitforvisualfinish - createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 + 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_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 -- cgit v1.2.3 From 72f0a079a9221e314e7eecf0e920313bf83d32ac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 19 Nov 2018 09:28:55 -0600 Subject: Decompile all of battle_anim_utility_funcs --- data/battle_anim_scripts.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/battle_anim_scripts.s') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f0afce456..ca338ac9b 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2921,7 +2921,7 @@ SkyAttackEnd: SkyAttackSetUp: monbg ANIM_DEF_PARTNER setalpha 12, 11 - createvisualtask AnimTask_IsTargetPartner, 5, ARG_RET_ID + createvisualtask AnimTask_GetTargetIsAttackerPartner, 5, ARG_RET_ID jumpretfalse SkyAttackSetUpAgainstOpponent goto SkyAttackSetUpAgainstPartner SkyAttackSetUpAgainstOpponent: @@ -3125,7 +3125,7 @@ Move_MACH_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_ATK_PARTNER - createvisualtask AnimTask_IsAttackerOpponentSide, 2 + createvisualtask AnimTask_GetAttackerSide, 2 jumprettrue MachPunchAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT MachPunchContinue: @@ -3385,7 +3385,7 @@ Move_MOONLIGHT: Move_EXTREME_SPEED: loadspritegfx ANIM_TAG_SPEED_DUST loadspritegfx ANIM_TAG_IMPACT - createvisualtask AnimTask_IsAttackerOpponentSide, 2 + createvisualtask AnimTask_GetAttackerSide, 2 jumprettrue ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT ExtremeSpeedContinue: @@ -3871,13 +3871,13 @@ Move_CAMOUFLAGE: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 16, 0 - createvisualtask sub_811675C, 5, 2, 3, 0, 14 + createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 3, 0, 14 delay 16 createvisualtask sub_81136E8, 2, 4 playsewithpan SE_W185, SOUND_PAN_ATTACKER waitforvisualfinish delay 8 - createvisualtask sub_811675C, 5, 2, 0, 0, 0 + createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 0, 0, 0 waitforvisualfinish createvisualtask sub_81137E4, 2, 1 waitforvisualfinish @@ -5518,7 +5518,7 @@ SolarBeamUnleash1: Move_BLIZZARD: loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER - createvisualtask AnimTask_IsAttackerOpponentSide, 2 + createvisualtask AnimTask_GetAttackerSide, 2 jumprettrue BlizzardAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT BlizzardContinue: @@ -9158,7 +9158,7 @@ Move_SILVER_WIND: monbgprio_29 delay 0 createvisualtask sub_8116664, 10, 1, 0, 0, 4, RGB_BLACK - createvisualtask AnimTask_IsTargetOpponentSide, 2 + createvisualtask AnimTask_GetTargetSide, 2 jumprettrue SilverWindOnPlayer fadetobg BG_BUG_OPPONENT waitbgfadeout -- cgit v1.2.3