From be8e1ab2169d4f98adcbd2eba079f1544dc8a4d8 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 12 Apr 2020 10:49:23 +1000 Subject: [PATCH] Decompile ciIsLocationBioAVehicle --- src/game/game_19c990.c | 12 +++++------- src/include/game/game_19c990.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 642460c4b..146306d4b 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -4756,12 +4756,10 @@ char *ciGetMiscBioDescription(void) return langGet(bio->description); } -GLOBAL_ASM( -glabel func0f1a14a8 -/* f1a14a8: 2882000e */ slti $v0,$a0,0xe -/* f1a14ac: 03e00008 */ jr $ra -/* f1a14b0: 38420001 */ xori $v0,$v0,0x1 -); +bool ciIsLocationBioAVehicle(s32 index) +{ + return index >= 14; +} u32 var80088964 = 0; @@ -4901,7 +4899,7 @@ glabel func0f1a16a4 /* f1a16bc: 00008025 */ or $s0,$zero,$zero /* f1a16c0: 24120017 */ addiu $s2,$zero,0x17 .L0f1a16c4: -/* f1a16c4: 0fc6852a */ jal func0f1a14a8 +/* f1a16c4: 0fc6852a */ jal ciIsLocationBioAVehicle /* f1a16c8: 02002025 */ or $a0,$s0,$zero /* f1a16cc: 10400003 */ beqz $v0,.L0f1a16dc /* f1a16d0: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h index 1ef1cead2..5c608f245 100644 --- a/src/include/game/game_19c990.h +++ b/src/include/game/game_19c990.h @@ -71,7 +71,7 @@ bool ciIsMiscBioUnlocked(s32 index); s32 ciGetNumUnlockedMiscBios(void); s32 ciGetMiscBioIndexBySlot(s32 slot); char *ciGetMiscBioDescription(void); -u32 func0f1a14a8(void); +bool ciIsLocationBioAVehicle(s32 index); struct locationbio *ciGetLocationBio(s32 index); bool ciIsLocationBioUnlocked(u32 bioindex); u32 func0f1a16a4(void);