Decompile frMenuTextTargetsDestroyedValue

This commit is contained in:
Ryan Dwyer
2020-03-19 21:06:38 +10:00
parent 65b78ad39d
commit 0b03fabae7
4 changed files with 14 additions and 24 deletions
+2 -2
View File
@@ -12926,7 +12926,7 @@ struct menu_dialog menudialog_frtraininginfo2 = {
struct menu_item menuitems_frtrainingstats[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU(449), 0x00000000, NULL }, // "Completed!"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&func0f1a3ff0, NULL }, // "Targets Destroyed:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:"
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(452), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(453), (u32)&func0f1a3e40, NULL }, // "Time Taken:"
@@ -12953,7 +12953,7 @@ struct menu_dialog menudialog_frtrainingstats = {
struct menu_item menuitems_frtrainingstats2[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&func0f1a3d98, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&func0f1a3ff0, NULL }, // "Targets Destroyed:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:"
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(452), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:"
{ MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(453), (u32)&func0f1a3e40, NULL }, // "Time Taken:"
+9 -20
View File
@@ -954,27 +954,16 @@ glabel func0f1a3fc0
/* f1a3fec: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f1a3ff0
/* f1a3ff0: 27bdffe8 */ addiu $sp,$sp,-24
/* f1a3ff4: afbf0014 */ sw $ra,0x14($sp)
/* f1a3ff8: 0fc675f3 */ jal getFiringRangeData
/* f1a3ffc: afa40018 */ sw $a0,0x18($sp)
/* f1a4000: 3c048007 */ lui $a0,%hi(g_StringPointer)
/* f1a4004: 3c057f1c */ lui $a1,%hi(var7f1b9800)
/* f1a4008: 24a59800 */ addiu $a1,$a1,%lo(var7f1b9800)
/* f1a400c: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0)
/* f1a4010: 0c004dad */ jal sprintf
/* f1a4014: 90460455 */ lbu $a2,0x455($v0)
/* f1a4018: 8fbf0014 */ lw $ra,0x14($sp)
/* f1a401c: 3c028007 */ lui $v0,%hi(g_StringPointer)
/* f1a4020: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0)
/* f1a4024: 03e00008 */ jr $ra
/* f1a4028: 27bd0018 */ addiu $sp,$sp,0x18
);
const char var7f1b97fc[] = "%d\n";
const char var7f1b9800[] = "%d\n";
char *frMenuTextTargetsDestroyedValue(struct menu_item *item)
{
struct frdata *frdata = getFiringRangeData();
sprintf(g_StringPointer, "%d\n", frdata->targetsdestroyed);
return g_StringPointer;
}
const char var7f1b9804[] = "%s%s%.1f%%\n";
const char var7f1b9810[] = "";
const char var7f1b9814[] = "";
+1 -1
View File
@@ -8,7 +8,7 @@ char *frMenuTextDifficultyName(struct menu_item *item);
u32 func0f1a3e40(void);
char *frMenuTextScoreValue(struct menu_item *item);
u32 func0f1a3fc0(void);
u32 func0f1a3ff0(void);
char *frMenuTextTargetsDestroyedValue(struct menu_item *item);
u32 func0f1a402c(void);
char *frMenuTextGoalScoreLabel(struct menu_item *item);
char *frMenuTextGoalScoreValue(struct menu_item *item);
+2 -1
View File
@@ -5609,7 +5609,8 @@ struct frdata {
/*0x448*/ u8 difficulty;
/*0x44c*/ u32 unk44c;
/*0x450*/ u32 score;
/*0x454*/ u16 unk454;
/*0x454*/ u8 unk454;
/*0x455*/ u8 targetsdestroyed;
/*0x456*/ u16 unk456;
/*0x458*/ u32 unk458;
/*0x45c*/ u32 unk45c;