From 8971607d8d2f3222cf9e2f4d00053d18c3d4c7ff Mon Sep 17 00:00:00 2001 From: Zimmermann Gyula Date: Sat, 2 Dec 2023 14:12:57 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20HGSS=20Pok=C3=A9dex=20teachable=20moves?= =?UTF-8?q?=20list.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pokedex_plus_hgss.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 294d42b26e6d..18ea0824e1ad 100644 --- 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;