diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2022-10-01 00:48:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 22:48:59 -0600 |
| commit | b7e7b34998c13eec3d61b8aa4afdacf9bc25edfc (patch) | |
| tree | dd0c30fe170c0bec668b391e517b85f270f20446 /include | |
| parent | 82b53f59283621618b3adc27a21e9efe1c8d9eff (diff) | |
A bunch of unrelated, assorted changes (#263)
Couple matches functions, an update to a struct, a bunch of header
files adjustments, and some mips_to_c regenerations
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common_structs.h | 15 | ||||
| -rw-r--r-- | include/functions.h | 1 | ||||
| -rw-r--r-- | include/waypoints.h | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/include/common_structs.h b/include/common_structs.h index e7c6b3dcc..c278d5967 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -191,9 +191,7 @@ typedef struct { } mk64_surface_map_ram; // size = 0x2C typedef struct { - /* 0x00 */ f32 cornerX; - /* 0x04 */ f32 cornerY; - /* 0x08 */ f32 cornerZ; + /* 0x00 */ Vec3f cornerPos; // Type of surface the corner is above /* 0x0C */ u8 surfaceType; // Close to being a copy of the top byte of the surface_map "flag" member @@ -201,7 +199,7 @@ typedef struct { // Don't know if "tile" is right the right term // D_8015F580 is a pointer to an array of "tile" structs. This is an index to that array /* 0x0E */ u16 surfaceMapIndex; - // cornerX/Y/Z place the corner "in the air" as it were, this member indicates the Y position of the corner's "on the ground" sibling + // cornerPos places the corner "in the air" as it were, this member indicates the Y position of the corner's "on the ground" sibling // On flat ground this value should be cornerY - gKartBoundingBoxTable[characterId] /* 0x10 */ f32 cornerGroundY; // Something lighting related. 1 when in a shaded region, 2 when in a tree's shadow @@ -274,7 +272,14 @@ typedef struct { /* 0x00C6 */ s16 unk_0C6; /* 0x00C8 */ s16 unk_0C8; /* 0x00CA */ s16 unk_0CA; - /* 0x00CC */ char unk_0CC[0x10]; + /* 0x00CC */ s16 unk_0CC; + /* 0x00CE */ s16 unk_0CE; + /* 0x00D0 */ s16 unk_0D0; + /* 0x00D2 */ s16 unk_0D2; + /* 0x00D4 */ s16 unk_0D4; + /* 0x00D6 */ s16 unk_0D6; + /* 0x00D8 */ s16 unk_0D8; + /* 0x00DA */ s16 unk_0DA; /* 0x00DC */ s16 boostTimer; /* 0x00DE */ u16 unk_0DE; /* 0x00E0 */ s16 unk_0E0; diff --git a/include/functions.h b/include/functions.h index 24fd47363..4848ddb92 100644 --- a/include/functions.h +++ b/include/functions.h @@ -7,7 +7,6 @@ void mio0decode(u8* arg0, u8* arg1); void func_8000F2DC(void); void func_8000F628(void); -void func_802B6540(f32* arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4); void func_8006B7E4(Player* player, s32 arg1); void func_800267AC(Player* player, s8 arg1, s8 arg2); void func_8005D290(void); diff --git a/include/waypoints.h b/include/waypoints.h index c625c30b5..9a2e58eca 100644 --- a/include/waypoints.h +++ b/include/waypoints.h @@ -39,6 +39,8 @@ extern s16 *D_801645A0[]; extern s16 D_80162FCE; // Shadows values from gPathIndexByPlayerId extern s32 D_80163448; +// Shadows values from gPathIndexByPlayerId, but is an array +extern u16 D_80165310[]; // Shadows values from D_80164560 extern struct TrackWayPoint *D_801631D0; // Shadows values from D_80164570 |