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

Added Ogerpon Tera Sprites (#4996)

Browse source 
* Added Ogerpon Tera Sprites

* Updated references to Ogerpon Tera forms

* Fixed back sprite offsets and color indices for Hearthflame Tera

* Removed Ogerpon data duplicates

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
This commit is contained in:
hedara90 2024-07-23 17:55:07 +02:00 committed by GitHub
parent 305c1ba55e
commit 7a4df80f89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 182 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/pokemon/ogerpon/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 487 B

After

Width:  |  Height:  |  Size: 447 B

BIN
graphics/pokemon/ogerpon/cornerstone/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 582 B

After

Width:  |  Height:  |  Size: 537 B

BIN
graphics/pokemon/ogerpon/cornerstone/tera/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 871 B

BIN
graphics/pokemon/ogerpon/cornerstone/tera/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

19
graphics/pokemon/ogerpon/cornerstone/tera/normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
224 54 230
14 17 13
27 29 27
42 44 41
46 48 45
74 76 73
90 96 103
61 113 53
139 99 57
0 150 177
90 171 46
149 151 148
0 212 248
196 198 195
253 218 63
251 253 250

19
graphics/pokemon/ogerpon/cornerstone/tera/shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
224 54 230
14 17 13
27 29 27
42 44 41
46 48 45
74 76 73
90 96 103
61 113 53
139 99 57
0 150 177
90 171 46
149 151 148
0 212 248
196 198 195
253 218 63
251 253 250

BIN
graphics/pokemon/ogerpon/hearthflame/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 577 B

After

Width:  |  Height:  |  Size: 533 B

BIN
graphics/pokemon/ogerpon/hearthflame/tera/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 949 B

BIN
graphics/pokemon/ogerpon/hearthflame/tera/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

18
graphics/pokemon/ogerpon/hearthflame/tera/normal.pal Normal file
View file

@ -0,0 +1,18 @@
JASC-PAL
0100
15
222 57 229
16 16 16
87 15 15
44 43 41
153 23 23
75 76 76
64 112 54
237 59 47
141 98 59
91 171 49
209 154 24
232 157 2
0 211 249
255 218 70
253 253 253

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

@ -0,0 +1,18 @@
JASC-PAL
0100
15
222 57 229
16 16 16
87 15 15
44 43 41
153 23 23
75 76 76
64 112 54
237 59 47
141 98 59
91 171 49
209 154 24
232 157 2
0 211 249
255 218 70
253 253 253

BIN
graphics/pokemon/ogerpon/tera/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 910 B

BIN
graphics/pokemon/ogerpon/tera/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

19
graphics/pokemon/ogerpon/tera/normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 57 229
16 16 16
44 43 41
75 76 76
15 106 67
64 112 54
141 98 59
9 164 156
97 167 27
91 171 49
84 182 101
232 157 2
219 156 94
151 216 120
255 218 70
253 253 253

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

@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 57 229
16 16 16
44 43 41
75 76 76
15 106 67
64 112 54
141 98 59
9 164 156
97 167 27
91 171 49
84 182 101
232 157 2
219 156 94
151 216 120
255 218 70
253 253 253

BIN
graphics/pokemon/ogerpon/wellspring/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 514 B

After

Width:  |  Height:  |  Size: 472 B

BIN
graphics/pokemon/ogerpon/wellspring/tera/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 818 B

BIN
graphics/pokemon/ogerpon/wellspring/tera/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 978 B

19
graphics/pokemon/ogerpon/wellspring/tera/normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
224 54 230
14 17 13
42 44 41
22 65 128
74 76 73
19 94 181
61 113 53
139 99 57
0 130 229
90 171 46
42 214 251
139 196 213
204 222 254
251 253 250
253 218 63
232 157 0

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

@ -0,0 +1,19 @@
JASC-PAL
0100
16
224 54 230
14 17 13
42 44 41
22 65 128
74 76 73
19 94 181
61 113 53
139 99 57
0 130 229
90 171 46
42 214 251
139 196 213
204 222 254
251 253 250
253 218 63
232 157 0

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

@ -12960,25 +12960,25 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
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");
// const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponTealMaskTera[]] = INCBIN_U32("graphics/pokemon/ogerpon/tera/shiny.gbapal.lz");
const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz");
const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz");
const u32 gMonBackPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/back.4bpp.lz");
const u32 gMonShinyPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/shiny.gbapal.lz");
const u32 gMonFrontPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/front.4bpp.lz");
const u32 gMonPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/normal.gbapal.lz");
const u32 gMonBackPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/back.4bpp.lz");
const u32 gMonShinyPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/shiny.gbapal.lz");
const u32 gMonFrontPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/front.4bpp.lz");
const u32 gMonPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/normal.gbapal.lz");
const u32 gMonBackPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/back.4bpp.lz");
const u32 gMonShinyPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz");
const u32 gMonFrontPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/front.4bpp.lz");
const u32 gMonPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/normal.gbapal.lz");
const u32 gMonBackPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/back.4bpp.lz");
const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz");
#endif //P_FAMILY_OGERPON
#if P_FAMILY_GOUGING_FIRE

32
src/data/pokemon/species_info/gen_9_families.h
View file

@ -6278,7 +6278,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
#endif //P_FAMILY_FEZANDIPITI
#if P_FAMILY_OGERPON
#define OGERPON_SPECIES_INFO(Form, type, ability, color, iconpalette) \
#define OGERPON_SPECIES_INFO(Form1, Form2, type, ability, color, iconpalette) \
{ \
.baseHP = 80, \
.baseAttack = 120, \
@ -6303,23 +6303,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.categoryName = _("Mask"), \
.height = 12, \
.weight = 398, \
.description = gOgerpon##Form##PokedexText, \
.description = gOgerpon##Form1##MaskPokedexText, \
.pokemonScale = 356, \
.pokemonOffset = 17, \
.trainerScale = 256, \
.trainerOffset = 0, \
.frontPic = gMonFrontPic_Ogerpon##Form, \
.frontPic = gMonFrontPic_Ogerpon##Form1##Form2, \
.frontPicSize = MON_COORDS_SIZE(64, 64), \
.frontPicYOffset = 0, \
.frontAnimFrames = sAnims_Ogerpon, \
/*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \
.backPic = gMonBackPic_Ogerpon##Form, \
.backPic = gMonBackPic_Ogerpon##Form1##Form2, \
.backPicSize = MON_COORDS_SIZE(64, 64), \
.backPicYOffset = 16, \
.backPicYOffset = 0, \
/*.backAnimId = BACK_ANIM_NONE,*/ \
.palette = gMonPalette_Ogerpon##Form, \
.shinyPalette = gMonShinyPalette_Ogerpon##Form, \
.iconSprite = gMonIcon_Ogerpon##Form, \
.palette = gMonPalette_Ogerpon##Form1##Form2, \
.shinyPalette = gMonShinyPalette_Ogerpon##Form1##Form2, \
.iconSprite = gMonIcon_Ogerpon##Form1##Mask, \
.iconPalIndex = iconpalette, \
FOOTPRINT(Ogerpon) \
.levelUpLearnset = sOgerponLevelUpLearnset, \
@ -6329,15 +6329,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.isLegendary = TRUE, \
}
[SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1),
[SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 0),
[SPECIES_OGERPON_HEARTHFLAME_MASK] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 0),
[SPECIES_OGERPON_CORNERSTONE_MASK] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 0),
[SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(Teal, Mask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1),
[SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(Wellspring, Mask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 0),
[SPECIES_OGERPON_HEARTHFLAME_MASK] = OGERPON_SPECIES_INFO(Hearthflame, Mask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 0),
[SPECIES_OGERPON_CORNERSTONE_MASK] = OGERPON_SPECIES_INFO(Cornerstone, Mask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 0),
#if P_TERA_FORMS
[SPECIES_OGERPON_TEAL_MASK_TERA] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL_MASK, BODY_COLOR_GREEN, 1),
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING_MASK, BODY_COLOR_BLUE, 0),
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK, BODY_COLOR_RED, 0),
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK, BODY_COLOR_GRAY, 0),
[SPECIES_OGERPON_TEAL_MASK_TERA] = OGERPON_SPECIES_INFO(Teal, MaskTera, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL_MASK, BODY_COLOR_GREEN, 1),
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = OGERPON_SPECIES_INFO(Wellspring, MaskTera, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING_MASK, BODY_COLOR_BLUE, 0),
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = OGERPON_SPECIES_INFO(Hearthflame, MaskTera, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK, BODY_COLOR_RED, 0),
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = OGERPON_SPECIES_INFO(Cornerstone, MaskTera, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK, BODY_COLOR_GRAY, 0),
#endif //P_TERA_FORMS
#endif //P_FAMILY_OGERPON