Make Object_3C a LevelObjectEntry.

This commit is contained in:
Antonio Castelli
2022-11-06 20:19:11 -08:00
parent 10537750e1
commit 689ba90944
7 changed files with 167 additions and 107 deletions
+2 -11
View File
@@ -5,6 +5,7 @@
#include "types.h"
#include "enums.h"
#include "level_object_entries.h"
// Stolen from PD
// This hacky structure allows coords to be accessed using
@@ -554,16 +555,6 @@ typedef struct LevelModel {
/* 0x48 */ s32 modelSize;
} LevelModel;
typedef struct Object_3C {
u8 pad0[0x2];
s16 unk2;
s16 unk4;
s16 unk6;
s8 unk8;
u8 pad9[0x4];
u8 unkD;
} Object_3C;
typedef enum {
OBJECT_MODEL_TYPE_3D_MODEL,
OBJECT_MODEL_TYPE_SPRITE_BILLBOARD,
@@ -1387,7 +1378,7 @@ typedef struct ObjectSegment {
/* 0x003B */ s8 unk3B;
union {
/* 0x003C */ Object_3C* unk3C;
/* 0x003C */ LevelObjectEntry* level_entry;
/* 0x003C */ f32 unk3C_f;
} unk3C_a;