From a7301b0ee3ffa52c9970bd6df1dcf69c9a752b2f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 20 Mar 2020 18:53:31 +1000 Subject: [PATCH] Decompile dtMenuTextCancelOrAbort --- src/game/data/data_020df0.c | 2 +- src/game/game_1a3340.c | 33 ++++++++++----------------------- src/include/game/game_1a3340.h | 2 +- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 3f6a6ed80..4065c1a91 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -13095,7 +13095,7 @@ struct menu_item menuitems_2f424[] = { { MENUITEMTYPE_MODEL, 0, 0x00000003, 0x0000008c, 0x0000009c, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&dtMenuTextOkOrResume, 0x00000000, menuhandler001a64d8 }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&func0f1a67f8, 0x00000000, menuhandler001a6514 }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&dtMenuTextCancelOrAbort, 0x00000000, menuhandler001a6514 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 98b74b6b9..b46810537 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -3366,29 +3366,16 @@ char *dtMenuTextOkOrResume(struct menu_item *item) return langGet(L_MPMENU(427)); // "Ok" } -GLOBAL_ASM( -glabel func0f1a67f8 -/* f1a67f8: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a67fc: afbf0014 */ sw $ra,0x14($sp) -/* f1a6800: 0fc68606 */ jal getDeviceTrainingData -/* f1a6804: afa40018 */ sw $a0,0x18($sp) -/* f1a6808: 8c4e0000 */ lw $t6,0x0($v0) -/* f1a680c: 000e7fc2 */ srl $t7,$t6,0x1f -/* f1a6810: 11e00005 */ beqz $t7,.L0f1a6828 -/* f1a6814: 00000000 */ sll $zero,$zero,0x0 -/* f1a6818: 0fc5b9f1 */ jal langGet -/* f1a681c: 240451ae */ addiu $a0,$zero,0x51ae -/* f1a6820: 10000004 */ beqz $zero,.L0f1a6834 -/* f1a6824: 8fbf0014 */ lw $ra,0x14($sp) -.L0f1a6828: -/* f1a6828: 0fc5b9f1 */ jal langGet -/* f1a682c: 240451ad */ addiu $a0,$zero,0x51ad -/* f1a6830: 8fbf0014 */ lw $ra,0x14($sp) -.L0f1a6834: -/* f1a6834: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1a6838: 03e00008 */ jr $ra -/* f1a683c: 00000000 */ sll $zero,$zero,0x0 -); +char *dtMenuTextCancelOrAbort(struct menu_item *item) +{ + struct trainingdata *data = getDeviceTrainingData(); + + if (data->intraining) { + return langGet(L_MPMENU(430)); // "Abort" + } + + return langGet(L_MPMENU(429)); // "Cancel" +} const char var7f1b98ac[] = "%s\n"; diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index d59d92ed5..06ec8cb00 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -24,7 +24,7 @@ char *ciMenuTextBioRace(struct menu_item *item); u32 func0f1a6388(void); u32 func0f1a64a0(void); char *dtMenuTextOkOrResume(struct menu_item *item); -u32 func0f1a67f8(void); +char *dtMenuTextCancelOrAbort(struct menu_item *item); char *dtMenuTextTimeTakenValue(struct menu_item *item); u32 func0f1a6a04(void); u32 func0f1a6aec(void);