Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

added Ash Greninja overworld sprites (#6976)

Browse Source
This commit is contained in:
wiz1989 2025-06-07 09:57:43 +02:00 committed by GitHub
parent 8489b7a622
commit e63ac48de2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pokemon/greninja/ash/overworld.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

19
graphics/pokemon/greninja/ash/overworld_normal.pal Normal file
View File

@ -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

19
graphics/pokemon/greninja/ash/overworld_shiny.pal Normal file
View File

@ -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

3
spritesheet_rules.mk
View File

@ -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

10
src/data/graphics/pokemon.h
View File

@ -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

6
src/data/object_events/object_event_pic_tables_followers.h
View File

@ -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

11
src/data/pokemon/species_info/gen_6_families.h
View File

@ -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,