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

Rename some lock related symbols

This commit is contained in:
Ryan Dwyer 2020-01-11 22:33:31 +10:00
parent b6d0f685d8
commit bf41ace578
8 changed files with 28 additions and 28 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(g_MpLock)
/* f1108c0: 3c11800b */ lui $s1,%hi(g_MpLockType)
/* f1108c4: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f1108c8: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f1108cc: 2631cc10 */ addiu $s1,$s1,%lo(g_MpLock)
/* f1108cc: 2631cc10 */ addiu $s1,$s1,%lo(g_MpLockType)
/* 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(g_MpLock)
/* f110a34: 2631cc10 */ addiu $s1,$s1,%lo(g_MpLock)
/* f110a30: 3c11800b */ lui $s1,%hi(g_MpLockType)
/* f110a34: 2631cc10 */ addiu $s1,$s1,%lo(g_MpLockType)
/* f110a38: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f110a3c: 02402025 */ or $a0,$s2,$zero
.L0f110a40:

20
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 (g_MpLock != MPLOCK_CHALLENGE) {
if (g_MpLockType != MPLOCKTYPE_CHALLENGE) {
return true;
}
}
@ -8335,7 +8335,7 @@ glabel menuhandler0017e4d4
s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (g_MpLock != MPLOCK_CHALLENGE) {
if (g_MpLockType != MPLOCKTYPE_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 (g_MpLock != MPLOCK_CHALLENGE) {
if (g_MpLockType != MPLOCKTYPE_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 (g_MpLock != MPLOCK_CHALLENGE) {
if (g_MpLockType != MPLOCKTYPE_CHALLENGE) {
return true;
}
}
@ -8504,34 +8504,34 @@ char *menuhandlerMpLock(u32 operation, struct menu_item *item, s32 *value)
switch (operation) {
case MENUOP_GETOPTIONCOUNT:
if (mpGetLock() == MPLOCK_CHALLENGE) {
if (mpGetLockType() == MPLOCKTYPE_CHALLENGE) {
*value = 1;
} else {
*value = 5;
}
break;
case MENUOP_GETOPTIONTEXT:
if (mpGetLock() == MPLOCK_CHALLENGE) {
if (mpGetLockType() == MPLOCKTYPE_CHALLENGE) {
return textGet(0x5031); // "Challenge"
}
if ((u32)*value <= 3) {
return textGet(labels[*value]);
}
if (mpGetLock() == MPLOCK_PLAYER) {
if (mpGetLockType() == MPLOCKTYPE_PLAYER) {
return g_MpPlayers[mpGetLockPlayerNum()].base.name;
}
return mpGetCurrentPlayerName(item);
case MENUOP_SET:
if (mpGetLock() != MPLOCK_CHALLENGE) {
if (mpGetLockType() != MPLOCKTYPE_CHALLENGE) {
mpSetLock(*value, g_MpPlayerNum);
}
g_Vars.unk000458 |= 2;
break;
case MENUOP_GETOPTIONVALUE:
if (mpGetLock() == MPLOCK_CHALLENGE) {
if (mpGetLockType() == MPLOCKTYPE_CHALLENGE) {
*value = 0;
} else {
*value = mpGetLock();
*value = mpGetLockType();
}
break;
}

6
src/game/game_187770.c
View File

@ -5463,12 +5463,12 @@ glabel mpSetLock
/* f18bfbc: 00000000 */ sll $zero,$zero,0x0
);
u8 mpGetLock(void)
u32 mpGetLockType(void)
{
return g_MpLock;
return g_MpLockType;
}
s8 mpGetLockPlayerNum(void)
u32 mpGetLockPlayerNum(void)
{
return g_MpLockPlayerNum;
}

2
src/game/game_1999b0.c
View File

@ -2125,7 +2125,7 @@ glabel func0f19b540
// identical.
//void func0f19b540(void)
//{
// if (g_MpLock == MPLOCK_CHALLENGE) {
// if (g_MpLockType == MPLOCKTYPE_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 g_MpLock = MPLOCK_NONE;
u8 g_MpLockType = MPLOCKTYPE_NONE;
u32 var800acc14 = 0;
u32 var800acc18 = 0;
u32 var800acc1c = 0;

12
src/include/constants.h
View File

@ -483,12 +483,12 @@
#define MENUOP_SETTEXT 18
#define MENUOP_CHECKHIDDEN 24
#define MPLOCK_NONE 0
#define MPLOCK_LASTWINNER 1
#define MPLOCK_LASTLOSER 2
#define MPLOCK_RANDOM 3
#define MPLOCK_PLAYER 4
#define MPLOCK_CHALLENGE 5
#define MPLOCKTYPE_NONE 0
#define MPLOCKTYPE_LASTWINNER 1
#define MPLOCKTYPE_LASTLOSER 2
#define MPLOCKTYPE_RANDOM 3
#define MPLOCKTYPE_PLAYER 4
#define MPLOCKTYPE_CHALLENGE 5
#define MPOPTION_TEAMSENABLED 0x00000002
#define MPOPTION_NORADAR 0x00000004

4
src/include/game/game_187770.h
View File

@ -58,8 +58,8 @@ u32 func0f18bc70(void);
s32 func0f18bc9c(s32 arg0);
u32 func0f18bee8(void);
s32 mpSetLock(s32 arg0, s32 arg1);
u8 mpGetLock(void);
s8 mpGetLockPlayerNum(void);
u32 mpGetLockType(void);
u32 mpGetLockPlayerNum(void);
u32 func0f18bfd8(void);
u32 func0f18c014(void);
u32 func0f18c0c0(void);

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 g_MpLock;
extern u8 g_MpLockType;
extern s8 g_MpLockPlayerNum;
extern u32 var800acc28;
extern u32 var800acc70;