From af7aa624cdf63e97faeb5f7c2bfde90163d259d7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 14 Oct 2018 15:23:14 +0200 Subject: [PATCH] make aprentice compile --- src/easy_chat.c | 2 +- src/record_mixing.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/easy_chat.c b/src/easy_chat.c index 50ed0a649..7d25d1430 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -352,7 +352,7 @@ void easy_chat_input_maybe(void) words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014; break; case 19: - words = gSaveBlock2Ptr->field_DC[0].easyChatWords; + words = gSaveBlock2Ptr->apprentices[0].easyChatWords; break; case 20: words = sub_801B058(); diff --git a/src/record_mixing.c b/src/record_mixing.c index 2f28ff360..88f7e60f5 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1653,7 +1653,7 @@ static bool32 sub_80E841C(struct Apprentice *arg0, struct Apprentice *arg1) for (i = 0; i < 4; i++) { if (ReadUnalignedWord(arg0->playerId) == ReadUnalignedWord(arg1[i].playerId) - && arg0->field_2 == arg1[i].field_2) + && arg0->number == arg1[i].number) { return TRUE; }