Decompile func0f19c6bc and introduce PLAYERCOUNT() macro

This commit is contained in:
Ryan Dwyer
2020-01-04 21:28:11 +10:00
parent 59f770142b
commit c02eb78e8b
8 changed files with 40 additions and 202 deletions
+3
View File
@@ -4,6 +4,9 @@
#define false 0
#define true 1
#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))
#define PLAYERCOUNT3012() ((g_Vars.players[3] ? 1 : 0) + (g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0))
// These actions are assigned to chr->actiontype
#define ACT_INIT 0
#define ACT_STAND 1
+3 -3
View File
@@ -54,11 +54,11 @@ u32 func0f19c2cc(void);
u32 func0f19c37c(void);
u32 func0f19c3bc(void);
u32 func0f19c3dc(void);
u32 func0f19c40c(void);
void func0f19c40c(s32 arg0, s32 numplayers, s32 arg2);
u32 func0f19c47c(void);
u32 func0f19c4b8(void);
void func0f19c4b8(s32 arg0, s32 arg1, s32 numplayers, s32 arg3);
u32 func0f19c53c(void);
u32 func0f19c6bc(void);
void func0f19c6bc(void);
bool mpIsOptionAvailable(s32 option);
#endif
+1
View File
@@ -313,6 +313,7 @@ extern u32 var80087eb0;
extern u32 var80088490;
extern u32 var80088494;
extern u32 var800884a4;
extern u32 var800884b0;
extern u16 challenges[];
extern u32 var800887c4;
extern u32 var80088800;