Replaced some enums with defines

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -58,11 +58,9 @@ enum INVENTORY_SELECTION
 	DELETE,
 };
 
-enum INVENTORY_SELECTION_ERRORS
-{
-	INVENTORY_EMPTY = -2,
-	INVENTORY_FULL,
-};
+// Inventory selection errors
+#define INVENTORY_EMPTY 	-2
+#define INVENTORY_FULL 		-1
 
 enum CHEATS_OPTIONS
 {
@@ -99,7 +97,7 @@ enum CHEATS_CHANGE_SEQUENCE_SELECTION
 
 enum CHEATS_STANDARD_SELECTION
 {
-	TURN_ON_OR_OFF = 1,
+	CHEATS_STANDARD_TURN_ON_OR_OFF = 1,
 	CHANGE_BUTTON_COMBO,
 };
 
@@ -109,13 +107,10 @@ enum CHEATS_FORCE_ITEM_DROP_SELECTION
 	ITEM_DROP_CHANGE_BY_ID,
 };
 
-enum CHEATS_RESOLVE_FADES_RETURN_VALUES
-{
-	FADE_NOT_ACTIVE = -2,
-	FADE_DONT_RESOLVE,
-	FADE_RESOLVE_SUCCESS = 1,
-};
-
+// Fades return values
+#define FADE_NOT_ACTIVE 		-2
+#define FADE_DONT_RESOLVE 		-1
+#define FADE_RESOLVE_SUCCESS 	1
 
 enum CHEATS_LOCK_FLAGS_SELECTION
 {
@@ -194,21 +189,12 @@ enum CHEATS_CLEAR_AREA_FLAGS_AREAS
 	AREA_JON,
 };
 
-enum ADJUSTABLE_MENU_VALUES
-{
-	NO_NUMBERS_TO_DISPLAY 	= 0x1000,
-	ADDING_BY_ID 			= 0x1008,
-};
-
-enum ADD_BY_ICON_MENU_VALUES
-{
-	ADDING_BY_ICON = 0x1108,
-};
-
-enum CHEATS_SPAWN_ITEM_MENU_VALUE
-{
-	SPAWN_ITEM_MENU_VALUE = 0x7000,
-};
+// Various menu values
+#define NO_NUMBERS_TO_DISPLAY 				0x1000
+#define ADDING_BY_ID 						0x1008
+#define ADDING_BY_ICON 						0x1108
+#define SPAWN_ITEM_MENU_VALUE 				0x7000
+#define STATS_PARTNER_DISPLAY_YOSHI_COLORS 	100
 
 enum STATS_MARIO_SELECTION_OPTIONS
 {
@@ -239,11 +225,6 @@ enum STATS_PARTNER_SELECTION_OPTIONS
 	TOGGLE,
 };
 
-enum STATS_PARTNER_WINDOW_TO_DISPLAY
-{
-	STATS_PARTNER_DISPLAY_YOSHI_COLORS = 100,
-};
-
 enum STATS_FOLLOWER_SELECTION_OPTIONS
 {
 	BRING_OUT_FOLLOWER = 1,
@@ -305,11 +286,9 @@ enum MEMORY_MODIFY_ADDRESS_OPTIONS
 	REMOVE_POINTER_LEVEL,
 };
 
-enum MEMORY_ERRORS
-{
-	ALL_SLOTS_EMPTY = -2,
-	NO_SLOTS_LEFT,
-};
+// Memory error return values
+#define ALL_SLOTS_EMPTY 	-2
+#define NO_SLOTS_LEFT 		-1
 
 enum BATTLES_CURRENT_ACTOR_STATS_SELECTION
 {
@@ -382,11 +361,9 @@ enum DISPLAYS_NO_BUTTON_COMBO_OPTIONS
 	DISPLAYS_TURN_ON_OR_OFF = 1,
 };
 
-enum ONSCREEN_TIMER_BUTTON_CODES
-{
-	START_PAUSE_RESUME = 0,
-	RESET,
-};
+// On-screen timer button codse
+#define START_PAUSE_RESUME 	0
+#define RESET 				1
 
 enum WARPS_OPTIONS
 {

ttyd-tools/rel/source/menu.cpp

@@ -642,7 +642,7 @@ void menuCheckButton()
 							uint32_t CurrentMenuOptionCheck = tempCurrentMenuOption + 1;
 							switch (CurrentMenuOptionCheck)
 							{
-								case TURN_ON_OR_OFF:
+								case CHEATS_STANDARD_TURN_ON_OR_OFF:
 								{
 									// Flip the bool for the current cheat
 									bool CheatActive = Cheat[tempMenuSelectedOption].Active;