ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

enamorus_t cry, basculegionf sprite, new typhlosion back sprite

Browse Source
This commit is contained in:
Alex 2023-02-23 15:20:12 +01:00
parent a86b870cfd
commit a870ec3c22
27 changed files with 172 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pokemon/basculegion/female/back.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 633 B

BIN
graphics/pokemon/basculegion/female/front.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 928 B

0
graphics/pokemon/basculegion/iconf.png → graphics/pokemon/basculegion/female/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 474 B

19
graphics/pokemon/basculegion/female/normal.pal Executable file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
48 140 88
16 16 16
16 64 32
120 168 168
64 80 80
232 228 176
96 60 40
32 48 56
168 220 224
32 96 56
96 96 96
224 228 224
160 164 160
40 92 120
224 240 232

19
graphics/pokemon/basculegion/female/shiny.pal Executable file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
96 147 49
16 16 16
16 64 32
164 152 77
79 108 60
232 228 176
96 60 40
32 48 56
222 208 114
79 108 60
96 96 96
224 228 224
160 164 160
115 99 68
249 236 166

BIN
graphics/pokemon/typhlosion/hisuian/back.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 932 B

5
include/constants/species.h
View File

@ -1368,8 +1368,11 @@
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328
// Basculegion
#define SPECIES_BASCULEGION_FEMALE FORMS_START + 329
#define FORMS_START SPECIES_ENAMORUS
#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1
#define SPECIES_EGG SPECIES_BASCULEGION_FEMALE + 1
#define NUM_SPECIES SPECIES_EGG

10
include/graphics.h
View File

@ -990,7 +990,7 @@ extern const u32 gMonFrontPic_Wyrdeer[];
extern const u32 gMonFrontPic_Kleavor[];
extern const u32 gMonFrontPic_Ursaluna[];
extern const u32 gMonFrontPic_Basculegion[];
//extern const u32 gMonFrontPic_BasculegionF[];
extern const u32 gMonFrontPic_BasculegionF[];
extern const u32 gMonFrontPic_Sneasler[];
extern const u32 gMonFrontPic_Overqwil[];
extern const u32 gMonFrontPic_Enamorus[];
@ -2204,7 +2204,7 @@ extern const u32 gMonBackPic_Wyrdeer[];
extern const u32 gMonBackPic_Kleavor[];
extern const u32 gMonBackPic_Ursaluna[];
extern const u32 gMonBackPic_Basculegion[];
//extern const u32 gMonBackPic_BasculegionF[];
extern const u32 gMonBackPic_BasculegionF[];
extern const u32 gMonBackPic_Sneasler[];
extern const u32 gMonBackPic_Overqwil[];
extern const u32 gMonBackPic_Enamorus[];
@ -3410,7 +3410,7 @@ extern const u32 gMonPalette_Wyrdeer[];
extern const u32 gMonPalette_Kleavor[];
extern const u32 gMonPalette_Ursaluna[];
extern const u32 gMonPalette_Basculegion[];
//extern const u32 gMonPalette_BasculegionF[];
extern const u32 gMonPalette_BasculegionF[];
extern const u32 gMonPalette_Sneasler[];
extern const u32 gMonPalette_Overqwil[];
extern const u32 gMonPalette_Enamorus[];
@ -4643,7 +4643,7 @@ extern const u32 gMonShinyPalette_Wyrdeer[];
extern const u32 gMonShinyPalette_Kleavor[];
extern const u32 gMonShinyPalette_Ursaluna[];
extern const u32 gMonShinyPalette_Basculegion[];
//extern const u32 gMonShinyPalette_BasculegionF[];
extern const u32 gMonShinyPalette_BasculegionF[];
extern const u32 gMonShinyPalette_Sneasler[];
extern const u32 gMonShinyPalette_Overqwil[];
extern const u32 gMonShinyPalette_Enamorus[];
@ -4947,7 +4947,7 @@ extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[];
extern const u32 gMonShinyPalette_ZarudeDada[];
extern const u32 gMonShinyPalette_CalyrexIceRider[];
extern const u32 gMonShinyPalette_CalyrexShadowRider[];
//extern const u32 gMonShinyPalette_EnamorusTherian[];
extern const u32 gMonShinyPalette_EnamorusTherian[];
#endif
extern const u8 gMonIcon_QuestionMark[];

4
sound/cry_tables.inc
View File

@ -1749,7 +1749,7 @@ gCryTable::
cry Cry_TornadusTherian
cry Cry_ThundurusTherian
cry Cry_LandorusTherian
cry Cry_Bulbasaur //Cry_EnamorusTherian
cry Cry_EnamorusTherian
@ Kyurem
cry Cry_KyuremWhite
cry Cry_KyuremBlack
@ -3862,7 +3862,7 @@ gCryTable_Reverse::
cry_reverse Cry_TornadusTherian
cry_reverse Cry_ThundurusTherian
cry_reverse Cry_LandorusTherian
cry_reverse Cry_Bulbasaur //Cry_EnamorusTherian
cry_reverse Cry_EnamorusTherian
@ Kyurem
cry_reverse Cry_KyuremWhite
cry_reverse Cry_KyuremBlack

3
sound/direct_sound_data.inc
View File

@ -4360,11 +4360,10 @@ Cry_CalyrexIceRider::
Cry_CalyrexShadowRider::
.incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin"
/*
.align 2
Cry_EnamorusTherian::
.incbin "sound/direct_sound_samples/cries/enamorus_therian.bin"
*/
.endif
.align 2

BIN
sound/direct_sound_samples/cries/enamorus_therian.aif Normal file
View File

Binary file not shown.

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

@ -923,7 +923,7 @@ const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4b
const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz");
const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz");
const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz");
//const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/frontf.4bpp.lz");
const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz");
const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz");
const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz");
const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz");
@ -2135,7 +2135,7 @@ const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp
const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz");
const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz");
const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz");
//const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/backf.4bpp.lz");
const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/female/back.4bpp.lz");
const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz");
const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz");
const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz");
@ -3341,7 +3341,7 @@ const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gb
const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz");
const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz");
const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz");
//const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/normalf.gbapal.lz");
const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz");
const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz");
const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz");
const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz");
@ -4574,7 +4574,7 @@ const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shin
const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz");
const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz");
const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz");
//const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/shinyf.gbapal.lz");
const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/female/shiny.gbapal.lz");
const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz");
const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz");
const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz");
@ -4878,7 +4878,7 @@ const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/poke
const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/shiny.gbapal.lz");
const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz");
const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz");
//const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz");
const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz");
#endif
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
@ -5801,7 +5801,7 @@ const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/icon.4bpp");
const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/icon.4bpp");
const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/icon.4bpp");
const u8 gMonIcon_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp");
const u8 gMonIcon_BasculegionF[] = INCBIN_U8("graphics/pokemon/basculegion/iconf.4bpp");
const u8 gMonIcon_BasculegionF[] = INCBIN_U8("graphics/pokemon/basculegion/female/icon.4bpp");
const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp");
const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp");
const u8 gMonIcon_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp");

3
src/data/pokemon/form_species_table_pointers.h
View File

@ -171,6 +171,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable,
[SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable,
[SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable,
[SPECIES_BASCULEGION] = sBasculegionFormSpeciesIdTable,
#endif
// Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable,
@ -590,5 +591,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFormSpeciesIdTable,
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable,
// Basculegion
[SPECIES_BASCULEGION_FEMALE] = sBasculegionFormSpeciesIdTable,
#endif
};

6
src/data/pokemon/form_species_tables.h
View File

@ -1145,4 +1145,10 @@ static const u16 sEnamorusFormSpeciesIdTable[] = {
FORM_SPECIES_END,
};
static const u16 sBasculegionFormSpeciesIdTable[] = {
SPECIES_BASCULEGION,
SPECIES_BASCULEGION_FEMALE,
FORM_SPECIES_END,
};
#endif

1
src/data/pokemon/level_up_learnset_pointers.h
View File

@ -1334,5 +1334,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset,
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset,
[SPECIES_BASCULEGION_FEMALE] = sBasculegionLevelUpLearnset,
#endif
};

25
src/data/pokemon/species_info.h
View File

@ -20946,7 +20946,29 @@ const struct SpeciesInfo gSpeciesInfo[] =
.catchRate = 25,
.expYield = 186,
.evYield_HP = 2,
.genderRatio = PERCENT_FEMALE(50),
.genderRatio = MON_MALE,
.eggCycles = 40,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_WATER_2, EGG_GROUP_WATER_2},
.abilities = {ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER},
.bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE,
},
[SPECIES_BASCULEGION_FEMALE] =
{
.baseHP = 120,
.baseAttack = 92,
.baseDefense = 65,
.baseSpeed = 78,
.baseSpAttack = 100,
.baseSpDefense = 75,
.types = { TYPE_WATER, TYPE_GHOST},
.catchRate = 25,
.expYield = 186,
.evYield_HP = 2,
.genderRatio = MON_FEMALE,
.eggCycles = 40,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
@ -20954,7 +20976,6 @@ const struct SpeciesInfo gSpeciesInfo[] =
.abilities = {ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER},
.bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE,
.flags = SPECIES_FLAG_GENDER_DIFFERENCE,
},
[SPECIES_SNEASLER] =

1
src/data/pokemon/teachable_learnset_pointers.h
View File

@ -1334,5 +1334,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderTeachableLearnset,
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset,
[SPECIES_BASCULEGION_FEMALE] = sBasculegionTeachableLearnset,
#endif
};

4
src/data/pokemon_graphics/back_pic_coordinates.h
View File

@ -518,7 +518,7 @@ const struct MonCoords gMonBackPicCoords[] =
[SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SHAYMIN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 },
[SPECIES_ARCEUS] = ARCEUS_BACK_PIC_COORDS,
#endif
#endif
#if P_GEN_5_POKEMON == TRUE
[SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 7 },
[SPECIES_SNIVY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 },
@ -1356,6 +1356,8 @@ const struct MonCoords gMonBackPicCoords[] =
[SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 },
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Basculegion
[SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
[SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 },
};

2
src/data/pokemon_graphics/back_pic_table.h
View File

@ -1360,6 +1360,6 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF),
SPECIES_SPRITE(BASCULEGION, gMonBackPic_BasculegionF),
#endif
};

1
src/data/pokemon_graphics/front_pic_anims.h
View File

@ -12906,6 +12906,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
[SPECIES_CALYREX_ICE_RIDER] = sAnims_Calyrex,
[SPECIES_CALYREX_SHADOW_RIDER] = sAnims_Calyrex,
[SPECIES_ENAMORUS_THERIAN] = sAnims_EnamorusTherian,
[SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion,
#endif
[SPECIES_EGG] = sAnims_Egg,
};

134
src/data/pokemon_graphics/front_pic_coordinates.h
View File

@ -920,7 +920,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_ENAMORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
// Megas
// Megas
[SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
[SPECIES_CHARIZARD_MEGA_X] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_CHARIZARD_MEGA_Y] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
@ -974,11 +974,11 @@ const struct MonCoords gMonFrontPicCoords[] =
#if P_GEN_6_POKEMON == TRUE
[SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
// Special Mega + Primals
// Special Mega + Primals
[SPECIES_RAYQUAZA_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_KYOGRE_PRIMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_GROUDON_PRIMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Alolan Forms
// Alolan Forms
[SPECIES_RATTATA_ALOLAN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 },
[SPECIES_RATICATE_ALOLAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 },
[SPECIES_RAICHU_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
@ -997,7 +997,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_MUK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
[SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
// Galarian Forms
// Galarian Forms
[SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PONYTA_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 },
[SPECIES_RAPIDASH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
@ -1042,15 +1042,15 @@ const struct MonCoords gMonFrontPicCoords[] =
#if P_GEN_7_POKEMON == TRUE
[SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
// Misc Forms
// Cosplay Pikachu
// Misc Forms
// Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_ROCK_STAR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_BELLE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_POP_STAR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_PH_D] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_LIBRE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
// Cap Pikachu
// Cap Pikachu
[SPECIES_PIKACHU_ORIGINAL_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_HOENN_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_SINNOH_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
@ -1059,9 +1059,9 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_PIKACHU_ALOLA_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_PARTNER_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
[SPECIES_PIKACHU_WORLD_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 },
// Pichu
// Pichu
[SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 },
// Unown
// Unown
[SPECIES_UNOWN_B] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 16 },
[SPECIES_UNOWN_C] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 },
[SPECIES_UNOWN_D] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 },
@ -1089,40 +1089,40 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_UNOWN_Z] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 16 },
[SPECIES_UNOWN_EMARK] = { .size = MON_COORDS_SIZE(24, 40), .y_offset = 15 },
[SPECIES_UNOWN_QMARK] = { .size = MON_COORDS_SIZE(24, 40), .y_offset = 13 },
// Castform
// Castform
[SPECIES_CASTFORM_SUNNY] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 },
[SPECIES_CASTFORM_RAINY] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 },
[SPECIES_CASTFORM_SNOWY] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 8 },
// Deoxys
// Deoxys
[SPECIES_DEOXYS_ATTACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_DEOXYS_DEFENSE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
[SPECIES_DEOXYS_SPEED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
#if P_GEN_4_POKEMON == TRUE
// Burmy
// Burmy
[SPECIES_BURMY_SANDY_CLOAK] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 12 },
[SPECIES_BURMY_TRASH_CLOAK] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 8 },
// Wormadam
// Wormadam
[SPECIES_WORMADAM_SANDY_CLOAK] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 10 },
[SPECIES_WORMADAM_TRASH_CLOAK] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 10 },
// Cherrim
// Cherrim
[SPECIES_CHERRIM_SUNSHINE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 },
// Shellos
// Shellos
[SPECIES_SHELLOS_EAST_SEA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 },
// Gastrodon
// Gastrodon
[SPECIES_GASTRODON_EAST_SEA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 },
// Rotom
// Rotom
[SPECIES_ROTOM_HEAT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 },
[SPECIES_ROTOM_WASH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 },
[SPECIES_ROTOM_FROST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
[SPECIES_ROTOM_FAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 },
[SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 12 },
// Origin Forme
// Origin Forme
[SPECIES_DIALGA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_PALKIA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Shaymin
// Shaymin
[SPECIES_SHAYMIN_SKY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 },
// Arceus
// Arceus
[SPECIES_ARCEUS_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_ARCEUS_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_ARCEUS_POISON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
@ -1142,42 +1142,42 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_ARCEUS_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
#if P_GEN_5_POKEMON == TRUE
// Basculin
// Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 16 },
[SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 10 },
// Darmanitan
// Darmanitan
[SPECIES_DARMANITAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 },
[SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 },
// Deerling
// Deerling
[SPECIES_DEERLING_SUMMER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 },
[SPECIES_DEERLING_AUTUMN] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 },
[SPECIES_DEERLING_WINTER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 },
// Sawsbuck
// Sawsbuck
[SPECIES_SAWSBUCK_SUMMER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SAWSBUCK_AUTUMN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SAWSBUCK_WINTER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
// Therian Forms
// Therian Forms
[SPECIES_TORNADUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_THUNDURUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
[SPECIES_LANDORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Kyurem
// Kyurem
[SPECIES_KYUREM_WHITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_KYUREM_BLACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Keldeo
// Keldeo
[SPECIES_KELDEO_RESOLUTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
// Meloetta
// Meloetta
[SPECIES_MELOETTA_PIROUETTE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 2 },
// Genesect
// Genesect
[SPECIES_GENESECT_DOUSE_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
[SPECIES_GENESECT_SHOCK_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
[SPECIES_GENESECT_BURN_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
[SPECIES_GENESECT_CHILL_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
#endif
#if P_GEN_6_POKEMON == TRUE
// Greninja
// Greninja
[SPECIES_GRENINJA_BATTLE_BOND] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 },
[SPECIES_GRENINJA_ASH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Vivillon
// Vivillon
[SPECIES_VIVILLON_POLAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_VIVILLON_TUNDRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_VIVILLON_CONTINENTAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
@ -1197,23 +1197,23 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_VIVILLON_JUNGLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_VIVILLON_FANCY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_VIVILLON_POKE_BALL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Flabébé
// Flabébé
[SPECIES_FLABEBE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 },
[SPECIES_FLABEBE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 },
[SPECIES_FLABEBE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 },
[SPECIES_FLABEBE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 },
// Floette
// Floette
[SPECIES_FLOETTE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 },
[SPECIES_FLOETTE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 },
[SPECIES_FLOETTE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 },
[SPECIES_FLOETTE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 },
[SPECIES_FLOETTE_ETERNAL_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
// Florges
// Florges
[SPECIES_FLORGES_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_FLORGES_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_FLORGES_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_FLORGES_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Furfrou
// Furfrou
[SPECIES_FURFROU_HEART_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 },
[SPECIES_FURFROU_STAR_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 },
[SPECIES_FURFROU_DIAMOND_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 },
@ -1223,41 +1223,41 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_FURFROU_LA_REINE_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 },
[SPECIES_FURFROU_KABUKI_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 },
[SPECIES_FURFROU_PHARAOH_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 },
// Meowstic
// Meowstic
[SPECIES_MEOWSTIC_FEMALE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 },
// Aegislash
// Aegislash
[SPECIES_AEGISLASH_BLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Pumpkaboo
// Pumpkaboo
[SPECIES_PUMPKABOO_SMALL] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 },
[SPECIES_PUMPKABOO_LARGE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 },
[SPECIES_PUMPKABOO_SUPER] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 },
// Gourgeist
// Gourgeist
[SPECIES_GOURGEIST_SMALL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 5 },
[SPECIES_GOURGEIST_LARGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
[SPECIES_GOURGEIST_SUPER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Xerneas
// Xerneas
[SPECIES_XERNEAS_ACTIVE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Zygarde
// Zygarde
[SPECIES_ZYGARDE_10] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 },
[SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 },
[SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_ZYGARDE_COMPLETE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Hoopa
// Hoopa
[SPECIES_HOOPA_UNBOUND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
#if P_GEN_7_POKEMON == TRUE
// Oricorio
// Oricorio
[SPECIES_ORICORIO_POM_POM] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 },
[SPECIES_ORICORIO_PAU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 },
[SPECIES_ORICORIO_SENSU] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 },
// Rockruff
// Rockruff
[SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 },
// Lycanroc
// Lycanroc
[SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 },
[SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
// Wishiwashi
// Wishiwashi
[SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
// Silvally
// Silvally
[SPECIES_SILVALLY_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_POISON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
@ -1275,7 +1275,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_SILVALLY_DRAGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_DARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Minior
// Minior
[SPECIES_MINIOR_METEOR_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
[SPECIES_MINIOR_METEOR_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
[SPECIES_MINIOR_METEOR_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
@ -1289,26 +1289,26 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
[SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
[SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
// Mimikyu
// Mimikyu
[SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 },
// Necrozma
// Necrozma
[SPECIES_NECROZMA_DUSK_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_NECROZMA_DAWN_WINGS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_NECROZMA_ULTRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Magearna
// Magearna
[SPECIES_MAGEARNA_ORIGINAL_COLOR] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
#endif
#if P_GEN_8_POKEMON == TRUE
// Cramorant
// Cramorant
[SPECIES_CRAMORANT_GULPING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_CRAMORANT_GORGING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Toxtricity
// Toxtricity
[SPECIES_TOXTRICITY_LOW_KEY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 },
// Sinistea
// Sinistea
[SPECIES_SINISTEA_ANTIQUE] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 17 },
// Polteageist
// Polteageist
[SPECIES_POLTEAGEIST_ANTIQUE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 },
// Alcremie
// Alcremie
[SPECIES_ALCREMIE_RUBY_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 },
[SPECIES_ALCREMIE_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 },
[SPECIES_ALCREMIE_MINT_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 },
@ -1317,28 +1317,30 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_ALCREMIE_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 },
[SPECIES_ALCREMIE_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 },
[SPECIES_ALCREMIE_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 },
// Eiscue
// Eiscue
[SPECIES_EISCUE_NOICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 },
// Indeedee
// Indeedee
[SPECIES_INDEEDEE_FEMALE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 },
// Morpeko
// Morpeko
[SPECIES_MORPEKO_HANGRY] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 },
// Zacian
// Zacian
[SPECIES_ZACIAN_CROWNED_SWORD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Zamazenta
// Zamazenta
[SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
// Eternatus
// Eternatus
[SPECIES_ETERNATUS_ETERNAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
// Urshifu
// Urshifu
[SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
// Zarude
// Zarude
[SPECIES_ZARUDE_DADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
// Calyrex
// Calyrex
[SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Basculegion
[SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
// Egg
// Egg
[SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 },
};

2
src/data/pokemon_graphics/front_pic_table.h
View File

@ -1359,6 +1359,6 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
#endif
#if P_GEN_7_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculegionF),
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_BasculegionF),
#endif
};

2
src/data/pokemon_graphics/palette_table.h
View File

@ -1359,6 +1359,6 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] =
SPECIES_PAL(PYROAR, gMonPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF),
SPECIES_PAL(BASCULEGION, gMonPalette_BasculegionF),
#endif
};

4
src/data/pokemon_graphics/shiny_palette_table.h
View File

@ -1329,7 +1329,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(CALYREX_ICE_RIDER, gMonShinyPalette_CalyrexIceRider),
SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_EnamorusTherian),
#endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
};
@ -1358,6 +1358,6 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF),
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_BasculegionF),
#endif
};

1
src/data/text/species_names.h
View File

@ -1336,5 +1336,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
// Calyrex
[SPECIES_CALYREX_ICE_RIDER] = _("Calyrex"),
[SPECIES_CALYREX_SHADOW_RIDER] = _("Calyrex"),
[SPECIES_BASCULEGION_FEMALE] = _("Bsculegion"),
#endif
};

1
src/pokemon.c
View File

@ -1670,6 +1670,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX,
[SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX,
[SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS,
[SPECIES_BASCULEGION_FEMALE - 1] = NATIONAL_DEX_BASCULEGION,
#endif
};

4
src/pokemon_icon.c
View File

@ -1293,6 +1293,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider,
[SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider,
[SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian,
[SPECIES_BASCULEGION_FEMALE] = gMonIcon_BasculegionF,
#endif
[SPECIES_EGG] = gMonIcon_Egg,
};
@ -1326,7 +1327,7 @@ const u8 *const gMonIconTableFemale[] =
[SPECIES_PYROAR] = gMonIcon_PyroarF,
#endif
#if P_GEN_8_POKEMON == TRUE
[SPECIES_BASCULEGION] = gMonIcon_BasculegionF,
[SPECIES_BASCULEGION] = gMonIcon_Basculegion,
#endif
};
@ -2542,6 +2543,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_CALYREX_ICE_RIDER] = 0,
[SPECIES_CALYREX_SHADOW_RIDER] = 0,
[SPECIES_ENAMORUS_THERIAN] = 1,
[SPECIES_BASCULEGION_FEMALE] = 1,
#endif
[SPECIES_EGG] = 1,
};