diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc
index 9d3e1b900..6c38b172b 100644
--- a/ld/gamefiles.inc
+++ b/ld/gamefiles.inc
@@ -82,7 +82,7 @@
 	build/ROMID/game/objectives/objectives.o (section); \
 	build/ROMID/game/game_096360.o (section); \
 	build/ROMID/game/game_096700.o (section); \
-	build/ROMID/game/game_096750.o (section); \
+	build/ROMID/game/atan2f.o (section); \
 	build/ROMID/game/game_096890.o (section); \
 	build/ROMID/game/game_0969d0.o (section); \
 	build/ROMID/game/game_096b20.o (section); \
diff --git a/src/game/game_096750.c b/src/game/atan2f.c
similarity index 66%
rename from src/game/game_096750.c
rename to src/game/atan2f.c
index 9ebb97be7..6284ba75c 100644
--- a/src/game/game_096750.c
+++ b/src/game/atan2f.c
@@ -1,17 +1,8 @@
 #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 "game/game_0969d0.h"
-#include "gvars/gvars.h"
 #include "types.h"
 
-f32 func0f096750(f32 x, f32 z)
+f32 atan2f(f32 x, f32 z)
 {
 	f32 result;
 
diff --git a/src/game/bondmove.c b/src/game/bondmove.c
index 7c5d6b6f6..6f1022a6b 100644
--- a/src/game/bondmove.c
+++ b/src/game/bondmove.c
@@ -16,7 +16,7 @@
 #include "game/game_005fd0.h"
 #include "game/chr/chr.h"
 #include "game/prop.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0fd0.h"
@@ -585,7 +585,7 @@ glabel var7f1ad8b4
 /*  f0c88ac:	8dcea244 */ 	lw	$t6,%lo(g_Vars+0x284)($t6)
 /*  f0c88b0:	4600a386 */ 	mov.s	$f14,$f20
 /*  f0c88b4:	c5c80078 */ 	lwc1	$f8,0x78($t6)
-/*  f0c88b8:	0fc259d4 */ 	jal	func0f096750
+/*  f0c88b8:	0fc259d4 */ 	jal	atan2f
 /*  f0c88bc:	46089301 */ 	sub.s	$f12,$f18,$f8
 /*  f0c88c0:	46160282 */ 	mul.s	$f10,$f0,$f22
 /*  f0c88c4:	3c017f1b */ 	lui	$at,%hi(var7f1ad8b0)
diff --git a/src/game/bondview.c b/src/game/bondview.c
index c5d3ee7dd..9ec2f62ce 100644
--- a/src/game/bondview.c
+++ b/src/game/bondview.c
@@ -9,7 +9,7 @@
 #include "game/data/data_02da90.h"
 #include "game/dlights.h"
 #include "game/game_005fd0.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0d4690.h"
 #include "game/game_11f000.h"
 #include "game/bondview.h"
@@ -7114,7 +7114,7 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 		{'n', '\0', '\0'},
 	};
 
-	s32 turnangle = func0f096750(-lookx, lookz) * 180.0f / M_PI;
+	s32 turnangle = atan2f(-lookx, lookz) * 180.0f / M_PI;
 	f32 fovy;
 	char arrows[12];
 	s32 tmplensheight = 130;
diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c
index 8dbee22f7..92b19fbf7 100644
--- a/src/game/chr/chraction.c
+++ b/src/game/chr/chraction.c
@@ -18,7 +18,7 @@
 #include "game/prop.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0969d0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"
@@ -521,8 +521,8 @@ bool chrFaceCover(struct chrdata *chr)
 	chr->act_stand.unk038 = 0;
 	chr->act_stand.face_entitytype = ENTITYTYPE_DIRECTION;
 	chr->act_stand.unk03c = 1;
-	//chr->act_stand.face_entityid = func0f096750(-cover.look->x, -cover.look->z) * (0x4000 / BADDEG2RAD(90));
-	chr->act_stand.face_entityid = func0f096750(-cover.look->x, -cover.look->z) * 10432.039f;
+	//chr->act_stand.face_entityid = atan2f(-cover.look->x, -cover.look->z) * (0x4000 / BADDEG2RAD(90));
+	chr->act_stand.face_entityid = atan2f(-cover.look->x, -cover.look->z) * 10432.039f;
 
 	return true;
 }
@@ -4420,7 +4420,7 @@ glabel var7f1a8d5c
 /*  f0332ac:	c4aa0008 */ 	lwc1	$f10,0x8($a1)
 /*  f0332b0:	c4a60000 */ 	lwc1	$f6,0x0($a1)
 /*  f0332b4:	460a4381 */ 	sub.s	$f14,$f8,$f10
-/*  f0332b8:	0fc259d4 */ 	jal	func0f096750
+/*  f0332b8:	0fc259d4 */ 	jal	atan2f
 /*  f0332bc:	46062301 */ 	sub.s	$f12,$f4,$f6
 /*  f0332c0:	8fa20058 */ 	lw	$v0,0x58($sp)
 /*  f0332c4:	8fa50064 */ 	lw	$a1,0x64($sp)
@@ -8386,7 +8386,7 @@ void chrGoPosInitCheap(struct chrdata *chr, struct waydata *waydata, struct coor
 	f32 xdiff1 = padpos->x - chr->prop->pos.x;
 	f32 zdiff1 = padpos->z - chr->prop->pos.z;
 
-	f32 angle = func0f096750(xdiff1, zdiff1);
+	f32 angle = atan2f(xdiff1, zdiff1);
 
 	f32 xdiff2 = padpos->x - chrpos->x;
 	f32 zdiff2 = padpos->z - chrpos->z;
@@ -8868,7 +8868,7 @@ glabel var7f1a8dac
 /*  f0378b0:	c5e40008 */ 	lwc1	$f4,0x8($t7)
 /*  f0378b4:	c5e80010 */ 	lwc1	$f8,0x10($t7)
 /*  f0378b8:	46062301 */ 	sub.s	$f12,$f4,$f6
-/*  f0378bc:	0fc259d4 */ 	jal	func0f096750
+/*  f0378bc:	0fc259d4 */ 	jal	atan2f
 /*  f0378c0:	46104381 */ 	sub.s	$f14,$f8,$f16
 /*  f0378c4:	44050000 */ 	mfc1	$a1,$f0
 /*  f0378c8:	0fc0f94e */ 	jal	func0f03e538
@@ -10215,7 +10215,7 @@ bool chrHasLineOfSightToPos(struct chrdata *viewerchr, struct coord *pos, s16 *r
 bool chrCanSeePos(struct chrdata *chr, struct coord *pos, s16 *rooms)
 {
 	f32 facingangle = chrGetInverseTheta(chr);
-	f32 posangle = func0f096750(pos->x - chr->prop->pos.x, pos->z - chr->prop->pos.z);
+	f32 posangle = atan2f(pos->x - chr->prop->pos.x, pos->z - chr->prop->pos.z);
 	f32 diffangle = posangle - facingangle;
 
 	if (posangle < facingangle) {
@@ -10308,7 +10308,7 @@ bool chrCheckTargetInSight(struct chrdata *chr)
 	f32 y = target->pos.y - prop->pos.y;
 	f32 z = target->pos.z - prop->pos.z;
 
-	f32 fVar6 = func0f096750(x, z);
+	f32 fVar6 = atan2f(x, z);
 	f32 angle = fVar6 - fVar5;
 	bool result = false;
 
@@ -10410,7 +10410,7 @@ bool chrTrySidestep(struct chrdata *chr)
 		struct prop *prop = chr->prop;
 		struct prop *target = chrGetTargetProp(chr);
 		f32 a = chrGetInverseTheta(chr);
-		f32 b = func0f096750(target->pos.x - prop->pos.x, target->pos.z - prop->pos.z);
+		f32 b = atan2f(target->pos.x - prop->pos.x, target->pos.z - prop->pos.z);
 		f32 angle = b - a;
 		u32 stack[2];
 
@@ -10444,7 +10444,7 @@ bool chrTryJumpOut(struct chrdata *chr)
 		struct prop *target = chrGetTargetProp(chr);
 
 		f32 a = chrGetInverseTheta(chr);
-		f32 b = func0f096750(target->pos.x - prop->pos.x, target->pos.z - prop->pos.z);
+		f32 b = atan2f(target->pos.x - prop->pos.x, target->pos.z - prop->pos.z);
 		f32 angle = b - a;
 		u32 stack[2];
 
@@ -14388,7 +14388,7 @@ glabel var7f1a8fc8
 /*  f03f1ac:	0c012974 */ 	jal	sqrtf
 /*  f03f1b0:	46043300 */ 	add.s	$f12,$f6,$f4
 /*  f03f1b4:	c7ac0174 */ 	lwc1	$f12,0x174($sp)
-/*  f03f1b8:	0fc259d4 */ 	jal	func0f096750
+/*  f03f1b8:	0fc259d4 */ 	jal	atan2f
 /*  f03f1bc:	46000386 */ 	mov.s	$f14,$f0
 /*  f03f1c0:	3c017f1b */ 	lui	$at,%hi(var7f1a8f98)
 /*  f03f1c4:	c42a8f98 */ 	lwc1	$f10,%lo(var7f1a8f98)($at)
@@ -14591,7 +14591,7 @@ glabel var7f1a8fc8
 /*  f03f4b0:	e7a80170 */ 	swc1	$f8,0x170($sp)
 /*  f03f4b4:	c7ac0178 */ 	lwc1	$f12,0x178($sp)
 .L0f03f4b8:
-/*  f03f4b8:	0fc259d4 */ 	jal	func0f096750
+/*  f03f4b8:	0fc259d4 */ 	jal	atan2f
 /*  f03f4bc:	c7ae0170 */ 	lwc1	$f14,0x170($sp)
 /*  f03f4c0:	c7a60130 */ 	lwc1	$f6,0x130($sp)
 /*  f03f4c4:	3c017f1b */ 	lui	$at,%hi(var7f1a8fa4)
@@ -15097,7 +15097,7 @@ glabel var7f1a90b4
 /*  f03fb04:	c46a0010 */ 	lwc1	$f10,0x10($v1)
 /*  f03fb08:	e7ac0054 */ 	swc1	$f12,0x54($sp)
 /*  f03fb0c:	460a4381 */ 	sub.s	$f14,$f8,$f10
-/*  f03fb10:	0fc259d4 */ 	jal	func0f096750
+/*  f03fb10:	0fc259d4 */ 	jal	atan2f
 /*  f03fb14:	e7ae004c */ 	swc1	$f14,0x4c($sp)
 /*  f03fb18:	e7a00048 */ 	swc1	$f0,0x48($sp)
 /*  f03fb1c:	0fc0f97c */ 	jal	func0f03e5f0
@@ -18365,7 +18365,7 @@ glabel var7f1a91a0
 void func0f0429d8(struct chrdata *chr, f32 arg1, f32 arg2)
 {
 	struct prop *prop = chrGetTargetProp(chr);
-	f32 distance = func0f096750(prop->pos.x - chr->prop->pos.x, prop->pos.z - chr->prop->pos.z);
+	f32 distance = atan2f(prop->pos.x - chr->prop->pos.x, prop->pos.z - chr->prop->pos.z);
 	f32 value = func0001afe8(arg2, distance, arg1);
 	func0f03e538(chr, value);
 }
@@ -18619,7 +18619,7 @@ glabel var7f1a91dc
 /*  f042d64:	c7c40010 */ 	lwc1	$f4,0x10($s8)
 /*  f042d68:	c7ca0008 */ 	lwc1	$f10,0x8($s8)
 /*  f042d6c:	46062381 */ 	sub.s	$f14,$f4,$f6
-/*  f042d70:	0fc259d4 */ 	jal	func0f096750
+/*  f042d70:	0fc259d4 */ 	jal	atan2f
 /*  f042d74:	46105301 */ 	sub.s	$f12,$f10,$f16
 /*  f042d78:	c7ac00fc */ 	lwc1	$f12,0xfc($sp)
 /*  f042d7c:	3c017f1b */ 	lui	$at,%hi(var7f1a91b8)
@@ -18665,7 +18665,7 @@ glabel var7f1a91dc
 /*  f042e0c:	46123300 */ 	add.s	$f12,$f6,$f18
 /*  f042e10:	c6080004 */ 	lwc1	$f8,0x4($s0)
 /*  f042e14:	46000386 */ 	mov.s	$f14,$f0
-/*  f042e18:	0fc259d4 */ 	jal	func0f096750
+/*  f042e18:	0fc259d4 */ 	jal	atan2f
 /*  f042e1c:	4608a301 */ 	sub.s	$f12,$f20,$f8
 /*  f042e20:	4600f081 */ 	sub.s	$f2,$f30,$f0
 /*  f042e24:	3c017f1b */ 	lui	$at,%hi(var7f1a91c4)
@@ -19669,7 +19669,7 @@ glabel var7f1a9234
 /*  f043f58:	afa0002c */ 	sw	$zero,0x2c($sp)
 /*  f043f5c:	afa40058 */ 	sw	$a0,0x58($sp)
 /*  f043f60:	46062301 */ 	sub.s	$f12,$f4,$f6
-/*  f043f64:	0fc259d4 */ 	jal	func0f096750
+/*  f043f64:	0fc259d4 */ 	jal	atan2f
 /*  f043f68:	460a4381 */ 	sub.s	$f14,$f8,$f10
 /*  f043f6c:	8fa40058 */ 	lw	$a0,0x58($sp)
 /*  f043f70:	0fc0f95e */ 	jal	func0f03e578
@@ -21801,7 +21801,7 @@ glabel var7f1a927c
 /*  f045fa4:	c6260010 */ 	lwc1	$f6,0x10($s1)
 /*  f045fa8:	c604000c */ 	lwc1	$f4,0xc($s0)
 /*  f045fac:	46125301 */ 	sub.s	$f12,$f10,$f18
-/*  f045fb0:	0fc259d4 */ 	jal	func0f096750
+/*  f045fb0:	0fc259d4 */ 	jal	atan2f
 /*  f045fb4:	46062381 */ 	sub.s	$f14,$f4,$f6
 /*  f045fb8:	c6160010 */ 	lwc1	$f22,0x10($s0)
 /*  f045fbc:	c6320008 */ 	lwc1	$f18,0x8($s1)
@@ -21809,7 +21809,7 @@ glabel var7f1a927c
 /*  f045fc4:	c62a0010 */ 	lwc1	$f10,0x10($s1)
 /*  f045fc8:	4612b301 */ 	sub.s	$f12,$f22,$f18
 /*  f045fcc:	46000506 */ 	mov.s	$f20,$f0
-/*  f045fd0:	0fc259d4 */ 	jal	func0f096750
+/*  f045fd0:	0fc259d4 */ 	jal	atan2f
 /*  f045fd4:	460a8381 */ 	sub.s	$f14,$f16,$f10
 /*  f045fd8:	4600a581 */ 	sub.s	$f22,$f20,$f0
 /*  f045fdc:	c612001c */ 	lwc1	$f18,0x1c($s0)
@@ -21818,7 +21818,7 @@ glabel var7f1a927c
 /*  f045fe8:	c6280010 */ 	lwc1	$f8,0x10($s1)
 /*  f045fec:	46109301 */ 	sub.s	$f12,$f18,$f16
 /*  f045ff0:	e7b600d0 */ 	swc1	$f22,0xd0($sp)
-/*  f045ff4:	0fc259d4 */ 	jal	func0f096750
+/*  f045ff4:	0fc259d4 */ 	jal	atan2f
 /*  f045ff8:	46085381 */ 	sub.s	$f14,$f10,$f8
 /*  f045ffc:	c7b000d0 */ 	lwc1	$f16,0xd0($sp)
 /*  f046000:	4600a301 */ 	sub.s	$f12,$f20,$f0
@@ -21890,7 +21890,7 @@ glabel var7f1a927c
 /*  f0460ec:	c60a0018 */ 	lwc1	$f10,0x18($s0)
 /*  f0460f0:	c6320010 */ 	lwc1	$f18,0x10($s1)
 /*  f0460f4:	46083301 */ 	sub.s	$f12,$f6,$f8
-/*  f0460f8:	0fc259d4 */ 	jal	func0f096750
+/*  f0460f8:	0fc259d4 */ 	jal	atan2f
 /*  f0460fc:	46125381 */ 	sub.s	$f14,$f10,$f18
 /*  f046100:	4600a481 */ 	sub.s	$f18,$f20,$f0
 /*  f046104:	c7b000f4 */ 	lwc1	$f16,0xf4($sp)
@@ -21899,7 +21899,7 @@ glabel var7f1a927c
 /*  f046110:	c6260010 */ 	lwc1	$f6,0x10($s1)
 /*  f046114:	460a8301 */ 	sub.s	$f12,$f16,$f10
 /*  f046118:	e7b200c0 */ 	swc1	$f18,0xc0($sp)
-/*  f04611c:	0fc259d4 */ 	jal	func0f096750
+/*  f04611c:	0fc259d4 */ 	jal	atan2f
 /*  f046120:	46064381 */ 	sub.s	$f14,$f8,$f6
 /*  f046124:	c7b000c0 */ 	lwc1	$f16,0xc0($sp)
 /*  f046128:	4600a301 */ 	sub.s	$f12,$f20,$f0
@@ -21981,7 +21981,7 @@ glabel var7f1a927c
 /*  f046238:	c6080024 */ 	lwc1	$f8,0x24($s0)
 /*  f04623c:	c62a0010 */ 	lwc1	$f10,0x10($s1)
 /*  f046240:	46062301 */ 	sub.s	$f12,$f4,$f6
-/*  f046244:	0fc259d4 */ 	jal	func0f096750
+/*  f046244:	0fc259d4 */ 	jal	atan2f
 /*  f046248:	460a4381 */ 	sub.s	$f14,$f8,$f10
 /*  f04624c:	4600a481 */ 	sub.s	$f18,$f20,$f0
 /*  f046250:	c7b000f4 */ 	lwc1	$f16,0xf4($sp)
@@ -21990,7 +21990,7 @@ glabel var7f1a927c
 /*  f04625c:	c6260010 */ 	lwc1	$f6,0x10($s1)
 /*  f046260:	460a8301 */ 	sub.s	$f12,$f16,$f10
 /*  f046264:	e7b200b0 */ 	swc1	$f18,0xb0($sp)
-/*  f046268:	0fc259d4 */ 	jal	func0f096750
+/*  f046268:	0fc259d4 */ 	jal	atan2f
 /*  f04626c:	46064381 */ 	sub.s	$f14,$f8,$f6
 /*  f046270:	c7b000b0 */ 	lwc1	$f16,0xb0($sp)
 /*  f046274:	4600a301 */ 	sub.s	$f12,$f20,$f0
@@ -24047,7 +24047,7 @@ f32 chrGetAngleToPos(struct chrdata *chr, struct coord *pos)
 	}
 
 	prop = chr->prop;
-	fVar2 = func0f096750(pos->x - prop->pos.x, pos->z - prop->pos.z);
+	fVar2 = atan2f(pos->x - prop->pos.x, pos->z - prop->pos.z);
 	fVar4 = fVar2 - fVar3;
 
 	if (fVar2 < fVar3) {
@@ -24186,7 +24186,7 @@ glabel var7f1a9334
 /*  f048d04:	e7a20034 */ 	swc1	$f2,0x34($sp)
 /*  f048d08:	afa2002c */ 	sw	$v0,0x2c($sp)
 /*  f048d0c:	46062301 */ 	sub.s	$f12,$f4,$f6
-/*  f048d10:	0fc259d4 */ 	jal	func0f096750
+/*  f048d10:	0fc259d4 */ 	jal	atan2f
 /*  f048d14:	460a4381 */ 	sub.s	$f14,$f8,$f10
 /*  f048d18:	8fa5002c */ 	lw	$a1,0x2c($sp)
 /*  f048d1c:	24010006 */ 	addiu	$at,$zero,0x6
@@ -24255,7 +24255,7 @@ f32 chrGetVerticalAngleToTarget(struct chrdata *chr)
 		ydiff = prop->pos.y - target->pos.y;
 		zdiff = prop->pos.z - target->pos.z;
 
-		result = func0f096750(ydiff, sqrtf(xdiff * xdiff + zdiff * zdiff));
+		result = atan2f(ydiff, sqrtf(xdiff * xdiff + zdiff * zdiff));
 
 		if (result < 0) {
 			result += M_BADTAU;
@@ -24299,7 +24299,7 @@ f32 func0f048fcc(struct chrdata *chr, u8 arg1)
 	f32 xdiff = chrprop->pos.x - targetprop->pos.x;
 	f32 zdiff = chrprop->pos.z - targetprop->pos.z;
 
-	f32 angle1 = func0f096750(-xdiff, -zdiff);
+	f32 angle1 = atan2f(-xdiff, -zdiff);
 	f32 angle2 = chrGetInverseTheta(chr) + M_PI * (s32)arg1;
 
 	result = angle1 - angle2;
@@ -24960,7 +24960,7 @@ glabel var7f1a93ec
 /*  f04a300:	c4460000 */ 	lwc1	$f6,0x0($v0)
 /*  f04a304:	c44a0008 */ 	lwc1	$f10,0x8($v0)
 /*  f04a308:	46062301 */ 	sub.s	$f12,$f4,$f6
-/*  f04a30c:	0fc259d4 */ 	jal	func0f096750
+/*  f04a30c:	0fc259d4 */ 	jal	atan2f
 /*  f04a310:	460a4381 */ 	sub.s	$f14,$f8,$f10
 /*  f04a314:	c7ae0088 */ 	lwc1	$f14,0x88($sp)
 /*  f04a318:	3c017f1b */ 	lui	$at,%hi(var7f1a93e4)
@@ -25922,7 +25922,7 @@ struct prop *chrSpawnAtPad(struct chrdata *basechr, s32 body, s32 head, s32 pad_
 	s16 room[2];
 	f32 fvalue;
 	padUnpack(resolved_pad_id, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad);
-	fvalue = func0f096750(pad.look.x, pad.look.z);
+	fvalue = atan2f(pad.look.x, pad.look.z);
 	room[0] = pad.room;
 	room[1] = -1;
 
@@ -26799,7 +26799,7 @@ glabel var7f1a9428
 /*  f04c808:	c44a0008 */ 	lwc1	$f10,0x8($v0)
 /*  f04c80c:	e7b00024 */ 	swc1	$f16,0x24($sp)
 /*  f04c810:	46062301 */ 	sub.s	$f12,$f4,$f6
-/*  f04c814:	0fc259d4 */ 	jal	func0f096750
+/*  f04c814:	0fc259d4 */ 	jal	atan2f
 /*  f04c818:	460a4381 */ 	sub.s	$f14,$f8,$f10
 /*  f04c81c:	3c0143b4 */ 	lui	$at,0x43b4
 /*  f04c820:	44817000 */ 	mtc1	$at,$f14
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index c56068092..8c03197fb 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -23,7 +23,7 @@
 #include "game/game_091e10.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0fd0.h"
 #include "game/game_0b28d0.h"
@@ -5341,7 +5341,7 @@ bool aiChrMoveToPad(void)
 
 			if (padnum >= 0) {
 				padUnpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad);
-				somefloat = func0f096750(pad.look.x, pad.look.z);
+				somefloat = atan2f(pad.look.x, pad.look.z);
 
 				rooms[0] = pad.room;
 				rooms[1] = -1;
diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c
index 17d6870c7..175194fef 100644
--- a/src/game/game_006bd0.c
+++ b/src/game/game_006bd0.c
@@ -15,7 +15,7 @@
 #include "game/chr/chraction.h"
 #include "game/prop.h"
 #include "game/game_095320.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0b3350.h"
 #include "game/game_0d4690.h"
 #include "game/room.h"
diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c
index 5ab5d59df..59d42cf3c 100644
--- a/src/game/game_00c490.c
+++ b/src/game/game_00c490.c
@@ -23,7 +23,7 @@
 #include "game/game_02cde0.h"
 #include "game/prop.h"
 #include "game/game_091e10.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/inventory/inventory.h"
 #include "game/game_127910.h"
 #include "game/room.h"
@@ -1618,8 +1618,8 @@ void setupCamera(struct cameraobj *camera, s32 cmdindex)
 		camera->maxdist = *(s32 *)&camera->maxdist;
 		camera->yrot = camera->yleft;
 
-		camera->yzero = func0f096750(xdiff, zdiff);
-		camera->xzero = M_BADTAU - func0f096750(ydiff, sqrtf(xdiff * xdiff + zdiff * zdiff));
+		camera->yzero = atan2f(xdiff, zdiff);
+		camera->xzero = M_BADTAU - atan2f(ydiff, sqrtf(xdiff * xdiff + zdiff * zdiff));
 
 		if (xdiff || zdiff) {
 			// empty
@@ -1669,8 +1669,8 @@ void setupAutogun(struct autogunobj *autogun, s32 cmdindex)
 		ydiff = pad.pos.y - autogun->base.prop->pos.y;
 		zdiff = pad.pos.z - autogun->base.prop->pos.z;
 
-		autogun->angleh = func0f096750(xdiff, zdiff);
-		autogun->anglev = func0f096750(ydiff, sqrtf(xdiff * xdiff + zdiff * zdiff));
+		autogun->angleh = atan2f(xdiff, zdiff);
+		autogun->anglev = atan2f(ydiff, sqrtf(xdiff * xdiff + zdiff * zdiff));
 	} else if (autogun->base.modelnum == MODEL_CETROOFGUN) {
 		// Deep Sea roofgun
 		autogun->anglev = -1.5705462694168f;
@@ -2364,7 +2364,7 @@ void setupHov(struct defaultobj *obj, struct hov *hov)
 	hov->unk04 = 0;
 	hov->unk08 = 0;
 	hov->unk0c = 0;
-	hov->unk10 = func0f096750(obj->realrot[6], obj->realrot[8]);
+	hov->unk10 = atan2f(obj->realrot[6], obj->realrot[8]);
 	hov->unk14 = 0;
 	hov->unk18 = 0;
 	hov->unk1c = 0;
diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c
index 5729c59f0..4515b7463 100644
--- a/src/game/game_02cde0.c
+++ b/src/game/game_02cde0.c
@@ -12,7 +12,7 @@
 #include "game/chr/chr.h"
 #include "game/game_02cde0.h"
 #include "game/prop.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0b28d0.h"
 #include "game/core.h"
 #include "game/game_1a7560.h"
@@ -602,7 +602,7 @@ glabel chrUnpack
 .L0f02d70c:
 /*  f02d70c:	10400122 */ 	beqz	$v0,.L0f02db98
 /*  f02d710:	c7ac0070 */ 	lwc1	$f12,0x70($sp)
-/*  f02d714:	0fc259d4 */ 	jal	func0f096750
+/*  f02d714:	0fc259d4 */ 	jal	atan2f
 /*  f02d718:	c7ae0078 */ 	lwc1	$f14,0x78($sp)
 /*  f02d71c:	e7a00044 */ 	swc1	$f0,0x44($sp)
 /*  f02d720:	0c006134 */ 	jal	ailistFindById
diff --git a/src/game/game_092610.c b/src/game/game_092610.c
index f5c95de15..1eaa9f754 100644
--- a/src/game/game_092610.c
+++ b/src/game/game_092610.c
@@ -10,7 +10,7 @@
 #include "game/data/data_02da90.h"
 #include "game/dlights.h"
 #include "game/game_092610.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/hudmsg.h"
 #include "game/file.h"
 #include "game/core.h"
@@ -2509,7 +2509,7 @@ glabel var7f1ab768
 /*  f094bc4:	c4461bb0 */ 	lwc1	$f6,0x1bb0($v0)
 /*  f094bc8:	24421bb0 */ 	addiu	$v0,$v0,0x1bb0
 /*  f094bcc:	460a4381 */ 	sub.s	$f14,$f8,$f10
-/*  f094bd0:	0fc259d4 */ 	jal	func0f096750
+/*  f094bd0:	0fc259d4 */ 	jal	atan2f
 /*  f094bd4:	46062301 */ 	sub.s	$f12,$f4,$f6
 /*  f094bd8:	3c014334 */ 	lui	$at,0x4334
 /*  f094bdc:	44812000 */ 	mtc1	$at,$f4
@@ -2556,7 +2556,7 @@ glabel var7f1ab768
 /*  f094c7c:	46000386 */ 	mov.s	$f14,$f0
 /*  f094c80:	46000387 */ 	neg.s	$f14,$f0
 .L0f094c84:
-/*  f094c84:	0fc259d4 */ 	jal	func0f096750
+/*  f094c84:	0fc259d4 */ 	jal	atan2f
 /*  f094c88:	e7b0003c */ 	swc1	$f16,0x3c($sp)
 /*  f094c8c:	c7b0003c */ 	lwc1	$f16,0x3c($sp)
 /*  f094c90:	44809000 */ 	mtc1	$zero,$f18
diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c
index 302c738df..9f18e7644 100644
--- a/src/game/game_0b3350.c
+++ b/src/game/game_0b3350.c
@@ -7,7 +7,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0b3350.h"
 #include "game/game_127910.h"
 #include "game/room.h"
@@ -1602,7 +1602,7 @@ void currentPlayerSetPerspective(f32 near, f32 fovy, f32 aspect)
 
 f32 func0f0b49b8(f32 arg0)
 {
-	f32 result = func0f096750(g_Vars.currentplayer->c_scalelod60 * arg0 * g_Vars.currentplayer->c_halfheight, 1.0f);
+	f32 result = atan2f(g_Vars.currentplayer->c_scalelod60 * arg0 * g_Vars.currentplayer->c_halfheight, 1.0f);
 	result *= 114.591552f;
 
 	if (result < 0) {
diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c
index 807b584bf..27108bc66 100644
--- a/src/game/game_0b63b0.c
+++ b/src/game/game_0b63b0.c
@@ -19,7 +19,7 @@
 #include "game/prop.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"
diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c
index f0fd815b5..53951efb3 100644
--- a/src/game/game_0b69d0.c
+++ b/src/game/game_0b69d0.c
@@ -19,7 +19,7 @@
 #include "game/prop.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"
@@ -291,7 +291,7 @@ f32 playerChooseSpawnLocation(f32 chrwidth, struct coord *dstpos, s16 *dstrooms,
 			slpositions[sllen].y = pad.pos.y;
 			slpositions[sllen].z = pad.pos.z;
 
-			slangles[sllen] = func0f096750(pad.look.x, pad.look.z);
+			slangles[sllen] = atan2f(pad.look.x, pad.look.z);
 
 			if (func0f04af84(chrwidth, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) {
 				slpadindexes[sllen] = p;
@@ -323,7 +323,7 @@ f32 playerChooseSpawnLocation(f32 chrwidth, struct coord *dstpos, s16 *dstrooms,
 			slpositions[sllen].y = pad.pos.y;
 			slpositions[sllen].z = pad.pos.z;
 
-			slangles[sllen] = func0f096750(pad.look.x, pad.look.z);
+			slangles[sllen] = atan2f(pad.look.x, pad.look.z);
 
 			if (func0f04af84(chrwidth, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) {
 				slpadindexes[sllen] = p;
@@ -377,7 +377,7 @@ f32 playerChooseSpawnLocation(f32 chrwidth, struct coord *dstpos, s16 *dstrooms,
 		slpositions[sllen].y = pad.pos.y;
 		slpositions[sllen].z = pad.pos.z;
 
-		slangles[sllen] = func0f096750(pad.look.x, pad.look.z);
+		slangles[sllen] = atan2f(pad.look.x, pad.look.z);
 
 		if (func0f04af84(chrwidth, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) {
 			slpadindexes[sllen] = i;
@@ -409,7 +409,7 @@ f32 playerChooseSpawnLocation(f32 chrwidth, struct coord *dstpos, s16 *dstrooms,
 		dstpos->y = pad.pos.y;
 		dstpos->z = pad.pos.z;
 
-		dstangle = func0f096750(pad.look.x, pad.look.z);
+		dstangle = atan2f(pad.look.x, pad.look.z);
 	}
 
 	return dstangle;
@@ -2840,7 +2840,7 @@ void func0f0ba190(u32 arg0)
 	func00024050(0, 0, &stagethinglist_221b4, g_CameraAnimNum, sp7f, &sp94, &sp88, &sp7c);
 	func0001648c(&sp94, &sp38);
 
-	theta = func0f096750(-sp38.m[2][0], -sp38.m[2][2]);
+	theta = atan2f(-sp38.m[2][0], -sp38.m[2][2]);
 	theta = (M_BADTAU - theta) * 57.304901123047f;
 	g_Vars.bond->vv_theta = theta;
 
@@ -6542,7 +6542,7 @@ glabel var7f1ad6ac
 /*  f0bf618:	460a4301 */ 	sub.s	$f12,$f8,$f10
 /*  f0bf61c:	46062381 */ 	sub.s	$f14,$f4,$f6
 /*  f0bf620:	e7ac00d8 */ 	swc1	$f12,0xd8($sp)
-/*  f0bf624:	0fc259d4 */ 	jal	func0f096750
+/*  f0bf624:	0fc259d4 */ 	jal	atan2f
 /*  f0bf628:	e7ae00d4 */ 	swc1	$f14,0xd4($sp)
 /*  f0bf62c:	3c017f1b */ 	lui	$at,%hi(var7f1ad694)
 /*  f0bf630:	c436d694 */ 	lwc1	$f22,%lo(var7f1ad694)($at)
@@ -6562,7 +6562,7 @@ glabel var7f1ad6ac
 /*  f0bf664:	8e700284 */ 	lw	$s0,0x284($s3)
 .L0f0bf668:
 /*  f0bf668:	c60c036c */ 	lwc1	$f12,0x36c($s0)
-/*  f0bf66c:	0fc259d4 */ 	jal	func0f096750
+/*  f0bf66c:	0fc259d4 */ 	jal	atan2f
 /*  f0bf670:	c60e0374 */ 	lwc1	$f14,0x374($s0)
 /*  f0bf674:	4600b03c */ 	c.lt.s	$f22,$f0
 /*  f0bf678:	44804000 */ 	mtc1	$zero,$f8
@@ -7747,7 +7747,7 @@ glabel var7f1ad6ac
 //
 //						sp216 = pad.pos.x - g_Vars.currentplayer->bond2.unk10.x;
 //						sp212 = pad.pos.z - g_Vars.currentplayer->bond2.unk10.z;
-//						fVar20 = func0f096750(sp216, sp212);
+//						fVar20 = atan2f(sp216, sp212);
 //
 //						if (fVar20 > M_TAU) {
 //							fVar20 -= M_TAU;
@@ -7758,7 +7758,7 @@ glabel var7f1ad6ac
 //						}
 //
 //						fVar22 = M_TAU;
-//						fVar18 = func0f096750(g_Vars.currentplayer->bond2.unk00.x, g_Vars.currentplayer->bond2.unk00.z);
+//						fVar18 = atan2f(g_Vars.currentplayer->bond2.unk00.x, g_Vars.currentplayer->bond2.unk00.z);
 //
 //						if (fVar18 > fVar22) {
 //							fVar18 -= fVar22;
@@ -8526,7 +8526,7 @@ Gfx *currentPlayerUpdateShootRot(Gfx *gdl)
 
 	value = sqrtf(sp3c.z * sp3c.z + sp3c.x * sp3c.x);
 
-	rotx = func0f096750(y, value);
+	rotx = atan2f(y, value);
 	rotx += (g_Vars.currentplayer->vv_verta * M_BADTAU) / 360.0f;
 
 	if (rotx >= M_PI) {
@@ -8535,7 +8535,7 @@ Gfx *currentPlayerUpdateShootRot(Gfx *gdl)
 
 	g_Vars.currentplayer->shootrotx = rotx;
 
-	roty = func0f096750(-sp3c.x, -sp3c.z);
+	roty = atan2f(-sp3c.x, -sp3c.z);
 
 	if (roty >= M_PI) {
 		roty -= M_BADTAU;
@@ -9415,7 +9415,7 @@ void currentPlayerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z)
 {
 	if (g_Vars.normmplayerisrunning) {
 		s32 victimplayernum = g_Vars.currentplayernum;
-		f32 angle = func0f096750(x, z);
+		f32 angle = atan2f(x, z);
 		f32 finalangle = g_Vars.players[victimplayernum]->vv_theta - (360.0f - RAD2DEG(angle));
 
 		if (finalangle < 0) {
@@ -10835,7 +10835,7 @@ glabel var7f1ad744
 /*  f0c2e74:	01cf1021 */ 	addu	$v0,$t6,$t7
 .L0f0c2e78:
 /*  f0c2e78:	afa50038 */ 	sw	$a1,0x38($sp)
-/*  f0c2e7c:	0fc259d4 */ 	jal	func0f096750
+/*  f0c2e7c:	0fc259d4 */ 	jal	atan2f
 /*  f0c2e80:	e7b00020 */ 	swc1	$f16,0x20($sp)
 /*  f0c2e84:	3c017f1b */ 	lui	$at,%hi(var7f1ad718)
 /*  f0c2e88:	c42ed718 */ 	lwc1	$f14,%lo(var7f1ad718)($at)
diff --git a/src/game/game_150820.c b/src/game/game_150820.c
index 23988faee..37c39cf23 100644
--- a/src/game/game_150820.c
+++ b/src/game/game_150820.c
@@ -9,7 +9,7 @@
 #include "game/data/data_02da90.h"
 #include "game/dlights.h"
 #include "game/game_092610.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0b3350.h"
 #include "game/game_150820.h"
 #include "game/file.h"
@@ -118,7 +118,7 @@ glabel func0f150820
 /*  f150964:	4600e702 */ 	mul.s	$f28,$f28,$f0
 /*  f150968:	e7b000c8 */ 	swc1	$f16,0xc8($sp)
 /*  f15096c:	c64e0008 */ 	lwc1	$f14,0x8($s2)
-/*  f150970:	0fc259d4 */ 	jal	func0f096750
+/*  f150970:	0fc259d4 */ 	jal	atan2f
 /*  f150974:	c64c0000 */ 	lwc1	$f12,0x0($s2)
 /*  f150978:	3c0e800a */ 	lui	$t6,%hi(var800a45c0)
 /*  f15097c:	8dce45c0 */ 	lw	$t6,%lo(var800a45c0)($t6)
diff --git a/src/game/game_190260.c b/src/game/game_190260.c
index 7ee64b3fc..b77a321ad 100644
--- a/src/game/game_190260.c
+++ b/src/game/game_190260.c
@@ -12,7 +12,7 @@
 #include "game/chr/chr.h"
 #include "game/prop.h"
 #include "game/game_092610.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0fd0.h"
 #include "game/game_0b69d0.h"
@@ -1493,7 +1493,7 @@ glabel var7f1b8ec8
 /*  f191804:	c44a0010 */ 	lwc1	$f10,0x10($v0)
 /*  f191808:	e7a0001c */ 	swc1	$f0,0x1c($sp)
 /*  f19180c:	46062301 */ 	sub.s	$f12,$f4,$f6
-/*  f191810:	0fc259d4 */ 	jal	func0f096750
+/*  f191810:	0fc259d4 */ 	jal	atan2f
 /*  f191814:	460a4381 */ 	sub.s	$f14,$f8,$f10
 /*  f191818:	c7b0001c */ 	lwc1	$f16,0x1c($sp)
 /*  f19181c:	8fa6002c */ 	lw	$a2,0x2c($sp)
diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c
index 8039e99d3..ca39c9713 100644
--- a/src/game/game_19aa80.c
+++ b/src/game/game_19aa80.c
@@ -11,7 +11,7 @@
 #include "game/data/data_02a0e0.h"
 #include "game/data/data_02da90.h"
 #include "game/prop.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_127910.h"
 #include "game/mplayer/setup.h"
 #include "game/game_190260.h"
@@ -311,7 +311,7 @@ glabel func0f19ab70
 /*  f19ae3c:	e5e80008 */ 	swc1	$f8,0x8($t7)
 /*  f19ae40:	8fb8015c */ 	lw	$t8,0x15c($sp)
 /*  f19ae44:	c70c0008 */ 	lwc1	$f12,0x8($t8)
-/*  f19ae48:	0fc259d4 */ 	jal	func0f096750
+/*  f19ae48:	0fc259d4 */ 	jal	atan2f
 /*  f19ae4c:	c70e0000 */ 	lwc1	$f14,0x0($t8)
 /*  f19ae50:	8fb90220 */ 	lw	$t9,0x220($sp)
 /*  f19ae54:	2408ffff */ 	addiu	$t0,$zero,-1
@@ -339,7 +339,7 @@ glabel func0f19ab70
 /*  f19aea8:	c7b20060 */ 	lwc1	$f18,0x60($sp)
 /*  f19aeac:	e5d20008 */ 	swc1	$f18,0x8($t6)
 /*  f19aeb0:	c7ae0064 */ 	lwc1	$f14,0x64($sp)
-/*  f19aeb4:	0fc259d4 */ 	jal	func0f096750
+/*  f19aeb4:	0fc259d4 */ 	jal	atan2f
 /*  f19aeb8:	c7ac006c */ 	lwc1	$f12,0x6c($sp)
 /*  f19aebc:	8faf0220 */ 	lw	$t7,0x220($sp)
 /*  f19aec0:	2408ffff */ 	addiu	$t0,$zero,-1
diff --git a/src/game/mplayer/options.c b/src/game/mplayer/options.c
index a9cbf0725..767cfe9c9 100644
--- a/src/game/mplayer/options.c
+++ b/src/game/mplayer/options.c
@@ -14,7 +14,7 @@
 #include "game/game_00c490.h"
 #include "game/prop.h"
 #include "game/game_092610.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b69d0.h"
 #include "game/game_0d4690.h"
diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c
index 816965b0b..d81250a9c 100644
--- a/src/game/mplayer/scenarios.c
+++ b/src/game/mplayer/scenarios.c
@@ -14,7 +14,7 @@
 #include "game/game_00c490.h"
 #include "game/prop.h"
 #include "game/game_092610.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b69d0.h"
 #include "game/game_0d4690.h"
@@ -3215,7 +3215,7 @@ glabel var7f1b8960
 .L0f1836d4:
 /*  f1836d4:	afa30078 */ 	sw	$v1,0x78($sp)
 /*  f1836d8:	e7b0008c */ 	swc1	$f16,0x8c($sp)
-/*  f1836dc:	0fc259d4 */ 	jal	func0f096750
+/*  f1836dc:	0fc259d4 */ 	jal	atan2f
 /*  f1836e0:	e7b20090 */ 	swc1	$f18,0x90($sp)
 /*  f1836e4:	3c014334 */ 	lui	$at,0x4334
 /*  f1836e8:	44816000 */ 	mtc1	$at,$f12
diff --git a/src/game/nbomb.c b/src/game/nbomb.c
index 3a98ce143..b5598e12c 100644
--- a/src/game/nbomb.c
+++ b/src/game/nbomb.c
@@ -15,7 +15,7 @@
 #include "game/chr/chraction.h"
 #include "game/prop.h"
 #include "game/game_095320.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0b3350.h"
 #include "game/game_0d4690.h"
 #include "game/room.h"
@@ -243,7 +243,7 @@ glabel var7f1a7ee8
 /*  f006ea0:	a44e0008 */ 	sh	$t6,0x8($v0)
 /*  f006ea4:	afa2005c */ 	sw	$v0,0x5c($sp)
 /*  f006ea8:	c7ae0084 */ 	lwc1	$f14,0x84($sp)
-/*  f006eac:	0fc259d4 */ 	jal	func0f096750
+/*  f006eac:	0fc259d4 */ 	jal	atan2f
 /*  f006eb0:	c7ac007c */ 	lwc1	$f12,0x7c($sp)
 /*  f006eb4:	3c014380 */ 	lui	$at,0x4380
 /*  f006eb8:	44811000 */ 	mtc1	$at,$f2
@@ -316,7 +316,7 @@ glabel var7f1a7ee8
 /*  f006fbc:	a48c0014 */ 	sh	$t4,0x14($a0)
 /*  f006fc0:	afa4005c */ 	sw	$a0,0x5c($sp)
 /*  f006fc4:	c7ae0078 */ 	lwc1	$f14,0x78($sp)
-/*  f006fc8:	0fc259d4 */ 	jal	func0f096750
+/*  f006fc8:	0fc259d4 */ 	jal	atan2f
 /*  f006fcc:	c7ac0070 */ 	lwc1	$f12,0x70($sp)
 /*  f006fd0:	3c014380 */ 	lui	$at,0x4380
 /*  f006fd4:	44811000 */ 	mtc1	$at,$f2
@@ -389,7 +389,7 @@ glabel var7f1a7ee8
 /*  f0070d8:	a48b0020 */ 	sh	$t3,0x20($a0)
 /*  f0070dc:	afa4005c */ 	sw	$a0,0x5c($sp)
 /*  f0070e0:	c7ae006c */ 	lwc1	$f14,0x6c($sp)
-/*  f0070e4:	0fc259d4 */ 	jal	func0f096750
+/*  f0070e4:	0fc259d4 */ 	jal	atan2f
 /*  f0070e8:	c7ac0064 */ 	lwc1	$f12,0x64($sp)
 /*  f0070ec:	3c017f1a */ 	lui	$at,%hi(var7f1a7eb8)
 /*  f0070f0:	c4327eb8 */ 	lwc1	$f18,%lo(var7f1a7eb8)($at)
@@ -826,7 +826,7 @@ glabel var7f1a7ee8
 /*  f007798:	00000000 */ 	nop
 /*  f00779c:	a4580008 */ 	sh	$t8,0x8($v0)
 /*  f0077a0:	c7ae00b8 */ 	lwc1	$f14,0xb8($sp)
-/*  f0077a4:	0fc259d4 */ 	jal	func0f096750
+/*  f0077a4:	0fc259d4 */ 	jal	atan2f
 /*  f0077a8:	c7ac00b0 */ 	lwc1	$f12,0xb0($sp)
 /*  f0077ac:	3c017f1a */ 	lui	$at,%hi(var7f1a7ebc)
 /*  f0077b0:	c42a7ebc */ 	lwc1	$f10,%lo(var7f1a7ebc)($at)
@@ -890,7 +890,7 @@ glabel var7f1a7ee8
 /*  f007894:	00000000 */ 	nop
 /*  f007898:	a6180014 */ 	sh	$t8,0x14($s0)
 /*  f00789c:	c7ae00c4 */ 	lwc1	$f14,0xc4($sp)
-/*  f0078a0:	0fc259d4 */ 	jal	func0f096750
+/*  f0078a0:	0fc259d4 */ 	jal	atan2f
 /*  f0078a4:	c7ac00bc */ 	lwc1	$f12,0xbc($sp)
 /*  f0078a8:	3c017f1a */ 	lui	$at,%hi(var7f1a7ec0)
 /*  f0078ac:	c4247ec0 */ 	lwc1	$f4,%lo(var7f1a7ec0)($at)
@@ -952,7 +952,7 @@ glabel var7f1a7ee8
 /*  f007988:	00000000 */ 	nop
 /*  f00798c:	a6180020 */ 	sh	$t8,0x20($s0)
 /*  f007990:	c7ae00d0 */ 	lwc1	$f14,0xd0($sp)
-/*  f007994:	0fc259d4 */ 	jal	func0f096750
+/*  f007994:	0fc259d4 */ 	jal	atan2f
 /*  f007998:	c7ac00c8 */ 	lwc1	$f12,0xc8($sp)
 /*  f00799c:	3c017f1a */ 	lui	$at,%hi(var7f1a7ec4)
 /*  f0079a0:	c42a7ec4 */ 	lwc1	$f10,%lo(var7f1a7ec4)($at)
@@ -1014,7 +1014,7 @@ glabel var7f1a7ee8
 /*  f007a7c:	00000000 */ 	nop
 /*  f007a80:	a618002c */ 	sh	$t8,0x2c($s0)
 /*  f007a84:	c7ae00dc */ 	lwc1	$f14,0xdc($sp)
-/*  f007a88:	0fc259d4 */ 	jal	func0f096750
+/*  f007a88:	0fc259d4 */ 	jal	atan2f
 /*  f007a8c:	c7ac00d4 */ 	lwc1	$f12,0xd4($sp)
 /*  f007a90:	3c017f1a */ 	lui	$at,%hi(var7f1a7ec8)
 /*  f007a94:	c4247ec8 */ 	lwc1	$f4,%lo(var7f1a7ec8)($at)
@@ -1076,7 +1076,7 @@ glabel var7f1a7ee8
 /*  f007b70:	00000000 */ 	nop
 /*  f007b74:	a6180038 */ 	sh	$t8,0x38($s0)
 /*  f007b78:	c7ae00e8 */ 	lwc1	$f14,0xe8($sp)
-/*  f007b7c:	0fc259d4 */ 	jal	func0f096750
+/*  f007b7c:	0fc259d4 */ 	jal	atan2f
 /*  f007b80:	c7ac00e0 */ 	lwc1	$f12,0xe0($sp)
 /*  f007b84:	3c017f1a */ 	lui	$at,%hi(var7f1a7ecc)
 /*  f007b88:	c42a7ecc */ 	lwc1	$f10,%lo(var7f1a7ecc)($at)
@@ -1138,7 +1138,7 @@ glabel var7f1a7ee8
 /*  f007c64:	00000000 */ 	nop
 /*  f007c68:	a6180044 */ 	sh	$t8,0x44($s0)
 /*  f007c6c:	c7ae00f4 */ 	lwc1	$f14,0xf4($sp)
-/*  f007c70:	0fc259d4 */ 	jal	func0f096750
+/*  f007c70:	0fc259d4 */ 	jal	atan2f
 /*  f007c74:	c7ac00ec */ 	lwc1	$f12,0xec($sp)
 /*  f007c78:	3c017f1a */ 	lui	$at,%hi(var7f1a7ed0)
 /*  f007c7c:	c4247ed0 */ 	lwc1	$f4,%lo(var7f1a7ed0)($at)
@@ -1295,7 +1295,7 @@ glabel var7f1a7ee8
 /*  f007ed4:	00000000 */ 	nop
 /*  f007ed8:	a44f0008 */ 	sh	$t7,0x8($v0)
 /*  f007edc:	c7ae00b8 */ 	lwc1	$f14,0xb8($sp)
-/*  f007ee0:	0fc259d4 */ 	jal	func0f096750
+/*  f007ee0:	0fc259d4 */ 	jal	atan2f
 /*  f007ee4:	c7ac00b0 */ 	lwc1	$f12,0xb0($sp)
 /*  f007ee8:	3c017f1a */ 	lui	$at,%hi(var7f1a7ed4)
 /*  f007eec:	c42a7ed4 */ 	lwc1	$f10,%lo(var7f1a7ed4)($at)
@@ -1357,7 +1357,7 @@ glabel var7f1a7ee8
 /*  f007fc8:	00000000 */ 	nop
 /*  f007fcc:	a60f0014 */ 	sh	$t7,0x14($s0)
 /*  f007fd0:	c7ae00c4 */ 	lwc1	$f14,0xc4($sp)
-/*  f007fd4:	0fc259d4 */ 	jal	func0f096750
+/*  f007fd4:	0fc259d4 */ 	jal	atan2f
 /*  f007fd8:	c7ac00bc */ 	lwc1	$f12,0xbc($sp)
 /*  f007fdc:	3c017f1a */ 	lui	$at,%hi(var7f1a7ed8)
 /*  f007fe0:	c4247ed8 */ 	lwc1	$f4,%lo(var7f1a7ed8)($at)
@@ -1419,7 +1419,7 @@ glabel var7f1a7ee8
 /*  f0080bc:	00000000 */ 	nop
 /*  f0080c0:	a60f0020 */ 	sh	$t7,0x20($s0)
 /*  f0080c4:	c7ae00d0 */ 	lwc1	$f14,0xd0($sp)
-/*  f0080c8:	0fc259d4 */ 	jal	func0f096750
+/*  f0080c8:	0fc259d4 */ 	jal	atan2f
 /*  f0080cc:	c7ac00c8 */ 	lwc1	$f12,0xc8($sp)
 /*  f0080d0:	3c017f1a */ 	lui	$at,%hi(var7f1a7edc)
 /*  f0080d4:	c42a7edc */ 	lwc1	$f10,%lo(var7f1a7edc)($at)
@@ -1481,7 +1481,7 @@ glabel var7f1a7ee8
 /*  f0081b0:	00000000 */ 	nop
 /*  f0081b4:	a60f002c */ 	sh	$t7,0x2c($s0)
 /*  f0081b8:	c7ae00dc */ 	lwc1	$f14,0xdc($sp)
-/*  f0081bc:	0fc259d4 */ 	jal	func0f096750
+/*  f0081bc:	0fc259d4 */ 	jal	atan2f
 /*  f0081c0:	c7ac00d4 */ 	lwc1	$f12,0xd4($sp)
 /*  f0081c4:	3c017f1a */ 	lui	$at,%hi(var7f1a7ee0)
 /*  f0081c8:	c4247ee0 */ 	lwc1	$f4,%lo(var7f1a7ee0)($at)
@@ -1543,7 +1543,7 @@ glabel var7f1a7ee8
 /*  f0082a4:	00000000 */ 	nop
 /*  f0082a8:	a60f0038 */ 	sh	$t7,0x38($s0)
 /*  f0082ac:	c7ae00e8 */ 	lwc1	$f14,0xe8($sp)
-/*  f0082b0:	0fc259d4 */ 	jal	func0f096750
+/*  f0082b0:	0fc259d4 */ 	jal	atan2f
 /*  f0082b4:	c7ac00e0 */ 	lwc1	$f12,0xe0($sp)
 /*  f0082b8:	3c017f1a */ 	lui	$at,%hi(var7f1a7ee4)
 /*  f0082bc:	c42a7ee4 */ 	lwc1	$f10,%lo(var7f1a7ee4)($at)
@@ -1605,7 +1605,7 @@ glabel var7f1a7ee8
 /*  f008398:	00000000 */ 	nop
 /*  f00839c:	a60f0044 */ 	sh	$t7,0x44($s0)
 /*  f0083a0:	c7ae00f4 */ 	lwc1	$f14,0xf4($sp)
-/*  f0083a4:	0fc259d4 */ 	jal	func0f096750
+/*  f0083a4:	0fc259d4 */ 	jal	atan2f
 /*  f0083a8:	c7ac00ec */ 	lwc1	$f12,0xec($sp)
 /*  f0083ac:	3c017f1a */ 	lui	$at,%hi(var7f1a7ee8)
 /*  f0083b0:	c4247ee8 */ 	lwc1	$f4,%lo(var7f1a7ee8)($at)
@@ -1812,7 +1812,7 @@ glabel var7f1a7f18
 /*  f008654:	00000000 */ 	nop
 /*  f008658:	a44f0008 */ 	sh	$t7,0x8($v0)
 /*  f00865c:	c7ae0064 */ 	lwc1	$f14,0x64($sp)
-/*  f008660:	0fc259d4 */ 	jal	func0f096750
+/*  f008660:	0fc259d4 */ 	jal	atan2f
 /*  f008664:	c7ac005c */ 	lwc1	$f12,0x5c($sp)
 /*  f008668:	3c017f1a */ 	lui	$at,%hi(var7f1a7eec)
 /*  f00866c:	c4307eec */ 	lwc1	$f16,%lo(var7f1a7eec)($at)
@@ -1875,7 +1875,7 @@ glabel var7f1a7f18
 /*  f008748:	00000000 */ 	nop
 /*  f00874c:	a60e0014 */ 	sh	$t6,0x14($s0)
 /*  f008750:	c7ae0070 */ 	lwc1	$f14,0x70($sp)
-/*  f008754:	0fc259d4 */ 	jal	func0f096750
+/*  f008754:	0fc259d4 */ 	jal	atan2f
 /*  f008758:	c7ac0068 */ 	lwc1	$f12,0x68($sp)
 /*  f00875c:	3c017f1a */ 	lui	$at,%hi(var7f1a7ef0)
 /*  f008760:	c4267ef0 */ 	lwc1	$f6,%lo(var7f1a7ef0)($at)
@@ -1938,7 +1938,7 @@ glabel var7f1a7f18
 /*  f00883c:	00000000 */ 	nop
 /*  f008840:	a60a0020 */ 	sh	$t2,0x20($s0)
 /*  f008844:	c7ae007c */ 	lwc1	$f14,0x7c($sp)
-/*  f008848:	0fc259d4 */ 	jal	func0f096750
+/*  f008848:	0fc259d4 */ 	jal	atan2f
 /*  f00884c:	c7ac0074 */ 	lwc1	$f12,0x74($sp)
 /*  f008850:	3c017f1a */ 	lui	$at,%hi(var7f1a7ef4)
 /*  f008854:	c4307ef4 */ 	lwc1	$f16,%lo(var7f1a7ef4)($at)
@@ -2001,7 +2001,7 @@ glabel var7f1a7f18
 /*  f008930:	00000000 */ 	nop
 /*  f008934:	a60c002c */ 	sh	$t4,0x2c($s0)
 /*  f008938:	c7ae0088 */ 	lwc1	$f14,0x88($sp)
-/*  f00893c:	0fc259d4 */ 	jal	func0f096750
+/*  f00893c:	0fc259d4 */ 	jal	atan2f
 /*  f008940:	c7ac0080 */ 	lwc1	$f12,0x80($sp)
 /*  f008944:	3c017f1a */ 	lui	$at,%hi(var7f1a7ef8)
 /*  f008948:	c4267ef8 */ 	lwc1	$f6,%lo(var7f1a7ef8)($at)
@@ -2064,7 +2064,7 @@ glabel var7f1a7f18
 /*  f008a24:	00000000 */ 	nop
 /*  f008a28:	a60d0038 */ 	sh	$t5,0x38($s0)
 /*  f008a2c:	c7ae0094 */ 	lwc1	$f14,0x94($sp)
-/*  f008a30:	0fc259d4 */ 	jal	func0f096750
+/*  f008a30:	0fc259d4 */ 	jal	atan2f
 /*  f008a34:	c7ac008c */ 	lwc1	$f12,0x8c($sp)
 /*  f008a38:	3c017f1a */ 	lui	$at,%hi(var7f1a7efc)
 /*  f008a3c:	c4307efc */ 	lwc1	$f16,%lo(var7f1a7efc)($at)
@@ -2127,7 +2127,7 @@ glabel var7f1a7f18
 /*  f008b18:	00000000 */ 	nop
 /*  f008b1c:	a6190044 */ 	sh	$t9,0x44($s0)
 /*  f008b20:	c7ae00a0 */ 	lwc1	$f14,0xa0($sp)
-/*  f008b24:	0fc259d4 */ 	jal	func0f096750
+/*  f008b24:	0fc259d4 */ 	jal	atan2f
 /*  f008b28:	c7ac0098 */ 	lwc1	$f12,0x98($sp)
 /*  f008b2c:	3c017f1a */ 	lui	$at,%hi(var7f1a7f00)
 /*  f008b30:	c4267f00 */ 	lwc1	$f6,%lo(var7f1a7f00)($at)
@@ -2269,7 +2269,7 @@ glabel var7f1a7f18
 /*  f008d48:	00000000 */ 	nop
 /*  f008d4c:	a4490008 */ 	sh	$t1,0x8($v0)
 /*  f008d50:	c7ae0064 */ 	lwc1	$f14,0x64($sp)
-/*  f008d54:	0fc259d4 */ 	jal	func0f096750
+/*  f008d54:	0fc259d4 */ 	jal	atan2f
 /*  f008d58:	c7ac005c */ 	lwc1	$f12,0x5c($sp)
 /*  f008d5c:	3c017f1a */ 	lui	$at,%hi(var7f1a7f04)
 /*  f008d60:	c4307f04 */ 	lwc1	$f16,%lo(var7f1a7f04)($at)
@@ -2332,7 +2332,7 @@ glabel var7f1a7f18
 /*  f008e3c:	00000000 */ 	nop
 /*  f008e40:	a60f0014 */ 	sh	$t7,0x14($s0)
 /*  f008e44:	c7ae0070 */ 	lwc1	$f14,0x70($sp)
-/*  f008e48:	0fc259d4 */ 	jal	func0f096750
+/*  f008e48:	0fc259d4 */ 	jal	atan2f
 /*  f008e4c:	c7ac0068 */ 	lwc1	$f12,0x68($sp)
 /*  f008e50:	3c017f1a */ 	lui	$at,%hi(var7f1a7f08)
 /*  f008e54:	c4267f08 */ 	lwc1	$f6,%lo(var7f1a7f08)($at)
@@ -2395,7 +2395,7 @@ glabel var7f1a7f18
 /*  f008f30:	00000000 */ 	nop
 /*  f008f34:	a60b0020 */ 	sh	$t3,0x20($s0)
 /*  f008f38:	c7ae007c */ 	lwc1	$f14,0x7c($sp)
-/*  f008f3c:	0fc259d4 */ 	jal	func0f096750
+/*  f008f3c:	0fc259d4 */ 	jal	atan2f
 /*  f008f40:	c7ac0074 */ 	lwc1	$f12,0x74($sp)
 /*  f008f44:	3c017f1a */ 	lui	$at,%hi(var7f1a7f0c)
 /*  f008f48:	c4307f0c */ 	lwc1	$f16,%lo(var7f1a7f0c)($at)
@@ -2458,7 +2458,7 @@ glabel var7f1a7f18
 /*  f009024:	00000000 */ 	nop
 /*  f009028:	a60a002c */ 	sh	$t2,0x2c($s0)
 /*  f00902c:	c7ae0088 */ 	lwc1	$f14,0x88($sp)
-/*  f009030:	0fc259d4 */ 	jal	func0f096750
+/*  f009030:	0fc259d4 */ 	jal	atan2f
 /*  f009034:	c7ac0080 */ 	lwc1	$f12,0x80($sp)
 /*  f009038:	3c017f1a */ 	lui	$at,%hi(var7f1a7f10)
 /*  f00903c:	c4267f10 */ 	lwc1	$f6,%lo(var7f1a7f10)($at)
@@ -2521,7 +2521,7 @@ glabel var7f1a7f18
 /*  f009118:	00000000 */ 	nop
 /*  f00911c:	a60c0038 */ 	sh	$t4,0x38($s0)
 /*  f009120:	c7ae0094 */ 	lwc1	$f14,0x94($sp)
-/*  f009124:	0fc259d4 */ 	jal	func0f096750
+/*  f009124:	0fc259d4 */ 	jal	atan2f
 /*  f009128:	c7ac008c */ 	lwc1	$f12,0x8c($sp)
 /*  f00912c:	3c017f1a */ 	lui	$at,%hi(var7f1a7f14)
 /*  f009130:	c4307f14 */ 	lwc1	$f16,%lo(var7f1a7f14)($at)
@@ -2584,7 +2584,7 @@ glabel var7f1a7f18
 /*  f00920c:	00000000 */ 	nop
 /*  f009210:	a60d0044 */ 	sh	$t5,0x44($s0)
 /*  f009214:	c7ae00a0 */ 	lwc1	$f14,0xa0($sp)
-/*  f009218:	0fc259d4 */ 	jal	func0f096750
+/*  f009218:	0fc259d4 */ 	jal	atan2f
 /*  f00921c:	c7ac0098 */ 	lwc1	$f12,0x98($sp)
 /*  f009220:	3c017f1a */ 	lui	$at,%hi(var7f1a7f18)
 /*  f009224:	c4267f18 */ 	lwc1	$f6,%lo(var7f1a7f18)($at)
@@ -3957,7 +3957,7 @@ glabel var7f1a7f5c
 /*  f00ac08:	e7a4008c */ 	swc1	$f4,0x8c($sp)
 /*  f00ac0c:	c46a1bb8 */ 	lwc1	$f10,0x1bb8($v1)
 /*  f00ac10:	46000307 */ 	neg.s	$f12,$f0
-/*  f00ac14:	0fc259d4 */ 	jal	func0f096750
+/*  f00ac14:	0fc259d4 */ 	jal	atan2f
 /*  f00ac18:	e7aa0088 */ 	swc1	$f10,0x88($sp)
 /*  f00ac1c:	3c017f1a */ 	lui	$at,%hi(var7f1a7f50)
 /*  f00ac20:	c4267f50 */ 	lwc1	$f6,%lo(var7f1a7f50)($at)
@@ -4431,7 +4431,7 @@ const u32 var7f1a7eac[] = {0x00000090};
 //			camposx = g_Vars.currentplayer->cam_pos.f[0];
 //			camposz = g_Vars.currentplayer->cam_pos.f[2];
 //
-//			sp78 = func0f096750(-lookx, lookz) / M_BADTAU;
+//			sp78 = atan2f(-lookx, lookz) / M_BADTAU;
 //			sp38 = (func0f006b08(4) - 0.5f) / 6.0f;
 //
 //			fVar19 = (camposx + camposz) / 3000.0f;
diff --git a/src/game/propobj.c b/src/game/propobj.c
index 6363daf2c..e384a9312 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -24,7 +24,7 @@
 #include "game/game_092610.h"
 #include "game/game_095320.h"
 #include "game/game_096360.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0969d0.h"
 #include "game/game_096ca0.h"
 #include "game/floor.h"
@@ -9902,7 +9902,7 @@ glabel var7f1aa2a0
 /*  f06eaa8:	e7a6011c */ 	swc1	$f6,0x11c($sp)
 .L0f06eaac:
 /*  f06eaac:	c7ac0118 */ 	lwc1	$f12,0x118($sp)
-/*  f06eab0:	0fc259d4 */ 	jal	func0f096750
+/*  f06eab0:	0fc259d4 */ 	jal	atan2f
 /*  f06eab4:	c7ae0114 */ 	lwc1	$f14,0x114($sp)
 /*  f06eab8:	e7a000f4 */ 	swc1	$f0,0xf4($sp)
 /*  f06eabc:	46000307 */ 	neg.s	$f12,$f0
@@ -9918,7 +9918,7 @@ glabel var7f1aa2a0
 /*  f06eae4:	0c0056c4 */ 	jal	func00015b10
 /*  f06eae8:	e7a4002c */ 	swc1	$f4,0x2c($sp)
 /*  f06eaec:	c7ac0024 */ 	lwc1	$f12,0x24($sp)
-/*  f06eaf0:	0fc259d4 */ 	jal	func0f096750
+/*  f06eaf0:	0fc259d4 */ 	jal	atan2f
 /*  f06eaf4:	c7ae0028 */ 	lwc1	$f14,0x28($sp)
 /*  f06eaf8:	3c017f1b */ 	lui	$at,%hi(var7f1aa29c)
 /*  f06eafc:	c426a29c */ 	lwc1	$f6,%lo(var7f1aa29c)($at)
@@ -10412,7 +10412,7 @@ glabel func0f06f0a0
 /*  f06f1d4:	8fa60030 */ 	lw	$a2,0x30($sp)
 /*  f06f1d8:	8fa20030 */ 	lw	$v0,0x30($sp)
 /*  f06f1dc:	c44c0000 */ 	lwc1	$f12,0x0($v0)
-/*  f06f1e0:	0fc259d4 */ 	jal	func0f096750
+/*  f06f1e0:	0fc259d4 */ 	jal	atan2f
 /*  f06f1e4:	c44e0008 */ 	lwc1	$f14,0x8($v0)
 /*  f06f1e8:	e6000060 */ 	swc1	$f0,0x60($s0)
 /*  f06f1ec:	8faf0030 */ 	lw	$t7,0x30($sp)
@@ -10425,7 +10425,7 @@ glabel func0f06f0a0
 /*  f06f208:	46062300 */ 	add.s	$f12,$f4,$f6
 /*  f06f20c:	8fb80030 */ 	lw	$t8,0x30($sp)
 /*  f06f210:	46000386 */ 	mov.s	$f14,$f0
-/*  f06f214:	0fc259d4 */ 	jal	func0f096750
+/*  f06f214:	0fc259d4 */ 	jal	atan2f
 /*  f06f218:	c70c0004 */ 	lwc1	$f12,0x4($t8)
 /*  f06f21c:	c6080060 */ 	lwc1	$f8,0x60($s0)
 /*  f06f220:	e6000074 */ 	swc1	$f0,0x74($s0)
@@ -12918,7 +12918,7 @@ glabel var7f1aa314
 /*  f071778:	45020011 */ 	bc1fl	.L0f0717c0
 /*  f07177c:	4602603e */ 	c.le.s	$f12,$f2
 /*  f071780:	46101301 */ 	sub.s	$f12,$f2,$f16
-/*  f071784:	0fc259d4 */ 	jal	func0f096750
+/*  f071784:	0fc259d4 */ 	jal	atan2f
 /*  f071788:	46062381 */ 	sub.s	$f14,$f4,$f6
 /*  f07178c:	3c017f1b */ 	lui	$at,%hi(var7f1aa2d8)
 /*  f071790:	c428a2d8 */ 	lwc1	$f8,%lo(var7f1aa2d8)($at)
@@ -12940,7 +12940,7 @@ glabel var7f1aa314
 /*  f0717c8:	4600603e */ 	c.le.s	$f12,$f0
 /*  f0717cc:	c6040034 */ 	lwc1	$f4,0x34($s0)
 /*  f0717d0:	46007387 */ 	neg.s	$f14,$f14
-/*  f0717d4:	0fc259d4 */ 	jal	func0f096750
+/*  f0717d4:	0fc259d4 */ 	jal	atan2f
 /*  f0717d8:	46041301 */ 	sub.s	$f12,$f2,$f4
 /*  f0717dc:	3c017f1b */ 	lui	$at,%hi(var7f1aa2e0)
 /*  f0717e0:	c426a2e0 */ 	lwc1	$f6,%lo(var7f1aa2e0)($at)
@@ -12962,7 +12962,7 @@ glabel var7f1aa314
 /*  f071818:	44804000 */ 	mtc1	$zero,$f8
 /*  f07181c:	c60a0034 */ 	lwc1	$f10,0x34($s0)
 /*  f071820:	c7ae01cc */ 	lwc1	$f14,0x1cc($sp)
-/*  f071824:	0fc259d4 */ 	jal	func0f096750
+/*  f071824:	0fc259d4 */ 	jal	atan2f
 /*  f071828:	46105301 */ 	sub.s	$f12,$f10,$f16
 /*  f07182c:	3c017f1b */ 	lui	$at,%hi(var7f1aa2e8)
 /*  f071830:	c424a2e8 */ 	lwc1	$f4,%lo(var7f1aa2e8)($at)
@@ -15103,7 +15103,7 @@ glabel var7f1aa3d0
 /*  f0735bc:	00000000 */ 	nop
 /*  f0735c0:	460e7182 */ 	mul.s	$f6,$f14,$f14
 /*  f0735c4:	e7a40044 */ 	swc1	$f4,0x44($sp)
-/*  f0735c8:	0fc259d4 */ 	jal	func0f096750
+/*  f0735c8:	0fc259d4 */ 	jal	atan2f
 /*  f0735cc:	e7a60040 */ 	swc1	$f6,0x40($sp)
 /*  f0735d0:	c7a80044 */ 	lwc1	$f8,0x44($sp)
 /*  f0735d4:	c7aa0040 */ 	lwc1	$f10,0x40($sp)
@@ -15111,7 +15111,7 @@ glabel var7f1aa3d0
 /*  f0735dc:	0c012974 */ 	jal	sqrtf
 /*  f0735e0:	460a4300 */ 	add.s	$f12,$f8,$f10
 /*  f0735e4:	4600a306 */ 	mov.s	$f12,$f20
-/*  f0735e8:	0fc259d4 */ 	jal	func0f096750
+/*  f0735e8:	0fc259d4 */ 	jal	atan2f
 /*  f0735ec:	46000386 */ 	mov.s	$f14,$f0
 /*  f0735f0:	3c15800a */ 	lui	$s5,%hi(g_Vars)
 /*  f0735f4:	26b59fc0 */ 	addiu	$s5,$s5,%lo(g_Vars)
@@ -20316,7 +20316,7 @@ void cameraTick(struct prop *camprop)
 
 	// Check horizontal angle
 	if (canseeplayer) {
-		f32 angle = func0f096750(xdist, zdist);
+		f32 angle = atan2f(xdist, zdist);
 		f32 yrot = camera->yrot;
 		f32 finalangle;
 
@@ -20355,7 +20355,7 @@ void cameraTick(struct prop *camprop)
 
 	// Check vertical angle
 	if (canseeplayer) {
-		f32 angle = func0f096750(ydist, sqrtf(xdist * xdist + zdist * zdist));
+		f32 angle = atan2f(ydist, sqrtf(xdist * xdist + zdist * zdist));
 		f32 finalangle = angle - camera->xzero;
 
 		if (angle < camera->xzero) {
@@ -21245,11 +21245,11 @@ glabel var7f1aa580
 /*  f0793cc:	45020112 */ 	bc1fl	.L0f079818
 /*  f0793d0:	8fb8007c */ 	lw	$t8,0x7c($sp)
 /*  f0793d4:	afa800ac */ 	sw	$t0,0xac($sp)
-/*  f0793d8:	0fc259d4 */ 	jal	func0f096750
+/*  f0793d8:	0fc259d4 */ 	jal	atan2f
 /*  f0793dc:	e7b200a4 */ 	swc1	$f18,0xa4($sp)
 /*  f0793e0:	e7a00050 */ 	swc1	$f0,0x50($sp)
 /*  f0793e4:	c7ac0090 */ 	lwc1	$f12,0x90($sp)
-/*  f0793e8:	0fc259d4 */ 	jal	func0f096750
+/*  f0793e8:	0fc259d4 */ 	jal	atan2f
 /*  f0793ec:	c7ae0080 */ 	lwc1	$f14,0x80($sp)
 /*  f0793f0:	8fae00a8 */ 	lw	$t6,0xa8($sp)
 /*  f0793f4:	e7a0004c */ 	swc1	$f0,0x4c($sp)
@@ -23090,7 +23090,7 @@ bool chopperCheckTargetInFov(struct chopperobj *hovercar, u8 fov)
 		f32 roty = chopper->roty;
 		struct prop *target = chopperGetTargetProp(chopper);
 		struct prop *prop = chopper->base.prop;
-		f32 angle = func0f096750(prop->pos.x - target->pos.x, prop->pos.z - target->pos.z);
+		f32 angle = atan2f(prop->pos.x - target->pos.x, prop->pos.z - target->pos.z);
 		f32 anglediff = angle - roty;
 
 		if (angle < roty) {
@@ -23497,7 +23497,7 @@ glabel var7f1aa610
 /*  f07b608:	c44a0010 */ 	lwc1	$f10,0x10($v0)
 /*  f07b60c:	c4440008 */ 	lwc1	$f4,0x8($v0)
 /*  f07b610:	46085381 */ 	sub.s	$f14,$f10,$f8
-/*  f07b614:	0fc259d4 */ 	jal	func0f096750
+/*  f07b614:	0fc259d4 */ 	jal	atan2f
 /*  f07b618:	46062301 */ 	sub.s	$f12,$f4,$f6
 /*  f07b61c:	44802000 */ 	mtc1	$zero,$f4
 /*  f07b620:	46000406 */ 	mov.s	$f16,$f0
@@ -23550,7 +23550,7 @@ glabel var7f1aa610
 /*  f07b6cc:	c7aa004c */ 	lwc1	$f10,0x4c($sp)
 /*  f07b6d0:	c7a800f4 */ 	lwc1	$f8,0xf4($sp)
 /*  f07b6d4:	46000386 */ 	mov.s	$f14,$f0
-/*  f07b6d8:	0fc259d4 */ 	jal	func0f096750
+/*  f07b6d8:	0fc259d4 */ 	jal	atan2f
 /*  f07b6dc:	46085301 */ 	sub.s	$f12,$f10,$f8
 /*  f07b6e0:	c6040080 */ 	lwc1	$f4,0x80($s0)
 /*  f07b6e4:	3c017f1b */ 	lui	$at,%hi(var7f1aa5ec)
@@ -24832,10 +24832,10 @@ void chopperTickPatrol(struct prop *chopperprop)
 			pad.pos.y += -250;
 		}
 
-		roty = func0f096750(pad.pos.x - chopperprop->pos.x, pad.pos.z - chopperprop->pos.z);
+		roty = atan2f(pad.pos.x - chopperprop->pos.x, pad.pos.z - chopperprop->pos.z);
 		xdiff = pad.pos.x - chopperprop->pos.x;
 		zdiff = pad.pos.z - chopperprop->pos.z;
-		rotx = func0f096750(pad.pos.y - chopperprop->pos.y, sqrtf(xdiff * xdiff + zdiff * zdiff));
+		rotx = atan2f(pad.pos.y - chopperprop->pos.y, sqrtf(xdiff * xdiff + zdiff * zdiff));
 	}
 
 	if (chopper->base.flags & OBJFLAG_20000000) {
@@ -25311,7 +25311,7 @@ glabel var7f1aa6a8
 /*  f07d118:	c4660008 */ 	lwc1	$f6,0x8($v1)
 /*  f07d11c:	c4720010 */ 	lwc1	$f18,0x10($v1)
 /*  f07d120:	460a3301 */ 	sub.s	$f12,$f6,$f10
-/*  f07d124:	0fc259d4 */ 	jal	func0f096750
+/*  f07d124:	0fc259d4 */ 	jal	atan2f
 /*  f07d128:	46089381 */ 	sub.s	$f14,$f18,$f8
 /*  f07d12c:	8fa2015c */ 	lw	$v0,0x15c($sp)
 /*  f07d130:	8fa30170 */ 	lw	$v1,0x170($sp)
@@ -25332,7 +25332,7 @@ glabel var7f1aa6a8
 /*  f07d16c:	46000386 */ 	mov.s	$f14,$f0
 /*  f07d170:	c5f0000c */ 	lwc1	$f16,0xc($t7)
 /*  f07d174:	c504000c */ 	lwc1	$f4,0xc($t0)
-/*  f07d178:	0fc259d4 */ 	jal	func0f096750
+/*  f07d178:	0fc259d4 */ 	jal	atan2f
 /*  f07d17c:	46048301 */ 	sub.s	$f12,$f16,$f4
 /*  f07d180:	8e6300bc */ 	lw	$v1,0xbc($s3)
 /*  f07d184:	46000086 */ 	mov.s	$f2,$f0
@@ -25655,7 +25655,7 @@ glabel var7f1aa6e4
 /*  f07d5bc:	c4440008 */ 	lwc1	$f4,0x8($v0)
 /*  f07d5c0:	c4460010 */ 	lwc1	$f6,0x10($v0)
 /*  f07d5c4:	46044301 */ 	sub.s	$f12,$f8,$f4
-/*  f07d5c8:	0fc259d4 */ 	jal	func0f096750
+/*  f07d5c8:	0fc259d4 */ 	jal	atan2f
 /*  f07d5cc:	46065381 */ 	sub.s	$f14,$f10,$f6
 /*  f07d5d0:	8fa20278 */ 	lw	$v0,0x278($sp)
 /*  f07d5d4:	e7a00200 */ 	swc1	$f0,0x200($sp)
@@ -25674,7 +25674,7 @@ glabel var7f1aa6e4
 /*  f07d608:	c7aa0218 */ 	lwc1	$f10,0x218($sp)
 /*  f07d60c:	46000386 */ 	mov.s	$f14,$f0
 /*  f07d610:	c566000c */ 	lwc1	$f6,0xc($t3)
-/*  f07d614:	0fc259d4 */ 	jal	func0f096750
+/*  f07d614:	0fc259d4 */ 	jal	atan2f
 /*  f07d618:	46065301 */ 	sub.s	$f12,$f10,$f6
 /*  f07d61c:	e7a001fc */ 	swc1	$f0,0x1fc($sp)
 /*  f07d620:	8e0c0008 */ 	lw	$t4,0x8($s0)
@@ -25763,7 +25763,7 @@ glabel var7f1aa6e4
 /*  f07d754:	05630016 */ 	bgezl	$t3,.L0f07d7b0
 /*  f07d758:	44807000 */ 	mtc1	$zero,$f14
 /*  f07d75c:	c60c0034 */ 	lwc1	$f12,0x34($s0)
-/*  f07d760:	0fc259d4 */ 	jal	func0f096750
+/*  f07d760:	0fc259d4 */ 	jal	atan2f
 /*  f07d764:	c60e003c */ 	lwc1	$f14,0x3c($s0)
 /*  f07d768:	c6020034 */ 	lwc1	$f2,0x34($s0)
 /*  f07d76c:	c60e003c */ 	lwc1	$f14,0x3c($s0)
@@ -25774,7 +25774,7 @@ glabel var7f1aa6e4
 /*  f07d780:	0c012974 */ 	jal	sqrtf
 /*  f07d784:	46065300 */ 	add.s	$f12,$f10,$f6
 /*  f07d788:	c60c0038 */ 	lwc1	$f12,0x38($s0)
-/*  f07d78c:	0fc259d4 */ 	jal	func0f096750
+/*  f07d78c:	0fc259d4 */ 	jal	atan2f
 /*  f07d790:	46000386 */ 	mov.s	$f14,$f0
 /*  f07d794:	8e0c0008 */ 	lw	$t4,0x8($s0)
 /*  f07d798:	3c01dfff */ 	lui	$at,0xdfff
@@ -26471,8 +26471,8 @@ glabel var7f1aa6e4
 //			padUnpack(*padnum, PADFIELD_POS, &pad);
 //		}
 //
-//		sp200 = func0f096750(sp214.x - prop->pos.x, sp214.z - prop->pos.z);
-//		sp1fc = func0f096750(sp214.y - prop->pos.y,
+//		sp200 = atan2f(sp214.x - prop->pos.x, sp214.z - prop->pos.z);
+//		sp1fc = atan2f(sp214.y - prop->pos.y,
 //				sqrtf((sp214.x - prop->pos.x) * (sp214.x - prop->pos.x) + (sp214.z - prop->pos.z) * (sp214.z - prop->pos.z)));
 //
 //		// 630
@@ -26509,8 +26509,8 @@ glabel var7f1aa6e4
 //	} else {
 //		// 750
 //		if (hovercar->base.flags & OBJFLAG_20000000) {
-//			hovercar->roty = func0f096750(hovercar->base.realrot[6], hovercar->base.realrot[8]);
-//			hovercar->rotx = func0f096750(hovercar->base.realrot[7], sqrtf(hovercar->base.realrot[8] * hovercar->base.realrot[8] + hovercar->base.realrot[6] * hovercar->base.realrot[6]));
+//			hovercar->roty = atan2f(hovercar->base.realrot[6], hovercar->base.realrot[8]);
+//			hovercar->rotx = atan2f(hovercar->base.realrot[7], sqrtf(hovercar->base.realrot[8] * hovercar->base.realrot[8] + hovercar->base.realrot[6] * hovercar->base.realrot[6]));
 //			hovercar->base.flags &= ~OBJFLAG_20000000;
 //		}
 //	}
@@ -27236,7 +27236,7 @@ s32 objTick(struct prop *prop)
 
 						if (hov) {
 							func0f0713e4(obj, hov, &prop->pos, prop->rooms, obj->realrot);
-							hoverpropSetTurnAngle(obj, func0f096750(sp412.m[2][0], sp412.m[2][2]));
+							hoverpropSetTurnAngle(obj, atan2f(sp412.m[2][0], sp412.m[2][2]));
 
 							hov->unk14 = 0;
 							hov->unk1c = 0;
@@ -32956,7 +32956,7 @@ glabel var7f1aa978
 /*  f08321c:	c7ac00e4 */ 	lwc1	$f12,0xe4($sp)
 /*  f083220:	c7ae00ec */ 	lwc1	$f14,0xec($sp)
 /*  f083224:	46125182 */ 	mul.s	$f6,$f10,$f18
-/*  f083228:	0fc259d4 */ 	jal	func0f096750
+/*  f083228:	0fc259d4 */ 	jal	atan2f
 /*  f08322c:	e7a600a4 */ 	swc1	$f6,0xa4($sp)
 /*  f083230:	0c004b70 */ 	jal	random
 /*  f083234:	e7a000a0 */ 	swc1	$f0,0xa0($sp)
@@ -33330,7 +33330,7 @@ glabel var7f1aa978
 /*  f0837a8:	c4480010 */ 	lwc1	$f8,0x10($v0)
 /*  f0837ac:	afa600cc */ 	sw	$a2,0xcc($sp)
 /*  f0837b0:	460a3301 */ 	sub.s	$f12,$f6,$f10
-/*  f0837b4:	0fc259d4 */ 	jal	func0f096750
+/*  f0837b4:	0fc259d4 */ 	jal	atan2f
 /*  f0837b8:	46089381 */ 	sub.s	$f14,$f18,$f8
 /*  f0837bc:	0c004b70 */ 	jal	random
 /*  f0837c0:	e7a00058 */ 	swc1	$f0,0x58($sp)
@@ -37099,7 +37099,7 @@ glabel var7f1aab3c
 /*  f086c78:	45020035 */ 	bc1fl	.L0f086d50
 /*  f086c7c:	8fbf001c */ 	lw	$ra,0x1c($sp)
 /*  f086c80:	afa30020 */ 	sw	$v1,0x20($sp)
-/*  f086c84:	0fc259d4 */ 	jal	func0f096750
+/*  f086c84:	0fc259d4 */ 	jal	atan2f
 /*  f086c88:	afa60028 */ 	sw	$a2,0x28($sp)
 /*  f086c8c:	3c18800a */ 	lui	$t8,%hi(g_Vars+0x284)
 /*  f086c90:	8f18a244 */ 	lw	$t8,%lo(g_Vars+0x284)($t8)
@@ -37190,7 +37190,7 @@ bool currentPlayerTryMountHoverbike(struct prop *prop)
 	}
 
 	if (pass) {
-		f32 angle = func0f096750(
+		f32 angle = atan2f(
 				prop->pos.x - g_Vars.currentplayer->prop->pos.x,
 				prop->pos.z - g_Vars.currentplayer->prop->pos.z);
 		angle -= hoverpropGetTurnAngle(obj);
@@ -45939,7 +45939,7 @@ glabel var7f1ab17c
 .text
 /*  f08f538:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*  f08f53c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f08f540:	0fc259d4 */ 	jal	func0f096750
+/*  f08f540:	0fc259d4 */ 	jal	atan2f
 /*  f08f544:	00000000 */ 	nop
 /*  f08f548:	3c03800a */ 	lui	$v1,%hi(g_Vars+0x284)
 /*  f08f54c:	8c63a244 */ 	lw	$v1,%lo(g_Vars+0x284)($v1)
diff --git a/src/game/radar.c b/src/game/radar.c
index 98b8ab5c6..753653ab4 100644
--- a/src/game/radar.c
+++ b/src/game/radar.c
@@ -9,7 +9,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_0b2150.h"
 #include "game/game_0b3350.h"
 #include "game/game_152fa0.h"
@@ -109,7 +109,7 @@ Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1,
 
 	osSyncPrintf("RadarDrawDot : Prop=%x", prop);
 
-	spcc = (func0f096750(dist->x, dist->z) * 180.0f) / M_PI + g_Vars.currentplayer->vv_theta + 180.0f;
+	spcc = (atan2f(dist->x, dist->z) * 180.0f) / M_PI + g_Vars.currentplayer->vv_theta + 180.0f;
 	sqdist = sqrtf(dist->z * dist->z + dist->x * dist->x) * 0.004f;
 
 	if (sqdist < 16.0f) {
diff --git a/src/game/training/training.c b/src/game/training/training.c
index abaf38f19..91e4f9519 100644
--- a/src/game/training/training.c
+++ b/src/game/training/training.c
@@ -13,7 +13,7 @@
 #include "game/prop.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0fd0.h"
 #include "game/game_0b69d0.h"
@@ -2053,7 +2053,7 @@ f32 frGetTargetAngleToPos(struct coord *targetpos, f32 targetangle, struct coord
 {
 	f32 xdiff = targetpos->x - pos->x;
 	f32 zdiff = targetpos->z - pos->z;
-	f32 directangle = func0f096750(xdiff, zdiff);
+	f32 directangle = atan2f(xdiff, zdiff);
 	f32 relativeangle = directangle - targetangle;
 
 	if (directangle < targetangle) {
diff --git a/src/include/game/atan2f.h b/src/include/game/atan2f.h
new file mode 100644
index 000000000..5ce7bb879
--- /dev/null
+++ b/src/include/game/atan2f.h
@@ -0,0 +1,8 @@
+#ifndef IN_GAME_ATAN2F_H
+#define IN_GAME_ATAN2F_H
+#include <ultra64.h>
+#include "types.h"
+
+f32 atan2f(f32 x, f32 z);
+
+#endif
diff --git a/src/include/game/game_096750.h b/src/include/game/game_096750.h
deleted file mode 100644
index 0bccd58ae..000000000
--- a/src/include/game/game_096750.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef IN_GAME_GAME_096750_H
-#define IN_GAME_GAME_096750_H
-#include <ultra64.h>
-#include "types.h"
-
-f32 func0f096750(f32 x, f32 z);
-
-#endif
diff --git a/src/lib/lib_16110.c b/src/lib/lib_16110.c
index 26c52da93..8510d70f3 100644
--- a/src/lib/lib_16110.c
+++ b/src/lib/lib_16110.c
@@ -8,7 +8,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "game/padhalllv.h"
 #include "gvars/gvars.h"
 #include "lib/lib_159b0.h"
@@ -279,16 +279,16 @@ glabel func000165d8
 /*    1661c:	45020010 */ 	bc1fl	.L00016660
 /*    16620:	44805000 */ 	mtc1	$zero,$f10
 /*    16624:	c60c0018 */ 	lwc1	$f12,0x18($s0)
-/*    16628:	0fc259d4 */ 	jal	func0f096750
+/*    16628:	0fc259d4 */ 	jal	atan2f
 /*    1662c:	c60e0028 */ 	lwc1	$f14,0x28($s0)
 /*    16630:	e6200000 */ 	swc1	$f0,0x0($s1)
 /*    16634:	c60c0008 */ 	lwc1	$f12,0x8($s0)
 /*    16638:	c7ae0024 */ 	lwc1	$f14,0x24($sp)
-/*    1663c:	0fc259d4 */ 	jal	func0f096750
+/*    1663c:	0fc259d4 */ 	jal	atan2f
 /*    16640:	46006307 */ 	neg.s	$f12,$f12
 /*    16644:	e6200004 */ 	swc1	$f0,0x4($s1)
 /*    16648:	c60e0000 */ 	lwc1	$f14,0x0($s0)
-/*    1664c:	0fc259d4 */ 	jal	func0f096750
+/*    1664c:	0fc259d4 */ 	jal	atan2f
 /*    16650:	c60c0004 */ 	lwc1	$f12,0x4($s0)
 /*    16654:	1000000e */ 	b	.L00016690
 /*    16658:	e6200008 */ 	swc1	$f0,0x8($s1)
@@ -298,12 +298,12 @@ glabel func000165d8
 /*    16664:	e62a0000 */ 	swc1	$f10,0x0($s1)
 /*    16668:	c60c0008 */ 	lwc1	$f12,0x8($s0)
 /*    1666c:	c7ae0024 */ 	lwc1	$f14,0x24($sp)
-/*    16670:	0fc259d4 */ 	jal	func0f096750
+/*    16670:	0fc259d4 */ 	jal	atan2f
 /*    16674:	46006307 */ 	neg.s	$f12,$f12
 /*    16678:	e6200004 */ 	swc1	$f0,0x4($s1)
 /*    1667c:	c60c0010 */ 	lwc1	$f12,0x10($s0)
 /*    16680:	c60e0014 */ 	lwc1	$f14,0x14($s0)
-/*    16684:	0fc259d4 */ 	jal	func0f096750
+/*    16684:	0fc259d4 */ 	jal	atan2f
 /*    16688:	46006307 */ 	neg.s	$f12,$f12
 /*    1668c:	e6200008 */ 	swc1	$f0,0x8($s1)
 .L00016690:
diff --git a/src/lib/lib_3a100.c b/src/lib/lib_3a100.c
index 5d8b86a18..c677ab67b 100644
--- a/src/lib/lib_3a100.c
+++ b/src/lib/lib_3a100.c
@@ -7,7 +7,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_096750.h"
+#include "game/atan2f.h"
 #include "gvars/gvars.h"
 #include "lib/lib_2faf0.h"
 #include "lib/lib_3a100.h"
@@ -1555,7 +1555,7 @@ glabel func0003b710
 /*    3b76c:	c7b00028 */ 	lwc1	$f16,0x28($sp)
 /*    3b770:	46044282 */ 	mul.s	$f10,$f8,$f4
 /*    3b774:	460083a1 */ 	cvt.d.s	$f14,$f16
-/*    3b778:	0fc259d4 */ 	jal	func0f096750
+/*    3b778:	0fc259d4 */ 	jal	atan2f
 /*    3b77c:	46005321 */ 	cvt.d.s	$f12,$f10
 /*    3b780:	44829000 */ 	mtc1	$v0,$f18
 /*    3b784:	00000000 */ 	nop