From 8bb7e8e7581b6f00e0fa9ddf050345fe01d81286 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 8 Sep 2021 12:13:07 +1000 Subject: [PATCH] Decompile func0f0d475c --- src/game/game_0d4690.c | 31 ++++++------------------------- src/include/game/game_0d4690.h | 2 +- src/include/lib/lib_159b0.h | 4 ++-- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index b8eb1d2e9..7a28e8c5c 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -98,31 +98,12 @@ glabel func0f0d4690 /* f0d4758: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f0d475c -.late_rodata -glabel var7f1adbd0 -.word 0x3dcccccd -glabel var7f1adbd4 -.word 0x3dcccccd -.text -/* f0d475c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0d4760: afbf0014 */ sw $ra,0x14($sp) -/* f0d4764: 0fc351a4 */ jal func0f0d4690 -/* f0d4768: afa40018 */ sw $a0,0x18($sp) -/* f0d476c: 3c017f1b */ lui $at,%hi(var7f1adbd0) -/* f0d4770: c42cdbd0 */ lwc1 $f12,%lo(var7f1adbd0)($at) -/* f0d4774: 0c00577c */ jal func00015df0 -/* f0d4778: 8fa50018 */ lw $a1,0x18($sp) -/* f0d477c: 3c017f1b */ lui $at,%hi(var7f1adbd4) -/* f0d4780: c42cdbd4 */ lwc1 $f12,%lo(var7f1adbd4)($at) -/* f0d4784: 0c005793 */ jal func00015e4c -/* f0d4788: 8fa50018 */ lw $a1,0x18($sp) -/* f0d478c: 8fbf0014 */ lw $ra,0x14($sp) -/* f0d4790: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0d4794: 03e00008 */ jr $ra -/* f0d4798: 00000000 */ nop -); +void func0f0d475c(Mtxf *mtx) +{ + func0f0d4690(mtx); + func00015df0(0.1f, mtx); + func00015e4c(0.1f, mtx); +} Gfx *func0f0d479c(Gfx *gdl) { diff --git a/src/include/game/game_0d4690.h b/src/include/game/game_0d4690.h index ffca89299..29a0e6a40 100644 --- a/src/include/game/game_0d4690.h +++ b/src/include/game/game_0d4690.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -u32 func0f0d4690(void); +void func0f0d4690(Mtxf *mtx); void func0f0d475c(Mtxf *mtx); Gfx *func0f0d479c(Gfx *gdl); Gfx *func0f0d49c8(Gfx *gdl); diff --git a/src/include/lib/lib_159b0.h b/src/include/lib/lib_159b0.h index e0d6b9363..fa048d530 100644 --- a/src/include/lib/lib_159b0.h +++ b/src/include/lib/lib_159b0.h @@ -18,9 +18,9 @@ void func00015d18(Mtxf *matrix, Mtxf *arg1); void func00015d54(f32 *realrot, Mtxf *matrix); void func00015da0(Mtxf *arg0, f32 *arg1); void func00015dd4(struct coord *pos, Mtxf *matrix); -u32 func00015df0(void); +void func00015df0(f32 arg0, Mtxf *matrix); void func00015e24(f32 mult, f32 *matrix); -u32 func00015e4c(void); +void func00015e4c(f32 arg0, Mtxf *matrix); void func00015e80(f32 mult, f32 *matrix); u32 func00015ea8(void); void func00015edc(f32 mult, Mtxf *matrix);