summaryrefslogtreecommitdiff
path: root/src/evolution_scene.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-10-17 19:22:03 -0400
committerGriffinR <griffin.richards@comcast.net>2019-10-25 15:41:06 -0400
commit6db014cc32d28a64499af7d605be3a062560d5e0 (patch)
tree378d719659dd5a32b077bd6ee8140ccae6b2799c /src/evolution_scene.c
parent60a592a2c32d07d47c892204659a8576017584d1 (diff)
Document party_menu first pass
Diffstat (limited to 'src/evolution_scene.c')
-rw-r--r--src/evolution_scene.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index af560bc40..929539d30 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -743,12 +743,12 @@ static void Task_EvolutionScene(u8 taskID)
GetMonData(mon, MON_DATA_NICKNAME, text);
StringCopy10(gBattleTextBuff1, text);
- if (var == 0xFFFF) // no place to learn it
+ if (var == MON_HAS_MAX_MOVES)
gTasks[taskID].tState = 22;
- else if (var == 0xFFFE) // it already knows that move
+ else if (var == MON_ALREADY_KNOWS_MOVE)
break;
else
- gTasks[taskID].tState = 20; // has less than 4 moves, so it's been learned
+ gTasks[taskID].tState = 20; // move has been learned
}
else // no move to learn
{
@@ -909,8 +909,8 @@ static void Task_EvolutionScene(u8 taskID)
case 6:
if (!gPaletteFade.active && gMain.callback2 == CB2_EvolutionSceneUpdate)
{
- var = sub_81C1B94(); // moveID
- if (var == 4)
+ var = GetMoveSlotToReplace();
+ if (var == MAX_MON_MOVES)
{
gTasks[taskID].tLearnMoveState = 10;
}
@@ -1100,9 +1100,9 @@ static void Task_TradeEvolutionScene(u8 taskID)
GetMonData(mon, MON_DATA_NICKNAME, text);
StringCopy10(gBattleTextBuff1, text);
- if (var == 0xFFFF)
+ if (var == MON_HAS_MAX_MOVES)
gTasks[taskID].tState = 20;
- else if (var == 0xFFFE)
+ else if (var == MON_ALREADY_KNOWS_MOVE)
break;
else
gTasks[taskID].tState = 18;
@@ -1243,8 +1243,8 @@ static void Task_TradeEvolutionScene(u8 taskID)
case 6:
if (!gPaletteFade.active && gMain.callback2 == CB2_TradeEvolutionSceneUpdate)
{
- var = sub_81C1B94(); // moveID
- if (var == 4)
+ var = GetMoveSlotToReplace();
+ if (var == MAX_MON_MOVES)
{
gTasks[taskID].tLearnMoveState = 9;
}