diff --git a/graphics/pokemon/gouging_fire/back.png b/graphics/pokemon/gouging_fire/back.png new file mode 100644 index 0000000000..8a0f79ef5c Binary files /dev/null and b/graphics/pokemon/gouging_fire/back.png differ diff --git a/graphics/pokemon/gouging_fire/front.png b/graphics/pokemon/gouging_fire/front.png new file mode 100644 index 0000000000..a399776f4d Binary files /dev/null and b/graphics/pokemon/gouging_fire/front.png differ diff --git a/graphics/pokemon/gouging_fire/normal.pal b/graphics/pokemon/gouging_fire/normal.pal new file mode 100644 index 0000000000..26c06154b0 --- /dev/null +++ b/graphics/pokemon/gouging_fire/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +76 44 11 +255 222 123 +8 8 8 +184 148 35 +249 199 40 +99 86 99 +210 212 207 +172 158 149 +53 140 58 +78 198 90 +136 17 14 +192 25 22 +151 77 32 +81 36 0 +207 114 56 diff --git a/graphics/pokemon/gouging_fire/shiny.pal b/graphics/pokemon/gouging_fire/shiny.pal new file mode 100644 index 0000000000..115a249070 --- /dev/null +++ b/graphics/pokemon/gouging_fire/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +61 17 25 +249 189 116 +8 8 8 +199 100 36 +235 148 37 +99 86 99 +210 212 207 +172 158 149 +39 146 176 +70 220 210 +51 50 50 +93 92 92 +116 61 52 +61 17 25 +152 96 57 diff --git a/graphics/pokemon/hydrapple/back.png b/graphics/pokemon/hydrapple/back.png new file mode 100644 index 0000000000..f84712a508 Binary files /dev/null and b/graphics/pokemon/hydrapple/back.png differ diff --git a/graphics/pokemon/hydrapple/front.png b/graphics/pokemon/hydrapple/front.png new file mode 100644 index 0000000000..eecdea6d78 Binary files /dev/null and b/graphics/pokemon/hydrapple/front.png differ diff --git a/graphics/pokemon/hydrapple/icon.png b/graphics/pokemon/hydrapple/icon.png new file mode 100644 index 0000000000..352513f998 Binary files /dev/null and b/graphics/pokemon/hydrapple/icon.png differ diff --git a/graphics/pokemon/hydrapple/normal.pal b/graphics/pokemon/hydrapple/normal.pal new file mode 100644 index 0000000000..6fec9a7957 --- /dev/null +++ b/graphics/pokemon/hydrapple/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +88 56 32 +16 16 16 +152 24 16 +96 16 8 +32 72 24 +136 88 56 +216 80 64 +72 128 56 +248 160 160 +192 168 80 +40 96 8 +88 168 24 +160 216 72 +240 200 80 +32 88 8 diff --git a/graphics/pokemon/hydrapple/shiny.pal b/graphics/pokemon/hydrapple/shiny.pal new file mode 100644 index 0000000000..d3d0f68f92 --- /dev/null +++ b/graphics/pokemon/hydrapple/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +88 56 32 +16 16 16 +216 136 0 +192 80 0 +32 72 24 +136 88 56 +248 208 16 +72 128 56 +248 232 144 +192 168 80 +40 96 8 +88 168 24 +160 216 72 +240 200 80 +32 88 8 diff --git a/graphics/pokemon/iron_boulder/back.png b/graphics/pokemon/iron_boulder/back.png new file mode 100644 index 0000000000..3c7cf2bf33 Binary files /dev/null and b/graphics/pokemon/iron_boulder/back.png differ diff --git a/graphics/pokemon/iron_boulder/front.png b/graphics/pokemon/iron_boulder/front.png new file mode 100644 index 0000000000..cf306085da Binary files /dev/null and b/graphics/pokemon/iron_boulder/front.png differ diff --git a/graphics/pokemon/iron_boulder/normal.pal b/graphics/pokemon/iron_boulder/normal.pal new file mode 100644 index 0000000000..d6a1404c07 --- /dev/null +++ b/graphics/pokemon/iron_boulder/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +8 8 8 +35 26 26 +62 53 44 +96 79 70 +113 92 83 +110 110 110 +245 245 245 +210 210 210 +193 99 32 +161 161 161 +254 172 53 +250 226 167 +123 51 30 +186 83 52 +242 112 4 diff --git a/graphics/pokemon/iron_boulder/shiny.pal b/graphics/pokemon/iron_boulder/shiny.pal new file mode 100644 index 0000000000..9ff1b42075 --- /dev/null +++ b/graphics/pokemon/iron_boulder/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +8 8 8 +82 81 103 +149 148 170 +203 204 218 +249 248 250 +91 100 116 +228 232 235 +191 197 204 +193 99 32 +148 156 170 +254 172 53 +250 226 167 +97 95 107 +150 148 160 +209 204 217 diff --git a/graphics/pokemon/iron_crown/back.png b/graphics/pokemon/iron_crown/back.png new file mode 100644 index 0000000000..a3a5135503 Binary files /dev/null and b/graphics/pokemon/iron_crown/back.png differ diff --git a/graphics/pokemon/iron_crown/front.png b/graphics/pokemon/iron_crown/front.png new file mode 100644 index 0000000000..af3ab5bc9a Binary files /dev/null and b/graphics/pokemon/iron_crown/front.png differ diff --git a/graphics/pokemon/iron_crown/normal.pal b/graphics/pokemon/iron_crown/normal.pal new file mode 100644 index 0000000000..2df8f4b6a9 --- /dev/null +++ b/graphics/pokemon/iron_crown/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +0 163 172 +96 240 240 +210 248 248 +8 8 8 +179 146 50 +122 86 30 +130 138 163 +240 194 19 +1 68 78 +19 163 180 +59 202 202 +19 114 130 +60 68 78 +202 202 218 +162 202 218 diff --git a/graphics/pokemon/iron_crown/shiny.pal b/graphics/pokemon/iron_crown/shiny.pal new file mode 100644 index 0000000000..aaf724e6b4 --- /dev/null +++ b/graphics/pokemon/iron_crown/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +0 163 172 +96 240 240 +210 248 248 +8 8 8 +171 172 186 +50 60 68 +130 138 163 +234 234 240 +96 96 104 +194 194 202 +248 248 251 +138 146 154 +60 68 78 +202 202 218 +162 202 218 diff --git a/graphics/pokemon/raging_bolt/back.png b/graphics/pokemon/raging_bolt/back.png new file mode 100644 index 0000000000..ae03ffab6b Binary files /dev/null and b/graphics/pokemon/raging_bolt/back.png differ diff --git a/graphics/pokemon/raging_bolt/front.png b/graphics/pokemon/raging_bolt/front.png new file mode 100644 index 0000000000..01e805fe98 Binary files /dev/null and b/graphics/pokemon/raging_bolt/front.png differ diff --git a/graphics/pokemon/raging_bolt/normal.pal b/graphics/pokemon/raging_bolt/normal.pal new file mode 100644 index 0000000000..a2feea268e --- /dev/null +++ b/graphics/pokemon/raging_bolt/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +80 79 87 +8 8 10 +8 8 8 +86 34 117 +123 98 19 +255 255 255 +114 81 156 +165 128 211 +192 154 43 +247 198 58 +149 149 149 +198 199 199 +197 64 62 +143 213 230 +118 104 104 diff --git a/graphics/pokemon/raging_bolt/shiny.pal b/graphics/pokemon/raging_bolt/shiny.pal new file mode 100644 index 0000000000..bec4088cca --- /dev/null +++ b/graphics/pokemon/raging_bolt/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +154 212 167 +94 82 82 +8 8 10 +8 8 8 +104 84 22 +140 73 2 +255 255 255 +182 149 49 +231 206 90 +201 118 6 +247 159 53 +175 160 153 +198 199 199 +11 125 232 +206 206 214 +118 104 104 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index de164520d2..2dd93eb118 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -10994,11 +10994,11 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp"); #endif //P_FOOTPRINTS - // const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/front.4bpp.lz"); - // const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/normal.gbapal.lz"); - // const u32 gMonBackPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/back.4bpp.lz"); - // const u32 gMonShinyPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/shiny.gbapal.lz"); - // const u8 gMonIcon_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/icon.4bpp"); + const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/front.4bpp.lz"); + const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/normal.gbapal.lz"); + const u32 gMonBackPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/back.4bpp.lz"); + const u32 gMonShinyPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/shiny.gbapal.lz"); + const u8 gMonIcon_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/footprint.1bpp"); #endif //P_FOOTPRINTS @@ -12963,10 +12963,10 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #endif //P_FAMILY_OGERPON #if P_FAMILY_GOUGING_FIRE - // const u32 gMonFrontPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/front.4bpp.lz"); - // const u32 gMonPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/normal.gbapal.lz"); - // const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/back.4bpp.lz"); - // const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/shiny.gbapal.lz"); + const u32 gMonFrontPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/front.4bpp.lz"); + const u32 gMonPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/normal.gbapal.lz"); + const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/back.4bpp.lz"); + const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/shiny.gbapal.lz"); // const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp"); @@ -12974,10 +12974,10 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #endif //P_FAMILY_GOUGING_FIRE #if P_FAMILY_RAGING_BOLT - // const u32 gMonFrontPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/front.4bpp.lz"); - // const u32 gMonPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/normal.gbapal.lz"); - // const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/back.4bpp.lz"); - // const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/shiny.gbapal.lz"); + const u32 gMonFrontPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/front.4bpp.lz"); + const u32 gMonPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/normal.gbapal.lz"); + const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/back.4bpp.lz"); + const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/shiny.gbapal.lz"); // const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp"); @@ -12985,10 +12985,10 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #endif //P_FAMILY_RAGING_BOLT #if P_FAMILY_IRON_BOULDER - // const u32 gMonFrontPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/front.4bpp.lz"); - // const u32 gMonPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/normal.gbapal.lz"); - // const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/back.4bpp.lz"); - // const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/shiny.gbapal.lz"); + const u32 gMonFrontPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/front.4bpp.lz"); + const u32 gMonPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/normal.gbapal.lz"); + const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/back.4bpp.lz"); + const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/shiny.gbapal.lz"); // const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp"); @@ -12996,10 +12996,10 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #endif //P_FAMILY_IRON_BOULDER #if P_FAMILY_IRON_CROWN - // const u32 gMonFrontPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/front.4bpp.lz"); - // const u32 gMonPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/normal.gbapal.lz"); - // const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/back.4bpp.lz"); - // const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/shiny.gbapal.lz"); + const u32 gMonFrontPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/front.4bpp.lz"); + const u32 gMonPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/normal.gbapal.lz"); + const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/back.4bpp.lz"); + const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/shiny.gbapal.lz"); // const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp"); diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index fa0e606b45..bae9dadea8 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -1977,15 +1977,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - //FRONT_PIC(Hydrapple, 64, 64), - .frontPicYOffset = 0, + FRONT_PIC(Hydrapple, 64, 64), + .frontPicYOffset = 1, .frontAnimFrames = sAnims_Hydrapple, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(Hydrapple, 64, 64), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(Hydrapple, 64, 64), .backPicYOffset = 0, - //.backAnimId = BACK_ANIM_NONE, - //PALETTES(Hydrapple), - //ICON(Hydrapple, 0), + .backAnimId = BACK_ANIM_NONE, + PALETTES(Hydrapple), + ICON(Hydrapple, 0), //FOOTPRINT(Hydrapple) LEARNSETS(Hydrapple), }, diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index 6fada1325d..c9f1eb4950 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -5468,15 +5468,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - //FRONT_PIC(GougingFire, 64, 64), - .frontPicYOffset = 0, + FRONT_PIC(GougingFire, 64, 64), + .frontPicYOffset = 2, .frontAnimFrames = sAnims_GougingFire, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(GougingFire, 64, 64), - .backPicYOffset = 0, - //.backAnimId = BACK_ANIM_NONE, - //PALETTES(GougingFire), - //ICON(GougingFire, 0), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(GougingFire, 64, 64), + .backPicYOffset = 6, + .backAnimId = BACK_ANIM_NONE, + PALETTES(GougingFire), + // ICON(GougingFire, 0), //FOOTPRINT(GougingFire) LEARNSETS(GougingFire), }, @@ -5518,15 +5518,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - //FRONT_PIC(RagingBolt, 64, 64), + FRONT_PIC(RagingBolt, 64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RagingBolt, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(RagingBolt, 64, 64), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(RagingBolt, 64, 64), .backPicYOffset = 0, - //.backAnimId = BACK_ANIM_NONE, - //PALETTES(RagingBolt), - //ICON(RagingBolt, 0), + .backAnimId = BACK_ANIM_NONE, + PALETTES(RagingBolt), + // ICON(RagingBolt, 0), //FOOTPRINT(RagingBolt) LEARNSETS(RagingBolt), }, @@ -5567,15 +5567,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 1, .trainerScale = 336, .trainerOffset = 4, - //FRONT_PIC(IronBoulder, 64, 64), - .frontPicYOffset = 0, + FRONT_PIC(IronBoulder, 64, 64), + .frontPicYOffset = 3, .frontAnimFrames = sAnims_IronBoulder, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(IronBoulder, 64, 64), - .backPicYOffset = 0, - //.backAnimId = BACK_ANIM_NONE, - //PALETTES(IronBoulder), - //ICON(IronBoulder, 0), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(IronBoulder, 64, 64), + .backPicYOffset = 12, + .backAnimId = BACK_ANIM_NONE, + PALETTES(IronBoulder), + // ICON(IronBoulder, 0), //FOOTPRINT(IronBoulder) LEARNSETS(IronBoulder), }, @@ -5617,15 +5617,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - //FRONT_PIC(IronCrown, 64, 64), + FRONT_PIC(IronCrown, 64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronCrown, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(IronCrown, 64, 64), - .backPicYOffset = 0, - //.backAnimId = BACK_ANIM_NONE, - //PALETTES(IronCrown), - //ICON(IronCrown, 0), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(IronCrown, 64, 64), + .backPicYOffset = 2, + .backAnimId = BACK_ANIM_NONE, + PALETTES(IronCrown), + // ICON(IronCrown, 0), //FOOTPRINT(IronCrown) LEARNSETS(IronCrown), },