Decompile mpCountWeaponSetThing

This commit is contained in:
Ryan Dwyer
2020-03-19 17:53:36 +10:00
parent 800f4b045e
commit bd098d02f7
6 changed files with 59 additions and 306 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
#define true 1
#define ABS(val) (val > 0 ? val : -val)
#define ARRAYCOUNT(a) (sizeof(a) / sizeof(a[0]))
#define ARRAYCOUNT(a) (s32)(sizeof(a) / sizeof(a[0]))
#define CHRRACE(chr) (chr ? chr->race : RACE_HUMAN)
#define FRAMEDURATION (1 / 60.0f)
#define PLAYERCOUNT() ((g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0) + (g_Vars.players[3] ? 1 : 0))
+1 -1
View File
@@ -298,7 +298,7 @@ extern u32 var8008716c;
extern u32 var800871fc;
extern u32 var80087264;
extern u16 mpweaponstable[];
extern struct mpweaponset mpweaponsetstable[];
extern struct mpweaponset g_MpWeaponSets[12];
extern u32 var800874c8;
extern u32 var800874cc;
extern u32 var800874f0;
+1 -1
View File
@@ -25,7 +25,7 @@ char *mpGetWeaponLabel(s32 weapon_id);
void mpSetWeaponSlot(s32 slot, s32 weapon_id);
s32 mpGetWeaponSlot(s32 slot);
u32 func0f188e24(void);
u32 func0f188ed4(void);
s32 mpCountWeaponSetThing(s32 weaponsetindex);
u32 func0f188f9c(void);
s32 func0f189058(s32 arg0);
u32 func0f189088(void);
+9 -2
View File
@@ -3070,8 +3070,15 @@ struct stagetableentry {
};
struct mpweaponset {
u16 namefileid;
u8 slots[16];
/*0x00*/ u16 name;
/*0x02*/ u8 slots[6];
/*0x08*/ u8 unlocks[4];
/*0x0c*/ u8 unk0c;
/*0x0d*/ u8 unk0d;
/*0x0e*/ u8 unk0e;
/*0x0f*/ u8 unk0f;
/*0x10*/ u8 unk10;
/*0x11*/ u8 unk11;
};
struct mphead {