Decompile func0f161520

This commit is contained in:
Ryan Dwyer
2022-05-14 21:13:43 +10:00
parent ca08c2c96a
commit 615480e6fd
6 changed files with 218 additions and 427 deletions
+1 -1
View File
@@ -222,7 +222,7 @@ extern s16 *g_RoomPortals;
extern struct var800a4cf0 var800a4cf0;
extern u32 var800a6470;
extern u32 var800a647c;
extern u32 var800a6538;
extern struct var800a6538 var800a6538[16];
extern u32 var800a65b8;
extern struct screenbox var800a65c0;
extern struct screenbox var800a65c8;
+3 -3
View File
@@ -68,9 +68,9 @@ bool func0f15f20c(struct coord *arg0, struct coord *arg1, s32 *arg2, s32 *arg3);
bool func0f15f2b0(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3);
bool func0f15f560(struct coord *arg0, struct coord *arg1, struct coord *arg2, Gfx *arg3, void *arg4, struct gfxvtx *vertices, struct hitthing *hitthing);
bool func0f15ffdc(struct model *model, struct coord *arg1, struct coord *arg2, struct coord *arg3, Gfx *arg4, Gfx *arg5, struct gfxvtx *vertices, f32 *arg7, void *arg8);
u32 func0f160a38(void);
u32 func0f1612e4(void);
bool func0f161520(struct coord *arg0, struct coord *arg1, s16 room, void *arg3);
bool func0f160a38(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct room44 *arg3, s32 roomnum, struct hitthing *hitthing);
s32 func0f1612e4(void *arg0, void *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4, struct hitthing *hitthing);
bool func0f161520(struct coord *arg0, struct coord *arg1, s32 roomnum, struct hitthing *hitthing);
bool roomIsLoaded(s32 room);
bool roomContainsCoord(struct coord *pos, s16 roomnum);
bool func0f161c08(struct coord *arg0, s16 roomnum);
+18 -3
View File
@@ -3684,6 +3684,17 @@ struct roomgfxdata {
/*0x18*/ struct roomgfxdata18 unk18[1];
};
struct room44 {
/*0x00*/ u32 unk00;
/*0x04*/ u32 unk04;
/*0x08*/ u32 unk08;
/*0x0c*/ u32 unk0c;
/*0x10*/ u32 unk10;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
};
struct room {
/*0x00*/ u16 flags;
/*0x02*/ s16 loaded240; // 0 when unloaded, 1 when visible, ticks up to 120 when recently visible
@@ -3702,8 +3713,8 @@ struct room {
/*0x24*/ f32 bbmax[3];
/*0x30*/ struct coord centre;
/*0x3c*/ f32 radius; // from volume centre to the corner in 3D
/*0x40*/ u32 unk40;
/*0x44*/ void *unk44;
/*0x40*/ s32 unk40;
/*0x44*/ struct room44 *unk44;
/*0x48*/ u8 unk48;
/*0x49*/ u8 unk49;
/*0x4a*/ u8 unk4a;
@@ -6396,7 +6407,6 @@ struct hitthing {
s16 unk28;
s16 texturenum;
s16 unk2c;
s16 unk2e;
};
struct hit {
@@ -6833,4 +6843,9 @@ struct portalthing2 {
u32 unk0c;
};
struct var800a6538 {
s32 unk00;
f32 unk04;
};
#endif