diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 4506334f5..f0300199f 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -12044,7 +12044,7 @@ glabel var7f1b1e8c /* f0ecd68: 00000000 */ sll $zero,$zero,0x0 /* f0ecd6c: 10000029 */ beqz $zero,.L0f0ece14 /* f0ecd70: 8fbf0014 */ lw $ra,0x14($sp) -/* f0ecd74: 0fc6851a */ jal func0f1a1468 +/* f0ecd74: 0fc6851a */ jal ciGetMiscBioDescription /* f0ecd78: 00000000 */ sll $zero,$zero,0x0 /* f0ecd7c: 10000025 */ beqz $zero,.L0f0ece14 /* f0ecd80: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 60c3f0391..5eda22f09 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -5448,25 +5448,13 @@ glabel func0f1a13f0 /* f1a1464: 27bd0028 */ addiu $sp,$sp,0x28 ); -GLOBAL_ASM( -glabel func0f1a1468 -/* f1a1468: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a146c: afbf0014 */ sw $ra,0x14($sp) -/* f1a1470: 0fc6846e */ jal func0f1a11b8 -/* f1a1474: 00000000 */ sll $zero,$zero,0x0 -/* f1a1478: 3c0e8009 */ lui $t6,%hi(var800888a0) -/* f1a147c: 91ce88a0 */ lbu $t6,%lo(var800888a0)($t6) -/* f1a1480: 0fc684fc */ jal func0f1a13f0 -/* f1a1484: 01c22023 */ subu $a0,$t6,$v0 -/* f1a1488: 0fc684a2 */ jal ciGetMiscBio -/* f1a148c: 00402025 */ or $a0,$v0,$zero -/* f1a1490: 0fc5b9f1 */ jal langGet -/* f1a1494: 8c440004 */ lw $a0,0x4($v0) -/* f1a1498: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a149c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1a14a0: 03e00008 */ jr $ra -/* f1a14a4: 00000000 */ sll $zero,$zero,0x0 -); +char *ciGetMiscBioDescription(void) +{ + s32 index = func0f1a13f0(var800888a0 - func0f1a11b8()); + struct miscbio *bio = ciGetMiscBio(index); + + return langGet(bio->description); +} GLOBAL_ASM( glabel func0f1a14a8 diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h index 217c2ea59..399c10bfb 100644 --- a/src/include/game/game_19c990.h +++ b/src/include/game/game_19c990.h @@ -68,8 +68,8 @@ u32 func0f1a1210(u32 arg0); struct miscbio *ciGetMiscBio(s32 index); u32 func0f1a1328(void); u32 func0f1a1398(void); -u32 func0f1a13f0(void); -u32 func0f1a1468(void); +s32 func0f1a13f0(u32 arg0); +char *ciGetMiscBioDescription(void); u32 func0f1a14a8(void); struct locationbio *ciGetLocationBio(s32 index); bool ciIsLocationBioUnlocked(u32 bioindex);