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

Add Night Slash animation

Browse source
This commit is contained in:
Marcus Huderle 2018-12-20 12:46:08 -06:00
parent ecda59a406
commit 4aecea2ce8
2 changed files with 96 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data/battle_anim_scripts.s
View file

@ -1464,6 +1464,23 @@ Move_DARK_PULSE:
end
Move_NIGHT_SLASH:
loadspritegfx ANIM_TAG_SLASH
createvisualtask AnimTask_BlendNightSlash, 2, ANIM_TARGET, 2, 0, 8, 1
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 3, 0, 12, RGB_BLACK
waitforvisualfinish
createsprite gNightSlashLeftSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0
playsewithpan SE_W013, SOUND_PAN_TARGET
delay 4
createsprite gNightSlashLeftSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
delay 40
createsprite gNightSlashRightSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0
createsprite gNightSlashRightSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
playsewithpan SE_W013, SOUND_PAN_TARGET
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 3, 12, 0, RGB_BLACK
waitforvisualfinish
end
Move_AQUA_TAIL:

79
src/effects_1.c
View file

@ -2104,10 +2104,12 @@ const struct SpriteTemplate gPowerOrbs_Float =
};
#include "random.h"
#include "util.h"
void AnimRockPolishStreak(struct Sprite *);
void AnimRockPolishSparkle(struct Sprite *);
void AnimPoisonJabProjectile(struct Sprite *);
void AnimNightSlash(struct Sprite *);
const union AnimCmd gRockPolishStreak_AnimCmd[] =
{
@ -2333,3 +2335,80 @@ void AnimPoisonJabProjectile(struct Sprite *sprite)
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
const union AnimCmd gNightSlashLeftAnimCmd0[] =
{
ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(16, 4),
ANIMCMD_FRAME(32, 4),
ANIMCMD_FRAME(48, 4),
ANIMCMD_END,
};
const union AnimCmd gNightSlashLeftAnimCmd1[] =
{
ANIMCMD_FRAME(48, 4),
ANIMCMD_END,
};
const union AnimCmd *const gNightSlashLeftAnimTable[] =
{
gNightSlashLeftAnimCmd0,
gNightSlashLeftAnimCmd1,
};
const struct SpriteTemplate gNightSlashLeftSpriteTemplate =
{
.tileTag = ANIM_TAG_SLASH,
.paletteTag = ANIM_TAG_SLASH,
.oam = &gUnknown_08524914,
.anims = gNightSlashLeftAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimNightSlash,
};
const union AnimCmd gNightSlashRightAnimCmd0[] =
{
ANIMCMD_FRAME(0, 4, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(16, 4, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(32, 4, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(48, 4, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_END,
};
const union AnimCmd gNightSlashRightAnimCmd1[] =
{
ANIMCMD_FRAME(48, 4, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_END,
};
const union AnimCmd *const gNightSlashRightAnimTable[] =
{
gNightSlashRightAnimCmd0,
gNightSlashRightAnimCmd1,
};
const struct SpriteTemplate gNightSlashRightSpriteTemplate =
{
.tileTag = ANIM_TAG_SLASH,
.paletteTag = ANIM_TAG_SLASH,
.oam = &gUnknown_08524914,
.anims = gNightSlashRightAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimNightSlash,
};
void AnimTask_BlendNightSlash(u8 taskId)
{
int paletteOffset = IndexOfSpritePaletteTag(ANIM_TAG_SLASH) * 16 + 256;
BlendPalette(paletteOffset, 16, 6, RGB_RED);
DestroyAnimVisualTask(taskId);
}
void AnimNightSlash(struct Sprite *sprite)
{
sprite->callback = sub_8101F40;
sprite->callback(sprite);
}