mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-10 18:56:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile menuRenderItemPlayerStats

Browse Source
This commit is contained in:
Ryan Dwyer
2020-10-07 08:24:44 +10:00
parent 33917dffaa
commit 93f24f3165
7 changed files with 418 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_0e5ce0.c
+343 -917
View File
File diff suppressed because it is too large Load Diff
src/game/game_0f09f0.c
+34 -34
View File
@@ -4787,18 +4787,18 @@ glabel func0f0f50fc
/* f0f5118: 3c0f800a */ lui $t7,%hi(var800a2038)
/* f0f511c: 8def2038 */ lw $t7,%lo(var800a2038)($t7)
/* f0f5120: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1)
/* f0f5124: 3c058007 */ lui $a1,%hi(var80071190)
/* f0f5128: 24a51190 */ addiu $a1,$a1,%lo(var80071190)
/* f0f5124: 3c058007 */ lui $a1,%hi(g_ScissorX1)
/* f0f5128: 24a51190 */ addiu $a1,$a1,%lo(g_ScissorX1)
/* f0f512c: 01e30019 */ multu $t7,$v1
/* f0f5130: 3c19800a */ lui $t9,%hi(var800a203c)
/* f0f5134: 3c068007 */ lui $a2,%hi(var80071194)
/* f0f5138: 24c61194 */ addiu $a2,$a2,%lo(var80071194)
/* f0f5134: 3c068007 */ lui $a2,%hi(g_ScissorX2)
/* f0f5138: 24c61194 */ addiu $a2,$a2,%lo(g_ScissorX2)
/* f0f513c: 3c0a800a */ lui $t2,%hi(var800a2040)
/* f0f5140: 3c088007 */ lui $t0,%hi(var80071198)
/* f0f5144: 25081198 */ addiu $t0,$t0,%lo(var80071198)
/* f0f5140: 3c088007 */ lui $t0,%hi(g_ScissorY1)
/* f0f5144: 25081198 */ addiu $t0,$t0,%lo(g_ScissorY1)
/* f0f5148: 3c0b800a */ lui $t3,%hi(var800a2044)
/* f0f514c: 3c078007 */ lui $a3,%hi(var8007119c)
/* f0f5150: 24e7119c */ addiu $a3,$a3,%lo(var8007119c)
/* f0f514c: 3c078007 */ lui $a3,%hi(g_ScissorY2)
/* f0f5150: 24e7119c */ addiu $a3,$a3,%lo(g_ScissorY2)
/* f0f5154: 0000c012 */ mflo $t8
/* f0f5158: acb80000 */ sw $t8,0x0($a1)
/* f0f515c: 8f39203c */ lw $t9,%lo(var800a203c)($t9)
@@ -4830,70 +4830,70 @@ glabel func0f0f50fc
.L0f0f51b8:
/* f0f51b8: 0c002ef1 */ jal viGetBufX
/* f0f51bc: afa40018 */ sw $a0,0x18($sp)
/* f0f51c0: 3c188007 */ lui $t8,%hi(var80071190)
/* f0f51c4: 8f181190 */ lw $t8,%lo(var80071190)($t8)
/* f0f51c0: 3c188007 */ lui $t8,%hi(g_ScissorX1)
/* f0f51c4: 8f181190 */ lw $t8,%lo(g_ScissorX1)($t8)
/* f0f51c8: 0058082a */ slt $at,$v0,$t8
/* f0f51cc: 10200005 */ beqz $at,.L0f0f51e4
/* f0f51d0: 00000000 */ nop
/* f0f51d4: 0c002ef1 */ jal viGetBufX
/* f0f51d8: 00000000 */ nop
/* f0f51dc: 3c018007 */ lui $at,%hi(var80071190)
/* f0f51e0: ac221190 */ sw $v0,%lo(var80071190)($at)
/* f0f51dc: 3c018007 */ lui $at,%hi(g_ScissorX1)
/* f0f51e0: ac221190 */ sw $v0,%lo(g_ScissorX1)($at)
.L0f0f51e4:
/* f0f51e4: 0c002ef1 */ jal viGetBufX
/* f0f51e8: 00000000 */ nop
/* f0f51ec: 3c198007 */ lui $t9,%hi(var80071194)
/* f0f51f0: 8f391194 */ lw $t9,%lo(var80071194)($t9)
/* f0f51ec: 3c198007 */ lui $t9,%hi(g_ScissorX2)
/* f0f51f0: 8f391194 */ lw $t9,%lo(g_ScissorX2)($t9)
/* f0f51f4: 0059082a */ slt $at,$v0,$t9
/* f0f51f8: 10200005 */ beqz $at,.L0f0f5210
/* f0f51fc: 00000000 */ nop
/* f0f5200: 0c002ef1 */ jal viGetBufX
/* f0f5204: 00000000 */ nop
/* f0f5208: 3c018007 */ lui $at,%hi(var80071194)
/* f0f520c: ac221194 */ sw $v0,%lo(var80071194)($at)
/* f0f5208: 3c018007 */ lui $at,%hi(g_ScissorX2)
/* f0f520c: ac221194 */ sw $v0,%lo(g_ScissorX2)($at)
.L0f0f5210:
/* f0f5210: 0c002ef5 */ jal viGetBufY
/* f0f5214: 00000000 */ nop
/* f0f5218: 3c098007 */ lui $t1,%hi(var80071198)
/* f0f521c: 8d291198 */ lw $t1,%lo(var80071198)($t1)
/* f0f5218: 3c098007 */ lui $t1,%hi(g_ScissorY1)
/* f0f521c: 8d291198 */ lw $t1,%lo(g_ScissorY1)($t1)
/* f0f5220: 0049082a */ slt $at,$v0,$t1
/* f0f5224: 10200005 */ beqz $at,.L0f0f523c
/* f0f5228: 00000000 */ nop
/* f0f522c: 0c002ef5 */ jal viGetBufY
/* f0f5230: 00000000 */ nop
/* f0f5234: 3c018007 */ lui $at,%hi(var80071198)
/* f0f5238: ac221198 */ sw $v0,%lo(var80071198)($at)
/* f0f5234: 3c018007 */ lui $at,%hi(g_ScissorY1)
/* f0f5238: ac221198 */ sw $v0,%lo(g_ScissorY1)($at)
.L0f0f523c:
/* f0f523c: 0c002ef5 */ jal viGetBufY
/* f0f5240: 00000000 */ nop
/* f0f5244: 3c078007 */ lui $a3,%hi(var8007119c)
/* f0f5248: 24e7119c */ addiu $a3,$a3,%lo(var8007119c)
/* f0f5244: 3c078007 */ lui $a3,%hi(g_ScissorY2)
/* f0f5248: 24e7119c */ addiu $a3,$a3,%lo(g_ScissorY2)
/* f0f524c: 8ce30000 */ lw $v1,0x0($a3)
/* f0f5250: 0043082a */ slt $at,$v0,$v1
/* f0f5254: 10200009 */ beqz $at,.L0f0f527c
/* f0f5258: 00000000 */ nop
/* f0f525c: 0c002ef5 */ jal viGetBufY
/* f0f5260: 00000000 */ nop
/* f0f5264: 3c018007 */ lui $at,%hi(var8007119c)
/* f0f5268: ac22119c */ sw $v0,%lo(var8007119c)($at)
/* f0f526c: 3c038007 */ lui $v1,%hi(var8007119c)
/* f0f5270: 3c078007 */ lui $a3,%hi(var8007119c)
/* f0f5274: 24e7119c */ addiu $a3,$a3,%lo(var8007119c)
/* f0f5278: 8c63119c */ lw $v1,%lo(var8007119c)($v1)
/* f0f5264: 3c018007 */ lui $at,%hi(g_ScissorY2)
/* f0f5268: ac22119c */ sw $v0,%lo(g_ScissorY2)($at)
/* f0f526c: 3c038007 */ lui $v1,%hi(g_ScissorY2)
/* f0f5270: 3c078007 */ lui $a3,%hi(g_ScissorY2)
/* f0f5274: 24e7119c */ addiu $a3,$a3,%lo(g_ScissorY2)
/* f0f5278: 8c63119c */ lw $v1,%lo(g_ScissorY2)($v1)
.L0f0f527c:
/* f0f527c: 3c088007 */ lui $t0,%hi(var80071194)
/* f0f5280: 3c048007 */ lui $a0,%hi(var80071190)
/* f0f5284: 8c841190 */ lw $a0,%lo(var80071190)($a0)
/* f0f5288: 25081194 */ addiu $t0,$t0,%lo(var80071194)
/* f0f527c: 3c088007 */ lui $t0,%hi(g_ScissorX2)
/* f0f5280: 3c048007 */ lui $a0,%hi(g_ScissorX1)
/* f0f5284: 8c841190 */ lw $a0,%lo(g_ScissorX1)($a0)
/* f0f5288: 25081194 */ addiu $t0,$t0,%lo(g_ScissorX2)
/* f0f528c: 8d0a0000 */ lw $t2,0x0($t0)
/* f0f5290: 44842000 */ mtc1 $a0,$f4
/* f0f5294: 3c058007 */ lui $a1,%hi(var80071198)
/* f0f5294: 3c058007 */ lui $a1,%hi(g_ScissorY1)
/* f0f5298: 0144082a */ slt $at,$t2,$a0
/* f0f529c: 10200002 */ beqz $at,.L0f0f52a8
/* f0f52a0: 468021a0 */ cvt.s.w $f6,$f4
/* f0f52a4: ad040000 */ sw $a0,0x0($t0)
.L0f0f52a8:
/* f0f52a8: 8ca51198 */ lw $a1,%lo(var80071198)($a1)
/* f0f52a8: 8ca51198 */ lw $a1,%lo(g_ScissorY1)($a1)
/* f0f52ac: 0065082a */ slt $at,$v1,$a1
/* f0f52b0: 50200003 */ beqzl $at,.L0f0f52c0
/* f0f52b4: 44858000 */ mtc1 $a1,$f16
src/game/game_17f930.c
+30 -30
View File
@@ -950,7 +950,7 @@ glabel scenarioHtbCallback18
/* f18095c: 27bd00a8 */ addiu $sp,$sp,0xa8
);
void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
void scenarioHtbKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3)
{
struct mpchr *loopmpchr;
s32 i;
@@ -960,8 +960,8 @@ void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
if (g_MpSetup.options & MPOPTION_KILLSSCORE) {
for (i = 0; i != MAX_MPCHRS; i++) {
if (i == arg1) {
*score -= mpchr->unk24[i];
if (i == mpchrnum) {
*score -= mpchr->killcounts[i];
} else if (g_MpSetup.options & MPOPTION_TEAMSENABLED) {
if (i < 4) {
loopmpchr = &g_MpPlayers[i].base;
@@ -970,12 +970,12 @@ void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
}
if (loopmpchr->team == mpchr->team) {
*score -= mpchr->unk24[i];
*score -= mpchr->killcounts[i];
} else {
*score += mpchr->unk24[i];
*score += mpchr->killcounts[i];
}
} else {
*score += mpchr->unk24[i];
*score += mpchr->killcounts[i];
}
}
}
@@ -1484,7 +1484,7 @@ glabel scenarioCtcReset
/* f1813d4: 27bd00d8 */ addiu $sp,$sp,0xd8
);
void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
void scenarioCtcKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3)
{
struct mpchr *loopmpchr;
s32 i;
@@ -1494,8 +1494,8 @@ void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
if (g_MpSetup.options & MPOPTION_KILLSSCORE) {
for (i = 0; i != MAX_MPCHRS; i++) {
if (i == arg1) {
*score -= mpchr->unk24[i];
if (i == mpchrnum) {
*score -= mpchr->killcounts[i];
} else {
if (i < 4) {
loopmpchr = &g_MpPlayers[i].base;
@@ -1504,9 +1504,9 @@ void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
}
if (loopmpchr->team == mpchr->team) {
*score -= mpchr->unk24[i];
*score -= mpchr->killcounts[i];
} else {
*score += mpchr->unk24[i];
*score += mpchr->killcounts[i];
}
}
}
@@ -2716,7 +2716,7 @@ glabel scenarioKohCallback18
/* f182904: 27bd00b0 */ addiu $sp,$sp,0xb0
);
void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
void scenarioKohKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3)
{
struct mpchr *loopmpchr;
s32 i;
@@ -2726,8 +2726,8 @@ void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
if (g_MpSetup.options & MPOPTION_KILLSSCORE) {
for (i = 0; i != MAX_MPCHRS; i++) {
if (i == arg1) {
*score -= mpchr->unk24[i];
if (i == mpchrnum) {
*score -= mpchr->killcounts[i];
} else {
if (i < 4) {
loopmpchr = &g_MpPlayers[i].base;
@@ -2736,9 +2736,9 @@ void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
}
if (loopmpchr->team == mpchr->team) {
*score -= mpchr->unk24[i];
*score -= mpchr->killcounts[i];
} else {
*score += mpchr->unk24[i];
*score += mpchr->killcounts[i];
}
}
}
@@ -3839,14 +3839,14 @@ glabel scenarioHtmCallback18
/* f183bb0: 27bd0068 */ addiu $sp,$sp,0x68
);
void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
void scenarioHtmKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3)
{
struct mpchr *loopmpchr;
s32 i;
s32 index;
*score = 0;
index = func0f18d0e8(arg1);
index = func0f18d0e8(mpchrnum);
if (index >= 0) {
*score += g_ScenarioData.htm.unk0d8[index] * 2;
@@ -3854,8 +3854,8 @@ void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
if (g_MpSetup.options & MPOPTION_KILLSSCORE) {
for (i = 0; i != MAX_MPCHRS; i++) {
if (i == arg1) {
*score -= mpchr->unk24[i];
if (i == mpchrnum) {
*score -= mpchr->killcounts[i];
} else if (g_MpSetup.options & MPOPTION_TEAMSENABLED) {
if (i < 4) {
loopmpchr = &g_MpPlayers[i].base;
@@ -3864,12 +3864,12 @@ void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
}
if (loopmpchr->team == mpchr->team) {
*score -= mpchr->unk24[i];
*score -= mpchr->killcounts[i];
} else {
*score += mpchr->unk24[i];
*score += mpchr->killcounts[i];
}
} else {
*score += mpchr->unk24[i];
*score += mpchr->killcounts[i];
}
}
}
@@ -4955,14 +4955,14 @@ glabel scenarioPacCallback18
/* f184c14: 27bd00a8 */ addiu $sp,$sp,0xa8
);
void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
void scenarioPacKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3)
{
struct mpchr *loopmpchr;
s32 i;
s32 index;
*score = 0;
index = func0f18d0e8(arg1);
index = func0f18d0e8(mpchrnum);
if (index >= 0) {
*score += g_ScenarioData.pac.unk20[index] * 2;
@@ -4971,8 +4971,8 @@ void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
if (g_MpSetup.options & MPOPTION_KILLSSCORE) {
for (i = 0; i != MAX_MPCHRS; i++) {
if (i == arg1) {
*score -= mpchr->unk24[i];
if (i == mpchrnum) {
*score -= mpchr->killcounts[i];
} else if (g_MpSetup.options & MPOPTION_TEAMSENABLED) {
if (i < 4) {
loopmpchr = &g_MpPlayers[i].base;
@@ -4981,12 +4981,12 @@ void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3)
}
if (loopmpchr->team == mpchr->team) {
*score -= mpchr->unk24[i];
*score -= mpchr->killcounts[i];
} else {
*score += mpchr->unk24[i];
*score += mpchr->killcounts[i];
}
} else {
*score += mpchr->unk24[i];
*score += mpchr->killcounts[i];
}
}
}
src/include/game/data/data_0160b0.h
+4 -4
View File
@@ -139,10 +139,10 @@ extern struct hudmessageconfig g_HudMessageConfigs[];
extern u32 var80071170;
extern u32 var80071180;
extern u32 var80071184;
extern s32 var80071190;
extern s32 var80071194;
extern s32 var80071198;
extern s32 var8007119c;
extern s32 g_ScissorX1;
extern s32 g_ScissorX2;
extern s32 g_ScissorY1;
extern s32 g_ScissorY2;
extern s32 var800711a0;
extern s32 var800711a4;
extern u8 g_KeyboardKeys[5][10];
src/include/game/game_0e5ce0.h
+1 -1
View File
@@ -59,7 +59,7 @@ Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemRanking(struct menuinputs *inputs, u32 arg1, union menuitemdata *data);
void menuInitItemRanking(union menuitemdata *data);
Gfx *menuRenderItemPlayerStats(Gfx *gdl);
Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemPlayerStats(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
Gfx *func0f0ef2fc(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, u32 arg6, u32 arg7);
void menuInitItemPlayerStats(struct menuitem *item, union menuitemdata *data);
src/include/game/game_17f930.h
+5 -5
View File
@@ -12,7 +12,7 @@ s32 scenarioHtbCallback08(void);
void scenarioHtbReset(void);
void scenarioHtbCallback10(void);
void scenarioHtbCallback14(struct chrdata *chr);
void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
void scenarioHtbKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3);
Gfx *scenarioHtbRadar(Gfx *gdl);
bool scenarioHtbRadar2(Gfx **gdl, struct prop *prop);
bool scenarioHtbHighlight(struct prop *prop, u32 *colour);
@@ -20,7 +20,7 @@ void scenarioCtcInit(void);
s32 scenarioCtcCallback08(void);
void scenarioCtcCallback10(void);
void scenarioCtcCallback14();
void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
void scenarioCtcKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3);
Gfx *scenarioCtcRadar(Gfx *gdl);
bool scenarioCtcRadar2(Gfx **gdl, struct prop *prop);
bool scenarioCtcCallback2c(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4);
@@ -31,18 +31,18 @@ void scenarioKohCallback40(s32 *arg0);
void scenarioKohCallback44(s32 *arg0);
void scenarioKohInit(void);
void scenarioKohReset(void);
void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
void scenarioKohKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3);
Gfx *scenarioKohRadar(Gfx *gdl);
bool scenarioKohIsRoomHighlighted(s16 arg0);
void scenarioHtmInit(void);
s32 scenarioHtmCallback08(void);
void scenarioHtmCallback10(void);
void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
void scenarioHtmKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3);
bool scenarioHtmRadar2(Gfx **gdl, struct prop *prop);
bool scenarioHtmHighlight(struct prop *prop, u32 *colour);
void scenarioPacInit(void);
void scenarioPacReset(void);
void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
void scenarioPacKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3);
Gfx *scenarioPacRadar(Gfx *gdl);
s32 menuhandlerMpOpenOptions(u32 operation, struct menuitem *item, union handlerdata *data);
void scenarioCallback40(s32 *arg0);
src/include/types.h
+1 -1
View File
@@ -4391,7 +4391,7 @@ struct mpchr {
/*0x1c*/ u16 unk1c;
/*0x1e*/ s8 placement;
/*0x20*/ u32 unk20;
/*0x24*/ s16 unk24[12];
/*0x24*/ s16 killcounts[12]; // per player - each index is a chrslot
/*0x3c*/ s16 numdeaths;
/*0x3e*/ s16 unk3e;
/*0x40*/ u32 unk40;