From 7832a43544ea5b5441b3ccb011a04d36e936f4a4 Mon Sep 17 00:00:00 2001
From: Aaghat <adventureco36@gmail.com>
Date: Fri, 8 Sep 2023 21:47:43 +0530
Subject: [PATCH] Minor fixes

---
 include/party_menu.h    | 3 ---
 src/party_menu.c        | 5 -----
 src/pokedex_plus_hgss.c | 4 ++--
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/include/party_menu.h b/include/party_menu.h
index ab12d76c5e..38139cc962 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -96,8 +96,5 @@ void MoveDeleterForgetMove(void);
 void BufferMoveDeleterNicknameAndMove(void);
 void GetNumMovesSelectedMonHas(void);
 void MoveDeleterChooseMoveToForget(void);
-#if POKEDEX_PLUS_HGSS == TRUE
-u16 GetTMHMMoves(u16 item);
-#endif
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/src/party_menu.c b/src/party_menu.c
index 3cc84587cb..2b72566282 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -6964,8 +6964,3 @@ void IsLastMonThatKnowsSurf(void)
             gSpecialVar_Result = TRUE;
     }
 }
-
-u16 GetTMHMMoves(u16 item)
-{
-   return (ItemId_GetPocket(item) == POCKET_TM_HM) ? gItems[item].secondaryId : MOVE_NONE;
-}
diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c
index da6b25642d..2aa92c7c22 100644
--- a/src/pokedex_plus_hgss.c
+++ b/src/pokedex_plus_hgss.c
@@ -159,7 +159,7 @@ static EWRAM_DATA u16 sLastSelectedPokemon = 0;
 static EWRAM_DATA u8 sPokeBallRotation = 0;
 static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL;
 //Pokedex Plus HGSS_Ui
-#define MOVES_COUNT_TOTAL (EGG_MOVES_ARRAY_COUNT + MAX_LEVEL_UP_MOVES + NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES + 20)
+#define MOVES_COUNT_TOTAL (EGG_MOVES_ARRAY_COUNT + MAX_LEVEL_UP_MOVES + NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES)
 EWRAM_DATA static u16 sStatsMoves[MOVES_COUNT_TOTAL] = {0};
 EWRAM_DATA static u16 sStatsMovesTMHM_ID[NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES] = {0};
 
@@ -5108,7 +5108,7 @@ static bool8 CalculateMoves(void)
         move = gTeachableLearnsets[species][i];
         for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++)
         {
-            if (GetTMHMMoves(j) == move)
+            if (ItemIdToBattleMoveId(ITEM_TM01 + j) == move)
             {
                 sStatsMovesTMHM_ID[numTMHMMoves] = (ITEM_TM01 + j);
                 numTMHMMoves++;