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

Merge pull request #532 from LOuroboros/deoxys_anim

Browse source 
Fixed the animation of Deoxys' Attack, Defense and Speed forms
This commit is contained in:
Eduardo Quezada D'Ottone 2020-10-23 11:42:12 -03:00 committed by GitHub
commit c6a2d0cda8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/data/pokemon_graphics/front_pic_anims.h
View file

@ -8418,19 +8418,57 @@ static const union AnimCmd sAnim_ZYGARDE_COMPLETE_1[] =
static const union AnimCmd sAnim_DEOXYS_ATTACK_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(0, 16),
ANIMCMD_FRAME(1, 16),
ANIMCMD_FRAME(0, 26),
ANIMCMD_FRAME(1, 16),
ANIMCMD_FRAME(0, 16),
};
static const union AnimCmd sAnim_DEOXYS_ATTACK_2[] =
{
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(2, 20),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(2, 20),
ANIMCMD_END,
};
static const union AnimCmd sAnim_DEOXYS_DEFENSE_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(0, 16),
ANIMCMD_FRAME(1, 16),
ANIMCMD_FRAME(0, 26),
ANIMCMD_FRAME(1, 16),
ANIMCMD_FRAME(0, 16),
ANIMCMD_END,
};
static const union AnimCmd sAnim_DEOXYS_DEFENSE_2[] =
{
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(2, 20),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(2, 20),
ANIMCMD_END,
};
static const union AnimCmd sAnim_DEOXYS_SPEED_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(0, 16),
ANIMCMD_FRAME(1, 16),
ANIMCMD_FRAME(0, 26),
ANIMCMD_FRAME(1, 16),
ANIMCMD_FRAME(0, 16),
ANIMCMD_END,
};
static const union AnimCmd sAnim_DEOXYS_SPEED_2[] =
{
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(2, 20),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(2, 20),
ANIMCMD_END,
};
@ -13147,16 +13185,19 @@ static const union AnimCmd *const sAnims_ZYGARDE_COMPLETE[] ={
static const union AnimCmd *const sAnims_DEOXYS_ATTACK[] ={
sAnim_GeneralFrame0,
sAnim_DEOXYS_ATTACK_1,
sAnim_DEOXYS_ATTACK_2,
};
static const union AnimCmd *const sAnims_DEOXYS_DEFENSE[] ={
sAnim_GeneralFrame0,
sAnim_DEOXYS_DEFENSE_1,
sAnim_DEOXYS_DEFENSE_2,
};
static const union AnimCmd *const sAnims_DEOXYS_SPEED[] ={
sAnim_GeneralFrame0,
sAnim_DEOXYS_SPEED_1,
sAnim_DEOXYS_SPEED_2,
};
#define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name