ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some missing constant use in Apprentice

Browse Source
This commit is contained in:
GriffinR 2023-08-10 00:38:23 -04:00
parent 16c0be7ed2
commit 079f2da0f6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/script_menu.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_SCRIPT_MENU_H #ifndef GUARD_SCRIPT_MENU_H
#define GUARD_SCRIPT_MENU_H #define GUARD_SCRIPT_MENU_H
#include "constants/script_menu.h"
extern const u8 *const gStdStrings[]; extern const u8 *const gStdStrings[];
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress); bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress);

10
src/apprentice.c
View File

@ -346,11 +346,10 @@ static u16 GetRandomAlternateMove(u8 monId)
learnset = gLevelUpLearnsets[species]; learnset = gLevelUpLearnsets[species];
j = 0; j = 0;
// Despite being open level, level up moves are only read up to level 60
if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50) if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
level = 50; level = FRONTIER_MAX_LEVEL_50;
else // == APPRENTICE_LVL_MODE_OPEN 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++) for (j = 0; learnset[j] != LEVEL_UP_END; j++)
{ {
@ -464,7 +463,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves)
const u16 *learnset; const u16 *learnset;
if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50) if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
level = 50; level = FRONTIER_MAX_LEVEL_50;
else // == APPRENTICE_LVL_MODE_OPEN else // == APPRENTICE_LVL_MODE_OPEN
level = 60; level = 60;
@ -666,11 +665,12 @@ static void Task_ChooseAnswer(u8 taskId)
case MENU_NOTHING_CHOSEN: case MENU_NOTHING_CHOSEN:
return; return;
case MENU_B_PRESSED: case MENU_B_PRESSED:
// Only ever true. Answering Apprentice questions is required.
if (tNoBButton) if (tNoBButton)
return; return;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gSpecialVar_Result = 0x7F; gSpecialVar_Result = MULTI_B_PRESSED;
break; break;
default: default:
gSpecialVar_Result = input; gSpecialVar_Result = input;

1
src/field_specials.c
View File

@ -57,7 +57,6 @@
#include "constants/heal_locations.h" #include "constants/heal_locations.h"
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/mystery_gift.h" #include "constants/mystery_gift.h"
#include "constants/script_menu.h"
#include "constants/slot_machine.h" #include "constants/slot_machine.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/moves.h" #include "constants/moves.h"

1
src/tv.c
View File

@ -45,7 +45,6 @@
#include "constants/metatile_labels.h" #include "constants/metatile_labels.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
#include "constants/script_menu.h"
#define LAST_TVSHOW_IDX (TV_SHOWS_COUNT - 1) #define LAST_TVSHOW_IDX (TV_SHOWS_COUNT - 1)