Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-26 11:57:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync bev2 with pret

Browse Source
This commit is contained in:
ExpoSeed
2020-10-10 23:57:16 -05:00
parent 13f37cf974 97d0643110
commit 9e2c8a95c1
854 changed files with 66663 additions and 14056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/apprentice.c
View File

@@ -48,7 +48,7 @@
* - Asking which move a mon should use, which they will ask at most 5 times
* - Asking what held item to give to a mon, which they will ask at most 3 times (once for each mon)
* - Asking what they should say when they win a battle, which will always be their final question before departing
*
*
* ## After departing
* After telling them what they should say when they win a battle they will leave the lobby for a final time
* They will then be replaced by a new random Apprentice (they can repeat)
@@ -274,7 +274,7 @@ static void SetRandomQuestionData(void)
for (i = 0; i < ARRAY_COUNT(questionOrder); i++)
questionOrder[i] = sQuestionPossibilities[i];
// Shuffle the questions an arbitrary 50 times
for (i = 0; i < 50; i++)
{
@@ -342,7 +342,7 @@ static u16 GetRandomAlternateMove(u8 monId)
u8 id;
u8 numLearnsetMoves;
u16 species;
const u16 *learnset;
const struct LevelUpMove *learnset;
bool32 needTMs = FALSE;
u16 moveId = MOVE_NONE;
bool32 shouldUseMove;
@@ -367,9 +367,9 @@ static u16 GetRandomAlternateMove(u8 monId)
else // == APPRENTICE_LVL_MODE_OPEN
level = 60;
for (j = 0; learnset[j] != LEVEL_UP_END; j++)
for (j = 0; learnset[j].move != LEVEL_UP_END; j++)
{
if ((learnset[j] & LEVEL_UP_MOVE_LV) > (level << 9))
if (learnset[j].level > level)
break;
}
@@ -406,7 +406,7 @@ static u16 GetRandomAlternateMove(u8 monId)
for (; j < numLearnsetMoves; j++)
{
// Keep looking for TMs until one not in the level up learnset is found
if ((learnset[j] & LEVEL_UP_MOVE_ID) == moveId)
if ((learnset[j].move) == moveId)
{
shouldUseMove = FALSE;
break;
@@ -430,13 +430,13 @@ static u16 GetRandomAlternateMove(u8 monId)
{
// Get a random move excluding the 4 it would know at max level
u8 learnsetId = Random() % (numLearnsetMoves - MAX_MON_MOVES);
moveId = learnset[learnsetId] & LEVEL_UP_MOVE_ID;
moveId = learnset[learnsetId].move;
shouldUseMove = TRUE;
for (j = numLearnsetMoves - MAX_MON_MOVES; j < numLearnsetMoves; j++)
{
// Keep looking for moves until one not in the last 4 is found
if ((learnset[j] & LEVEL_UP_MOVE_ID) == moveId)
if ((learnset[j].move) == moveId)
{
shouldUseMove = FALSE;
break;
@@ -476,7 +476,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves)
{
u8 i, j;
u8 level, numLearnsetMoves;
const u16 *learnset;
const struct LevelUpMove *learnset;
if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
level = 50;
@@ -484,9 +484,9 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves)
level = 60;
learnset = gLevelUpLearnsets[species];
for (i = 0; learnset[i] != LEVEL_UP_END; i++)
for (i = 0; learnset[i].move != LEVEL_UP_END; i++)
{
if ((learnset[i] & LEVEL_UP_MOVE_LV) > (level << 9))
if (learnset[i].level > level)
break;
}
@@ -495,7 +495,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves)
numLearnsetMoves = MAX_MON_MOVES;
for (j = 0; j < numLearnsetMoves; j++)
moves[j] = learnset[(i - 1) - j] & LEVEL_UP_MOVE_ID;
moves[j] = learnset[(i - 1) - j].move;
}
// Get the level up move or previously suggested move to be the first move choice
@@ -801,7 +801,7 @@ static void GetNumApprenticePartyMonsAssigned(void)
static void IsFinalQuestion(void)
{
s32 questionNum = CURRENT_QUESTION_NUM;
if (questionNum < 0)
{
// Not finished asking initial questions
@@ -954,7 +954,7 @@ static void ApprenticeGetQuestion(void)
gSpecialVar_Result = APPRENTICE_QUESTION_WHICH_FIRST;
break;
default:
//case QUESTION_ID_WIN_SPEECH:
//case QUESTION_ID_WIN_SPEECH:
gSpecialVar_Result = APPRENTICE_QUESTION_WIN_SPEECH;
break;
}