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

Fixed Xerneas

Browse source
This commit is contained in:
Hedara 2024-08-06 16:52:42 +02:00
parent 29bb658d1b
commit a9492f5b1c
11 changed files with 57 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 55 57 65
202 204 210 202 204 210
84 63 30 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 16
153 211 165 153 211 165
16 16 16 16 16 16
53 51 52 32 34 38
48 181 222 48 181 222
84 63 30 84 63 30
164 88 198 164 88 198
@ -11,9 +11,9 @@ JASC-PAL
139 138 111 139 138 111
218 52 55 218 52 55
255 208 67 255 208 67
25 134 171 55 64 205
38 199 254 92 123 216
224 224 224 55 57 65
202 204 210 202 204 210
119 117 119 84 63 30
0 0 0 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 $(POKEMONGFXDIR)/xerneas/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8 $(GFX) $< $@ -mwidth 8 -mheight 8
$(POKEMONGFXDIR)/xerneas/active/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8
$(POKEMONGFXDIR)/yveltal/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/yveltal/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8 $(GFX) $< $@ -mwidth 8 -mheight 8

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

@ -15939,7 +15939,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u32 gMonShinyPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/shiny.gbapal.lz"); 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"); const u8 gMonIcon_XerneasActive[] = INCBIN_U8("graphics/pokemon/xerneas/active/icon.4bpp");
#if OW_POKEMON_OBJECT_EVENTS #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 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
//const u32 gOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_normal.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"); //const u32 gShinyOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_shiny.gbapal.lz");

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[] = { static const struct SpriteFrameImage sPicTable_XerneasNeutral[] = {
overworld_ascending_frames(gObjectEventPic_XerneasNeutral, 4, 4), 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), overworld_ascending_frames(gObjectEventPic_XerneasActive, 4, 4),
};*/ };
#endif //P_FAMILY_XERNEAS #endif //P_FAMILY_XERNEAS
#if P_FAMILY_YVELTAL #if P_FAMILY_YVELTAL

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

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