From 82bb758d19b7273edab0a7839114e0c7b47324f7 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 23 Oct 2023 11:08:06 -0300 Subject: [PATCH] SPECIES_PALAFIN_ZERO --- include/constants/species.h | 3 ++- include/graphics.h | 10 +++++----- src/data/graphics/pokemon.h | 11 +++++------ src/data/pokemon/evolution.h | 2 +- src/data/pokemon/form_species_table_pointers.h | 2 +- src/data/pokemon/form_species_tables.h | 2 +- src/data/pokemon/level_up_learnset_pointers.h | 5 ++--- src/data/pokemon/species_info.h | 2 +- src/data/pokemon/teachable_learnset_pointers.h | 5 ++--- src/data/pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/back_pic_table.h | 2 +- src/data/pokemon_graphics/footprint_table.h | 3 ++- src/data/pokemon_graphics/front_pic_anims.h | 4 ++-- src/data/pokemon_graphics/front_pic_coordinates.h | 3 ++- src/data/pokemon_graphics/front_pic_table.h | 2 +- src/data/pokemon_graphics/palette_table.h | 2 +- src/data/pokemon_graphics/shiny_palette_table.h | 2 +- src/data/text/species_names.h | 5 ++--- src/pokemon.c | 6 +++--- src/pokemon_icon.c | 5 +++-- 20 files changed, 39 insertions(+), 39 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index 57dab7f532..2f607b4c6a 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1500,7 +1500,8 @@ #define SPECIES_WUGTRIO GEN9_START + 56 #define SPECIES_BOMBIRDIER GEN9_START + 57 #define SPECIES_FINIZEN GEN9_START + 58 -#define SPECIES_PALAFIN GEN9_START + 59 +#define SPECIES_PALAFIN SPECIES_PALAFIN_ZERO +#define SPECIES_PALAFIN_ZERO GEN9_START + 59 #define SPECIES_VAROOM GEN9_START + 60 #define SPECIES_REVAVROOM GEN9_START + 61 #define SPECIES_CYCLIZAR GEN9_START + 62 diff --git a/include/graphics.h b/include/graphics.h index f792ca862a..078cf2fe51 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -7803,11 +7803,11 @@ extern const u32 gMonBackPic_Finizen[]; extern const u32 gMonShinyPalette_Finizen[]; extern const u8 gMonIcon_Finizen[]; extern const u8 gMonFootprint_Finizen[]; -extern const u32 gMonFrontPic_Palafin[]; -extern const u32 gMonPalette_Palafin[]; -extern const u32 gMonBackPic_Palafin[]; -extern const u32 gMonShinyPalette_Palafin[]; -extern const u8 gMonIcon_Palafin[]; +extern const u32 gMonFrontPic_PalafinZero[]; +extern const u32 gMonPalette_PalafinZero[]; +extern const u32 gMonBackPic_PalafinZero[]; +extern const u32 gMonShinyPalette_PalafinZero[]; +extern const u8 gMonIcon_PalafinZero[]; extern const u8 gMonFootprint_PalafinHero[]; extern const u32 gMonFrontPic_PalafinHero[]; extern const u32 gMonPalette_PalafinHero[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index f3cc2edfea..ee4a295e73 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -7800,11 +7800,11 @@ const u32 gMonShinyPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/shin const u8 gMonIcon_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/icon.4bpp"); // const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/footprint.1bpp"); -const u32 gMonFrontPic_Palafin[] = INCBIN_U32("graphics/pokemon/palafin/front.4bpp.lz"); -const u32 gMonPalette_Palafin[] = INCBIN_U32("graphics/pokemon/palafin/normal.gbapal.lz"); -const u32 gMonBackPic_Palafin[] = INCBIN_U32("graphics/pokemon/palafin/back.4bpp.lz"); -const u32 gMonShinyPalette_Palafin[] = INCBIN_U32("graphics/pokemon/palafin/shiny.gbapal.lz"); -const u8 gMonIcon_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/icon.4bpp"); +const u32 gMonFrontPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/front.4bpp.lz"); +const u32 gMonPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/normal.gbapal.lz"); +const u32 gMonBackPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/back.4bpp.lz"); +const u32 gMonShinyPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/shiny.gbapal.lz"); +const u8 gMonIcon_PalafinZero[] = INCBIN_U8("graphics/pokemon/palafin/icon.4bpp"); // const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp"); const u32 gMonFrontPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/front.4bpp.lz"); @@ -7812,7 +7812,6 @@ const u32 gMonPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/ const u32 gMonBackPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/back.4bpp.lz"); const u32 gMonShinyPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/shiny.gbapal.lz"); const u8 gMonIcon_PalafinHero[] = INCBIN_U8("graphics/pokemon/palafin/hero/icon.4bpp"); -// const u8 gMonFootprint_PalafinHero[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp"); const u32 gMonFrontPic_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/front.4bpp.lz"); const u32 gMonPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/normal.gbapal.lz"); diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 879f86f3cb..80ce5d4594 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -574,7 +574,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_TINKATINK] = {{EVO_LEVEL, 24, SPECIES_TINKATUFF}}, [SPECIES_TINKATUFF] = {{EVO_LEVEL, 38, SPECIES_TINKATON}}, [SPECIES_WIGLETT] = {{EVO_LEVEL, 26, SPECIES_WUGTRIO}}, - [SPECIES_FINIZEN] = {{EVO_LEVEL, 38, SPECIES_PALAFIN}}, + [SPECIES_FINIZEN] = {{EVO_LEVEL, 38, SPECIES_PALAFIN_ZERO}}, [SPECIES_VAROOM] = {{EVO_LEVEL, 40, SPECIES_REVAVROOM}}, [SPECIES_GLIMMET] = {{EVO_LEVEL, 35, SPECIES_GLIMMORA}}, [SPECIES_GREAVARD] = {{EVO_LEVEL_NIGHT, 30, SPECIES_HOUNDSTONE}}, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 737d7570e3..308553e1c3 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -184,7 +184,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, - [SPECIES_PALAFIN] = sPalafinFormSpeciesIdTable, + [SPECIES_PALAFIN_ZERO] = sPalafinFormSpeciesIdTable, [SPECIES_TATSUGIRI] = sTatsugiriFormSpeciesIdTable, [SPECIES_DUDUNSPARCE] = sDudunsparceFormSpeciesIdTable, [SPECIES_GIMMIGHOUL] = sGimmighoulFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index deedb2af5d..365b927fb5 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1337,7 +1337,7 @@ static const u16 sSquawkabillyFormSpeciesIdTable[] = { }; static const u16 sPalafinFormSpeciesIdTable[] = { - SPECIES_PALAFIN, + SPECIES_PALAFIN_ZERO, SPECIES_PALAFIN_HERO, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 677a8bbb6d..6b3694528c 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -980,7 +980,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_WUGTRIO] = sWugtrioLevelUpLearnset, [SPECIES_BOMBIRDIER] = sBombirdierLevelUpLearnset, [SPECIES_FINIZEN] = sFinizenLevelUpLearnset, - [SPECIES_PALAFIN] = sPalafinLevelUpLearnset, + [SPECIES_PALAFIN_ZERO] = sPalafinLevelUpLearnset, + [SPECIES_PALAFIN_HERO] = sPalafinLevelUpLearnset, [SPECIES_VAROOM] = sVaroomLevelUpLearnset, [SPECIES_REVAVROOM] = sRevavroomLevelUpLearnset, [SPECIES_CYCLIZAR] = sCyclizarLevelUpLearnset, @@ -1487,8 +1488,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, #endif #if P_GEN_9_POKEMON == TRUE - // Palafin - [SPECIES_PALAFIN_HERO] = sPalafinLevelUpLearnset, // Tatsugiri [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriLevelUpLearnset, [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriLevelUpLearnset, diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 959438a3d0..e648965b7e 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -26384,7 +26384,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .bodyColor = BODY_COLOR_BLUE, \ .noFlip = FALSE - [SPECIES_PALAFIN] = + [SPECIES_PALAFIN_ZERO] = { .baseAttack = 70, .baseDefense = 72, diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 2b0d4e15b1..293545c525 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -980,7 +980,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_WUGTRIO] = sWugtrioTeachableLearnset, [SPECIES_BOMBIRDIER] = sBombirdierTeachableLearnset, [SPECIES_FINIZEN] = sFinizenTeachableLearnset, - [SPECIES_PALAFIN] = sPalafinTeachableLearnset, + [SPECIES_PALAFIN_ZERO] = sPalafinTeachableLearnset, + [SPECIES_PALAFIN_HERO] = sPalafinTeachableLearnset, [SPECIES_VAROOM] = sVaroomTeachableLearnset, [SPECIES_REVAVROOM] = sRevavroomTeachableLearnset, [SPECIES_CYCLIZAR] = sCyclizarTeachableLearnset, @@ -1487,8 +1488,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, #endif #if P_GEN_9_POKEMON == TRUE - // Palafin - [SPECIES_PALAFIN_HERO] = sPalafinTeachableLearnset, // Tatsugiri [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriTeachableLearnset, [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriTeachableLearnset, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index cec525e696..0193c48e30 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1007,7 +1007,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_WUGTRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_BOMBIRDIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FINIZEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, - [SPECIES_PALAFIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_PALAFIN_ZERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_REVAVROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 }, [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index c03db3654e..d84ba87d21 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1440,7 +1440,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(WUGTRIO, gMonBackPic_Wugtrio), SPECIES_SPRITE(BOMBIRDIER, gMonBackPic_Bombirdier), SPECIES_SPRITE(FINIZEN, gMonBackPic_Finizen), - SPECIES_SPRITE(PALAFIN, gMonBackPic_Palafin), + SPECIES_SPRITE(PALAFIN_ZERO, gMonBackPic_PalafinZero), SPECIES_SPRITE(PALAFIN_HERO, gMonBackPic_PalafinHero), SPECIES_SPRITE(VAROOM, gMonBackPic_Varoom), SPECIES_SPRITE(REVAVROOM, gMonBackPic_Revavroom), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index b1267a8fcd..0e4748c098 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -973,7 +973,8 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = //[SPECIES_WUGTRIO] = gMonFootprint_Wugtrio, //[SPECIES_BOMBIRDIER] = gMonFootprint_Bombirdier, //[SPECIES_FINIZEN] = gMonFootprint_Finizen, - //[SPECIES_PALAFIN] = gMonFootprint_Palafin, + //[SPECIES_PALAFIN_ZERO] = gMonFootprint_Palafin, + //[SPECIES_PALAFIN_HERO] = gMonFootprint_Palafin, //[SPECIES_VAROOM] = gMonFootprint_Varoom, //[SPECIES_REVAVROOM] = gMonFootprint_Revavroom, //[SPECIES_CYCLIZAR] = gMonFootprint_Cyclizar, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index ffe3a71a50..6d9d9ba265 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -13089,7 +13089,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_WUGTRIO] = sAnims_Wugtrio, [SPECIES_BOMBIRDIER] = sAnims_Bombirdier, [SPECIES_FINIZEN] = sAnims_Finizen, - [SPECIES_PALAFIN] = sAnims_Palafin, + [SPECIES_PALAFIN_ZERO] = sAnims_Palafin, + [SPECIES_PALAFIN_HERO] = sAnims_Palafin, [SPECIES_VAROOM] = sAnims_Varoom, [SPECIES_REVAVROOM] = sAnims_Revavroom, [SPECIES_CYCLIZAR] = sAnims_Cyclizar, @@ -13498,7 +13499,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion, #endif #if P_GEN_9_POKEMON == TRUE - [SPECIES_PALAFIN_HERO] = sAnims_Palafin, [SPECIES_TATSUGIRI_DROOPY] = sAnims_Tatsugiri, [SPECIES_TATSUGIRI_STRETCHY] = sAnims_Tatsugiri, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sAnims_Dudunsparce, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index d1eeec9e4f..c4bc1e2c14 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -984,7 +984,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_WUGTRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BOMBIRDIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FINIZEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_PALAFIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_PALAFIN_ZERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_PALAFIN_HERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_REVAVROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index d96344ec20..4bacd7f57c 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1438,7 +1438,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(WUGTRIO, gMonFrontPic_Wugtrio), SPECIES_SPRITE(BOMBIRDIER, gMonFrontPic_Bombirdier), SPECIES_SPRITE(FINIZEN, gMonFrontPic_Finizen), - SPECIES_SPRITE(PALAFIN, gMonFrontPic_Palafin), + SPECIES_SPRITE(PALAFIN_ZERO, gMonFrontPic_PalafinZero), SPECIES_SPRITE(PALAFIN_HERO, gMonFrontPic_PalafinHero), SPECIES_SPRITE(VAROOM, gMonFrontPic_Varoom), SPECIES_SPRITE(REVAVROOM, gMonFrontPic_Revavroom), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 83c9e225a4..c2ec2effc1 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1438,7 +1438,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(WUGTRIO, gMonPalette_Wugtrio), SPECIES_PAL(BOMBIRDIER, gMonPalette_Bombirdier), SPECIES_PAL(FINIZEN, gMonPalette_Finizen), - SPECIES_PAL(PALAFIN, gMonPalette_Palafin), + SPECIES_PAL(PALAFIN_ZERO, gMonPalette_PalafinZero), SPECIES_PAL(PALAFIN_HERO, gMonPalette_PalafinHero), SPECIES_PAL(VAROOM, gMonPalette_Varoom), SPECIES_PAL(REVAVROOM, gMonPalette_Revavroom), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 10db2ca310..c368646dcb 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1437,7 +1437,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(WUGTRIO, gMonShinyPalette_Wugtrio), SPECIES_SHINY_PAL(BOMBIRDIER, gMonShinyPalette_Bombirdier), SPECIES_SHINY_PAL(FINIZEN, gMonShinyPalette_Finizen), - SPECIES_SHINY_PAL(PALAFIN, gMonShinyPalette_Palafin), + SPECIES_SHINY_PAL(PALAFIN_ZERO, gMonShinyPalette_PalafinZero), SPECIES_SHINY_PAL(PALAFIN_HERO, gMonShinyPalette_PalafinHero), SPECIES_SHINY_PAL(VAROOM, gMonShinyPalette_Varoom), SPECIES_SHINY_PAL(REVAVROOM, gMonShinyPalette_Revavroom), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 62dc633710..9dad421504 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -979,7 +979,8 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_WUGTRIO] = _("Wugtrio"), [SPECIES_BOMBIRDIER] = _("Bombirdier"), [SPECIES_FINIZEN] = _("Finizen"), - [SPECIES_PALAFIN] = _("Palafin"), + [SPECIES_PALAFIN_ZERO] = _("Palafin"), + [SPECIES_PALAFIN_HERO] = _("Palafin"), [SPECIES_VAROOM] = _("Varoom"), [SPECIES_REVAVROOM] = _("Revavroom"), [SPECIES_CYCLIZAR] = _("Cyclizar"), @@ -1489,8 +1490,6 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), #endif #if P_GEN_9_POKEMON == TRUE - // Palafin - [SPECIES_PALAFIN_HERO] = _("Palafin"), // Tatsugiri [SPECIES_TATSUGIRI_DROOPY] = _("Tatsugiri"), [SPECIES_TATSUGIRI_STRETCHY] = _("Tatsugiri"), diff --git a/src/pokemon.c b/src/pokemon.c index 1303892c9f..5cd081f965 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1333,6 +1333,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(BOMBIRDIER), SPECIES_TO_NATIONAL(FINIZEN), SPECIES_TO_NATIONAL(PALAFIN), + [SPECIES_PALAFIN_HERO - 1] = NATIONAL_DEX_PALAFIN, SPECIES_TO_NATIONAL(VAROOM), SPECIES_TO_NATIONAL(REVAVROOM), SPECIES_TO_NATIONAL(CYCLIZAR), @@ -1838,8 +1839,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 - // Palafin - [SPECIES_PALAFIN_HERO - 1] = NATIONAL_DEX_PALAFIN, // Tatsugiri [SPECIES_TATSUGIRI_DROOPY - 1] = NATIONAL_DEX_TATSUGIRI, [SPECIES_TATSUGIRI_STRETCHY - 1] = NATIONAL_DEX_TATSUGIRI, @@ -3126,7 +3125,8 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_WUGTRIO - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_BOMBIRDIER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_FINIZEN - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_PALAFIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_PALAFIN_ZERO - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_PALAFIN_HERO - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_VAROOM - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_REVAVROOM - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CYCLIZAR - 1] = ANIM_V_SQUISH_AND_BOUNCE, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 7bdf1c9a8f..ecc5551ebb 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1397,7 +1397,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_WUGTRIO] = gMonIcon_Wugtrio, [SPECIES_BOMBIRDIER] = gMonIcon_Bombirdier, [SPECIES_FINIZEN] = gMonIcon_Finizen, - [SPECIES_PALAFIN] = gMonIcon_Palafin, + [SPECIES_PALAFIN_ZERO] = gMonIcon_PalafinZero, [SPECIES_PALAFIN_HERO] = gMonIcon_PalafinHero, [SPECIES_VAROOM] = gMonIcon_Varoom, [SPECIES_REVAVROOM] = gMonIcon_Revavroom, @@ -2781,7 +2781,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_WUGTRIO] = 0, [SPECIES_BOMBIRDIER] = 0, [SPECIES_FINIZEN] = 0, - [SPECIES_PALAFIN] = 0, // TODO: Hero form + [SPECIES_PALAFIN_ZERO] = 0, + [SPECIES_PALAFIN_HERO] = 0, [SPECIES_VAROOM] = 5, [SPECIES_REVAVROOM] = 5, [SPECIES_CYCLIZAR] = 1,