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

Merge branch 'RHH/master' into RHH/upcoming

Browse source
This commit is contained in:
Eduardo Quezada 2023-12-16 20:13:15 -03:00
commit 537f1c9235
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/battle_anim_scripts.s
View file

@ -15613,6 +15613,7 @@ Move_FREEZING_GLARE::
Move_FIERY_WRATH::
loadspritegfx ANIM_TAG_SMALL_EMBER
loadspritegfx ANIM_TAG_PURPLE_RING
monbg ANIM_DEF_PARTNER
playsewithpan SE_M_SACRED_FIRE2, 0xc0
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x2, 0x0, 0xE, 0x0
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x4, 0x0, 0x8, 0x1F
@ -15633,6 +15634,7 @@ Move_FIERY_WRATH::
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_DEF_SIDE, 0x2, 0x9, 0x0, 0x3006
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xE, 0x0, 0x0
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
FieryWrathGeyser:
@ -15650,6 +15652,7 @@ FieryWrathGeyser:
delay 0x0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfffc, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfffc, 0x10
delay 0x0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x100D, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x100D, 0x10
delay 0x0
@ -15682,10 +15685,10 @@ FieryWrathGeyser:
delay 0x0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfff0, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfff0, 0x10
delay 0x0
return
@Credits to Skeli
Move_THUNDEROUS_KICK::
loadspritegfx ANIM_TAG_IMPACT