Fix HGSS Pokédex teachable moves list. (#3624)

Co-authored-by: Alex <[email protected]>
rh-hideout · Dec 6, 2023 · 7f0b1da · 7f0b1da
1 parent f7ca839
commit 7f0b1da
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c
@@ -5276,14 +5276,30 @@ static bool8 CalculateMoves(void)
             {
                 sStatsMovesTMHM_ID[numTMHMMoves] = (ITEM_TM01 + j);
                 numTMHMMoves++;
+
+                sStatsMoves[movesTotal] = move;
+                movesTotal++;
                 break;
             }
         }
+    }
+
+    for (i = 0; gTeachableLearnsets[species][i] != MOVE_UNAVAILABLE; i++)
+    {
+        move = gTeachableLearnsets[species][i];
+        for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++)
+        {
+            if (ItemIdToBattleMoveId(ITEM_TM01 + j) == move)
+                break;
+        }
+
         if (j >= NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES)
+        {
             numTutorMoves++;
-
-        sStatsMoves[movesTotal] = move;
-        movesTotal++;
+
+            sStatsMoves[movesTotal] = move;
+            movesTotal++;
+        }
     }
 
     sPokedexView->numEggMoves = numEggMoves;