Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable female Indeedee follower and improve shiny Indeedees #5285

Merged
merged 3 commits into from
Aug 29, 2024
Merged

Enable female Indeedee follower and improve shiny Indeedees #5285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a60d84
Enable female Indeedee
Cafeei Aug 29, 2024
13e67de
Improve shiny Indeedees
Cafeei Aug 29, 2024
33c87d7
Update front.png
Cafeei Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified graphics/pokemon/indeedee/back.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/indeedee/female/back.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/indeedee/female/overworld.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions graphics/pokemon/indeedee/female/overworld_shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ JASC-PAL
16
128 128 128
26 24 32
135 128 162
86 82 102
145 127 199
84 73 122
8 8 14
0 0 0
37 37 62
77 76 116
255 255 255
64 96 120
96 144 160
254 254 238
121 83 136
61 37 19
175 175 175
121 72 39
136 136 136
105 52 91
193 190 180
132 85 120
97 97 85
14 14 14
15 15 15
14 changes: 7 additions & 7 deletions graphics/pokemon/indeedee/female/shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ JASC-PAL
16
152 208 160
32 48 64
120 112 144
80 72 104
145 127 199
84 73 122
96 144 160
16 16 16
216 112 224
200 176 192
248 248 248
144 96 88
193 190 180
254 254 238
132 85 120
64 96 120
112 48 48
128 104 128
105 52 91
97 97 85
48 64 80
0 0 0
0 0 0
Binary file modified graphics/pokemon/indeedee/front.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions graphics/pokemon/indeedee/shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ JASC-PAL
16
152 208 160
32 48 64
120 112 144
145 127 199
16 16 16
80 72 104
84 73 122
96 144 160
200 176 192
248 248 248
193 190 180
254 254 238
64 96 120
144 96 88
112 48 48
132 85 120
105 52 91
40 176 224
128 104 128
97 97 85
48 64 80
0 0 0
0 0 0
3 changes: 3 additions & 0 deletions spritesheet_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3474,6 +3474,9 @@ $(POKEMONGFXDIR)/eiscue/overworld.4bpp: %.4bpp: %.png
$(POKEMONGFXDIR)/indeedee/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(POKEMONGFXDIR)/indeedee/female/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(POKEMONGFXDIR)/morpeko/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

Expand Down
8 changes: 8 additions & 0 deletions src/data/pokemon/species_info/gen_8_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5280,6 +5280,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.iconSprite = gMonIcon_IndeedeeFemale,
.iconPalIndex = 2,
FOOTPRINT(Indeedee)
OVERWORLD(
sPicTable_IndeedeeFemale,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
gOverworldPalette_IndeedeeFemale,
gShinyOverworldPalette_IndeedeeFemale
)
.levelUpLearnset = sIndeedeeFemaleLevelUpLearnset,
.teachableLearnset = sIndeedeeFemaleTeachableLearnset,
.eggMoveLearnset = sIndeedeeFemaleEggMoveLearnset,
Expand Down
Loading