atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add NO_COND macro

Browse source
This commit is contained in:
ProjectRevoTPP 2021-04-22 17:20:28 -04:00
parent 5c51a3ecc6
commit 6ebd0ccb57
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/apprentice.c
View file

@ -325,6 +325,10 @@ static void SetRandomQuestionData(void)
#define APPRENTICE_SPECIES_ID(monId) \ #define APPRENTICE_SPECIES_ID(monId) \
((monId < MULTI_PARTY_SIZE) ? (PLAYER_APPRENTICE.speciesIds[monId] >> (((PLAYER_APPRENTICE.party >> monId) & 1) << 2) & 0xF) : 0) ((monId < MULTI_PARTY_SIZE) ? (PLAYER_APPRENTICE.speciesIds[monId] >> (((PLAYER_APPRENTICE.party >> monId) & 1) << 2) & 0xF) : 0)
#define APPRENTICE_SPECIES_ID_NO_COND(monId, count) \
monId = ((PLAYER_APPRENTICE.party >> count) & 1); \
monId = ((PLAYER_APPRENTICE.speciesIds[count]) >> (monId << 2)) & 0xF; \
// Get the second move choice for the "Which move" question // Get the second move choice for the "Which move" question
// Unlike the first move choice, this can be either a level up move or a TM/HM move // Unlike the first move choice, this can be either a level up move or a TM/HM move
static u16 GetRandomAlternateMove(u8 monId) static u16 GetRandomAlternateMove(u8 monId)
@ -997,12 +1001,9 @@ static void InitQuestionData(void)
&& PLAYER_APPRENTICE.questionsAnswered < count + NUM_WHICH_MON_QUESTIONS && PLAYER_APPRENTICE.questionsAnswered < count + NUM_WHICH_MON_QUESTIONS
&& PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].questionId == QUESTION_ID_WHICH_MOVE) && PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].questionId == QUESTION_ID_WHICH_MOVE)
{ {
u8 a0;
// count re-used as monId // count re-used as monId
count = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].monId; count = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].monId;
a0 = ((PLAYER_APPRENTICE.party >> count) & 1); APPRENTICE_SPECIES_ID_NO_COND(id1, count);
id1 = PLAYER_APPRENTICE.speciesIds[count];
id1 = ((id1) >> (a0 << 2)) & 0xF;
gApprenticeQuestionData->speciesId = gApprentices[PLAYER_APPRENTICE.id].species[id1]; gApprenticeQuestionData->speciesId = gApprentices[PLAYER_APPRENTICE.id].species[id1];
gApprenticeQuestionData->moveId1 = GetDefaultMove(count, id1, PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].moveSlot); gApprenticeQuestionData->moveId1 = GetDefaultMove(count, id1, PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].moveSlot);
gApprenticeQuestionData->moveId2 = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data; gApprenticeQuestionData->moveId2 = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data;
@ -1014,12 +1015,9 @@ static void InitQuestionData(void)
&& PLAYER_APPRENTICE.questionsAnswered < count + NUM_WHICH_MON_QUESTIONS && PLAYER_APPRENTICE.questionsAnswered < count + NUM_WHICH_MON_QUESTIONS
&& PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].questionId == QUESTION_ID_WHAT_ITEM) && PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].questionId == QUESTION_ID_WHAT_ITEM)
{ {
u8 a0;
// count re-used as monId // count re-used as monId
count = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].monId; count = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].monId;
a0 = ((PLAYER_APPRENTICE.party >> count) & 1); APPRENTICE_SPECIES_ID_NO_COND(id2, count);
id2 = PLAYER_APPRENTICE.speciesIds[count];
id2 = ((id2) >> (a0 << 2)) & 0xF;
gApprenticeQuestionData->speciesId = gApprentices[PLAYER_APPRENTICE.id].species[id2]; gApprenticeQuestionData->speciesId = gApprentices[PLAYER_APPRENTICE.id].species[id2];
} }
} }