Skip to content

Commit

Permalink
Misc pokemon sprite fixes (#5846)
Browse files Browse the repository at this point in the history
  • Loading branch information
Cafeei authored Dec 22, 2024
1 parent 5560f33 commit 570c652
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 11 deletions.
Binary file modified graphics/pokemon/ariados/anim_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/diggersby/anim_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/diggersby/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion graphics/pokemon/diggersby/shiny.pal
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ JASC-PAL
120 120 112
160 160 144
8 8 8
120 120 112
84 84 78
48 48 56
232 232 232
240 152 168
Expand Down
Binary file modified graphics/pokemon/duraludon/overworld.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/honedge/anim_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/honedge/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions graphics/pokemon/honedge/normal.pal
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ JASC-PAL
16
152 208 160
8 48 56
0 128 160
36 103 149
16 16 16
80 64 40
248 208 128
176 152 88
255 215 132
181 158 90
136 104 56
152 232 248
102 225 253
96 192 216
80 88 88
168 168 168
216 216 216
48 56 40
152 128 80
136 88 56
99 84 80
201 185 131
167 139 110
Binary file modified graphics/pokemon/maractus/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed graphics/pokemon/pichu/spiky_eared/front.png
Binary file not shown.
Binary file modified graphics/pokemon/pichu/spiky_eared/overworld.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/pincurchin/anim_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/data/pokemon/species_info/gen_1_families.h
Original file line number Diff line number Diff line change
Expand Up @@ -2533,7 +2533,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicSize = MON_COORDS_SIZE(32, 40),
.frontPicYOffset = 13,
.frontAnimFrames = sAnims_PichuSpikyEared,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.frontAnimId = ANIM_V_JUMPS_H_JUMPS,
.backPic = gMonBackPic_PichuSpikyEared,
.backPicSize = MON_COORDS_SIZE(48, 56),
.backPicYOffset = 8,
Expand All @@ -2544,11 +2544,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 1,
SHADOW(2, 0, SHADOW_SIZE_S)
FOOTPRINT(Pichu)
OVERWORLD(
OVERWORLD_SET_ANIM(
sPicTable_PichuSpikyEared,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
sAnimTable_Following_Asym,
gOverworldPalette_PichuSpikyEared,
gShinyOverworldPalette_PichuSpikyEared
)
Expand Down
12 changes: 11 additions & 1 deletion src/data/pokemon_graphics/front_pic_anims.h
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,17 @@ static const union AnimCmd sAnim_Pichu_1[] =
ANIMCMD_END,
};

PLACEHOLDER_ANIM_SINGLE_FRAME(PichuSpikyEared);
static const union AnimCmd sAnim_PichuSpikyEared_1[] =
{
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
#endif //P_GEN_2_CROSS_EVOS

static const union AnimCmd sAnim_Pikachu_1[] =
Expand Down

0 comments on commit 570c652

Please sign in to comment.