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: 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
---
 src/code/z_map_mark.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c
index d5a8c5cf6..885458677 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++);
-- 
cgit v1.2.3