Decompile propobjHandlePickupByAibot

src/include/constants.h

@@ -1544,6 +1544,7 @@
 #define OBJHFLAG_GRABBED           0x08000000
 
 // obj->hidden2
+#define OBJH2FLAG_04 0x04
 #define OBJH2FLAG_08 0x08
 
 #define OBJTYPE_DOOR             0x01
@@ -1552,7 +1553,7 @@
 #define OBJTYPE_KEY              0x04
 #define OBJTYPE_05               0x05
 #define OBJTYPE_CAMERA           0x06
-#define OBJTYPE_07               0x07
+#define OBJTYPE_AMMOCRATE        0x07
 #define OBJTYPE_WEAPON           0x08
 #define OBJTYPE_CHR              0x09
 #define OBJTYPE_SINGLEMONITOR    0x0a
@@ -2084,7 +2085,7 @@
 
 #define WEAPONFLAG_00000010      0x00000010
 #define WEAPONFLAG_TRACKTIMEUSED 0x00000200
-#define WEAPONFLAG_00001000      0x00001000
+#define WEAPONFLAG_DUALWIELD      0x00001000 // Suspected dual wield
 
 // Heads and bodies
 #define HEAD_RANDOM           -1

src/include/game/game_092610.h

@@ -16,7 +16,7 @@ u32 func0f093508(void);
 u32 func0f093630(void);
 u32 func0f093790(void);
 u32 func0f0938ec(void);
-void func0f0939f8(void *arg0, struct prop *prop, s16 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, f32 arg9, s32 arg10, s32 arg11, f32 arg12, f32 arg13, f32 arg14);
+u32 func0f0939f8(void *arg0, struct prop *prop, s16 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, f32 arg9, s32 arg10, s32 arg11, f32 arg12, f32 arg13, f32 arg14);
 void audioMuteChannel(s32 channel);
 u32 audioIfChannelIdle(s32 channel);
 bool audioPlayFromProp2(s8 channel_id, s32 audio_id, s32 volumemaybe, struct prop *prop, u32 arg4, s32 arg5, s32 arg6, s32 arg7);

src/include/game/game_179060.h

@@ -111,9 +111,9 @@ void func0f18620c(void);
 u32 func0f186508(void);
 void func0f1866b8(s32 playernum, char *message);
 u32 func0f186780(void);
-u32 func0f186898(void);
+u32 chrGiveBriefcase(struct chrdata *chr, struct prop *prop);
 u32 func0f187288(void);
-u32 func0f187410(void);
+u32 chrGiveUplink(struct chrdata *chr, struct prop *prop);
 u32 func0f1876e4(void);
 s32 menuhandlerMpDropOut(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandlerMpTeamsLabel(u32 operation, struct menu_item *item, s32 *value);

src/include/game/game_190260.h

@@ -8,7 +8,7 @@ void mpChrReset(struct chrdata *chr, u8 full);
 void mpInitSimulant(struct chrdata *chr, u8 full);
 void mpInitSimulants(void);
 u32 add87654321(u32 value);
-u32 func0f190784(void);
+u32 propobjHandlePickupByAibot(struct prop *prop, struct chrdata *chr);
 u32 func0f190be4(void);
 u32 func0f19124c(void);
 u32 func0f1913f8(void);

src/include/game/game_197600.h

@@ -9,11 +9,11 @@ void func0f197c00(struct chrdata *chr);
 u32 func0f197c70(void);
 u32 func0f197cf0(void);
 u32 func0f197d94(void);
-u32 func0f197e40(void);
+bool chrHasWeapon(struct chrdata *chr, u32 weaponnum);
 u32 func0f197e8c(void);
-u32 func0f197f04(void);
-u32 func0f197f30(void);
-u32 func0f197f6c(void);
+void chrGiveDualWeapon(struct chrdata *chr, u32 weaponnum);
+u32 chrGetWeaponPad(struct chrdata *chr, u32 weaponnum);
+void chrGiveWeapon(struct chrdata *chr, struct prop *prop);
 u32 func0f198068(void);
 u32 func0f198278(void);
 u32 func0f1982d4(void);

src/include/game/game_1999b0.h

@@ -9,8 +9,8 @@ u32 func0f199a40(void);
 u32 func0f199be4(void);
 u32 func0f199cb8(void);
 u32 func0f199d70(void);
-u32 func0f199e3c(void);
-u32 func0f199ef4(void);
+void func0f199e3c(struct chr2d4 *chr2d4, u32 weaponnum, bool proxy, u32 qty);
+void aibotGiveAmmo(struct chr2d4 *chr2d4, u32 ammotype, u32 qty);
 u32 func0f199f84(void);
 bool func0f19a29c(u32 value, bool fallback);
 u32 func0f19a2dc(u32 value);

src/include/game/propobj.h

@@ -93,8 +93,8 @@ void func0f06a730(struct defaultobj *obj, struct pad *newpad, f32 *matrix, s16 *
 u32 func0f06ab60(void);
 void func0f06ac40(struct defaultobj *obj);
 void func0f06ac90(struct prop *prop);
-void setupParseObject(u32 *ptr, bool arg1, bool arg2);
-void setupParseObjectWithArg2False(u32 *ptr, bool arg1);
+void setupParseObject(void *ptr, bool arg1, bool arg2);
+void setupParseObjectWithArg2False(void *ptr, bool arg1);
 u32 func0f06b36c(void);
 u32 func0f06b39c(void);
 u32 func0f06b488(void);
@@ -237,7 +237,7 @@ u32 func0f087638(void);
 u32 func0f087668(void);
 u32 func0f08791c(void);
 void func0f087b0c(u32 arg0);
-u32 func0f087c0c(void);
+u32 propPlayPickupSound(struct prop *prop, s32 weaponnum);
 u32 func0f087d10(void);
 u32 func0f087e40(void);
 u32 func0f087fb0(void);

src/include/types.h

@@ -893,6 +893,11 @@ struct image {
 	/*0x14*/ u32 unk14;
 };
 
+struct ammocrateobj { // objtype 0x07
+	struct defaultobj base;
+	/*0x5c*/ u32 ammotype;
+};
+
 struct weaponobj { // objtype 0x08
 	struct defaultobj base;
 	/*0x5c*/ u8 weapon_id;
@@ -955,9 +960,15 @@ struct autogunobj { // objtype 0d
 	/*0xa8*/ u8 autogun_type;
 };
 
-struct ammocrateobj { // objtype 14
+struct multiammocrateobj { // objtype 14
 	struct defaultobj base;
-	/*0x5c*/ u32 ammotype;
+	/*0x5c*/ u32 quantities[19]; // indexed by ammotype minus 1
+};
+
+struct shieldobj { // objtype 15
+	struct defaultobj base;
+	/*0x5c*/ f32 unk5c;
+	/*0x60*/ f32 amount;
 };
 
 struct truckobj {