From 5dd143f19d4da6d7de2f88bbdea2281e3b9d7f8a Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 25 Aug 2022 13:07:52 -0300 Subject: [PATCH] Applied Blackforest's changes to General_AffectionHangedOn --- data/battle_anim_scripts.s | 19 +++++++++++-------- include/constants/battle_anim.h | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index da1e45b232..a84796cc55 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -24885,15 +24885,18 @@ PrimalReversionParticles: delay 3 return -General_AffectionHangedOn:: @ TODO: Make new animation, currenty a copy of General_HangedOn. - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_ATTACKER, 7, 0, 9, RGB_RED - playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER - createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1 +General_AffectionHangedOn:: + loadspritegfx ANIM_TAG_RED_HEART + loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 12, 3 + createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER + delay 15 + createsprite gRedHeartBurstSpriteTemplate, ANIM_ATTACKER, 3, 160, -32 + createsprite gRedHeartBurstSpriteTemplate, ANIM_ATTACKER, 3, -256, -40 + createsprite gRedHeartBurstSpriteTemplate, ANIM_ATTACKER, 3, 128, -16 + createsprite gRedHeartBurstSpriteTemplate, ANIM_ATTACKER, 3, 416, -38 + createsprite gRedHeartBurstSpriteTemplate, ANIM_ATTACKER, 3, -128, -22 + createsprite gRedHeartBurstSpriteTemplate, ANIM_ATTACKER, 3, -384, -31 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_ATTACKER, 4, 9, 0, RGB_RED - waitforvisualfinish - delay 6 - createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 0, 0, 0, 15 end SnatchMoveTrySwapFromSubstitute: diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index f6e1bed716..28bcb283d4 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -536,7 +536,7 @@ #define B_ANIM_BEAK_BLAST_SETUP 33 #define B_ANIM_SHELL_TRAP_SETUP 34 #define B_ANIM_ZMOVE_ACTIVATE 35 // Using Z Moves -#define B_ANIM_AFFECTION_HANGED_ON 36 // TODO: Make new animation, currently a copy of B_ANIM_HANGED_ON. +#define B_ANIM_AFFECTION_HANGED_ON 36 // special animations table (gBattleAnims_Special) #define B_ANIM_LVL_UP 0