From 1a1497e675c9b42cd21d11ab85b9532063eb69cb Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 5 Nov 2021 23:21:33 +1000 Subject: [PATCH] Decompile mtx00016710 --- src/include/lib/mtx.h | 2 +- src/lib/mtx.c | 24 +++++++----------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/include/lib/mtx.h b/src/include/lib/mtx.h index 1a54ae2aa..04b5537d2 100644 --- a/src/include/lib/mtx.h +++ b/src/include/lib/mtx.h @@ -41,7 +41,7 @@ void mtx0001648c(struct coord *coord, Mtxf *dest); u32 mtx000165d8(void); void mtx000166a4(struct coord *pos, struct coord *rot, Mtxf *matrix); void mtx000166dc(struct coord *pos, Mtxf *matrix); -u32 mtx00016710(void); +void mtx00016710(f32 mult, f32 mtx[4][4]); void mtx00016748(f32 arg0); void mtx00016760(void); void mtx00016784(void); diff --git a/src/lib/mtx.c b/src/lib/mtx.c index 5e4105299..b5b50820e 100644 --- a/src/lib/mtx.c +++ b/src/lib/mtx.c @@ -310,23 +310,13 @@ void mtx000166dc(struct coord *pos, Mtxf *matrix) mtx00015dd4(pos, matrix); } -GLOBAL_ASM( -glabel mtx00016710 -/* 16710: c4a40008 */ lwc1 $f4,0x8($a1) -/* 16714: c4a80018 */ lwc1 $f8,0x18($a1) -/* 16718: c4b00028 */ lwc1 $f16,0x28($a1) -/* 1671c: 460c2182 */ mul.s $f6,$f4,$f12 -/* 16720: c4a40038 */ lwc1 $f4,0x38($a1) -/* 16724: 460c4282 */ mul.s $f10,$f8,$f12 -/* 16728: 00000000 */ nop -/* 1672c: 460c8482 */ mul.s $f18,$f16,$f12 -/* 16730: e4a60008 */ swc1 $f6,0x8($a1) -/* 16734: 460c2182 */ mul.s $f6,$f4,$f12 -/* 16738: e4aa0018 */ swc1 $f10,0x18($a1) -/* 1673c: e4b20028 */ swc1 $f18,0x28($a1) -/* 16740: 03e00008 */ jr $ra -/* 16744: e4a60038 */ swc1 $f6,0x38($a1) -); +void mtx00016710(f32 mult, f32 mtx[4][4]) +{ + mtx[0][2] *= mult; + mtx[1][2] *= mult; + mtx[2][2] *= mult; + mtx[3][2] *= mult; +} void mtx00016748(f32 arg0) {