mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-09-12 20:16:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile mpGetChrFromPlayerIndex

Browse Source
This commit is contained in:
Ryan Dwyer
2020-01-19 22:05:32 +10:00
parent ed9249ae8b
commit e632162f38
5 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_066310.c
+5 -5
View File
@@ -12029,7 +12029,7 @@ glabel func0f06f54c
/* f06f91c: 0081c024 */ and $t8,$a0,$at
/* f06f920: 11c00006 */ beqz $t6,.L0f06f93c
/* f06f924: 00182702 */ srl $a0,$t8,0x1c
/* f06f928: 0fc63410 */ jal func0f18d040
/* f06f928: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f06f92c: afa0018c */ sw $zero,0x18c($sp)
/* f06f930: 10400002 */ beqz $v0,.L0f06f93c
/* f06f934: 8fa5018c */ lw $a1,0x18c($sp)
@@ -12502,7 +12502,7 @@ glabel func0f06f54c
/* f06ffbc: 00002825 */ or $a1,$zero,$zero
/* f06ffc0: 11e00006 */ beqz $t7,.L0f06ffdc
/* f06ffc4: 000e2702 */ srl $a0,$t6,0x1c
/* f06ffc8: 0fc63410 */ jal func0f18d040
/* f06ffc8: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f06ffcc: afa00154 */ sw $zero,0x154($sp)
/* f06ffd0: 10400002 */ beqz $v0,.L0f06ffdc
/* f06ffd4: 8fa50154 */ lw $a1,0x154($sp)
@@ -16506,7 +16506,7 @@ glabel func0f073478
/* f0738cc: 1b20005d */ blez $t9,.L0f073a44
/* f0738d0: 00000000 */ sll $zero,$zero,0x0
.L0f0738d4:
/* f0738d4: 0fc63410 */ jal func0f18d040
/* f0738d4: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f0738d8: 02202025 */ or $a0,$s1,$zero
/* f0738dc: 10540053 */ beq $v0,$s4,.L0f073a2c
/* f0738e0: 00408025 */ or $s0,$v0,$zero
@@ -18799,7 +18799,7 @@ glabel func0f073c6c
/* f075a70: 11600008 */ beqz $t3,.L0f075a94
/* f075a74: 8fa4017c */ lw $a0,0x17c($sp)
/* f075a78: afa00178 */ sw $zero,0x178($sp)
/* f075a7c: 0fc63410 */ jal func0f18d040
/* f075a7c: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f075a80: afa70070 */ sw $a3,0x70($sp)
/* f075a84: 8fa30178 */ lw $v1,0x178($sp)
/* f075a88: 10400002 */ beqz $v0,.L0f075a94
@@ -23643,7 +23643,7 @@ glabel func0f079f1c
/* f07a028: 0081c824 */ and $t9,$a0,$at
/* f07a02c: 11200007 */ beqz $t1,.L0f07a04c
/* f07a030: 00192702 */ srl $a0,$t9,0x1c
/* f07a034: 0fc63410 */ jal func0f18d040
/* f07a034: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f07a038: 00000000 */ sll $zero,$zero,0x0
/* f07a03c: 10400003 */ beqz $v0,.L0f07a04c
/* f07a040: afa20110 */ sw $v0,0x110($sp)
src/game/game_129900.c
+2 -2
View File
@@ -3161,7 +3161,7 @@ glabel func0f12b0e0
/* f12bacc: 8faf03a0 */ lw $t7,0x3a0($sp)
/* f12bad0: 51000008 */ beqzl $t0,.L0f12baf4
/* f12bad4: 81e203ce */ lb $v0,0x3ce($t7)
/* f12bad8: 0fc63410 */ jal func0f18d040
/* f12bad8: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f12badc: 812403ce */ lb $a0,0x3ce($t1)
/* f12bae0: 5040001a */ beqzl $v0,.L0f12bb4c
/* f12bae4: 4405a000 */ mfc1 $a1,$f20
@@ -3788,7 +3788,7 @@ glabel func0f12bbdc
/* f12c3b4: 4604a502 */ mul.s $f20,$f20,$f4
/* f12c3b8: 53200006 */ beqzl $t9,.L0f12c3d4
/* f12c3bc: 8ea2029c */ lw $v0,0x29c($s5)
/* f12c3c0: 0fc63410 */ jal func0f18d040
/* f12c3c0: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f12c3c4: 822403ce */ lb $a0,0x3ce($s1)
/* f12c3c8: 10000018 */ beqz $zero,.L0f12c42c
/* f12c3cc: 00401825 */ or $v1,$v0,$zero
src/game/game_176d70.c
+1 -1
View File
@@ -10306,7 +10306,7 @@ glabel scenarioCtcReset
/* f180fe8: 02202025 */ or $a0,$s1,$zero
/* f180fec: 04400009 */ bltz $v0,.L0f181014
/* f180ff0: 00402025 */ or $a0,$v0,$zero
/* f180ff4: 0fc63410 */ jal func0f18d040
/* f180ff4: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f180ff8: 00000000 */ sll $zero,$zero,0x0
/* f180ffc: 50400006 */ beqzl $v0,.L0f181018
/* f181000: 920d0011 */ lbu $t5,0x11($s0)
src/game/game_187770.c
+14 -23
View File
@@ -6639,23 +6639,14 @@ s32 mpPlayerGetIndex(struct chrdata *chr)
return -1;
}
GLOBAL_ASM(
glabel func0f18d040
/* f18d040: 04800009 */ bltz $a0,.L0f18d068
/* f18d044: 3c0e800b */ lui $t6,0x800b
/* f18d048: 8dcec530 */ lw $t6,-0x3ad0($t6)
/* f18d04c: 00047880 */ sll $t7,$a0,0x2
/* f18d050: 3c02800b */ lui $v0,0x800b
/* f18d054: 008e082a */ slt $at,$a0,$t6
/* f18d058: 10200003 */ beqz $at,.L0f18d068
/* f18d05c: 004f1021 */ addu $v0,$v0,$t7
/* f18d060: 03e00008 */ jr $ra
/* f18d064: 8c42c4d0 */ lw $v0,-0x3b30($v0)
.L0f18d068:
/* f18d068: 00001025 */ or $v0,$zero,$zero
/* f18d06c: 03e00008 */ jr $ra
/* f18d070: 00000000 */ sll $zero,$zero,0x0
);
struct chrdata *mpGetChrFromPlayerIndex(s32 index)
{
if (index >= 0 && index < g_MpNumPlayers) {
return g_MpPlayerChrs[index];
}
return NULL;
}
GLOBAL_ASM(
glabel func0f18d074
@@ -13299,7 +13290,7 @@ glabel func0f192e90
/* f192ef8: 00000000 */ sll $zero,$zero,0x0
/* f192efc: 0006000d */ break 0x6
.L0f192f00:
/* f192f00: 0fc63410 */ jal func0f18d040
/* f192f00: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f192f04: 00000000 */ sll $zero,$zero,0x0
/* f192f08: 1055002b */ beq $v0,$s5,.L0f192fb8
/* f192f0c: 00408825 */ or $s1,$v0,$zero
@@ -13534,7 +13525,7 @@ glabel func0f192e90
/* f193248: 0260a025 */ or $s4,$s3,$zero
/* f19324c: 82900130 */ lb $s0,0x130($s4)
.L0f193250:
/* f193250: 0fc63410 */ jal func0f18d040
/* f193250: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f193254: 02002025 */ or $a0,$s0,$zero
/* f193258: 1055003a */ beq $v0,$s5,.L0f193344
/* f19325c: 00408825 */ or $s1,$v0,$zero
@@ -13611,7 +13602,7 @@ glabel func0f192e90
/* f193364: 02a02025 */ or $a0,$s5,$zero
/* f193368: 0580000f */ bltz $t4,.L0f1933a8
/* f19336c: 00000000 */ sll $zero,$zero,0x0
/* f193370: 0fc63410 */ jal func0f18d040
/* f193370: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f193374: 01802025 */ or $a0,$t4,$zero
/* f193378: 3c0f800a */ lui $t7,0x800a
/* f19337c: 8defa2f8 */ lw $t7,-0x5d08($t7)
@@ -13659,7 +13650,7 @@ glabel func0f192e90
/* f193414: 930d016c */ lbu $t5,0x16c($t8)
/* f193418: 11a0001d */ beqz $t5,.L0f193490
/* f19341c: 00000000 */ sll $zero,$zero,0x0
/* f193420: 0fc63410 */ jal func0f18d040
/* f193420: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f193424: 00000000 */ sll $zero,$zero,0x0
/* f193428: 10550019 */ beq $v0,$s5,.L0f193490
/* f19342c: 00408825 */ or $s1,$v0,$zero
@@ -16663,7 +16654,7 @@ glabel func0f194b40
/* f1961c4: 0fc6343a */ jal func0f18d0e8
/* f1961c8: 8e040004 */ lw $a0,0x4($s0)
/* f1961cc: afa200d8 */ sw $v0,0xd8($sp)
/* f1961d0: 0fc63410 */ jal func0f18d040
/* f1961d0: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f1961d4: 00402025 */ or $a0,$v0,$zero
/* f1961d8: 10540011 */ beq $v0,$s4,.L0f196220
/* f1961dc: 00402025 */ or $a0,$v0,$zero
@@ -16702,7 +16693,7 @@ glabel func0f194b40
/* f196258: 19200032 */ blez $t1,.L0f196324
/* f19625c: e7aa00d0 */ swc1 $f10,0xd0($sp)
.L0f196260:
/* f196260: 0fc63410 */ jal func0f18d040
/* f196260: 0fc63410 */ jal mpGetChrFromPlayerIndex
/* f196264: 02002025 */ or $a0,$s0,$zero
/* f196268: 10540029 */ beq $v0,$s4,.L0f196310
/* f19626c: 00402025 */ or $a0,$v0,$zero
src/include/game/game_187770.h
+1 -1
View File
@@ -93,7 +93,7 @@ bool mpIsSimSlotEnabled(s32 slotindex);
s32 func0f18cd68(s32 arg0, s32 arg1);
u32 func0f18cddc(void);
s32 mpPlayerGetIndex(struct chrdata *chr);
u32 func0f18d040(void);
struct chrdata *mpGetChrFromPlayerIndex(s32 index);
u32 func0f18d074(void);
s32 func0f18d0e8(s32 arg0);
u32 func0f18d1b8(void);