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

Paldean Wooper and Clodsire followers (#5277)

Browse source
This commit is contained in:
Cafei 2024-08-28 13:47:08 +04:00 committed by GitHub
parent 98dbf3a575
commit 213c097dc0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 106 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/pokemon/clodsire/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 856 B

19
graphics/pokemon/clodsire/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
64 60 48
128 108 96
96 80 72
48 40 32
16 16 16
184 160 160
208 208 208
40 36 32
152 120 120
80 68 72
104 52 56
176 88 104
248 140 160
0 0 0
0 0 0

19
graphics/pokemon/clodsire/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
74 67 90
127 116 143
96 87 115
46 40 44
16 16 16
160 158 197
205 180 170
40 36 32
117 117 158
77 63 72
104 52 56
176 88 104
248 140 160
0 0 0
0 0 0

BIN
graphics/pokemon/wooper/wooper_paldean/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 503 B

19
graphics/pokemon/wooper/wooper_paldean/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
99 73 120
201 177 219
85 67 66
104 82 81
16 16 16
169 147 146
130 103 102
158 129 179
255 255 255
46 36 35
180 65 65
255 106 115
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/wooper/wooper_paldean/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
120 80 48
230 186 149
102 96 146
140 133 186
16 16 16
204 202 219
171 167 198
200 144 97
255 255 255
35 36 46
180 65 65
255 106 115
0 0 0
0 0 0
0 0 0

6
spritesheet_rules.mk
View file

@ -3996,6 +3996,12 @@ $(POKEMONGFXDIR)/exeggutor/alolan/overworld.4bpp: %.4bpp: %.png
$(POKEMONGFXDIR)/marowak/alolan/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(POKEMONGFXDIR)/wooper/wooper_paldean/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(POKEMONGFXDIR)/clodsire/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(MISCGFXDIR)/emotes.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2

12
src/data/graphics/pokemon.h
View file

@ -5193,10 +5193,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u32 gMonShinyPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/shiny.gbapal.lz");
const u8 gMonIcon_WooperPaldean[] = INCBIN_U8("graphics/pokemon/wooper/wooper_paldean/icon.4bpp");
#if OW_POKEMON_OBJECT_EVENTS
// const u32 gObjectEventPic_WooperPaldean[] = INCBIN_COMP("graphics/pokemon/wooper/wooper_paldean/overworld.4bpp");
const u32 gObjectEventPic_WooperPaldean[] = INCBIN_COMP("graphics/pokemon/wooper/wooper_paldean/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
// const u32 gOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_normal.gbapal.lz");
// const u32 gShinyOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_shiny.gbapal.lz");
const u32 gOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_normal.gbapal.lz");
const u32 gShinyOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS
@ -5209,10 +5209,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/footprint.1bpp");
#endif //P_FOOTPRINTS
#if OW_POKEMON_OBJECT_EVENTS
// const u32 gObjectEventPic_Clodsire[] = INCBIN_COMP("graphics/pokemon/clodsire/overworld.4bpp");
const u32 gObjectEventPic_Clodsire[] = INCBIN_COMP("graphics/pokemon/clodsire/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
// const u32 gOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_normal.gbapal.lz");
// const u32 gShinyOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_shiny.gbapal.lz");
const u32 gOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_normal.gbapal.lz");
const u32 gShinyOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS
#endif //P_PALDEAN_FORMS

4
src/data/object_events/object_event_pic_tables_followers.h
View file

@ -1426,12 +1426,12 @@ static const struct SpriteFrameImage sPicTable_Quagsire[] = {
overworld_ascending_frames(gObjectEventPic_Quagsire, 4, 4),
};
#if P_PALDEAN_FORMS
/*static const struct SpriteFrameImage sPicTable_WooperPaldean[] = {
static const struct SpriteFrameImage sPicTable_WooperPaldean[] = {
overworld_ascending_frames(gObjectEventPic_WooperPaldean, 4, 4),
};
static const struct SpriteFrameImage sPicTable_Clodsire[] = {
overworld_ascending_frames(gObjectEventPic_Clodsire, 4, 4),
};*/
};
#endif //P_PALDEAN_FORMS
#endif //P_FAMILY_WOOPER

16
src/data/pokemon/species_info/gen_2_families.h
View file

@ -3005,6 +3005,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.iconSprite = gMonIcon_WooperPaldean,
.iconPalIndex = 2,
FOOTPRINT(Wooper)
OVERWORLD(
sPicTable_WooperPaldean,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
gOverworldPalette_WooperPaldean,
gShinyOverworldPalette_WooperPaldean
)
.isPaldeanForm = TRUE,
.levelUpLearnset = sWooperPaldeanLevelUpLearnset,
.teachableLearnset = sWooperPaldeanTeachableLearnset,
@ -3061,6 +3069,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.iconSprite = gMonIcon_Clodsire,
.iconPalIndex = 0,
FOOTPRINT(Clodsire)
OVERWORLD(
sPicTable_Clodsire,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
gOverworldPalette_Clodsire,
gShinyOverworldPalette_Clodsire
)
.levelUpLearnset = sClodsireLevelUpLearnset,
.teachableLearnset = sClodsireTeachableLearnset,
},