diff --git a/graphics/pokemon/cherrim/sunshine/overworld.png b/graphics/pokemon/cherrim/sunshine/overworld.png new file mode 100644 index 0000000000..269b0b2369 Binary files /dev/null and b/graphics/pokemon/cherrim/sunshine/overworld.png differ diff --git a/graphics/pokemon/cherrim/sunshine/overworld_normal.pal b/graphics/pokemon/cherrim/sunshine/overworld_normal.pal new file mode 100644 index 0000000000..a90df82107 --- /dev/null +++ b/graphics/pokemon/cherrim/sunshine/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +144 32 64 +200 56 104 +248 192 224 +16 16 16 +224 128 168 +248 160 200 +248 96 128 +248 224 240 +152 104 16 +216 176 88 +248 224 112 +40 112 48 +48 160 56 +200 56 104 +120 96 40 diff --git a/graphics/pokemon/cherrim/sunshine/overworld_shiny.pal b/graphics/pokemon/cherrim/sunshine/overworld_shiny.pal new file mode 100644 index 0000000000..636edb2602 --- /dev/null +++ b/graphics/pokemon/cherrim/sunshine/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +112 40 56 +192 88 120 +248 232 232 +16 16 16 +224 128 184 +240 176 216 +224 136 176 +248 224 240 +160 88 32 +248 168 56 +248 208 120 +0 96 16 +24 144 56 +192 88 120 +160 88 32 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 2088feb763..827e11cea3 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -2888,6 +2888,9 @@ $(POKEMONGFXDIR)/cherubi/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/cherrim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 +$(POKEMONGFXDIR)/cherrim/sunshine/overworld.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + $(POKEMONGFXDIR)/shellos/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 2cdbeb2681..b2506c56f6 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -14942,12 +14942,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_CherrimOvercast[] = INCBIN_COMP("graphics/pokemon/cherrim/overworld.4bpp"); - // const u32 gObjectEventPic_CherrimSunshine[] = INCBIN_COMP("graphics/pokemon/cherrim/sunshine/overworld.4bpp"); + const u32 gObjectEventPic_CherrimSunshine[] = INCBIN_COMP("graphics/pokemon/cherrim/sunshine/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u16 gOverworldPalette_CherrimOvercast[] = INCBIN_U16("graphics/pokemon/cherrim/overworld_normal.gbapal"); - // const u16 gOverworldPalette_CherrimSunshine[] = INCBIN_U16("graphics/pokemon/cherrim/sunshine/overworld_normal.gbapal"); + const u16 gOverworldPalette_CherrimSunshine[] = INCBIN_U16("graphics/pokemon/cherrim/sunshine/overworld_normal.gbapal"); const u16 gShinyOverworldPalette_CherrimOvercast[] = INCBIN_U16("graphics/pokemon/cherrim/overworld_shiny.gbapal"); - // const u16 gShinyOverworldPalette_CherrimSunshine[] = INCBIN_U16("graphics/pokemon/cherrim/sunshine/overworld_shiny.gbapal"); + const u16 gShinyOverworldPalette_CherrimSunshine[] = INCBIN_U16("graphics/pokemon/cherrim/sunshine/overworld_shiny.gbapal"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHERUBI 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 4339d4c683..e859946a8e 100644 --- a/src/data/object_events/object_event_pic_tables_followers.h +++ b/src/data/object_events/object_event_pic_tables_followers.h @@ -3294,9 +3294,9 @@ static const struct SpriteFrameImage sPicTable_Cherubi[] = { static const struct SpriteFrameImage sPicTable_CherrimOvercast[] = { overworld_ascending_frames(gObjectEventPic_CherrimOvercast, 4, 4), }; -/*static const struct SpriteFrameImage sPicTable_CherrimSunshine[] = { +static const struct SpriteFrameImage sPicTable_CherrimSunshine[] = { overworld_ascending_frames(gObjectEventPic_CherrimSunshine, 4, 4), -};*/ +}; #endif //P_FAMILY_CHERUBI #if P_FAMILY_SHELLOS diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index 9122bda366..eddf9ad144 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -2973,6 +2973,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Cherrim) + OVERWORLD( + sPicTable_CherrimSunshine, + SIZE_32x32, + SHADOW_SIZE_M, + TRACKS_FOOT, + sAnimTable_Following, + gOverworldPalette_CherrimSunshine, + gShinyOverworldPalette_CherrimSunshine + ) .levelUpLearnset = sCherrimLevelUpLearnset, .teachableLearnset = sCherrimTeachableLearnset, .formSpeciesIdTable = sCherrimFormSpeciesIdTable,