From dada27e39e22c3f0be4149143931e2f45e17be0e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 11 Apr 2020 20:52:12 +1000 Subject: [PATCH] Decompile ciGetChrBioDescription --- src/game/game_0e5ce0.c | 2 +- src/game/game_19c990.c | 21 +++++---------------- src/include/game/game_19c990.h | 2 +- src/include/types.h | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index f0300199f..038f27db0 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -12040,7 +12040,7 @@ glabel var7f1b1e8c /* f0ecd58: 00000000 */ sll $zero,$zero,0x0 /* f0ecd5c: 1000002d */ beqz $zero,.L0f0ece14 /* f0ecd60: 8fbf0014 */ lw $ra,0x14($sp) -/* f0ecd64: 0fc68461 */ jal func0f1a1184 +/* f0ecd64: 0fc68461 */ jal ciGetChrBioDescription /* f0ecd68: 00000000 */ sll $zero,$zero,0x0 /* f0ecd6c: 10000029 */ beqz $zero,.L0f0ece14 /* f0ecd70: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 5eda22f09..934828735 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -5242,22 +5242,11 @@ struct chrbio *ciGetChrBioByBodynum(u32 bodynum) return NULL; } -GLOBAL_ASM( -glabel func0f1a1184 -/* f1a1184: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a1188: afbf0014 */ sw $ra,0x14($sp) -/* f1a118c: 3c048009 */ lui $a0,%hi(var800888a0) -/* f1a1190: 0fc68484 */ jal func0f1a1210 -/* f1a1194: 908488a0 */ lbu $a0,%lo(var800888a0)($a0) -/* f1a1198: 0fc68429 */ jal ciGetChrBioByBodynum -/* f1a119c: 00402025 */ or $a0,$v0,$zero -/* f1a11a0: 0fc5b9f1 */ jal langGet -/* f1a11a4: 8c44000c */ lw $a0,0xc($v0) -/* f1a11a8: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a11ac: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1a11b0: 03e00008 */ jr $ra -/* f1a11b4: 00000000 */ sll $zero,$zero,0x0 -); +char *ciGetChrBioDescription(void) +{ + struct chrbio *bio = ciGetChrBioByBodynum(func0f1a1210(var800888a0)); + return langGet(bio->description); +} GLOBAL_ASM( glabel func0f1a11b8 diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h index 399c10bfb..66cd64b60 100644 --- a/src/include/game/game_19c990.h +++ b/src/include/game/game_19c990.h @@ -62,7 +62,7 @@ u32 func0f1a0cc0(void); u32 func0f1a0fc8(void); bool ciIsChrBioUnlocked(u32 bodynum); struct chrbio *ciGetChrBioByBodynum(u32 bodynum); -u32 func0f1a1184(void); +char *ciGetChrBioDescription(void); u32 func0f1a11b8(void); u32 func0f1a1210(u32 arg0); struct miscbio *ciGetMiscBio(s32 index); diff --git a/src/include/types.h b/src/include/types.h index 13bbff77f..d0f2ca246 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -4728,7 +4728,7 @@ struct chrbio { u32 name; u32 race; u32 age; - u32 profile; + u32 description; }; struct mpteaminfo {