From c0ef3a5b9dc0622f92d640071a3f20d480e57b67 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 31 Oct 2020 09:38:54 +1000 Subject: [PATCH] Decompile func000155f4 --- src/include/lib/lib_13900.h | 2 +- src/lib/lib_13900.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/include/lib/lib_13900.h b/src/include/lib/lib_13900.h index f0d0e5dc7..01bb8291e 100644 --- a/src/include/lib/lib_13900.h +++ b/src/include/lib/lib_13900.h @@ -43,7 +43,7 @@ u32 func0001519c(void); u32 func000152d0(void); u32 func000153c4(void); bool func000155b4(s8 index); -u32 func000155f4(void); +bool func000155f4(s8 index); u32 func0001561c(void); #endif diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index 1e1e07ca5..17c367758 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -1592,19 +1592,10 @@ bool func000155b4(s8 index) return var800a2380[index].unk010; } -GLOBAL_ASM( -glabel func000155f4 -/* 155f4: 27bdffe8 */ addiu $sp,$sp,-24 -/* 155f8: afbf0014 */ sw $ra,0x14($sp) -/* 155fc: afa40018 */ sw $a0,0x18($sp) -/* 15600: 00047600 */ sll $t6,$a0,0x18 -/* 15604: 0c00556d */ jal func000155b4 -/* 15608: 000e2603 */ sra $a0,$t6,0x18 -/* 1560c: 8fbf0014 */ lw $ra,0x14($sp) -/* 15610: 27bd0018 */ addiu $sp,$sp,0x18 -/* 15614: 03e00008 */ jr $ra -/* 15618: 00000000 */ nop -); +bool func000155f4(s8 index) +{ + return func000155b4(index); +} GLOBAL_ASM( glabel func0001561c