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

Fixed Ogerpon shiny palettes (#4165)

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2024-02-09 18:51:36 -03:00 committed by GitHub
parent 47abc33c84
commit 0f312e3f76
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 93 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
graphics/pokemon/ogerpon/cornerstone/shiny.pal Normal file
View file

@ -0,0 +1,18 @@
JASC-PAL
0100
15
148 209 161
42 44 41
21 158 7
0 0 0
74 76 73
25 27 24
61 113 53
109 99 108
133 139 139
53 134 168
55 189 227
194 139 62
255 197 74
212 230 247
124 162 56

19
graphics/pokemon/ogerpon/hearthflame/shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
148 210 164
156 153 172
131 28 24
49 133 172
213 230 246
41 44 41
255 198 74
124 162 56
16 157 0
57 113 49
49 190 230
0 0 0
164 52 49
74 76 74
189 137 90
230 60 49

2
graphics/pokemon/ogerpon/normal.pal
View file

@ -9,7 +9,7 @@ JASC-PAL
17 106 68
21 158 7
74 76 73
61 113 53
61 97 53
175 216 159
251 253 250
139 99 57

18
graphics/pokemon/ogerpon/shiny.pal Normal file
View file

@ -0,0 +1,18 @@
JASC-PAL
0100
15
148 209 161
42 44 41
0 1 0
27 70 15
0 164 153
17 106 68
21 158 7
74 76 73
61 97 53
175 216 159
251 253 250
139 99 57
124 162 56
219 157 92
83 133 90

19
graphics/pokemon/ogerpon/wellspring/shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
148 209 161
42 44 41
21 158 7
74 76 73
0 0 0
61 113 53
11 64 121
15 90 170
0 126 229
53 134 168
71 85 100
55 189 227
212 230 247
124 162 56
169 122 74
152 155 171

8
src/data/graphics/pokemon.h
View file

@ -10863,26 +10863,26 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
const u32 gMonFrontPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz");
const u32 gMonPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz");
const u32 gMonBackPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz");
const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz");
const u8 gMonIcon_OgerponTealMask[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp");
// const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/ogerpon/footprint.1bpp");
const u32 gMonFrontPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz");
const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz");
const u32 gMonBackPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz");
const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp");
const u32 gMonFrontPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz");
const u32 gMonPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz");
const u32 gMonBackPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz");
const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp");
const u32 gMonFrontPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz");
const u32 gMonPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz");
const u32 gMonBackPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz");
const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp");
// const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz");

29
src/data/pokemon/species_info/gen_9.h
View file

@ -5367,7 +5367,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
#endif //P_FAMILY_FEZANDIPITI
#if P_FAMILY_OGERPON
#define OGERPON_SPECIES_INFO(Form, type, ability, color, tera) \
#define OGERPON_SPECIES_INFO(Form, type, ability, color) \
{ \
.baseHP = 80, \
.baseAttack = 120, \
@ -5400,30 +5400,29 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
FRONT_PIC(Ogerpon##Form, 64, 64), \
.frontPicYOffset = 0, \
.frontAnimFrames = sAnims_Ogerpon, \
/*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \
BACK_PIC(Ogerpon##Form, 64, 64), \
.backPicYOffset = 16, \
/*.backAnimId = BACK_ANIM_NONE,*/ \
.palette = gMonPalette_Ogerpon##Form, \
ICON(OgerponTealMask, 1), \
.shinyPalette = gMonShinyPalette_Ogerpon##Form, \
ICON(OgerponTealMask, 1), /* Each form should have its own icon */ \
/*.footprint = gMonFootprint_Ogerpon,*/ \
LEARNSETS(Ogerpon), \
.formSpeciesIdTable = sOgerponFormSpeciesIdTable, \
.formChangeTable = sOgerponFormChangeTable, \
.isLegendary = TRUE, \
}
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
//.backAnimId = BACK_ANIM_NONE,
//.shinyPalette = gMonShinyPalette_OgerponTealMask,
//ICON(Ogerpon##Form##, 1),
//.footprint = gMonFootprint_Ogerpon,
[SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, FALSE),
[SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, FALSE),
[SPECIES_OGERPON_HEARTHFLAME_MASK] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, FALSE),
[SPECIES_OGERPON_CORNERSTONE_MASK] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, FALSE),
[SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN),
[SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE),
[SPECIES_OGERPON_HEARTHFLAME_MASK] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED),
[SPECIES_OGERPON_CORNERSTONE_MASK] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY),
#if P_TERA_FORMS
[SPECIES_OGERPON_TEAL_MASK_TERA] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL, BODY_COLOR_GREEN, TRUE),
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING, BODY_COLOR_BLUE, TRUE),
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME, BODY_COLOR_RED, TRUE),
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE, BODY_COLOR_GRAY, TRUE),
[SPECIES_OGERPON_TEAL_MASK_TERA] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL, BODY_COLOR_GREEN),
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING, BODY_COLOR_BLUE),
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME, BODY_COLOR_RED),
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE, BODY_COLOR_GRAY),
#endif //P_TERA_FORMS
#endif //P_FAMILY_OGERPON