From cafc4f95b7bbfdf437b7506e0a03148bda9a0500 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 10 Apr 2020 22:22:53 +1000 Subject: [PATCH] Decompile dtGetDescription --- src/game/game_0e5ce0.c | 2 +- src/game/game_19c990.c | 38 +++++------------------------ src/include/game/data/data_02da90.h | 2 +- src/include/game/game_19c990.h | 2 +- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 2971f3282..2d4fe97d8 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -12048,7 +12048,7 @@ glabel var7f1b1e8c /* f0ecd78: 00000000 */ sll $zero,$zero,0x0 /* f0ecd7c: 10000025 */ beqz $zero,.L0f0ece14 /* f0ecd80: 8fbf0014 */ lw $ra,0x14($sp) -/* f0ecd84: 0fc687a4 */ jal func0f1a1e90 +/* f0ecd84: 0fc687a4 */ jal dtGetDescription /* f0ecd88: 00000000 */ sll $zero,$zero,0x0 /* f0ecd8c: 10000021 */ beqz $zero,.L0f0ece14 /* f0ecd90: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index d808469ca..90812d132 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -6066,38 +6066,12 @@ u32 ciGetStageFlagByDeviceIndex(u32 deviceindex) return flags[deviceindex]; } -GLOBAL_ASM( -glabel func0f1a1e90 -/* f1a1e90: 27bdffb8 */ addiu $sp,$sp,-72 -/* f1a1e94: 3c0f8009 */ lui $t7,%hi(device_descriptions) -/* f1a1e98: 25ef8b3c */ addiu $t7,$t7,%lo(device_descriptions) -/* f1a1e9c: afbf0014 */ sw $ra,0x14($sp) -/* f1a1ea0: 25e80024 */ addiu $t0,$t7,0x24 -/* f1a1ea4: 27ae0020 */ addiu $t6,$sp,0x20 -.L0f1a1ea8: -/* f1a1ea8: 8de10000 */ lw $at,0x0($t7) -/* f1a1eac: 25ef000c */ addiu $t7,$t7,0xc -/* f1a1eb0: 25ce000c */ addiu $t6,$t6,0xc -/* f1a1eb4: adc1fff4 */ sw $at,-0xc($t6) -/* f1a1eb8: 8de1fff8 */ lw $at,-0x8($t7) -/* f1a1ebc: adc1fff8 */ sw $at,-0x8($t6) -/* f1a1ec0: 8de1fffc */ lw $at,-0x4($t7) -/* f1a1ec4: 15e8fff8 */ bne $t7,$t0,.L0f1a1ea8 -/* f1a1ec8: adc1fffc */ sw $at,-0x4($t6) -/* f1a1ecc: 8de10000 */ lw $at,0x0($t7) -/* f1a1ed0: 3c048009 */ lui $a0,%hi(var80088ad8) -/* f1a1ed4: adc10000 */ sw $at,0x0($t6) -/* f1a1ed8: 0fc6875a */ jal func0f1a1d68 -/* f1a1edc: 90848ad8 */ lbu $a0,%lo(var80088ad8)($a0) -/* f1a1ee0: 00024880 */ sll $t1,$v0,0x2 -/* f1a1ee4: 03a92021 */ addu $a0,$sp,$t1 -/* f1a1ee8: 0fc5b9f1 */ jal langGet -/* f1a1eec: 8c840020 */ lw $a0,0x20($a0) -/* f1a1ef0: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a1ef4: 27bd0048 */ addiu $sp,$sp,0x48 -/* f1a1ef8: 03e00008 */ jr $ra -/* f1a1efc: 00000000 */ sll $zero,$zero,0x0 -); +char *dtGetDescription(void) +{ + u32 texts[10] = device_descriptions; + + return langGet(texts[func0f1a1d68(var80088ad8)]); +} char *dtGetTip1(void) { diff --git a/src/include/game/data/data_02da90.h b/src/include/game/data/data_02da90.h index f3909548b..a764c686c 100644 --- a/src/include/game/data/data_02da90.h +++ b/src/include/game/data/data_02da90.h @@ -36,7 +36,7 @@ extern u8 var80088adc; extern u32 var80088ae0; extern u32 var80088aec; extern u32 g_CiDeviceStageFlags[10]; -extern u32 device_descriptions[]; +extern u32 device_descriptions[10]; extern u32 device_tips1[10]; extern u32 device_tips2[10]; extern u8 var80088bb4; diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h index b879a796a..39afa4294 100644 --- a/src/include/game/game_19c990.h +++ b/src/include/game/game_19c990.h @@ -86,7 +86,7 @@ u32 func0f1a1d10(void); u32 func0f1a1d68(u32 arg0); u32 func0f1a1de0(u32 arg0); u32 ciGetStageFlagByDeviceIndex(u32 deviceindex); -u32 func0f1a1e90(void); +char *dtGetDescription(void); char *dtGetTip1(void); char *dtGetTip2(void); struct trainingdata *getHoloTrainingData(void);