falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile mpGetNumBeauHeads

This commit is contained in:
Ryan Dwyer 2020-01-19 21:10:18 +10:00
parent c0221e30d0
commit 21880c4b08
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/game_187770.c
View File

@ -5128,11 +5128,10 @@ s32 mpGetBeauHeadId(u8 headnum)
return g_MpBeauHeads[headnum].headid;
}
GLOBAL_ASM(
glabel func0f18bb80
/* f18bb80: 03e00008 */ jr $ra
/* f18bb84: 24020005 */ addiu $v0,$zero,0x5
);
s32 mpGetNumBeauHeads(void)
{
return NUM_MPBEAUHEADS;
}
u32 mpGetNumBodies(void)
{

1
src/include/constants.h
View File

@ -556,6 +556,7 @@
#define NUM_CHALLENGES 30
#define NUM_CHEATS 42
#define NUM_FIRESLOTS 20
#define NUM_MPBEAUHEADS 5
#define NUM_MPBOTCOMMANDS 14
#define NUM_MPBODIES 61
#define NUM_MPTRACKS 42

2
src/include/setup/setup_020df0.h
View File

@ -298,7 +298,7 @@ extern struct mpweaponset mpweaponsetstable[];
extern u32 var800874c8;
extern u32 var800874cc;
extern u32 var800874f0;
extern struct mphead g_MpBeauHeads[];
extern struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS];
extern struct mphead g_MpHeads[];
extern u32 table_0x2d678[];
extern struct mpsimulant g_MpGeneralSimulants[];

2
src/setup/setup_020df0.c
View File

@ -11928,7 +11928,7 @@ u32 var8008750c = 0x00000000;
u32 var80087510 = 0x00000000;
u32 var80087514 = 0x00000000;
struct mphead g_MpBeauHeads[] = {
struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS] = {
// head, unlock value
{ HEAD_BEAU2, 0x00 },
{ HEAD_BEAU3, 0x00 },