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

Jump to bottom

Follower palette fix #5107

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Follower palette fix #5107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29bb658
Fixed some overworld palettes
Aug 6, 2024
a9492f5
Fixed Xerneas
Aug 6, 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
19 changes: 19 additions & 0 deletions graphics/pokemon/dialga/origin/overworld_shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 19 additions & 0 deletions graphics/pokemon/enamorus/overworld_shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 19 additions & 0 deletions graphics/pokemon/enamorus/therian/overworld_shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file modified graphics/pokemon/giratina/origin/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.
16 changes: 8 additions & 8 deletions graphics/pokemon/giratina/origin/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
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 changes: 19 additions & 0 deletions graphics/pokemon/palkia/origin/overworld_shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file added graphics/pokemon/xerneas/active/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.
19 changes: 19 additions & 0 deletions graphics/pokemon/xerneas/active/overworld_normal.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 19 additions & 0 deletions graphics/pokemon/xerneas/active/overworld_shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file modified graphics/pokemon/xerneas/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.
Binary file added graphics/pokemon/xerneas/overworld_neutral.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.
2 changes: 1 addition & 1 deletion graphics/pokemon/xerneas/overworld_normal.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ JASC-PAL
55 57 65
202 204 210
84 63 30
0 0 0
185 236 253
12 changes: 6 additions & 6 deletions graphics/pokemon/xerneas/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
153 211 165
16 16 16
53 51 52
32 34 38
48 181 222
84 63 30
164 88 198
212 193 126
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 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 @@ -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

Expand Down
14 changes: 7 additions & 7 deletions src/data/graphics/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/data/object_events/object_event_pic_tables_followers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/data/pokemon/species_info/gen_4_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions src/data/pokemon/species_info/gen_6_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -5331,7 +5331,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.iconPalIndex = 0,
FOOTPRINT(Xerneas)
OVERWORLD(
sPicTable_XerneasNeutral,
sPicTable_XerneasActive,
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_FOOT,
Expand Down
12 changes: 6 additions & 6 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 @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading