Decompile func0f105948

This commit is contained in:
Ryan Dwyer
2020-03-22 01:26:08 +10:00
parent 8c93fc00ac
commit 009e42e1ba
8 changed files with 405 additions and 863 deletions
+2 -1
View File
@@ -2125,7 +2125,8 @@
#define WEAPONFLAG_00000010 0x00000010
#define WEAPONFLAG_TRACKTIMEUSED 0x00000200
#define WEAPONFLAG_DUALWIELD 0x00001000 // Suspected dual wield
#define WEAPONFLAG_DUALWIELD 0x00001000
#define WEAPONFLAG_00040000 0x00040000
// Heads and bodies
#define HEAD_RANDOM -1
+5
View File
@@ -208,7 +208,12 @@ extern u32 var80072d8c;
extern u8 g_CassNecklaceUsername[10];
extern u8 g_CassNecklacePassword[14];
extern struct menu_dialog menudialog_weaponsavailable;
extern struct menu_dialog g_SoloAbortMenuDialog;
extern struct menu_dialog g_SoloPauseMenuDialog;
extern struct menu_dialog menudialog_18058;
extern struct menu_item menuitems_18c18[];
extern struct menu_dialog menudialog_18d30;
extern struct menu_dialog menudialog_19534;
extern struct menu_dialog menudialog_196c8;
extern struct menu_dialog menudialog_status;
extern struct cutscene g_Cutscenes[];
+1 -1
View File
@@ -35,7 +35,7 @@ u32 func0f0b1804(void);
u32 func0f0b184c(void);
s32 currentPlayerHasWeaponEquipped(u32 arg0);
void func0f0b1948(s32 weaponum, s32 arg1);
u32 func0f0b1a18(void);
u32 func0f0b1a18(s32 weaponnum);
u32 func0f0b1ad0(void);
u32 func0f0b1af0(void);
u32 func0f0b1c24(void);
+2 -2
View File
@@ -39,7 +39,7 @@ u32 func0f0f33bc(void);
u32 func0f0f361c(void);
void menuPopDialog(void);
void func0f0f3704(struct menu_dialog *dialog);
u32 func0f0f372c(void);
void func0f0f372c(u8 *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8);
u32 func0f0f37a4(void);
u32 func0f0f38b0(void);
u32 func0f0f5004(void);
@@ -58,7 +58,7 @@ void menuPushRootDialog(struct menu_dialog *dialog, s32 arg1);
void func0f0f85e0(struct menu_dialog *dialog, s32 arg1);
u32 func0f0f8634(void);
u32 func0f0f86a8(void);
void func0f0f8bb4(u32 *arg0, u32 arg1, u32 arg2);
void func0f0f8bb4(u8 *arg0, u32 arg1, u32 arg2);
void func0f0f8c98(void);
u32 func0f0f9030(void);
u32 func0f0f935c(void);
+1 -2
View File
@@ -17,11 +17,10 @@ u32 func0f105664(void);
u32 func0f1056a0(void);
char *invMenuTextPrimaryFunction(struct menu_item *item);
char *invMenuTextSecondaryFunction(struct menu_item *item);
u32 func0f105948(void);
void func0f105948(s32 weaponnum);
char *invMenuTextWeaponName(struct menu_item *item);
char *invMenuTextWeaponManufacturer(struct menu_item *item);
char *invMenuTextWeaponDescription(struct menu_item *item);
char *soloMenuTitlePauseStatus(struct menu_dialog *dialog);
bool soloChoosePauseDialog(void);
s32 menudialog00103368(u32, u32, u32 *);
void menudialog00103608(void);
+22 -19
View File
@@ -3897,7 +3897,10 @@ struct menustackitem {
/*0x83a*/ u8 unk83a;
/*0x83b*/ u8 playernum;
/*0x83c*/ u8 unk83c;
/*0x840*/ u32 unk840;
/*0x83d*/ u8 unk83d;
/*0x83e*/ u8 unk83e;
/*0x83f*/ u8 unk83f;
/*0x840*/ u8 unk840;
/*0x844*/ u32 unk844;
/*0x848*/ u32 unk848;
/*0x84c*/ u32 unk84c;
@@ -4221,24 +4224,24 @@ struct menustackitem {
/*0xd44*/ u32 unkd44;
/*0xd48*/ u32 unkd48;
/*0xd4c*/ u32 unkd4c;
/*0xd50*/ u32 unkd50;
/*0xd54*/ u32 unkd54;
/*0xd58*/ u32 unkd58;
/*0xd5c*/ u32 unkd5c;
/*0xd60*/ u32 unkd60;
/*0xd64*/ u32 unkd64;
/*0xd68*/ u32 unkd68;
/*0xd6c*/ u32 unkd6c;
/*0xd70*/ u32 unkd70;
/*0xd74*/ u32 unkd74;
/*0xd78*/ u32 unkd78;
/*0xd7c*/ u32 unkd7c;
/*0xd80*/ u32 unkd80;
/*0xd50*/ f32 unkd50;
/*0xd54*/ f32 unkd54;
/*0xd58*/ f32 unkd58;
/*0xd5c*/ f32 unkd5c;
/*0xd60*/ f32 unkd60;
/*0xd64*/ f32 unkd64;
/*0xd68*/ f32 unkd68;
/*0xd6c*/ f32 unkd6c;
/*0xd70*/ f32 unkd70;
/*0xd74*/ f32 unkd74;
/*0xd78*/ f32 unkd78;
/*0xd7c*/ f32 unkd7c;
/*0xd80*/ f32 unkd80;
/*0xd84*/ u32 unkd84;
/*0xd88*/ u32 unkd88;
/*0xd8c*/ u32 unkd8c;
/*0xd90*/ u32 unkd90;
/*0xd94*/ u32 unkd94;
/*0xd88*/ f32 unkd88;
/*0xd8c*/ f32 unkd8c;
/*0xd90*/ f32 unkd90;
/*0xd94*/ f32 unkd94;
/*0xd98*/ u32 unkd98;
/*0xd9c*/ u32 unkd9c;
/*0xda0*/ u32 unkda0;
@@ -4262,7 +4265,7 @@ struct menustackitem {
/*0xde8*/ u32 unkde8;
/*0xdec*/ u32 unkdec;
/*0xdf0*/ u32 unkdf0;
/*0xdf4*/ u32 unkdf4;
/*0xdf4*/ s8 *unkdf4;
/*0xdf8*/ u32 unkdf8;
/*0xdfc*/ u32 unkdfc;
/*0xe00*/ u32 unke00;