Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pecharunt sprite from pokemoncommunity #4324

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Pecharunt sprite from pokemoncommunity #4324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4a3af5
Pecharunt sprite from pokemoncommunity
AlexOn1ine Apr 1, 2024
13c4adc
disable icon sprite
AlexOn1ine Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added graphics/pokemon/pecharunt/back.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/pecharunt/front.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/pecharunt/normal.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
154 212 167
8 8 8
68 68 77
80 11 62
186 33 155
36 36 42
255 39 255
35 20 68
92 52 154
220 147 205
55 30 102
139 93 215
255 255 255
189 189 189
129 26 101
148 50 154
19 changes: 19 additions & 0 deletions graphics/pokemon/pecharunt/shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
154 212 167
8 8 8
68 68 77
80 11 62
186 33 155
36 36 42
255 39 255
144 80 30
234 176 47
220 147 205
193 133 36
244 208 96
255 255 255
189 189 189
129 26 101
148 50 154
8 changes: 4 additions & 4 deletions src/data/graphics/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13030,10 +13030,10 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
#endif //P_FAMILY_TERAPAGOS

#if P_FAMILY_PECHARUNT
// const u32 gMonFrontPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/front.4bpp.lz");
// const u32 gMonPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/normal.gbapal.lz");
// const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/back.4bpp.lz");
// const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/shiny.gbapal.lz");
const u32 gMonFrontPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/front.4bpp.lz");
const u32 gMonPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/normal.gbapal.lz");
const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/back.4bpp.lz");
const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/shiny.gbapal.lz");
// const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/icon.4bpp");
#if P_FOOTPRINTS
// const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp");
Expand Down
24 changes: 12 additions & 12 deletions src/data/pokemon/species_info/gen_9_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6744,19 +6744,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.pokemonOffset = 0,
.trainerScale = 365,
.trainerOffset = 7,
//.frontPic = gMonFrontPic_Pecharunt,
//.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontPic = gMonFrontPic_Pecharunt,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 13,
.frontAnimFrames = sAnims_Pecharunt,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
//.backPic = gMonBackPic_Pecharunt,
//.backPicSize = MON_COORDS_SIZE(64, 64),
.backPicYOffset = 0,
//.backAnimId = BACK_ANIM_NONE,
//.palette = gMonPalette_Pecharunt,
//.shinyPalette = gMonShinyPalette_Pecharunt,
//.iconSprite = gMonIcon_Pecharunt,
//.iconPalIndex = 0,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Pecharunt,
.backPicSize = MON_COORDS_SIZE(64, 64),
.backPicYOffset = 5,
.backAnimId = BACK_ANIM_NONE,
.palette = gMonPalette_Pecharunt,
.shinyPalette = gMonShinyPalette_Pecharunt,
// .iconSprite = gMonIcon_Pecharunt,
// .iconPalIndex = 0,
//FOOTPRINT(Pecharunt)
.isMythical = TRUE,
.levelUpLearnset = sPecharuntLevelUpLearnset,
Expand Down
Loading