Add Indigo Disk Pokemon data (rh-hideout#3878)

* Archaludon? * more archuladon stuff * Hydrapple and Gouging Fire * Raging Bolt * Iron Boulder and Iron Crown * Terapagos * Pecharunt * Update gen_9.h * Pokedex orders
Fervstheone · Jan 1, 2024 · f6f287d · f6f287d
1 parent f31b4f3
commit f6f287d
Show file tree

Hide file tree

Showing 14 changed files with 930 additions and 26 deletions.
diff --git a/include/config/species_enabled.h b/include/config/species_enabled.h
@@ -594,5 +594,11 @@
 #define P_FAMILY_MUNKIDORI               P_GEN_9_POKEMON
 #define P_FAMILY_FEZANDIPITI             P_GEN_9_POKEMON
 #define P_FAMILY_OGERPON                 P_GEN_9_POKEMON
+#define P_FAMILY_GOUGING_FIRE            P_GEN_9_POKEMON
+#define P_FAMILY_RAGING_BOLT             P_GEN_9_POKEMON
+#define P_FAMILY_IRON_BOULDER            P_GEN_9_POKEMON
+#define P_FAMILY_IRON_CROWN              P_GEN_9_POKEMON
+#define P_FAMILY_TERAPAGOS               P_GEN_9_POKEMON
+#define P_FAMILY_PECHARUNT               P_GEN_9_POKEMON
 
 #endif // GUARD_CONFIG_SPECIES_ENABLED_H
diff --git a/include/constants/cries.h b/include/constants/cries.h
@@ -2025,6 +2025,7 @@ enum {
     CRY_APPLETUN,
 #if P_GEN_9_CROSS_EVOS
     CRY_DIPPLIN,
+    //CRY_HYDRAPPLE,
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_APPLIN
 #if P_FAMILY_SILICOBRA
@@ -2112,6 +2113,9 @@ enum {
 #endif //P_FAMILY_ARCTOVISH
 #if P_FAMILY_DURALUDON
     CRY_DURALUDON,
+#if P_GEN_9_CROSS_EVOS
+    //CRY_ARCHALUDON,
+#endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_DURALUDON
 #if P_FAMILY_DREEPY
     CRY_DREEPY,
@@ -2404,6 +2408,24 @@ enum {
 #if P_FAMILY_OGERPON
     CRY_OGERPON,
 #endif //P_FAMILY_OGERPON
+#if P_FAMILY_GOUGING_FIRE
+    //CRY_GOUGING_FIRE,
+#endif //P_FAMILY_GOUGING_FIRE
+#if P_FAMILY_RAGING_BOLT
+    //CRY_RAGING_BOLT,
+#endif //P_FAMILY_RAGING_BOLT
+#if P_FAMILY_IRON_BOULDER
+    //CRY_IRON_BOULDER,
+#endif //P_FAMILY_IRON_BOULDER
+#if P_FAMILY_IRON_CROWN
+    //CRY_IRON_CROWN,
+#endif //P_FAMILY_IRON_CROWN
+#if P_FAMILY_TERAPAGOS
+    //CRY_TERAPAGOS,
+#endif //P_FAMILY_TERAPAGOS
+#if P_FAMILY_PECHARUNT
+    //CRY_PECHARUNT,
+#endif //P_FAMILY_PECHARUNT
     CRY_COUNT,
 };
 

diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h
@@ -1031,21 +1031,21 @@ enum {
     NATIONAL_DEX_MUNKIDORI,
     NATIONAL_DEX_FEZANDIPITI,
     NATIONAL_DEX_OGERPON,
-    NATIONAL_DEX_1018,
-    NATIONAL_DEX_1019,
-    NATIONAL_DEX_1020,
-    NATIONAL_DEX_1021,
-    NATIONAL_DEX_1022,
-    NATIONAL_DEX_1023,
-    NATIONAL_DEX_1024,
-    NATIONAL_DEX_1025,
+    NATIONAL_DEX_ARCHALUDON,
+    NATIONAL_DEX_HYDRAPPLE,
+    NATIONAL_DEX_GOUGING_FIRE,
+    NATIONAL_DEX_RAGING_BOLT,
+    NATIONAL_DEX_IRON_BOULDER,
+    NATIONAL_DEX_IRON_CROWN,
+    NATIONAL_DEX_TERAPAGOS,
+    NATIONAL_DEX_PECHARUNT,
 };
 
 #define KANTO_DEX_COUNT     NATIONAL_DEX_MEW
 #define JOHTO_DEX_COUNT     NATIONAL_DEX_CELEBI
 
 #if P_GEN_9_POKEMON == TRUE
-    #define NATIONAL_DEX_COUNT  NATIONAL_DEX_1025
+    #define NATIONAL_DEX_COUNT  NATIONAL_DEX_PECHARUNT
 #elif P_GEN_8_POKEMON == TRUE
     #define NATIONAL_DEX_COUNT  NATIONAL_DEX_ENAMORUS
 #elif P_GEN_7_POKEMON == TRUE

diff --git a/include/constants/species.h b/include/constants/species.h
@@ -1658,19 +1658,19 @@
 #define SPECIES_OGERPON_CORNERSTONE_MASK_TERA           GEN9_START + 135
 #define SPECIES_URSALUNA_BLOODMOON                      GEN9_START + 136
 // Indigo Disk
-#define SPECIES_1018                                    GEN9_START + 137
-#define SPECIES_1019                                    GEN9_START + 138
-#define SPECIES_1020                                    GEN9_START + 139
-#define SPECIES_1021                                    GEN9_START + 140
-#define SPECIES_1022                                    GEN9_START + 141
-#define SPECIES_1023                                    GEN9_START + 142
-#define SPECIES_1024                                    SPECIES_1024_FORM_1
-#define SPECIES_1024_FORM_1                             GEN9_START + 143
-#define SPECIES_1024_FORM_2                             GEN9_START + 144
-#define SPECIES_1024_FORM_3                             GEN9_START + 145
-#define SPECIES_1025                                    GEN9_START + 146
-
-#define PLACEHOLDER_START                               SPECIES_1025
+#define SPECIES_ARCHALUDON                              GEN9_START + 137
+#define SPECIES_HYDRAPPLE                               GEN9_START + 138
+#define SPECIES_GOUGING_FIRE                            GEN9_START + 139
+#define SPECIES_RAGING_BOLT                             GEN9_START + 140
+#define SPECIES_IRON_BOULDER                            GEN9_START + 141
+#define SPECIES_IRON_CROWN                              GEN9_START + 142
+#define SPECIES_TERAPAGOS                               SPECIES_TERAPAGOS_NORMAL
+#define SPECIES_TERAPAGOS_NORMAL                        GEN9_START + 143
+#define SPECIES_TERAPAGOS_TERASTAL                      GEN9_START + 144
+#define SPECIES_TERAPAGOS_STELLAR                       GEN9_START + 145
+#define SPECIES_PECHARUNT                               GEN9_START + 146
+
+#define PLACEHOLDER_START                               SPECIES_PECHARUNT
 // XD: Gale of Darkness
 #define SPECIES_LUGIA_SHADOW                            PLACEHOLDER_START + 1
 // Diamond & Pearl

diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
@@ -9269,6 +9269,13 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
     const u32 gMonShinyPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/shiny.gbapal.lz");
     const u8 gMonIcon_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/icon.4bpp");
     // const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp");
+
+    // const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/front.4bpp.lz");
+    // const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/normal.gbapal.lz");
+    // const u32 gMonBackPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/back.4bpp.lz");
+    // const u32 gMonShinyPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/shiny.gbapal.lz");
+    // const u8 gMonIcon_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/icon.4bpp");
+    // const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/footprint.1bpp");
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_APPLIN
 
@@ -9767,6 +9774,15 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
     const u32 gMonShinyPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/shiny.gbapal.lz");
     const u8 gMonIcon_DuraludonGigantamax[] = INCBIN_U8("graphics/pokemon/duraludon/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
+
+#if P_GEN_9_CROSS_EVOS
+    // const u32 gMonFrontPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/front.4bpp.lz");
+    // const u32 gMonPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/normal.gbapal.lz");
+    // const u32 gMonBackPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/back.4bpp.lz");
+    // const u32 gMonShinyPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/shiny.gbapal.lz");
+    // const u8 gMonIcon_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/icon.4bpp");
+    // const u8 gMonFootprint_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/footprint.1bpp");
+#endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_DURALUDON
 
 #if P_FAMILY_DREEPY
@@ -10906,6 +10922,72 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
     // const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz");
 #endif //P_FAMILY_OGERPON
 
+#if P_FAMILY_GOUGING_FIRE
+    // const u32 gMonFrontPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/front.4bpp.lz");
+    // const u32 gMonPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/normal.gbapal.lz");
+    // const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/back.4bpp.lz");
+    // const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/shiny.gbapal.lz");
+    // const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/icon.4bpp");
+    // const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp");
+#endif //P_FAMILY_GOUGING_FIRE
+
+#if P_FAMILY_RAGING_BOLT
+    // const u32 gMonFrontPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/front.4bpp.lz");
+    // const u32 gMonPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/normal.gbapal.lz");
+    // const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/back.4bpp.lz");
+    // const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/shiny.gbapal.lz");
+    // const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/icon.4bpp");
+    // const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp");
+#endif //P_FAMILY_RAGING_BOLT
+
+#if P_FAMILY_IRON_BOULDER
+    // const u32 gMonFrontPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/front.4bpp.lz");
+    // const u32 gMonPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/normal.gbapal.lz");
+    // const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/back.4bpp.lz");
+    // const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/shiny.gbapal.lz");
+    // const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/icon.4bpp");
+    // const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp");
+#endif //P_FAMILY_IRON_BOULDER
+
+#if P_FAMILY_IRON_CROWN
+    // const u32 gMonFrontPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/front.4bpp.lz");
+    // const u32 gMonPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/normal.gbapal.lz");
+    // const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/back.4bpp.lz");
+    // const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/shiny.gbapal.lz");
+    // const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/icon.4bpp");
+    // const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp");
+#endif //P_FAMILY_IRON_CROWN
+
+#if P_FAMILY_TERAPAGOS
+    // const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/front.4bpp.lz");
+    // const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/normal.gbapal.lz");
+    // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz");
+    // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz");
+    // const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/icon.4bpp");
+    // const u8 gMonFootprint_Terapagos[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp");
+
+    // const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/front.4bpp.lz");
+    // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz");
+    // const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/back.4bpp.lz");
+    // const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/shiny.gbapal.lz");
+    // const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/icon.4bpp");
+
+    // const u32 gMonFrontPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/front.4bpp.lz");
+    // const u32 gMonPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/normal.gbapal.lz");
+    // const u32 gMonBackPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/back.4bpp.lz");
+    // const u32 gMonShinyPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/shiny.gbapal.lz");
+    // const u8 gMonIcon_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/terapagos/stellar/icon.4bpp");
+#endif //P_FAMILY_TERAPAGOS
+
+#if P_FAMILY_PECHARUNT
+    // const u32 gMonFrontPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/front.4bpp.lz");
+    // const u32 gMonPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/normal.gbapal.lz");
+    // const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/back.4bpp.lz");
+    // const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/shiny.gbapal.lz");
+    // const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/icon.4bpp");
+    // const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp");
+#endif //P_FAMILY_PECHARUNT
+
     const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz");
     const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz");
     const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");

diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h
@@ -1092,5 +1092,14 @@ static const struct FormChange sOgerponFormChangeTable[] = {
 };
 #endif //P_FAMILY_OGERPON
 
+#if P_FAMILY_TERAPAGOS
+static const struct FormChange sTerapagosFormChangeTable[] = {
+    {FORM_CHANGE_BEGIN_BATTLE, SPECIES_TERAPAGOS_TERASTAL}, //needs to be tied to the ability
+    //{FORM_CHANGE_TERASTALLIZATION, SPECIES_TERAPAGOS_STELLAR},
+    {FORM_CHANGE_END_BATTLE,   SPECIES_TERAPAGOS_NORMAL},
+    {FORM_CHANGE_TERMINATOR},
+};
+#endif //P_FAMILY_TERAPAGOS
+
 #undef WHEN_LEARNED
 #undef WHEN_FORGOTTEN
diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h
@@ -1761,3 +1761,12 @@ static const u16 sOgerponFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 #endif //P_FAMILY_OGERPON
+
+#if P_FAMILY_TERAPAGOS
+static const u16 sTerapagosFormSpeciesIdTable[] = {
+    SPECIES_TERAPAGOS_NORMAL,
+    SPECIES_TERAPAGOS_TERASTAL,
+    SPECIES_TERAPAGOS_STELLAR,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_TERAPAGOS
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
@@ -629,6 +629,7 @@ const u8 *const gItemEffectTable[ITEMS_COUNT] =
     [ITEM_SYRUPY_APPLE]       = gItemEffect_EvoItem,
     [ITEM_UNREMARKABLE_TEACUP] = gItemEffect_EvoItem,
     [ITEM_MASTERPIECE_TEACUP] = gItemEffect_EvoItem,
+    [ITEM_METAL_ALLOY]        = gItemEffect_EvoItem,
 
     // Berries
     [ITEM_CHERI_BERRY]        = gItemEffect_CheriBerry,