mirror of
https://github.com/n64decomp/mk64
synced 2026-08-04 08:58:41 -04:00
Match the rest of actors.h (#254)
* Matched rest of actors and more Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
@@ -128,18 +128,15 @@ struct FallingRock {
|
||||
|
||||
struct ActorSpawnData {
|
||||
/* 0x00 */ Vec3s pos;
|
||||
/* 0x06 */ u16 someId; // Usually populated, but not necessarily used by all actors types
|
||||
union {
|
||||
/* 0x06 */ u16 someId; // Usually populated, but not necessarily used by all actors types
|
||||
/* 0x06 */ s16 signedSomeId;
|
||||
};
|
||||
};
|
||||
|
||||
// Required for func_80298AC0 due to diff size.
|
||||
// members unverified. data located at D_06013F78
|
||||
struct UnkActorSpawnData {
|
||||
/* 0x00 */ Vec3s pos;
|
||||
/* 0x06 */ s16 someId; // s16 required here.
|
||||
/* 0x08 */ u16 unk8;
|
||||
};
|
||||
|
||||
struct UnkActorSpawnData80298D10 {
|
||||
/* 0x00 */ Vec3s pos;
|
||||
/* 0x06 */ s16 someId; // Usually populated, but not necessarily used by all actors types
|
||||
/* 0x08 */ s16 unk8;
|
||||
|
||||
@@ -109,9 +109,7 @@ typedef struct {
|
||||
/* 0x08 */ u16 unk38;
|
||||
// This may be an index to the tilemap?
|
||||
/* 0x0A */ u16 unk3A;
|
||||
/* 0x0C */ f32 unk3C;
|
||||
/* 0x10 */ f32 unk40;
|
||||
/* 0x14 */ f32 unk44;
|
||||
/* 0x0C */ Vec3f unk3C;
|
||||
/* 0x18 */ Vec3f unk48;
|
||||
/* 0x24 */ Vec3f unk54;
|
||||
/* 0x30 */ Vec3f unk60;
|
||||
@@ -309,7 +307,7 @@ typedef struct {
|
||||
/* 0x0214 */ f32 unk_214;
|
||||
/* 0x0218 */ f32 unk_218;
|
||||
/* 0x021C */ f32 unk_21C;
|
||||
/* 0x0220 */ s16 unk_220;
|
||||
/* 0x0220 */ s16 nearestWaypointId; // ??
|
||||
/* 0x0222 */ s16 unk_222;
|
||||
/* 0x0224 */ f32 unk_224;
|
||||
/* 0x0228 */ s16 unk_228;
|
||||
|
||||
@@ -7,9 +7,7 @@ void mio0decode(u8* arg0, u8* arg1);
|
||||
|
||||
void func_8000F2DC(void);
|
||||
void func_8000F628(void);
|
||||
void func_8000EEDC(void);
|
||||
void func_802B6540(f32* arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4);
|
||||
void func_8005D6C0(Player* player);
|
||||
void func_8006B7E4(Player* player, s32 arg1);
|
||||
void func_800267AC(Player* player, s8 arg1, s8 arg2);
|
||||
void func_8005D290(void);
|
||||
|
||||
Reference in New Issue
Block a user