diff --git a/src/game/game_000880.c b/src/game/game_000880.c
index 493167965..bcc745d8a 100644
--- a/src/game/game_000880.c
+++ b/src/game/game_000880.c
@@ -14,6 +14,6 @@
 
 void func0f000880(void)
 {
-	func000500e4(&var800a3448, 0.1, 0.1, 0.1);
-	func000500e4(&var800a3488, 0.2, 0.2, 0.2);
+	guScale(&var800a3448, 0.1, 0.1, 0.1);
+	guScale(&var800a3488, 0.2, 0.2, 0.2);
 }
diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c
index 5c32c6353..044bf49f9 100644
--- a/src/gvars/gvars.c
+++ b/src/gvars/gvars.c
@@ -14735,38 +14735,8 @@ u32 var800a3438 = 0;
 u32 var800a343c = 0;
 struct smoke *g_Smokes = NULL;
 s32 g_MaxSmokes = 0;
-u32 var800a3448 = 0;
-u32 var800a344c = 0;
-u32 var800a3450 = 0;
-u32 var800a3454 = 0;
-u32 var800a3458 = 0;
-u32 var800a345c = 0;
-u32 var800a3460 = 0;
-u32 var800a3464 = 0;
-u32 var800a3468 = 0;
-u32 var800a346c = 0;
-u32 var800a3470 = 0;
-u32 var800a3474 = 0;
-u32 var800a3478 = 0;
-u32 var800a347c = 0;
-u32 var800a3480 = 0;
-u32 var800a3484 = 0;
-u32 var800a3488 = 0;
-u32 var800a348c = 0;
-u32 var800a3490 = 0;
-u32 var800a3494 = 0;
-u32 var800a3498 = 0;
-u32 var800a349c = 0;
-u32 var800a34a0 = 0;
-u32 var800a34a4 = 0;
-u32 var800a34a8 = 0;
-u32 var800a34ac = 0;
-u32 var800a34b0 = 0;
-u32 var800a34b4 = 0;
-u32 var800a34b8 = 0;
-u32 var800a34bc = 0;
-u32 var800a34c0 = 0;
-u32 var800a34c4 = 0;
+Mtx var800a3448 = {0};
+Mtx var800a3488 = {0};
 u32 var800a34c8 = 0;
 u32 var800a34cc = 0;
 struct spark g_Sparks[100] = {0};
diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h
index cf96d54b0..8caf69700 100644
--- a/src/include/gvars/gvars.h
+++ b/src/include/gvars/gvars.h
@@ -665,8 +665,8 @@ extern struct explosion *g_Explosions;
 extern s32 g_MaxExplosions;
 extern struct smoke *g_Smokes;
 extern s32 g_MaxSmokes;
-extern u32 var800a3448;
-extern u32 var800a3488;
+extern Mtx var800a3448;
+extern Mtx var800a3488;
 extern struct spark g_Sparks[100];
 extern u32 g_NextSparkIndex;
 extern struct sparkgroup g_SparkGroups[];
diff --git a/src/include/lib/lib_50090.h b/src/include/lib/lib_50090.h
index b90947a97..7685d83ff 100644
--- a/src/include/lib/lib_50090.h
+++ b/src/include/lib/lib_50090.h
@@ -3,6 +3,4 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func000500e4(u32 *ptr, f32 arg1, f32 arg2, f32 arg3);
-
 #endif
diff --git a/src/lib/lib_50090.c b/src/lib/lib_50090.c
index 9c2e8aa0d..05b8fd089 100644
--- a/src/lib/lib_50090.c
+++ b/src/lib/lib_50090.c
@@ -1,16 +1,4 @@
 #include <ultra64.h>
-#include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
-#include "gvars/gvars.h"
-#include "lib/lib_4a360.h"
-#include "lib/lib_50090.h"
-#include "types.h"
 
 void guScaleF(float mf[4][4], float x, float y, float z)
 {
@@ -23,7 +11,7 @@ void guScaleF(float mf[4][4], float x, float y, float z)
 }
 
 GLOBAL_ASM(
-glabel func000500e4
+glabel guScale
 /*    500e4:	44856000 */ 	mtc1	$a1,$f12
 /*    500e8:	44867000 */ 	mtc1	$a2,$f14
 /*    500ec:	44878000 */ 	mtc1	$a3,$f16
@@ -44,3 +32,13 @@ glabel func000500e4
 /*    50128:	00000000 */ 	nop
 /*    5012c:	00000000 */ 	nop
 );
+
+// Mismatch: Goal moves a3 to f16, while this stores it in the stack.
+//void guScale(Mtx *m, float x, float y, float z)
+//{
+//	f32 mf[4][4];
+//
+//	guScaleF(mf, x, y, z);
+//
+//	guMtxF2L(mf, m);
+//}