Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable floragato icon and tinkatuff shiny palette

Browse Source
This commit is contained in:
leo60228 2023-10-23 16:18:56 -04:00
parent 0756dc1d4a
commit 60d746729d
No known key found for this signature in database
GPG Key ID: 6F3EB461799AD95E
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/graphics/pokemon.h
View File

@ -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");

2
src/data/pokemon_graphics/shiny_palette_table.h
View File

@ -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),

2
src/pokemon_icon.c
View File

@ -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,