atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1981 from ghoulslash/be/aquaring

Browse source 
Fix aqua ring heal anim
This commit is contained in:
Eduardo Quezada D'Ottone 2021-12-24 15:11:28 -03:00 committed by GitHub
commit 75fbc5c0ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/battle_anim_scripts.s
View file

@ -828,6 +828,7 @@ gBattleAnims_General::
.4byte General_GulpMissile @ B_ANIM_GULP_MISSILE .4byte General_GulpMissile @ B_ANIM_GULP_MISSILE
.4byte General_StrongWinds @ B_ANIM_STRONG_WINDS .4byte General_StrongWinds @ B_ANIM_STRONG_WINDS
.4byte General_PrimalReversion @ B_ANIM_PRIMAL_REVERSION .4byte General_PrimalReversion @ B_ANIM_PRIMAL_REVERSION
.4byte General_AquaRingHeal @ B_ANIM_AQUA_RING_HEAL
.align 2 .align 2
gBattleAnims_Special:: gBattleAnims_Special::
@ -1708,10 +1709,12 @@ Move_HEART_SWAP:
end end
Move_AQUA_RING: Move_AQUA_RING:
General_AquaRingHeal:
loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_BLUE_STAR
loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_SMALL_BUBBLES
loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_ICE_CRYSTALS
loadspritegfx ANIM_TAG_GUARD_RING loadspritegfx ANIM_TAG_GUARD_RING
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_GUARD_RING, 0, 14, 14, RGB_BLUE
monbg ANIM_ATK_PARTNER monbg ANIM_ATK_PARTNER
setalpha 12, 8 setalpha 12, 8
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1
@ -1752,9 +1755,6 @@ Move_AQUA_RING:
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER clearmonbg ANIM_ATK_PARTNER
blendoff blendoff
delay 1
call HealingEffect
waitforvisualfinish
end end
Move_MAGNET_RISE: Move_MAGNET_RISE:

2
data/battle_scripts_1.s
View file

@ -6964,7 +6964,7 @@ BattleScript_TurnHeal:
end2 end2
BattleScript_AquaRingHeal:: BattleScript_AquaRingHeal::
playanimation BS_ATTACKER, B_ANIM_INGRAIN_HEAL playanimation BS_ATTACKER, B_ANIM_AQUA_RING_HEAL
printstring STRINGID_AQUARINGHEAL printstring STRINGID_AQUARINGHEAL
goto BattleScript_TurnHeal goto BattleScript_TurnHeal

1
include/constants/battle_anim.h
View file

@ -531,6 +531,7 @@
#define B_ANIM_GULP_MISSILE 29 #define B_ANIM_GULP_MISSILE 29
#define B_ANIM_STRONG_WINDS 30 #define B_ANIM_STRONG_WINDS 30
#define B_ANIM_PRIMAL_REVERSION 31 #define B_ANIM_PRIMAL_REVERSION 31
#define B_ANIM_AQUA_RING_HEAL 32
// special animations table (gBattleAnims_Special) // special animations table (gBattleAnims_Special)
#define B_ANIM_LVL_UP 0 #define B_ANIM_LVL_UP 0