Decompile func0f09018c

src/include/game/game_066310.h

@@ -282,7 +282,7 @@ u32 func0f08bb3c(void);
 void func0f08bb5c(struct prop *prop, bool firing, s32 room);
 s32 func0f08bc5c(struct prop *prop);
 u32 func0f08bcf4(void);
-u32 func0f08bd00(void);
+bool func0f08bd00(struct prop *playerprop, struct prop *doorprop);
 u32 func0f08bdd4(void);
 u32 func0f08be80(void);
 u32 func0f08bf78(void);
@@ -324,8 +324,8 @@ u32 func0f08f968(void);
 u32 func0f08fcb8(void);
 void func0f08fee8(struct prop *prop, s32 arg1);
 u32 func0f08fffc(void);
-u32 func0f0900c0(void);
-u32 func0f09018c(void);
+void func0f0900c0(struct prop *prop, struct doorobj *door);
+bool func0f09018c(struct prop *doorprop);
 u32 func0f0903d4(void);
 u32 func0f09044c(void);
 u32 func0f0904e0(void);

src/include/game/game_111600.h

@@ -33,7 +33,7 @@ bool func0f112884(void);
 u32 currentPlayerHasProp(struct prop *prop);
 u32 func0f112950(void);
 u32 func0f112a58(void);
-u32 func0f112bc0(void);
+struct textoverride *objGetTextOverride(struct defaultobj *obj);
 u32 func0f112bfc(void);
 u32 func0f112c44(void);
 u32 func0f112cf8(void);

src/include/game/game_19c990.h

@@ -89,7 +89,7 @@ u32 func0f1a1e38(void);
 u32 func0f1a1e90(void);
 u32 func0f1a1f00(void);
 u32 func0f1a1f70(void);
-u32 func0f1a1fe0(void);
+struct trainingdata *func0f1a1fe0(void); // might be a different but similar struct
 u32 func0f1a1fec(void);
 u32 func0f1a2070(void);
 u32 func0f1a2198(void);

src/include/gvars/gvars.h

@@ -44,7 +44,7 @@ struct g_vars {
 	/*000274*/ u32 unk000274[4];
 	/*000284*/ struct player *currentplayer;
 	/*000288*/ struct gvars74 *unk000288;
-	/*00028c*/ u32 currentplayernum; // 0-3 - controller numbers I think
+	/*00028c*/ s32 currentplayernum; // 0-3 - controller numbers I think
 	/*000290*/ u32 currentplayerindex; // 0-3 - but 2 or 3 probably only used in combat simulator
 	/*000294*/ s32 bondplayernum;
 	/*000298*/ s32 coopplayernum;

src/include/types.h

@@ -32,6 +32,7 @@ struct prop {
 	union {
 		struct chrdata *chr;
 		struct defaultobj *obj;
+		struct doorobj *door;
 		struct weaponobj *weapon;
 	};
 
@@ -920,7 +921,7 @@ struct eyespy {
 	/*0x34*/ u8 init;
 	/*0x35*/ u8 initialised;
 	/*0x36*/ u8 startuptimer60;
-	/*0x37*/ u8 active;
+	/*0x37*/ s8 active;
 	/*0x38*/ u8 buttonheld;
 	/*0x39*/ u8 camerabuttonheld;
 	/*0x3a*/ s16 bobdir;
@@ -4741,4 +4742,15 @@ struct smoketype {
 	f32 unk20;
 };
 
+struct textoverride {
+	/*0x00*/ u32 unk00;
+	/*0x04*/ u32 unk04;
+	/*0x08*/ u32 unk08;
+	/*0x0c*/ u32 unk0c;
+	/*0x10*/ u32 unk10;
+	/*0x14*/ u32 unk14;
+	/*0x18*/ u32 unk18;
+	/*0x1c*/ u32 activatetextid;
+};
+
 #endif