falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile htMenuTextCancelOrAbort

This commit is contained in:
Ryan Dwyer 2020-03-20 19:09:25 +10:00
parent 82163362a0
commit 416cbfc518
4 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/data/data_020df0.c
View File

@ -13171,7 +13171,7 @@ struct menu_item menuitems_2f614[] = {
{ MENUITEMTYPE_MODEL, 0, 0x00000003, 0x0000008c, 0x0000009c, NULL },
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&htMenuTextOkOrResume, 0x00000000, menuhandler001a6a34 },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&func0f1a6b34, 0x00000000, menuhandler001a6a70 },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&htMenuTextCancelOrAbort, 0x00000000, menuhandler001a6a70 },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};

33
src/game/game_1a3340.c
View File

@ -3537,29 +3537,16 @@ char *htMenuTextOkOrResume(struct menu_item *item)
return langGet(L_MPMENU(427)); // "Ok"
}
GLOBAL_ASM(
glabel func0f1a6b34
/* f1a6b34: 27bdffe8 */ addiu $sp,$sp,-24
/* f1a6b38: afbf0014 */ sw $ra,0x14($sp)
/* f1a6b3c: 0fc687f8 */ jal getHoloTrainingData
/* f1a6b40: afa40018 */ sw $a0,0x18($sp)
/* f1a6b44: 8c4e0000 */ lw $t6,0x0($v0)
/* f1a6b48: 000e7fc2 */ srl $t7,$t6,0x1f
/* f1a6b4c: 11e00005 */ beqz $t7,.L0f1a6b64
/* f1a6b50: 00000000 */ sll $zero,$zero,0x0
/* f1a6b54: 0fc5b9f1 */ jal langGet
/* f1a6b58: 240451ae */ addiu $a0,$zero,0x51ae
/* f1a6b5c: 10000004 */ beqz $zero,.L0f1a6b70
/* f1a6b60: 8fbf0014 */ lw $ra,0x14($sp)
.L0f1a6b64:
/* f1a6b64: 0fc5b9f1 */ jal langGet
/* f1a6b68: 240451ad */ addiu $a0,$zero,0x51ad
/* f1a6b6c: 8fbf0014 */ lw $ra,0x14($sp)
.L0f1a6b70:
/* f1a6b70: 27bd0018 */ addiu $sp,$sp,0x18
/* f1a6b74: 03e00008 */ jr $ra
/* f1a6b78: 00000000 */ sll $zero,$zero,0x0
);
char *htMenuTextCancelOrAbort(struct menu_item *item)
{
struct trainingdata *data = getHoloTrainingData();
if (data->intraining) {
return langGet(L_MPMENU(430)); // "Abort"
}
return langGet(L_MPMENU(429)); // "Cancel"
}
char *htMenuTextTimeTakenValue(struct menu_item *item)
{

9
src/game/propobj.c
View File

@ -48692,11 +48692,12 @@ bool func0f09018c(struct prop *doorprop)
u8 intraining = false;
if (g_Vars.stagenum == STAGE_CITRAINING) {
struct trainingdata *a = getDeviceTrainingData();
struct trainingdata *b = getHoloTrainingData();
struct trainingdata *devdata = getDeviceTrainingData();
struct trainingdata *holodata = getHoloTrainingData();
intraining = (a && a->unk00_00) || (b && b->unk00_00) ||
g_Vars.currentplayer->prop->rooms[0] == 0x0a;
intraining = (devdata && devdata->intraining)
|| (holodata && holodata->intraining)
|| g_Vars.currentplayer->prop->rooms[0] == 0x0a;
}
if (override && override->activatetextid) {

2
src/include/game/game_1a3340.h
View File

@ -28,7 +28,7 @@ char *dtMenuTextCancelOrAbort(struct menu_item *item);
char *dtMenuTextTimeTakenValue(struct menu_item *item);
u32 func0f1a6a04(void);
char *htMenuTextOkOrResume(struct menu_item *item);
u32 func0f1a6b34(void);
char *htMenuTextCancelOrAbort(struct menu_item *item);
char *htMenuTextTimeTakenValue(struct menu_item *item);
u32 func0f1a6c8c(void);
u32 func0f1a6cc4(void);