Decompile mpGetSimTypeIndex

This commit is contained in:
Ryan Dwyer
2020-08-30 00:53:13 +10:00
parent aab6609660
commit 59bcfcef89
10 changed files with 114 additions and 124 deletions
+8
View File
@@ -2488,6 +2488,14 @@
#define SIGHT_MAIAN 6
#define SIGHT_NONE 7
#define SIMSKILL_MEAT 0
#define SIMSKILL_EASY 1
#define SIMSKILL_NORMAL 2
#define SIMSKILL_HARD 3
#define SIMSKILL_PERFECT 4
#define SIMSKILL_DARK 5
#define SIMSKILL_6 6
#define SIMTYPE_GENERAL 0
#define SIMTYPE_PEACE 1
#define SIMTYPE_SHIELD 2
+1 -2
View File
@@ -89,8 +89,7 @@ extern u32 var800874f0;
extern struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS];
extern struct mphead g_MpHeads[75];
extern u32 table_0x2d678[];
extern struct mpsimulant g_MpGeneralSimulants[];
extern struct mpsimulant mpspecialsimulants[];
extern struct mpsimulanttype g_MpSimulantTypes[];
extern struct mpbody g_MpBodies[NUM_MPBODIES];
extern u32 g_MpMaleHeads[44];
extern u32 g_MpFemaleHeads[7];
+1 -1
View File
@@ -7,7 +7,7 @@ extern struct mptrack g_MpTracks[NUM_MPTRACKS];
extern struct mppreset g_MpPresets[NUM_MPPRESETS];
extern u32 g_TeamColours[MAX_TEAMS];
extern u8 g_NumMpSimulantChrs;
extern struct var80087d14 var80087d14[];
extern struct simskill g_SimSkills[];
extern u32 g_MpBotCommands[NUM_MPBOTCOMMANDS];
extern u32 var80087e2c;
extern u32 var80087e50;
+1 -1
View File
@@ -90,7 +90,7 @@ void mpRemoveSimulant(s32 index);
bool mpHasSimulants(void);
u32 func0f18cc8c(void);
bool mpIsSimSlotEnabled(s32 slot);
s32 func0f18cd68(s32 arg0, s32 arg1);
s32 mpGetSimTypeIndex(s32 arg0, s32 arg1);
u32 func0f18cddc(void);
s32 mpPlayerGetIndex(struct chrdata *chr);
struct chrdata *mpGetChrFromPlayerIndex(s32 index);
+3 -3
View File
@@ -3126,7 +3126,7 @@ struct mphead {
u8 unlockvalue;
};
struct mpsimulant {
struct mpsimulanttype {
u8 type;
u8 skill;
u16 name;
@@ -4259,7 +4259,7 @@ struct mpplayer {
struct mpsim {
/*0x00*/ struct mpchr base;
/*0x48*/ u8 unk48;
/*0x48*/ u8 skill;
};
struct missionconfig {
@@ -5165,7 +5165,7 @@ struct propdefinition {
u16 scale;
};
struct var80087d14 {
struct simskill {
u8 unk00;
f32 unk04;
f32 unk08;