Split game_0f09f0 into game_0fd660 and decompile activemenuGetSlotDetails

src/include/constants.h

@@ -86,6 +86,11 @@
 #define AMMOTYPE_1F           0x1f
 #define AMMOTYPE_ECM_MINE     0x20
 
+// Active menu slots
+#define AMSLOTFLAG_CURRENT 0x02 // black, eg. current equipped weapon
+#define AMSLOTFLAG_ACTIVE  0x08 // pulsates slightly, eg. cloak/xray when active
+#define AMSLOTFLAG_HIDDEN  0x10
+
 #define ANIM_IDLE                   0x0000
 #define ANIM_TWO_GUN_HOLD           0x0001
 #define ANIM_KNEEL_TWO_HANDED_GUN   0x0008

src/include/game/game_097ba0.h

@@ -95,7 +95,7 @@ u32 func0f0a1a68(void);
 u32 func0f0a1ab0(void);
 u32 func0f0a1b50(void);
 u32 func0f0a1c2c(void);
-u32 func0f0a1d14(void);
+bool func0f0a1d14(u32 weaponnum);
 u32 func0f0a1df4(void);
 void currentPlayerEquipWeapon(u32 arg0, u32 arg1);
 u32 func0f0a20fc(void);
@@ -152,7 +152,7 @@ u32 func0f0a9494(void);
 u32 func0f0a94d0(void);
 void func0f0a95ec(u32 arg0, u32 arg1);
 void currentPlayerGiveAmmo(s32 ammotype, s32 quantity);
-u32 func0f0a9770(void);
+s32 ammoGetQuantity(u32 type);
 s32 currentPlayerGetAmmoCount(s8 arg0);
 u32 func0f0a98f4(void);
 u32 func0f0a9910(void);

src/include/game/game_0b0420.h

@@ -21,7 +21,7 @@ struct weapon *weaponFindById(s32 itemid);
 struct weaponfunc *weaponGetFunctionById(s32 weapon_id, s32 which);
 u32 func0f0b103c(void);
 u32 func0f0b107c(void);
-u32 func0f0b10b8(void);
+struct weaponfunc *weaponGetFunction(u8 *arg0, s32 which);
 u32 func0f0b10ec(void);
 u32 func0f0b11bc(void);
 u32 func0f0b11ec(void);

src/include/game/game_0f09f0.h

@@ -79,30 +79,5 @@ u32 func0f0fd494(void);
 u32 func0f0fd548(void);
 u32 func0f0fd570(void);
 bool currentPlayerIsInTraining(void);
-void func0f0fd660(void);
-u32 func0f0fdd00(void);
-u32 func0f0fdd84(void);
-s32 func0f0fde8c(void);
-u32 func0f0fdf14(void);
-u32 func0f0fe280(void);
-u32 func0f0fe848(void);
-u32 func0f0fea14(void);
-void activemenuChangeScreen(s32 step);
-u32 func0f0fecd4(void);
-u32 func0f0fef68(void);
-u32 func0f0ff040(void);
-u32 func0f0ff0bc(void);
-u32 func0f0ff274(void);
-u32 func0f0ff6f4(void);
-u32 func0f0ff7bc(void);
-u32 func0f100128(void);
-u32 func0f100ad0(void);
-s32 menudialog000fcd48(u32, u32, u32 *);
-bool menudialogMpPickTarget(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem);
-s32 menuhandler000fcc34(u32, u32, u32 *);
-s32 menuhandler000fd6f0(u32, u32, u32 *);
-s32 menuhandlerRepairPak(u32 operation, struct menu_item *item, s32 *value);
-s32 menuhandlerRetrySavePak(u32 operation, struct menu_item *item, s32 *value);
-s32 menuhandlerWarnRepairPak(u32 operation, struct menu_item *item, s32 *value);
 
 #endif

src/include/game/game_0fd660.h

@@ -0,0 +1,32 @@
+#ifndef IN_GAME_GAME_0FD660_H
+#define IN_GAME_GAME_0FD660_H
+#include <ultra64.h>
+#include "types.h"
+
+void func0f0fd660(void);
+u32 func0f0fdd00(void);
+u32 func0f0fdd84(void);
+s32 func0f0fde8c(void);
+u32 func0f0fdf14(void);
+void activemenuGetSlotDetails(s32 slot, u32 *flags, char *dst);
+u32 func0f0fe848(void);
+u32 func0f0fea14(void);
+void activemenuChangeScreen(s32 step);
+u32 func0f0fecd4(void);
+u32 func0f0fef68(void);
+u32 func0f0ff040(void);
+u32 func0f0ff0bc(void);
+u32 func0f0ff274(void);
+u32 func0f0ff6f4(void);
+u32 func0f0ff7bc(void);
+u32 func0f100128(void);
+u32 func0f100ad0(void);
+s32 menudialog000fcd48(u32, u32, u32 *);
+bool menudialogMpPickTarget(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem);
+s32 menuhandler000fcc34(u32, u32, u32 *);
+s32 menuhandler000fd6f0(u32, u32, u32 *);
+s32 menuhandlerRepairPak(u32 operation, struct menu_item *item, s32 *value);
+s32 menuhandlerRetrySavePak(u32 operation, struct menu_item *item, s32 *value);
+s32 menuhandlerWarnRepairPak(u32 operation, struct menu_item *item, s32 *value);
+
+#endif

src/include/gvars/gvars.h

@@ -862,7 +862,7 @@ extern u32 var800ac798[8];
 extern struct mpplayer g_MpPlayers[4];
 extern u32 var800aca38;
 extern u32 var800acad8;
-extern u32 var800acb78;
+extern u8 g_ActiveMenuMpBotCommands[16];
 extern struct mpsetup g_MpSetup;
 extern s8 g_MpLockPlayerNum;
 extern u32 var800acc28;

src/include/types.h

@@ -2388,7 +2388,7 @@ struct player {
 	/*0x1574*/ u32 unk1574;
 	/*0x1578*/ u32 unk1578;
 	/*0x157c*/ u32 unk157c;
-	/*0x1580*/ u32 unk1580;
+	/*0x1580*/ s8 unk1580;
 	/*0x1584*/ u32 unk1584;
 	/*0x1588*/ u32 unk1588;
 	/*0x158c*/ u32 unk158c;
@@ -4342,7 +4342,8 @@ struct mpplayer {
 	/*0x90*/ u32 unk90;
 	/*0x94*/ u8 unk94;
 	/*0x95*/ u8 title;
-	/*0x98*/ u32 unk98;
+	/*0x96*/ u8 unk96;
+	/*0x97*/ u8 gunfuncs[5];
 	/*0x9c*/ u8 unk9c;
 	/*0x9d*/ u8 handicap;
 };
@@ -4832,8 +4833,7 @@ struct activemenuthing {
 	/*0x14*/ u32 unk14;
 	/*0x18*/ f32 unk18;
 	/*0x1c*/ u32 unk1c;
-	/*0x20*/ u32 unk20;
-	/*0x24*/ u32 unk24;
+	/*0x20*/ u8 weaponnums[8];
 	/*0x28*/ u32 unk28;
 	/*0x2c*/ u32 unk2c;
 	/*0x30*/ u16 unk30;