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

icon/palette fixes

Browse source
This commit is contained in:
leo60228 2023-10-23 18:16:48 -04:00
parent 1359df7f86
commit 95e0dabfa3
No known key found for this signature in database
GPG key ID: 6F3EB461799AD95E
9 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/pokemon/dachsbun/icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 413 B

BIN
graphics/pokemon/gimmighoul/icon.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 416 B

BIN
graphics/pokemon/iron_leaves/icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 819 B

After

Width:  |  Height:  |  Size: 363 B

BIN
graphics/pokemon/rabsca/front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 776 B

After

Width:  |  Height:  |  Size: 769 B

BIN
graphics/pokemon/scovillain/icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 457 B

BIN
graphics/pokemon/tinkatink/icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 318 B

BIN
graphics/pokemon/walking_wake/icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 986 B

After

Width:  |  Height:  |  Size: 427 B

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

@ -7532,7 +7532,7 @@ const u32 gMonFrontPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/front.
const u32 gMonPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/normal.gbapal.lz");
const u32 gMonBackPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/back.4bpp.lz");
const u32 gMonShinyPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/shiny.gbapal.lz");
// const u8 gMonIcon_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/icon.4bpp");
const u8 gMonIcon_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/icon.4bpp");
// const u8 gMonFootprint_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/footprint.1bpp");
const u32 gMonFrontPic_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/front.4bpp.lz");
@ -7755,7 +7755,7 @@ const u32 gMonFrontPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/fron
const u32 gMonPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/normal.gbapal.lz");
const u32 gMonBackPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/back.4bpp.lz");
const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/shiny.gbapal.lz");
// const u8 gMonIcon_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/icon.4bpp");
const u8 gMonIcon_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/icon.4bpp");
// const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/footprint.1bpp");
const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/front.4bpp.lz");
@ -8147,13 +8147,13 @@ const u32 gMonFrontPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake
const u32 gMonPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/normal.gbapal.lz");
const u32 gMonBackPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/back.4bpp.lz");
const u32 gMonShinyPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/shiny.gbapal.lz");
// const u8 gMonIcon_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/icon.4bpp");
const u8 gMonIcon_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/icon.4bpp");
// const u8 gMonFootprint_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/footprint.1bpp");
const u32 gMonFrontPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/front.4bpp.lz");
const u32 gMonPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/normal.gbapal.lz");
const u32 gMonBackPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/back.4bpp.lz");
const u32 gMonShinyPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/shiny.gbapal.lz");
// const u8 gMonIcon_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/icon.4bpp");
const u8 gMonIcon_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/icon.4bpp");
// const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/footprint.1bpp");
#endif

20
src/pokemon_icon.c
View file

@ -1358,7 +1358,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
[SPECIES_MAUSHOLD_FAMILY_OF_THREE] = gMonIcon_MausholdFamilyOfThree,
[SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = gMonIcon_MausholdFamilyOfFour,
[SPECIES_FIDOUGH] = gMonIcon_Fidough,
// [SPECIES_DACHSBUN] = gMonIcon_Dachsbun,
[SPECIES_DACHSBUN] = gMonIcon_Dachsbun,
[SPECIES_SMOLIV] = gMonIcon_Smoliv,
[SPECIES_DOLLIV] = gMonIcon_Dolliv,
[SPECIES_ARBOLIVA] = gMonIcon_Arboliva,
@ -1391,7 +1391,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
[SPECIES_RABSCA] = gMonIcon_Rabsca,
[SPECIES_FLITTLE] = gMonIcon_Flittle,
[SPECIES_ESPATHRA] = gMonIcon_Espathra,
// [SPECIES_TINKATINK] = gMonIcon_Tinkatink,
[SPECIES_TINKATINK] = gMonIcon_Tinkatink,
[SPECIES_TINKATUFF] = gMonIcon_Tinkatuff,
[SPECIES_TINKATON] = gMonIcon_Tinkaton,
[SPECIES_WIGLETT] = gMonIcon_Wiglett,
@ -1448,8 +1448,8 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
[SPECIES_IRON_VALIANT] = gMonIcon_IronValiant,
[SPECIES_KORAIDON] = gMonIcon_Koraidon,
[SPECIES_MIRAIDON] = gMonIcon_Miraidon,
//[SPECIES_WALKING_WAKE] = gMonIcon_WalkingWake,
//[SPECIES_IRON_LEAVES] = gMonIcon_IronLeaves,
[SPECIES_WALKING_WAKE] = gMonIcon_WalkingWake,
[SPECIES_IRON_LEAVES] = gMonIcon_IronLeaves,
#endif
[SPECIES_EGG] = gMonIcon_Egg,
};
@ -2749,12 +2749,12 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_DOLLIV] = 1,
[SPECIES_ARBOLIVA] = 5,
[SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = 1,
[SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = 1,
[SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = 2,
[SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = 1,
[SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = 1,
[SPECIES_NACLI] = 2,
[SPECIES_NACLSTACK] = 2, // TODO: recolor
[SPECIES_GARGANACL] = 3,
[SPECIES_GARGANACL] = 2,
[SPECIES_CHARCADET] = 1,
[SPECIES_ARMAROUGE] = 0,
[SPECIES_CERULEDGE] = 2,
@ -2777,7 +2777,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_RABSCA] = 0,
[SPECIES_FLITTLE] = 3,
[SPECIES_ESPATHRA] = 5,
[SPECIES_TINKATINK] = 4,
[SPECIES_TINKATINK] = 1,
[SPECIES_TINKATUFF] = 4,
[SPECIES_TINKATON] = 4,
[SPECIES_WIGLETT] = 0,
@ -2823,7 +2823,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_FRIGIBAX] = 3,
[SPECIES_ARCTIBAX] = 0,
[SPECIES_BAXCALIBUR] = 0,
[SPECIES_GIMMIGHOUL_CHEST] = 1,
[SPECIES_GIMMIGHOUL_CHEST] = 0,
[SPECIES_GIMMIGHOUL_ROAMING] = 1,
[SPECIES_GHOLDENGO] = 0,
[SPECIES_WO_CHIEN] = 5,
@ -2834,8 +2834,8 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_IRON_VALIANT] = 4,
[SPECIES_KORAIDON] = 0,
[SPECIES_MIRAIDON] = 2,
[SPECIES_WALKING_WAKE] = 0,
[SPECIES_IRON_LEAVES] = 0,
[SPECIES_WALKING_WAKE] = 2,
[SPECIES_IRON_LEAVES] = 1,
#endif
[SPECIES_EGG] = 1,
};