From 67375ba3c80e8434a004887aaa131d0a3c1c9e50 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 19 Nov 2018 21:45:15 -0300 Subject: [PATCH 1/2] Update battle_anim_scripts.s New mega evolution animation. --- data/battle_anim_scripts.s | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f1a302256c..72e7932844 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -12301,11 +12301,33 @@ General_WishHeal: waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK end - + General_MegaEvolution: - createvisualtask sub_815B7D0, 0x2, 0 - waitforvisualfinish - end + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_METEOR + loadspritegfx ANIM_TAG_FLAT_ROCK + monbg ANIM_ATK_PARTNER + setalpha 12, 8 + createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) + playsewithpan SE_W025, -64 + call SolarBeamSetUp1 + waitforvisualfinish + createsprite gUnknown_08595FEC, 130, 0 + playsewithpan SE_W025, -64 + delay 15 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1 + createvisualtask sub_8159244, 5, 234, 0 + delay 20 + createvisualtask sub_815B7D0, 2, 0 + delay 4 + createvisualtask sub_8117494, 50 + waitforvisualfinish + createvisualtask sub_8117494, 2 + playsewithpan SE_W043, -64 + blendoff + clearmonbg ANIM_ATTACKER + end AnimScript_82D85A3: createvisualtask sub_8172E9C, 2 From 9d93817319777fb07ddab67000451a305f208220 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 21 Nov 2018 18:27:35 -0300 Subject: [PATCH 2/2] Update battle_anim_scripts.s --- data/battle_anim_scripts.s | 50 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 72e7932844..a3e1cc89ef 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -12303,31 +12303,31 @@ General_WishHeal: end General_MegaEvolution: - loadspritegfx ANIM_TAG_ORBS - loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT - loadspritegfx ANIM_TAG_METEOR - loadspritegfx ANIM_TAG_FLAT_ROCK - monbg ANIM_ATK_PARTNER - setalpha 12, 8 - createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) - playsewithpan SE_W025, -64 - call SolarBeamSetUp1 - waitforvisualfinish - createsprite gUnknown_08595FEC, 130, 0 - playsewithpan SE_W025, -64 - delay 15 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1 - createvisualtask sub_8159244, 5, 234, 0 - delay 20 - createvisualtask sub_815B7D0, 2, 0 - delay 4 - createvisualtask sub_8117494, 50 - waitforvisualfinish - createvisualtask sub_8117494, 2 - playsewithpan SE_W043, -64 - blendoff - clearmonbg ANIM_ATTACKER - end + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_METEOR + loadspritegfx ANIM_TAG_FLAT_ROCK + monbg ANIM_ATK_PARTNER + setalpha 12, 8 + createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) + playsewithpan SE_W025, -64 + call SolarBeamSetUp1 + waitforvisualfinish + createsprite gUnknown_08595FEC, ANIM_TARGET, 2, 0 + playsewithpan SE_W025, -64 + delay 15 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 4, 1, 180, 1 + createvisualtask sub_8159244, 5, 234, 0 + delay 20 + createvisualtask sub_815B7D0, 2, 0 + delay 4 + createvisualtask sub_8117494, 50 + waitforvisualfinish + createvisualtask sub_8117494, 2 + playsewithpan SE_W043, -64 + blendoff + clearmonbg ANIM_ATTACKER + end AnimScript_82D85A3: createvisualtask sub_8172E9C, 2