mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-25 19:24:16 +01:00
Fix some missing constant use in Apprentice
This commit is contained in:
parent
16c0be7ed2
commit
079f2da0f6
@ -1,6 +1,8 @@
|
||||
#ifndef GUARD_SCRIPT_MENU_H
|
||||
#define GUARD_SCRIPT_MENU_H
|
||||
|
||||
#include "constants/script_menu.h"
|
||||
|
||||
extern const u8 *const gStdStrings[];
|
||||
|
||||
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress);
|
||||
|
@ -346,11 +346,10 @@ static u16 GetRandomAlternateMove(u8 monId)
|
||||
learnset = gLevelUpLearnsets[species];
|
||||
j = 0;
|
||||
|
||||
// Despite being open level, level up moves are only read up to level 60
|
||||
if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
|
||||
level = 50;
|
||||
level = FRONTIER_MAX_LEVEL_50;
|
||||
else // == APPRENTICE_LVL_MODE_OPEN
|
||||
level = 60;
|
||||
level = 60; // Despite being open level, level up moves are only read up to level 60
|
||||
|
||||
for (j = 0; learnset[j] != LEVEL_UP_END; j++)
|
||||
{
|
||||
@ -464,7 +463,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves)
|
||||
const u16 *learnset;
|
||||
|
||||
if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
|
||||
level = 50;
|
||||
level = FRONTIER_MAX_LEVEL_50;
|
||||
else // == APPRENTICE_LVL_MODE_OPEN
|
||||
level = 60;
|
||||
|
||||
@ -666,11 +665,12 @@ static void Task_ChooseAnswer(u8 taskId)
|
||||
case MENU_NOTHING_CHOSEN:
|
||||
return;
|
||||
case MENU_B_PRESSED:
|
||||
// Only ever true. Answering Apprentice questions is required.
|
||||
if (tNoBButton)
|
||||
return;
|
||||
|
||||
PlaySE(SE_SELECT);
|
||||
gSpecialVar_Result = 0x7F;
|
||||
gSpecialVar_Result = MULTI_B_PRESSED;
|
||||
break;
|
||||
default:
|
||||
gSpecialVar_Result = input;
|
||||
|
@ -57,7 +57,6 @@
|
||||
#include "constants/heal_locations.h"
|
||||
#include "constants/map_types.h"
|
||||
#include "constants/mystery_gift.h"
|
||||
#include "constants/script_menu.h"
|
||||
#include "constants/slot_machine.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/moves.h"
|
||||
|
Loading…
Reference in New Issue
Block a user