From 7ed1e3562e7d37c83c685a73134a53737fb3f2c1 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 8 Sep 2021 23:10:55 +1000 Subject: [PATCH] Decompile func0f006ba0 --- src/game/game_006900.c | 23 ++++++++--------------- src/include/game/game_006900.h | 2 +- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/game/game_006900.c b/src/game/game_006900.c index be1ca8d31..cc3415f10 100644 --- a/src/game/game_006900.c +++ b/src/game/game_006900.c @@ -132,21 +132,14 @@ glabel var7f1a7e74 /* f006b9c: 46128000 */ add.s $f0,$f16,$f18 ); -GLOBAL_ASM( -glabel func0f006ba0 -/* f006ba0: 3c018006 */ lui $at,%hi(var80061630) -/* f006ba4: c4241630 */ lwc1 $f4,%lo(var80061630)($at) -/* f006ba8: 460c2082 */ mul.s $f2,$f4,$f12 -/* f006bac: 4600118d */ trunc.w.s $f6,$f2 -/* f006bb0: 440f3000 */ mfc1 $t7,$f6 -/* f006bb4: 00000000 */ nop -/* f006bb8: 448f4000 */ mtc1 $t7,$f8 -/* f006bbc: 00000000 */ nop -/* f006bc0: 468042a0 */ cvt.s.w $f10,$f8 -/* f006bc4: 460a1081 */ sub.s $f2,$f2,$f10 -/* f006bc8: 03e00008 */ jr $ra -/* f006bcc: 46001006 */ mov.s $f0,$f2 -); +f32 func0f006ba0(f32 arg0) +{ + f32 tmp = var80061630 * arg0; + + tmp -= (s32)tmp; + + return tmp; +} #if VERSION < VERSION_NTSC_1_0 f32 func0f006bd0(f32 arg0) diff --git a/src/include/game/game_006900.h b/src/include/game/game_006900.h index 4187078b4..8f149dca3 100644 --- a/src/include/game/game_006900.h +++ b/src/include/game/game_006900.h @@ -8,6 +8,6 @@ u32 colourBlend(u32 a, u32 b, u32 weight); void func0f0069dc(void); f32 func0f006b08(f32 arg0); f32 func0f006b54(f32 arg0); -u32 func0f006ba0(void); +f32 func0f006ba0(f32 arg0); #endif