From 7a0edab5732b816536a35b0556d8fa1db13afa30 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 12 Dec 2019 16:10:45 -0500 Subject: fix rebase conflicts --- src/quest_log_815A008.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quest_log_815A008.c') diff --git a/src/quest_log_815A008.c b/src/quest_log_815A008.c index 234d5ad9c..3aa7ea3d2 100644 --- a/src/quest_log_815A008.c +++ b/src/quest_log_815A008.c @@ -51,7 +51,7 @@ void sub_815A008(struct QuestLog * questLog) void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates) { u32 i, j; - const struct QuestLogMapObject * questLogObjectEvents = questLog->unk_008; + const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008; CpuFill16(0, gObjectEvents, sizeof(gObjectEvents)); @@ -129,7 +129,7 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl } } - CpuCopy16(gObjectEvents, gSaveBlock1Ptr->mapObjects, sizeof(gObjectEvents)); + CpuCopy16(gObjectEvents, gSaveBlock1Ptr->objectEvents, sizeof(gObjectEvents)); } void sub_815A540(void) -- cgit v1.2.3