summaryrefslogtreecommitdiff
path: root/src/pokemon_3.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-10 11:01:29 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-10 11:09:57 -0500
commit2e80477ea11c265e69658b852c57097fd8a21492 (patch)
tree3df0755d3a2468805117b4ff8f34d10f53df3734 /src/pokemon_3.c
parentc5bcb67bb871a445b20bbc0c226bc290dc5ba6bc (diff)
Label move_tutor_menu.c
Diffstat (limited to 'src/pokemon_3.c')
-rw-r--r--src/pokemon_3.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index abf1ef9c6..c6eda8bca 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -10,6 +10,7 @@
#include "link.h"
#include "m4a.h"
#include "main.h"
+#include "move_tutor_menu.h"
#include "pokemon.h"
#include "random.h"
#include "overworld.h"
@@ -993,18 +994,18 @@ u32 CanMonLearnTMHM(struct Pokemon *mon, u8 tm)
}
}
-u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves)
+u8 GetMoveTutorMoves(struct Pokemon *mon, u16 *moves)
{
- u16 learnedMoves[4];
+ u16 knownMoves[4];
u8 numMoves = 0;
u16 species = GetMonData(mon, MON_DATA_SPECIES, 0);
u8 level = GetMonData(mon, MON_DATA_LEVEL, 0);
int i, j, k;
for (i = 0; i < 4; i++)
- learnedMoves[i] = GetMonData(mon, MON_DATA_MOVE1 + i, 0);
+ knownMoves[i] = GetMonData(mon, MON_DATA_MOVE1 + i, 0);
- for (i = 0; i < 20; i++)
+ for (i = 0; i < MAX_MOVE_TUTOR_MOVES; i++)
{
u16 moveLevel;
@@ -1012,10 +1013,9 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves)
break;
moveLevel = gLevelUpLearnsets[species][i] & 0xFE00;
-
if (moveLevel <= (level << 9))
{
- for (j = 0; j < 4 && learnedMoves[j] != (gLevelUpLearnsets[species][i] & 0x1FF); j++)
+ for (j = 0; j < 4 && knownMoves[j] != (gLevelUpLearnsets[species][i] & 0x1FF); j++)
;
if (j == 4)