Skip to content

Commit

Permalink
Multiple sprite updates (rh-hideout#4541)
Browse files Browse the repository at this point in the history
* Updated Mega Mewtwo Y sprite to fix transparent eye pixel

* Updated Keldeo Resolute sprite to a two framed animation

* Updated Keldeo Resolute sprite to increase definition to facial features

* Improved Keldeo Resolutes second frame to match BW2 original & changed front animation

* Added Meloetta Pirouette front anim

* Updated Meloetta Pirouette anim frame to a dip
  • Loading branch information
TheJamesLJ authored and Pawkkie committed May 29, 2024
1 parent da60d9b commit 78a947a
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 4 deletions.
Binary file added graphics/pokemon/keldeo/resolute/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 removed graphics/pokemon/keldeo/resolute/front.png
Binary file not shown.
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/meloetta/pirouette/front.png
Binary file not shown.
Binary file modified graphics/pokemon/mewtwo/mega_y/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/data/graphics/pokemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -8455,7 +8455,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1bpp");
#endif //P_FOOTPRINTS

const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/front.4bpp.lz");
const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/anim_front.4bpp.lz");
const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/normal.gbapal.lz");
const u32 gMonBackPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/back.4bpp.lz");
const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/shiny.gbapal.lz");
Expand All @@ -8472,7 +8472,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp");
#endif //P_FOOTPRINTS

const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/front.4bpp.lz");
const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/anim_front.4bpp.lz");
const u32 gMonPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/normal.gbapal.lz");
const u32 gMonBackPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/back.4bpp.lz");
const u32 gMonShinyPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/shiny.gbapal.lz");
Expand Down
4 changes: 2 additions & 2 deletions src/data/pokemon/species_info/gen_5_families.h
Original file line number Diff line number Diff line change
Expand Up @@ -10200,7 +10200,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_KeldeoResolute,
.frontAnimId = ANIM_V_STRETCH,
.frontAnimId = ANIM_V_JUMPS_H_JUMPS,
.backPic = gMonBackPic_KeldeoResolute,
.backPicSize = MON_COORDS_SIZE(64, 64),
.backPicYOffset = 3,
Expand Down Expand Up @@ -10319,7 +10319,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.trainerScale = 256,
.trainerOffset = 0,
.frontPic = gMonFrontPic_MeloettaPirouette,
.frontPicSize = MON_COORDS_SIZE(40, 64),
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_MeloettaPirouette,
.frontAnimId = ANIM_H_SLIDE_SLOW,
Expand Down

0 comments on commit 78a947a

Please sign in to comment.