ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-15 16:12:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1275 from ghoulslash/battle_anims

Browse Source 
Fix Shadow Sneak Animation
This commit is contained in:
ultima-soul 2020-12-18 23:15:07 -08:00 committed by GitHub
commit aefa35a04f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
data/battle_anim_scripts.s
View File

@ -2800,28 +2800,42 @@ Move_FIRE_FANG:
end end
Move_SHADOW_SNEAK: Move_SHADOW_SNEAK:
loadspritegfx ANIM_TAG_LICK loadspritegfx ANIM_TAG_IMPACT
setalpha 0, 16 loadspritegfx ANIM_TAG_WHITE_SHADOW @Destiny Bond
delay 1 loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @Black Colour
createvisualtask AnimTask_InitMementoShadow, 2 loadspritegfx ANIM_TAG_POISON_BUBBLE @Poison
delay 1 loadspritegfx ANIM_TAG_HANDS_AND_FEET
createvisualtask AnimTask_MoveAttackerMementoShadow, 5 monbg ANIM_ATTACKER
playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x0 0x7 0x0000
delay 48
playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8114470, 2 playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
setalpha 0, 16 launchtask AnimTask_TranslateMonEllipticalRespectSide 0x2 0x5 0x0 0x12 0x6 0x1 0x3
delay 1 launchtask AnimTask_AttackerFadeToInvisible 0x2 0x1 0x1
playsewithpan SE_M_LICK, SOUND_PAN_TARGET waitforvisualfinish
createsprite gLickSpriteTemplate, ANIM_TARGET, 2, 0, 0 clearmonbg ANIM_ATTACKER
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 invisible ANIM_ATTACKER
delay 0x1
launchtask AnimTask_DestinyBondWhiteShadow 0x5 0x2 0x0 0x30
delay 0x30
launchtask AnimTask_BlendColorCycle 0x2 0x6 ANIM_PAL_DEF 0x2 0x2 0x0 0xF 0x0
createsprite gShadowSneakImpactSpriteTemplate, ANIM_TARGET, 2, 0xfff6, 0xfff6, 0x0
call ShadowSneakMovement
createsprite gShadowSneakImpactSpriteTemplate, ANIM_TARGET, 2, 0xa, 0x14, 0x0
call ShadowSneakMovement
createsprite gShadowSneakImpactSpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x0
call ShadowSneakMovement
createsprite gShadowSneakImpactSpriteTemplate, ANIM_TARGET, 2, 0x11, 0xfff4, 0x0
call ShadowSneakMovement
waitforvisualfinish
visible ANIM_ATTACKER
launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x7 0x0 0x0000
waitforvisualfinish waitforvisualfinish
clearmonbg_23 ANIM_TARGET
delay 1
blendoff
delay 1
end end
ShadowSneakMovement:
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x3 0x0 0x6 0x1
delay 0x4
return
Move_MUD_BOMB: Move_MUD_BOMB:
loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_MUD_SAND

12
src/battle_anim_new.c
View File

@ -67,6 +67,18 @@ static const union AffineAnimCmd sSquishTargetAffineAnimCmds[] =
}; };
//// GEN 4 //// GEN 4
// shadow sneak
const struct SpriteTemplate gShadowSneakImpactSpriteTemplate =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gAffineAnims_IceCrystalHit,
.callback = AnimIceEffectParticle
};
// power trick // power trick
const struct SpriteTemplate gPowerTrickSpriteTemplate = const struct SpriteTemplate gPowerTrickSpriteTemplate =
{ {