From 29bb658d1bc94b2cb9b87ed3800a76fe8ea785f0 Mon Sep 17 00:00:00 2001 From: Hedara Date: Tue, 6 Aug 2024 13:25:26 +0200 Subject: [PATCH] Fixed some overworld palettes --- .../pokemon/dialga/origin/overworld_shiny.pal | 19 ++++++++++++++++++ graphics/pokemon/enamorus/overworld_shiny.pal | 19 ++++++++++++++++++ .../enamorus/therian/overworld_shiny.pal | 19 ++++++++++++++++++ .../pokemon/giratina/origin/overworld.png | Bin 1965 -> 2102 bytes .../giratina/origin/overworld_shiny.pal | 16 +++++++-------- .../pokemon/palkia/origin/overworld_shiny.pal | 19 ++++++++++++++++++ src/data/graphics/pokemon.h | 8 ++++---- .../pokemon/species_info/gen_4_families.h | 12 +++++------ .../pokemon/species_info/gen_8_families.h | 12 +++++------ 9 files changed, 100 insertions(+), 24 deletions(-) create mode 100644 graphics/pokemon/dialga/origin/overworld_shiny.pal create mode 100644 graphics/pokemon/enamorus/overworld_shiny.pal create mode 100644 graphics/pokemon/enamorus/therian/overworld_shiny.pal create mode 100644 graphics/pokemon/palkia/origin/overworld_shiny.pal diff --git a/graphics/pokemon/dialga/origin/overworld_shiny.pal b/graphics/pokemon/dialga/origin/overworld_shiny.pal new file mode 100644 index 0000000000..e6bfc48201 --- /dev/null +++ b/graphics/pokemon/dialga/origin/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 182 49 +0 0 0 +65 129 255 +189 32 16 +246 80 65 +57 121 180 +98 121 139 +32 64 106 +16 56 90 +24 64 106 +189 202 222 +32 89 148 +139 161 180 +156 210 246 +16 16 16 +24 40 49 diff --git a/graphics/pokemon/enamorus/overworld_shiny.pal b/graphics/pokemon/enamorus/overworld_shiny.pal new file mode 100644 index 0000000000..88fa42851f --- /dev/null +++ b/graphics/pokemon/enamorus/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +41 165 49 +0 0 0 +164 133 41 +230 117 156 +189 60 90 +172 72 82 +238 234 255 +32 36 32 +57 60 57 +205 202 222 +148 32 24 +255 198 57 +16 16 16 +246 85 139 +82 80 90 +115 48 57 diff --git a/graphics/pokemon/enamorus/therian/overworld_shiny.pal b/graphics/pokemon/enamorus/therian/overworld_shiny.pal new file mode 100644 index 0000000000..c799ddfb89 --- /dev/null +++ b/graphics/pokemon/enamorus/therian/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +80 80 88 +118 50 58 +232 232 248 +200 200 216 +224 116 156 +174 74 87 +16 16 16 +243 46 46 +199 46 41 +147 33 30 +243 84 143 +187 62 94 +247 238 76 +255 197 60 +0 0 0 diff --git a/graphics/pokemon/giratina/origin/overworld.png b/graphics/pokemon/giratina/origin/overworld.png index cf022c4858307401eb420e320a17477ce618e677..a4de07e1cf22bd5b5c16a27b137b102f95f79595 100644 GIT binary patch delta 2061 zcmV+o2=e!>54I4H7#auz0000ahER`v3q3v`IukRCt{2TZ^`b^^Aq z*RWy3h7B7wY}l}2!-fqTHf-3iVZ(+E8#Zj%uwlc74I4IW*sx*4hW#rB(E7)p#2dqZ zhM#`2Ui^P&$i^>V;=v1lYw} z%rJk%py4;c0Zq8~;00deKQ?xoF`L652|VL%SU@-W=pc|kg~F`xVTcP8*ot9KvoN>| zfxG9w?Ep`2=D`y_!W&Ky{w5;O$z}Gg0$t-#@5Uy973dplG=-MdI>L$rDoB=hi`aC4 zTvZ{1Gbkkx=X@D|b31~+@qSJk^~(e3qKrF2sDxiofv>DE-?Jy0bYpfxpqoie4*m=5 ziTYb?;u~C0@UmhVd0Zob`Ut+p3%uEZ56wW}MH!bIP#8Y1ojCsjUfQqMkwkDtATj7A zoJ5@Y%Lu%lOU&POd@B>M-{#rV$FN%wT*E68c?iuwAeV7}laz5&DC1HH7D71ZuYxZq ziI3oHv>yb=NHl&tvqt11N8i4{7{H zUgZubF=&&22QKl6|I%E1n~=ogJ`rfMw(=}Oa{*ud@My-svL*uWC`c85sAqNXkzlDp zm_UkPPawQrM|0Bwc!9^J1AHTok{=CiXT*X2W&C%Y3LoMXd`m~nEb0wx?nAb8yNGLi zc&cTRL`_B@IOpI*V2wfia=-Sv~IF8Tw zi1a0YaqPrv<{j#BDkRs1iy6u(v51U;RPUjJZwCP;3QrN7=&RQen0PMWRm%V^E4W!b zf0;v-sknew_%42sL@O(N<+S^Snl@O^Y}jSuk4`Nvo}L_Cv_ zuZBVoHXX-(lpv>P%{WK(&@ETm=MKG*kh8_Vahz-Ppn)8+C4rnKhfq)W! zp4+dFGC}}{CZ6xME#9{6n0~dGj#qiX`M@7-Eg~#yxJU?|)Jsd`6<*;#f0h{;oOuz! zV!@K2@tepWzDkEdn6^44eB36Ljv}%_(%xxVc5mdF?Ebc9G8FmN74S`ix7To9yP2M; zU2wwR0As${q1DS0LL?A}Bq8Twys{I2ZsSWDei-j%HsRkNrV)dDz^j=1BX}Z^1qAFq z!=ZYr?D37y;SCog&OkNc5F8fx@(iO>93zM&Plk-K(OL{1>%2R_&f_xtK+35W{3k_ls(KQG}s z-{w}Kp1{NV9W;ESE>5?EdF*CwbajnS^RD1CZupBuBxJIJ0UY1sxwxuq6}-wgi|#}p zA1D)rcDt1X`tYRTvXupa((*}vE-)+dai^`{r|-qf@Mptk$)Sqi6J>LU!hSquQ4#Qv zMeTY=#C!3SK1si%1JXvh5j_%`STJte~`!fu!N!>~<%O_2OeEBI6uM%pmCsss!`_JRm6ucnRB= zoWOmb6+Z04dj%y1-J8U0w{OS%>C;#*KI;UNjH4Cu6axB*cfa6qV**_YU=C<{%icrP zBJ99N1zo&?i;7Dbp-f|cz4*KnWEqcNF0qo(ngaR^eqD(_zN^U0?ZT(C?#3$1kc~*#mJmPT21`jK2-*J0?%E z2tIZr6pB$frxM^N@ECtjAj|>E*Fuyv)Dw8Q*rl_apZM#=r+xxxhgL1X58yHUq9!nh zcYa{=1m1&V@Z9`?!BhCdM8Uj*;x9iNx{puiKH;ZPw;j-l4+h?T!ajjN+Yiy-jgJKW r8bZDJ|Cjv~{eAde=Kd1q|7QCK)$M#TCnBP900000NkvXXu0mjfjpF6` delta 1923 zcmV-}2YmRp5Umf87!3pi0002tcD;-M001YEGAn=Ituz7v00%)yL_t(|ob8yuZ`(!` z$0;4)S@aJ%sx!z;WPr}X<^twd7rW`;QA!;^n`|NnH}=v7s8e)G4LEG8MS>OJvLyiw zl=b2m$zWwGYN#^*sJ=TY^8J!%J6#I!Ef)DXlHd3E-n(a7R%V%HmRV+*WtLfHnPrw) zW|@CwmRV+*eV*Bazq!JtxMMj^dCcw8_-7fy*s`X}pb^wvFC@pR3EW`$nzOn(M&N)? zkjrWm6(LW7=-Do|rk8UqvewE!C?G$4s$7jdf%8MfDz(+snl)PBfD;m2Mj)JeI_e;~ z+9zIV#d#F%*W8tYPgH@o!$9D8EQ3r`J2Wb0A6s=PV z4yaE-m;^&UMFK6u@{isu9*q$=;1i@_3U8`FZ23FFWq8+9?*f{0l=h?OAKJ212N1Rp z35Fbgvs02)o?Kt-dR(B<1nwJsR0YZcp30iwKz&I_azIW4i~~<~00(lGRh$Pm-Z_8H z$OsQPJV`Aup7WsTtj#gCQcdh=Tz+G)7(~0B<0yJh%ixR@;oBjcP`EFbL4Mh#j!WCD zhD{L`I3jwByUiUqYjezj+rnM^9Ts7MLkb8l3FAay{$&(J`)!L06e7$DK;cL!gFIcW zxs;YiL|Eo}ncwlaz~$T$SzCfO$5Mabj_5$3aU`S^M7Y5s@JS%^pNJ7=&zumsrXu%f z-Cdz=Yea-)?x_@Qa0j5xEgc^&vo^>a5T3wNM&V*j@CbuIYXMT^LwO)jQ~`Ze;z%v? zTyfUjTbZ;b8pa5VoQYGqG|ySq221Ve4J}dbfG;@!iW_H~`6DWTBiIPYK;VA_KMLe0 z5KrI@UlZwEp-f=%Ds=}$&R)Ol0r%N& z{e&ngu)@_k&DSZl?YTj6sXbQa%tyIQxEe07)jdoET2hSACkKXHdC!nUkTZn1i|zvd zq3u+@%(Wmp)F$2TmqlO=Y}kM3h8%o=HFB8@9I#3iI`4Me!UzXMt|clI+*{` z1R|NM7!(#s_i$zk^n)D3s3CDR0HD@`A}h6jnlAmoCIJhpDS{=g6(L_Uh_E5PP<2S) zSgk^S{pMk%%Ji{(OydeeJORAvmFIh{Us;#LL@PpxYek5e!XSw-)2Dw3U`a1=edIxF z_GG7+=re^tR;Q#`=pNCjgByg7kmOB^*=STMf>OA()^id%KQsPO$vqroc6ug&eQiJQ0m)l5n1gS`njU>%o=zVz_Hpt|gTs z?Zg__8b#iHwb6um{~)ABg=u{DciY~o@TQUpCn$7pz>iJ$8sGQjQ36U> z;<^L3R_NBpgE)WgpU?*iIu|c)cH>U5!E?bhj}AEG#)P)dF$Z9$t(aog_;wxy#8M@dhDrwyz=|&+lCc!|B#FA6v>y zh&68N6bm0A$-|R3Ws|@(KKni7_@BMxs|xb+?a`b)Tjqbs^yjP|UX5e>eXTq^C7Hwx z=Ir<4<0#(!qitR=p3m;u_7?}eKKH=&Dlf^!INZNRZ$Otgb=zizshmb}4F7VS(7mrO z!E;-u#|LrP@4>j7uam9j{>8Y3R;%B(UTkka->a@ZG&~@cKcKI8mGVBXe_2T5)&@i; zY(~BQK1_e3{ex!Xf*j$S_R5v*XQib{W0j?I*n(J<{^fu?w|r4<6?bshj3G%5xXSg5 za?6P}ZI~>UH6+0jF}yy3Z%2P0t9=!NJh|E?94?Zhpd8eyd>NyOBLb3+B(G zX&h_r-evlZMypHVd=2h)Kaj?V5RK&^5Tb0Mr4g5=aWJ@f_sF|E=N4eU-arO{X&fga zM+!{i%xv2(j1!l}2R1VPsr=T+^f({?k8Di*Q@F7^T!8=o>|c928$@gCpgI5m002ov JPDHLkV1kMLs_*~+ diff --git a/graphics/pokemon/giratina/origin/overworld_shiny.pal b/graphics/pokemon/giratina/origin/overworld_shiny.pal index 560f34aaf5..c05ed66c48 100644 --- a/graphics/pokemon/giratina/origin/overworld_shiny.pal +++ b/graphics/pokemon/giratina/origin/overworld_shiny.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -80 80 80 +96 80 16 40 40 40 248 248 208 -144 144 144 -56 48 24 -16 184 192 -8 112 120 +176 152 24 +56 56 56 +240 80 64 +168 48 64 +232 208 24 184 184 184 -248 224 96 -200 144 48 -112 96 16 +144 144 144 +80 80 80 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/palkia/origin/overworld_shiny.pal b/graphics/pokemon/palkia/origin/overworld_shiny.pal new file mode 100644 index 0000000000..8a6f0c4ab8 --- /dev/null +++ b/graphics/pokemon/palkia/origin/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 97 0 +0 0 0 +246 80 65 +172 161 180 +255 238 238 +246 161 156 +131 121 148 +16 16 16 +197 190 213 +246 194 189 +164 80 164 +205 137 197 +106 97 24 +222 218 246 +65 72 74 +82 80 90 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 37258b7f54..2c40dc9d81 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -10834,7 +10834,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gObjectEventPic_DialgaOrigin[] = INCBIN_COMP("graphics/pokemon/dialga/origin/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DIALGA @@ -10865,7 +10865,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gObjectEventPic_PalkiaOrigin[] = INCBIN_COMP("graphics/pokemon/palkia/origin/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PALKIA @@ -14180,7 +14180,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gObjectEventPic_EnamorusIncarnate[] = INCBIN_COMP("graphics/pokemon/enamorus/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -14193,7 +14193,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gObjectEventPic_EnamorusTherian[] = INCBIN_COMP("graphics/pokemon/enamorus/therian/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ENAMORUS diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index faa9ed73b4..6b37bb2065 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -5509,8 +5509,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gOverworldPalette_DialgaOrigin - //, gShinyOverworldPalette_DialgaOrigin + gOverworldPalette_DialgaOrigin, + gShinyOverworldPalette_DialgaOrigin ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5647,8 +5647,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gOverworldPalette_PalkiaOrigin - //, gShinyOverworldPalette_PalkiaOrigin + gOverworldPalette_PalkiaOrigin, + gShinyOverworldPalette_PalkiaOrigin ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5924,8 +5924,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_GiratinaOrigin - //, gShinyOverworldPalette_GiratinaOrigin + gOverworldPalette_GiratinaOrigin, + gShinyOverworldPalette_GiratinaOrigin ) .isLegendary = TRUE, .isFrontierBanned = TRUE, diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 353597e96a..bb878e1fed 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -7512,9 +7512,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = sPicTable_EnamorusIncarnate, SIZE_64x64, SHADOW_SIZE_M, - TRACKS_NONE - //, gOverworldPalette_EnamorusIncarnate - //, gShinyOverworldPalette_EnamorusIncarnate + TRACKS_NONE, + gOverworldPalette_EnamorusIncarnate, + gShinyOverworldPalette_EnamorusIncarnate ) .isLegendary = TRUE, .levelUpLearnset = sEnamorusLevelUpLearnset, @@ -7574,9 +7574,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = sPicTable_EnamorusTherian, SIZE_64x64, SHADOW_SIZE_M, - TRACKS_NONE - //, gOverworldPalette_EnamorusTherian - //, gShinyOverworldPalette_EnamorusTherian + TRACKS_NONE, + gOverworldPalette_EnamorusTherian, + gShinyOverworldPalette_EnamorusTherian ) .isLegendary = TRUE, .levelUpLearnset = sEnamorusLevelUpLearnset,