diff --git a/include/constants/items.h b/include/constants/items.h
index 0abfc31a44..10b718fc64 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -827,177 +827,180 @@
 #define ITEM_HM06 687
 #define ITEM_HM07 688
 #define ITEM_HM08 689
+#define ITEM_HM09 690
+#define ITEM_HM10 691
+#define ITEM_HM11 692
 
 // Charms
-#define ITEM_OVAL_CHARM 690
-#define ITEM_SHINY_CHARM 691
-#define ITEM_CATCHING_CHARM 692
-#define ITEM_EXP_CHARM 693
+#define ITEM_OVAL_CHARM 693
+#define ITEM_SHINY_CHARM 694
+#define ITEM_CATCHING_CHARM 695
+#define ITEM_EXP_CHARM 696
 
 // Form-changing Key Items
-#define ITEM_ROTOM_CATALOG 694
-#define ITEM_GRACIDEA 695
-#define ITEM_REVEAL_GLASS 696
-#define ITEM_DNA_SPLICERS 697
-#define ITEM_ZYGARDE_CUBE 698
-#define ITEM_PRISON_BOTTLE 699
-#define ITEM_N_SOLARIZER 700
-#define ITEM_N_LUNARIZER 701
-#define ITEM_REINS_OF_UNITY 702
+#define ITEM_ROTOM_CATALOG 697
+#define ITEM_GRACIDEA 698
+#define ITEM_REVEAL_GLASS 699
+#define ITEM_DNA_SPLICERS 700
+#define ITEM_ZYGARDE_CUBE 701
+#define ITEM_PRISON_BOTTLE 702
+#define ITEM_N_SOLARIZER 703
+#define ITEM_N_LUNARIZER 704
+#define ITEM_REINS_OF_UNITY 705
 
 // Battle Mechanic Key Items
-#define ITEM_MEGA_RING 703
-#define ITEM_Z_POWER_RING 704
-#define ITEM_DYNAMAX_BAND 705
+#define ITEM_MEGA_RING 706
+#define ITEM_Z_POWER_RING 707
+#define ITEM_DYNAMAX_BAND 708
 
 // Misc. Key Items
-#define ITEM_BICYCLE 706
-#define ITEM_MACH_BIKE 707
-#define ITEM_ACRO_BIKE 708
-#define ITEM_OLD_ROD 709
-#define ITEM_GOOD_ROD 710
-#define ITEM_SUPER_ROD 711
-#define ITEM_DOWSING_MACHINE 712
+#define ITEM_BICYCLE 709
+#define ITEM_MACH_BIKE 710
+#define ITEM_ACRO_BIKE 711
+#define ITEM_OLD_ROD 712
+#define ITEM_GOOD_ROD 713
+#define ITEM_SUPER_ROD 714
+#define ITEM_DOWSING_MACHINE 715
 #define ITEM_ITEMFINDER ITEM_DOWSING_MACHINE // Pre-Gen IV name
 #define ITEM_DOWSING_MCHN ITEM_DOWSING_MACHINE // Gen IV-V name
-#define ITEM_TOWN_MAP 713
-#define ITEM_VS_SEEKER 714
-#define ITEM_TM_CASE 715
-#define ITEM_BERRY_POUCH 716
-#define ITEM_POKEMON_BOX_LINK 717
+#define ITEM_TOWN_MAP 716
+#define ITEM_VS_SEEKER 717
+#define ITEM_TM_CASE 718
+#define ITEM_BERRY_POUCH 719
+#define ITEM_POKEMON_BOX_LINK 720
 #define ITEM_POKEMON_BOX ITEM_POKEMON_BOX_LINK // Pre-Gen VIII name
-#define ITEM_COIN_CASE 718
-#define ITEM_POWDER_JAR 719
-#define ITEM_WAILMER_PAIL 720
-#define ITEM_POKE_RADAR 721
-#define ITEM_POKEBLOCK_CASE 722
-#define ITEM_SOOT_SACK 723
-#define ITEM_POKE_FLUTE 724
-#define ITEM_FAME_CHECKER 725
-#define ITEM_TEACHY_TV 726
+#define ITEM_COIN_CASE 721
+#define ITEM_POWDER_JAR 722
+#define ITEM_WAILMER_PAIL 723
+#define ITEM_POKE_RADAR 724
+#define ITEM_POKEBLOCK_CASE 725
+#define ITEM_SOOT_SACK 726
+#define ITEM_POKE_FLUTE 727
+#define ITEM_FAME_CHECKER 728
+#define ITEM_TEACHY_TV 729
 
 // Story Key Items
-#define ITEM_SS_TICKET 727
-#define ITEM_EON_TICKET 728
-#define ITEM_MYSTIC_TICKET 729
-#define ITEM_AURORA_TICKET 730
-#define ITEM_OLD_SEA_MAP 731
-#define ITEM_LETTER 732
-#define ITEM_DEVON_PARTS 733
+#define ITEM_SS_TICKET 730
+#define ITEM_EON_TICKET 731
+#define ITEM_MYSTIC_TICKET 732
+#define ITEM_AURORA_TICKET 733
+#define ITEM_OLD_SEA_MAP 734
+#define ITEM_LETTER 735
+#define ITEM_DEVON_PARTS 736
 #define ITEM_DEVON_GOODS ITEM_DEVON_PARTS // Pre-Gen VI name
-#define ITEM_GO_GOGGLES 734
-#define ITEM_DEVON_SCOPE 735
-#define ITEM_BASEMENT_KEY 736
-#define ITEM_SCANNER 737
-#define ITEM_STORAGE_KEY 738
-#define ITEM_KEY_TO_ROOM_1 739
+#define ITEM_GO_GOGGLES 737
+#define ITEM_DEVON_SCOPE 738
+#define ITEM_BASEMENT_KEY 739
+#define ITEM_SCANNER 740
+#define ITEM_STORAGE_KEY 741
+#define ITEM_KEY_TO_ROOM_1 742
 #define ITEM_RM_1_KEY ITEM_KEY_TO_ROOM_1 // Pre-Gen VI name
-#define ITEM_KEY_TO_ROOM_2 740
+#define ITEM_KEY_TO_ROOM_2 743
 #define ITEM_RM_2_KEY ITEM_KEY_TO_ROOM_2 // Pre-Gen VI name
-#define ITEM_KEY_TO_ROOM_4 741
+#define ITEM_KEY_TO_ROOM_4 744
 #define ITEM_RM_4_KEY ITEM_KEY_TO_ROOM_4 // Pre-Gen VI name
-#define ITEM_KEY_TO_ROOM_6 742
+#define ITEM_KEY_TO_ROOM_6 745
 #define ITEM_RM_6_KEY ITEM_KEY_TO_ROOM_6 // Pre-Gen VI name
-#define ITEM_METEORITE 743
-#define ITEM_MAGMA_EMBLEM 744
-#define ITEM_CONTEST_PASS 745
-#define ITEM_PARCEL 746
+#define ITEM_METEORITE 746
+#define ITEM_MAGMA_EMBLEM 747
+#define ITEM_CONTEST_PASS 748
+#define ITEM_PARCEL 749
 #define ITEM_OAKS_PARCEL ITEM_PARCEL // Pre-Gen IV name
-#define ITEM_SECRET_KEY 747
-#define ITEM_BIKE_VOUCHER 748
-#define ITEM_GOLD_TEETH 749
-#define ITEM_CARD_KEY 750
-#define ITEM_LIFT_KEY 751
-#define ITEM_SILPH_SCOPE 752
-#define ITEM_TRI_PASS 753
-#define ITEM_RAINBOW_PASS 754
-#define ITEM_TEA 755
-#define ITEM_RUBY 756
-#define ITEM_SAPPHIRE 757
+#define ITEM_SECRET_KEY 750
+#define ITEM_BIKE_VOUCHER 751
+#define ITEM_GOLD_TEETH 752
+#define ITEM_CARD_KEY 753
+#define ITEM_LIFT_KEY 754
+#define ITEM_SILPH_SCOPE 755
+#define ITEM_TRI_PASS 756
+#define ITEM_RAINBOW_PASS 757
+#define ITEM_TEA 758
+#define ITEM_RUBY 759
+#define ITEM_SAPPHIRE 760
 
 // GEN IX ITEMS
-#define ITEM_ABILITY_SHIELD 758
-#define ITEM_CLEAR_AMULET 759
-#define ITEM_PUNCHING_GLOVE 760
-#define ITEM_COVERT_CLOAK 761
-#define ITEM_LOADED_DICE 762
-#define ITEM_AUSPICIOUS_ARMOR 763
-#define ITEM_BOOSTER_ENERGY 764
-#define ITEM_BIG_BAMBOO_SHOOT 765
-#define ITEM_GIMMIGHOUL_COIN 766
-#define ITEM_LEADERS_CREST 767
-#define ITEM_MALICIOUS_ARMOR 768
-#define ITEM_MIRROR_HERB 769
-#define ITEM_SCROLL_OF_DARKNESS 770
-#define ITEM_SCROLL_OF_WATERS 771
-#define ITEM_TERA_ORB 772
-#define ITEM_TINY_BAMBOO_SHOOT 773
-
-#define ITEM_BUG_TERA_SHARD 774
-#define ITEM_DARK_TERA_SHARD 775
-#define ITEM_DRAGON_TERA_SHARD 776
-#define ITEM_ELECTRIC_TERA_SHARD 777
-#define ITEM_FAIRY_TERA_SHARD 778
-#define ITEM_FIGHTING_TERA_SHARD 779
-#define ITEM_FIRE_TERA_SHARD 780
-#define ITEM_FLYING_TERA_SHARD 781
-#define ITEM_GHOST_TERA_SHARD 782
-#define ITEM_GRASS_TERA_SHARD 783
-#define ITEM_GROUND_TERA_SHARD 784
-#define ITEM_ICE_TERA_SHARD 785
-#define ITEM_NORMAL_TERA_SHARD 786
-#define ITEM_POISON_TERA_SHARD 787
-#define ITEM_PSYCHIC_TERA_SHARD 788
-#define ITEM_ROCK_TERA_SHARD 789
-#define ITEM_STEEL_TERA_SHARD 790
-#define ITEM_WATER_TERA_SHARD 791
-
-#define ITEM_ADAMANT_CRYSTAL 792
-#define ITEM_GRISEOUS_CORE 793
-#define ITEM_LUSTROUS_GLOBE 794
-
-#define ITEM_BLACK_AUGURITE 795
-#define ITEM_LINKING_CORD 796
-#define ITEM_PEAT_BLOCK 797
-#define ITEM_BERSERK_GENE 798
-
-#define ITEM_FAIRY_FEATHER 799
-#define ITEM_SYRUPY_APPLE 800
-#define ITEM_UNREMARKABLE_TEACUP 801
-#define ITEM_MASTERPIECE_TEACUP 802
-#define ITEM_CORNERSTONE_MASK 803
-#define ITEM_WELLSPRING_MASK 804
-#define ITEM_HEARTHFLAME_MASK 805
-#define ITEM_HEALTH_MOCHI 806
-#define ITEM_MUSCLE_MOCHI 807
-#define ITEM_RESIST_MOCHI 808
-#define ITEM_GENIUS_MOCHI 809
-#define ITEM_CLEVER_MOCHI 810
-#define ITEM_SWIFT_MOCHI 811
-#define ITEM_FRESH_START_MOCHI 812
-#define ITEM_GLIMMERING_CHARM 813
-#define ITEM_METAL_ALLOY 814
-#define ITEM_STELLAR_TERA_SHARD 815
-
-#define ITEM_JUBILIFE_MUFFIN 816
-#define ITEM_REMEDY 817
-#define ITEM_FINE_REMEDY 818
-#define ITEM_SUPERB_REMEDY 819
-#define ITEM_AUX_EVASION 820
-#define ITEM_AUX_GUARD 821
-#define ITEM_AUX_POWER 822
-#define ITEM_AUX_POWERGUARD 823
-#define ITEM_CHOICE_DUMPLING 824
-#define ITEM_SWAP_SNACK 825
-#define ITEM_TWICE_SPICED_RADISH 826
-#define ITEM_POKESHI_DOLL 827
-
-#define ITEM_STRANGE_BALL 828
+#define ITEM_ABILITY_SHIELD 761
+#define ITEM_CLEAR_AMULET 762
+#define ITEM_PUNCHING_GLOVE 763
+#define ITEM_COVERT_CLOAK 764
+#define ITEM_LOADED_DICE 765
+#define ITEM_AUSPICIOUS_ARMOR 766
+#define ITEM_BOOSTER_ENERGY 767
+#define ITEM_BIG_BAMBOO_SHOOT 768
+#define ITEM_GIMMIGHOUL_COIN 769
+#define ITEM_LEADERS_CREST 770
+#define ITEM_MALICIOUS_ARMOR 771
+#define ITEM_MIRROR_HERB 772
+#define ITEM_SCROLL_OF_DARKNESS 773
+#define ITEM_SCROLL_OF_WATERS 774
+#define ITEM_TERA_ORB 775
+#define ITEM_TINY_BAMBOO_SHOOT 776
+
+#define ITEM_BUG_TERA_SHARD 777
+#define ITEM_DARK_TERA_SHARD 778
+#define ITEM_DRAGON_TERA_SHARD 779
+#define ITEM_ELECTRIC_TERA_SHARD 780
+#define ITEM_FAIRY_TERA_SHARD 781
+#define ITEM_FIGHTING_TERA_SHARD 782
+#define ITEM_FIRE_TERA_SHARD 783
+#define ITEM_FLYING_TERA_SHARD 784
+#define ITEM_GHOST_TERA_SHARD 785
+#define ITEM_GRASS_TERA_SHARD 786
+#define ITEM_GROUND_TERA_SHARD 787
+#define ITEM_ICE_TERA_SHARD 788
+#define ITEM_NORMAL_TERA_SHARD 789
+#define ITEM_POISON_TERA_SHARD 790
+#define ITEM_PSYCHIC_TERA_SHARD 791
+#define ITEM_ROCK_TERA_SHARD 792
+#define ITEM_STEEL_TERA_SHARD 793
+#define ITEM_WATER_TERA_SHARD 794
+
+#define ITEM_ADAMANT_CRYSTAL 795
+#define ITEM_GRISEOUS_CORE 796
+#define ITEM_LUSTROUS_GLOBE 797
+
+#define ITEM_BLACK_AUGURITE 798
+#define ITEM_LINKING_CORD 799
+#define ITEM_PEAT_BLOCK 800
+#define ITEM_BERSERK_GENE 801
+
+#define ITEM_FAIRY_FEATHER 802
+#define ITEM_SYRUPY_APPLE 803
+#define ITEM_UNREMARKABLE_TEACUP 804
+#define ITEM_MASTERPIECE_TEACUP 805
+#define ITEM_CORNERSTONE_MASK 806
+#define ITEM_WELLSPRING_MASK 807
+#define ITEM_HEARTHFLAME_MASK 808
+#define ITEM_HEALTH_MOCHI 809
+#define ITEM_MUSCLE_MOCHI 810
+#define ITEM_RESIST_MOCHI 811
+#define ITEM_GENIUS_MOCHI 812
+#define ITEM_CLEVER_MOCHI 813
+#define ITEM_SWIFT_MOCHI 814
+#define ITEM_FRESH_START_MOCHI 815
+#define ITEM_GLIMMERING_CHARM 816
+#define ITEM_METAL_ALLOY 817
+#define ITEM_STELLAR_TERA_SHARD 818
+
+#define ITEM_JUBILIFE_MUFFIN 819
+#define ITEM_REMEDY 820
+#define ITEM_FINE_REMEDY 821
+#define ITEM_SUPERB_REMEDY 822
+#define ITEM_AUX_EVASION 823
+#define ITEM_AUX_GUARD 824
+#define ITEM_AUX_POWER 825
+#define ITEM_AUX_POWERGUARD 826
+#define ITEM_CHOICE_DUMPLING 827
+#define ITEM_SWAP_SNACK 828
+#define ITEM_TWICE_SPICED_RADISH 829
+#define ITEM_POKESHI_DOLL 830
+
+#define ITEM_STRANGE_BALL 831
 
 // HOPO BERRY
 // LEGEND PLATE
 
-#define ITEMS_COUNT 829
+#define ITEMS_COUNT 832
 #define ITEM_FIELD_ARROW ITEMS_COUNT
 
 // A special item id associated with "Cancel"/"Exit" etc. in a list of items or decorations
@@ -1028,7 +1031,7 @@
 #define ITEM_TO_MULCH(itemId)(((itemId) - ITEM_GROWTH_MULCH) + 1)
 
 #define NUM_TECHNICAL_MACHINES 100
-#define NUM_HIDDEN_MACHINES 8
+#define NUM_HIDDEN_MACHINES 11
 
 #define MAX_BAG_ITEM_CAPACITY         999
 #define MAX_PC_ITEM_CAPACITY          999
diff --git a/include/constants/tms_hms.h b/include/constants/tms_hms.h
index 03fb934139..e4a94b8280 100644
--- 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
index 2b560ad9d5..b41bab1d90 100644
--- 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 and hurts the\n"
+                "foe in a whirlpool\n"
+                "for 4 or 5 turns."),
+        #else
+            .description = COMPOUND_STRING(
+                "Traps and 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