4 More matches, and large struct changes (#469)

* Match func_8005698C and fix func_8001B7A8

* Larger update to match func_80032424 and change a couple of structs

* format

* Fix many warnings

* Matxh func_80014B50

* Format func_80014B50

* Racing Smokey!

* Match func_80053750

* Update score

* Fix some explicit casts
This commit is contained in:
Ryan Myers
2025-03-02 17:18:23 -05:00
committed by GitHub
parent 3209990c94
commit db602828c3
29 changed files with 1081 additions and 2549 deletions
+1 -1
View File
@@ -101,7 +101,7 @@
_g->words.w1 = (unsigned int)(ptr); \
}
#define numberOfGfxCommands(gfxCmds) (sizeof(gfxCmds) / sizeof(Gwords))
#define numberOfGfxCommands(gfxCmds) (sizeof(gfxCmds) / sizeof(Gfx))
#define gDkrDmaDisplayList(pkt, address, numberOfCommands) \
{ \
+3 -10
View File
@@ -1304,7 +1304,7 @@ typedef struct Object_Racer {
/* 0x1A4 */ s16 x_rotation_vel;
/* 0x1A6 */ s16 z_rotation_vel;
/* 0x1A8 */ s16 unk1A8;
/* 0x1AA */ u16 unk1AA;
/* 0x1AA */ s16 unk1AA;
/* 0x1AC */ s16 finishPosition;
/* 0x1AE */ s16 racePosition;
/* 0x1B0 */ s16 unk1B0;
@@ -1519,11 +1519,6 @@ typedef struct Object_Bridge_WhaleRamp {
/* 0x4 */ SoundMask *soundMask;
} Object_Bridge_WhaleRamp;
typedef struct Object_8001B7A8 {
u8 pad0[0x112];
/* 0x112 */ s16 unk112;
} Object_8001B7A8;
typedef struct Object_64_80021400 {
/* 0x00 */ u8 pad[0x2A];
/* 0x2A */ s16 unk2A;
@@ -1798,9 +1793,7 @@ typedef struct unk800B2260_C {
/* Size: 0x018 bytes */
typedef struct ObjectTransform {
/* 0x0000 */ s16 y_rotation;
/* 0x0002 */ s16 x_rotation;
/* 0x0004 */ s16 z_rotation;
/* 0x0000 */ Vec3s rotation;
/* 0x0006 */ s16 flags;
/* 0x0008 */ f32 scale;
/* 0x000C */ f32 x_position;
@@ -1910,7 +1903,7 @@ typedef struct Object {
/* 0x008C */ u32 unk8C;
/* 0x0090 */ u32 unk90;
/* 0x0094 */ u32 unk94;
/* 0x0098 */ Object_8001B7A8 obj;
/* 0x0098 */ s32 unk98;
} Object;
// Unused