atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable female Indeedee follower and improve shiny Indeedees (#5285)

Browse source 
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
This commit is contained in:
Cafei 2024-08-29 20:14:46 +04:00 committed by GitHub
parent 8af35a7e0d
commit 8053f4ab1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/pokemon/indeedee/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 530 B

BIN
graphics/pokemon/indeedee/female/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 494 B

BIN
graphics/pokemon/indeedee/female/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 561 B

After

Width:  |  Height:  |  Size: 568 B

18
graphics/pokemon/indeedee/female/overworld_shiny.pal
View file

@ -3,17 +3,17 @@ JASC-PAL
16 16
128 128 128 128 128 128
26 24 32 26 24 32
135 128 162 145 127 199
86 82 102 84 73 122
8 8 14 8 8 14
0 0 0 0 0 0
37 37 62 64 96 120
77 76 116 96 144 160
255 255 255 254 254 238
121 83 136 121 83 136
61 37 19 105 52 91
175 175 175 193 190 180
121 72 39 132 85 120
136 136 136 97 97 85
14 14 14 14 14 14
15 15 15 15 15 15

14
graphics/pokemon/indeedee/female/shiny.pal
View file

@ -3,17 +3,17 @@ JASC-PAL
16 16
152 208 160 152 208 160
32 48 64 32 48 64
120 112 144 145 127 199
80 72 104 84 73 122
96 144 160 96 144 160
16 16 16 16 16 16
216 112 224 216 112 224
200 176 192 193 190 180
248 248 248 254 254 238
144 96 88 132 85 120
64 96 120 64 96 120
112 48 48 105 52 91
128 104 128 97 97 85
48 64 80 48 64 80
0 0 0 0 0 0
0 0 0 0 0 0

BIN
graphics/pokemon/indeedee/front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 592 B

14
graphics/pokemon/indeedee/shiny.pal
View file

@ -3,17 +3,17 @@ JASC-PAL
16 16
152 208 160 152 208 160
32 48 64 32 48 64
120 112 144 145 127 199
16 16 16 16 16 16
80 72 104 84 73 122
96 144 160 96 144 160
200 176 192 193 190 180
248 248 248 254 254 238
64 96 120 64 96 120
144 96 88 132 85 120
112 48 48 105 52 91
40 176 224 40 176 224
128 104 128 97 97 85
48 64 80 48 64 80
0 0 0 0 0 0
0 0 0 0 0 0

3
spritesheet_rules.mk
View file

@ -3474,6 +3474,9 @@ $(POKEMONGFXDIR)/eiscue/overworld.4bpp: %.4bpp: %.png
$(POKEMONGFXDIR)/indeedee/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/indeedee/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4 $(GFX) $< $@ -mwidth 4 -mheight 4
$(POKEMONGFXDIR)/indeedee/female/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(POKEMONGFXDIR)/morpeko/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/morpeko/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4 $(GFX) $< $@ -mwidth 4 -mheight 4

8
src/data/pokemon/species_info/gen_8_families.h
View file

@ -5280,6 +5280,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.iconSprite = gMonIcon_IndeedeeFemale, .iconSprite = gMonIcon_IndeedeeFemale,
.iconPalIndex = 2, .iconPalIndex = 2,
FOOTPRINT(Indeedee) FOOTPRINT(Indeedee)
OVERWORLD(
sPicTable_IndeedeeFemale,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
gOverworldPalette_IndeedeeFemale,
gShinyOverworldPalette_IndeedeeFemale
)
.levelUpLearnset = sIndeedeeFemaleLevelUpLearnset, .levelUpLearnset = sIndeedeeFemaleLevelUpLearnset,
.teachableLearnset = sIndeedeeFemaleTeachableLearnset, .teachableLearnset = sIndeedeeFemaleTeachableLearnset,
.eggMoveLearnset = sIndeedeeFemaleEggMoveLearnset, .eggMoveLearnset = sIndeedeeFemaleEggMoveLearnset,