ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 18:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

make aprentice compile

Browse Source
This commit is contained in:
DizzyEggg 2018-10-14 15:23:14 +02:00
parent 84936b4260
commit af7aa624cd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/easy_chat.c
View File

@ -352,7 +352,7 @@ void easy_chat_input_maybe(void)
words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014; words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014;
break; break;
case 19: case 19:
words = gSaveBlock2Ptr->field_DC[0].easyChatWords; words = gSaveBlock2Ptr->apprentices[0].easyChatWords;
break; break;
case 20: case 20:
words = sub_801B058(); words = sub_801B058();

2
src/record_mixing.c
View File

@ -1653,7 +1653,7 @@ static bool32 sub_80E841C(struct Apprentice *arg0, struct Apprentice *arg1)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (ReadUnalignedWord(arg0->playerId) == ReadUnalignedWord(arg1[i].playerId) if (ReadUnalignedWord(arg0->playerId) == ReadUnalignedWord(arg1[i].playerId)
&& arg0->field_2 == arg1[i].field_2) && arg0->number == arg1[i].number)
{ {
return TRUE; return TRUE;
} }