Ogerpon sprites

This commit is contained in:
kittenchilly 2023-10-26 14:58:40 -05:00 committed by leo60228
parent d9ccc80b31
commit 91b4659d5c
No known key found for this signature in database
GPG key ID: 6F3EB461799AD95E
19 changed files with 106 additions and 32 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 582 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,002 B

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
144 92 38

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 999 B

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
172 105 32
16 157 0
57 113 49
49 190 230
0 0 0
164 52 49
74 76 74
189 137 90
230 60 49

Binary file not shown.

After

Width:  |  Height:  |  Size: 793 B

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 113 53
175 216 159
251 253 250
139 99 57
120 81 39
219 157 92
83 133 90

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,001 B

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
147 91 33
169 122 74
152 155 171

View file

@ -8207,27 +8207,27 @@ const u32 gMonShinyPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandip
const u8 gMonIcon_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/icon.4bpp");
// const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/footprint.1bpp");
// const u32 gMonFrontPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz");
// const u32 gMonPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz");
const u32 gMonFrontPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz");
const u32 gMonPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz");
const u32 gMonBackPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponTeal[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp");
const u8 gMonIcon_OgerponTeal[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp");
// const u32 gMonFrontPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz");
// const u32 gMonPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz");
const u32 gMonFrontPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz");
const u32 gMonPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz");
const u32 gMonBackPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponWellspring[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp");
// const u32 gMonFrontPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz");
// const u32 gMonPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz");
const u32 gMonFrontPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz");
const u32 gMonPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz");
const u32 gMonBackPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponHearthflame[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp");
// const u32 gMonFrontPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz");
// const u32 gMonPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz");
const u32 gMonFrontPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz");
const u32 gMonPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz");
const u32 gMonBackPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponCornerstone[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp");

View file

@ -1068,10 +1068,10 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
[SPECIES_OKIDOGI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_MUNKIDORI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_FEZANDIPITI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
[SPECIES_OGERPON_TEAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_CORNERSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_TEAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_WELLSPRING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_HEARTHFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_CORNERSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_TEAL_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },

View file

@ -1501,10 +1501,10 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(OKIDOGI, gMonBackPic_Okidogi),
SPECIES_SPRITE(MUNKIDORI, gMonBackPic_Munkidori),
SPECIES_SPRITE(FEZANDIPITI, gMonBackPic_Fezandipiti),
// SPECIES_SPRITE(OGERPON_TEAL, gMonBackPic_OgerponTeal),
// SPECIES_SPRITE(OGERPON_WELLSPRING, gMonBackPic_OgerponWellspring),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME, gMonBackPic_OgerponHearthflame),
// SPECIES_SPRITE(OGERPON_CORNERSTONE, gMonBackPic_OgerponCornerstone),
SPECIES_SPRITE(OGERPON_TEAL, gMonBackPic_OgerponTeal),
SPECIES_SPRITE(OGERPON_WELLSPRING, gMonBackPic_OgerponWellspring),
SPECIES_SPRITE(OGERPON_HEARTHFLAME, gMonBackPic_OgerponHearthflame),
SPECIES_SPRITE(OGERPON_CORNERSTONE, gMonBackPic_OgerponCornerstone),
// SPECIES_SPRITE(OGERPON_TEAL_TERA, gMonBackPic_OgerponTealTera),
// SPECIES_SPRITE(OGERPON_WELLSPRING_TERA, gMonBackPic_OgerponWellspringTera),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME_TERA, gMonBackPic_OgerponHearthflameTera),

View file

@ -1499,10 +1499,10 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(OKIDOGI, gMonFrontPic_Okidogi),
SPECIES_SPRITE(MUNKIDORI, gMonFrontPic_Munkidori),
SPECIES_SPRITE(FEZANDIPITI, gMonFrontPic_Fezandipiti),
// SPECIES_SPRITE(OGERPON_TEAL, gMonFrontPic_OgerponTeal),
// SPECIES_SPRITE(OGERPON_WELLSPRING, gMonFrontPic_OgerponWellspring),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME, gMonFrontPic_OgerponHearthflame),
// SPECIES_SPRITE(OGERPON_CORNERSTONE, gMonFrontPic_OgerponCornerstone),
SPECIES_SPRITE(OGERPON_TEAL, gMonFrontPic_OgerponTeal),
SPECIES_SPRITE(OGERPON_WELLSPRING, gMonFrontPic_OgerponWellspring),
SPECIES_SPRITE(OGERPON_HEARTHFLAME, gMonFrontPic_OgerponHearthflame),
SPECIES_SPRITE(OGERPON_CORNERSTONE, gMonFrontPic_OgerponCornerstone),
// SPECIES_SPRITE(OGERPON_TEAL_TERA, gMonFrontPic_OgerponTealTera),
// SPECIES_SPRITE(OGERPON_WELLSPRING_TERA, gMonFrontPic_OgerponWellspringTera),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME_TERA, gMonFrontPic_OgerponHearthflameTera),

View file

@ -1499,10 +1499,10 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] =
SPECIES_PAL(OKIDOGI, gMonPalette_Okidogi),
SPECIES_PAL(MUNKIDORI, gMonPalette_Munkidori),
SPECIES_PAL(FEZANDIPITI, gMonPalette_Fezandipiti),
// SPECIES_PAL(OGERPON_TEAL, gMonPalette_OgerponTeal),
// SPECIES_PAL(OGERPON_WELLSPRING, gMonPalette_OgerponWellspring),
// SPECIES_PAL(OGERPON_HEARTHFLAME, gMonPalette_OgerponHearthflame),
// SPECIES_PAL(OGERPON_CORNERSTONE, gMonPalette_OgerponCornerstone),
SPECIES_PAL(OGERPON_TEAL, gMonPalette_OgerponTeal),
SPECIES_PAL(OGERPON_WELLSPRING, gMonPalette_OgerponWellspring),
SPECIES_PAL(OGERPON_HEARTHFLAME, gMonPalette_OgerponHearthflame),
SPECIES_PAL(OGERPON_CORNERSTONE, gMonPalette_OgerponCornerstone),
// SPECIES_PAL(OGERPON_TEAL_TERA, gMonPalette_OgerponTealTera),
// SPECIES_PAL(OGERPON_WELLSPRING_TERA, gMonPalette_OgerponWellspringTera),
// SPECIES_PAL(OGERPON_HEARTHFLAME_TERA, gMonPalette_OgerponHearthflameTera),

View file

@ -1459,11 +1459,11 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
[SPECIES_OKIDOGI] = gMonIcon_Okidogi,
[SPECIES_MUNKIDORI] = gMonIcon_Munkidori,
[SPECIES_FEZANDIPITI] = gMonIcon_Fezandipiti,
//[SPECIES_OGERPON_TEAL] = gMonIcon_OgerponTeal,
[SPECIES_OGERPON_TEAL] = gMonIcon_OgerponTeal,
//[SPECIES_OGERPON_WELLSPRING] = gMonIcon_OgerponWellspring,
//[SPECIES_OGERPON_HEARTHFLAME] = gMonIcon_OgerponHearthflame,
//[SPECIES_OGERPON_CORNERSTONE] = gMonIcon_OgerponCornerstone,
//[SPECIES_OGERPON_TEAL_TERA] = gMonIcon_OgerponTeal,
[SPECIES_OGERPON_TEAL_TERA] = gMonIcon_OgerponTeal,
//[SPECIES_OGERPON_WELLSPRING_TERA] = gMonIcon_OgerponWellspring,
//[SPECIES_OGERPON_HEARTHFLAME_TERA] = gMonIcon_OgerponHearthflame,
//[SPECIES_OGERPON_CORNERSTONE_TERA] = gMonIcon_OgerponCornerstone,
@ -2854,7 +2854,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_MIRAIDON] = 2,
[SPECIES_WALKING_WAKE] = 2,
[SPECIES_IRON_LEAVES] = 1,
[SPECIES_DIPPLIN] = 0,
[SPECIES_DIPPLIN] = 1,
[SPECIES_POLTCHAGEIST_COUNTERFEIT] = 0,
[SPECIES_POLTCHAGEIST_ARTISAN] = 0,
[SPECIES_SINISTCHA_UNREMARKABLE] = 0,