From 8c73045fd6dc9fe135508a8bf9487e20e199f6d3 Mon Sep 17 00:00:00 2001 From: Karathan Date: Sat, 12 Jan 2019 04:50:33 +0100 Subject: [PATCH 01/11] add brave bird animation --- data/battle_anim_scripts.s | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 0859f8012..cab0750c4 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1565,6 +1565,26 @@ Move_ENERGY_BALL: end Move_BRAVE_BIRD: + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_BIRD + call SetFlyingBg + 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 + createsprite gUnknown_08596514, ANIM_TARGET, 2 + 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 UnsetFlyingBg end Move_EARTH_POWER: From 832c0d63334904171f43285888fe688cbcc2ef8f Mon Sep 17 00:00:00 2001 From: Karathan Date: Sat, 12 Jan 2019 15:59:35 +0100 Subject: [PATCH 02/11] add toxic spike animation --- data/battle_anim_scripts.s | 17 +++++++++++++++++ .../battle_anims/sprites/toxicspike_color.png | Bin 0 -> 214 bytes include/constants/battle_anim.h | 1 + include/graphics.h | 1 + src/battle_anim.c | 2 ++ src/battle_anim_effects_3.c | 11 +++++++++++ src/graphics.c | 2 ++ 7 files changed, 34 insertions(+) create mode 100644 graphics/battle_anims/sprites/toxicspike_color.png diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index cab0750c4..09639da00 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1222,6 +1222,23 @@ Move_SUCKER_PUNCH: end Move_TOXIC_SPIKES: + loadspritegfx ANIM_TAG_TOXIC_SPIKES + loadspritegfx ANIM_TAG_POISON_BUBBLE + monbg ANIM_DEF_PARTNER + playsewithpan SE_W026, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gToxicSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 30 + delay 10 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gToxicSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, -24, 24, 30 + delay 10 + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gToxicSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 24, 24, 30 + delay 40 + call PoisonBubblesEffect + waitforvisualfinish + clearmonbg ANIM_DEF_PARTNER end Move_HEART_SWAP: diff --git a/graphics/battle_anims/sprites/toxicspike_color.png b/graphics/battle_anims/sprites/toxicspike_color.png new file mode 100644 index 0000000000000000000000000000000000000000..3102949fd5867f7814330fccbb6d49d86f6dedaf GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU{l@Sg$P5Y!TC!xx|NsAw zZYf?eB`Dvr*+(Ktm%;1o*`v+P%|Hcka7Il*63F2!@Q5sCVBi)8VMc~ob0mO*>?NMQ zuI!H)dH6K=-<&(W6)0rs>Eal|aXmTV0Nahugem?FhEfZRp3cqa`P9|NDbP66_<++> sS)Mt@4Nh-F9r&L6u(fe*usX+CFq<*bmgiJnO*z Date: Sat, 12 Jan 2019 16:18:50 +0100 Subject: [PATCH 03/11] add seed bomb animation --- data/battle_anim_scripts.s | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 09639da00..9fa1aa9de 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1507,6 +1507,52 @@ Move_AQUA_TAIL: end Move_SEED_BOMB: + loadspritegfx ANIM_TAG_SEED + loadspritegfx ANIM_TAG_EXPLOSION + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + delay 5 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + delay 5 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + delay 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 6, 5, 1, 0 + delay 6 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -16, -15, 1, 0 + delay 6 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 16, -5, 1, 0 + delay 6 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -12, 18, 1, 0 + delay 6 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 0, 5, 1, 0 + delay 6 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 6, 5, 1, 0 + delay 6 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -16, -15, 1, 0 + delay 6 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 16, -5, 1, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + delay 6 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -12, 18, 1, 0 + delay 6 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 0, 5, 1, 0 + waitforvisualfinish end Move_AIR_SLASH: From 768af79b362c7d3cc3a2dfbce5f2c4537c51de64 Mon Sep 17 00:00:00 2001 From: Karathan Date: Sat, 12 Jan 2019 16:31:56 +0100 Subject: [PATCH 04/11] add ice fang animation --- data/battle_anim_scripts.s | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 9fa1aa9de..d67f27251 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1675,12 +1675,76 @@ Move_SHADOW_CLAW: end Move_THUNDER_FANG: + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT + monbg ANIM_TARGET + setalpha 12, 8 + playsewithpan SE_W044, SOUND_PAN_TARGET + 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 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 + waitforvisualfinish + clearmonbg ANIM_TARGET + blendoff + delay 1 end Move_ICE_FANG: + + monbg ANIM_TARGET + setalpha 12, 8 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT + 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 + 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 + 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 + + playsewithpan SE_W044, SOUND_PAN_TARGET + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 + delay 15 + call FreezeEffect1 + delay 5 + createvisualtask sub_8116620, 10, 4, 2, 9, 0, RGB(12, 26, 31) + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK + waitforvisualfinish + clearmonbg ANIM_TARGET + blendoff + delay 1 end Move_FIRE_FANG: + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT + monbg ANIM_TARGET + setalpha 12, 8 + playsewithpan SE_W044, SOUND_PAN_TARGET + 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 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 + waitforvisualfinish + clearmonbg ANIM_TARGET + blendoff + delay 1 end Move_SHADOW_SNEAK: From 74ae0a6e83fbaf674a1e25475f7d0e3ab9751719 Mon Sep 17 00:00:00 2001 From: Karathan Date: Sat, 12 Jan 2019 16:55:13 +0100 Subject: [PATCH 05/11] add thunder fang and fire fang animations --- data/battle_anim_scripts.s | 42 +++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d67f27251..68471a052 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1675,16 +1675,34 @@ Move_SHADOW_CLAW: end Move_THUNDER_FANG: - loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_LIGHTNING + loadspritegfx ANIM_TAG_SHARP_TEETH monbg ANIM_TARGET setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK + waitforvisualfinish + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -48 + delay 1 + createsprite gUnknown_085956C0, ANIM_ATTACKER, 2, 0, -16 + delay 1 + createsprite gUnknown_085956C0, ANIM_ATTACKER, 2, 0, 16 + delay 1 playsewithpan SE_W044, SOUND_PAN_TARGET 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 - createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 + delay 1 + playsewithpan SE_W161B, SOUND_PAN_TARGET + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK + delay 20 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1692,7 +1710,6 @@ Move_THUNDER_FANG: end Move_ICE_FANG: - monbg ANIM_TARGET setalpha 12, 8 loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -1711,7 +1728,6 @@ Move_ICE_FANG: createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 96 createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 160 createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 224 - playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 @@ -1731,16 +1747,28 @@ Move_ICE_FANG: end Move_FIRE_FANG: + loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED + 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 createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 + playsewithpan SE_W044, SOUND_PAN_TARGET delay 10 + waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 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_TARGET blendoff From 3a5e5d04e7d180b8de42a4b27d3e4e50e2869b91 Mon Sep 17 00:00:00 2001 From: SBird1337 Date: Sun, 13 Jan 2019 01:21:05 +0100 Subject: [PATCH 06/11] add iceshard --- data/battle_anim_scripts.s | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 68471a052..a6c1230b3 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1669,6 +1669,39 @@ Move_AVALANCHE: end Move_ICE_SHARD: + monbg ANIM_TARGET + monbgprio_28 ANIM_TARGET + setalpha 12, 8 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + fadetobg BG_ICE + waitbgfadein + createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, -20, 70, 0, 42, 35 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, -20, 58, 0, 30, 35 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, -20, -12, 0, 22, 40 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, -20, 0, 0, 10, 40 + delay 5 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, -10, -30, 10, -12, 45 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, -10, -42, 10, -24, 45 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, -10, -20, 10, -36, 45 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, -10, -32, 10, -24, 45 + delay 5 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 0, 10, 20, 22, 45 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, 0, -2, 20, 10, 45 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 0, 20, 20, -2, 30 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, 0, 8, 20, 10, 30 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 4, -31, 0, 7, RGB(0, 20, 31) + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1 + waitforvisualfinish + delay 20 + call FreezeEffect1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 4, 5, 7, 0, RGB(0, 20, 31) + waitforvisualfinish + restorebg + waitbgfadein + clearmonbg ANIM_TARGET + blendoff end Move_SHADOW_CLAW: From cb617401a6aa74a969676272ac33530f0940b756 Mon Sep 17 00:00:00 2001 From: Karathan Date: Sun, 13 Jan 2019 17:03:23 +0100 Subject: [PATCH 07/11] add air slash --- data/battle_anim_scripts.s | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index a6c1230b3..ad287c8d0 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1556,6 +1556,19 @@ Move_SEED_BOMB: end Move_AIR_SLASH: + loadspritegfx ANIM_TAG_CUT + monbg ANIM_TARGET + setalpha 12, 8 + call SetFlyingBg + playsewithpan SE_W015, SOUND_PAN_TARGET + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 + waitforvisualfinish + clearmonbg ANIM_TARGET + blendoff + waitforvisualfinish + call UnsetFlyingBg end Move_XSCISSOR: From bb38edad23f40553249576b579835a8d8fdadd38 Mon Sep 17 00:00:00 2001 From: Karathan Date: Sun, 13 Jan 2019 19:13:37 +0100 Subject: [PATCH 08/11] add x-scissor animation --- data/battle_anim_scripts.s | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index ad287c8d0..d12ec9ad3 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1556,22 +1556,34 @@ Move_SEED_BOMB: end Move_AIR_SLASH: - loadspritegfx ANIM_TAG_CUT - monbg ANIM_TARGET - setalpha 12, 8 + loadspritegfx ANIM_TAG_SLASH call SetFlyingBg - playsewithpan SE_W015, SOUND_PAN_TARGET - createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 - delay 5 - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 - waitforvisualfinish - clearmonbg ANIM_TARGET - blendoff + createsprite gUnknown_08592D2C, ANIM_TARGET, 2, 1, -8, 0 + playsewithpan SE_W013, SOUND_PAN_TARGET + delay 4 + 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 call UnsetFlyingBg end Move_XSCISSOR: + loadspritegfx ANIM_TAG_CUT + monbg ANIM_TARGET + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 + createvisualtask sub_81169C0, 2, 0, 4, 7, 3 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + delay 5 + 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_TARGET + blendoff end Move_BUG_BUZZ: From 200f0a09d32884cd9746f783ee525b3c638e2d24 Mon Sep 17 00:00:00 2001 From: Karathan Date: Sun, 13 Jan 2019 19:35:29 +0100 Subject: [PATCH 09/11] add sticky web --- data/battle_anim_scripts.s | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d12ec9ad3..ee2dc8c12 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2251,6 +2251,41 @@ Move_ROTOTILLER: end Move_STICKY_WEB: + loadspritegfx ANIM_TAG_SPIDER_WEB + loadspritegfx ANIM_TAG_WEB_THREAD + monbg ANIM_DEF_PARTNER + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK + waitforvisualfinish + monbgprio_28 ANIM_TARGET + 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, ANIM_ATTACKER, 2, 0, 0 + delay 50 + playsewithpan SE_W081B, SOUND_PAN_TARGET + createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2, -30, 30 + delay 50 + playsewithpan SE_W081B, SOUND_PAN_TARGET + createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2, 30, -30 + waitforvisualfinish + clearmonbg ANIM_DEF_PARTNER + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end Move_FELL_STINGER: @@ -9500,7 +9535,7 @@ Move_SPIDER_WEB: call SpiderWeb1 waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2 + createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2, 0, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER delay 1 From 5ad85f0d557a9784b6d6b61d0c67a37462f65d80 Mon Sep 17 00:00:00 2001 From: Karathan Date: Mon, 14 Jan 2019 00:21:36 +0100 Subject: [PATCH 10/11] add bullet punch animation --- data/battle_anim_scripts.s | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index ee2dc8c12..ce79175a4 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1688,6 +1688,57 @@ Move_NASTY_PLOT: end Move_BULLET_PUNCH: + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + monbg ANIM_TARGET + setalpha 12, 8 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -8, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -16, 8, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 8, -16, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 8, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 24, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 24, 16, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 24, 16, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -24, 16, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -24, 16, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -24, -8, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -24, -8, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -24, 8, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -24, 8, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + delay 2 + waitforvisualfinish + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 9, 0, 8, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + waitforvisualfinish + + clearmonbg ANIM_TARGET + blendoff end Move_AVALANCHE: From 0f19f969c950751867e7ddc75da20dbcc0536f99 Mon Sep 17 00:00:00 2001 From: Karathan Date: Tue, 15 Jan 2019 01:11:34 +0100 Subject: [PATCH 11/11] modify net animation for sticky web --- src/bug.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bug.c b/src/bug.c index 31d1a9740..fee1eda45 100644 --- a/src/bug.c +++ b/src/bug.c @@ -317,7 +317,12 @@ void sub_811067C(struct Sprite *sprite) { SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0)); + if (GetBattlerSide(gBattleAnimAttacker)) + sprite->pos1.x -= gBattleAnimArgs[0]; + else + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; sprite->data[0] = 16; sprite->callback = sub_81106A4; }