From e63ac48de2568fa235e5645928d06ed6d7fef220 Mon Sep 17 00:00:00 2001 From: wiz1989 <80073265+wiz1989@users.noreply.github.com> Date: Sat, 7 Jun 2025 09:57:43 +0200 Subject: [PATCH] added Ash Greninja overworld sprites (#6976) --- graphics/pokemon/greninja/ash/overworld.png | Bin 0 -> 1092 bytes .../pokemon/greninja/ash/overworld_normal.pal | 19 ++++++++++++++++++ .../pokemon/greninja/ash/overworld_shiny.pal | 19 ++++++++++++++++++ spritesheet_rules.mk | 3 +++ src/data/graphics/pokemon.h | 10 ++++----- .../object_event_pic_tables_followers.h | 6 ++++-- .../pokemon/species_info/gen_6_families.h | 11 ++++++++++ 7 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 graphics/pokemon/greninja/ash/overworld.png create mode 100644 graphics/pokemon/greninja/ash/overworld_normal.pal create mode 100644 graphics/pokemon/greninja/ash/overworld_shiny.pal diff --git a/graphics/pokemon/greninja/ash/overworld.png b/graphics/pokemon/greninja/ash/overworld.png new file mode 100644 index 0000000000000000000000000000000000000000..9313520a5eee723fb4c2c46608a714b8f5cb2d26 GIT binary patch literal 1092 zcmV-K1iSl*P)D zi;S3SFo+8FltVCvoP6-1&^;KIEbJxt5<>D7+9e@%umf9Z^>0=yL7}J8&SAB`S2NEu z^J?B1g#K^;kw&5)sb0zdxUEH64Xu*@MkAzN#j+6zYLTE-#t7kgUnLt{s2iK zXswGh>An{JE8(zv7hxos`S1cGy!GzYQ&h!rV6557`O1CG_RBaDtYbt(gGEMLZ;k<= zlI;<-56^=x8ylsJ@ZQrc`io#t;M(PLv(>s$$-RKybkF%}dtj6@!gjFL4g`Y&&nA3r zRnaP0J|uHN#V_Yju<_#AiaA9Ud`WIZdR7(7hf3q}_`Q-FEHb*Fty`_tjZCn>n7?f) zS3}vaV1&#sHa{JG{#r3Ac!Rb`Log^XzC(_`{B3Ca6&%(qefaw5{6|*K60uGwA@C^m zLq(p^##hdt;~%Dr{9u+aX>K@8@0vq1gP2)djF{W|Cjh5*_En4gjpGbI*nJtoa`mlO;j`DA>;Fnpmuux?k-;yO0tVgz~OhZ7!M#N#pd68xv6;Z})mL zWGx?H2bLWe7Y|XKGB@U$ljVqa`&2yabWc@8mioNojx|UP+h@Gf@8|F3APD^a$JhXL z>P3ud_p)ML=V!br2;$B}7g_b-TPoBx5PF*l=Wj2Z@xc7}UGf&s*{JQLIhS;onSqfD zDjYy$bz;G;c>L~~toJfM(1VfQ9Q(Ct&MF)GDBb5sf=$cp359hAE*BW-V-taRfq{nY zms!9b?YX*@o~?5RE-;eR%~4mjvw$=qlz2HK%$Bc5mVIJ5*z+_DS?S9`xV;z`jsle{ zO`^&9U;+~F3yduxKg%HtTy1`prW~!&W%+~&LC_Q=!aXi6+|l~oPH_oh2z#De^e==k z=Vm#?j-A^@gM|?DmQq*<;dKwnA(31D24V;o`!9zUxTOETxBUh8>Th+*<0W+f0000< KMNUMnLSTZ|RQ8Sl literal 0 HcmV?d00001 diff --git a/graphics/pokemon/greninja/ash/overworld_normal.pal b/graphics/pokemon/greninja/ash/overworld_normal.pal new file mode 100644 index 0000000000..04bbf21ddf --- /dev/null +++ b/graphics/pokemon/greninja/ash/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +46 56 55 +68 84 82 +20 20 20 +220 212 133 +234 152 208 +72 95 157 +245 103 190 +62 141 206 +136 186 226 +184 62 48 +176 97 134 +186 214 237 +233 85 88 +241 174 219 +100 33 26 diff --git a/graphics/pokemon/greninja/ash/overworld_shiny.pal b/graphics/pokemon/greninja/ash/overworld_shiny.pal new file mode 100644 index 0000000000..6ce04a9319 --- /dev/null +++ b/graphics/pokemon/greninja/ash/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +46 56 55 +68 84 82 +20 20 20 +184 152 83 +234 152 208 +46 56 55 +245 103 190 +68 84 82 +136 186 226 +184 62 48 +176 97 134 +186 214 237 +233 85 88 +241 174 219 +100 33 26 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 37074cb048..aaa346ccf1 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -3237,6 +3237,9 @@ $(POKEMONGFXDIR)/frogadier/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/greninja/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 +$(POKEMONGFXDIR)/greninja/ash/overworld.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + $(POKEMONGFXDIR)/bunnelby/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 74b3a98229..1b70cf3aa4 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -19202,13 +19202,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/back.4bpp.smol"); const u16 gMonShinyPalette_GreninjaAsh[] = INCBIN_U16("graphics/pokemon/greninja/ash/shiny.gbapal"); const u8 gMonIcon_GreninjaAsh[] = INCBIN_U8("graphics/pokemon/greninja/ash/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GreninjaAsh[] = INCBIN_COMP("graphics/pokemon/greninja/ash/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_GreninjaAsh[] = INCBIN_COMP("graphics/pokemon/greninja/ash/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u16 gOverworldPalette_GreninjaAsh[] = INCBIN_U16("graphics/pokemon/greninja/ash/overworld_normal.gbapal"); - // const u16 gShinyOverworldPalette_GreninjaAsh[] = INCBIN_U16("graphics/pokemon/greninja/ash/overworld_shiny.gbapal"); + const u16 gOverworldPalette_GreninjaAsh[] = INCBIN_U16("graphics/pokemon/greninja/ash/overworld_normal.gbapal"); + const u16 gShinyOverworldPalette_GreninjaAsh[] = INCBIN_U16("graphics/pokemon/greninja/ash/overworld_shiny.gbapal"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_FAMILY_FROAKIE #if P_FAMILY_BUNNELBY 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 305fd6b74e..13f9d17316 100644 --- a/src/data/object_events/object_event_pic_tables_followers.h +++ b/src/data/object_events/object_event_pic_tables_followers.h @@ -4590,9 +4590,11 @@ static const struct SpriteFrameImage sPicTable_Frogadier[] = { static const struct SpriteFrameImage sPicTable_Greninja[] = { overworld_ascending_frames(gObjectEventPic_Greninja, 4, 4), }; -/*static const struct SpriteFrameImage sPicTable_GreninjaAsh[] = { +#if OW_BATTLE_ONLY_FORMS +static const struct SpriteFrameImage sPicTable_GreninjaAsh[] = { overworld_ascending_frames(gObjectEventPic_GreninjaAsh, 4, 4), -};*/ +}; +#endif //OW_BATTLE_ONLY_FORMS #endif //P_FAMILY_FROAKIE #if P_FAMILY_BUNNELBY diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index 9dfac96c80..411ef400f6 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -744,6 +744,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_L) FOOTPRINT(Greninja) + #if OW_BATTLE_ONLY_FORMS + OVERWORLD( + sPicTable_GreninjaAsh, + SIZE_32x32, + SHADOW_SIZE_M, + TRACKS_FOOT, + sAnimTable_Following, + gOverworldPalette_GreninjaAsh, + gShinyOverworldPalette_GreninjaAsh + ) + #endif //OW_BATTLE_ONLY_FORMS .levelUpLearnset = sGreninjaLevelUpLearnset, .teachableLearnset = sGreninjaTeachableLearnset, .formSpeciesIdTable = sGreninjaFormSpeciesIdTable,