From 0b8252cfe99651b3174ac8652ba133781e8e2105 Mon Sep 17 00:00:00 2001 From: Roman971 <32455037+Roman971@users.noreply.github.com> Date: Wed, 28 Apr 2021 11:10:23 +0200 Subject: [PATCH] Improve the format in z_map_mark_data.c and cleanup mapmark.py (#798) * Cleanup mapmark.py script * Rename map mark defines * Remove unused entries from map_mark_data --- include/z64map_mark.h | 6 +- src/code/z_map_mark.c | 5 +- .../ovl_map_mark_data/z_map_mark_data.c | 1966 +++-------------- tools/overlayhelpers/mapmark.py | 50 +- 4 files changed, 354 insertions(+), 1673 deletions(-) diff --git a/include/z64map_mark.h b/include/z64map_mark.h index 66191a0841..cfd2e32303 100644 --- a/include/z64map_mark.h +++ b/include/z64map_mark.h @@ -3,9 +3,9 @@ #include "ultra64.h" -#define MAP_MARK_ICON_NONE -1 -#define MAP_MARK_ICON_CHEST 0 -#define MAP_MARK_ICON_BOSS 1 +#define MAP_MARK_NONE -1 +#define MAP_MARK_CHEST 0 +#define MAP_MARK_BOSS 1 typedef struct { /* 0x00 */ s8 chestFlag; // chest icon is only displayed if this flag is not set for the current room diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index d5a8c5cf64..8854586774 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -98,7 +98,7 @@ void MapMark_Draw(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_map_mark.c", 303); while (true) { - if (mapMarkIconData->markType == MAP_MARK_ICON_NONE) { + if (mapMarkIconData->markType == MAP_MARK_NONE) { break; } @@ -109,8 +109,7 @@ void MapMark_Draw(GlobalContext* globalCtx) { markPoint = mapMarkIconData->points; for (i = 0; i < mapMarkIconData->count; i++) { - if (mapMarkIconData->markType != MAP_MARK_ICON_CHEST || - !Flags_GetTreasure(globalCtx, markPoint->chestFlag)) { + if ((mapMarkIconData->markType != MAP_MARK_CHEST) || !Flags_GetTreasure(globalCtx, markPoint->chestFlag)) { markInfo = &sMapMarkInfoTable[mapMarkIconData->markType]; gDPPipeSync(OVERLAY_DISP++); diff --git a/src/overlays/ovl_map_mark_data/z_map_mark_data.c b/src/overlays/ovl_map_mark_data/z_map_mark_data.c index 698847853a..7fed7c64c1 100644 --- a/src/overlays/ovl_map_mark_data/z_map_mark_data.c +++ b/src/overlays/ovl_map_mark_data/z_map_mark_data.c @@ -3,2754 +3,1438 @@ MapMarkData sMapMarkDekuTree[] = { // Deku Tree minimap 0 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 3, 71, 50 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 1 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 2 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 1, 64, 62 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 3 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 4, 76, 37 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 4 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 5 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 0, 46, 50 }, { 5, 76, 52 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 6 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 7 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 9 { - { MAP_MARK_ICON_BOSS, + { MAP_MARK_BOSS, 1, { { -1, 50, 23 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 10 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 2, 46, 50 }, { 6, 58, 60 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 11 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Deku Tree minimap 12 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkDodongosCavern[] = { // Dodongo's Cavern minimap 0 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 0, 69, 14 }, { 4, 69, 30 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 1 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 2 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 3 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 4 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 5 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 5, 54, 54 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 6 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 2, 69, 54 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 7 { - { MAP_MARK_ICON_BOSS, + { MAP_MARK_BOSS, 1, { { -1, 37, 49 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 9 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 3, 59, 53 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 10 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 11 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 12 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 13 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 14 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 1, 68, 54 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 15 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 16 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 17 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Dodongo's Cavern minimap 18 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkJabuJabuBelly[] = { // Jabu-Jabu's Belly minimap 0 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 3, 66, 50 }, { 5, 72, 47 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 1 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 7, 72, 54 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 2 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 3 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 4, 64, 62 }, { 8, 79, 38 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 4 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 5 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 10, 64, 45 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_BOSS, + { MAP_MARK_BOSS, 1, { { -1, 67, 32 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 6 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 7 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 9 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 10 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 11 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 9, 68, 45 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 12 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 13 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 14 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 1, 79, 33 }, { 6, 61, 41 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Jabu-Jabu's Belly minimap 15 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 0, 48, 57 }, { 2, 77, 55 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkForestTemple[] = { // Forest Temple minimap 0 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 1 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 2 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 3 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 4 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 5 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 6 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 0, 72, 57 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 7 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 1, 69, 39 }, { 9, 62, 65 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 9 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 9, 71, 59 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 10 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 11 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 12 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 13, 80, 53 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 13 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 15, 49, 50 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 14 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 15 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 6, 65, 53 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 16 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 17 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 11, 39, 35 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_BOSS, + { MAP_MARK_BOSS, 1, { { -1, 53, 5 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 18 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 2, 65, 54 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 19 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 14, 64, 31 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 20 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 21 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 22 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 3, 75, 53 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 23 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 12, 69, 52 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 24 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 5, 58, 27 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 25 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Forest Temple minimap 26 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkFireTemple[] = { // Fire Temple minimap 0 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 1 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 2 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 7, 53, 70 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_BOSS, + { MAP_MARK_BOSS, 1, { { -1, 40, 47 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 3 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 4 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 11, 57, 48 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 5 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 3, 67, 73 }, { 6, 58, 76 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 6 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 7 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 9 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 10 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 11 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 12 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 13 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 14 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 15 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 16 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 17 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 2, 78, 62 }, { 12, 77, 58 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 18 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 19 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 4, 60, 54 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 20 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 21 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 22 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 1, 72, 68 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 23 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 8, 66, 57 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 24 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 25 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 26 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 27 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 28 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 29 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 30 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 31 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 32 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 33 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 34 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 35 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 5, 51, 61 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 36 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Fire Temple minimap 37 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkWaterTemple[] = { // Water Temple minimap 0 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 1 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 2 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 6, 81, 68 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 3 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 4 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 5 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 6 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 7 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 9 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 5, 75, 55 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 10 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 11 { - { MAP_MARK_ICON_BOSS, + { MAP_MARK_BOSS, 1, { { -1, 77, 40 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 12 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 13 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 14 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 15 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 16 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 17 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 18 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 1, 74, 61 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 19 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 2, 73, 65 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 20 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 21 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 22 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 23 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 24 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 25 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 26 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 27 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 28 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 29 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 30 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 31 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 32 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 33 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 34 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 35 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 36 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 37 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 38 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 39 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 0, 73, 63 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 40 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 41 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 42 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Water Temple minimap 43 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkSpiritTemple[] = { // Spirit Temple minimap 0 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 4, { { 26, 27, 35 }, { 27, 36, 35 }, { 30, 27, 28 }, { 31, 36, 28 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 1 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 29, 67, 63 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 2 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 3 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 0, 71, 62 }, { 8, 71, 48 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 4 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 5 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 3, 56, 54 }, { 15, 69, 42 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 6 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 28, 60, 54 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 7 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 8 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 1, 76, 40 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 9 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 10 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 11 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 12 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 7, 70, 53 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 13 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 14 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 4, 68, 42 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 15 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 16 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 17 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 25, 78, 58 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 18 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 24, 78, 58 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 19 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 20 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 21 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 5, 71, 55 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 22 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 23 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 24 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 25 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 26 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 18, 75, 54 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 27 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 28 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 6, 78, 55 }, { 12, 70, 70 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 29 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 2, 76, 37 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_BOSS, + { MAP_MARK_BOSS, 1, { { -1, 57, 23 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 30 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 31 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Spirit Temple minimap 32 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkShadowTemple[] = { // Shadow Temple minimap 0 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 1 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 1, 77, 64 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 2 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 3 { - { MAP_MARK_ICON_BOSS, + { MAP_MARK_BOSS, 1, { { -1, 77, 76 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 4 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 7, 76, 65 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 5 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 6 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 2, 83, 67 }, { 14, 84, 59 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 7 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 3, 76, 67 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 9 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 10 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 3, { { 4, 78, 62 }, { 5, 74, 62 }, { 6, 71, 68 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 11 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 9, 77, 64 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 12 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 13 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 10, 71, 65 }, { 11, 80, 65 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 14 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 16, 73, 64 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 15 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 16 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 12, 87, 64 }, { 22, 87, 68 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 17 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 13, 77, 66 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 18 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 19 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 21, 78, 66 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 20 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 2, { { 8, 76, 66 }, { 20, 78, 68 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 21 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 14, 77, 62 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 22 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 23 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 15, 56, 67 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 24 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 25 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 16, 73, 64 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Shadow Temple minimap 26 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 14, 77, 62 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkBottomWell[] = { // Bottom of the Well minimap 0 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 3, 60, 18 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 1 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 2 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 3 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 4 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 2, 73, 61 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 5 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 6 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 7 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Bottom of the Well minimap 9 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 1, 74, 66 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; MapMarkData sMapMarkIceCavern[] = { // Ice Cavern minimap 0 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 1 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 2 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 3 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 4 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 5 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 6 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 7 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 2, 71, 59 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 8 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 9 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 0, 48, 36 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 10 { - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, // Ice Cavern minimap 11 { - { MAP_MARK_ICON_CHEST, + { MAP_MARK_CHEST, 1, { { 1, 73, 67 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, } }, - { MAP_MARK_ICON_NONE, 0, { 0 } }, - { 0 }, + { MAP_MARK_NONE, 0, { 0 } }, }, }; diff --git a/tools/overlayhelpers/mapmark.py b/tools/overlayhelpers/mapmark.py index e483483cb7..2c1d0f9682 100644 --- a/tools/overlayhelpers/mapmark.py +++ b/tools/overlayhelpers/mapmark.py @@ -6,7 +6,6 @@ import sys NUM_SCENES = 10 SIMPLIFY_OUTPUT = True # setting to True reduces the final output by ~9k lines MAP_MARK_RAM = 0x80858B70 -MAP_MARK_ROM = 0x00C27940 gMapMarkDataTable = 0x8085F5E8 DUNGEON_NAMES = [ @@ -29,11 +28,11 @@ HEADER = """\ def RamToOff(vram): return vram - MAP_MARK_RAM - + def GetMapPtrs(data): off = RamToOff(gMapMarkDataTable) return struct.unpack_from(">10L", data[off:off+(NUM_SCENES * 4)]) - + def GetMapsPerScene(ptrs): result = [] endAddr = list(ptrs) @@ -43,10 +42,10 @@ def GetMapsPerScene(ptrs): result.append(v) return result -def GetPoints(data, ptr): +def GetPoints(data, ptr, numPoints): points = [] off = RamToOff(ptr); - for i in range(12): + for i in range(numPoints): points.append(struct.unpack_from(">bBB", data[off:off+3])) off = off + 3 return points @@ -54,14 +53,15 @@ def GetPoints(data, ptr): def GetIconData(data, ptr): off = RamToOff(ptr) v = struct.unpack_from(">bB", data[off:off+2]) - points = GetPoints(data, ptr+2) + points = GetPoints(data, ptr+2, v[1]) return [v[0], v[1], points] - + def GetSceneMap(data, ptr): icons = [] for i in range(3): - icon = GetIconData(data, ptr+(i * 0x26)) - icons.append(icon) + icon = GetIconData(data, ptr + (i * 0x26)) + if icon[0] != 0 or icon[1] > 0: + icons.append(icon) return icons def GetSceneMaps(data, ptr, numMaps): @@ -69,38 +69,38 @@ def GetSceneMaps(data, ptr, numMaps): for i in range(numMaps): maps.append(GetSceneMap(data, ptr + (i * 0x72))) return maps - + def GetDungeonSymbol(i): return f"sMapMark{DUNGEON_NAMES[i][0]}" - + def GetDungeonName(i): return DUNGEON_NAMES[i][1] def GetIconName(v): if v == 0: - return "MAP_MARK_ICON_CHEST" + return "MAP_MARK_CHEST" if v == 1: - return "MAP_MARK_ICON_BOSS" + return "MAP_MARK_BOSS" if v == -1: - return "MAP_MARK_ICON_NONE" + return "MAP_MARK_NONE" return v - + def IND(n): return ' ' * 4 * n - - + + if len(sys.argv) != 2: print("Script requires an output filename for the generated .c file") quit() scriptDir = os.path.dirname(os.path.realpath(__file__)) -repo = scriptDir + os.sep + ".." + os.sep + ".." +repo = scriptDir + os.sep + ".." + os.sep + ".." map_mark_data = [] with open(repo + "/baserom/ovl_map_mark_data", "rb") as file: map_mark_data = bytearray(file.read()) - + scenemaps = [] scenemap_ptrs = GetMapPtrs(map_mark_data) @@ -109,16 +109,14 @@ for i in range(NUM_SCENES): scenemaps.append((i, GetSceneMaps(map_mark_data, scenemap_ptrs[i], maps_per_scene[i]))) cstr = HEADER - + for scenemap in scenemaps: cstr += f"MapMarkData {GetDungeonSymbol(scenemap[0])}[] = {{\n" for mapId, map in enumerate(scenemap[1]): cstr += IND(1) + f"// {GetDungeonName(scenemap[0])} minimap {mapId}\n" cstr += IND(1) + "{\n" for icon in map: - if SIMPLIFY_OUTPUT and icon[0] == 0 and icon[1] == 0: - cstr += IND(2) + "{ 0 },\n" - elif SIMPLIFY_OUTPUT and icon[0] == -1: + if SIMPLIFY_OUTPUT and icon[0] == -1: cstr += IND(2) + f"{{ {GetIconName(icon[0])}, 0, {{ 0 }} }},\n" else: cstr += IND(2) + "{\n" @@ -130,11 +128,11 @@ for scenemap in scenemaps: cstr += IND(2) + "},\n" cstr += IND(1) + "},\n" cstr += "};\n\n" - + cstr += "MapMarkData* gMapMarkDataTable[] = {\n" for scenemap in scenemaps: cstr += f" {GetDungeonSymbol(scenemap[0])},\n" -cstr += "};" +cstr += "};\n" with open(sys.argv[1], "w") as file: - file.write(cstr) \ No newline at end of file + file.write(cstr)