mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-31 15:57:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile frMenuTextScoreValue

Browse Source
This commit is contained in:
Ryan Dwyer
2020-03-19 21:03:39 +10:00
parent 4574f1011d
commit 65b78ad39d
4 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/data/data_020df0.c
+2 -2
View File
@@ -12925,7 +12925,7 @@ struct menu_dialog menudialog_frtraininginfo2 = {
// 2ef98
struct menu_item menuitems_frtrainingstats[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU(449), 0x00000000, NULL }, // "Completed!"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&func0f1a3f48, NULL }, // "Score:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&func0f1a3ff0, NULL }, // "Targets Destroyed:"
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(452), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:"
@@ -12952,7 +12952,7 @@ struct menu_dialog menudialog_frtrainingstats = {
// 2f0b4
struct menu_item menuitems_frtrainingstats2[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&func0f1a3d98, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&func0f1a3f48, NULL }, // "Score:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&func0f1a3ff0, NULL }, // "Targets Destroyed:"
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(452), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:"
src/game/game_1a3340.c
+15 -22
View File
@@ -37,12 +37,6 @@ const char var7f1b97d8[] = "%dm %2ds\n";
const char var7f1b97e4[] = "%s%s%2.2fs\n";
const char var7f1b97f0[] = "";
const char var7f1b97f4[] = "";
const char var7f1b97f8[] = "%d\n";
const char var7f1b97fc[] = "%d\n";
const char var7f1b9800[] = "%d\n";
const char var7f1b9804[] = "%s%s%.1f%%\n";
const char var7f1b9810[] = "";
const char var7f1b9814[] = "";
GLOBAL_ASM(
glabel menuhandler001a3340
@@ -917,23 +911,16 @@ glabel func0f1a3e40
/* f1a3f44: 00000000 */ sll $zero,$zero,0x0
);
char *frMenuTextScoreValue(struct menu_item *item)
{
struct frdata *frdata = getFiringRangeData();
sprintf(g_StringPointer, "%d\n", frdata->score);
return g_StringPointer;
}
GLOBAL_ASM(
glabel func0f1a3f48
/* f1a3f48: 27bdffe8 */ addiu $sp,$sp,-24
/* f1a3f4c: afbf0014 */ sw $ra,0x14($sp)
/* f1a3f50: 0fc675f3 */ jal getFiringRangeData
/* f1a3f54: afa40018 */ sw $a0,0x18($sp)
/* f1a3f58: 3c048007 */ lui $a0,%hi(g_StringPointer)
/* f1a3f5c: 3c057f1c */ lui $a1,%hi(var7f1b97f8)
/* f1a3f60: 24a597f8 */ addiu $a1,$a1,%lo(var7f1b97f8)
/* f1a3f64: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0)
/* f1a3f68: 0c004dad */ jal sprintf
/* f1a3f6c: 8c460450 */ lw $a2,0x450($v0)
/* f1a3f70: 8fbf0014 */ lw $ra,0x14($sp)
/* f1a3f74: 3c028007 */ lui $v0,%hi(g_StringPointer)
/* f1a3f78: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0)
/* f1a3f7c: 03e00008 */ jr $ra
/* f1a3f80: 27bd0018 */ addiu $sp,$sp,0x18
glabel func0f1a3f84
/* f1a3f84: 27bdffe8 */ addiu $sp,$sp,-24
/* f1a3f88: afbf0014 */ sw $ra,0x14($sp)
/* f1a3f8c: 0fc675f3 */ jal getFiringRangeData
@@ -986,6 +973,12 @@ glabel func0f1a3ff0
/* f1a4028: 27bd0018 */ addiu $sp,$sp,0x18
);
const char var7f1b97fc[] = "%d\n";
const char var7f1b9800[] = "%d\n";
const char var7f1b9804[] = "%s%s%.1f%%\n";
const char var7f1b9810[] = "";
const char var7f1b9814[] = "";
GLOBAL_ASM(
glabel func0f1a402c
/* f1a402c: 27bdffe0 */ addiu $sp,$sp,-32
src/include/game/game_1a3340.h
+1 -1
View File
@@ -6,7 +6,7 @@
u32 func0f1a3d98(void);
char *frMenuTextDifficultyName(struct menu_item *item);
u32 func0f1a3e40(void);
u32 func0f1a3f48(void);
char *frMenuTextScoreValue(struct menu_item *item);
u32 func0f1a3fc0(void);
u32 func0f1a3ff0(void);
u32 func0f1a402c(void);
src/include/types.h
+1 -1
View File
@@ -5608,7 +5608,7 @@ struct frdata {
/*0x444*/ u32 unk444;
/*0x448*/ u8 difficulty;
/*0x44c*/ u32 unk44c;
/*0x450*/ u32 unk450;
/*0x450*/ u32 score;
/*0x454*/ u16 unk454;
/*0x456*/ u16 unk456;
/*0x458*/ u32 unk458;