From 755b31bee0a500a963f5c4de137c9b8c9953b03f Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Sat, 26 Feb 2022 12:19:38 -0300
Subject: [PATCH] Enable form change for the Forces of Nature

---
 include/constants/pokemon_config.h            |  4 +--
 src/data/pokemon/form_change_table_pointers.h | 10 +++---
 src/data/pokemon/form_change_tables.h         | 35 +++++--------------
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h
index 257c06b7c..91561ab7c 100644
--- a/include/constants/pokemon_config.h
+++ b/include/constants/pokemon_config.h
@@ -159,8 +159,8 @@
 
     //FORM_ITEM_USE
     #define ITEM_GRACIDEA            10125
-    // #define ITEM_REVEAL_GLASS        10126
-    // #define ITEM_PRISON_BOTTLE       10127
+    #define ITEM_REVEAL_GLASS        10126
+    #define ITEM_PRISON_BOTTLE       10127
     #define ITEM_RED_NECTAR          10128
     #define ITEM_YELLOW_NECTAR       10129
     #define ITEM_PINK_NECTAR         10130
diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h
index 39fcc7aee..d44b70dce 100644
--- a/src/data/pokemon/form_change_table_pointers.h
+++ b/src/data/pokemon/form_change_table_pointers.h
@@ -3,7 +3,7 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
     [SPECIES_GIRATINA] = sGiratinaFormChangeTable,
     [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormChangeTable,
     [SPECIES_SHAYMIN] = sShayminFormChangeTable,
-    [SPECIES_SHAYMIN_SKY] = sShayminSkyFormChangeTable,
+    [SPECIES_SHAYMIN_SKY] = sShayminFormChangeTable,
     [SPECIES_ARCEUS] = sArceusFormChangeTable,
     [SPECIES_ARCEUS_FIGHTING] = sArceusFormChangeTable,
     [SPECIES_ARCEUS_FLYING] = sArceusFormChangeTable,
@@ -23,13 +23,13 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
     [SPECIES_ARCEUS_DARK] = sArceusFormChangeTable,
     [SPECIES_ARCEUS_FAIRY] = sArceusFormChangeTable,
     [SPECIES_TORNADUS] = sTornadusFormChangeTable,
-    [SPECIES_TORNADUS_THERIAN] = sTornadusTherianFormChangeTable,
+    [SPECIES_TORNADUS_THERIAN] = sTornadusFormChangeTable,
     [SPECIES_THUNDURUS] = sThundurusFormChangeTable,
-    [SPECIES_THUNDURUS_THERIAN] = sThundurusTherianFormChangeTable,
+    [SPECIES_THUNDURUS_THERIAN] = sThundurusFormChangeTable,
     [SPECIES_LANDORUS] = sLandorusFormChangeTable,
-    [SPECIES_LANDORUS_THERIAN] = sLandorusTherianFormChangeTable,
+    [SPECIES_LANDORUS_THERIAN] = sLandorusFormChangeTable,
     [SPECIES_KELDEO] = sKeldeoFormChangeTable,
-    [SPECIES_KELDEO_RESOLUTE] = sKeldeoResoluteFormChangeTable,
+    [SPECIES_KELDEO_RESOLUTE] = sKeldeoFormChangeTable,
     [SPECIES_GENESECT] = sGenesectFormChangeTable, 
     [SPECIES_GENESECT_DOUSE_DRIVE] = sGenesectFormChangeTable,
     [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormChangeTable,
diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h
index f980f14b8..a333d62c1 100644
--- a/src/data/pokemon/form_change_tables.h
+++ b/src/data/pokemon/form_change_tables.h
@@ -47,10 +47,6 @@ static const struct FormChange sGiratinaFormChangeTable[] = {
 
 static const struct FormChange sShayminFormChangeTable[] = {
     {FORM_ITEM_USE_TIME, SPECIES_SHAYMIN_SKY, ITEM_GRACIDEA, DAY},
-    {FORM_CHANGE_END},
-};
-
-static const struct FormChange sShayminSkyFormChangeTable[] = {
     {FORM_WITHDRAW, SPECIES_SHAYMIN},
     {FORM_CHANGE_END},
 };
@@ -95,41 +91,25 @@ static const struct FormChange sArceusFormChangeTable[] = {
 };
 
 static const struct FormChange sTornadusFormChangeTable[] = {
-    // {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS},
-    {FORM_CHANGE_END},
-};
-
-static const struct FormChange sTornadusTherianFormChangeTable[] = {
-    // {FORM_ITEM_USE, SPECIES_TORNADUS, ITEM_REVEAL_GLASS},
+    {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS},
+    {FORM_ITEM_USE, SPECIES_TORNADUS, ITEM_REVEAL_GLASS},
     {FORM_CHANGE_END},
 };
 
 static const struct FormChange sThundurusFormChangeTable[] = {
-    // {FORM_ITEM_USE, SPECIES_THUNDURUS_THERIAN, ITEM_REVEAL_GLASS},
-    {FORM_CHANGE_END},
-};
-
-static const struct FormChange sThundurusTherianFormChangeTable[] = {
-    // {FORM_ITEM_USE, SPECIES_THUNDURUS, ITEM_REVEAL_GLASS},
+    {FORM_ITEM_USE, SPECIES_THUNDURUS_THERIAN, ITEM_REVEAL_GLASS},
+    {FORM_ITEM_USE, SPECIES_THUNDURUS, ITEM_REVEAL_GLASS},
     {FORM_CHANGE_END},
 };
 
 static const struct FormChange sLandorusFormChangeTable[] = {
-    // {FORM_ITEM_USE, SPECIES_LANDORUS_THERIAN, ITEM_REVEAL_GLASS},
-    {FORM_CHANGE_END},
-};
-
-static const struct FormChange sLandorusTherianFormChangeTable[] = {
-    // {FORM_ITEM_USE, SPECIES_LANDORUS, ITEM_REVEAL_GLASS},
+    {FORM_ITEM_USE, SPECIES_LANDORUS_THERIAN, ITEM_REVEAL_GLASS},
+    {FORM_ITEM_USE, SPECIES_LANDORUS, ITEM_REVEAL_GLASS},
     {FORM_CHANGE_END},
 };
 
 static const struct FormChange sKeldeoFormChangeTable[] = {
     {FORM_MOVE, SPECIES_KELDEO_RESOLUTE, MOVE_SECRET_SWORD, WHEN_LEARNED},
-    {FORM_CHANGE_END},
-};
-
-static const struct FormChange sKeldeoResoluteFormChangeTable[] = {
     {FORM_MOVE, SPECIES_KELDEO, MOVE_SECRET_SWORD, WHEN_FORGOTTEN},
     {FORM_CHANGE_END},
 };
@@ -144,7 +124,8 @@ static const struct FormChange sGenesectFormChangeTable[] = {
 };
 
 static const struct FormChange sHoopaFormChangeTable[] = {
-    // {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA},
+    {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA},
+    {FORM_WITHDRAW, SPECIES_HOOPA},
     {FORM_CHANGE_END},
 };