dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

[LEAK-INFORMED] fix do {} while (0) in apprentice

Browse Source
This commit is contained in:
Kurausukun
2021-05-11 04:53:31 -04:00
committed by huderlem
parent e737f1f924
commit 3a403dc520
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/apprentice.c
View File

@@ -30,7 +30,7 @@
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/moves.h" #include "constants/moves.h"
/* Summary of Apprentice, because (as of writing at least) its not very well documented online /* Summary of Apprentice, because (as of writing at least) it's not very well documented online
* *
* ## Basic info * ## Basic info
* In the Battle Tower lobby there is an NPC which asks to be taught by the player * In the Battle Tower lobby there is an NPC which asks to be taught by the player
@@ -1107,17 +1107,24 @@ static void TrySetApprenticeHeldItem(void)
if (PLAYER_APPRENTICE.questionsAnswered < NUM_WHICH_MON_QUESTIONS) if (PLAYER_APPRENTICE.questionsAnswered < NUM_WHICH_MON_QUESTIONS)
return; return;
for (count = 0, j = 0; j < APPRENTICE_MAX_QUESTIONS && PLAYER_APPRENTICE.questions[j].questionId != QUESTION_ID_WIN_SPEECH; count++, j++) count = 0;
; for (j = 0; j < APPRENTICE_MAX_QUESTIONS; j++)
// Make sure the item hasnt already been suggested in previous questions
for (i = 0; i < count && i < CURRENT_QUESTION_NUM; i++)
{ {
do {} while(0); if (PLAYER_APPRENTICE.questions[j].questionId == QUESTION_ID_WIN_SPEECH)
if (PLAYER_APPRENTICE.questions[i].questionId == QUESTION_ID_WHAT_ITEM break;
&& PLAYER_APPRENTICE.questions[i].suggestedChange count++;
&& PLAYER_APPRENTICE.questions[i].data == gSpecialVar_0x8005) }
// Make sure the item hasn't already been suggested in previous questions
for (i = 0; i < count; i++)
{
if (i >= CURRENT_QUESTION_NUM)
break;
if (PLAYER_APPRENTICE.questions[i].questionId != QUESTION_ID_WHAT_ITEM ||
PLAYER_APPRENTICE.questions[i].suggestedChange == 0)
continue;
if (PLAYER_APPRENTICE.questions[i].data == gSpecialVar_0x8005)
{ {
PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].suggestedChange = FALSE; PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].suggestedChange = FALSE;
PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data = gSpecialVar_0x8005; PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data = gSpecialVar_0x8005;