summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorRoman971 <32455037+Roman971@users.noreply.github.com>2021-04-28 11:10:23 +0200
committerGitHub <noreply@github.com>2021-04-28 05:10:23 -0400
commit0b8252cfe99651b3174ac8652ba133781e8e2105 (patch)
tree807c9c85a0f83710fea5983225d90823221fb963 /src/code
parent3fbdccbdbac4113ae04d77216b2a28b405e07734 (diff)
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
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_map_mark.c5
1 files changed, 2 insertions, 3 deletions
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++);