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

Decompile dtMenuTextOkOrResume

Browse Source
This commit is contained in:
Ryan Dwyer
2020-03-20 18:51:33 +10:00
parent 81900cc430
commit 9c4f6cb010
4 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/data/data_020df0.c
+1 -1
View File
@@ -13094,7 +13094,7 @@ struct menu_item menuitems_2f424[] = {
{ MENUITEMTYPE_SCROLLABLE, 5, 0x00000000, 0x000000aa, 0x000000be, NULL },
{ MENUITEMTYPE_MODEL, 0, 0x00000003, 0x0000008c, 0x0000009c, NULL },
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&func0f1a67b0, 0x00000000, menuhandler001a64d8 },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&dtMenuTextOkOrResume, 0x00000000, menuhandler001a64d8 },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&func0f1a67f8, 0x00000000, menuhandler001a6514 },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
src/game/game_1a3340.c
+10 -23
View File
@@ -3355,29 +3355,16 @@ glabel var7f1b9998
/* f1a67ac: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f1a67b0
/* f1a67b0: 27bdffe8 */ addiu $sp,$sp,-24
/* f1a67b4: afbf0014 */ sw $ra,0x14($sp)
/* f1a67b8: 0fc68606 */ jal getDeviceTrainingData
/* f1a67bc: afa40018 */ sw $a0,0x18($sp)
/* f1a67c0: 8c4e0000 */ lw $t6,0x0($v0)
/* f1a67c4: 000e7fc2 */ srl $t7,$t6,0x1f
/* f1a67c8: 11e00005 */ beqz $t7,.L0f1a67e0
/* f1a67cc: 00000000 */ sll $zero,$zero,0x0
/* f1a67d0: 0fc5b9f1 */ jal langGet
/* f1a67d4: 240451ac */ addiu $a0,$zero,0x51ac
/* f1a67d8: 10000004 */ beqz $zero,.L0f1a67ec
/* f1a67dc: 8fbf0014 */ lw $ra,0x14($sp)
.L0f1a67e0:
/* f1a67e0: 0fc5b9f1 */ jal langGet
/* f1a67e4: 240451ab */ addiu $a0,$zero,0x51ab
/* f1a67e8: 8fbf0014 */ lw $ra,0x14($sp)
.L0f1a67ec:
/* f1a67ec: 27bd0018 */ addiu $sp,$sp,0x18
/* f1a67f0: 03e00008 */ jr $ra
/* f1a67f4: 00000000 */ sll $zero,$zero,0x0
);
char *dtMenuTextOkOrResume(struct menu_item *item)
{
struct trainingdata *data = getDeviceTrainingData();
if (data->intraining) {
return langGet(L_MPMENU(428)); // "Resume"
}
return langGet(L_MPMENU(427)); // "Ok"
}
GLOBAL_ASM(
glabel func0f1a67f8
src/include/game/game_1a3340.h
+1 -1
View File
@@ -23,7 +23,7 @@ char *ciMenuTextBioAge(struct menu_item *item);
char *ciMenuTextBioRace(struct menu_item *item);
u32 func0f1a6388(void);
u32 func0f1a64a0(void);
u32 func0f1a67b0(void);
char *dtMenuTextOkOrResume(struct menu_item *item);
u32 func0f1a67f8(void);
char *dtMenuTextTimeTakenValue(struct menu_item *item);
u32 func0f1a6a04(void);
src/include/types.h
+1 -1
View File
@@ -4864,7 +4864,7 @@ struct portal {
};
struct trainingdata {
u32 unk00_00 : 1;
u32 intraining : 1;
u32 unk00_01 : 1;
u32 unk00_02 : 1;
u32 unk00_03 : 1;