Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follower palette fix (#5107)

Browse Source
This commit is contained in:
tertu 2024-08-06 11:52:05 -05:00 committed by GitHub
commit 08f8ccd9eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 157 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
graphics/pokemon/dialga/origin/overworld_shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 182 49
0 0 0
65 129 255
189 32 16
246 80 65
57 121 180
98 121 139
32 64 106
16 56 90
24 64 106
189 202 222
32 89 148
139 161 180
156 210 246
16 16 16
24 40 49

19
graphics/pokemon/enamorus/overworld_shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
41 165 49
0 0 0
164 133 41
230 117 156
189 60 90
172 72 82
238 234 255
32 36 32
57 60 57
205 202 222
148 32 24
255 198 57
16 16 16
246 85 139
82 80 90
115 48 57

19
graphics/pokemon/enamorus/therian/overworld_shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
80 80 88
118 50 58
232 232 248
200 200 216
224 116 156
174 74 87
16 16 16
243 46 46
199 46 41
147 33 30
243 84 143
187 62 94
247 238 76
255 197 60
0 0 0

BIN
graphics/pokemon/giratina/origin/overworld.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

16
graphics/pokemon/giratina/origin/overworld_shiny.pal
View File

@ -3,17 +3,17 @@ JASC-PAL
16
152 208 160
16 16 16
80 80 80
96 80 16
40 40 40
248 248 208
144 144 144
56 48 24
16 184 192
8 112 120
176 152 24
56 56 56
240 80 64
168 48 64
232 208 24
184 184 184
248 224 96
200 144 48
112 96 16
144 144 144
80 80 80
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/palkia/origin/overworld_shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
32 97 0
0 0 0
246 80 65
172 161 180
255 238 238
246 161 156
131 121 148
16 16 16
197 190 213
246 194 189
164 80 164
205 137 197
106 97 24
222 218 246
65 72 74
82 80 90

BIN
graphics/pokemon/xerneas/active/overworld.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

19
graphics/pokemon/xerneas/active/overworld_normal.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
32 34 38
48 181 222
84 63 30
164 88 198
212 193 126
139 138 111
218 52 55
255 208 67
55 64 205
92 123 216
55 57 65
202 204 210
84 63 30
0 0 0

19
graphics/pokemon/xerneas/active/overworld_shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
32 34 38
48 181 222
84 63 30
164 88 198
212 193 126
139 138 111
218 52 55
255 208 67
55 64 205
92 123 216
55 57 65
202 204 210
84 63 30
0 0 0

BIN
graphics/pokemon/xerneas/overworld.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
graphics/pokemon/xerneas/overworld_neutral.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

2
graphics/pokemon/xerneas/overworld_normal.pal
View File

@ -16,4 +16,4 @@ JASC-PAL
55 57 65
202 204 210
84 63 30
0 0 0
185 236 253

12
graphics/pokemon/xerneas/overworld_shiny.pal
View File

@ -3,7 +3,7 @@ JASC-PAL
16
153 211 165
16 16 16
53 51 52
32 34 38
48 181 222
84 63 30
164 88 198
@ -11,9 +11,9 @@ JASC-PAL
139 138 111
218 52 55
255 208 67
25 134 171
38 199 254
224 224 224
55 64 205
92 123 216
55 57 65
202 204 210
119 117 119
0 0 0
84 63 30
185 236 253

3
spritesheet_rules.mk
View File

@ -2976,6 +2976,9 @@ $(POKEMONGFXDIR)/noivern/overworld.4bpp: %.4bpp: %.png
$(POKEMONGFXDIR)/xerneas/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8
$(POKEMONGFXDIR)/xerneas/active/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8
$(POKEMONGFXDIR)/yveltal/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8

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

@ -10834,7 +10834,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u32 gObjectEventPic_DialgaOrigin[] = INCBIN_COMP("graphics/pokemon/dialga/origin/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
const u32 gOverworldPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/overworld_normal.gbapal.lz");
// const u32 gShinyOverworldPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS
#endif //P_FAMILY_DIALGA
@ -10865,7 +10865,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u32 gObjectEventPic_PalkiaOrigin[] = INCBIN_COMP("graphics/pokemon/palkia/origin/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
const u32 gOverworldPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/overworld_normal.gbapal.lz");
// const u32 gShinyOverworldPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS
#endif //P_FAMILY_PALKIA
@ -14180,7 +14180,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u32 gObjectEventPic_EnamorusIncarnate[] = INCBIN_COMP("graphics/pokemon/enamorus/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
const u32 gOverworldPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/overworld_normal.gbapal.lz");
// const u32 gShinyOverworldPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS
@ -14193,7 +14193,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u32 gObjectEventPic_EnamorusTherian[] = INCBIN_COMP("graphics/pokemon/enamorus/therian/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
const u32 gOverworldPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/overworld_normal.gbapal.lz");
// const u32 gShinyOverworldPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS
#endif //P_FAMILY_ENAMORUS
@ -15939,10 +15939,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u32 gMonShinyPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/shiny.gbapal.lz");
const u8 gMonIcon_XerneasActive[] = INCBIN_U8("graphics/pokemon/xerneas/active/icon.4bpp");
#if OW_POKEMON_OBJECT_EVENTS
// const u32 gObjectEventPic_XerneasActive[] = INCBIN_COMP("graphics/pokemon/xerneas/active/overworld.4bpp");
const u32 gObjectEventPic_XerneasActive[] = INCBIN_COMP("graphics/pokemon/xerneas/active/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
// const u32 gOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_normal.gbapal.lz");
// const u32 gShinyOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_shiny.gbapal.lz");
//const u32 gOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_normal.gbapal.lz");
//const u32 gShinyOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS
#endif //P_FAMILY_XERNEAS

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

@ -4465,9 +4465,9 @@ static const struct SpriteFrameImage sPicTable_Noivern[] = {
static const struct SpriteFrameImage sPicTable_XerneasNeutral[] = {
overworld_ascending_frames(gObjectEventPic_XerneasNeutral, 4, 4),
};
/*static const struct SpriteFrameImage sPicTable_XerneasActive[] = {
static const struct SpriteFrameImage sPicTable_XerneasActive[] = {
overworld_ascending_frames(gObjectEventPic_XerneasActive, 4, 4),
};*/
};
#endif //P_FAMILY_XERNEAS
#if P_FAMILY_YVELTAL

12
src/data/pokemon/species_info/gen_4_families.h
View File

@ -5509,8 +5509,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_NONE,
gOverworldPalette_DialgaOrigin
//, gShinyOverworldPalette_DialgaOrigin
gOverworldPalette_DialgaOrigin,
gShinyOverworldPalette_DialgaOrigin
)
.isLegendary = TRUE,
.isFrontierBanned = TRUE,
@ -5647,8 +5647,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_NONE,
gOverworldPalette_PalkiaOrigin
//, gShinyOverworldPalette_PalkiaOrigin
gOverworldPalette_PalkiaOrigin,
gShinyOverworldPalette_PalkiaOrigin
)
.isLegendary = TRUE,
.isFrontierBanned = TRUE,
@ -5924,8 +5924,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_FOOT,
gOverworldPalette_GiratinaOrigin
//, gShinyOverworldPalette_GiratinaOrigin
gOverworldPalette_GiratinaOrigin,
gShinyOverworldPalette_GiratinaOrigin
)
.isLegendary = TRUE,
.isFrontierBanned = TRUE,

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

@ -5274,9 +5274,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
sPicTable_XerneasNeutral,
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_FOOT
//, gOverworldPalette_XerneasNeutral
//, gShinyOverworldPalette_XerneasNeutral
TRACKS_FOOT,
gOverworldPalette_XerneasNeutral,
gShinyOverworldPalette_XerneasNeutral
)
.isLegendary = TRUE,
.isFrontierBanned = TRUE,
@ -5331,7 +5331,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.iconPalIndex = 0,
FOOTPRINT(Xerneas)
OVERWORLD(
sPicTable_XerneasNeutral,
sPicTable_XerneasActive,
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_FOOT,

12
src/data/pokemon/species_info/gen_8_families.h
View File

@ -7512,9 +7512,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
sPicTable_EnamorusIncarnate,
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_NONE
//, gOverworldPalette_EnamorusIncarnate
//, gShinyOverworldPalette_EnamorusIncarnate
TRACKS_NONE,
gOverworldPalette_EnamorusIncarnate,
gShinyOverworldPalette_EnamorusIncarnate
)
.isLegendary = TRUE,
.levelUpLearnset = sEnamorusLevelUpLearnset,
@ -7574,9 +7574,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
sPicTable_EnamorusTherian,
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_NONE
//, gOverworldPalette_EnamorusTherian
//, gShinyOverworldPalette_EnamorusTherian
TRACKS_NONE,
gOverworldPalette_EnamorusTherian,
gShinyOverworldPalette_EnamorusTherian
)
.isLegendary = TRUE,
.levelUpLearnset = sEnamorusLevelUpLearnset,