From 144fbcec73dc100a569542d91f68655863f157f5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 5 Sep 2021 21:41:23 +1000 Subject: [PATCH] Decompile func00016784 --- src/include/lib/lib_16110.h | 2 +- src/include/types.h | 2 +- src/lib/lib_16110.c | 12 ++++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/include/lib/lib_16110.h b/src/include/lib/lib_16110.h index d774fe729..5e42322a3 100644 --- a/src/include/lib/lib_16110.h +++ b/src/include/lib/lib_16110.h @@ -19,7 +19,7 @@ void func000166dc(struct coord *pos, Mtxf *matrix); u32 func00016710(void); void func00016748(f32 arg0); u32 func00016760(void); -u32 func00016784(void); +void func00016784(void); void func00016798(Mtxf *arg0, Mtxf *arg1); void func00016820(Mtx *arg0, Mtx *arg1); void func00016874(Mtxf *matrix, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz); diff --git a/src/include/types.h b/src/include/types.h index 7488631c3..0f3323ee2 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -246,7 +246,7 @@ struct g_vars { /*000504*/ u32 unk000504; /*000508*/ u32 unk000508; /*00050c*/ u32 unk00050c; - /*000510*/ u32 unk000510; + /*000510*/ f32 unk000510; /*000514*/ u32 unk000514; /*000518*/ u32 unk000518; /*00051c*/ u32 unk00051c; diff --git a/src/lib/lib_16110.c b/src/lib/lib_16110.c index 97ed3e374..a4c658484 100644 --- a/src/lib/lib_16110.c +++ b/src/lib/lib_16110.c @@ -400,14 +400,10 @@ glabel func00016760 /* 16780: e4460000 */ swc1 $f6,0x0($v0) ); -GLOBAL_ASM( -glabel func00016784 -/* 16784: 3c01800a */ lui $at,%hi(g_Vars+0x510) -/* 16788: c424a4d0 */ lwc1 $f4,%lo(g_Vars+0x510)($at) -/* 1678c: 3c018006 */ lui $at,%hi(var8005ef10) -/* 16790: 03e00008 */ jr $ra -/* 16794: e424ef10 */ swc1 $f4,%lo(var8005ef10)($at) -); +void func00016784(void) +{ + var8005ef10[0] = g_Vars.unk000510; +} GLOBAL_ASM( glabel func00016798