mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-04 20:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename wayPoint to waypoint (#448)

Browse Source 
* Rename wayPoint to waypoint

* other
This commit is contained in:
MegaMech
2023-10-09 20:46:56 -06:00
committed by GitHub
parent 41a0471605
commit 7f14bf80df
63 changed files with 704 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/bomb_kart.h
+2 -2
View File
@@ -15,7 +15,7 @@
#define BOMB_STATE_UNKNOWN 5
typedef struct {
/* 0x00 */ u16 wayPointIndex;
/* 0x00 */ u16 waypointIndex;
/* 0x02 */ u16 startingState;
/* 0x04 */ f32 unk_04; // Used to set the value of unk_3C in struct_D_80163DE8_entry
/* 0x08 */ f32 startingXPos;
@@ -41,7 +41,7 @@ typedef struct {
/* 0x30 */ Vec3f wheel4Pos;
/* 0x3C */ f32 unk_3C;
/* 0x40 */ s16 someRot; // seems like an angle of some variety, can't figure out its purpose
/* 0x42 */ u16 wayPointIndex; // probably the waypoint that the bomb circles
/* 0x42 */ u16 waypointIndex; // probably the waypoint that the bomb circles
/* 0x44 */ u16 state;
/* 0x46 */ s16 bounceTimer; // timer? state? height?
/* 0x48 */ s16 circleTimer; // timer? state? Somehow controls how it circles around
include/defines.h
+11 -1
View File
@@ -103,6 +103,16 @@
#define PLAYER_THREE 2
#define PLAYER_FOUR 3
#define MARIO_SIZE 0.75f
#define LUIGI_SIZE 0.75f
#define YOSHI_SIZE 0.75f
#define TOAD_SIZE 0.75f
#define DK_SIZE 0.75f
#define WARIO_SIZE 0.75f
#define PEACH_SIZE 0.75f
#define BOWSER_SIZE 0.75f
// 2P Game has Grand Prix, VS, and Battle as available game types
#define MAX_NUM_MAIN_MENU_GAME_TYPES 3
@@ -171,7 +181,7 @@
#define RACING_DUPLICATE 14
/**
* Options for gMenuSelectionFromQuit and gMenuSelectionFromEndingSequence
* Options for gGameState gMenuSelectionFromQuit and gMenuSelectionFromEndingSequence
**/
#define START_MENU_FROM_QUIT 0
#define MAIN_MENU_FROM_QUIT 1
include/vehicles.h
+3 -3
View File
@@ -27,7 +27,7 @@ typedef struct {
/* 0x02 */ s16 compilerPadding;
/* 0x04 */ Vec3f position;
/* 0x10 */ Vec3f velocity;
/* 0x1C */ u16 wayPointIndex;
/* 0x1C */ u16 waypointIndex;
/* 0x1E */ s16 actorIndex;
/* 0x20 */ s32 unused; // Not read or written. Could be padding?
} TrainCarStuff; // size = 0x24;
@@ -47,7 +47,7 @@ typedef struct {
/* 0x02 */ // s16 compilerPadding;
/* 0x04 */ Vec3f position; //
/* 0x10 */ Vec3f velocity; //
/* 0x1C */ s16 wayPointIndex; //
/* 0x1C */ s16 waypointIndex; //
/* 0x1E */ s16 actorIndex; //
/* 0x20 */ f32 someMultiplier; //
/* 0x24 */ s16 yRotation; // Only Y rotation is tracked in this struct
@@ -64,7 +64,7 @@ typedef struct {
/* 0x02 */ // s16 compilerPadding;
/* 0x04 */ Vec3f position;
/* 0x10 */ Vec3f velocity;
/* 0x1C */ u16 wayPointIndex;
/* 0x1C */ u16 waypointIndex;
/* 0x1E */ s16 actorIndex;
/* 0x20 */ f32 someMultiplier; //
/* 0x24 */ f32 someMultiplierTheSequel; //
include/waypoints.h
+12 -12
View File
@@ -1,12 +1,12 @@
#ifndef WAYPOINTS_H
#define WAYPOINTS_H
struct TrackWayPoint {
/* 0x00 */ s16 wayPointX;
/* 0x02 */ s16 wayPointY;
/* 0x04 */ s16 wayPointZ;
/* 0x06 */ u16 wayPointTrackSegment;
}; // size = 0x08
typedef struct {
/* 0x00 */ s16 posX;
/* 0x02 */ s16 posY;
/* 0x04 */ s16 posZ;
/* 0x06 */ u16 trackSegment;
} TrackWaypoint; // size = 0x08
/**
* These are per-path arrays that contain some information relating to waypoints
@@ -14,9 +14,9 @@ struct TrackWayPoint {
* The arrays in D_80164560 and D_80164570 track some other X/Y/Z, but the track segment is always 0 (so, untracked/unused)
* Its unclear how these arrays relate to each other
**/
extern struct TrackWayPoint *D_80164550[];
extern struct TrackWayPoint *D_80164560[];
extern struct TrackWayPoint *D_80164570[];
extern TrackWaypoint *D_80164550[];
extern TrackWaypoint *D_80164560[];
extern TrackWaypoint *D_80164570[];
/**
* Don't know what exactly these are, but like D_80164550, D_80164560, and D_80164570
@@ -46,9 +46,9 @@ extern s16 D_80165320[];
// Don't think this really belongs with waypoint stuff, but don't know where else to put it
extern s16 D_80165330[];
// Shadows values from D_80164560
extern struct TrackWayPoint *D_801631D0;
extern TrackWaypoint *D_801631D0;
// Shadows values from D_80164570
extern struct TrackWayPoint *D_801631D4;
extern TrackWaypoint *D_801631D4;
// Shadows values from D_80164580
extern s16 *D_801631D8;
// Shadows values from D_80164590
@@ -56,7 +56,7 @@ extern u16 *D_801631DC;
// Shadowd values from gWaypointCountByPathIndex
extern u16 D_80164430;
// Shadows values from D_80164550
extern struct TrackWayPoint *D_80164490;
extern TrackWaypoint *D_80164490;
// Shadows values from D_801645A0
extern s16 *D_801645E0;