From 60d746729d15851d638aa8449847677bd51b92dc Mon Sep 17 00:00:00 2001 From: leo60228 Date: Mon, 23 Oct 2023 16:18:56 -0400 Subject: [PATCH] enable floragato icon and tinkatuff shiny palette --- src/data/graphics/pokemon.h | 4 ++-- src/data/pokemon_graphics/shiny_palette_table.h | 2 +- src/pokemon_icon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 1f5a83d4fe..9fa9a0e36a 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -7381,7 +7381,7 @@ const u32 gMonFrontPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/fron const u32 gMonPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/normal.gbapal.lz"); const u32 gMonBackPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/back.4bpp.lz"); const u32 gMonShinyPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/shiny.gbapal.lz"); -// const u8 gMonIcon_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/icon.4bpp"); +const u8 gMonIcon_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/icon.4bpp"); // const u8 gMonFootprint_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/footprint.1bpp"); const u32 gMonFrontPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/front.4bpp.lz"); @@ -7761,7 +7761,7 @@ const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/ const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/front.4bpp.lz"); const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/normal.gbapal.lz"); const u32 gMonBackPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/back.4bpp.lz"); -// const u32 gMonShinyPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/shiny.gbapal.lz"); const u8 gMonIcon_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/icon.4bpp"); // const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/footprint.1bpp"); diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 51578c1c55..2c79cdd4b2 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1431,7 +1431,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(FLITTLE, gMonShinyPalette_Flittle), SPECIES_SHINY_PAL(ESPATHRA, gMonShinyPalette_Espathra), SPECIES_SHINY_PAL(TINKATINK, gMonShinyPalette_Tinkatink), - // SPECIES_SHINY_PAL(TINKATUFF, gMonShinyPalette_Tinkatuff), + SPECIES_SHINY_PAL(TINKATUFF, gMonShinyPalette_Tinkatuff), SPECIES_SHINY_PAL(TINKATON, gMonShinyPalette_Tinkaton), SPECIES_SHINY_PAL(WIGLETT, gMonShinyPalette_Wiglett), SPECIES_SHINY_PAL(WUGTRIO, gMonShinyPalette_Wugtrio), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index d07f16c662..dad8f8a67c 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1336,7 +1336,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = #endif #if P_GEN_9_POKEMON == TRUE [SPECIES_SPRIGATITO] = gMonIcon_Sprigatito, - // [SPECIES_FLORAGATO] = gMonIcon_Floragato, + [SPECIES_FLORAGATO] = gMonIcon_Floragato, [SPECIES_MEOWSCARADA] = gMonIcon_Meowscarada, [SPECIES_FUECOCO] = gMonIcon_Fuecoco, [SPECIES_CROCALOR] = gMonIcon_Crocalor,