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

Decompile mpPerformSanityChecks

This commit is contained in:
Ryan Dwyer 2020-08-30 20:22:22 +10:00
parent af61bae15f
commit d05a05831a
8 changed files with 62 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/game_01bea0.c
View File

@ -563,7 +563,7 @@ glabel var7f1a863c
/* f01c58c: 24630e70 */ addiu $v1,$v1,0x0e70
/* f01c590: 0fc63005 */ jal mpCalculateLockIfLastWinnerOrLoser
/* f01c594: 00000000 */ nop
/* f01c598: 0fc66d50 */ jal func0f19b540
/* f01c598: 0fc66d50 */ jal mpPerformSanityChecks
/* f01c59c: 00000000 */ nop
.L0f01c5a0:
/* f01c5a0: 3c068007 */ lui $a2,%hi(g_MpPlayerNum)
@ -2115,7 +2115,7 @@ glabel var7f1a863c
// }
//
// mpCalculateLockIfLastWinnerOrLoser();
// func0f19b540();
// mpPerformSanityChecks();
// }
//
// // c5a0

4
src/game/game_179060.c
View File

@ -6117,8 +6117,8 @@ glabel var7f1b82dc
/* f17f340: 0fc63377 */ jal func0f18cddc
/* f17f344: 00000000 */ nop
/* f17f348: 3c02800b */ lui $v0,%hi(g_MpSimulants)
/* f17f34c: 3c04800b */ lui $a0,%hi(var800ac798)
/* f17f350: 2484c798 */ addiu $a0,$a0,%lo(var800ac798)
/* f17f34c: 3c04800b */ lui $a0,%hi(g_MpSimulantSkillsPerNumPlayers)
/* f17f350: 2484c798 */ addiu $a0,$a0,%lo(g_MpSimulantSkillsPerNumPlayers)
/* f17f354: 2442c538 */ addiu $v0,$v0,%lo(g_MpSimulants)
/* f17f358: 24030001 */ addiu $v1,$zero,0x1
.L0f17f35c:

154
src/game/game_19aa80.c
View File

@ -780,128 +780,40 @@ glabel func0f19afdc
/* f19b53c: 27bd0038 */ addiu $sp,$sp,0x38
);
GLOBAL_ASM(
glabel func0f19b540
/* f19b540: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x88)
/* f19b544: 91cecc10 */ lbu $t6,%lo(g_MpSetup+0x88)($t6)
/* f19b548: 27bdffe8 */ addiu $sp,$sp,-24
/* f19b54c: 24010005 */ addiu $at,$zero,0x5
/* f19b550: 15c10038 */ bne $t6,$at,.L0f19b634
/* f19b554: afbf0014 */ sw $ra,0x14($sp)
/* f19b558: 3c07800b */ lui $a3,%hi(g_MpSetup+0x16)
/* f19b55c: 3c03800b */ lui $v1,%hi(g_MpPlayers)
/* f19b560: 00002825 */ or $a1,$zero,$zero
/* f19b564: 2463c7b8 */ addiu $v1,$v1,%lo(g_MpPlayers)
/* f19b568: 94e7cb9e */ lhu $a3,%lo(g_MpSetup+0x16)($a3)
/* f19b56c: 00001025 */ or $v0,$zero,$zero
/* f19b570: 24060080 */ addiu $a2,$zero,0x80
/* f19b574: 240400a0 */ addiu $a0,$zero,0xa0
/* f19b578: 240f0001 */ addiu $t7,$zero,0x1
.L0f19b57c:
/* f19b57c: 004fc004 */ sllv $t8,$t7,$v0
/* f19b580: 00f8c824 */ and $t9,$a3,$t8
/* f19b584: 53200007 */ beqzl $t9,.L0f19b5a4
/* f19b588: 24420001 */ addiu $v0,$v0,0x1
/* f19b58c: 00440019 */ multu $v0,$a0
/* f19b590: 24a50001 */ addiu $a1,$a1,0x1
/* f19b594: 00004012 */ mflo $t0
/* f19b598: 00684821 */ addu $t1,$v1,$t0
/* f19b59c: a126009d */ sb $a2,0x9d($t1)
/* f19b5a0: 24420001 */ addiu $v0,$v0,0x1
.L0f19b5a4:
/* f19b5a4: 28410004 */ slti $at,$v0,0x4
/* f19b5a8: 5420fff4 */ bnezl $at,.L0f19b57c
/* f19b5ac: 240f0001 */ addiu $t7,$zero,0x1
/* f19b5b0: 3c0b800b */ lui $t3,%hi(var800ac798)
/* f19b5b4: 3c06800b */ lui $a2,%hi(g_MpSetup)
/* f19b5b8: 30ea000f */ andi $t2,$a3,0xf
/* f19b5bc: 256bc798 */ addiu $t3,$t3,%lo(var800ac798)
/* f19b5c0: 24c6cb88 */ addiu $a2,$a2,%lo(g_MpSetup)
/* f19b5c4: 00ab2021 */ addu $a0,$a1,$t3
/* f19b5c8: 3c03800b */ lui $v1,%hi(g_MpSimulants)
/* f19b5cc: a4ca0016 */ sh $t2,0x16($a2)
/* f19b5d0: 2463c538 */ addiu $v1,$v1,%lo(g_MpSimulants)
/* f19b5d4: 24050006 */ addiu $a1,$zero,0x6
/* f19b5d8: 24070008 */ addiu $a3,$zero,0x8
/* f19b5dc: 00001025 */ or $v0,$zero,$zero
.L0f19b5e0:
/* f19b5e0: 908cffff */ lbu $t4,-0x1($a0)
/* f19b5e4: 2463004c */ addiu $v1,$v1,0x4c
/* f19b5e8: 244f0004 */ addiu $t7,$v0,0x4
/* f19b5ec: 318d00ff */ andi $t5,$t4,0xff
/* f19b5f0: 10ad0006 */ beq $a1,$t5,.L0f19b60c
/* f19b5f4: a06cfffc */ sb $t4,-0x4($v1)
/* f19b5f8: 94ce0016 */ lhu $t6,0x16($a2)
/* f19b5fc: 24180001 */ addiu $t8,$zero,0x1
/* f19b600: 01f8c804 */ sllv $t9,$t8,$t7
/* f19b604: 01d94025 */ or $t0,$t6,$t9
/* f19b608: a4c80016 */ sh $t0,0x16($a2)
.L0f19b60c:
/* f19b60c: 24420001 */ addiu $v0,$v0,0x1
/* f19b610: 1447fff3 */ bne $v0,$a3,.L0f19b5e0
/* f19b614: 24840004 */ addiu $a0,$a0,0x4
/* f19b618: 90c90010 */ lbu $t1,0x10($a2)
/* f19b61c: 24010004 */ addiu $at,$zero,0x4
/* f19b620: 240a000a */ addiu $t2,$zero,0xa
/* f19b624: 1521000b */ bne $t1,$at,.L0f19b654
/* f19b628: 3c01800a */ lui $at,%hi(g_Vars+0x484)
/* f19b62c: 10000009 */ b .L0f19b654
/* f19b630: ac2aa444 */ sw $t2,%lo(g_Vars+0x484)($at)
.L0f19b634:
/* f19b634: 0fc67244 */ jal mpIsChallengeComplete
/* f19b638: 24040040 */ addiu $a0,$zero,0x40
/* f19b63c: 14400005 */ bnez $v0,.L0f19b654
/* f19b640: 3c06800b */ lui $a2,%hi(g_MpSetup)
/* f19b644: 24c6cb88 */ addiu $a2,$a2,%lo(g_MpSetup)
/* f19b648: 94cb0016 */ lhu $t3,0x16($a2)
/* f19b64c: 316c00ff */ andi $t4,$t3,0xff
/* f19b650: a4cc0016 */ sh $t4,0x16($a2)
.L0f19b654:
/* f19b654: 8fbf0014 */ lw $ra,0x14($sp)
/* f19b658: 27bd0018 */ addiu $sp,$sp,0x18
/* f19b65c: 03e00008 */ jr $ra
/* f19b660: 00000000 */ nop
);
void mpPerformSanityChecks(void)
{
if (g_MpSetupSaveFile.locktype == MPLOCKTYPE_CHALLENGE) {
s32 numplayers = 0;
s32 i;
// Mismatch because it's doing something weird with the chrslots, and also
// writing to negative mpsim offsets. This code below might not be functionally
// identical.
//void func0f19b540(void)
//{
// if (g_MpSetup.locktype == MPLOCKTYPE_CHALLENGE) {
// s32 slot = 0;
// s32 i;
// u32 *ptr;
//
// for (i = 0; i < 4; i++) {
// if (g_MpSetup.chrslots & (1 << i)) {
// g_MpPlayers[i].unk9d = 0x80;
// slot++;
// }
// }
//
// g_MpSetup.chrslots &= 0x000f;
// ptr = &var800ac798[slot];
//
// for (i = 0; i != MAX_SIMULANTS; i++) {
// g_MpSimulants[i].unk48 = *(ptr - 1);
//
// if (*(ptr - 1) != 6) {
// g_MpSetup.chrslots |= 1 << (i + 4);
// }
//
// ptr++;
// }
//
// if (g_MpSetup.scenario == MPSCENARIO_KINGOFTHEHILL) {
// g_Vars.mphilltime = 10;
// }
// } else {
// if (!mpIsChallengeComplete(CHALLENGE_UNK64)) {
// g_MpSetup.chrslots &= 0x00ff;
// }
// }
//}
// Reset player handicaps
for (i = 0; i < 4; i++) {
if (g_MpSetup.chrslots & (1 << i)) {
g_MpPlayers[i].handicap = 0x80;
numplayers++;
}
}
// Turn off all simulants and turn them on if enabled
// for this number of players
g_MpSetup.chrslots &= 0x000f;
for (i = 0; i != MAX_SIMULANTS; i++) {
g_MpSimulants[i].skill = g_MpSimulantSkillsPerNumPlayers[i * 4 + numplayers - 1];
if (g_MpSimulants[i].skill != SIMSKILL_DISABLED) {
g_MpSetup.chrslots |= 1 << (i + 4);
}
}
if (g_MpSetup.scenario == MPSCENARIO_KINGOFTHEHILL) {
g_Vars.mphilltime = 10;
}
} else if (!mpIsChallengeComplete(CHALLENGE_UNK64)) {
// Limit to 4 players and 4 simulants
g_MpSetup.chrslots &= 0x00ff;
}
}
s32 mpGetNumAvailableChallenges(void)
{

18
src/game/mplayer.c
View File

@ -747,7 +747,7 @@ void func0f1881d4(s32 index)
g_MpSimulants[index].base.headnum = 0;
g_MpSimulants[index].base.bodynum = 0;
g_MpSimulants[index].base.simtype = SIMTYPE_GENERAL;
g_MpSimulants[index].skill = SIMSKILL_6;
g_MpSimulants[index].skill = SIMSKILL_DISABLED;
}
GLOBAL_ASM(
@ -5696,11 +5696,11 @@ glabel func0f18c984
/* f18c9e0: 3c14800b */ lui $s4,%hi(g_MpSimulants)
/* f18c9e4: 90f90000 */ lbu $t9,0x0($a3)
/* f18c9e8: 2694c538 */ addiu $s4,$s4,%lo(g_MpSimulants)
/* f18c9ec: 3c0a800b */ lui $t2,%hi(var800ac798)
/* f18c9ec: 3c0a800b */ lui $t2,%hi(g_MpSimulantSkillsPerNumPlayers)
/* f18c9f0: 00007012 */ mflo $t6
/* f18c9f4: 028ef021 */ addu $s8,$s4,$t6
/* f18c9f8: 305100ff */ andi $s1,$v0,0xff
/* f18c9fc: 254ac798 */ addiu $t2,$t2,%lo(var800ac798)
/* f18c9fc: 254ac798 */ addiu $t2,$t2,%lo(g_MpSimulantSkillsPerNumPlayers)
/* f18ca00: 00104880 */ sll $t1,$s0,0x2
/* f18ca04: 8fa6005c */ lw $a2,0x5c($sp)
/* f18ca08: 012a2021 */ addu $a0,$t1,$t2
@ -5809,9 +5809,9 @@ glabel func0f18cb60
/* f18cb74: 25efc538 */ addiu $t7,$t7,%lo(g_MpSimulants)
/* f18cb78: 000e7080 */ sll $t6,$t6,0x2
/* f18cb7c: 01cf1021 */ addu $v0,$t6,$t7
/* f18cb80: 3c19800b */ lui $t9,%hi(var800ac798)
/* f18cb80: 3c19800b */ lui $t9,%hi(g_MpSimulantSkillsPerNumPlayers)
/* f18cb84: a0450048 */ sb $a1,0x48($v0)
/* f18cb88: 2739c798 */ addiu $t9,$t9,%lo(var800ac798)
/* f18cb88: 2739c798 */ addiu $t9,$t9,%lo(g_MpSimulantSkillsPerNumPlayers)
/* f18cb8c: 0004c080 */ sll $t8,$a0,0x2
/* f18cb90: 03193021 */ addu $a2,$t8,$t9
/* f18cb94: 24020004 */ addiu $v0,$zero,0x4
@ -6975,8 +6975,8 @@ glabel func0f18dcec
/* f18dd58: 1738fff8 */ bne $t9,$t8,.L0f18dd3c
/* f18dd5c: ad01fffc */ sw $at,-0x4($t0)
/* f18dd60: 8f210000 */ lw $at,0x0($t9)
/* f18dd64: 3c09800b */ lui $t1,%hi(var800ac798)
/* f18dd68: 2537c798 */ addiu $s7,$t1,%lo(var800ac798)
/* f18dd64: 3c09800b */ lui $t1,%hi(g_MpSimulantSkillsPerNumPlayers)
/* f18dd68: 2537c798 */ addiu $s7,$t1,%lo(g_MpSimulantSkillsPerNumPlayers)
/* f18dd6c: 3c11800b */ lui $s1,%hi(g_MpSimulants)
/* f18dd70: 2631c538 */ addiu $s1,$s1,%lo(g_MpSimulants)
/* f18dd74: 02e0a825 */ or $s5,$s7,$zero
@ -7154,11 +7154,11 @@ glabel func0f18df5c
/* f18dfd8: 24050015 */ addiu $a1,$zero,0x15
/* f18dfdc: 96ae0016 */ lhu $t6,0x16($s5)
/* f18dfe0: 3c11800b */ lui $s1,%hi(g_MpSimulants)
/* f18dfe4: 3c14800b */ lui $s4,%hi(var800ac798)
/* f18dfe4: 3c14800b */ lui $s4,%hi(g_MpSimulantSkillsPerNumPlayers)
/* f18dfe8: 31cf000f */ andi $t7,$t6,0xf
/* f18dfec: aea2000c */ sw $v0,0xc($s5)
/* f18dff0: a6af0016 */ sh $t7,0x16($s5)
/* f18dff4: 2694c798 */ addiu $s4,$s4,%lo(var800ac798)
/* f18dff4: 2694c798 */ addiu $s4,$s4,%lo(g_MpSimulantSkillsPerNumPlayers)
/* f18dff8: 2631c538 */ addiu $s1,$s1,%lo(g_MpSimulants)
/* f18dffc: 00009025 */ or $s2,$zero,$zero
/* f18e000: 24160006 */ addiu $s6,$zero,0x6

2
src/gvars/gvars.c
View File

@ -19675,7 +19675,7 @@ struct mpchr *var800ac500[MAX_MPCHRS] = {NULL};
s32 g_MpNumPlayers = 0;
u32 var800ac534 = 0;
struct mpsim g_MpSimulants[MAX_SIMULANTS] = {0};
u32 var800ac798[8] = {0};
u8 g_MpSimulantSkillsPerNumPlayers[32] = {0};
struct mpplayer g_MpPlayers[6] = {0};
u8 g_ActiveMenuMpBotCommands[16] = {0};
struct mpsetup g_MpSetup = {0};

14
src/include/constants.h
View File

@ -2488,13 +2488,13 @@
#define SIGHT_MAIAN 6
#define SIGHT_NONE 7
#define SIMSKILL_MEAT 0
#define SIMSKILL_EASY 1
#define SIMSKILL_NORMAL 2
#define SIMSKILL_HARD 3
#define SIMSKILL_PERFECT 4
#define SIMSKILL_DARK 5
#define SIMSKILL_6 6
#define SIMSKILL_MEAT 0
#define SIMSKILL_EASY 1
#define SIMSKILL_NORMAL 2
#define SIMSKILL_HARD 3
#define SIMSKILL_PERFECT 4
#define SIMSKILL_DARK 5
#define SIMSKILL_DISABLED 6
#define SIMTYPE_GENERAL 0
#define SIMTYPE_PEACE 1

2
src/include/game/game_19aa80.h
View File

@ -10,7 +10,7 @@ extern struct challenge g_MpChallenges[NUM_CHALLENGES];
bool ai0176(void);
u32 func0f19ab70(void);
void func0f19afdc(void);
void func0f19b540(void);
void mpPerformSanityChecks(void);
char *mpGetChallengeNameBySlot(s32 slot);
bool mpIsChallengeCompletedByAnyChrWithNumPlayersBySlot(s32 slot, s32 numplayers);
struct mpconfigfull *mpLoadConfig(s32 confignum, u8 *buffer, s32 len);

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

@ -815,7 +815,13 @@ extern struct chrdata *g_MpPlayerChrs[MAX_MPCHRS];
extern struct mpchr *var800ac500[MAX_MPCHRS];
extern s32 g_MpNumPlayers;
extern struct mpsim g_MpSimulants[MAX_SIMULANTS];
extern u32 var800ac798[8];
// Elements 0-3 are skill levels for simulant 0 when there's 1/2/3/4 players
// Elements 4-7 are skill levels for simulant 1 when there's 1/2/3/4 players
// ...
// Elements 28-31 are skill levels for simulant 7 when there's 1/2/3/4 players
extern u8 g_MpSimulantSkillsPerNumPlayers[32];
extern struct mpplayer g_MpPlayers[6];
extern u8 g_ActiveMenuMpBotCommands[16];
extern struct mpsetup g_MpSetup;