Naming global variables related to menu navigation (#119)

* Naming of global variables related to the game menu and Controller Pak menu
This commit is contained in:
ChiefFruitcake
2022-01-01 04:35:37 -05:00
committed by GitHub
parent f250fb6e45
commit 4d9ca02750
53 changed files with 403 additions and 368 deletions
+39 -4
View File
@@ -80,7 +80,7 @@
#define LOGO_INTRO_MENU 8
#define CONTROLLER_PAK_MENU 9
#define START_MENU 10
#define GAME_SELECT_MENU 11
#define MAIN_MENU 11
#define PLAYER_SELECT_MENU 12
#define COURSE_SELECT_MENU 13
#define RACING_DUPLICATE 14
@@ -89,7 +89,7 @@
* Options for gMenuSelectionFromQuit and gMenuSelectionFromEndingSequence
**/
#define START_MENU_FROM_QUIT 0
#define GAME_SELECT_MENU_FROM_QUIT 1
#define MAIN_MENU_FROM_QUIT 1
#define PLAYER_SELECT_MENU_FROM_QUIT 2
#define COURSE_SELECT_MENU_FROM_QUIT 3
#define RACING 4
@@ -97,7 +97,34 @@
#define CREDITS_SEQUENCE 9
/**
* Options for gStartMenuDebugRowSelection
* Options for gMainMenuSelectionDepth
**/
#define BLANK_MAIN_MENU 0
#define OPTIONS_SELECTION 1
#define DATA_SELECTION 2
#define PLAYER_NUM_SELECTION 3
#define GAME_MODE_SELECTION 4
#define GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION 5 // Selecting CC for GP and Versus. Selecting "Begin" or "Data" for Time Trials. Unused for Battle
#define CONFIRM_OK_SELECTION 6
#define CONFIRM_OK_SELECTION_FROM_BACK_OUT 7
#define TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT 8
/**
* Options for gControllerPakMenuSelection
**/
#define CONTROLLER_PAK_MENU_SELECT_RECORD 1
#define CONTROLLER_PAK_MENU_END 2
#define CONTROLLER_PAK_MENU_ERASE 3
#define CONTROLLER_PAK_MENU_QUIT 4
#define CONTROLLER_PAK_MENU_TABLE_GAME_DATA 5
#define CONTROLLER_PAK_MENU_GO_TO_ERASING 6
#define CONTROLLER_PAK_MENU_ERASING 7
#define CONTROLLER_PAK_MENU_ERASE_ERROR_NOT_ERASED 8
#define CONTROLLER_PAK_MENU_ERASE_ERROR_NO_PAK 9
#define CONTROLLER_PAK_MENU_ERASE_ERROR_PAK_CHANGED 10
/**
* Options for gDebugMenuSelection
*/
#define DEBUG_MENU_DISABLED 1
#define DEBUG_MENU_DEBUG_MODE 2
@@ -116,6 +143,15 @@
#define DEBUG_GOTO_CREDITS_SEQUENCE_CC_50 2
#define DEBUG_GOTO_CREDITS_SEQUENCE_CC_EXTRA 3
/**
* Options for gScreenModeSelection
*/
#define SCREEN_MODE_1P 0
#define SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL 1
#define SCREEN_MODE_2P_SPLITSCREEN_VERTICAL 2
#define SCREEN_MODE_3P_4P_SPLITSCREEN 3
#define NUM_SCREEN_MODES 4
/**
* Indexes for accessing Time Trial records
**/
@@ -141,7 +177,6 @@
#define TEXT_BLUE_GREEN_RED_CYCLE_1 4
#define TEXT_BLUE_GREEN_RED_CYCLE_2 5
/**
* Sound mode options
* Option 2 appears to be unused, as such its probably not
+1 -1
View File
@@ -25,7 +25,7 @@ extern s8 gHumanPlayerCount;
extern f32 gKartFrictionTable[];
extern f32 gKartBoundingBoxTable[];
extern f32 gKartGravityTable[];
extern s8 gMenuState; // D_8018EDF0
extern s8 gControllerPakMenuSelection; // D_8018EDF0
extern s32 gModeSelection;
// Indicates the ID of the next title screen demo that will be played
extern u8 gNextDemoId; // D_800E86BC