summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-10-14 15:23:14 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-10-14 15:23:14 +0200
commitaf7aa624cdf63e97faeb5f7c2bfde90163d259d7 (patch)
tree5b1b99bffbe0085f79e6e479fa87e54655b0f6ff
parent84936b4260f2864fe143415c6ca92e4b1704e4fe (diff)
make aprentice compile
-rw-r--r--src/easy_chat.c2
-rw-r--r--src/record_mixing.c2
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;
}