diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2021-12-31 15:30:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-31 13:30:55 -0700 |
| commit | 494c36bdb15bae2aeb618ad4d2fb85fa7b570627 (patch) | |
| tree | f228e06f91e160adf498974ac14d3555e6cd97fd /include | |
| parent | 2263234e581ca7f9147e1d7fcb46d27d97f179ba (diff) | |
Match assorted functions and identify a variable (#122)
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common_structs.h | 27 | ||||
| -rw-r--r-- | include/defines.h | 5 | ||||
| -rw-r--r-- | include/variables.h | 3 |
3 files changed, 34 insertions, 1 deletions
diff --git a/include/common_structs.h b/include/common_structs.h index 693e8fc94..2c1234035 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -32,6 +32,26 @@ typedef enum { /* 0x15 */ NUM_COURSES } COURSES; +typedef enum { + /* 0x00 */ TIME_TRIAL_DATA_LUIGI_RACEWAY, + /* 0x01 */ TIME_TRIAL_DATA_MOO_MOO_FARM, + /* 0x02 */ TIME_TRIAL_DATA_KOOPA_BEACH, + /* 0x03 */ TIME_TRIAL_DATA_KALAMARI_DESERT, + /* 0x04 */ TIME_TRIAL_DATA_TOADS_TURNPIKE, + /* 0x05 */ TIME_TRIAL_DATA_FRAPPE_SNOWLAND, + /* 0x06 */ TIME_TRIAL_DATA_CHOCO_MOUNTAIN, + /* 0x07 */ TIME_TRIAL_DATA_MARIO_RACEWAY, + /* 0x08 */ TIME_TRIAL_DATA_WARIO_STADIUM, + /* 0x09 */ TIME_TRIAL_DATA_SHERBET_LAND, + /* 0x0A */ TIME_TRIAL_DATA_ROYAL_RACEWAY, + /* 0x0B */ TIME_TRIAL_DATA_BOWSER_CASTLE, + /* 0x0C */ TIME_TRIAL_DATA_DK_JUNGLE, + /* 0x0D */ TIME_TRIAL_DATA_YOSHI_VALLEY, + /* 0x0E */ TIME_TRIAL_DATA_BANSHEE_BOARDWALK, + /* 0x0F */ TIME_TRIAL_DATA_RAINBOW_ROAD, + /* 0x10 */ NUM_TIME_TRIAL_DATA +} TIME_TRIAL_DATA_INDEX; + // This was added as a silly idea: // In the data to use "A, B, Z, R" instead of hex numbers. typedef enum { @@ -454,4 +474,11 @@ typedef struct { /* 0x14 */ s32 unk14; // Flip flops between 0 and 1, use unknown } struct_8018DEE0_entry; // size = 0x18 +typedef struct { + /* 0x00 */ u16 red; + /* 0x02 */ u16 green; + /* 0x04 */ u16 blue; + /* 0x06 */ u16 alpha; +} RGBA16; // size = 0x08 + #endif diff --git a/include/defines.h b/include/defines.h index 6b099f550..de579b2a1 100644 --- a/include/defines.h +++ b/include/defines.h @@ -170,4 +170,9 @@ #define CUP_COURSE_FOUR 3 #define NUM_COURSES_PER_CUP 4 +/** + * Max representable time, 100 minutes measured in centiseconds + */ +#define MAX_TIME 0x927C0 + #endif // DEFINES_H diff --git a/include/variables.h b/include/variables.h index 669c40176..c250d9bfd 100644 --- a/include/variables.h +++ b/include/variables.h @@ -13,7 +13,7 @@ extern f32 gCourseCompletionPercentByPlayerId[8]; // D_801644D0 extern f32 gCourseCompletionPercentByRank[8]; // D_80162FD8 extern s8 gCupCourseSelection; // D_8018EE0B extern char *gCupNames[]; // D_800E7500 -extern s8 gCupSelection; +extern s8 gCupSelection; // D_8018EE09 // Maps course IDs (as defined in the COURSES enum) to the cup they belong to extern u8 gCupSelectionByCourseId[NUM_COURSES]; // D_800E7664 extern s16 gCurrentCourseId; @@ -39,6 +39,7 @@ extern u8 gSoundMode; // D_8018EDF2 extern char *gSoundModeNames[NUM_SOUND_MODES]; // D_800E7710 // Indexed by Player ID. Track time in seconds since player has last crossed the finish line extern f32 gTimePlayerLastTouchedFinishLine[8]; // D_8015F898 +extern s8 gTimeTrialDataCourseIndex; // D_8018EDF7 extern struct_8018D9E0_entry D_8018D9E0[32]; // D_8018D9E0 extern struct_8018DEE0_entry D_8018DEE0[16]; // D_8018DEE0 |