Add HMs from other gens

EIGHTFINITE · Jan 9, 2025 · edc2875 · edc2875
1 parent 8521f23
commit edc2875
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 4 deletions.
diff --git a/include/constants/items.h b/include/constants/items.h
@@ -830,6 +830,9 @@
 #define ITEM_HM06 (LAST_TECHNICAL_MACHINE_INDEX + 6)
 #define ITEM_HM07 (LAST_TECHNICAL_MACHINE_INDEX + 7)
 #define ITEM_HM08 (LAST_TECHNICAL_MACHINE_INDEX + 8)
+#define ITEM_HM09 (LAST_TECHNICAL_MACHINE_INDEX + 9)
+#define ITEM_HM10 (LAST_TECHNICAL_MACHINE_INDEX + 10)
+#define ITEM_HM11 (LAST_TECHNICAL_MACHINE_INDEX + 11)
 
 #define LAST_HIDDEN_MACHINE_INDEX ITEM_HM11
 #define NUM_HIDDEN_MACHINES (LAST_HIDDEN_MACHINE_INDEX - ITEM_HM01 + 1)

diff --git a/include/constants/tms_hms.h b/include/constants/tms_hms.h
@@ -59,9 +59,12 @@
     F(SURF) \
     F(STRENGTH) \
     F(FLASH) \
+    F(DEFOG) \
+    F(WHIRLPOOL) \
     F(ROCK_SMASH) \
     F(WATERFALL) \
-    F(DIVE)
+    F(DIVE) \
+    F(ROCK_CLIMB)
 
 #define FOREACH_TMHM(F) \
     FOREACH_TM(F) \

diff --git a/src/data/items.h b/src/data/items.h
@@ -11843,10 +11843,46 @@ const struct Item gItemsInfo[] =
         .secondaryId = MOVE_FLASH,
     },
 
-    [ITEM_HM_ROCK_SMASH] =
+    [ITEM_HM_DEFOG] =
     {
         .name = _("HM06"),
         .price = 0,
+        .description = COMPOUND_STRING(
+            "Removes obstacles\n"
+            "and lowers evasion."),
+        .importance = 1,
+        .pocket = POCKET_TM_HM,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_TMHM,
+        .secondaryId = MOVE_DEFOG,
+    },
+
+    [ITEM_HM_WHIRLPOOL] =
+    {
+        .name = _("HM07"),
+        .price = 0,
+        #if B_BINDING_TURNS >= GEN_5
+            .description = COMPOUND_STRING(
+                "Traps & hurts the\n"
+                "foe in a whirlpool\n"
+                "for 4 or 5 turns."),
+        #else
+            .description = COMPOUND_STRING(
+                "Traps & hurts the\n"
+                "foe in a whirlpool\n"
+                "for 2 to 5 turns."),
+        #endif
+        .importance = 1,
+        .pocket = POCKET_TM_HM,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_TMHM,
+        .secondaryId = MOVE_WHIRLPOOL,
+    },
+
+    [ITEM_HM_ROCK_SMASH] =
+    {
+        .name = _("HM08"),
+        .price = 0,
         .description = COMPOUND_STRING(
             "A rock-crushingly\n"
             "tough attack that\n"
@@ -11860,7 +11896,7 @@ const struct Item gItemsInfo[] =
 
     [ITEM_HM_WATERFALL] =
     {
-        .name = _("HM07"),
+        .name = _("HM09"),
         .price = 0,
         .description = COMPOUND_STRING(
             "Attacks the foe\n"
@@ -11875,7 +11911,7 @@ const struct Item gItemsInfo[] =
 
     [ITEM_HM_DIVE] =
     {
-        .name = _("HM08"),
+        .name = _("HM10"),
         .price = 0,
         .description = COMPOUND_STRING(
             "Dives underwater\n"
@@ -11888,6 +11924,21 @@ const struct Item gItemsInfo[] =
         .secondaryId = MOVE_DIVE,
     },
 
+    [ITEM_HM_ROCK_CLIMB] =
+    {
+        .name = _("HM11"),
+        .price = 0,
+        .description = COMPOUND_STRING(
+            "A charging attack\n"
+            "that may confuse\n"
+            "the foe."),
+        .importance = 1,
+        .pocket = POCKET_TM_HM,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_TMHM,
+        .secondaryId = MOVE_ROCK_CLIMB,
+    },
+
 
 // Charms