Fix rain dance/sunny day not blending opponent sprite (#3785)
This commit is contained in:
DizzyEggg
GitHub
parent
3a5ca6f8f0
commit
fcdc515be2
2 changed files with 52 additions and 49 deletions
|
|
@ -5389,11 +5389,11 @@ Move_FOUL_PLAY:
|
|||
createsprite gFoulPlayImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1, 0x1
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
|
||||
playsewithpan SE_M_VITAL_THROW SOUND_PAN_TARGET
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0xa, 0x0, 0x0
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0xa, 0x0, 0x0
|
||||
createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
|
||||
delay 0x8
|
||||
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0xa, 0x0, 0x0
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0xa, 0x0, 0x0
|
||||
createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_TARGET
|
||||
|
|
@ -10404,7 +10404,7 @@ Move_LIGHT_OF_RUIN::
|
|||
delay 0x10
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x7FFF
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x1, 0x0, 0x0, 0x0
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x1, 0x0, 0x0, 0x0
|
||||
waitforvisualfinish
|
||||
end
|
||||
LightOfRuinBeam:
|
||||
|
|
@ -11142,7 +11142,7 @@ SolarBladeUnleash:
|
|||
loadspritegfx ANIM_TAG_SUNLIGHT @sun rays
|
||||
monbg ANIM_ATTACKER
|
||||
setalpha 13, 3
|
||||
createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 0, 6, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 6, 0x7fff
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4
|
||||
|
|
@ -11159,7 +11159,7 @@ SolarBladeUnleash:
|
|||
delay 0x2
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 6, 0, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, 0x7fff
|
||||
waitforvisualfinish
|
||||
call UnsetPsychicBg
|
||||
clearmonbg ANIM_ATTACKER
|
||||
|
|
@ -15384,7 +15384,7 @@ Move_SILK_TRAP::
|
|||
Move_SNOWSCAPE::
|
||||
loadspritegfx ANIM_TAG_SNOWFLAKES
|
||||
playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB(11, 18, 22)
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 4, RGB(11, 18, 22)
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
|
||||
createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
|
||||
|
|
@ -15393,7 +15393,7 @@ Move_SNOWSCAPE::
|
|||
playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER
|
||||
delay 30
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB(11, 18, 22)
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 4, 0, RGB(11, 18, 22)
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
|
|
@ -15555,7 +15555,7 @@ Move_DRAGON_ENERGY::
|
|||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 4, 0, 11, RGB(31, 28, 31) @;Pinkish White
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_M_DETECT, SOUND_PAN_TARGET
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x10, 0x0, 0x2C5E @;Regidrago Reddish Reddish, Purple
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x10, 0x0, 0x2C5E @;Regidrago Reddish Reddish, Purple
|
||||
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -120, 0, 0, 1 @;Slide off off, screen
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_TARGET
|
||||
|
|
@ -16093,7 +16093,7 @@ Move_CHLOROBLAST::
|
|||
createvisualtask AnimTask_AllBattlersVisible, 0xA,
|
||||
clearmonbg ANIM_DEF_PARTNER
|
||||
waitbgfadein
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x0, 0x0 @;From Black
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x0, 0x0 @;From Black
|
||||
end
|
||||
ChloroblastShot:
|
||||
createsprite gSpriteTemplate_ChloroblastShot, ANIM_TARGET, 2, 0, 0, 0x19
|
||||
|
|
@ -16461,7 +16461,7 @@ Move_CEASELESS_EDGE::
|
|||
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_AllBattlersVisible, 0xA,
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x10, 0x0, 0x7FFF @;From White
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x10, 0x0, 0x7FFF @;From White
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
|
|
@ -21839,14 +21839,14 @@ Move_DRAGON_RAGE:
|
|||
Move_RAIN_DANCE:
|
||||
loadspritegfx ANIM_TAG_RAIN_DROPS
|
||||
playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB_BLACK
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 4, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120
|
||||
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120
|
||||
delay 120
|
||||
delay 30
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB_BLACK
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 4, 0, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
|
|
@ -23279,7 +23279,7 @@ Move_SUNNY_DAY:
|
|||
loadspritegfx ANIM_TAG_SUNLIGHT
|
||||
monbg ANIM_ATK_PARTNER
|
||||
setalpha 13, 3
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 0, 6, RGB_WHITE
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 6, RGB_WHITE
|
||||
waitforvisualfinish
|
||||
panse_adjustnone SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
|
||||
call SunnyDayLightRay
|
||||
|
|
@ -23287,7 +23287,7 @@ Move_SUNNY_DAY:
|
|||
call SunnyDayLightRay
|
||||
call SunnyDayLightRay
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 6, 0, RGB_WHITE
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, RGB_WHITE
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_ATK_PARTNER
|
||||
blendoff
|
||||
|
|
@ -23503,9 +23503,9 @@ Move_HAZE:
|
|||
playsewithpan SE_M_HAZE, 0
|
||||
createvisualtask AnimTask_HazeScrollingFog, 5
|
||||
delay 30
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS, 2, 0, 16, RGB_BLACK
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 2, 0, 16, RGB_BLACK
|
||||
delay 90
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS, 1, 16, 0, RGB_BLACK
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 1, 16, 0, RGB_BLACK
|
||||
end
|
||||
|
||||
Move_FIRE_PUNCH:
|
||||
|
|
@ -24850,7 +24850,7 @@ Move_MORNING_SUN:
|
|||
loadspritegfx ANIM_TAG_BLUE_STAR
|
||||
createvisualtask AnimTask_MorningSunLightBeam, 5
|
||||
delay 8
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 8, 0, 12, RGB_WHITE
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 8, 0, 12, RGB_WHITE
|
||||
delay 14
|
||||
call MorningSunStar
|
||||
call MorningSunStar
|
||||
|
|
@ -24867,7 +24867,7 @@ Move_MORNING_SUN:
|
|||
call MorningSunStar
|
||||
call MorningSunStar
|
||||
call MorningSunStar
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 3, 12, 0, RGB_WHITE
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 12, 0, RGB_WHITE
|
||||
waitforvisualfinish
|
||||
waitsound
|
||||
call HealingEffect
|
||||
|
|
@ -27172,13 +27172,13 @@ General_Rain:
|
|||
RainDrops:
|
||||
loadspritegfx ANIM_TAG_RAIN_DROPS
|
||||
playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB_BLACK
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 4, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
|
||||
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
|
||||
delay 50
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB_BLACK
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 4, 0, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
return
|
||||
|
||||
|
|
@ -27627,14 +27627,14 @@ General_Rainbow::
|
|||
call RainDrops
|
||||
delay 30
|
||||
loadspritegfx ANIM_TAG_SUNLIGHT
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 0, 6, RGB_WHITE
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 6, RGB_WHITE
|
||||
waitforvisualfinish
|
||||
panse_adjustnone SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
|
||||
call SunnyDayLightRay
|
||||
call SunnyDayLightRay
|
||||
call SunnyDayLightRay
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 6, 0, RGB_WHITE
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, RGB_WHITE
|
||||
waitforvisualfinish
|
||||
delay 30
|
||||
fadetobg BG_RAINBOW
|
||||
|
|
@ -28807,7 +28807,7 @@ FinishCorkscrewCrash:
|
|||
call CorkscrewCrashSprayRocks
|
||||
delay 0x6
|
||||
call CorkscrewCrashSprayRocks
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff
|
||||
waitforvisualfinish
|
||||
delay 0x10
|
||||
call ResetFromWhiteScreen
|
||||
|
|
@ -28890,7 +28890,7 @@ FinishInfernoOverdrive:
|
|||
call InfernoOverdriveExplosion
|
||||
delay 0x6
|
||||
call InfernoOverdriveExplosion
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x0, 0x10, 0x001b @ red bg pal
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x001b @ red bg pal
|
||||
delay 0x6
|
||||
call InfernoOverdriveExplosion
|
||||
waitforvisualfinish
|
||||
|
|
@ -29249,7 +29249,7 @@ BloomDoomPetalBlast:
|
|||
ResetFromGreenScreen:
|
||||
createvisualtask AnimTask_AllBattlersInvisible, 0xA
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x33ED @Everything from green
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x33ED @Everything from green
|
||||
restorebg
|
||||
waitbgfadeout
|
||||
setarg 0x7 0xffff
|
||||
|
|
@ -29873,7 +29873,7 @@ DevastatingDrakeUniversalEnding:
|
|||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x10, 0x0, 0x40c0 @ fade from purple
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x0 @ reset all colours
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x0 @ reset all colours
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_AllBattlersVisible, 0xA
|
||||
waitforvisualfinish
|
||||
|
|
@ -30066,7 +30066,7 @@ Move_BLACK_HOLE_ECLIPSE::
|
|||
unloadspritegfx ANIM_TAG_BLACK_BALL_2
|
||||
loadspritegfx ANIM_TAG_EXPLOSION_2
|
||||
call BlackHoleEclipseExplosion
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x0, 0x10, 0x7fff @ bg to white pal
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x7fff @ bg to white pal
|
||||
call BlackHoleEclipseExplosion
|
||||
waitforvisualfinish
|
||||
delay 0x18
|
||||
|
|
@ -30097,7 +30097,7 @@ BlackHoleEclipseExplosion:
|
|||
ResetFromWhiteScreen:
|
||||
createvisualtask AnimTask_AllBattlersInvisible, 0xA
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x7FFF @everything from white
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x7FFF @everything from white
|
||||
restorebg
|
||||
waitbgfadeout
|
||||
setarg 0x7 0xffff
|
||||
|
|
@ -30416,10 +30416,10 @@ CatastropikaFinish:
|
|||
call CatastropikaThundering
|
||||
call CatastropikaThundering
|
||||
call CatastropikaThundering
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x7fff @ bg to white
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff @ bg to white
|
||||
call CatastropikaThundering
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x10, 0x0, 0x7fff @ bg to white
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x10, 0x0, 0x7fff @ bg to white
|
||||
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10 @fix tgt position
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_AllBattlersVisible, 0xA
|
||||
|
|
@ -30623,11 +30623,11 @@ Move_10000000_VOLT_THUNDERBOLT::
|
|||
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x40, 0x28, 0x1, 0x8003
|
||||
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x80, 0x28, 0x0, 0x8003
|
||||
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x00, 0x37, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x8003
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff
|
||||
call TenMillionVoltThunderboltSparkGeyser
|
||||
waitforvisualfinish
|
||||
delay 0x10
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0x10, 0x0, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x10, 0x0, 0x7fff
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_AllBattlersVisible, 0xA
|
||||
waitforvisualfinish
|
||||
|
|
@ -30843,10 +30843,10 @@ StokedSparksurferSparkGeyser:
|
|||
|
||||
Move_EXTREME_EVOBOOST::
|
||||
loadspritegfx ANIM_TAG_LEER @leer
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0x0, 0x10, 0x0000
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x0000
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_AllBattlersInvisible, 0xA
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 3, 0, 0, 0 @Remove fading on everyone
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 3, 0, 0, 0 @Remove fading on everyone
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
|
||||
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x18, 0xfff4
|
||||
|
|
@ -31055,7 +31055,7 @@ PulverizingPancakeFinish:
|
|||
delay 0x5
|
||||
loadspritegfx ANIM_TAG_EXPLOSION @explosion
|
||||
call PulverizingPancakeExplosion
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x7fff @ everything goes white
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff @ everything goes white
|
||||
call PulverizingPancakeExplosion
|
||||
waitforvisualfinish
|
||||
call ResetFromWhiteScreen
|
||||
|
|
@ -31148,7 +31148,7 @@ GenesisSupernovaFinish:
|
|||
unloadspritegfx ANIM_TAG_METEOR @superpower
|
||||
call GenesisSupernovaBubbleExplosion
|
||||
call GenesisSupernovaBubbleExplosion
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0x0, 0x10, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x7fff
|
||||
call GenesisSupernovaBubbleExplosion
|
||||
waitforvisualfinish
|
||||
delay 0x10
|
||||
|
|
@ -31631,7 +31631,7 @@ Move_MALICIOUS_MOONSAULT::
|
|||
call MaliciousMoonsaultExplosion
|
||||
delay 0x6
|
||||
call MaliciousMoonsaultExplosion
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x0, 0x10, 0x001b @ fade all to red
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x001b @ fade all to red
|
||||
delay 0x6
|
||||
call MaliciousMoonsaultExplosion
|
||||
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10
|
||||
|
|
@ -31954,10 +31954,10 @@ SplinteredStormshardsByPlayer:
|
|||
call SplinteredStormshardsExplosionOpponent
|
||||
call SplinteredStormshardsExplosionOpponent
|
||||
SplinteredStormshardsEnd:
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff
|
||||
call SplinteredStormshardsBrownExplode
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x10, 0x0, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x10, 0x0, 0x7fff
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_AllBattlersVisible, 0xA
|
||||
waitforvisualfinish
|
||||
|
|
@ -32203,7 +32203,7 @@ Move_LETS_SNUGGLE_FOREVER::
|
|||
delay 0x8
|
||||
call LetsSnuggleForeverTears
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x0000
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x0000
|
||||
waitforvisualfinish
|
||||
loadspritegfx ANIM_TAG_SPARKLE_4 @detect
|
||||
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
|
||||
|
|
@ -32405,7 +32405,7 @@ ClangorousSoulblazeOnPlayer:
|
|||
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x60, 0xffe0, ANIM_ATTACKER, 0x1
|
||||
call ClangorousSoulblazePulse_2
|
||||
delay 0x5
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff
|
||||
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
|
||||
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x65, 0xfff0, ANIM_ATTACKER, 0x1
|
||||
call ClangorousSoulblazePulse_3
|
||||
|
|
@ -32476,7 +32476,7 @@ ClangorousSoulblazeOnOpponent:
|
|||
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x60, 0x45, ANIM_ATTACKER, 0x1
|
||||
call ClangorousSoulblazePulse_2
|
||||
delay 0x5
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff
|
||||
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
|
||||
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x65, 0x35, ANIM_ATTACKER, 0x1
|
||||
call ClangorousSoulblazePulse_3
|
||||
|
|
@ -32630,7 +32630,7 @@ Move_GUARDIAN_OF_ALOLA::
|
|||
call GuardianOfAlolaRockGeyser
|
||||
call GuardianOfAlolaRockGeyser
|
||||
call GuardianOfAlolaRocksTarget
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0x0, 0x10, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x7fff
|
||||
call GuardianOfAlolaRockGeyser
|
||||
call GuardianOfAlolaRockGeyser
|
||||
call GuardianOfAlolaRockGeyser
|
||||
|
|
@ -32801,7 +32801,7 @@ SearingSunrazeSmashImpact:
|
|||
call SearingSunrazeSmashInferno
|
||||
call SearingSunrazeSmashInferno
|
||||
call SearingSunrazeSmashInferno
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x001b @full red
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x001b @full red
|
||||
call SearingSunrazeSmashInferno
|
||||
call SearingSunrazeSmashInferno
|
||||
call SearingSunrazeSmashInferno
|
||||
|
|
@ -32881,7 +32881,7 @@ SearingSunrazeSmashCharge:
|
|||
ResetFromRedScreen:
|
||||
createvisualtask AnimTask_AllBattlersInvisible, 0xA
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x1B @Everything from red
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x1B @Everything from red
|
||||
restorebg
|
||||
waitbgfadeout
|
||||
setarg 0x7 0xffff
|
||||
|
|
@ -33011,7 +33011,7 @@ MenacingMoonrazeMaelstromFinish:
|
|||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 76, 1
|
||||
call MenacingMoonrazeMaelstromExplosion
|
||||
call MenacingMoonrazeMaelstromExplosion
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x7fff
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff
|
||||
call MenacingMoonrazeMaelstromExplosion
|
||||
waitforvisualfinish
|
||||
call ResetFromWhiteScreen
|
||||
|
|
@ -33158,7 +33158,7 @@ Move_LIGHT_THAT_BURNS_THE_SKY::
|
|||
clearmonbg ANIM_TARGET
|
||||
waitforvisualfinish
|
||||
delay 0x10
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS), 0x0, 0x10, 0x0, 0x43FF
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x0, 0x10, 0x0, 0x43FF
|
||||
restorebg
|
||||
waitbgfadeout
|
||||
end
|
||||
|
|
@ -33360,9 +33360,9 @@ Move_SOUL_STEALING_7_STAR_STRIKE::
|
|||
waitforvisualfinish
|
||||
blendoff
|
||||
restorebg
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x10, 0x0, 0x0 @everything from black
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x10, 0x0, 0x0 @everything from black
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x0
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x0
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_AllBattlersVisible, 0xA
|
||||
waitforvisualfinish
|
||||
|
|
|
|||
|
|
@ -642,5 +642,8 @@
|
|||
#define F_PAL_ADJACENT (F_PAL_DEF_SIDE | F_PAL_ATK_PARTNER)
|
||||
#define F_PAL_ALL_BUT_DEF (F_PAL_ATK_SIDE | F_PAL_DEF_PARTNER)
|
||||
#define F_PAL_ALL_BUT_ATK_PARTNER (F_PAL_ATTACKER | F_PAL_DEF_SIDE)
|
||||
// The below are only used by AnimTask_BlendBattleAnimPal to get battler sprite palettes by position rather than by role.
|
||||
// It's redundant with F_PAL_BATTLERS, because they're only ever used together to refer to all the battlers at once.
|
||||
#define F_PAL_BATTLERS_2 (1 << 7 | 1 << 8 | 1 << 9 | 1 << 10)
|
||||
|
||||
#endif // GUARD_CONSTANTS_BATTLE_ANIM_H
|
||||
|
|
|
|||
Loading…
Reference in a new issue