Gen 6 Sprites/Animations For Species (#3543)

* Bunnelby Spritework

+ New pal + new animation

* Fletchling Spritework

New front sprite, animation and palettes

* Fletchinder + Talonflame Changes

New animation for Fletchinder
Spritework + animations for Talonflame

* Flabebe, Floette + Florges Changes

+ Touched up Flabebe
+ Fixed Floettes normal forms sprite
+ Added second frame to Eternal form for Floette
+ Animations changed

* Amaura Spritework

New second frame + animation (frame-by-frame)

* Chespin Spritework

Touched up chespins sprites + changed the animation.

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
This commit is contained in:
Katy 2023-11-18 16:48:02 -06:00 committed by GitHub
parent 42076897d3
commit b5cb92f0e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 105 additions and 118 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 773 B

After

Width:  |  Height:  |  Size: 760 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 968 B

After

Width:  |  Height:  |  Size: 927 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 634 B

After

Width:  |  Height:  |  Size: 558 B

View File

@ -13,7 +13,7 @@ JASC-PAL
136 136 120
200 192 192
248 248 248
80 40 16
8 8 8
0 0 0
0 0 0
0 0 0

View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
80 80 96
153 153 153
230 230 230
199 199 199
8 8 8
66 66 66
125 125 125
152 73 37
214 111 60
97 97 97
186 186 186
248 248 248
200 200 200
0 0 0
56 56 56
160 160 144
144 104 80
240 184 168
120 120 112
200 192 192
248 248 248
160 152 152
88 24 32
0 0 0
0 0 0
158 0 0
255 0 255
255 0 255
255 0 255

Binary file not shown.

Before

Width:  |  Height:  |  Size: 840 B

After

Width:  |  Height:  |  Size: 853 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 590 B

View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
0 181 239
152 208 160
74 99 25
16 16 16
165 214 74

View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
0 181 239
152 208 160
99 8 8
16 16 16
222 41 58

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 921 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 531 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 704 B

After

Width:  |  Height:  |  Size: 653 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 613 B

After

Width:  |  Height:  |  Size: 528 B

View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
120 184 168
128 24 0
248 112 80
8 8 8
208 72 40
32 32 32
64 56 48
128 112 104
248 248 248
248 200 64
208 208 208
56 96 120
160 208 248
120 160 200
32 32 32
0 0 0
35 35 34
68 67 65
138 52 18
174 69 27
91 96 109
228 90 35
140 147 169
197 197 197
192 201 230
255 212 39
255 255 255
250 250 250
255 0 255
255 0 255

View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
120 184 168
104 72 0
248 184 56
152 208 160
8 8 8
200 144 16
40 32 32
72 48 72
120 104 120
248 248 248
232 248 72
208 208 208
104 80 64
232 192 144
176 144 104
32 32 32
0 0 0
87 51 51
154 90 90
118 45 14
219 115 66
124 103 74
255 152 86
191 158 121
240 212 0
255 218 166
255 255 134
255 255 255
247 227 77
255 0 255
255 0 255

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -1266,7 +1266,7 @@ const u32 gMonFrontPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/o
const u32 gMonFrontPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/anim_front.4bpp.lz");
const u32 gMonFrontPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/anim_front.4bpp.lz");
const u32 gMonFrontPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/anim_front.4bpp.lz");
const u32 gMonFrontPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/front.4bpp.lz");
const u32 gMonFrontPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/anim_front.4bpp.lz");
const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/anim_front.4bpp.lz");
const u32 gMonFrontPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/anim_front.4bpp.lz");
const u32 gMonFrontPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/anim_front.4bpp.lz");

View File

@ -7731,10 +7731,8 @@ static const union AnimCmd sAnim_GreninjaAsh_1[] =
static const union AnimCmd sAnim_Bunnelby_1[] =
{
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
};
@ -7747,41 +7745,31 @@ static const union AnimCmd sAnim_Diggersby_1[] =
static const union AnimCmd sAnim_Fletchling_1[] =
{
ANIMCMD_FRAME(1, 7),
ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(1, 28),
ANIMCMD_FRAME(1, 7),
ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
};
static const union AnimCmd sAnim_Fletchinder_1[] =
{
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 30),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
};
static const union AnimCmd sAnim_Talonflame_1[] =
{
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 55),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
};
@ -7843,11 +7831,10 @@ static const union AnimCmd sAnim_Pyroar_1[] =
static const union AnimCmd sAnim_Flabebe_1[] =
{
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 27),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 23),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
};
@ -7862,21 +7849,16 @@ static const union AnimCmd sAnim_Flabebe_2[] =
static const union AnimCmd sAnim_Floette_1[] =
{
ANIMCMD_FRAME(0, 33),
ANIMCMD_FRAME(1, 33),
ANIMCMD_FRAME(0, 33),
ANIMCMD_FRAME(1, 33),
ANIMCMD_FRAME(0, 11),
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
};
static const union AnimCmd sAnim_Florges_1[] =
{
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
};
@ -8148,10 +8130,15 @@ static const union AnimCmd sAnim_Tyrantrum_1[] =
static const union AnimCmd sAnim_Amaura_1[] =
{
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 35),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 11),
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
};

View File

@ -663,7 +663,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
[SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
#endif
#if P_GEN_6_POKEMON == TRUE
[SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 },
[SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 5 },
[SPECIES_QUILLADIN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 },
[SPECIES_CHESNAUGHT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
[SPECIES_FENNEKIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 },
@ -711,7 +711,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
[SPECIES_HELIOLISK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 },
[SPECIES_TYRUNT] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 },
[SPECIES_TYRANTRUM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_AMAURA] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 8 },
[SPECIES_AMAURA] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 0 },
[SPECIES_AURORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SYLVEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 },
[SPECIES_HAWLUCHA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 },

View File

@ -2856,7 +2856,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_GENESECT - 1] = ANIM_H_VIBRATE,
// Gen 6
[SPECIES_CHESPIN - 1] = ANIM_V_JUMPS_SMALL,
[SPECIES_CHESPIN - 1] = ANIM_H_SLIDE_SLOW,
[SPECIES_QUILLADIN - 1] = ANIM_LUNGE_GROW,
[SPECIES_CHESNAUGHT - 1] = ANIM_GROW_IN_STAGES,
[SPECIES_FENNEKIN - 1] = ANIM_V_SQUISH_AND_BOUNCE,
@ -2865,19 +2865,19 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_FROAKIE - 1] = ANIM_H_JUMPS,
[SPECIES_FROGADIER - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
[SPECIES_GRENINJA - 1] = ANIM_V_STRETCH,
[SPECIES_BUNNELBY - 1] = ANIM_V_JUMPS_SMALL,
[SPECIES_BUNNELBY - 1] = ANIM_CIRCULAR_STRETCH_TWICE,
[SPECIES_DIGGERSBY - 1] = ANIM_H_JUMPS_V_STRETCH,
[SPECIES_FLETCHLING - 1] = ANIM_RAPID_H_HOPS,
[SPECIES_FLETCHINDER - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_TALONFLAME - 1] = ANIM_SWING_CONCAVE_FAST,
[SPECIES_FLETCHLING - 1] = ANIM_V_JUMPS_SMALL,
[SPECIES_FLETCHINDER - 1] = ANIM_V_SLIDE_SLOW,
[SPECIES_TALONFLAME - 1] = ANIM_V_SLIDE_WOBBLE,
[SPECIES_SCATTERBUG - 1] = ANIM_V_STRETCH,
[SPECIES_SPEWPA - 1] = ANIM_V_SHAKE,
[SPECIES_VIVILLON_ICY_SNOW - 1] = ANIM_ZIGZAG_SLOW,
[SPECIES_LITLEO - 1] = ANIM_BACK_AND_LUNGE,
[SPECIES_PYROAR - 1] = ANIM_V_SHAKE,
[SPECIES_FLABEBE_RED_FLOWER - 1] = ANIM_SWING_CONCAVE_FAST_SHORT,
[SPECIES_FLABEBE_RED_FLOWER - 1] = ANIM_H_SLIDE_SLOW,
[SPECIES_FLOETTE_RED_FLOWER - 1] = ANIM_V_SLIDE_WOBBLE,
[SPECIES_FLORGES_RED_FLOWER - 1] = ANIM_GROW_VIBRATE,
[SPECIES_FLORGES_RED_FLOWER - 1] = ANIM_V_SLIDE_SLOW,
[SPECIES_SKIDDO - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_GOGOAT - 1] = ANIM_V_STRETCH,
[SPECIES_PANCHAM - 1] = ANIM_H_STRETCH,
@ -2904,7 +2904,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_HELIOLISK - 1] = ANIM_RAPID_H_HOPS,
[SPECIES_TYRUNT - 1] = ANIM_V_SHAKE,
[SPECIES_TYRANTRUM - 1] = ANIM_V_SHAKE,
[SPECIES_AMAURA - 1] = ANIM_H_STRETCH,
[SPECIES_AMAURA - 1] = ANIM_CONCAVE_ARC_SMALL_TWICE,
[SPECIES_AURORUS - 1] = ANIM_GROW_VIBRATE,
[SPECIES_SYLVEON - 1] = ANIM_SHRINK_GROW,
[SPECIES_HAWLUCHA - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
@ -3398,19 +3398,19 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_VIVILLON_JUNGLE - 1] = ANIM_ZIGZAG_SLOW,
[SPECIES_VIVILLON_FANCY - 1] = ANIM_ZIGZAG_SLOW,
[SPECIES_VIVILLON_POKE_BALL - 1] = ANIM_ZIGZAG_SLOW,
[SPECIES_FLABEBE_YELLOW_FLOWER - 1] = ANIM_SWING_CONCAVE_FAST_SHORT,
[SPECIES_FLABEBE_ORANGE_FLOWER - 1] = ANIM_SWING_CONCAVE_FAST_SHORT,
[SPECIES_FLABEBE_BLUE_FLOWER - 1] = ANIM_SWING_CONCAVE_FAST_SHORT,
[SPECIES_FLABEBE_WHITE_FLOWER - 1] = ANIM_SWING_CONCAVE_FAST_SHORT,
[SPECIES_FLABEBE_YELLOW_FLOWER - 1] = ANIM_H_SLIDE_SLOW,
[SPECIES_FLABEBE_ORANGE_FLOWER - 1] = ANIM_H_SLIDE_SLOW,
[SPECIES_FLABEBE_BLUE_FLOWER - 1] = ANIM_H_SLIDE_SLOW,
[SPECIES_FLABEBE_WHITE_FLOWER - 1] = ANIM_H_SLIDE_SLOW,
[SPECIES_FLOETTE_YELLOW_FLOWER - 1] = ANIM_V_SLIDE_WOBBLE,
[SPECIES_FLOETTE_ORANGE_FLOWER - 1] = ANIM_V_SLIDE_WOBBLE,
[SPECIES_FLOETTE_BLUE_FLOWER - 1] = ANIM_V_SLIDE_WOBBLE,
[SPECIES_FLOETTE_WHITE_FLOWER - 1] = ANIM_V_SLIDE_WOBBLE,
[SPECIES_FLOETTE_ETERNAL_FLOWER - 1] = ANIM_V_SLIDE_WOBBLE,
[SPECIES_FLORGES_YELLOW_FLOWER - 1] = ANIM_GROW_VIBRATE,
[SPECIES_FLORGES_ORANGE_FLOWER - 1] = ANIM_GROW_VIBRATE,
[SPECIES_FLORGES_BLUE_FLOWER - 1] = ANIM_GROW_VIBRATE,
[SPECIES_FLORGES_WHITE_FLOWER - 1] = ANIM_GROW_VIBRATE,
[SPECIES_FLORGES_YELLOW_FLOWER - 1] = ANIM_V_SLIDE_SLOW,
[SPECIES_FLORGES_ORANGE_FLOWER - 1] = ANIM_V_SLIDE_SLOW,
[SPECIES_FLORGES_BLUE_FLOWER - 1] = ANIM_V_SLIDE_SLOW,
[SPECIES_FLORGES_WHITE_FLOWER - 1] = ANIM_V_SLIDE_SLOW,
[SPECIES_FURFROU_HEART_TRIM - 1] = ANIM_H_SLIDE,
[SPECIES_FURFROU_STAR_TRIM - 1] = ANIM_H_SLIDE,
[SPECIES_FURFROU_DIAMOND_TRIM - 1] = ANIM_H_SLIDE,

View File

@ -887,17 +887,17 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_FROAKIE] = BACK_ANIM_SHRINK_GROW,
[SPECIES_FROGADIER] = BACK_ANIM_GROW_STUTTER,
[SPECIES_GRENINJA] = BACK_ANIM_JOLT_RIGHT,
[SPECIES_BUNNELBY] = BACK_ANIM_CONCAVE_ARC_SMALL,
[SPECIES_BUNNELBY] = BACK_ANIM_V_STRETCH,
[SPECIES_DIGGERSBY] = BACK_ANIM_V_SHAKE_H_SLIDE,
[SPECIES_FLETCHLING] = BACK_ANIM_CONCAVE_ARC_SMALL,
[SPECIES_FLETCHINDER] = BACK_ANIM_TRIANGLE_DOWN,
[SPECIES_TALONFLAME] = BACK_ANIM_SHAKE_GLOW_RED,
[SPECIES_FLETCHLING] = BACK_ANIM_TRIANGLE_DOWN,
[SPECIES_FLETCHINDER] = BACK_ANIM_CONCAVE_ARC_SMALL,
[SPECIES_TALONFLAME] = BACK_ANIM_SHRINK_GROW_VIBRATE,
[SPECIES_SCATTERBUG] = BACK_ANIM_H_SLIDE,
[SPECIES_SPEWPA] = BACK_ANIM_H_VIBRATE,
[SPECIES_VIVILLON_ICY_SNOW] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE,
[SPECIES_LITLEO] = BACK_ANIM_CONCAVE_ARC_SMALL,
[SPECIES_PYROAR] = BACK_ANIM_H_STRETCH,
[SPECIES_FLABEBE_RED_FLOWER] = BACK_ANIM_CONCAVE_ARC_SMALL,
[SPECIES_FLABEBE_RED_FLOWER] = BACK_ANIM_CONVEX_DOUBLE_ARC,
[SPECIES_FLOETTE_RED_FLOWER] = BACK_ANIM_CONVEX_DOUBLE_ARC,
[SPECIES_FLORGES_RED_FLOWER] = BACK_ANIM_SHRINK_GROW_VIBRATE,
[SPECIES_SKIDDO] = BACK_ANIM_CONCAVE_ARC_SMALL,
@ -926,7 +926,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_HELIOLISK] = BACK_ANIM_SHAKE_FLASH_YELLOW,
[SPECIES_TYRUNT] = BACK_ANIM_H_SHAKE,
[SPECIES_TYRANTRUM] = BACK_ANIM_V_SHAKE_H_SLIDE,
[SPECIES_AMAURA] = BACK_ANIM_H_SLIDE,
[SPECIES_AMAURA] = BACK_ANIM_CONCAVE_ARC_SMALL,
[SPECIES_AURORUS] = BACK_ANIM_SHRINK_GROW_VIBRATE,
[SPECIES_SYLVEON] = BACK_ANIM_SHRINK_GROW_VIBRATE,
[SPECIES_HAWLUCHA] = BACK_ANIM_GROW_STUTTER,