Decompile func0f07e474

src/include/constants.h

@@ -2020,6 +2020,7 @@
 #define OBJHFLAG_00000200          0x00000200
 #define OBJHFLAG_00000400          0x00000400
 #define OBJHFLAG_00000800          0x00000800
+#define OBJHFLAG_00001000          0x00001000
 #define OBJHFLAG_ACTIVATED_BY_BOND 0x00004000
 #define OBJHFLAG_ACTIVATED_BY_COOP 0x00040000
 #define OBJHFLAG_00100000          0x00100000
@@ -2031,6 +2032,7 @@
 // obj->hidden2
 #define OBJH2FLAG_04 0x04
 #define OBJH2FLAG_08 0x08
+#define OBJH2FLAG_10 0x10
 #define OBJH2FLAG_40 0x40
 
 #define OBJTYPE_DOOR             0x01

src/include/game/game_091e10.h

@@ -6,7 +6,7 @@
 u32 setupGetCommandLength(u32 *cmd);
 u32 *setupGetPtrToCommandByIndex(u32 cmdindex);
 s32 tagGetCommandIndex(struct tag *tag);
-u32 func0f092124(void);
+u32 setupGetCommandOffset(struct prop *prop);
 bool propLoad(s32 propnum);
 bool func0f09220c(struct defaultobj *obj, struct coord *pos, f32 *realrot, u32 arg3, u32 arg4);
 bool func0f092304(struct defaultobj *obj, u32 arg1, u32 arg2);

src/include/game/game_0abe70.h

@@ -7,7 +7,7 @@ u32 func0f0abe70(void);
 u32 func0f0ac138(void);
 u32 func0f0ac4b8(void);
 u32 func0f0acb90(void);
-void func0f0adbbc(u32 *arg0);
+void func0f0adbbc(struct fireslot04 *fireslot04);
 u32 func0f0adcc8(void);
 u32 func0f0ade00(void);
 u32 func0f0ae964(void);

src/include/game/propobj.h

@@ -151,8 +151,8 @@ void doorTick(struct prop *doorprop);
 void func0f07731c(struct prop *door, s32 playercount);
 u32 func0f077448(void);
 u32 func0f07766c(void);
-u32 func0f077c10(void);
-u32 func0f078094(void);
+void liftTick(struct prop *lift);
+void escalatorTick(struct prop *escalator);
 void cameraTick(struct prop *camera);
 u32 func0f078930(void);
 void fanTick(struct prop *fan);
@@ -187,7 +187,7 @@ void func0f07e0b8(struct prop *glass, s32 playercount, u32 *arg2);
 u32 func0f07e184(void);
 u32 func0f07e1fc(void);
 void func0f07e2cc(struct prop *prop);
-u32 func0f07e468(void);
+bool propCanRegen(struct prop *prop);
 u32 func0f07e474(struct prop *prop);
 s32 objTick(struct prop *prop);
 u32 func0f07f6d0(void);
@@ -249,7 +249,7 @@ void currentPlayerQueuePickupWeaponHudmsg(u32 weaponnum, bool dual);
 u32 func0f088840(struct prop *prop, bool showhudmsg);
 u32 func0f089014(void);
 u32 func0f0899dc(void);
-u32 func0f089a94(void);
+void func0f089a94(bool arg0, struct model *model);
 u32 func0f089c70(void);
 u32 func0f089d64(void);
 u32 func0f089db8(void);

src/include/types.h

@@ -36,7 +36,7 @@ struct explosion;
 struct prop {
 	/*0x00*/ u8 type;
 	/*0x01*/ u8 flags;
-	/*0x02*/ s16 timetoregen;
+	/*0x02*/ s16 timetoregen; // ticks down
 
 	/*0x04*/
 	union {
@@ -1135,7 +1135,7 @@ struct autogunobj { // objtype 0d
 	/*0x90*/ u32 unk90;
 	/*0x94*/ u32 unk94;
 	/*0x98*/ u32 unk98;
-	/*0x9c*/ u32 unk9c;
+	/*0x9c*/ struct fireslot04 *unk9c;
 	/*0xa0*/ u32 unka0;
 	/*0xa4*/ u32 unka4;
 	/*0xa8*/ u8 autogun_type;
@@ -1149,7 +1149,7 @@ struct multiammocrateobj { // objtype 14
 
 struct shieldobj { // objtype 15
 	struct defaultobj base;
-	/*0x5c*/ f32 unk5c;
+	/*0x5c*/ f32 initialamount;
 	/*0x60*/ f32 amount;
 };
 
@@ -1282,7 +1282,7 @@ struct chopperobj {
 	/*0xd4*/ f32 gunrotx;
 	/*0xd8*/ f32 barrelrotspeed;
 	/*0xdc*/ f32 barrelrot;
-	/*0xdc*/ u32 unke0;
+	/*0xe0*/ struct fireslotthing *fireslotthing;
 	/*0xe4*/ bool dead;
 };
 
@@ -3271,19 +3271,29 @@ struct room {
 	/*0x88*/ u32 unk88;
 };
 
+struct fireslot04 {
+	s8 unk00;
+	s8 unk01;
+	u32 unk04;
+	u32 unk08;
+	u32 unk0c;
+	u32 unk10;
+	u32 unk14;
+	u32 unk18;
+	f32 unk1c;
+	f32 unk20;
+	u32 unk24;
+	f32 unk28;
+};
+
+struct fireslotthing {
+	/*0x00*/ u32 unk00;
+	/*0x04*/ struct fireslot04 *unk04;
+};
+
 struct fireslot {
 	/*0x00*/ s32 unk00;
-	/*0x04*/ u32 unk04;
-	/*0x08*/ u32 unk08;
-	/*0x0c*/ u32 unk0c;
-	/*0x10*/ u32 unk10;
-	/*0x14*/ u32 unk14;
-	/*0x18*/ u32 unk18;
-	/*0x1c*/ u32 unk1c;
-	/*0x20*/ u32 unk20;
-	/*0x24*/ u32 unk24;
-	/*0x28*/ u32 unk28;
-	/*0x2c*/ u32 unk2c;
+	/*0x04*/ struct fireslot04 unk04;
 };
 
 struct menulayer {