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

Decompile mpGetLock

This commit is contained in:
Ryan Dwyer 2020-01-11 21:13:26 +10:00
parent ae9798d482
commit 2dd60c0e3c
6 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/game_10ccd0.c
View File

@ -4257,10 +4257,10 @@ glabel func0f11080c
/* f1108b4: 0fc354fe */ jal scenarioDefaultCallback40
/* f1108b8: 24050004 */ addiu $a1,$zero,0x4
/* f1108bc: a6220482 */ sh $v0,0x482($s1)
/* f1108c0: 3c11800b */ lui $s1,%hi(var800acc10)
/* f1108c0: 3c11800b */ lui $s1,%hi(g_MpLock)
/* f1108c4: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f1108c8: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f1108cc: 2631cc10 */ addiu $s1,$s1,%lo(var800acc10)
/* f1108cc: 2631cc10 */ addiu $s1,$s1,%lo(g_MpLock)
/* f1108d0: 02402025 */ or $a0,$s2,$zero
.L0f1108d4:
/* f1108d4: 02002825 */ or $a1,$s0,$zero
@ -4359,8 +4359,8 @@ glabel func0f1109c0
/* f110a24: 0fc354be */ jal scenarioDefaultCallback44
/* f110a28: 24060004 */ addiu $a2,$zero,0x4
/* f110a2c: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f110a30: 3c11800b */ lui $s1,%hi(var800acc10)
/* f110a34: 2631cc10 */ addiu $s1,$s1,%lo(var800acc10)
/* f110a30: 3c11800b */ lui $s1,%hi(g_MpLock)
/* f110a34: 2631cc10 */ addiu $s1,$s1,%lo(g_MpLock)
/* f110a38: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f110a3c: 02402025 */ or $a0,$s2,$zero
.L0f110a40:

8
src/game/game_176d70.c
View File

@ -1807,7 +1807,7 @@ s32 menuhandlerMpEndGame(u32 operation, struct menu_item *item, s32 *value)
s32 menuhandler00178018(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (var800acc10 != 5) {
if (g_MpLock != MPLOCK_CHALLENGE) {
return true;
}
}
@ -8335,7 +8335,7 @@ glabel menuhandler0017e4d4
s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (var800acc10 != 5) {
if (g_MpLock != MPLOCK_CHALLENGE) {
return true;
}
}
@ -8346,7 +8346,7 @@ s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value)
s32 menuhandlerMpAbortChallenge(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (var800acc10 != 5) {
if (g_MpLock != MPLOCK_CHALLENGE) {
return true;
}
}
@ -8361,7 +8361,7 @@ s32 menuhandlerMpAbortChallenge(u32 operation, struct menu_item *item, s32 *valu
s32 menuhandlerMpStartChallenge(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (var800acc10 != 5) {
if (g_MpLock != MPLOCK_CHALLENGE) {
return true;
}
}

10
src/game/game_187770.c
View File

@ -5463,12 +5463,10 @@ glabel mpSetLock
/* f18bfbc: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel mpGetLock
/* f18bfc0: 3c02800b */ lui $v0,0x800b
/* f18bfc4: 03e00008 */ jr $ra
/* f18bfc8: 9042cc10 */ lbu $v0,-0x33f0($v0)
);
u32 mpGetLock(void)
{
return g_MpLock;
}
GLOBAL_ASM(
glabel mpGetLockPlayerNum

2
src/game/game_1999b0.c
View File

@ -2125,7 +2125,7 @@ glabel func0f19b540
// identical.
//void func0f19b540(void)
//{
// if (var800acc10 == 5) {
// if (g_MpLock == MPLOCK_CHALLENGE) {
// s32 slot = 0;
// s32 i;
// u32 *ptr;

2
src/gvars/gvars.c
View File

@ -30647,7 +30647,7 @@ u32 var800acc00 = 0;
u32 var800acc04 = 0;
u32 var800acc08 = 0;
u32 var800acc0c = 0;
u8 var800acc10 = 0;
u8 g_MpLock = MPLOCK_NONE;
u32 var800acc14 = 0;
u32 var800acc18 = 0;
u32 var800acc1c = 0;

2
src/include/gvars/gvars.h
View File

@ -843,7 +843,7 @@ extern u32 var800acad8;
extern u32 var800acb78;
extern struct mpsetup g_MpSetup;
extern u32 var800acbb0;
extern u8 var800acc10;
extern u8 g_MpLock;
extern u32 var800acc20;
extern u32 var800acc28;
extern u32 var800acc70;