From a9492f5b1c6371afe553cdbcc17388fbec115a56 Mon Sep 17 00:00:00 2001 From: Hedara Date: Tue, 6 Aug 2024 16:52:42 +0200 Subject: [PATCH] Fixed Xerneas --- graphics/pokemon/xerneas/active/overworld.png | Bin 0 -> 1832 bytes .../xerneas/active/overworld_normal.pal | 19 ++++++++++++++++++ .../xerneas/active/overworld_shiny.pal | 19 ++++++++++++++++++ graphics/pokemon/xerneas/overworld.png | Bin 1685 -> 1779 bytes .../pokemon/xerneas/overworld_neutral.png | Bin 0 -> 1753 bytes graphics/pokemon/xerneas/overworld_normal.pal | 2 +- graphics/pokemon/xerneas/overworld_shiny.pal | 12 +++++------ spritesheet_rules.mk | 3 +++ src/data/graphics/pokemon.h | 6 +++--- .../object_event_pic_tables_followers.h | 4 ++-- .../pokemon/species_info/gen_6_families.h | 8 ++++---- 11 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 graphics/pokemon/xerneas/active/overworld.png create mode 100644 graphics/pokemon/xerneas/active/overworld_normal.pal create mode 100644 graphics/pokemon/xerneas/active/overworld_shiny.pal create mode 100644 graphics/pokemon/xerneas/overworld_neutral.png diff --git a/graphics/pokemon/xerneas/active/overworld.png b/graphics/pokemon/xerneas/active/overworld.png new file mode 100644 index 0000000000000000000000000000000000000000..c5bf3867ee95b534734555d4f10337b8cf00dba5 GIT binary patch literal 1832 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 delta 1663 zcmV-_27vkV4V4X$7&in10002tcD;-M0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000jP)t-snbV~Z5D+ypG?70Qe;J0WCddBZ;NZ&4(sy-tY!3aP00009a7bBm000id z000id0mpBsWB>pK@kvBMRA}Dqn!#(^RvgFQPxw6EFLCA8QH`aRWJ^q;=~%BZ^_=!7 zNVc<5S03w0CX2hR7em>4bqOmz%7-50?BE^}hv?&A8oNyfe~@u>Z2j(==Dy;h?eLUbC5SdSr|UX7Th>FlT_K2W&0R~y z0Xw=4`WwMTgfFmzX}D4lbnjn$2c-e9UbP$bS~?C+2kvp$ikCHqU2ve|q~S_I=;&*w zhe+pj?8pSWoo3bEUdNPN?=an&ugAN1@fNxqe&DINLJ;r~G_-&Ee-5{DPOc*{M5oh$ z4Ro%vR2;frA=I6GtIVuzbgOXD>89ceL1=ET>D8MjE1`@@kgOod+!j_Tq%gyu6_KtwY2O*uw*@We0AMR?jg|~e;s`zuY1Y<1c%+4+rUSS zMx&G8Y1F#uxLUB*eqyb+d>{RO+p?Z|TqgJc@7cJ`S!#Z%XMNk#cif#zz1Al^o|Y>G zYrUuVUEd$}1Fz8Q$^_34t&hUVF->8+=5{?t`vme zqc&<$j{gZ&lX&&(NKe&+s6e|%q6ah0IxVXDD3Hw>QjHWLC^IX$NZGhtBUo(a*|7!9jD#vU7zXTegb9+_Ics-EX}zgY2BK%EEo) z99$(>4C0rZ17a~Cj-iS(EfRv`>|80>e-*r>PZ9{u!?kGSMdR#TDQHA{5&cXH4*hd* zZ8E~ie>gi=3Bn}Wn~WG$MMVIbi#_ZsjsVG3f?6a3QagY_F%&&+S(;^K;9yJ^!crui zN~yR~(1>0>pOQTU!!R7qh2cv0!b)oivi8d2qWLUV!kGmt{2uSgAB8MYHgSd)7gjgWB5erVJ0F^Pt z#Ry*qhG=fF8H!h=yucY9fXAz37KEuWGU))v_&Pd9d4OY_My5P~am+4L+rP|VN(B&t zf0b**=Z(3MLEp$quf;cNb1D-QJVIWQ2k^)}EFe6j?zE8*q&{C7nPMMNWq47URfJ*k zjf|O7p)RmwPFWhkAHT`BE+9}H08>N$FZ$K4*_EYGo*8p++ zuURkI$@L_uv~et0kOq(@KLcd{MF25?b@J#Hk}s6nSOBpRc>u*_l+oj#H^AEgJwS2< z$^sNTCVzB5_6VFifZ`l^`_M@`l$ZnI2l;0aa@1MP>i=1c{SC$1`IrC82FCyZ002ov JPDHLkV1mp~6~O=i diff --git a/graphics/pokemon/xerneas/overworld_neutral.png b/graphics/pokemon/xerneas/overworld_neutral.png new file mode 100644 index 0000000000000000000000000000000000000000..9d40b9ff59f4f138d640088bc72a66e56324c4b0 GIT binary patch literal 1753 zcmV;~1}6E5P)Px#Fi=cXMVZs35D*X`A|^1k-c&yxq*%t(!G4R1Z`w3B|IkA>K+Rlx*f%*r%FNPK zKOVX4{nC5}C;$Ke5Oh*bQvm<}|NsC0|NsC0|NsC0|G-d-LjV85TOho+VJ*$M5@W{9hAwQ{UREZvK@Ouy~%pkKcF$|MEBR zov8N4+CFe)4J>}+2vq%Ko^Ds53dzf*Nx%m)csFlY`r8_MNcXWX*1+O7o>nt=$o{@EelI7&wj~glB;bHKy!!vK zPB-^Cx?^4bw|q$fi{Cf`b>z?fb{EnCf4t?oh#a8pJT^H+0tqmQHwMi>-9h1g^pc{- z4*GT**YEh_@GOBg%drEzYdKyt82Ts*_`V-=Rmd1?0y(4|EmVN6)+>qF8m2rj zhwt3&`ry!PKCF)P5cXy4{rS(}Sptzi4GFXt2OpXppZ&F&vm=GtR1p$HFZfFd1sq{~ z85_Zm;^A=&-jY>}q@52R-@gtY3QrRV*Pw>ke3-ClHU+peH^(w)M`4>v0Anl_%HI5^pq?}zzj7lM#@|7pd&mo*!R<%=+IkUm|IUaUY4B$kN$2z) z9KrW(6!8j+5tZ6w`m5r78=fa{A9b!}APexhjp{f@zc-X^_o+r>!&9cZ`m$T)KT`d_EgO||1Ed_lyqK*{aii96EcH zOX2SzQ1ejG;W>5?XUOCxlswyjl6Y?*+aR!cGdVXiiRTFf_(g&Tp^_W6QBx2*2#wO)2340Px~07;Rk0|`7jky@NUJkRq-;%^~PndtX@Eae<` z0EM^st@bbi{dt-K7T=X{1af$^5w-`}U163;1!D1tz@u6U)gu;xEPmr1u*Iu4s)r@6 zrErN6$l_i4(b|0Xb{C!@(EF}|j|70CeQ9uNq1s zJ&WB$of%4g0uL2cN-I*sJp_ek33TlE4O!sl_~KPC6hkcD_!|U98RYOhf!X3O=TpN~ z>}kf&;Elj4$@q&qfWp%RV(JVdV(_7)kPe9BwVu^-$gWWbaCnwL%nba=ctA4e00!?7 zoXHFz@GOCt-yIm<#8Ag`84Qk(i{^T20&k&PPq9`?jE2BL6pN<`gy&B!dNM`G?qbo+ z7ZKdr7r#`!P9uRAe1wo~6U8}Rpp|6tG=ZLawYVFj4iM`hvb7O7mPIIJ*H$kF1%pTK z;8vn^56;_8;%Nd0zAEbgK_lmK_G1+&zNV4F3*6RfE5Tia#*+k!FEv-;98i$IpziE} zYwE6RR+TJtfXB^-k2|Xg%EfG8}DtwRE3B1(g_i|DD#km(rG5iP> zT&F(_cf2{k6F!LVN*eB?26uJ78ot77oyLoQi-K~%Q%eBO64+BflyU&R(0QVOJo7n# z_tFz_fLkte-vxV(2U4PKJl5?5Ry~9B102ubhZU#i@up7XtS;bt74Gm!2OxN(5j>F5 z3e+>m2@KDV91#^Y$qMyEQa9j04N|nk2ukBP=|2}x}P3E4^t-{P@e`k7jw7u zhP4tB-9>?9mXFyt$^pIyQ3;?}{KEnI9Jwy2TqA-}&UEfz#lP4aufeEb;T`0`T{MB7 zN~pu+zIc5WqHUHBI3PW0(9@aM4WJ!BEuSLq4jm(Y^i+F{p}C5nxcQYAWs?rrragWO z@}c189niu3Ao(#iwJZ?c5#5r21GqMnkso)!hbx#{mVdXP_v1;n$QKNVB0`q$TO2?c v@!_G(yh2wKJyQEg`43HAvSi7U|44oTt50iX*Jn0q00000NkvXXu0mjfUWGz> literal 0 HcmV?d00001 diff --git a/graphics/pokemon/xerneas/overworld_normal.pal b/graphics/pokemon/xerneas/overworld_normal.pal index cfa83f5465..6ba56fe6c6 100644 --- a/graphics/pokemon/xerneas/overworld_normal.pal +++ b/graphics/pokemon/xerneas/overworld_normal.pal @@ -16,4 +16,4 @@ JASC-PAL 55 57 65 202 204 210 84 63 30 -0 0 0 +185 236 253 diff --git a/graphics/pokemon/xerneas/overworld_shiny.pal b/graphics/pokemon/xerneas/overworld_shiny.pal index 6b1dbf9941..6ba56fe6c6 100644 --- a/graphics/pokemon/xerneas/overworld_shiny.pal +++ b/graphics/pokemon/xerneas/overworld_shiny.pal @@ -3,7 +3,7 @@ JASC-PAL 16 153 211 165 16 16 16 -53 51 52 +32 34 38 48 181 222 84 63 30 164 88 198 @@ -11,9 +11,9 @@ JASC-PAL 139 138 111 218 52 55 255 208 67 -25 134 171 -38 199 254 -224 224 224 +55 64 205 +92 123 216 +55 57 65 202 204 210 -119 117 119 -0 0 0 +84 63 30 +185 236 253 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index a50f48c707..03e6b8a3b1 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -2976,6 +2976,9 @@ $(POKEMONGFXDIR)/noivern/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/xerneas/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 +$(POKEMONGFXDIR)/xerneas/active/overworld.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 8 -mheight 8 + $(POKEMONGFXDIR)/yveltal/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 2c40dc9d81..4c86c0adcd 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -15939,10 +15939,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/shiny.gbapal.lz"); const u8 gMonIcon_XerneasActive[] = INCBIN_U8("graphics/pokemon/xerneas/active/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_XerneasActive[] = INCBIN_COMP("graphics/pokemon/xerneas/active/overworld.4bpp"); + const u32 gObjectEventPic_XerneasActive[] = INCBIN_COMP("graphics/pokemon/xerneas/active/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_shiny.gbapal.lz"); + //const u32 gOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_normal.gbapal.lz"); + //const u32 gShinyOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_XERNEAS diff --git a/src/data/object_events/object_event_pic_tables_followers.h b/src/data/object_events/object_event_pic_tables_followers.h index 46c134d911..b47faf52f1 100644 --- a/src/data/object_events/object_event_pic_tables_followers.h +++ b/src/data/object_events/object_event_pic_tables_followers.h @@ -4465,9 +4465,9 @@ static const struct SpriteFrameImage sPicTable_Noivern[] = { static const struct SpriteFrameImage sPicTable_XerneasNeutral[] = { overworld_ascending_frames(gObjectEventPic_XerneasNeutral, 4, 4), }; -/*static const struct SpriteFrameImage sPicTable_XerneasActive[] = { +static const struct SpriteFrameImage sPicTable_XerneasActive[] = { overworld_ascending_frames(gObjectEventPic_XerneasActive, 4, 4), -};*/ +}; #endif //P_FAMILY_XERNEAS #if P_FAMILY_YVELTAL diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index 46c776639c..973f24e13d 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -5274,9 +5274,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = sPicTable_XerneasNeutral, SIZE_64x64, SHADOW_SIZE_M, - TRACKS_FOOT - //, gOverworldPalette_XerneasNeutral - //, gShinyOverworldPalette_XerneasNeutral + TRACKS_FOOT, + gOverworldPalette_XerneasNeutral, + gShinyOverworldPalette_XerneasNeutral ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5331,7 +5331,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconPalIndex = 0, FOOTPRINT(Xerneas) OVERWORLD( - sPicTable_XerneasNeutral, + sPicTable_XerneasActive, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT,