From ef7ddd6773ec7f016256563a7570e6749a280c3e Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Tue, 20 Oct 2020 07:36:05 +0100 Subject: [PATCH] MapHeader -> MapConfig It ain't a header if it ain't at the top of the data. --- include/map.h | 4 ++-- src/world/area_kmr/kmr_12/header.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/map.h b/include/map.h index 5ff8f504d8..e804934649 100644 --- a/include/map.h +++ b/include/map.h @@ -11,7 +11,7 @@ typedef Vec4f EntryList[]; -typedef struct MapHeader { +typedef struct MapConfig { /* 0x00 */ char unk_00[0x10]; /* 0x10 */ Script* main; /* 0x14 */ EntryList* entryList; @@ -22,7 +22,7 @@ typedef struct MapHeader { MessageID msgID; UNK_FUN_PTR(get); } tattle; -} MapHeader; // size = 0x40 +} MapConfig; // size = 0x40 typedef struct NpcAISettings { /* 0x00 */ f32 moveSpeed; diff --git a/src/world/area_kmr/kmr_12/header.c b/src/world/area_kmr/kmr_12/header.c index 93bf2dd0d6..f8b4cba3f5 100644 --- a/src/world/area_kmr/kmr_12/header.c +++ b/src/world/area_kmr/kmr_12/header.c @@ -5,7 +5,7 @@ static EntryList entryList = { { 471.0f, 0.0f, 12.0f, 270.0f }, // east, towards Goomba King's Fortress }; -MapHeader header = { +MapConfig config = { .main = kmr_12_main, .entryList = entryList, .entryCount = ENTRY_COUNT(entryList),