diff --git a/graphics/pokemon/ogerpon/back.png b/graphics/pokemon/ogerpon/back.png new file mode 100644 index 0000000000..8ec6f0fc0d Binary files /dev/null and b/graphics/pokemon/ogerpon/back.png differ diff --git a/graphics/pokemon/ogerpon/cornerstone/back.png b/graphics/pokemon/ogerpon/cornerstone/back.png new file mode 100644 index 0000000000..1f37c9c1df Binary files /dev/null and b/graphics/pokemon/ogerpon/cornerstone/back.png differ diff --git a/graphics/pokemon/ogerpon/cornerstone/front.png b/graphics/pokemon/ogerpon/cornerstone/front.png new file mode 100644 index 0000000000..6bca5e915c Binary files /dev/null and b/graphics/pokemon/ogerpon/cornerstone/front.png differ diff --git a/graphics/pokemon/ogerpon/cornerstone/normal.pal b/graphics/pokemon/ogerpon/cornerstone/normal.pal new file mode 100644 index 0000000000..057bd48dcc --- /dev/null +++ b/graphics/pokemon/ogerpon/cornerstone/normal.pal @@ -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 diff --git a/graphics/pokemon/ogerpon/front.png b/graphics/pokemon/ogerpon/front.png new file mode 100644 index 0000000000..5fa971f873 Binary files /dev/null and b/graphics/pokemon/ogerpon/front.png differ diff --git a/graphics/pokemon/ogerpon/hearthflame/back.png b/graphics/pokemon/ogerpon/hearthflame/back.png new file mode 100644 index 0000000000..d092ec3297 Binary files /dev/null and b/graphics/pokemon/ogerpon/hearthflame/back.png differ diff --git a/graphics/pokemon/ogerpon/hearthflame/front.png b/graphics/pokemon/ogerpon/hearthflame/front.png new file mode 100644 index 0000000000..036ea37f32 Binary files /dev/null and b/graphics/pokemon/ogerpon/hearthflame/front.png differ diff --git a/graphics/pokemon/ogerpon/hearthflame/normal.pal b/graphics/pokemon/ogerpon/hearthflame/normal.pal new file mode 100644 index 0000000000..637556660a --- /dev/null +++ b/graphics/pokemon/ogerpon/hearthflame/normal.pal @@ -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 diff --git a/graphics/pokemon/ogerpon/icon.png b/graphics/pokemon/ogerpon/icon.png new file mode 100644 index 0000000000..cba44a4fbb Binary files /dev/null and b/graphics/pokemon/ogerpon/icon.png differ diff --git a/graphics/pokemon/ogerpon/normal.pal b/graphics/pokemon/ogerpon/normal.pal new file mode 100644 index 0000000000..67a862587b --- /dev/null +++ b/graphics/pokemon/ogerpon/normal.pal @@ -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 diff --git a/graphics/pokemon/ogerpon/wellspring/back.png b/graphics/pokemon/ogerpon/wellspring/back.png new file mode 100644 index 0000000000..ed74528e65 Binary files /dev/null and b/graphics/pokemon/ogerpon/wellspring/back.png differ diff --git a/graphics/pokemon/ogerpon/wellspring/front.png b/graphics/pokemon/ogerpon/wellspring/front.png new file mode 100644 index 0000000000..5263ce2f1e Binary files /dev/null and b/graphics/pokemon/ogerpon/wellspring/front.png differ diff --git a/graphics/pokemon/ogerpon/wellspring/normal.pal b/graphics/pokemon/ogerpon/wellspring/normal.pal new file mode 100644 index 0000000000..4b22619be4 --- /dev/null +++ b/graphics/pokemon/ogerpon/wellspring/normal.pal @@ -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 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 3c89f0e7a4..626523f661 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -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"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 782feeb228..157f4bef3b 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -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 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 3be5ee77bb..eb52ef1cc8 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -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), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index ceb478ecd0..10fcfc26de 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -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), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 6bc004e054..af4fffe4ba 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -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), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 25abf283ff..7c10e9b255 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -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,