Decompile mpCalculatePlayerTitle

This commit is contained in:
Ryan Dwyer
2020-03-27 22:21:55 +10:00
parent 96b689db75
commit a61078b1cb
319 changed files with 3546 additions and 3359 deletions
+62 -84
View File
@@ -32,24 +32,86 @@ extern u16 fade80084064;
extern s32 var80087260;
extern struct stagethinglist stagethinglist_20e10;
extern struct stagethinglist stagethinglist_20e3c;
extern struct stagethinglist stagethinglist_20e48;
extern struct stagethinglist stagethinglist_20e54;
extern struct stagethinglist stagethinglist_20e60;
extern struct stagethinglist stagethinglist_20e6c;
extern struct stagethinglist stagethinglist_20e80;
extern struct stagethinglist stagethinglist_20e94;
extern struct stagethinglist stagethinglist_20ea4;
extern struct stagethinglist stagethinglist_20ec8;
extern struct stagethinglist stagethinglist_20edc;
extern struct stagethinglist stagethinglist_20eec;
extern struct stagethinglist stagethinglist_20ef8;
extern struct stagethinglist stagethinglist_20f0c;
extern struct stagethinglist stagethinglist_20f18;
extern struct stagethinglist stagethinglist_20f24;
extern struct stagethinglist stagethinglist_20f50;
extern struct stagethinglist stagethinglist_20f5c;
extern struct stagethinglist stagethinglist_20f74;
extern struct stagethinglist stagethinglist_20f84;
extern struct stagethinglist stagethinglist_20fb8;
extern struct stagethinglist stagethinglist_20fd8;
extern struct stagethinglist stagethinglist_20fe8;
extern struct stagethinglist stagethinglist_20ff8;
extern struct propdefinition g_Props[];
extern u8 propexplosiontypes[];
extern struct stagethinglist stagethinglist_2208c;
extern struct stagethinglist stagethinglist_220d0;
extern struct stagethinglist stagethinglist_220a4;
extern struct stagethinglist stagethinglist_2100c;
extern struct stagethinglist stagethinglist_21018;
extern struct stagethinglist stagethinglist_21024;
extern struct stagethinglist stagethinglist_21034;
extern struct stagethinglist stagethinglist_21084;
extern u32 var8007c0c0;
extern struct stagethinglist stagethinglist_221a4;
extern struct stagethinglist stagethinglist_221b4;
extern struct stagethinglist stagethinglist_221cc;
extern struct stagethinglist stagethinglist_221e4;
extern struct stagethinglist stagethinglist_22200;
extern struct stagethinglist stagethinglist_22220;
extern struct stagethinglist stagethinglist_2224c;
extern struct stagethinglist stagethinglist_222b4;
extern struct stagethinglist stagethinglist_22318;
extern struct stagethinglist stagethinglist_22374;
extern struct stagethinglist stagethinglist_223d4;
extern struct stagethinglist stagethinglist_22424;
extern struct stagethinglist stagethinglist_2247c;
extern struct stagethinglist stagethinglist_224d8;
extern struct stagethinglist stagethinglist_22538;
extern struct stagethinglist stagethinglist_2258c;
extern struct stagethinglist stagethinglist_225d8;
extern struct stagethinglist stagethinglist_22630;
extern struct stagethinglist stagethinglist_22698;
extern struct stagethinglist stagethinglist_226e8;
extern struct stagethinglist stagethinglist_22754;
extern struct stagethinglist stagethinglist_227ac;
extern struct stagethinglist stagethinglist_22804;
extern struct stagethinglist stagethinglist_2285c;
extern struct stagethinglist stagethinglist_228b4;
extern struct stagethinglist stagethinglist_2291c;
extern struct stagethinglist stagethinglist_22970;
extern struct stagethinglist stagethinglist_229c4;
extern struct stagethinglist stagethinglist_22a20;
extern struct stagethinglist stagethinglist_22a78;
extern struct stagethinglist stagethinglist_22adc;
extern struct stagethinglist stagethinglist_22b28;
extern struct stagethinglist stagethinglist_22b80;
extern struct stagethinglist stagethinglist_22be0;
extern struct stagethinglist stagethinglist_22c3c;
extern struct stagethinglist stagethinglist_22c54;
extern struct stagethinglist stagethinglist_22ca0;
extern struct stagethinglist stagethinglist_22cf0;
extern struct stagethinglist stagethinglist_22d40;
extern struct stagethinglist stagethinglist_22d90;
extern struct stagethinglist stagethinglist_22de0;
extern struct stagethinglist stagethinglist_22e34;
extern struct stagethinglist stagethinglist_22e60;
extern struct stagethinglist stagethinglist_22eb8;
extern struct stagethinglist stagethinglist_22ec8;
extern struct stagethinglist stagethinglist_22f0c;
extern struct stagethinglist stagethinglist_22f1c;
extern struct body g_Bodies[];
extern u32 var8007dae4;
@@ -310,89 +372,5 @@ extern struct mpsimulant mpspecialsimulants[];
extern struct mpbody g_MpBodies[NUM_MPBODIES];
extern u32 g_MpMaleHeads[44];
extern u32 g_MpFemaleHeads[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 u32 g_MpBotCommands[NUM_MPBOTCOMMANDS];
extern u32 var80087e2c;
extern u32 var80087e50;
extern u32 var80087e98;
extern u32 var80087eb0;
extern u32 var80088490;
extern u32 var80088494;
extern u32 var800884a4;
extern u32 g_MpChallengeIndex;
extern u32 var800884b4;
extern struct challenge g_MpChallenges[NUM_CHALLENGES];
extern u32 var800887c4;
extern u32 var80088800;
extern u8 var80088804;
extern u32 var80088808;
extern u32 var8008880c;
extern u32 var80088810;
extern u32 var80088854;
extern u8 var800888a0;
extern struct chrbio g_ChrBios[10];
extern u32 misc_bios[];
extern u32 var80088964;
extern u32 place_bios[];
extern u32 var80088adc;
extern u32 var80088ae0;
extern u32 var80088aec;
extern u32 var80088b14;
extern u32 device_descriptions[];
extern u32 device_tips1[];
extern u32 device_tips2[];
extern u32 var80088bb8;
extern u32 var80088bbc;
extern u32 var80088bc8;
extern u32 var80088be4;
extern u32 var80088c04;
extern u32 var80088c20;
extern u32 var80088c3c;
extern u32 var80088c58;
extern u32 var80088c70;
extern u16 g_FiringRangeFailReasons[5];
extern u16 g_FiringRangeDifficultyNames[3];
extern u32 var80088c8c;
extern u32 var80088c90;
extern u32 var80088c94;
extern u32 var80088c98;
extern u32 var80088c9c;
extern u32 var80088ca0;
extern u32 var80088ca4;
extern u32 var80088ca8;
extern struct menu_dialog menudialog_frdifficulty;
extern struct menu_dialog g_FrWeaponListMenuDialog;
extern struct menu_dialog g_FrTrainingInfoMenuDialog;
extern struct menu_dialog menudialog_frtraininginfo2;
extern struct menu_dialog menudialog_frtrainingstats;
extern struct menu_dialog menudialog_frtrainingstats2;
extern u32 var800891b0;
extern struct menu_dialog menudialog_information;
extern u32 var80089268;
extern u32 var80089280;
extern struct menu_dialog menudialog_characterprofile;
extern struct menu_dialog menudialog_2f3c0;
extern struct menu_dialog g_DeviceTrainingListMenuDialog;
extern u32 var800893f8;
extern struct menu_dialog g_DeviceTrainingDetailsMenuDialog;
extern struct menu_dialog g_DeviceTrainingStatsFailedMenuDialog;
extern struct menu_dialog g_DeviceTrainingStatsCompletedMenuDialog;
extern struct menu_dialog g_HoloTrainingListMenuDialog;
extern struct menu_dialog g_HoloTrainingDetailsMenuDialog;
extern struct menu_dialog g_HoloTrainingStatsFailedMenuDialog;
extern struct menu_dialog g_HoloTrainingStatsCompletedMenuDialog;
extern u32 var800897a4;
extern u32 var800897b4;
extern u32 var800897c4;
extern struct hoverprop hoverprops[];
extern struct menu_dialog menudialog_2f938;
extern struct menu_dialog menudialog_2f950;
extern struct menu_dialog menudialog_hangarinformation;
extern u32 var80089ad0;
extern u32 var8008a2d0;
#endif
+91
View File
@@ -0,0 +1,91 @@
#ifndef IN_GAME_DATA_02DA90_H
#define IN_GAME_DATA_02DA90_H
#include <ultra64.h>
#include "game/data/data_020df0.h"
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 u32 g_MpBotCommands[NUM_MPBOTCOMMANDS];
extern u32 var80087e2c;
extern u32 var80087e50;
extern u32 var80087e98;
extern u32 var80087eb0;
extern u32 var80088490;
extern u32 var80088494;
extern u32 var800884a4;
extern u32 g_MpChallengeIndex;
extern u32 var800884b4;
extern struct challenge g_MpChallenges[NUM_CHALLENGES];
extern u32 var800887c4;
extern u32 var80088800;
extern u8 var80088804;
extern u32 var80088808;
extern u32 var8008880c;
extern u32 var80088810;
extern u32 var80088854;
extern u8 var800888a0;
extern struct chrbio g_ChrBios[10];
extern u32 misc_bios[];
extern u32 var80088964;
extern u32 place_bios[];
extern u32 var80088adc;
extern u32 var80088ae0;
extern u32 var80088aec;
extern u32 var80088b14;
extern u32 device_descriptions[];
extern u32 device_tips1[];
extern u32 device_tips2[];
extern u32 var80088bb8;
extern u32 var80088bbc;
extern u32 var80088bc8;
extern u32 var80088be4;
extern u32 var80088c04;
extern u32 var80088c20;
extern u32 var80088c3c;
extern u32 var80088c58;
extern u32 var80088c70;
extern u16 g_FiringRangeFailReasons[5];
extern u16 g_FiringRangeDifficultyNames[3];
extern u32 var80088c8c;
extern u32 var80088c90;
extern u32 var80088c94;
extern u32 var80088c98;
extern u32 var80088c9c;
extern u32 var80088ca0;
extern u32 var80088ca4;
extern u32 var80088ca8;
extern struct menu_dialog menudialog_frdifficulty;
extern struct menu_dialog g_FrWeaponListMenuDialog;
extern struct menu_dialog g_FrTrainingInfoMenuDialog;
extern struct menu_dialog menudialog_frtraininginfo2;
extern struct menu_dialog menudialog_frtrainingstats;
extern struct menu_dialog menudialog_frtrainingstats2;
extern u32 var800891b0;
extern struct menu_dialog menudialog_information;
extern u32 var80089268;
extern u32 var80089280;
extern struct menu_dialog menudialog_characterprofile;
extern struct menu_dialog menudialog_2f3c0;
extern struct menu_dialog g_DeviceTrainingListMenuDialog;
extern u32 var800893f8;
extern struct menu_dialog g_DeviceTrainingDetailsMenuDialog;
extern struct menu_dialog g_DeviceTrainingStatsFailedMenuDialog;
extern struct menu_dialog g_DeviceTrainingStatsCompletedMenuDialog;
extern struct menu_dialog g_HoloTrainingListMenuDialog;
extern struct menu_dialog g_HoloTrainingDetailsMenuDialog;
extern struct menu_dialog g_HoloTrainingStatsFailedMenuDialog;
extern struct menu_dialog g_HoloTrainingStatsCompletedMenuDialog;
extern u32 var800897a4;
extern u32 var800897b4;
extern u32 var800897c4;
extern struct hoverprop hoverprops[];
extern struct menu_dialog menudialog_2f938;
extern struct menu_dialog menudialog_2f950;
extern struct menu_dialog menudialog_hangarinformation;
extern u32 var80089ad0;
extern u32 var8008a2d0;
#endif
+1 -1
View File
@@ -42,7 +42,7 @@ u32 func0f189cc0(void);
u32 func0f189dc8(void);
u32 func0f189ed0(void);
u32 func0f18a030(void);
u32 func0f18a190(void);
void mpCalculatePlayerTitle(struct mpplayer *mpplayer);
u32 func0f18a56c(void);
u32 func0f18b9e4(void);
u32 func0f18bb1c(void);
+2 -2
View File
@@ -4089,9 +4089,9 @@ struct mpplayer {
/*0x60*/ u32 gameswon;
/*0x64*/ u32 gameslost;
/*0x68*/ u32 time;
/*0x6c*/ f32 distance;
/*0x6c*/ u32 distance;
/*0x70*/ f32 accuracy;
/*0x74*/ f32 damagedealt;
/*0x74*/ u32 damagedealt;
/*0x78*/ f32 painreceived;
/*0x7c*/ u32 headshots;
/*0x80*/ u32 ammoused;