From 727afd66a414b87b9a402d75339feef475486602 Mon Sep 17 00:00:00 2001 From: engineer124 Date: Thu, 21 Apr 2022 15:50:10 +1000 Subject: [PATCH] macro -> enum --- include/z64.h | 12 +++++++----- src/code/graph.c | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/z64.h b/include/z64.h index a0b64b5f1..7403f025e 100644 --- a/include/z64.h +++ b/include/z64.h @@ -62,11 +62,13 @@ #define Z_PRIORITY_DMAMGR 17 #define Z_PRIORITY_IRQMGR 18 -#define EQUIP_SLOT_B 0 -#define EQUIP_SLOT_C_LEFT 1 -#define EQUIP_SLOT_C_DOWN 2 -#define EQUIP_SLOT_C_RIGHT 3 -#define EQUIP_SLOT_UNUSED 4 +typedef enum { + /* 0 */ EQUIP_SLOT_B, + /* 1 */ EQUIP_SLOT_C_LEFT, + /* 2 */ EQUIP_SLOT_C_DOWN, + /* 3 */ EQUIP_SLOT_C_RIGHT, + /* 4 */ EQUIP_SLOT_UNUSED +} EquipSlot; typedef struct { /* 0x0 */ s16 priority; // Lower means higher priority. -1 means it ignores priority diff --git a/src/code/graph.c b/src/code/graph.c index 8059d1f63..04ab72057 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "system_malloc.h" #include "overlays/gamestates/ovl_daytelop/z_daytelop.h"