summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/common_structs.h2
-rw-r--r--include/course.h19
-rw-r--r--include/defines.h12
-rw-r--r--include/mk64.h60
-rw-r--r--include/objects.h2
-rw-r--r--include/save_data.h2
6 files changed, 39 insertions, 58 deletions
diff --git a/include/common_structs.h b/include/common_structs.h
index 4691e3310..25a12dc53 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -417,7 +417,7 @@ typedef struct {
// Something related to time trial ghost data?
/* 0x00 */ s32 unk_00;
/* 0x04 */ u8 ghostDataSaved;
- /* 0x05 */ s8 courseIndex;
+ /* 0x05 */ s8 trackIndex;
/* 0x06 */ u8 characterId;
/* 0x07 */ u8 unk_07[0x3C];
/* 0x43 */ u8 pad_43[0x7F - 0x43];
diff --git a/include/course.h b/include/course.h
deleted file mode 100644
index 8bbd83054..000000000
--- a/include/course.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef COURSE_H
-#define COURSE_H
-
-#include <libultraship.h>
-#include <libultra/gbi.h>
-#include <macros.h>
-
-/**
- * @file Include for course gfx.inc.c.
- */
-
-typedef struct {
- uint64_t crc;
- u8 surfaceType;
- u8 sectionId;
- u16 flags;
-} TrackSections;
-
-#endif // COURSE_H
diff --git a/include/defines.h b/include/defines.h
index 11ca54efc..e5cdf6963 100644
--- a/include/defines.h
+++ b/include/defines.h
@@ -76,11 +76,11 @@
#define DEMO_MODE_INACTIVE 0
#ifdef VERSION_EU
-#define COURSE_TIMER_ITER 0.020041665999999999 // 1 / 50
-#define COURSE_TIMER_ITER_f 0.020041665999999999f // 1 / 50
+#define TRACK_TIMER_ITER 0.020041665999999999 // 1 / 50
+#define TRACK_TIMER_ITER_f 0.020041665999999999f // 1 / 50
#else
-#define COURSE_TIMER_ITER 0.01666666 // 1 / 60
-#define COURSE_TIMER_ITER_f 0.01666666f // 1 / 60
+#define TRACK_TIMER_ITER 0.01666666 // 1 / 60
+#define TRACK_TIMER_ITER_f 0.01666666f // 1 / 60
#endif
#define V_BlANK_TIMER_ITER 0.01666666
@@ -182,7 +182,7 @@ enum { MUSHROOM_CUP, FLOWER_CUP, STAR_CUP, SPECIAL_CUP, BATTLE_CUP, NUM_CUPS };
/**
* @brief Options for gCourseIndexInCup
*/
-enum { COURSE_ONE, COURSE_TWO, COURSE_THREE, COURSE_FOUR };
+enum { TRACK_ONE, TRACK_TWO, TRACK_THREE, TRACK_FOUR };
/**
* @brief Character IDs
@@ -387,7 +387,7 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
#define UNKNOWN_EFFECT_0x10000 0x10000 //
#define BOOST_RAMP_ASPHALT_EFFECT 0x100000 // being boosted by a boost pad
#define UNKNOWN_EFFECT_0x200000 0x200000 //
-#define REVERSE_EFFECT 0x400000 // being in reverse of the course
+#define REVERSE_EFFECT 0x400000 // Player is facing the wrong direction
#define UNKNOWN_EFFECT_0x1000000 0x1000000 //
#define HIT_BY_ITEM_EFFECT 0x2000000 // being hit by an item
#define HIT_EFFECT 0x4000000 // hitting an object
diff --git a/include/mk64.h b/include/mk64.h
index 110db58af..7c87a5f27 100644
--- a/include/mk64.h
+++ b/include/mk64.h
@@ -32,31 +32,31 @@ extern "C" {
#define BORDER_HEIGHT 1
typedef enum {
- /* 0x00 */ COURSE_MARIO_RACEWAY = 0,
- /* 0x01 */ COURSE_CHOCO_MOUNTAIN,
- /* 0x02 */ COURSE_BOWSER_CASTLE,
- /* 0x03 */ COURSE_BANSHEE_BOARDWALK,
- /* 0x04 */ COURSE_YOSHI_VALLEY,
- /* 0x05 */ COURSE_FRAPPE_SNOWLAND,
- /* 0x06 */ COURSE_KOOPA_BEACH,
- /* 0x07 */ COURSE_ROYAL_RACEWAY,
- /* 0x08 */ COURSE_LUIGI_RACEWAY,
- /* 0x09 */ COURSE_MOO_MOO_FARM,
- /* 0x0A */ COURSE_TOADS_TURNPIKE,
- /* 0x0B */ COURSE_KALIMARI_DESERT,
- /* 0x0C */ COURSE_SHERBET_LAND,
- /* 0x0D */ COURSE_RAINBOW_ROAD,
- /* 0x0E */ COURSE_WARIO_STADIUM,
- /* 0x0F */ COURSE_BLOCK_FORT,
- /* 0x10 */ COURSE_SKYSCRAPER,
- /* 0x11 */ COURSE_DOUBLE_DECK,
- /* 0x12 */ COURSE_DK_JUNGLE,
- /* 0x13 */ COURSE_BIG_DONUT,
- /* 0x14 */ COURSE_AWARD_CEREMONY,
- /* 0x15 */ NUM_COURSES
-} COURSES;
-
-#define COURSE_NULL 0xFF
+ /* 0x00 */ TRACK_MARIO_RACEWAY = 0,
+ /* 0x01 */ TRACK_CHOCO_MOUNTAIN,
+ /* 0x02 */ TRACK_BOWSER_CASTLE,
+ /* 0x03 */ TRACK_BANSHEE_BOARDWALK,
+ /* 0x04 */ TRACK_YOSHI_VALLEY,
+ /* 0x05 */ TRACK_FRAPPE_SNOWLAND,
+ /* 0x06 */ TRACK_KOOPA_BEACH,
+ /* 0x07 */ TRACK_ROYAL_RACEWAY,
+ /* 0x08 */ TRACK_LUIGI_RACEWAY,
+ /* 0x09 */ TRACK_MOO_MOO_FARM,
+ /* 0x0A */ TRACK_TOADS_TURNPIKE,
+ /* 0x0B */ TRACK_KALIMARI_DESERT,
+ /* 0x0C */ TRACK_SHERBET_LAND,
+ /* 0x0D */ TRACK_RAINBOW_ROAD,
+ /* 0x0E */ TRACK_WARIO_STADIUM,
+ /* 0x0F */ TRACK_BLOCK_FORT,
+ /* 0x10 */ TRACK_SKYSCRAPER,
+ /* 0x11 */ TRACK_DOUBLE_DECK,
+ /* 0x12 */ TRACK_DK_JUNGLE,
+ /* 0x13 */ TRACK_BIG_DONUT,
+ /* 0x14 */ TRACK_AWARD_CEREMONY,
+ /* 0x15 */ NUM_TRACKS
+} TRACKS;
+
+#define TRACK_NULL 0xFF
typedef enum {
/* 0x00 */ TIME_TRIAL_DATA_LUIGI_RACEWAY,
@@ -86,19 +86,19 @@ enum SURFACE_TYPE {
/* 0x00 */ AIRBORNE,
/* 0x01 */ ASPHALT, // Luigi's Raceway, Toad's Turnpike, Koopa Troop beach shortcut tunnel, Mario Raceway, Royal
// Raceway, Rainbow Road, Block Fort, Double Deck, Skyscraper
- /* 0x02 */ DIRT, // Luigi's Raceway, Moo Moo Farm, Kalimiari Desert on course, Choco Mountain, Wario Stadium, DK
- // Jungle on course, Yoshi Valley
+ /* 0x02 */ DIRT, // Luigi's Raceway, Moo Moo Farm, Kalimiari Desert as road, Choco Mountain, Wario Stadium, DK
+ // Jungle as road, Yoshi Valley
/* 0x03 */ SAND, // Koopa Troopa Beach light color, Royal Raceway
/* 0x04 */ STONE, // Royal Raceway castle entrance, Bowser's Castle
- /* 0x05 */ SNOW, // Frappe Snowland on course, Sherber Land tunnel
+ /* 0x05 */ SNOW, // Frappe Snowland as road, Sherber Land tunnel
/* 0x06 */ BRIDGE, // Royal Raceway castle bridges (even the wooden one), Banshee's Boardwalk, Big Donut
/* 0x07 */ SAND_OFFROAD, // Mario Raceway
/* 0x08 */ GRASS, // Luigi's Raceway, Mario Raceway, Royal Raceway, Bowser's Castle, DK Jungle, Yoshi Valley
/* 0x09 */ ICE, // Sherbert Land
/* 0x0A */ WET_SAND, // Koop Troopa Beach dark color
- /* 0x0B */ SNOW_OFFROAD, // Frappe Snowland off course
+ /* 0x0B */ SNOW_OFFROAD, // Frappe Snowland off road
/* 0x0C */ CLIFF, // Koopa Troopa Beach, Choco Mountain
- /* 0x0D */ DIRT_OFFROAD, // Kalimari Desert off course
+ /* 0x0D */ DIRT_OFFROAD, // Kalimari Desert off road
/* 0x0E */ TRAIN_TRACK, // Kalimari Desert
/* 0x0F */ CAVE, // DK Jungle cave
/* 0x10 */ ROPE_BRIDGE, // Bowser's Castle bridge 2, DK Jungle bridge
diff --git a/include/objects.h b/include/objects.h
index 4c3c6d77b..2862b7587 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -213,7 +213,7 @@ extern Collision D_8018C0B0[];
* First indexObjectList1 gets an unused index, then indexObjectList2, then indexObjectList3, then indexObjectList4, and
*then it loops.
*
- * The objects found at the indices in each list appears to be course dependent
+ * The objects found at the indices in each list appears to be track dependent
**/
#define NUM_YV_FLAG_POLES 4
diff --git a/include/save_data.h b/include/save_data.h
index 2f16ad1f1..cb5636bb5 100644
--- a/include/save_data.h
+++ b/include/save_data.h
@@ -11,7 +11,7 @@ typedef struct {
// The 6th record is the best 1-lap record
u8 records[6][3];
// It's unknown what these bytes are used for
- // Byte 1 might be an indicator that there is a ghost available for that course
+ // Byte 1 might be an indicator that there is a ghost available for that track
u8 unknownBytes[5];
u8 checksum;
} CourseTimeTrialRecords; // size = 0x18
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 02:52:29 +0000