Decompile currentPlayerTickPauseMenu

This commit is contained in:
Ryan Dwyer
2020-11-26 23:25:26 +10:00
parent 754fd91a37
commit 5dc8a0622f
16 changed files with 99 additions and 180 deletions
+8 -6
View File
@@ -1949,6 +1949,10 @@
#define MPOPTION_PAC_HIGHLIGHTTARGET 0x00080000
#define MPOPTION_PAC_SHOWONRADAR 0x00100000
#define MPPAUSEMODE_0 0 // unpaused
#define MPPAUSEMODE_1 1 // paused via "Pause" menu item
#define MPPAUSEMODE_2 2 // paused due to only one player and having opened menu?
#define MPPLAYERTITLE_BEGINNER 0
#define MPPLAYERTITLE_TRAINEE 1
#define MPPLAYERTITLE_AMATEUR 2
@@ -2449,12 +2453,10 @@
#define PATHFLAG_FLYING 2
#define PATHFLAG_04 4
// These are suspected to be the same as the MENUROOT constants,
// but pausemode is the name used in the original source
#define PAUSEMODE_UNPAUSED 0
#define PAUSEMODE_1 1
#define PAUSEMODE_2 2
#define PAUSEMODE_3 3
#define PAUSEMODE_UNPAUSED 0
#define PAUSEMODE_PAUSING 1
#define PAUSEMODE_PAUSED 3
#define PAUSEMODE_UNPAUSING 5
#define PDMODEPROP_REACTION 0
#define PDMODEPROP_HEALTH 1
+1 -1
View File
@@ -79,7 +79,7 @@ extern u32 var80070818;
extern u32 var80070824;
extern u32 var80070830;
extern u32 var8007083c;
extern u32 g_PauseMode;
extern u32 g_GlobalMenuRoot;
extern u32 var80070844;
extern struct healthdamagetype g_HealthDamageTypes[];
extern u32 var800709c4;
+2 -2
View File
@@ -33,8 +33,8 @@ void func0f0ba8b0(f32 value);
f32 currentPlayerGetTeleportFovY(void);
void currentPlayerUpdateZoom(void);
void func0f0bace0(void);
void func0f0bad6c(void);
void currentPlayerPause(s32 mode);
void currentPlayerTickPauseMenu(void);
void currentPlayerPause(s32 root);
void func0f0baf38(void);
Gfx *func0f0baf84(Gfx *gdl);
Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac);
+1 -1
View File
@@ -36,7 +36,7 @@ void mpSetWeaponSet(s32 weaponsetnum);
void func0f1895e8(void);
s32 mpGetWeaponSet(void);
bool mpIsPaused(void);
void mpSetPaused(u8 pause);
void mpSetPaused(u8 mode);
u32 func0f18973c(void);
u32 func0f189cc0(void);
u32 func0f189dc8(void);
+1 -1
View File
@@ -25,7 +25,7 @@ void func0f16d9fc(void);
void func0f16da2c(void);
void func0f16daa4(void);
void musicStartForMenu(void);
void func0f16db3c(void);
void musicResumeAfterUnpause(void);
void musicStartSoloDeath(void);
void musicStartMpDeath(f32 arg0);
void func0f16dd14(void);
+1 -1
View File
@@ -2701,7 +2701,7 @@ struct player {
/*0x1a1c*/ s32 grabbeddoextra;
/*0x1a20*/ f32 grabbedrotextra;
/*0x1a24*/ s32 pausemode;
/*0x1a28*/ u32 pausetime60;
/*0x1a28*/ s32 pausetime60;
/*0x1a2c*/ struct coord grabbedposextra;
/*0x1a38*/ f32 grabbedrotextrasum;
/*0x1a3c*/ struct coord grabbedposextrasum;