diff --git a/graphics/pokemon/enamorus/anim_front.png b/graphics/pokemon/enamorus/anim_front.png new file mode 100644 index 000000000000..e4b21fc52aeb Binary files /dev/null and b/graphics/pokemon/enamorus/anim_front.png differ diff --git a/graphics/pokemon/enamorus/back.png b/graphics/pokemon/enamorus/back.png index 2e7af720cfc0..17668de57602 100755 Binary files a/graphics/pokemon/enamorus/back.png and b/graphics/pokemon/enamorus/back.png differ diff --git a/graphics/pokemon/enamorus/front.png b/graphics/pokemon/enamorus/front.png deleted file mode 100755 index 67493a1e6b1d..000000000000 Binary files a/graphics/pokemon/enamorus/front.png and /dev/null differ diff --git a/graphics/pokemon/enamorus/normal.pal b/graphics/pokemon/enamorus/normal.pal index 43c4eb7a07d8..b8986ffd4662 100755 --- a/graphics/pokemon/enamorus/normal.pal +++ b/graphics/pokemon/enamorus/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -118 50 58 -74 74 74 -147 33 30 -199 46 41 -243 46 46 -187 62 94 -174 74 87 -255 197 60 -243 84 143 -224 116 156 +153 211 165 +255 255 255 180 180 189 +105 106 115 16 16 16 -252 252 252 -0 0 0 -0 0 0 +237 129 170 +185 81 133 +126 44 70 +255 203 81 +201 50 96 +157 36 61 +40 40 40 +177 109 135 +123 79 110 +82 50 75 +111 26 47 diff --git a/graphics/pokemon/enamorus/shiny.pal b/graphics/pokemon/enamorus/shiny.pal index edbd1c73cbb8..41b6650a7574 100644 --- a/graphics/pokemon/enamorus/shiny.pal +++ b/graphics/pokemon/enamorus/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -117 60 81 -74 74 74 -141 33 33 -192 79 50 -244 92 19 -179 102 181 -168 87 109 -255 197 60 -233 135 231 -207 131 158 -180 180 189 +153 211 165 +255 255 255 +194 184 173 +115 107 104 16 16 16 -252 252 252 -0 0 0 -0 0 0 +251 142 224 +198 83 185 +127 58 131 +255 197 32 +246 81 4 +205 35 35 +40 40 40 +230 131 164 +189 82 106 +107 51 74 +140 29 49 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 39b11560d486..8801942e5361 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -18880,7 +18880,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_FAMILY_LANDORUS #if P_FAMILY_ENAMORUS - const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz"); + const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/anim_front.4bpp.lz"); const u32 gMonPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz"); const u32 gMonBackPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); const u32 gMonShinyPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index fd86f22ddc6b..ee085425236c 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -7660,7 +7660,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 1, .frontPic = gMonFrontPic_EnamorusIncarnate, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 1, + .frontPicYOffset = 0, .frontAnimFrames = sAnims_EnamorusIncarnate, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, @@ -7672,7 +7672,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EnamorusIncarnate, .iconSprite = gMonIcon_EnamorusIncarnate, .iconPalIndex = 1, - SHADOW(0, 17, SHADOW_SIZE_M) + SHADOW(-3, 19, SHADOW_SIZE_M) FOOTPRINT(Enamorus) OVERWORLD( sPicTable_EnamorusIncarnate, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index deceeb04204c..56ec319a57ff 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -9794,7 +9794,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Calyrex); #endif //P_FAMILY_CALYREX #if P_FAMILY_ENAMORUS -PLACEHOLDER_ANIM_SINGLE_FRAME(EnamorusIncarnate); +PLACEHOLDER_ANIM_TWO_FRAMES(EnamorusIncarnate); PLACEHOLDER_ANIM_SINGLE_FRAME(EnamorusTherian); #endif //P_FAMILY_ENAMORUS