diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 1f31882d2..6caa3b6b2 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -12056,7 +12056,7 @@ glabel var7f1b1e8c /* f0ecd98: 00000000 */ sll $zero,$zero,0x0 /* f0ecd9c: 1000001d */ beqz $zero,.L0f0ece14 /* f0ecda0: 8fbf0014 */ lw $ra,0x14($sp) -/* f0ecda4: 0fc685f9 */ jal func0f1a17e4 +/* f0ecda4: 0fc685f9 */ jal ciGetHangarBioDescription /* f0ecda8: 00000000 */ sll $zero,$zero,0x0 /* f0ecdac: 10000019 */ beqz $zero,.L0f0ece14 /* f0ecdb0: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 12d44f5b7..e9273844d 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -4761,7 +4761,7 @@ bool ciIsHangarBioAVehicle(s32 index) return index >= HANGARBIO_JUMPSHIP; } -u32 var80088964 = 0; +u8 g_HangarBioSlot = 0; struct hangarbio *ciGetHangarBio(s32 index) { @@ -4938,22 +4938,11 @@ s32 ciGetHangarBioIndexBySlot(s32 slot) return 0; } -GLOBAL_ASM( -glabel func0f1a17e4 -/* f1a17e4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a17e8: afbf0014 */ sw $ra,0x14($sp) -/* f1a17ec: 3c048009 */ lui $a0,%hi(var80088964) -/* f1a17f0: 0fc685db */ jal ciGetHangarBioIndexBySlot -/* f1a17f4: 90848964 */ lbu $a0,%lo(var80088964)($a0) -/* f1a17f8: 0fc6852d */ jal ciGetHangarBio -/* f1a17fc: 00402025 */ or $a0,$v0,$zero -/* f1a1800: 0fc5b9f1 */ jal langGet -/* f1a1804: 8c440004 */ lw $a0,0x4($v0) -/* f1a1808: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a180c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1a1810: 03e00008 */ jr $ra -/* f1a1814: 00000000 */ sll $zero,$zero,0x0 -); +char *ciGetHangarBioDescription(void) +{ + struct hangarbio *bio = ciGetHangarBio(ciGetHangarBioIndexBySlot(g_HangarBioSlot)); + return langGet(bio->description); +} struct trainingdata *getDeviceTrainingData(void) { diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index e95cde3fc..ffa62187a 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -3539,9 +3539,9 @@ glabel func0f1a6c8c /* f1a6c8c: 27bdffe8 */ addiu $sp,$sp,-24 /* f1a6c90: afa40018 */ sw $a0,0x18($sp) /* f1a6c94: afbf0014 */ sw $ra,0x14($sp) -/* f1a6c98: 3c048009 */ lui $a0,%hi(var80088964) +/* f1a6c98: 3c048009 */ lui $a0,%hi(g_HangarBioSlot) /* f1a6c9c: 0fc685db */ jal ciGetHangarBioIndexBySlot -/* f1a6ca0: 90848964 */ lbu $a0,%lo(var80088964)($a0) +/* f1a6ca0: 90848964 */ lbu $a0,%lo(g_HangarBioSlot)($a0) /* f1a6ca4: 0fc6852d */ jal ciGetHangarBio /* f1a6ca8: 00402025 */ or $a0,$v0,$zero /* f1a6cac: 0fc5b9f1 */ jal langGet @@ -3557,8 +3557,8 @@ glabel func0f1a6cc4 /* f1a6cc4: 27bdffe0 */ addiu $sp,$sp,-32 /* f1a6cc8: afa40020 */ sw $a0,0x20($sp) /* f1a6ccc: afbf0014 */ sw $ra,0x14($sp) -/* f1a6cd0: 3c048009 */ lui $a0,%hi(var80088964) -/* f1a6cd4: 90848964 */ lbu $a0,%lo(var80088964)($a0) +/* f1a6cd0: 3c048009 */ lui $a0,%hi(g_HangarBioSlot) +/* f1a6cd4: 90848964 */ lbu $a0,%lo(g_HangarBioSlot)($a0) /* f1a6cd8: 0fc685db */ jal ciGetHangarBioIndexBySlot /* f1a6cdc: afa0001c */ sw $zero,0x1c($sp) /* f1a6ce0: 0fc6852d */ jal ciGetHangarBio @@ -3653,8 +3653,8 @@ glabel var7f1b99d0 /* f1a6dec: 1000002a */ beqz $zero,.L0f1a6e98 /* f1a6df0: 8fbf0014 */ lw $ra,0x14($sp) /* f1a6df4: 8ccb0000 */ lw $t3,0x0($a2) -/* f1a6df8: 3c028009 */ lui $v0,%hi(var80088964) -/* f1a6dfc: 24428964 */ addiu $v0,$v0,%lo(var80088964) +/* f1a6df8: 3c028009 */ lui $v0,%hi(g_HangarBioSlot) +/* f1a6dfc: 24428964 */ addiu $v0,$v0,%lo(g_HangarBioSlot) /* f1a6e00: a04b0000 */ sb $t3,0x0($v0) /* f1a6e04: 0fc685db */ jal ciGetHangarBioIndexBySlot /* f1a6e08: 316400ff */ andi $a0,$t3,0xff @@ -3671,8 +3671,8 @@ glabel var7f1b99d0 /* f1a6e30: 24849918 */ addiu $a0,$a0,%lo(menudialog_2f938) /* f1a6e34: 10000017 */ beqz $zero,.L0f1a6e94 /* f1a6e38: 00001025 */ or $v0,$zero,$zero -/* f1a6e3c: 3c028009 */ lui $v0,%hi(var80088964) -/* f1a6e40: 24428964 */ addiu $v0,$v0,%lo(var80088964) +/* f1a6e3c: 3c028009 */ lui $v0,%hi(g_HangarBioSlot) +/* f1a6e40: 24428964 */ addiu $v0,$v0,%lo(g_HangarBioSlot) /* f1a6e44: 904c0000 */ lbu $t4,0x0($v0) /* f1a6e48: 10000011 */ beqz $zero,.L0f1a6e90 /* f1a6e4c: accc0000 */ sw $t4,0x0($a2) @@ -3711,8 +3711,8 @@ glabel menuhandler001a6ea4 /* f1a6eb4: 1481012b */ bne $a0,$at,.L0f1a7364 /* f1a6eb8: afa500ac */ sw $a1,0xac($sp) /* f1a6ebc: 8cce0000 */ lw $t6,0x0($a2) -/* f1a6ec0: 3c048009 */ lui $a0,%hi(var80088964) -/* f1a6ec4: 90848964 */ lbu $a0,%lo(var80088964)($a0) +/* f1a6ec0: 3c048009 */ lui $a0,%hi(g_HangarBioSlot) +/* f1a6ec4: 90848964 */ lbu $a0,%lo(g_HangarBioSlot)($a0) /* f1a6ec8: afae00a4 */ sw $t6,0xa4($sp) /* f1a6ecc: 0fc685db */ jal ciGetHangarBioIndexBySlot /* f1a6ed0: 8cd00008 */ lw $s0,0x8($a2) @@ -4040,9 +4040,9 @@ glabel var7f1b99d8 /* f1a7384: 00803025 */ or $a2,$a0,$zero /* f1a7388: afa400a0 */ sw $a0,0xa0($sp) /* f1a738c: afbf0014 */ sw $ra,0x14($sp) -/* f1a7390: 3c048009 */ lui $a0,%hi(var80088964) +/* f1a7390: 3c048009 */ lui $a0,%hi(g_HangarBioSlot) /* f1a7394: afa500a4 */ sw $a1,0xa4($sp) -/* f1a7398: 90848964 */ lbu $a0,%lo(var80088964)($a0) +/* f1a7398: 90848964 */ lbu $a0,%lo(g_HangarBioSlot)($a0) /* f1a739c: 0fc685db */ jal ciGetHangarBioIndexBySlot /* f1a73a0: afa600a0 */ sw $a2,0xa0($sp) /* f1a73a4: 2841000e */ slti $at,$v0,0xe diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h index e69d92045..186f12447 100644 --- a/src/include/game/game_19c990.h +++ b/src/include/game/game_19c990.h @@ -77,7 +77,7 @@ bool ciIsHangarBioUnlocked(u32 bioindex); s32 ciGetNumUnlockedLocationBios(void); s32 ciGetNumUnlockedHangarBios(void); s32 ciGetHangarBioIndexBySlot(s32 slot); -u32 func0f1a17e4(void); +char *ciGetHangarBioDescription(void); struct trainingdata *getDeviceTrainingData(void); void dtRestorePlayer(void); void dtPushEndscreen(void);