Rename many symbols

* g_MenuStackDepth to g_MpPlayerNum
* menu_item.left/right to menu_item.param2/param3
* g_Options to g_MpChrs
* optionsindex to mpchrnum
* mpchr.booleans to options
* mpchr.mpbody/mphead to bodynum/headnum
* mpchr.mptitle to title
This commit is contained in:
Ryan Dwyer
2020-01-03 23:14:23 +10:00
parent 35e9a75213
commit f61a06e02d
24 changed files with 475 additions and 596 deletions
+28 -28
View File
@@ -3,39 +3,39 @@
#include <ultra64.h>
#include "types.h"
s32 optionsGetControlMode(s32 optionsindex);
void optionsSetControlMode(s32 optionsindex, s32 mode);
s32 optionsGetUnk45(s32 optionsindex);
s32 optionsGetUnk46(s32 optionsindex);
s32 optionsGetForwardPitch(s32 optionsindex);
s32 optionsGetAutoAim(s32 optionsindex);
s32 optionsGetLookAhead(s32 optionsindex);
s32 optionsGetAimControl(s32 optionsindex);
s32 optionsGetSightOnScreen(s32 optionsindex);
s32 optionsGetAmmoOnScreen(s32 optionsindex);
s32 optionsGetShowGunFunction(s32 optionsindex);
s32 optionsGetAlwaysShowTarget(s32 optionsindex);
s32 optionsGetShowZoomRange(s32 optionsindex);
s32 optionsGetPaintball(s32 optionsindex);
s32 optionsGetShowMissionTime(s32 optionsindex);
s32 optionsGetControlMode(s32 mpchrnum);
void optionsSetControlMode(s32 mpchrnum, s32 mode);
s32 optionsGetUnk45(s32 mpchrnum);
s32 optionsGetUnk46(s32 mpchrnum);
s32 optionsGetForwardPitch(s32 mpchrnum);
s32 optionsGetAutoAim(s32 mpchrnum);
s32 optionsGetLookAhead(s32 mpchrnum);
s32 optionsGetAimControl(s32 mpchrnum);
s32 optionsGetSightOnScreen(s32 mpchrnum);
s32 optionsGetAmmoOnScreen(s32 mpchrnum);
s32 optionsGetShowGunFunction(s32 mpchrnum);
s32 optionsGetAlwaysShowTarget(s32 mpchrnum);
s32 optionsGetShowZoomRange(s32 mpchrnum);
s32 optionsGetPaintball(s32 mpchrnum);
s32 optionsGetShowMissionTime(s32 mpchrnum);
u8 optionsGetInGameSubtitles(void);
u8 optionsGetCutsceneSubtitles(void);
s32 optionsGetHeadRoll(s32 optionsindex);
s32 optionsGetHeadRoll(s32 mpchrnum);
void optionsSetForwardPitch(s32 optionsindex, bool enable);
void optionsSetAutoAim(s32 optionsindex, bool enable);
void optionsSetLookAhead(s32 optionsindex, bool enable);
void optionsSetAimControl(s32 optionsindex, s32 index);
void optionsSetSightOnScreen(s32 optionsindex, bool enable);
void optionsSetAmmoOnScreen(s32 optionsindex, bool enable);
void optionsSetShowGunFunction(s32 optionsindex, bool enable);
void optionsSetAlwaysShowTarget(s32 optionsindex, bool enable);
void optionsSetShowZoomRange(s32 optionsindex, bool enable);
void optionsSetPaintball(s32 optionsindex, bool enable);
void optionsSetShowMissionTime(s32 optionsindex, bool enable);
void optionsSetForwardPitch(s32 mpchrnum, bool enable);
void optionsSetAutoAim(s32 mpchrnum, bool enable);
void optionsSetLookAhead(s32 mpchrnum, bool enable);
void optionsSetAimControl(s32 mpchrnum, s32 index);
void optionsSetSightOnScreen(s32 mpchrnum, bool enable);
void optionsSetAmmoOnScreen(s32 mpchrnum, bool enable);
void optionsSetShowGunFunction(s32 mpchrnum, bool enable);
void optionsSetAlwaysShowTarget(s32 mpchrnum, bool enable);
void optionsSetShowZoomRange(s32 mpchrnum, bool enable);
void optionsSetPaintball(s32 mpchrnum, bool enable);
void optionsSetShowMissionTime(s32 mpchrnum, bool enable);
void optionsSetInGameSubtitles(s32 enable);
void optionsSetCutsceneSubtitles(s32 enable);
void optionsSetHeadRoll(s32 optionsindex, bool enable);
void optionsSetHeadRoll(s32 mpchrnum, bool enable);
s32 optionsGetEffectiveScreenSize(void);
s32 optionsGetScreenSize(void);
void optionsSetScreenSize(s32 size);
+1 -2
View File
@@ -845,8 +845,7 @@ extern u32 var800ac500;
extern u32 var800ac530;
extern struct mpsim g_MpSimulants[8];
extern u32 var800ac798;
extern struct options g_Options[];
extern u32 var800ac858;
extern struct mpchr g_MpChrs[];
extern u32 var800aca38;
extern u32 var800acad8;
extern u32 var800acb78;
+1 -1
View File
@@ -143,7 +143,7 @@ extern u32 var800711e8;
extern u32 var800711f4;
extern u32 var8007142c;
extern u32 var80071440;
extern u32 g_MenuStackDepth;
extern u32 g_MpPlayerNum;
extern u32 var8007144c;
extern u32 var80071468;
extern u32 var80071470;
+1 -1
View File
@@ -301,7 +301,7 @@ extern struct mpheadentry mpheadstable[];
extern u32 table_0x2d678[];
extern struct mpsimulant mpgeneralsimulants[];
extern struct mpsimulant mpspecialsimulants[];
extern struct mpbody mpbodytable[];
extern struct bodynum mpbodytable[];
extern u32 mppresets[];
extern u32 mpteamcolors[];
extern u32 var80087d10;
+9 -9
View File
@@ -2678,7 +2678,7 @@ struct mpsimulant {
u8 unlockvalue;
};
struct mpbody {
struct bodynum {
u16 slot;
u16 name;
u16 unk04;
@@ -2811,8 +2811,8 @@ struct menu_item {
u8 type;
u8 param;
u32 flags;
u32 left;
u32 right;
u32 param2;
u32 param3;
void *handler;
};
@@ -2895,7 +2895,7 @@ struct gvars74 {
/*0x64*/ u32 unk64;
/*0x68*/ u32 unk68;
/*0x6c*/ u32 unk6c;
/*0x70*/ u32 optionsindex;
/*0x70*/ u32 mpchrnum;
/*0x74*/ u32 unk74;
/*0x78*/ u32 unk78;
/*0x7c*/ u32 unk7c;
@@ -3941,15 +3941,15 @@ struct propstate {
/*0x18*/ u32 lastupdateframe;
};
struct options {
struct mpchr {
/*0x00*/ u16 unk00;
/*0x04*/ u32 unk04;
/*0x08*/ u32 unk08;
/*0x0c*/ u8 unk0c;
/*0x0d*/ u8 unk0d;
/*0x0e*/ u8 unk0e;
/*0x0f*/ u8 mphead;
/*0x10*/ u8 mpbody;
/*0x0f*/ u8 headnum;
/*0x10*/ u8 bodynum;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
@@ -3966,7 +3966,7 @@ struct options {
/*0x45*/ s8 unk45;
/*0x46*/ s8 unk46;
/*0x47*/ u8 unk47;
/*0x48*/ u16 booleans;
/*0x48*/ u16 options;
/*0x4c*/ u32 unk4c;
/*0x50*/ u32 unk50;
/*0x54*/ u32 unk54;
@@ -3986,7 +3986,7 @@ struct options {
/*0x8c*/ u32 unk8c;
/*0x90*/ u32 unk90;
/*0x94*/ u8 unk94;
/*0x95*/ u8 mptitle;
/*0x95*/ u8 title;
/*0x98*/ u32 unk98;
/*0x9c*/ u32 unk9c;
};