From 4f40c678b5e3c15f398a3631b192cd8c69f573df Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 2 Feb 2024 19:06:28 +0100 Subject: [PATCH] Archaludon --- graphics/pokemon/archaludon/back.png | Bin 0 -> 609 bytes graphics/pokemon/archaludon/front.png | Bin 0 -> 1210 bytes graphics/pokemon/archaludon/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/archaludon/shiny.pal | 19 +++++++++++++++++++ src/data/graphics/pokemon.h | 8 ++++---- src/data/pokemon/species_info/gen_8.h | 16 ++++++++-------- 6 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 graphics/pokemon/archaludon/back.png create mode 100644 graphics/pokemon/archaludon/front.png create mode 100644 graphics/pokemon/archaludon/normal.pal create mode 100644 graphics/pokemon/archaludon/shiny.pal diff --git a/graphics/pokemon/archaludon/back.png b/graphics/pokemon/archaludon/back.png new file mode 100644 index 0000000000000000000000000000000000000000..4b2d3971efb04d27643c20b1855affe8780d66c8 GIT binary patch literal 609 zcmV-n0-pVeP)He>9rOQ(9veVvTmb*75NBaD@@b0000G zbW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs0005dNkl}c_Md|QgI*ROu{AGJK>;h_MQ^_ig&OeTV*5zHlG!8i7;$1K_|kTVedp3G>9N=yK4>Of|OEEFl-?HQG_J5x#r(>br(#}uyqXk zjG!0c+}AfnaL$=wLV$>oN(J<4mm|0V2|bG;qL1E_gG|)^zF7nq=tBe;eGI{Sk1>!Y zC5r$flK>V3;;A$VMNtE_GB63?4opyzM2nEpz!bOxcgGUhg856G!9`Ld~PB)yD|T=f~Lr z`3Q{X1^*O5c)I%lM~>tDywhk`s&5dUAB^QDh@;#Io#bT%v%H6;9H)C@y@FOI}zx!X*^^e555xUB%25w vKJqYI-X?j9(Byotb}bkW>|a#0000G zbW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs000CjNklwS?IdtabWu>3?nGruAmB?lZt}?6M7n^=7i}`%Jwz5KNcBX;A3C^0%$(KKE}a-4~Y{%7y-#~nU5om0G8tp92Si+NTuLE&c~4- z0`SEohE$#a>=xKFj{^P!0C&~?A>i)-LinEc@^t9|;0(EpPY1vn`k7a(DnPyhShD1g zeF6X;Sg3*>E4TpBpyYRZ1>^$~Bx6_7Ai!GJdX?UH4?d(h_LZYW5mMBP*lN1}X#2N#Rb>%4_D1eyb)&VVzD!|HcE`TMN3vt<&kjf*CT7|H0Wl_7UTXRGXl@Qp^ zZ!s_nvsVGvFt|;6R&$Ix(litfur~nZ)(JXD4jDp#2J6;GO8OKXgk|O_k@d3`5{PDh zj9KN~320uJCqF9Ec_v%20%A7RZr?kL72qw7O zmk>IjL~Vy8F@Sa0LmzvEAEf^a7ln~ zsDjhRV(f+BX{Oo+01N`Egy2hyD4P!{^-5}Am;h2Is=X;8??S2-7(58kHCQpz5aJjd z5ZRr`xlrxn;C>k3=0mtA$&%pq8U<>AwuexbQELH-EbhZlCdFdOtqO>` zfSO8o#zT;z#j*HMr~r*p&|9LFz$jo?XosU#f*xO6Dztp+Ng4e#v1f*aGi?dCylr_B z%*kvEu_b!37r~R1HYX?|T!dz<*OsXOeft0bW0);i7s2w@-Ypt|*8uqYmqIbqkwC#3 zQ@+2R*zY&WzY%Id=wxb$F928Qw*E=ARkF0f_72E$y}>og0|Ch+3q%L-i+#PM8K7K& zSSmsXRxSWkANWOrU();zVQ;t|h((iVfLNpO7Db)j{y5utx%ZKcUjyLkD3c)A>!S(K zCc2*zGH#ISgUAHXUw|_}sDSs|W^MqkF}o8+fV`wZ=XV|dwQ}YFoj1P${r%xXmNL&= zz{L9PLvTQiPn$5~ju6E1C^qtb1tA2xr|>VsVN0}9v7z}^%x}j&cj#qo3i#6+YwPp* Y2aSAH#dxm>@c;k-07*qoM6N<$f^r-viU0rr literal 0 HcmV?d00001 diff --git a/graphics/pokemon/archaludon/normal.pal b/graphics/pokemon/archaludon/normal.pal new file mode 100644 index 0000000000..cda3805601 --- /dev/null +++ b/graphics/pokemon/archaludon/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +136 73 83 +8 8 8 +189 126 61 +224 90 94 +240 225 123 +3 33 81 +105 99 119 +223 226 244 +252 253 253 +184 181 206 +49 93 142 +141 132 166 +18 56 103 +98 133 172 +132 109 58 diff --git a/graphics/pokemon/archaludon/shiny.pal b/graphics/pokemon/archaludon/shiny.pal new file mode 100644 index 0000000000..79e6173d9a --- /dev/null +++ b/graphics/pokemon/archaludon/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +134 152 175 +8 8 8 +174 103 68 +217 226 242 +227 155 106 +17 62 103 +61 65 71 +131 147 160 +172 186 203 +107 116 127 +52 154 201 +83 90 99 +23 98 141 +118 190 214 +241 240 251 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 2dd93eb118..efb16af883 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -11574,10 +11574,10 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS - // const u32 gMonFrontPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/front.4bpp.lz"); - // const u32 gMonPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/normal.gbapal.lz"); - // const u32 gMonBackPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/back.4bpp.lz"); - // const u32 gMonShinyPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/shiny.gbapal.lz"); + const u32 gMonFrontPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/front.4bpp.lz"); + const u32 gMonPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/normal.gbapal.lz"); + const u32 gMonBackPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/back.4bpp.lz"); + const u32 gMonShinyPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/shiny.gbapal.lz"); // const u8 gMonIcon_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/footprint.1bpp"); diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index bae9dadea8..1bdf34835c 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -1985,7 +1985,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .backPicYOffset = 0, .backAnimId = BACK_ANIM_NONE, PALETTES(Hydrapple), - ICON(Hydrapple, 0), + ICON(Hydrapple, 1), //FOOTPRINT(Hydrapple) LEARNSETS(Hydrapple), }, @@ -4333,15 +4333,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - //FRONT_PIC(Archaludon, 64, 64), + FRONT_PIC(Archaludon, 64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Archaludon, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(Archaludon, 64, 64), - .backPicYOffset = 0, - //.backAnimId = BACK_ANIM_NONE, - //PALETTES(Archaludon), - //ICON(Archaludon, 0), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(Archaludon, 64, 64), + .backPicYOffset = 7, + .backAnimId = BACK_ANIM_NONE, + PALETTES(Archaludon), + // ICON(Archaludon, 0), //FOOTPRINT(Archaludon) LEARNSETS(Archaludon), },