diff --git a/src/battle_main.c b/src/battle_main.c
index 20538985a5..d98834029d 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -305,7 +305,7 @@ const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] =
 {
     [TRAINER_CLASS_PKMN_TRAINER_1] = { _("宝可梦训练家") },
     [TRAINER_CLASS_PKMN_TRAINER_2] = { _("宝可梦训练家") },
-    [TRAINER_CLASS_HIKER] = { _("登山男"), 10 },
+    [TRAINER_CLASS_HIKER] = { _("登山男"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_ULTRA : BALL_POKE },
     [TRAINER_CLASS_TEAM_AQUA] = { _("海洋队") },
     [TRAINER_CLASS_PKMN_BREEDER] = { _("宝可梦培育家"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_HEAL : BALL_FRIEND },
     [TRAINER_CLASS_COOLTRAINER] = { _("精英训练家"), 12, BALL_ULTRA },
@@ -324,7 +324,7 @@ const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] =
     [TRAINER_CLASS_TUBER_F] = { _("泳圈女孩"), 1 },
     [TRAINER_CLASS_TUBER_M] = { _("泳圈男孩"), 1 },
     [TRAINER_CLASS_LADY] = { _("千金小姐"), 50 },
-    [TRAINER_CLASS_BEAUTY] = { _("大姐姐"), 20 },
+    [TRAINER_CLASS_BEAUTY] = { _("大姐姐"), 20, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_GREAT : BALL_POKE },
     [TRAINER_CLASS_RICH_BOY] = { _("富家少爷"), 50 },
     [TRAINER_CLASS_POKEMANIAC] = { _("怪兽狂"), 15 },
     [TRAINER_CLASS_GUITARIST] = { _("吉他手"), 8 },
@@ -335,13 +335,13 @@ const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] =
     [TRAINER_CLASS_PSYCHIC] = { _("超能力者"), 6 },
     [TRAINER_CLASS_GENTLEMAN] = { _("绅士"), 20, BALL_LUXURY },
     [TRAINER_CLASS_ELITE_FOUR] = { _("四天王"), 25, BALL_ULTRA },
-    [TRAINER_CLASS_LEADER] = { _("道馆馆主"), 25 },
+    [TRAINER_CLASS_LEADER] = { _("道馆馆主"), 25, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_ULTRA : BALL_POKE },
     [TRAINER_CLASS_SCHOOL_KID] = { _("补习班学生") },
     [TRAINER_CLASS_SR_AND_JR] = { _("前辈和后辈"), 4 },
     [TRAINER_CLASS_WINSTRATE] = { _("连胜家族"), 10 },
     [TRAINER_CLASS_POKEFAN] = { _("发烧友俱乐部"), 20 },
     [TRAINER_CLASS_YOUNGSTER] = { _("短裤小子"), 4 },
-    [TRAINER_CLASS_CHAMPION] = { _("冠军"), 50 },
+    [TRAINER_CLASS_CHAMPION] = { _("冠军"), 50, BALL_ULTRA },
     [TRAINER_CLASS_FISHERMAN] = { _("垂钓者"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_DIVE : BALL_LURE },
     [TRAINER_CLASS_TRIATHLETE] = { _("铁人三项选手"), 10 },
     [TRAINER_CLASS_DRAGON_TAMER] = { _("驯龙师"), 12 },
@@ -361,7 +361,7 @@ const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] =
     [TRAINER_CLASS_YOUNG_COUPLE] = { _("热恋情侣"), 8 },
     [TRAINER_CLASS_OLD_COUPLE] = { _("金婚夫妻"), 10 },
     [TRAINER_CLASS_SIS_AND_BRO] = { _("海上姐弟"), 3 },
-    [TRAINER_CLASS_SALON_MAIDEN] = { _("对战塔大君") },
+    [TRAINER_CLASS_SALON_MAIDEN] = { _("对战塔大君"), 0, BALL_ULTRA },
     [TRAINER_CLASS_DOME_ACE] = { _("巨蛋超级巨星") },
     [TRAINER_CLASS_PALACE_MAVEN] = { _("宫殿守护者") },
     [TRAINER_CLASS_ARENA_TYCOON] = { _("竞技场主将") },
diff --git a/src/item_menu.c b/src/item_menu.c
index 8b7aa84cc1..9c0b62fde8 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -937,7 +937,7 @@ static void GetItemNameFromPocket(u8 *dest, u16 itemId)
     {
     case POCKET_TM_HM:
         end = StringCopy(gStringVar2, GetMoveName(ItemIdToBattleMoveId(itemId)));
-        PrependFontIdToFit(gStringVar2, end, FONT_NARROW, 61);
+        PrependFontIdToFit(gStringVar2, end, FONT_NARROW, NUM_TECHNICAL_MACHINES >= 100 ? 60 : 65);
         if (GetItemTMHMIndex(itemId) > NUM_TECHNICAL_MACHINES)
         {
             // Get HM number
@@ -947,7 +947,7 @@ static void GetItemNameFromPocket(u8 *dest, u16 itemId)
         else
         {
             // Get TM number
-            ConvertIntToDecimalStringN(gStringVar1, GetItemTMHMIndex(itemId), STR_CONV_MODE_LEADING_ZEROS, 2);
+            ConvertIntToDecimalStringN(gStringVar1, GetItemTMHMIndex(itemId), STR_CONV_MODE_LEADING_ZEROS, NUM_TECHNICAL_MACHINES >= 100 ? 3 : 2);
             StringExpandPlaceholders(dest, gText_NumberItem_TMBerry);
         }
         break;
diff --git a/src/strings.c b/src/strings.c
index d2985419fb..3cdec7114b 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -206,7 +206,7 @@ const u8 *const gPocketNamesStringsTable[] =
     [POCKET_KEY_ITEMS] = COMPOUND_STRING("重要物品")
 };
 
-const u8 gText_NumberItem_TMBerry[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}");
+const u8 gText_NumberItem_TMBerry[] = _("{NO}{STR_VAR_1}{CLEAR 0x03}{STR_VAR_2}");
 const u8 gText_NumberItem_HM[] = _("{CLEAR_TO 0x11}{STR_VAR_1}{CLEAR 0x05}{STR_VAR_2}");
 
 const u8 gText_ShopBuy[] = _("购买");