From 70f858bd95df9ffb150c5511b0c7d38c74a322e1 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 16 Feb 2021 22:19:42 +1000 Subject: [PATCH] Decompile func0f189088 --- src/game/mplayer/mplayer.c | 15 ++++----------- src/include/game/mplayer/mplayer.h | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 597d2d716..b74cf60e0 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -1372,17 +1372,10 @@ s32 func0f189058(s32 arg0) return mpCountWeaponSetThing(arg0 ? 15 : 12); } -GLOBAL_ASM( -glabel func0f189088 -/* f189088: 27bdffe8 */ addiu $sp,$sp,-24 -/* f18908c: afbf0014 */ sw $ra,0x14($sp) -/* f189090: 0fc623b5 */ jal mpCountWeaponSetThing -/* f189094: 2404000e */ addiu $a0,$zero,0xe -/* f189098: 8fbf0014 */ lw $ra,0x14($sp) -/* f18909c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1890a0: 03e00008 */ jr $ra -/* f1890a4: 00000000 */ nop -); +s32 func0f189088(void) +{ + return mpCountWeaponSetThing(14); +} char *mpGetWeaponSetName(s32 index) { diff --git a/src/include/game/mplayer/mplayer.h b/src/include/game/mplayer/mplayer.h index 174e00dac..dfb2d847a 100644 --- a/src/include/game/mplayer/mplayer.h +++ b/src/include/game/mplayer/mplayer.h @@ -28,7 +28,7 @@ struct mpweapon *func0f188e24(s32 arg0); s32 mpCountWeaponSetThing(s32 weaponsetindex); s32 func0f188f9c(s32 arg0); s32 func0f189058(s32 arg0); -u32 func0f189088(void); +s32 func0f189088(void); char *mpGetWeaponSetName(s32 arg0); u32 func0f18913c(void); u32 func0f1892dc(void);