From a8c5b22fd7c5cdbbb35238d8ab171a50e022ae2d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 2 Jun 2020 21:36:05 +1000 Subject: [PATCH] Decompile func0f167b48 --- src/game/game_167ae0.c | 32 ++++++++++++-------------------- src/include/game/game_167ae0.h | 2 +- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 60824cd39..418ff172c 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -139,26 +139,18 @@ void func0f167b10(void) } } -GLOBAL_ASM( -glabel func0f167b48 -/* f167b48: 3c02800b */ lui $v0,%hi(var800aa5c0) -/* f167b4c: 2442a5c0 */ addiu $v0,$v0,%lo(var800aa5c0) -/* f167b50: 00001825 */ or $v1,$zero,$zero -/* f167b54: 24050003 */ addiu $a1,$zero,0x3 -.L0f167b58: -/* f167b58: 8c4e0000 */ lw $t6,0x0($v0) -/* f167b5c: 548e0004 */ bnel $a0,$t6,.L0f167b70 -/* f167b60: 24630001 */ addiu $v1,$v1,0x1 -/* f167b64: 03e00008 */ jr $ra -/* f167b68: 00601025 */ or $v0,$v1,$zero -/* f167b6c: 24630001 */ addiu $v1,$v1,0x1 -.L0f167b70: -/* f167b70: 1465fff9 */ bne $v1,$a1,.L0f167b58 -/* f167b74: 24420004 */ addiu $v0,$v0,0x4 -/* f167b78: 2402ffff */ addiu $v0,$zero,-1 -/* f167b7c: 03e00008 */ jr $ra -/* f167b80: 00000000 */ sll $zero,$zero,0x0 -); +s32 func0f167b48(s32 arg0) +{ + s32 i; + + for (i = 0; i != 3; i++) { + if (var800aa5c0[i] == arg0) { + return i; + } + } + + return -1; +} GLOBAL_ASM( glabel func0f167b84 diff --git a/src/include/game/game_167ae0.h b/src/include/game/game_167ae0.h index 421c9704b..a6d3804b6 100644 --- a/src/include/game/game_167ae0.h +++ b/src/include/game/game_167ae0.h @@ -6,7 +6,7 @@ u32 getVar80084040(void); void func0f167af8(void); void func0f167b10(void); -u32 func0f167b48(void); +s32 func0f167b48(s32 arg0); void func0f167b84(u32 arg0, u32 arg1); void doBoostAndSlayerSfx(void); void func0f167e7c(s32 stagenum);