Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-04-26 02:14:22 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix Aqua Ring animation (#8707)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2025-12-29 21:34:06 +01:00 committed by GitHub
parent 3a8fdf9fad
commit f10d722af7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/battle_anim_scripts.s
View File

@ -1043,14 +1043,14 @@ gBattleAnimGeneral_AquaRingHeal::
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 12, 0, 25, 0
setalpha 8, 8
playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 0
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 0, FALSE
delay 4
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 0
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 0, FALSE
delay 4
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 0
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 0, FALSE
waitforvisualfinish
playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATK_SIDE, 0, 2, 0, 10, RGB_WHITE
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 10, RGB_WHITE
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
blendoff
@ -22535,11 +22535,11 @@ gBattleAnimMove_Safeguard::
monbg ANIM_ATK_PARTNER
setalpha 8, 8
playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, TRUE
delay 4
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, TRUE
delay 4
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, TRUE
waitforvisualfinish
playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATK_SIDE, 0, 2, 0, 10, RGB_WHITE

3
src/battle_anim_effects_2.c
View File

@ -3740,9 +3740,10 @@ static void AnimPerishSongMusicNote_Step2(struct Sprite *sprite)
}
}
// arg0: cover both battlers
static void AnimGuardRing(struct Sprite *sprite)
{
if (IsDoubleBattle() && IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
if (gBattleAnimArgs[0] && IsDoubleBattle() && IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
{
SetAverageBattlerPositions(gBattleAnimAttacker, FALSE, &sprite->x, &sprite->y);
sprite->y += 40;