From 8fefdbe9145380d53ab686372be4b786eceee76b Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Tue, 24 Oct 2023 23:24:43 -0500
Subject: [PATCH] Evo and form changes

---
 src/data/pokemon/evolution.h                  |  5 ++++-
 src/data/pokemon/form_change_table_pointers.h | 10 ++++++++++
 src/data/pokemon/form_change_tables.h         | 10 ++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h
index 7a3d05624d..3515a78450 100644
--- a/src/data/pokemon/evolution.h
+++ b/src/data/pokemon/evolution.h
@@ -513,7 +513,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
     [SPECIES_ROLYCOLY]              = {{EVO_LEVEL, 18, SPECIES_CARKOL}},
     [SPECIES_CARKOL]                = {{EVO_LEVEL, 34, SPECIES_COALOSSAL}},
     [SPECIES_APPLIN]                = {{EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE},
-                                       {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}},
+                                       {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN},
+                                       {EVO_ITEM, ITEM_SYRUPY_APPLE, SPECIES_DIPPLIN}},
     [SPECIES_SILICOBRA]             = {{EVO_LEVEL, 36, SPECIES_SANDACONDA}},
     [SPECIES_ARROKUDA]              = {{EVO_LEVEL, 26, SPECIES_BARRASKEWDA}},
     [SPECIES_TOXEL]                 = {{EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED},
@@ -586,6 +587,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
     [SPECIES_ARCTIBAX]              = {{EVO_LEVEL, 54, SPECIES_BAXCALIBUR}},
     [SPECIES_GIMMIGHOUL_CHEST]      = {{EVO_NONE, 0, SPECIES_GHOLDENGO}},
     [SPECIES_GIMMIGHOUL_ROAMING]    = {{EVO_NONE, 0, SPECIES_GHOLDENGO}},
+    [SPECIES_POLTCHAGEIST_COUNTERFEIT] = {{EVO_ITEM, ITEM_UNREMARKABLE_TEACUP, SPECIES_SINISTCHA_UNREMARKABLE}},
+    [SPECIES_POLTCHAGEIST_ARTISAN]  = {{EVO_ITEM, ITEM_MASTERPIECE_TEACUP, SPECIES_SINISTCHA_MASTERPIECE}},
 #endif
     [SPECIES_RATTATA_ALOLAN]        = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}},
     [SPECIES_SANDSHREW_ALOLAN]      = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}},
diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h
index bd8f42a3e2..d838efff76 100644
--- a/src/data/pokemon/form_change_table_pointers.h
+++ b/src/data/pokemon/form_change_table_pointers.h
@@ -292,4 +292,14 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
     [SPECIES_ENAMORUS_INCARNATE] = sEnamorusFormChangeTable,
     [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormChangeTable,
 #endif
+#if P_GEN_9_POKEMON == TRUE
+    [SPECIES_OGERPON_TEAL] = sOgerponFormChangeTable,
+    [SPECIES_OGERPON_WELLSPRING] = sOgerponFormChangeTable,
+    [SPECIES_OGERPON_HEARTHFLAME] = sOgerponFormChangeTable,
+    [SPECIES_OGERPON_CORNERSTONE] = sOgerponFormChangeTable,
+    [SPECIES_OGERPON_TEAL_TERA] = sOgerponFormChangeTable,
+    [SPECIES_OGERPON_WELLSPRING_TERA] = sOgerponFormChangeTable,
+    [SPECIES_OGERPON_HEARTHFLAME_TERA] = sOgerponFormChangeTable,
+    [SPECIES_OGERPON_CORNERSTONE_TERA] = sOgerponFormChangeTable,
+#endif
 };
diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h
index f339130fac..68ebd2a96f 100644
--- a/src/data/pokemon/form_change_tables.h
+++ b/src/data/pokemon/form_change_tables.h
@@ -607,6 +607,16 @@ static const struct FormChange sEnamorusFormChangeTable[] = {
 
 #endif
 
+#if P_GEN_9_POKEMON == TRUE
+static const struct FormChange sOgerponFormChangeTable[] = {
+    {FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_TEAL,        ITEM_NONE},
+    {FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_WELLSPRING,  ITEM_WELLSPRING_MASK},
+    {FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_HEARTHFLAME, ITEM_HEARTHFLAME_MASK},
+    {FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_CORNERSTONE, ITEM_CORNERSTONE_MASK},
+    {FORM_CHANGE_TERMINATOR},
+};
+#endif
+
 static const struct FormChange sButterfreeFormChangeTable[] =
 {
     {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BUTTERFREE_GIGANTAMAX},