From 95e0dabfa382c1ad325cbad55de0e8efb7cafd6a Mon Sep 17 00:00:00 2001 From: leo60228 Date: Mon, 23 Oct 2023 18:16:48 -0400 Subject: [PATCH] icon/palette fixes --- graphics/pokemon/dachsbun/icon.png | Bin 0 -> 413 bytes graphics/pokemon/gimmighoul/icon.png | Bin 488 -> 416 bytes graphics/pokemon/iron_leaves/icon.png | Bin 819 -> 363 bytes graphics/pokemon/rabsca/front.png | Bin 776 -> 769 bytes graphics/pokemon/scovillain/icon.png | Bin 450 -> 457 bytes graphics/pokemon/tinkatink/icon.png | Bin 0 -> 318 bytes graphics/pokemon/walking_wake/icon.png | Bin 986 -> 427 bytes src/data/graphics/pokemon.h | 8 ++++---- src/pokemon_icon.c | 20 ++++++++++---------- 9 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 graphics/pokemon/dachsbun/icon.png mode change 100755 => 100644 graphics/pokemon/gimmighoul/icon.png create mode 100644 graphics/pokemon/tinkatink/icon.png diff --git a/graphics/pokemon/dachsbun/icon.png b/graphics/pokemon/dachsbun/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fe1caf375d7aa120a25db94ae6c67d0c68cd6f07 GIT binary patch literal 413 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 delta 706 zcmV;z0zLhK28afb7zqdi0001;w}I@DAwGWq5Oh*bQ~&?}|NsC0|NsC0|NsC0|IHz? zlmGw%cS%G+R9J?|^VT3VK5x{BK^-g&DYAPWLF#QBP_XR+j zfalOpK!8A_0sq9VfY3@(U&BuTijBfKMPC7YeQpBg{<;Sks}llzLD<89N%#g3n&r{_;4U=?=VkrInas3#xdGsuB?);) zCFjJ;1~^OBD>wiEcgqgI@M|IvZU9sw8n|8dpcO!%nIVPJ@7Dm(vxa#oi$#AxRm6>F zR#qvCP2f_BsFtmrvJBWn0p0=!Eb5gYRzJQ9%c>r|0|9ktDGUHFO(HY?)*&kDo(+Th zI6~!4fccUYQ|!TlzKZYxS=LX136TmyjWASi9n1BoulB0S(_xgDi&GEttpU(lt89x9 zBJg+ztrMsZKwd37fv*W%y8(Y~JtMzX(Owwr(u=rg1J_zRfOQxSG>;n`_$cy$-+v@< ze}Vh^Qkxt)kDJY+)GL4ztY5m9u$@~~g4kxz2iE{`0FELE4%<$sTy&yi09f#CgH=QY zdY~u(IF`2(f3(o200z1lU6|tgSuXWze(UGS!5sisUcy=7b=YCplZh^^s_jOJ>Wz`7 oTOEr5TOfRM{omu`m+@=BU&l!(An{7?)Bpeg07*qoM6N<$f_#rrD*ylh diff --git a/graphics/pokemon/scovillain/icon.png b/graphics/pokemon/scovillain/icon.png index ad591b21c3645f3625227d3ca87a377725c17bf6..9dea3d8e12130f0f53ab46119d37817a15f25dcd 100755 GIT binary patch delta 384 zcmV-`0e}9&1IYuB7zqRe0001qplF?uAwGWrR7pfZR5;7clD%rfFc5(C28SV#$@Nkw z9hy8tgJ$VjGHFWsB5j{0OUHEaBpZyDLM$sqkV#R`zm>ccI+Wh{ai_b}eT4j3fS-Yj zFcJ3ot~3NJ9SF!>zRQTEl$suFkD@7oDoS||mfP%D0<&racl%Y1;5*}{mIZ>>6>Wcd zaC#{o5ZoX1kdYR(G(h!14Sl_Q_ng>Uy)olto>s}_a!SBCO$e?!2EZv} zVGY2mK3v20Z6EK-*uXxMB3K1HP^0zGCpEoF`1qf)E`*Edt_}LJVQM|9js?n2gH3*fEB)vPF2+~{&<`C6gMRP`pdVTINau$&Ge4rA eZT)C|>&F*3D$^!Yy{66p0000KltFI9APhwf8x(2mfB)N#ZD<0;MjExNsz}KKKR&@p9?{<#0M7N+ z+D+^*z^yU&dB3j+n6<1((dn-4=~ zYvEp(69Ex90T>aI5%y%|KxjbGaYqFKTDFUjJcbr~N*Yo8gEAoNBWM8eDQ@gs{~zb^ zkw12P@kd~g#UGJDW`9s*5cdane^6y)kl7y;83g?JgCc{>{-DSpCWqmV#2}MD{1zCb z`(yYaH^}XW+mvs6mqdMgrupsLnyXi{o_T2|B}F+pI%ZndMg#Q#%qa!5r`+t4)4>?b+14l)dzu5G)kJoR>&284= zygOeUf5FMOk@aB)<0{_lZwp-WqvD(rnAmhVR%xes9ca&TkaF0?5xPjm(ZaQe$xgA{ zlkrfkABV>K$2KgEo@YGRGkV1KZ1ag16lA~gH+Yj(ozt&>=i;A6J6}j)j5)=Bly|p0 zSEEdw2dmNR!~CotK02o^xXZuNVO~?k?}a~S?7wiBxk8Tn&9Ao~mjE5k;OXk;vd$@? F2>^seiOm22 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/walking_wake/icon.png b/graphics/pokemon/walking_wake/icon.png index ac81940536497b3722a8953c2ea2b187480d7242..9260531ecf3a47d2c0109cd91f154ef20f49401c 100644 GIT binary patch delta 412 zcmV;N0b~B!2de{+8Gi!+002x-g`5BY05DKYR7GN(gL`{>y}h*m|NnDy&7`dMw1Zmi z#f!zPDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K01$LiPE!E?|NsC0|NsC0|NsC0 z|Np>Hi$eea0UAj}K~zYI?UccegD?z4A+eE~M4tcu+nq@Yg@4_&r#)3z0s-?pwnLO< z`Kkc++Z){-3ku#b)IB3gpp+S*eD^3N%EW~4@EAZVqtHc+4WuLOoeZ>@_`sHE-)GeUvb%NU`f8QsOeSHY)UN zrpFF&9rB(|#BA)1?PZYoNmBn8E&SKd7>`hkeX+uQx+OSyWH&e`ngCiXcAhyKXZ%Zm zW8m1iGXUq7W)>H>HGSCs!|s#(-Ep4}_xW(25C3>R{1pHYF(h@0YIeT>0000(_@5Jfo-+`>m7B-9Zc68Z>) z4jmE_IwW++QJfKqw|e5M)jO+^OGS~m>(^APr{}+!*)7Tbuz!1e_@{aYO!Z#@cYmXP z%K#v$I0{|1T zX4H}K*X|CHY@LH*b4Qzi`}-FY7JU2qf^-jtS)whR1DJ?AV+B+UYUfz;LmdqOe73}> zJ0WRV@bNK#pMOt_zz}twQAyAlR+g9ru2hU|h zx*ISQF4Z?LkM49bnh)JkzarL{ung(DW@xI&m;Pc}bpj|`8QX<42{@c~&l7$F0MU&_ z1Jncgu>vkI1}C6fm&(vF40&23p4J-xMy$2do&CxUrmRPT??tf?#;MZgYR19k8AU7reCgRR0p#9l` zz{Fz7%1`VVV3UdNgd`TQ42IGL1`YOel+<+}1G4J?;vVr);V8pL!W5OYdk4@_-5bDJ zFU`O2tdp1vU~Syd9DoAQ-HME0DAMn5XWY>V;7Szth9Ox$^XwhrJ^{qeWGH6!Ra#RY zx__f10A;^u`X7$sBWF@WcXS3Yupa)0Q*WlZtEIVEtJ4+n0(eZ4x(uV3=H=0yW*ZoX z?&t*2-SBlry4StSsM{ysa!37&aA!dj-zKK8b~ikps{m?gUF}-O%4>iNi~)ddT`EJz zFyv{Cz`Oxq#9BMuF_Lj?I)tPpIk!?B5J+V)BEi~ceypE&QfCLPt~LSaV6{ZctEd3> xWJAU!z*N|IIX(lU_1p^3G09pt0p@yq_yZp;#C~j|sW|`u002ovPDHLkV1kL-yNUn+ diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 9fa9a0e36a..4641892b12 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -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 diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index dad8f8a67c..f673df9696 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -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, };