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

SPECIES_DUDUNSPARCE_TWO_SEGMENT

Browse Source
This commit is contained in:
Eduardo Quezada 2023-10-23 11:45:15 -03:00
parent be921c57fc
commit 2e9e157cf8
19 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/constants/species.h
View File

@ -1520,7 +1520,8 @@
#define SPECIES_ANNIHILAPE GEN9_START + 74
#define SPECIES_CLODSIRE GEN9_START + 75
#define SPECIES_FARIGIRAF GEN9_START + 76
#define SPECIES_DUDUNSPARCE GEN9_START + 77
#define SPECIES_DUDUNSPARCE SPECIES_DUDUNSPARCE_TWO_SEGMENT
#define SPECIES_DUDUNSPARCE_TWO_SEGMENT GEN9_START + 77
#define SPECIES_KINGAMBIT GEN9_START + 78
#define SPECIES_GREAT_TUSK GEN9_START + 79
#define SPECIES_SCREAM_TAIL GEN9_START + 80

4
include/graphics.h
View File

@ -7927,9 +7927,9 @@ extern const u32 gMonBackPic_Farigiraf[];
extern const u32 gMonShinyPalette_Farigiraf[];
extern const u8 gMonIcon_Farigiraf[];
extern const u8 gMonFootprint_Farigiraf[];
extern const u32 gMonFrontPic_Dudunsparce[];
extern const u32 gMonFrontPic_DudunsparceTwoSegment[];
extern const u32 gMonPalette_Dudunsparce[];
extern const u32 gMonBackPic_Dudunsparce[];
extern const u32 gMonBackPic_DudunsparceTwoSegment[];
extern const u32 gMonShinyPalette_Dudunsparce[];
extern const u8 gMonIcon_Dudunsparce[];
extern const u8 gMonFootprint_Dudunsparce[];

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

@ -7944,13 +7944,14 @@ const u32 gMonShinyPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/
const u8 gMonIcon_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/icon.4bpp");
// const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/footprint.1bpp");
const u32 gMonFrontPic_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/front.4bpp.lz");
const u32 gMonPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/normal.gbapal.lz");
const u32 gMonBackPic_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/back.4bpp.lz");
const u32 gMonShinyPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/shiny.gbapal.lz");
const u8 gMonIcon_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/icon.4bpp");
// const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/footprint.1bpp");
const u32 gMonFrontPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/front.4bpp.lz");
const u32 gMonBackPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/back.4bpp.lz");
const u32 gMonFrontPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/front.4bpp.lz");
const u32 gMonBackPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/back.4bpp.lz");

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

@ -189,7 +189,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_TATSUGIRI_CURLY] = sTatsugiriFormSpeciesIdTable,
[SPECIES_TATSUGIRI_DROOPY] = sTatsugiriFormSpeciesIdTable,
[SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriFormSpeciesIdTable,
[SPECIES_DUDUNSPARCE] = sDudunsparceFormSpeciesIdTable,
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = sDudunsparceFormSpeciesIdTable,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceFormSpeciesIdTable,
[SPECIES_GIMMIGHOUL] = sGimmighoulFormSpeciesIdTable,
#endif
// Megas
@ -651,8 +652,6 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuFormSpeciesIdTable,
#endif
#if P_GEN_9_POKEMON == TRUE
// Dudunsparce
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceFormSpeciesIdTable,
// Gimmighoul
[SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulFormSpeciesIdTable,
#endif

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

@ -1350,7 +1350,7 @@ static const u16 sTatsugiriFormSpeciesIdTable[] = {
};
static const u16 sDudunsparceFormSpeciesIdTable[] = {
SPECIES_DUDUNSPARCE,
SPECIES_DUDUNSPARCE_TWO_SEGMENT,
SPECIES_DUDUNSPARCE_THREE_SEGMENT,
FORM_SPECIES_END,
};

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

@ -1001,7 +1001,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_ANNIHILAPE] = sAnnihilapeLevelUpLearnset,
[SPECIES_CLODSIRE] = sClodsireLevelUpLearnset,
[SPECIES_FARIGIRAF] = sFarigirafLevelUpLearnset,
[SPECIES_DUDUNSPARCE] = sDudunsparceLevelUpLearnset,
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = sDudunsparceLevelUpLearnset,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceLevelUpLearnset,
[SPECIES_KINGAMBIT] = sKingambitLevelUpLearnset,
[SPECIES_GREAT_TUSK] = sGreatTuskLevelUpLearnset,
[SPECIES_SCREAM_TAIL] = sScreamTailLevelUpLearnset,
@ -1490,8 +1491,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset,
#endif
#if P_GEN_9_POKEMON == TRUE
// Dudunsparce
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceLevelUpLearnset,
// Gimmighoul
[SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulLevelUpLearnset,
#endif

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

@ -26791,29 +26791,29 @@ const struct SpeciesInfo gSpeciesInfo[] =
.noFlip = FALSE,
},
#define DUDUNSPARCE_SPECIES_INFO \
{ \
.baseHP = 125, \
.baseAttack = 100, \
.baseDefense = 80, \
.baseSpeed = 55, \
.baseSpAttack = 85, \
.baseSpDefense = 75, \
.types = { TYPE_NORMAL, TYPE_NORMAL }, \
.catchRate = 45, \
.expYield = 182, \
.evYield_HP = 2, \
.genderRatio = PERCENT_FEMALE(50), \
.eggCycles = 20, \
.friendship = 50, \
.growthRate = GROWTH_MEDIUM_FAST, \
.eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FIELD}, \
#define DUDUNSPARCE_SPECIES_INFO \
{ \
.baseHP = 125, \
.baseAttack = 100, \
.baseDefense = 80, \
.baseSpeed = 55, \
.baseSpAttack = 85, \
.baseSpDefense = 75, \
.types = { TYPE_NORMAL, TYPE_NORMAL }, \
.catchRate = 45, \
.expYield = 182, \
.evYield_HP = 2, \
.genderRatio = PERCENT_FEMALE(50), \
.eggCycles = 20, \
.friendship = 50, \
.growthRate = GROWTH_MEDIUM_FAST, \
.eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FIELD}, \
.abilities = {ABILITY_SERENE_GRACE, ABILITY_RUN_AWAY, ABILITY_RATTLED}, \
.bodyColor = BODY_COLOR_YELLOW, \
.noFlip = FALSE, \
.bodyColor = BODY_COLOR_YELLOW, \
.noFlip = FALSE, \
}
[SPECIES_DUDUNSPARCE] = DUDUNSPARCE_SPECIES_INFO,
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = DUDUNSPARCE_SPECIES_INFO,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = DUDUNSPARCE_SPECIES_INFO,
[SPECIES_KINGAMBIT] =

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

@ -1001,7 +1001,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_ANNIHILAPE] = sAnnihilapeTeachableLearnset,
[SPECIES_CLODSIRE] = sClodsireTeachableLearnset,
[SPECIES_FARIGIRAF] = sFarigirafTeachableLearnset,
[SPECIES_DUDUNSPARCE] = sDudunsparceTeachableLearnset,
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = sDudunsparceTeachableLearnset,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceTeachableLearnset,
[SPECIES_KINGAMBIT] = sKingambitTeachableLearnset,
[SPECIES_GREAT_TUSK] = sGreatTuskTeachableLearnset,
[SPECIES_SCREAM_TAIL] = sScreamTailTeachableLearnset,
@ -1490,8 +1491,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleTeachableLearnset,
#endif
#if P_GEN_9_POKEMON == TRUE
// Dudunsparce
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceTeachableLearnset,
// Gimmighoul
[SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulTeachableLearnset,
#endif

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

@ -1027,7 +1027,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
[SPECIES_ANNIHILAPE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
[SPECIES_CLODSIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 },
[SPECIES_FARIGIRAF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_DUDUNSPARCE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
[SPECIES_KINGAMBIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 },

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

@ -1461,7 +1461,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(ANNIHILAPE, gMonBackPic_Annihilape),
SPECIES_SPRITE(CLODSIRE, gMonBackPic_Clodsire),
SPECIES_SPRITE(FARIGIRAF, gMonBackPic_Farigiraf),
SPECIES_SPRITE(DUDUNSPARCE, gMonBackPic_Dudunsparce),
SPECIES_SPRITE(DUDUNSPARCE_TWO_SEGMENT, gMonBackPic_DudunsparceTwoSegment),
SPECIES_SPRITE(DUDUNSPARCE_THREE_SEGMENT, gMonBackPic_DudunsparceThreeSegment),
SPECIES_SPRITE(KINGAMBIT, gMonBackPic_Kingambit),
SPECIES_SPRITE(GREAT_TUSK, gMonBackPic_GreatTusk),

3
src/data/pokemon_graphics/footprint_table.h
View File

@ -994,7 +994,8 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] =
//[SPECIES_ANNIHILAPE] = gMonFootprint_Annihilape,
//[SPECIES_CLODSIRE] = gMonFootprint_Clodsire,
//[SPECIES_FARIGIRAF] = gMonFootprint_Farigiraf,
//[SPECIES_DUDUNSPARCE] = gMonFootprint_Dudunsparce,
//[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = gMonFootprint_Dudunsparce,
//[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = gMonFootprint_Dudunsparce,
//[SPECIES_KINGAMBIT] = gMonFootprint_Kingambit,
//[SPECIES_GREAT_TUSK] = gMonFootprint_GreatTusk,
//[SPECIES_SCREAM_TAIL] = gMonFootprint_ScreamTail,

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

@ -13110,7 +13110,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] =
[SPECIES_ANNIHILAPE] = sAnims_Annihilape,
[SPECIES_CLODSIRE] = sAnims_Clodsire,
[SPECIES_FARIGIRAF] = sAnims_Farigiraf,
[SPECIES_DUDUNSPARCE] = sAnims_Dudunsparce,
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = sAnims_Dudunsparce,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sAnims_Dudunsparce,
[SPECIES_KINGAMBIT] = sAnims_Kingambit,
[SPECIES_GREAT_TUSK] = sAnims_GreatTusk,
[SPECIES_SCREAM_TAIL] = sAnims_ScreamTail,
@ -13501,7 +13502,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] =
[SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion,
#endif
#if P_GEN_9_POKEMON == TRUE
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sAnims_Dudunsparce,
[SPECIES_GIMMIGHOUL_ROAMING] = sAnims_Gimmighoul,
#endif
[SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sAnims_TaurosPaldean,

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

@ -1005,7 +1005,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
[SPECIES_ANNIHILAPE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_CLODSIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 },
[SPECIES_FARIGIRAF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_DUDUNSPARCE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_KINGAMBIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },

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

@ -1459,7 +1459,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(ANNIHILAPE, gMonFrontPic_Annihilape),
SPECIES_SPRITE(CLODSIRE, gMonFrontPic_Clodsire),
SPECIES_SPRITE(FARIGIRAF, gMonFrontPic_Farigiraf),
SPECIES_SPRITE(DUDUNSPARCE, gMonFrontPic_Dudunsparce),
SPECIES_SPRITE(DUDUNSPARCE_TWO_SEGMENT, gMonFrontPic_DudunsparceTwoSegment),
SPECIES_SPRITE(DUDUNSPARCE_THREE_SEGMENT, gMonFrontPic_DudunsparceThreeSegment),
SPECIES_SPRITE(KINGAMBIT, gMonFrontPic_Kingambit),
SPECIES_SPRITE(GREAT_TUSK, gMonFrontPic_GreatTusk),

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

@ -1459,7 +1459,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] =
SPECIES_PAL(ANNIHILAPE, gMonPalette_Annihilape),
SPECIES_PAL(CLODSIRE, gMonPalette_Clodsire),
SPECIES_PAL(FARIGIRAF, gMonPalette_Farigiraf),
SPECIES_PAL(DUDUNSPARCE, gMonPalette_Dudunsparce),
SPECIES_PAL(DUDUNSPARCE_TWO_SEGMENT, gMonPalette_Dudunsparce),
SPECIES_PAL(DUDUNSPARCE_THREE_SEGMENT, gMonPalette_Dudunsparce),
SPECIES_PAL(KINGAMBIT, gMonPalette_Kingambit),
SPECIES_PAL(GREAT_TUSK, gMonPalette_GreatTusk),

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

@ -1458,7 +1458,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] =
SPECIES_SHINY_PAL(ANNIHILAPE, gMonShinyPalette_Annihilape),
SPECIES_SHINY_PAL(CLODSIRE, gMonShinyPalette_Clodsire),
SPECIES_SHINY_PAL(FARIGIRAF, gMonShinyPalette_Farigiraf),
SPECIES_SHINY_PAL(DUDUNSPARCE, gMonShinyPalette_Dudunsparce),
SPECIES_SHINY_PAL(DUDUNSPARCE_TWO_SEGMENT, gMonShinyPalette_Dudunsparce),
SPECIES_SHINY_PAL(DUDUNSPARCE_THREE_SEGMENT, gMonShinyPalette_Dudunsparce),
SPECIES_SHINY_PAL(KINGAMBIT, gMonShinyPalette_Kingambit),
SPECIES_SHINY_PAL(GREAT_TUSK, gMonShinyPalette_GreatTusk),

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

@ -1000,7 +1000,8 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_ANNIHILAPE] = _("Annihilape"),
[SPECIES_CLODSIRE] = _("Clodsire"),
[SPECIES_FARIGIRAF] = _("Farigiraf"),
[SPECIES_DUDUNSPARCE] = _("Dudunsparc"),
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = _("Dudunsparc"),
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = _("Dudunsparc"),
[SPECIES_KINGAMBIT] = _("Kingambit"),
[SPECIES_GREAT_TUSK] = _("Great Tusk"),
[SPECIES_SCREAM_TAIL] = _("Scream Tai"),
@ -1492,8 +1493,6 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"),
#endif
#if P_GEN_9_POKEMON == TRUE
// Dudunsparce
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = _("Dudunsparc"),
// Gimmighoul
[SPECIES_GIMMIGHOUL_ROAMING] = _("Gimmighoul"),
#endif

6
src/pokemon.c
View File

@ -1354,6 +1354,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(CLODSIRE),
SPECIES_TO_NATIONAL(FARIGIRAF),
SPECIES_TO_NATIONAL(DUDUNSPARCE),
[SPECIES_DUDUNSPARCE_THREE_SEGMENT - 1] = NATIONAL_DEX_DUDUNSPARCE,
SPECIES_TO_NATIONAL(KINGAMBIT),
SPECIES_TO_NATIONAL(GREAT_TUSK),
SPECIES_TO_NATIONAL(SCREAM_TAIL),
@ -1841,8 +1842,6 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU,
#endif
#if P_GEN_9_POKEMON == TRUE
// Dudunsparce
[SPECIES_DUDUNSPARCE_THREE_SEGMENT - 1] = NATIONAL_DEX_DUDUNSPARCE,
// Gimmighoul
[SPECIES_GIMMIGHOUL_ROAMING - 1] = NATIONAL_DEX_GIMMIGHOUL,
#endif
@ -3145,7 +3144,8 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_ANNIHILAPE - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_CLODSIRE - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_FARIGIRAF - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_DUDUNSPARCE - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_DUDUNSPARCE_TWO_SEGMENT - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_KINGAMBIT - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_GREAT_TUSK - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_SCREAM_TAIL - 1] = ANIM_V_SQUISH_AND_BOUNCE,

5
src/pokemon_icon.c
View File

@ -1418,7 +1418,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
[SPECIES_ANNIHILAPE] = gMonIcon_Annihilape,
[SPECIES_CLODSIRE] = gMonIcon_Clodsire,
[SPECIES_FARIGIRAF] = gMonIcon_Farigiraf,
[SPECIES_DUDUNSPARCE] = gMonIcon_Dudunsparce,
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = gMonIcon_Dudunsparce,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = gMonIcon_Dudunsparce,
[SPECIES_KINGAMBIT] = gMonIcon_Kingambit,
[SPECIES_GREAT_TUSK] = gMonIcon_GreatTusk,
@ -2802,7 +2802,8 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ANNIHILAPE] = 0,
[SPECIES_CLODSIRE] = 2,
[SPECIES_FARIGIRAF] = 0,
[SPECIES_DUDUNSPARCE] = 0,
[SPECIES_DUDUNSPARCE_TWO_SEGMENT] = 0,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = 0,
[SPECIES_KINGAMBIT] = 3,
[SPECIES_GREAT_TUSK] = 0,
[SPECIES_SCREAM_TAIL] = 0,