diff --git a/asm/libnw4r_math/math_arithmetic_804415c0.s b/asm/libnw4r_math/math_arithmetic.s
similarity index 63%
rename from asm/libnw4r_math/math_arithmetic_804415c0.s
rename to asm/libnw4r_math/math_arithmetic.s
index bab29b25..550e3a74 100644
--- a/asm/libnw4r_math/math_arithmetic_804415c0.s
+++ b/asm/libnw4r_math/math_arithmetic.s
@@ -1,5 +1,114 @@
 .include "macros.inc"
 
+.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
+.global FExp__Q34nw4r4math6detailFf
+FExp__Q34nw4r4math6detailFf:
+/* 800FE910 000FA750  C0 02 92 58 */	lfs f0, "@2456"@sda21(r2)
+/* 800FE914 000FA754  94 21 FF D0 */	stwu r1, -0x30(r1)
+/* 800FE918 000FA758  EC 00 00 72 */	fmuls f0, f0, f1
+/* 800FE91C 000FA75C  38 61 00 20 */	addi r3, r1, 0x20
+/* 800FE920 000FA760  F0 03 D0 00 */	psq_st f0, 0x0(r3), 1, qr5
+/* 800FE924 000FA764  38 61 00 0C */	addi r3, r1, 0xc
+/* 800FE928 000FA768  A8 01 00 20 */	lha r0, 0x20(r1)
+/* 800FE92C 000FA76C  B0 01 00 0C */	sth r0, 0xc(r1)
+/* 800FE930 000FA770  B0 01 00 0E */	sth r0, 0xe(r1)
+/* 800FE934 000FA774  E0 83 D0 00 */	psq_l f4, 0x0(r3), 1, qr5
+/* 800FE938 000FA778  38 61 00 18 */	addi r3, r1, 0x18
+/* 800FE93C 000FA77C  C0 62 92 5C */	lfs f3, "@2457_8055F1DC"@sda21(r2)
+/* 800FE940 000FA780  FC 40 20 18 */	frsp f2, f4
+/* 800FE944 000FA784  C0 02 92 60 */	lfs f0, "@2458"@sda21(r2)
+/* 800FE948 000FA788  D0 81 00 1C */	stfs f4, 0x1c(r1)
+/* 800FE94C 000FA78C  EC 43 00 B2 */	fmuls f2, f3, f2
+/* 800FE950 000FA790  EC 21 10 28 */	fsubs f1, f1, f2
+/* 800FE954 000FA794  EC 23 08 2A */	fadds f1, f3, f1
+/* 800FE958 000FA798  EC 20 00 72 */	fmuls f1, f0, f1
+/* 800FE95C 000FA79C  F0 23 B0 00 */	psq_st f1, 0x0(r3), 1, qr3
+/* 800FE960 000FA7A0  38 61 00 0A */	addi r3, r1, 0xa
+/* 800FE964 000FA7A4  A0 81 00 18 */	lhz r4, 0x18(r1)
+/* 800FE968 000FA7A8  B0 81 00 0A */	sth r4, 0xa(r1)
+/* 800FE96C 000FA7AC  B0 81 00 08 */	sth r4, 0x8(r1)
+/* 800FE970 000FA7B0  E0 03 B0 00 */	psq_l f0, 0x0(r3), 1, qr3
+/* 800FE974 000FA7B4  3C A0 80 44 */	lis r5, "sExpTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"@ha
+/* 800FE978 000FA7B8  54 86 18 38 */	slwi r6, r4, 3
+/* 800FE97C 000FA7BC  54 03 B8 10 */	slwi r3, r0, 23
+/* 800FE980 000FA7C0  38 A5 15 C0 */	addi r5, r5, "sExpTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"@l
+/* 800FE984 000FA7C4  EC 41 00 28 */	fsubs f2, f1, f0
+/* 800FE988 000FA7C8  7C 85 32 14 */	add r4, r5, r6
+/* 800FE98C 000FA7CC  7C 05 34 2E */	lfsx f0, r5, r6
+/* 800FE990 000FA7D0  C0 24 00 04 */	lfs f1, 0x4(r4)
+/* 800FE994 000FA7D4  EC 22 00 72 */	fmuls f1, f2, f1
+/* 800FE998 000FA7D8  EC 00 08 2A */	fadds f0, f0, f1
+/* 800FE99C 000FA7DC  D0 01 00 14 */	stfs f0, 0x14(r1)
+/* 800FE9A0 000FA7E0  80 01 00 14 */	lwz r0, 0x14(r1)
+/* 800FE9A4 000FA7E4  7C 03 02 14 */	add r0, r3, r0
+/* 800FE9A8 000FA7E8  54 00 00 7E */	clrlwi r0, r0, 1
+/* 800FE9AC 000FA7EC  90 01 00 10 */	stw r0, 0x10(r1)
+/* 800FE9B0 000FA7F0  C0 21 00 10 */	lfs f1, 0x10(r1)
+/* 800FE9B4 000FA7F4  38 21 00 30 */	addi r1, r1, 0x30
+/* 800FE9B8 000FA7F8  4E 80 00 20 */	blr
+/* 800FE9BC 000FA7FC  00 00 00 00 */	.4byte 0x00000000
+.global FLog__Q34nw4r4math6detailFf
+FLog__Q34nw4r4math6detailFf:
+/* 800FE9C0 000FA800  94 21 FF D0 */	stwu r1, -0x30(r1)
+/* 800FE9C4 000FA804  D0 21 00 20 */	stfs f1, 0x20(r1)
+/* 800FE9C8 000FA808  38 61 00 0C */	addi r3, r1, 0xc
+/* 800FE9CC 000FA80C  D0 21 00 18 */	stfs f1, 0x18(r1)
+/* 800FE9D0 000FA810  80 01 00 20 */	lwz r0, 0x20(r1)
+/* 800FE9D4 000FA814  80 81 00 18 */	lwz r4, 0x18(r1)
+/* 800FE9D8 000FA818  54 05 4E 3E */	extrwi r5, r0, 8, 1
+/* 800FE9DC 000FA81C  38 05 FF 81 */	addi r0, r5, -0x7f
+/* 800FE9E0 000FA820  54 84 02 40 */	rlwinm r4, r4, 0, 9, 0
+/* 800FE9E4 000FA824  B0 01 00 0C */	sth r0, 0xc(r1)
+/* 800FE9E8 000FA828  64 80 3F 80 */	oris r0, r4, 0x3f80
+/* 800FE9EC 000FA82C  90 01 00 1C */	stw r0, 0x1c(r1)
+/* 800FE9F0 000FA830  C0 81 00 1C */	lfs f4, 0x1c(r1)
+/* 800FE9F4 000FA834  E0 43 D0 00 */	psq_l f2, 0x0(r3), 1, qr5
+/* 800FE9F8 000FA838  38 61 00 10 */	addi r3, r1, 0x10
+/* 800FE9FC 000FA83C  C0 22 92 68 */	lfs f1, "@2495"@sda21(r2)
+/* 800FEA00 000FA840  C0 02 92 64 */	lfs f0, "@2494"@sda21(r2)
+/* 800FEA04 000FA844  FC 60 10 18 */	frsp f3, f2
+/* 800FEA08 000FA848  EC 24 08 28 */	fsubs f1, f4, f1
+/* 800FEA0C 000FA84C  D0 41 00 14 */	stfs f2, 0x14(r1)
+/* 800FEA10 000FA850  EC 40 00 72 */	fmuls f2, f0, f1
+/* 800FEA14 000FA854  F0 43 B0 00 */	psq_st f2, 0x0(r3), 1, qr3
+/* 800FEA18 000FA858  38 61 00 0A */	addi r3, r1, 0xa
+/* 800FEA1C 000FA85C  A0 01 00 10 */	lhz r0, 0x10(r1)
+/* 800FEA20 000FA860  B0 01 00 0A */	sth r0, 0xa(r1)
+/* 800FEA24 000FA864  B0 01 00 08 */	sth r0, 0x8(r1)
+/* 800FEA28 000FA868  E0 23 B0 00 */	psq_l f1, 0x0(r3), 1, qr3
+/* 800FEA2C 000FA86C  3C 80 80 44 */	lis r4, "sLogTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"@ha
+/* 800FEA30 000FA870  C0 02 92 5C */	lfs f0, "@2457_8055F1DC"@sda21(r2)
+/* 800FEA34 000FA874  54 00 18 38 */	slwi r0, r0, 3
+/* 800FEA38 000FA878  38 84 16 C8 */	addi r4, r4, "sLogTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"@l
+/* 800FEA3C 000FA87C  EC 82 08 28 */	fsubs f4, f2, f1
+/* 800FEA40 000FA880  7C 64 02 14 */	add r3, r4, r0
+/* 800FEA44 000FA884  7C 24 04 2E */	lfsx f1, r4, r0
+/* 800FEA48 000FA888  C0 43 00 04 */	lfs f2, 0x4(r3)
+/* 800FEA4C 000FA88C  EC 00 00 F2 */	fmuls f0, f0, f3
+/* 800FEA50 000FA890  EC 44 00 B2 */	fmuls f2, f4, f2
+/* 800FEA54 000FA894  EC 21 10 2A */	fadds f1, f1, f2
+/* 800FEA58 000FA898  EC 21 00 2A */	fadds f1, f1, f0
+/* 800FEA5C 000FA89C  38 21 00 30 */	addi r1, r1, 0x30
+/* 800FEA60 000FA8A0  4E 80 00 20 */	blr
+/* 800FEA64 000FA8A4  00 00 00 00 */	.4byte 0x00000000
+/* 800FEA68 000FA8A8  00 00 00 00 */	.4byte 0x00000000
+/* 800FEA6C 000FA8AC  00 00 00 00 */	.4byte 0x00000000
+.global FrSqrt__Q24nw4r4mathFf
+FrSqrt__Q24nw4r4mathFf:
+/* 800FEA70 000FA8B0  FC 00 08 34 */	frsqrte f0, f1
+/* 800FEA74 000FA8B4  C0 42 92 6C */	lfs f2, "@2497"@sda21(r2)
+/* 800FEA78 000FA8B8  C0 62 92 70 */	lfs f3, "@2498"@sda21(r2)
+/* 800FEA7C 000FA8BC  EC 80 00 32 */	fmuls f4, f0, f0
+/* 800FEA80 000FA8C0  EC 00 00 B2 */	fmuls f0, f0, f2
+/* 800FEA84 000FA8C4  EC 84 18 7C */	fnmsubs f4, f4, f1, f3
+/* 800FEA88 000FA8C8  EC 04 00 32 */	fmuls f0, f4, f0
+/* 800FEA8C 000FA8CC  FC 20 00 90 */	fmr f1, f0
+/* 800FEA90 000FA8D0  4E 80 00 20 */	blr
+/* 800FEA94 000FA8D4  00 00 00 00 */	.4byte 0x00000000
+/* 800FEA98 000FA8D8  00 00 00 00 */	.4byte 0x00000000
+/* 800FEA9C 000FA8DC  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
 .section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
 .global "sExpTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"
 "sExpTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@":
@@ -588,3 +697,41 @@
 	.4byte 0x3B00200B
 	.4byte 0x3F317218
 	.4byte 0x3AFFC014
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@2456"
+"@2456":
+
+	.4byte 0x3FB8AA3B
+
+.global "@2457_8055F1DC"
+"@2457_8055F1DC":
+
+	.4byte 0x3F317218
+
+.global "@2458"
+"@2458":
+
+	.4byte 0x41B8AA3B
+
+.global "@2494"
+"@2494":
+
+	.4byte 0x43800000
+
+.global "@2495"
+"@2495":
+
+	.4byte 0x3F800000
+
+.global "@2497"
+"@2497":
+
+	.4byte 0x3F000000
+
+.global "@2498"
+"@2498":
+
+	.4byte 0x40400000
+	.4byte 0
diff --git a/asm/libnw4r_math/math_arithmetic_800fe910.s b/asm/libnw4r_math/math_arithmetic_800fe910.s
deleted file mode 100644
index d414a42b..00000000
--- a/asm/libnw4r_math/math_arithmetic_800fe910.s
+++ /dev/null
@@ -1,109 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
-.global FExp__Q34nw4r4math6detailFf
-FExp__Q34nw4r4math6detailFf:
-/* 800FE910 000FA750  C0 02 92 58 */	lfs f0, "@2456"@sda21(r2)
-/* 800FE914 000FA754  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 800FE918 000FA758  EC 00 00 72 */	fmuls f0, f0, f1
-/* 800FE91C 000FA75C  38 61 00 20 */	addi r3, r1, 0x20
-/* 800FE920 000FA760  F0 03 D0 00 */	psq_st f0, 0x0(r3), 1, qr5
-/* 800FE924 000FA764  38 61 00 0C */	addi r3, r1, 0xc
-/* 800FE928 000FA768  A8 01 00 20 */	lha r0, 0x20(r1)
-/* 800FE92C 000FA76C  B0 01 00 0C */	sth r0, 0xc(r1)
-/* 800FE930 000FA770  B0 01 00 0E */	sth r0, 0xe(r1)
-/* 800FE934 000FA774  E0 83 D0 00 */	psq_l f4, 0x0(r3), 1, qr5
-/* 800FE938 000FA778  38 61 00 18 */	addi r3, r1, 0x18
-/* 800FE93C 000FA77C  C0 62 92 5C */	lfs f3, "@2457_8055F1DC"@sda21(r2)
-/* 800FE940 000FA780  FC 40 20 18 */	frsp f2, f4
-/* 800FE944 000FA784  C0 02 92 60 */	lfs f0, "@2458"@sda21(r2)
-/* 800FE948 000FA788  D0 81 00 1C */	stfs f4, 0x1c(r1)
-/* 800FE94C 000FA78C  EC 43 00 B2 */	fmuls f2, f3, f2
-/* 800FE950 000FA790  EC 21 10 28 */	fsubs f1, f1, f2
-/* 800FE954 000FA794  EC 23 08 2A */	fadds f1, f3, f1
-/* 800FE958 000FA798  EC 20 00 72 */	fmuls f1, f0, f1
-/* 800FE95C 000FA79C  F0 23 B0 00 */	psq_st f1, 0x0(r3), 1, qr3
-/* 800FE960 000FA7A0  38 61 00 0A */	addi r3, r1, 0xa
-/* 800FE964 000FA7A4  A0 81 00 18 */	lhz r4, 0x18(r1)
-/* 800FE968 000FA7A8  B0 81 00 0A */	sth r4, 0xa(r1)
-/* 800FE96C 000FA7AC  B0 81 00 08 */	sth r4, 0x8(r1)
-/* 800FE970 000FA7B0  E0 03 B0 00 */	psq_l f0, 0x0(r3), 1, qr3
-/* 800FE974 000FA7B4  3C A0 80 44 */	lis r5, "sExpTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"@ha
-/* 800FE978 000FA7B8  54 86 18 38 */	slwi r6, r4, 3
-/* 800FE97C 000FA7BC  54 03 B8 10 */	slwi r3, r0, 23
-/* 800FE980 000FA7C0  38 A5 15 C0 */	addi r5, r5, "sExpTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"@l
-/* 800FE984 000FA7C4  EC 41 00 28 */	fsubs f2, f1, f0
-/* 800FE988 000FA7C8  7C 85 32 14 */	add r4, r5, r6
-/* 800FE98C 000FA7CC  7C 05 34 2E */	lfsx f0, r5, r6
-/* 800FE990 000FA7D0  C0 24 00 04 */	lfs f1, 0x4(r4)
-/* 800FE994 000FA7D4  EC 22 00 72 */	fmuls f1, f2, f1
-/* 800FE998 000FA7D8  EC 00 08 2A */	fadds f0, f0, f1
-/* 800FE99C 000FA7DC  D0 01 00 14 */	stfs f0, 0x14(r1)
-/* 800FE9A0 000FA7E0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 800FE9A4 000FA7E4  7C 03 02 14 */	add r0, r3, r0
-/* 800FE9A8 000FA7E8  54 00 00 7E */	clrlwi r0, r0, 1
-/* 800FE9AC 000FA7EC  90 01 00 10 */	stw r0, 0x10(r1)
-/* 800FE9B0 000FA7F0  C0 21 00 10 */	lfs f1, 0x10(r1)
-/* 800FE9B4 000FA7F4  38 21 00 30 */	addi r1, r1, 0x30
-/* 800FE9B8 000FA7F8  4E 80 00 20 */	blr
-/* 800FE9BC 000FA7FC  00 00 00 00 */	.4byte 0x00000000
-.global FLog__Q34nw4r4math6detailFf
-FLog__Q34nw4r4math6detailFf:
-/* 800FE9C0 000FA800  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 800FE9C4 000FA804  D0 21 00 20 */	stfs f1, 0x20(r1)
-/* 800FE9C8 000FA808  38 61 00 0C */	addi r3, r1, 0xc
-/* 800FE9CC 000FA80C  D0 21 00 18 */	stfs f1, 0x18(r1)
-/* 800FE9D0 000FA810  80 01 00 20 */	lwz r0, 0x20(r1)
-/* 800FE9D4 000FA814  80 81 00 18 */	lwz r4, 0x18(r1)
-/* 800FE9D8 000FA818  54 05 4E 3E */	extrwi r5, r0, 8, 1
-/* 800FE9DC 000FA81C  38 05 FF 81 */	addi r0, r5, -0x7f
-/* 800FE9E0 000FA820  54 84 02 40 */	rlwinm r4, r4, 0, 9, 0
-/* 800FE9E4 000FA824  B0 01 00 0C */	sth r0, 0xc(r1)
-/* 800FE9E8 000FA828  64 80 3F 80 */	oris r0, r4, 0x3f80
-/* 800FE9EC 000FA82C  90 01 00 1C */	stw r0, 0x1c(r1)
-/* 800FE9F0 000FA830  C0 81 00 1C */	lfs f4, 0x1c(r1)
-/* 800FE9F4 000FA834  E0 43 D0 00 */	psq_l f2, 0x0(r3), 1, qr5
-/* 800FE9F8 000FA838  38 61 00 10 */	addi r3, r1, 0x10
-/* 800FE9FC 000FA83C  C0 22 92 68 */	lfs f1, "@2495"@sda21(r2)
-/* 800FEA00 000FA840  C0 02 92 64 */	lfs f0, "@2494"@sda21(r2)
-/* 800FEA04 000FA844  FC 60 10 18 */	frsp f3, f2
-/* 800FEA08 000FA848  EC 24 08 28 */	fsubs f1, f4, f1
-/* 800FEA0C 000FA84C  D0 41 00 14 */	stfs f2, 0x14(r1)
-/* 800FEA10 000FA850  EC 40 00 72 */	fmuls f2, f0, f1
-/* 800FEA14 000FA854  F0 43 B0 00 */	psq_st f2, 0x0(r3), 1, qr3
-/* 800FEA18 000FA858  38 61 00 0A */	addi r3, r1, 0xa
-/* 800FEA1C 000FA85C  A0 01 00 10 */	lhz r0, 0x10(r1)
-/* 800FEA20 000FA860  B0 01 00 0A */	sth r0, 0xa(r1)
-/* 800FEA24 000FA864  B0 01 00 08 */	sth r0, 0x8(r1)
-/* 800FEA28 000FA868  E0 23 B0 00 */	psq_l f1, 0x0(r3), 1, qr3
-/* 800FEA2C 000FA86C  3C 80 80 44 */	lis r4, "sLogTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"@ha
-/* 800FEA30 000FA870  C0 02 92 5C */	lfs f0, "@2457_8055F1DC"@sda21(r2)
-/* 800FEA34 000FA874  54 00 18 38 */	slwi r0, r0, 3
-/* 800FEA38 000FA878  38 84 16 C8 */	addi r4, r4, "sLogTbl__Q34nw4r4math29@unnamed@math_arithmetic_cpp@"@l
-/* 800FEA3C 000FA87C  EC 82 08 28 */	fsubs f4, f2, f1
-/* 800FEA40 000FA880  7C 64 02 14 */	add r3, r4, r0
-/* 800FEA44 000FA884  7C 24 04 2E */	lfsx f1, r4, r0
-/* 800FEA48 000FA888  C0 43 00 04 */	lfs f2, 0x4(r3)
-/* 800FEA4C 000FA88C  EC 00 00 F2 */	fmuls f0, f0, f3
-/* 800FEA50 000FA890  EC 44 00 B2 */	fmuls f2, f4, f2
-/* 800FEA54 000FA894  EC 21 10 2A */	fadds f1, f1, f2
-/* 800FEA58 000FA898  EC 21 00 2A */	fadds f1, f1, f0
-/* 800FEA5C 000FA89C  38 21 00 30 */	addi r1, r1, 0x30
-/* 800FEA60 000FA8A0  4E 80 00 20 */	blr
-/* 800FEA64 000FA8A4  00 00 00 00 */	.4byte 0x00000000
-/* 800FEA68 000FA8A8  00 00 00 00 */	.4byte 0x00000000
-/* 800FEA6C 000FA8AC  00 00 00 00 */	.4byte 0x00000000
-.global FrSqrt__Q24nw4r4mathFf
-FrSqrt__Q24nw4r4mathFf:
-/* 800FEA70 000FA8B0  FC 00 08 34 */	frsqrte f0, f1
-/* 800FEA74 000FA8B4  C0 42 92 6C */	lfs f2, "@2497"@sda21(r2)
-/* 800FEA78 000FA8B8  C0 62 92 70 */	lfs f3, "@2498"@sda21(r2)
-/* 800FEA7C 000FA8BC  EC 80 00 32 */	fmuls f4, f0, f0
-/* 800FEA80 000FA8C0  EC 00 00 B2 */	fmuls f0, f0, f2
-/* 800FEA84 000FA8C4  EC 84 18 7C */	fnmsubs f4, f4, f1, f3
-/* 800FEA88 000FA8C8  EC 04 00 32 */	fmuls f0, f4, f0
-/* 800FEA8C 000FA8CC  FC 20 00 90 */	fmr f1, f0
-/* 800FEA90 000FA8D0  4E 80 00 20 */	blr
-/* 800FEA94 000FA8D4  00 00 00 00 */	.4byte 0x00000000
-/* 800FEA98 000FA8D8  00 00 00 00 */	.4byte 0x00000000
-/* 800FEA9C 000FA8DC  00 00 00 00 */	.4byte 0x00000000
diff --git a/asm/libnw4r_math/math_arithmetic_8055f1d8.s b/asm/libnw4r_math/math_arithmetic_8055f1d8.s
deleted file mode 100644
index 3bb8eecd..00000000
--- a/asm/libnw4r_math/math_arithmetic_8055f1d8.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@2456"
-"@2456":
-
-	.4byte 0x3FB8AA3B
-
-.global "@2457_8055F1DC"
-"@2457_8055F1DC":
-
-	.4byte 0x3F317218
-
-.global "@2458"
-"@2458":
-
-	.4byte 0x41B8AA3B
-
-.global "@2494"
-"@2494":
-
-	.4byte 0x43800000
-
-.global "@2495"
-"@2495":
-
-	.4byte 0x3F800000
-
-.global "@2497"
-"@2497":
-
-	.4byte 0x3F000000
-
-.global "@2498"
-"@2498":
-
-	.4byte 0x40400000
-	.4byte 0
diff --git a/asm/libnw4r_math/math_geometry_800ff1f0.s b/asm/libnw4r_math/math_geometry.s
similarity index 99%
rename from asm/libnw4r_math/math_geometry_800ff1f0.s
rename to asm/libnw4r_math/math_geometry.s
index 7a87470d..2e1123d6 100644
--- a/asm/libnw4r_math/math_geometry_800ff1f0.s
+++ b/asm/libnw4r_math/math_geometry.s
@@ -849,3 +849,25 @@ lbl_800FFDD4:
 /* 800FFDD4 000FBC14  38 21 00 20 */	addi r1, r1, 0x20
 /* 800FFDD8 000FBC18  4E 80 00 20 */	blr
 /* 800FFDDC 000FBC1C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@10654"
+"@10654":
+
+	.4byte 0x3F000000
+
+.global "@10655"
+"@10655":
+
+	.4byte 0
+
+.global "@10661"
+"@10661":
+
+	.4byte 0x3CC90FDB
+
+.global "@10662"
+"@10662":
+
+	.4byte 0x3F360B61
diff --git a/asm/libnw4r_math/math_geometry_8055f230.s b/asm/libnw4r_math/math_geometry_8055f230.s
deleted file mode 100644
index 8517ceca..00000000
--- a/asm/libnw4r_math/math_geometry_8055f230.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@10654"
-"@10654":
-
-	.4byte 0x3F000000
-
-.global "@10655"
-"@10655":
-
-	.4byte 0
-
-.global "@10661"
-"@10661":
-
-	.4byte 0x3CC90FDB
-
-.global "@10662"
-"@10662":
-
-	.4byte 0x3F360B61
diff --git a/asm/libnw4r_math/math_triangular_80408f10.s b/asm/libnw4r_math/math_triangular.s
similarity index 58%
rename from asm/libnw4r_math/math_triangular_80408f10.s
rename to asm/libnw4r_math/math_triangular.s
index a19cad80..15c0deca 100644
--- a/asm/libnw4r_math/math_triangular_80408f10.s
+++ b/asm/libnw4r_math/math_triangular.s
@@ -1,5 +1,254 @@
 .include "macros.inc"
 
+.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
+.global SinFIdx__Q24nw4r4mathFf
+SinFIdx__Q24nw4r4mathFf:
+/* 800FEAA0 000FA8E0  FC 60 0A 10 */	fabs f3, f1
+/* 800FEAA4 000FA8E4  94 21 FF F0 */	stwu r1, -0x10(r1)
+/* 800FEAA8 000FA8E8  C0 02 92 78 */	lfs f0, "@2956"@sda21(r2)
+/* 800FEAAC 000FA8EC  48 00 00 08 */	b lbl_800FEAB4
+.global lbl_800FEAB0
+lbl_800FEAB0:
+/* 800FEAB0 000FA8F0  EC 63 00 28 */	fsubs f3, f3, f0
+.global lbl_800FEAB4
+lbl_800FEAB4:
+/* 800FEAB4 000FA8F4  FC 03 00 40 */	fcmpo cr0, f3, f0
+/* 800FEAB8 000FA8F8  41 81 FF F8 */	bgt lbl_800FEAB0
+/* 800FEABC 000FA8FC  FC 00 18 18 */	frsp f0, f3
+/* 800FEAC0 000FA900  38 61 00 0C */	addi r3, r1, 0xc
+/* 800FEAC4 000FA904  F0 03 B0 00 */	psq_st f0, 0x0(r3), 1, qr3
+/* 800FEAC8 000FA908  38 61 00 08 */	addi r3, r1, 0x8
+/* 800FEACC 000FA90C  A0 01 00 0C */	lhz r0, 0xc(r1)
+/* 800FEAD0 000FA910  B0 01 00 08 */	sth r0, 0x8(r1)
+/* 800FEAD4 000FA914  B0 01 00 0A */	sth r0, 0xa(r1)
+/* 800FEAD8 000FA918  E0 43 B0 00 */	psq_l f2, 0x0(r3), 1, qr3
+/* 800FEADC 000FA91C  3C 80 80 41 */	lis r4, gSinCosTbl__Q34nw4r4math6detail@ha
+/* 800FEAE0 000FA920  54 00 25 36 */	rlwinm r0, r0, 4, 20, 27
+/* 800FEAE4 000FA924  C0 02 92 7C */	lfs f0, "@2957_8055F1FC"@sda21(r2)
+/* 800FEAE8 000FA928  38 84 8F 10 */	addi r4, r4, gSinCosTbl__Q34nw4r4math6detail@l
+/* 800FEAEC 000FA92C  EC 83 10 28 */	fsubs f4, f3, f2
+/* 800FEAF0 000FA930  7C 64 02 14 */	add r3, r4, r0
+/* 800FEAF4 000FA934  FC 01 00 40 */	fcmpo cr0, f1, f0
+/* 800FEAF8 000FA938  C0 63 00 08 */	lfs f3, 0x8(r3)
+/* 800FEAFC 000FA93C  7C 44 04 2E */	lfsx f2, r4, r0
+/* 800FEB00 000FA940  EC 04 00 F2 */	fmuls f0, f4, f3
+/* 800FEB04 000FA944  EC 22 00 2A */	fadds f1, f2, f0
+/* 800FEB08 000FA948  40 80 00 08 */	bge lbl_800FEB10
+/* 800FEB0C 000FA94C  FC 20 08 50 */	fneg f1, f1
+.global lbl_800FEB10
+lbl_800FEB10:
+/* 800FEB10 000FA950  38 21 00 10 */	addi r1, r1, 0x10
+/* 800FEB14 000FA954  4E 80 00 20 */	blr
+/* 800FEB18 000FA958  00 00 00 00 */	.4byte 0x00000000
+/* 800FEB1C 000FA95C  00 00 00 00 */	.4byte 0x00000000
+.global CosFIdx__Q24nw4r4mathFf
+CosFIdx__Q24nw4r4mathFf:
+/* 800FEB20 000FA960  FC 20 0A 10 */	fabs f1, f1
+/* 800FEB24 000FA964  94 21 FF F0 */	stwu r1, -0x10(r1)
+/* 800FEB28 000FA968  C0 02 92 78 */	lfs f0, "@2956"@sda21(r2)
+/* 800FEB2C 000FA96C  48 00 00 08 */	b lbl_800FEB34
+.global lbl_800FEB30
+lbl_800FEB30:
+/* 800FEB30 000FA970  EC 21 00 28 */	fsubs f1, f1, f0
+.global lbl_800FEB34
+lbl_800FEB34:
+/* 800FEB34 000FA974  FC 01 00 40 */	fcmpo cr0, f1, f0
+/* 800FEB38 000FA978  41 81 FF F8 */	bgt lbl_800FEB30
+/* 800FEB3C 000FA97C  FC 00 08 18 */	frsp f0, f1
+/* 800FEB40 000FA980  38 61 00 0C */	addi r3, r1, 0xc
+/* 800FEB44 000FA984  F0 03 B0 00 */	psq_st f0, 0x0(r3), 1, qr3
+/* 800FEB48 000FA988  38 61 00 08 */	addi r3, r1, 0x8
+/* 800FEB4C 000FA98C  A0 01 00 0C */	lhz r0, 0xc(r1)
+/* 800FEB50 000FA990  B0 01 00 08 */	sth r0, 0x8(r1)
+/* 800FEB54 000FA994  B0 01 00 0A */	sth r0, 0xa(r1)
+/* 800FEB58 000FA998  E0 03 B0 00 */	psq_l f0, 0x0(r3), 1, qr3
+/* 800FEB5C 000FA99C  3C 60 80 41 */	lis r3, gSinCosTbl__Q34nw4r4math6detail@ha
+/* 800FEB60 000FA9A0  54 00 25 36 */	rlwinm r0, r0, 4, 20, 27
+/* 800FEB64 000FA9A4  38 63 8F 10 */	addi r3, r3, gSinCosTbl__Q34nw4r4math6detail@l
+/* 800FEB68 000FA9A8  EC 41 00 28 */	fsubs f2, f1, f0
+/* 800FEB6C 000FA9AC  7C 63 02 14 */	add r3, r3, r0
+/* 800FEB70 000FA9B0  C0 23 00 0C */	lfs f1, 0xc(r3)
+/* 800FEB74 000FA9B4  C0 03 00 04 */	lfs f0, 0x4(r3)
+/* 800FEB78 000FA9B8  EC 22 00 72 */	fmuls f1, f2, f1
+/* 800FEB7C 000FA9BC  EC 20 08 2A */	fadds f1, f0, f1
+/* 800FEB80 000FA9C0  38 21 00 10 */	addi r1, r1, 0x10
+/* 800FEB84 000FA9C4  4E 80 00 20 */	blr
+/* 800FEB88 000FA9C8  00 00 00 00 */	.4byte 0x00000000
+/* 800FEB8C 000FA9CC  00 00 00 00 */	.4byte 0x00000000
+.global SinCosFIdx__Q24nw4r4mathFPfPff
+SinCosFIdx__Q24nw4r4mathFPfPff:
+/* 800FEB90 000FA9D0  FC 00 0A 10 */	fabs f0, f1
+/* 800FEB94 000FA9D4  3C A0 80 41 */	lis r5, gSinCosTbl__Q34nw4r4math6detail@ha
+/* 800FEB98 000FA9D8  C0 42 92 78 */	lfs f2, "@2956"@sda21(r2)
+/* 800FEB9C 000FA9DC  38 A5 8F 10 */	addi r5, r5, gSinCosTbl__Q34nw4r4math6detail@l
+/* 800FEBA0 000FA9E0  F0 03 B0 00 */	psq_st f0, 0x0(r3), 1, qr3
+/* 800FEBA4 000FA9E4  FC 00 10 00 */	fcmpu cr0, f0, f2
+/* 800FEBA8 000FA9E8  40 81 00 18 */	ble lbl_800FEBC0
+/* 800FEBAC 000FA9EC  60 00 00 00 */	nop
+.global lbl_800FEBB0
+lbl_800FEBB0:
+/* 800FEBB0 000FA9F0  EC 00 10 28 */	fsubs f0, f0, f2
+/* 800FEBB4 000FA9F4  FC 00 10 00 */	fcmpu cr0, f0, f2
+/* 800FEBB8 000FA9F8  41 81 FF F8 */	bgt lbl_800FEBB0
+/* 800FEBBC 000FA9FC  F0 03 B0 00 */	psq_st f0, 0x0(r3), 1, qr3
+.global lbl_800FEBC0
+lbl_800FEBC0:
+/* 800FEBC0 000FAA00  A0 03 00 00 */	lhz r0, 0x0(r3)
+/* 800FEBC4 000FAA04  EC 82 10 28 */	fsubs f4, f2, f2
+/* 800FEBC8 000FAA08  54 00 25 36 */	rlwinm r0, r0, 4, 20, 27
+/* 800FEBCC 000FAA0C  7C A5 02 14 */	add r5, r5, r0
+/* 800FEBD0 000FAA10  E0 43 B0 00 */	psq_l f2, 0x0(r3), 1, qr3
+/* 800FEBD4 000FAA14  E0 65 00 00 */	psq_l f3, 0x0(r5), 0, qr0
+/* 800FEBD8 000FAA18  FC 01 20 00 */	fcmpu cr0, f1, f4
+/* 800FEBDC 000FAA1C  EC 40 10 28 */	fsubs f2, f0, f2
+/* 800FEBE0 000FAA20  E0 05 00 08 */	psq_l f0, 0x8(r5), 0, qr0
+/* 800FEBE4 000FAA24  10 00 18 9C */	ps_madds0 f0, f0, f2, f3
+/* 800FEBE8 000FAA28  10 40 04 A0 */	ps_merge10 f2, f0, f0
+/* 800FEBEC 000FAA2C  F0 44 80 00 */	psq_st f2, 0x0(r4), 1, qr0
+/* 800FEBF0 000FAA30  40 80 00 08 */	bge lbl_800FEBF8
+/* 800FEBF4 000FAA34  10 00 00 50 */	ps_neg f0, f0
+.global lbl_800FEBF8
+lbl_800FEBF8:
+/* 800FEBF8 000FAA38  F0 03 80 00 */	psq_st f0, 0x0(r3), 1, qr0
+/* 800FEBFC 000FAA3C  4E 80 00 20 */	blr
+.global Atan2FIdx__Q24nw4r4mathFff
+Atan2FIdx__Q24nw4r4mathFff:
+/* 800FEC00 000FAA40  C0 02 92 7C */	lfs f0, "@2957_8055F1FC"@sda21(r2)
+/* 800FEC04 000FAA44  94 21 FF E0 */	stwu r1, -0x20(r1)
+/* 800FEC08 000FAA48  FC 00 10 00 */	fcmpu cr0, f0, f2
+/* 800FEC0C 000FAA4C  40 82 00 14 */	bne lbl_800FEC20
+/* 800FEC10 000FAA50  FC 00 08 00 */	fcmpu cr0, f0, f1
+/* 800FEC14 000FAA54  40 82 00 0C */	bne lbl_800FEC20
+/* 800FEC18 000FAA58  FC 20 00 90 */	fmr f1, f0
+/* 800FEC1C 000FAA5C  48 00 01 9C */	b lbl_800FEDB8
+.global lbl_800FEC20
+lbl_800FEC20:
+/* 800FEC20 000FAA60  C0 82 92 7C */	lfs f4, "@2957_8055F1FC"@sda21(r2)
+/* 800FEC24 000FAA64  FC 02 20 40 */	fcmpo cr0, f2, f4
+/* 800FEC28 000FAA68  4C 41 13 82 */	cror eq, gt, eq
+/* 800FEC2C 000FAA6C  40 82 00 6C */	bne lbl_800FEC98
+/* 800FEC30 000FAA70  FC 01 20 40 */	fcmpo cr0, f1, f4
+/* 800FEC34 000FAA74  4C 41 13 82 */	cror eq, gt, eq
+/* 800FEC38 000FAA78  40 82 00 30 */	bne lbl_800FEC68
+/* 800FEC3C 000FAA7C  FC 02 08 40 */	fcmpo cr0, f2, f1
+/* 800FEC40 000FAA80  4C 41 13 82 */	cror eq, gt, eq
+/* 800FEC44 000FAA84  40 82 00 10 */	bne lbl_800FEC54
+/* 800FEC48 000FAA88  FC 60 10 90 */	fmr f3, f2
+/* 800FEC4C 000FAA8C  38 00 00 00 */	li r0, 0x0
+/* 800FEC50 000FAA90  48 00 00 BC */	b lbl_800FED0C
+.global lbl_800FEC54
+lbl_800FEC54:
+/* 800FEC54 000FAA94  FC 60 08 90 */	fmr f3, f1
+/* 800FEC58 000FAA98  C0 82 92 84 */	lfs f4, "@3003"@sda21(r2)
+/* 800FEC5C 000FAA9C  FC 20 10 90 */	fmr f1, f2
+/* 800FEC60 000FAAA0  38 00 00 01 */	li r0, 0x1
+/* 800FEC64 000FAAA4  48 00 00 A8 */	b lbl_800FED0C
+.global lbl_800FEC68
+lbl_800FEC68:
+/* 800FEC68 000FAAA8  FC 20 08 50 */	fneg f1, f1
+/* 800FEC6C 000FAAAC  FC 02 08 40 */	fcmpo cr0, f2, f1
+/* 800FEC70 000FAAB0  4C 41 13 82 */	cror eq, gt, eq
+/* 800FEC74 000FAAB4  40 82 00 10 */	bne lbl_800FEC84
+/* 800FEC78 000FAAB8  FC 60 10 90 */	fmr f3, f2
+/* 800FEC7C 000FAABC  38 00 00 01 */	li r0, 0x1
+/* 800FEC80 000FAAC0  48 00 00 8C */	b lbl_800FED0C
+.global lbl_800FEC84
+lbl_800FEC84:
+/* 800FEC84 000FAAC4  FC 60 08 90 */	fmr f3, f1
+/* 800FEC88 000FAAC8  C0 82 92 88 */	lfs f4, "@3005"@sda21(r2)
+/* 800FEC8C 000FAACC  FC 20 10 90 */	fmr f1, f2
+/* 800FEC90 000FAAD0  38 00 00 00 */	li r0, 0x0
+/* 800FEC94 000FAAD4  48 00 00 78 */	b lbl_800FED0C
+.global lbl_800FEC98
+lbl_800FEC98:
+/* 800FEC98 000FAAD8  FC 01 20 40 */	fcmpo cr0, f1, f4
+/* 800FEC9C 000FAADC  4C 41 13 82 */	cror eq, gt, eq
+/* 800FECA0 000FAAE0  40 82 00 38 */	bne lbl_800FECD8
+/* 800FECA4 000FAAE4  FC 00 10 50 */	fneg f0, f2
+/* 800FECA8 000FAAE8  FC 00 08 40 */	fcmpo cr0, f0, f1
+/* 800FECAC 000FAAEC  4C 41 13 82 */	cror eq, gt, eq
+/* 800FECB0 000FAAF0  40 82 00 14 */	bne lbl_800FECC4
+/* 800FECB4 000FAAF4  FC 60 00 90 */	fmr f3, f0
+/* 800FECB8 000FAAF8  C0 82 92 8C */	lfs f4, "@3032"@sda21(r2)
+/* 800FECBC 000FAAFC  38 00 00 01 */	li r0, 0x1
+/* 800FECC0 000FAB00  48 00 00 4C */	b lbl_800FED0C
+.global lbl_800FECC4
+lbl_800FECC4:
+/* 800FECC4 000FAB04  FC 60 08 90 */	fmr f3, f1
+/* 800FECC8 000FAB08  C0 82 92 84 */	lfs f4, "@3003"@sda21(r2)
+/* 800FECCC 000FAB0C  FC 20 00 90 */	fmr f1, f0
+/* 800FECD0 000FAB10  38 00 00 00 */	li r0, 0x0
+/* 800FECD4 000FAB14  48 00 00 38 */	b lbl_800FED0C
+.global lbl_800FECD8
+lbl_800FECD8:
+/* 800FECD8 000FAB18  FC 00 10 50 */	fneg f0, f2
+/* 800FECDC 000FAB1C  FC 20 08 50 */	fneg f1, f1
+/* 800FECE0 000FAB20  FC 00 08 40 */	fcmpo cr0, f0, f1
+/* 800FECE4 000FAB24  4C 41 13 82 */	cror eq, gt, eq
+/* 800FECE8 000FAB28  40 82 00 14 */	bne lbl_800FECFC
+/* 800FECEC 000FAB2C  FC 60 00 90 */	fmr f3, f0
+/* 800FECF0 000FAB30  C0 82 92 90 */	lfs f4, "@3033_8055F210"@sda21(r2)
+/* 800FECF4 000FAB34  38 00 00 00 */	li r0, 0x0
+/* 800FECF8 000FAB38  48 00 00 14 */	b lbl_800FED0C
+.global lbl_800FECFC
+lbl_800FECFC:
+/* 800FECFC 000FAB3C  FC 60 08 90 */	fmr f3, f1
+/* 800FED00 000FAB40  C0 82 92 88 */	lfs f4, "@3005"@sda21(r2)
+/* 800FED04 000FAB44  FC 20 00 90 */	fmr f1, f0
+/* 800FED08 000FAB48  38 00 00 01 */	li r0, 0x1
+.global lbl_800FED0C
+lbl_800FED0C:
+/* 800FED0C 000FAB4C  2C 00 00 00 */	cmpwi r0, 0x0
+/* 800FED10 000FAB50  41 82 00 58 */	beq lbl_800FED68
+/* 800FED14 000FAB54  EC 21 18 24 */	fdivs f1, f1, f3
+/* 800FED18 000FAB58  C0 02 92 80 */	lfs f0, "@3002"@sda21(r2)
+/* 800FED1C 000FAB5C  38 61 00 14 */	addi r3, r1, 0x14
+/* 800FED20 000FAB60  EC 21 00 32 */	fmuls f1, f1, f0
+/* 800FED24 000FAB64  F0 23 B0 00 */	psq_st f1, 0x0(r3), 1, qr3
+/* 800FED28 000FAB68  38 61 00 0E */	addi r3, r1, 0xe
+/* 800FED2C 000FAB6C  A0 01 00 14 */	lhz r0, 0x14(r1)
+/* 800FED30 000FAB70  B0 01 00 0E */	sth r0, 0xe(r1)
+/* 800FED34 000FAB74  B0 01 00 0C */	sth r0, 0xc(r1)
+/* 800FED38 000FAB78  E0 03 B0 00 */	psq_l f0, 0x0(r3), 1, qr3
+/* 800FED3C 000FAB7C  3C 80 80 44 */	lis r4, "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"@ha
+/* 800FED40 000FAB80  54 00 18 38 */	slwi r0, r0, 3
+/* 800FED44 000FAB84  38 84 1E D0 */	addi r4, r4, "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"@l
+/* 800FED48 000FAB88  EC 41 00 28 */	fsubs f2, f1, f0
+/* 800FED4C 000FAB8C  7C 64 02 14 */	add r3, r4, r0
+/* 800FED50 000FAB90  7C 04 04 2E */	lfsx f0, r4, r0
+/* 800FED54 000FAB94  C0 23 00 04 */	lfs f1, 0x4(r3)
+/* 800FED58 000FAB98  EC 22 00 72 */	fmuls f1, f2, f1
+/* 800FED5C 000FAB9C  EC 00 08 2A */	fadds f0, f0, f1
+/* 800FED60 000FABA0  EC 24 00 28 */	fsubs f1, f4, f0
+/* 800FED64 000FABA4  48 00 00 54 */	b lbl_800FEDB8
+.global lbl_800FED68
+lbl_800FED68:
+/* 800FED68 000FABA8  EC 21 18 24 */	fdivs f1, f1, f3
+/* 800FED6C 000FABAC  C0 02 92 80 */	lfs f0, "@3002"@sda21(r2)
+/* 800FED70 000FABB0  38 61 00 10 */	addi r3, r1, 0x10
+/* 800FED74 000FABB4  EC 21 00 32 */	fmuls f1, f1, f0
+/* 800FED78 000FABB8  F0 23 B0 00 */	psq_st f1, 0x0(r3), 1, qr3
+/* 800FED7C 000FABBC  38 61 00 0A */	addi r3, r1, 0xa
+/* 800FED80 000FABC0  A0 01 00 10 */	lhz r0, 0x10(r1)
+/* 800FED84 000FABC4  B0 01 00 0A */	sth r0, 0xa(r1)
+/* 800FED88 000FABC8  B0 01 00 08 */	sth r0, 0x8(r1)
+/* 800FED8C 000FABCC  E0 03 B0 00 */	psq_l f0, 0x0(r3), 1, qr3
+/* 800FED90 000FABD0  3C 80 80 44 */	lis r4, "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"@ha
+/* 800FED94 000FABD4  54 00 18 38 */	slwi r0, r0, 3
+/* 800FED98 000FABD8  38 84 1E D0 */	addi r4, r4, "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"@l
+/* 800FED9C 000FABDC  EC 41 00 28 */	fsubs f2, f1, f0
+/* 800FEDA0 000FABE0  7C 64 02 14 */	add r3, r4, r0
+/* 800FEDA4 000FABE4  7C 04 04 2E */	lfsx f0, r4, r0
+/* 800FEDA8 000FABE8  C0 23 00 04 */	lfs f1, 0x4(r3)
+/* 800FEDAC 000FABEC  EC 22 00 72 */	fmuls f1, f2, f1
+/* 800FEDB0 000FABF0  EC 00 08 2A */	fadds f0, f0, f1
+/* 800FEDB4 000FABF4  EC 24 00 2A */	fadds f1, f4, f0
+.global lbl_800FEDB8
+lbl_800FEDB8:
+/* 800FEDB8 000FABF8  38 21 00 20 */	addi r1, r1, 0x20
+/* 800FEDBC 000FABFC  4E 80 00 20 */	blr
+.include "macros.inc"
+
 .section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
 .global gSinCosTbl__Q34nw4r4math6detail
 gSinCosTbl__Q34nw4r4math6detail:
@@ -1032,3 +1281,113 @@ gSinCosTbl__Q34nw4r4math6detail:
 	.4byte 0x3F800000
 	.4byte 0x3CC90A35
 	.4byte 0xB99DCF89
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"
+"sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@":
+
+	.4byte 0
+	.4byte 0x3FA2EBF1
+	.4byte 0x3FA2EBF1
+	.4byte 0x3FA29AB1
+	.4byte 0x4022C351
+	.4byte 0x3FA1F923
+	.4byte 0x4073BFE2
+	.4byte 0x3FA10925
+	.4byte 0x40A2223B
+	.4byte 0x3F9FCD71
+	.4byte 0x40CA1597
+	.4byte 0x3F9E498C
+	.4byte 0x40F1A7FA
+	.4byte 0x3F9C81AB
+	.4byte 0x410C6432
+	.4byte 0x3F9A7A9B
+	.4byte 0x411FB386
+	.4byte 0x3F98399D
+	.4byte 0x4132BAB9
+	.4byte 0x3F95C44B
+	.4byte 0x41457343
+	.4byte 0x3F932075
+	.4byte 0x4157D751
+	.4byte 0x3F905408
+	.4byte 0x4169E1D2
+	.4byte 0x3F8D64EB
+	.4byte 0x417B8E70
+	.4byte 0x3F8A58EC
+	.4byte 0x41866CC7
+	.4byte 0x3F8735A9
+	.4byte 0x418EE021
+	.4byte 0x3F84007D
+	.4byte 0x41972029
+	.4byte 0x3F80BE73
+	.4byte 0x419F2C10
+	.4byte 0x3F7AE877
+	.4byte 0x41A70354
+	.4byte 0x3F744C4A
+	.4byte 0x41AEA5B6
+	.4byte 0x3F6DB032
+	.4byte 0x41B61338
+	.4byte 0x3F671B36
+	.4byte 0x41BD4C11
+	.4byte 0x3F60938F
+	.4byte 0x41C450AE
+	.4byte 0x3F5A1EB2
+	.4byte 0x41CB21A3
+	.4byte 0x3F53C157
+	.4byte 0x41D1BFAE
+	.4byte 0x3F4D7F84
+	.4byte 0x41D82BAA
+	.4byte 0x3F475C97
+	.4byte 0x41DE668F
+	.4byte 0x3F415B59
+	.4byte 0x41E4716A
+	.4byte 0x3F3B7E02
+	.4byte 0x41EA4D5A
+	.4byte 0x3F35C652
+	.4byte 0x41EFFB8C
+	.4byte 0x3F303593
+	.4byte 0x41F57D39
+	.4byte 0x3F2ACCAE
+	.4byte 0x41FAD39E
+	.4byte 0x3F258C33
+	.4byte 0x42000000
+	.4byte 0x3F207467
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@2956"
+"@2956":
+
+	.4byte 0x47800000
+
+.global "@2957_8055F1FC"
+"@2957_8055F1FC":
+
+	.4byte 0
+
+.global "@3002"
+"@3002":
+
+	.4byte 0x42000000
+
+.global "@3003"
+"@3003":
+
+	.4byte 0x42800000
+
+.global "@3005"
+"@3005":
+
+	.4byte 0xC2800000
+
+.global "@3032"
+"@3032":
+
+	.4byte 0x43000000
+
+.global "@3033_8055F210"
+"@3033_8055F210":
+
+	.4byte 0xC3000000
+	.4byte 0
diff --git a/asm/libnw4r_math/math_triangular_800feaa0.s b/asm/libnw4r_math/math_triangular_800feaa0.s
deleted file mode 100644
index b3899a3c..00000000
--- a/asm/libnw4r_math/math_triangular_800feaa0.s
+++ /dev/null
@@ -1,249 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
-.global SinFIdx__Q24nw4r4mathFf
-SinFIdx__Q24nw4r4mathFf:
-/* 800FEAA0 000FA8E0  FC 60 0A 10 */	fabs f3, f1
-/* 800FEAA4 000FA8E4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 800FEAA8 000FA8E8  C0 02 92 78 */	lfs f0, "@2956"@sda21(r2)
-/* 800FEAAC 000FA8EC  48 00 00 08 */	b lbl_800FEAB4
-.global lbl_800FEAB0
-lbl_800FEAB0:
-/* 800FEAB0 000FA8F0  EC 63 00 28 */	fsubs f3, f3, f0
-.global lbl_800FEAB4
-lbl_800FEAB4:
-/* 800FEAB4 000FA8F4  FC 03 00 40 */	fcmpo cr0, f3, f0
-/* 800FEAB8 000FA8F8  41 81 FF F8 */	bgt lbl_800FEAB0
-/* 800FEABC 000FA8FC  FC 00 18 18 */	frsp f0, f3
-/* 800FEAC0 000FA900  38 61 00 0C */	addi r3, r1, 0xc
-/* 800FEAC4 000FA904  F0 03 B0 00 */	psq_st f0, 0x0(r3), 1, qr3
-/* 800FEAC8 000FA908  38 61 00 08 */	addi r3, r1, 0x8
-/* 800FEACC 000FA90C  A0 01 00 0C */	lhz r0, 0xc(r1)
-/* 800FEAD0 000FA910  B0 01 00 08 */	sth r0, 0x8(r1)
-/* 800FEAD4 000FA914  B0 01 00 0A */	sth r0, 0xa(r1)
-/* 800FEAD8 000FA918  E0 43 B0 00 */	psq_l f2, 0x0(r3), 1, qr3
-/* 800FEADC 000FA91C  3C 80 80 41 */	lis r4, gSinCosTbl__Q34nw4r4math6detail@ha
-/* 800FEAE0 000FA920  54 00 25 36 */	rlwinm r0, r0, 4, 20, 27
-/* 800FEAE4 000FA924  C0 02 92 7C */	lfs f0, "@2957_8055F1FC"@sda21(r2)
-/* 800FEAE8 000FA928  38 84 8F 10 */	addi r4, r4, gSinCosTbl__Q34nw4r4math6detail@l
-/* 800FEAEC 000FA92C  EC 83 10 28 */	fsubs f4, f3, f2
-/* 800FEAF0 000FA930  7C 64 02 14 */	add r3, r4, r0
-/* 800FEAF4 000FA934  FC 01 00 40 */	fcmpo cr0, f1, f0
-/* 800FEAF8 000FA938  C0 63 00 08 */	lfs f3, 0x8(r3)
-/* 800FEAFC 000FA93C  7C 44 04 2E */	lfsx f2, r4, r0
-/* 800FEB00 000FA940  EC 04 00 F2 */	fmuls f0, f4, f3
-/* 800FEB04 000FA944  EC 22 00 2A */	fadds f1, f2, f0
-/* 800FEB08 000FA948  40 80 00 08 */	bge lbl_800FEB10
-/* 800FEB0C 000FA94C  FC 20 08 50 */	fneg f1, f1
-.global lbl_800FEB10
-lbl_800FEB10:
-/* 800FEB10 000FA950  38 21 00 10 */	addi r1, r1, 0x10
-/* 800FEB14 000FA954  4E 80 00 20 */	blr
-/* 800FEB18 000FA958  00 00 00 00 */	.4byte 0x00000000
-/* 800FEB1C 000FA95C  00 00 00 00 */	.4byte 0x00000000
-.global CosFIdx__Q24nw4r4mathFf
-CosFIdx__Q24nw4r4mathFf:
-/* 800FEB20 000FA960  FC 20 0A 10 */	fabs f1, f1
-/* 800FEB24 000FA964  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 800FEB28 000FA968  C0 02 92 78 */	lfs f0, "@2956"@sda21(r2)
-/* 800FEB2C 000FA96C  48 00 00 08 */	b lbl_800FEB34
-.global lbl_800FEB30
-lbl_800FEB30:
-/* 800FEB30 000FA970  EC 21 00 28 */	fsubs f1, f1, f0
-.global lbl_800FEB34
-lbl_800FEB34:
-/* 800FEB34 000FA974  FC 01 00 40 */	fcmpo cr0, f1, f0
-/* 800FEB38 000FA978  41 81 FF F8 */	bgt lbl_800FEB30
-/* 800FEB3C 000FA97C  FC 00 08 18 */	frsp f0, f1
-/* 800FEB40 000FA980  38 61 00 0C */	addi r3, r1, 0xc
-/* 800FEB44 000FA984  F0 03 B0 00 */	psq_st f0, 0x0(r3), 1, qr3
-/* 800FEB48 000FA988  38 61 00 08 */	addi r3, r1, 0x8
-/* 800FEB4C 000FA98C  A0 01 00 0C */	lhz r0, 0xc(r1)
-/* 800FEB50 000FA990  B0 01 00 08 */	sth r0, 0x8(r1)
-/* 800FEB54 000FA994  B0 01 00 0A */	sth r0, 0xa(r1)
-/* 800FEB58 000FA998  E0 03 B0 00 */	psq_l f0, 0x0(r3), 1, qr3
-/* 800FEB5C 000FA99C  3C 60 80 41 */	lis r3, gSinCosTbl__Q34nw4r4math6detail@ha
-/* 800FEB60 000FA9A0  54 00 25 36 */	rlwinm r0, r0, 4, 20, 27
-/* 800FEB64 000FA9A4  38 63 8F 10 */	addi r3, r3, gSinCosTbl__Q34nw4r4math6detail@l
-/* 800FEB68 000FA9A8  EC 41 00 28 */	fsubs f2, f1, f0
-/* 800FEB6C 000FA9AC  7C 63 02 14 */	add r3, r3, r0
-/* 800FEB70 000FA9B0  C0 23 00 0C */	lfs f1, 0xc(r3)
-/* 800FEB74 000FA9B4  C0 03 00 04 */	lfs f0, 0x4(r3)
-/* 800FEB78 000FA9B8  EC 22 00 72 */	fmuls f1, f2, f1
-/* 800FEB7C 000FA9BC  EC 20 08 2A */	fadds f1, f0, f1
-/* 800FEB80 000FA9C0  38 21 00 10 */	addi r1, r1, 0x10
-/* 800FEB84 000FA9C4  4E 80 00 20 */	blr
-/* 800FEB88 000FA9C8  00 00 00 00 */	.4byte 0x00000000
-/* 800FEB8C 000FA9CC  00 00 00 00 */	.4byte 0x00000000
-.global SinCosFIdx__Q24nw4r4mathFPfPff
-SinCosFIdx__Q24nw4r4mathFPfPff:
-/* 800FEB90 000FA9D0  FC 00 0A 10 */	fabs f0, f1
-/* 800FEB94 000FA9D4  3C A0 80 41 */	lis r5, gSinCosTbl__Q34nw4r4math6detail@ha
-/* 800FEB98 000FA9D8  C0 42 92 78 */	lfs f2, "@2956"@sda21(r2)
-/* 800FEB9C 000FA9DC  38 A5 8F 10 */	addi r5, r5, gSinCosTbl__Q34nw4r4math6detail@l
-/* 800FEBA0 000FA9E0  F0 03 B0 00 */	psq_st f0, 0x0(r3), 1, qr3
-/* 800FEBA4 000FA9E4  FC 00 10 00 */	fcmpu cr0, f0, f2
-/* 800FEBA8 000FA9E8  40 81 00 18 */	ble lbl_800FEBC0
-/* 800FEBAC 000FA9EC  60 00 00 00 */	nop
-.global lbl_800FEBB0
-lbl_800FEBB0:
-/* 800FEBB0 000FA9F0  EC 00 10 28 */	fsubs f0, f0, f2
-/* 800FEBB4 000FA9F4  FC 00 10 00 */	fcmpu cr0, f0, f2
-/* 800FEBB8 000FA9F8  41 81 FF F8 */	bgt lbl_800FEBB0
-/* 800FEBBC 000FA9FC  F0 03 B0 00 */	psq_st f0, 0x0(r3), 1, qr3
-.global lbl_800FEBC0
-lbl_800FEBC0:
-/* 800FEBC0 000FAA00  A0 03 00 00 */	lhz r0, 0x0(r3)
-/* 800FEBC4 000FAA04  EC 82 10 28 */	fsubs f4, f2, f2
-/* 800FEBC8 000FAA08  54 00 25 36 */	rlwinm r0, r0, 4, 20, 27
-/* 800FEBCC 000FAA0C  7C A5 02 14 */	add r5, r5, r0
-/* 800FEBD0 000FAA10  E0 43 B0 00 */	psq_l f2, 0x0(r3), 1, qr3
-/* 800FEBD4 000FAA14  E0 65 00 00 */	psq_l f3, 0x0(r5), 0, qr0
-/* 800FEBD8 000FAA18  FC 01 20 00 */	fcmpu cr0, f1, f4
-/* 800FEBDC 000FAA1C  EC 40 10 28 */	fsubs f2, f0, f2
-/* 800FEBE0 000FAA20  E0 05 00 08 */	psq_l f0, 0x8(r5), 0, qr0
-/* 800FEBE4 000FAA24  10 00 18 9C */	ps_madds0 f0, f0, f2, f3
-/* 800FEBE8 000FAA28  10 40 04 A0 */	ps_merge10 f2, f0, f0
-/* 800FEBEC 000FAA2C  F0 44 80 00 */	psq_st f2, 0x0(r4), 1, qr0
-/* 800FEBF0 000FAA30  40 80 00 08 */	bge lbl_800FEBF8
-/* 800FEBF4 000FAA34  10 00 00 50 */	ps_neg f0, f0
-.global lbl_800FEBF8
-lbl_800FEBF8:
-/* 800FEBF8 000FAA38  F0 03 80 00 */	psq_st f0, 0x0(r3), 1, qr0
-/* 800FEBFC 000FAA3C  4E 80 00 20 */	blr
-.global Atan2FIdx__Q24nw4r4mathFff
-Atan2FIdx__Q24nw4r4mathFff:
-/* 800FEC00 000FAA40  C0 02 92 7C */	lfs f0, "@2957_8055F1FC"@sda21(r2)
-/* 800FEC04 000FAA44  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 800FEC08 000FAA48  FC 00 10 00 */	fcmpu cr0, f0, f2
-/* 800FEC0C 000FAA4C  40 82 00 14 */	bne lbl_800FEC20
-/* 800FEC10 000FAA50  FC 00 08 00 */	fcmpu cr0, f0, f1
-/* 800FEC14 000FAA54  40 82 00 0C */	bne lbl_800FEC20
-/* 800FEC18 000FAA58  FC 20 00 90 */	fmr f1, f0
-/* 800FEC1C 000FAA5C  48 00 01 9C */	b lbl_800FEDB8
-.global lbl_800FEC20
-lbl_800FEC20:
-/* 800FEC20 000FAA60  C0 82 92 7C */	lfs f4, "@2957_8055F1FC"@sda21(r2)
-/* 800FEC24 000FAA64  FC 02 20 40 */	fcmpo cr0, f2, f4
-/* 800FEC28 000FAA68  4C 41 13 82 */	cror eq, gt, eq
-/* 800FEC2C 000FAA6C  40 82 00 6C */	bne lbl_800FEC98
-/* 800FEC30 000FAA70  FC 01 20 40 */	fcmpo cr0, f1, f4
-/* 800FEC34 000FAA74  4C 41 13 82 */	cror eq, gt, eq
-/* 800FEC38 000FAA78  40 82 00 30 */	bne lbl_800FEC68
-/* 800FEC3C 000FAA7C  FC 02 08 40 */	fcmpo cr0, f2, f1
-/* 800FEC40 000FAA80  4C 41 13 82 */	cror eq, gt, eq
-/* 800FEC44 000FAA84  40 82 00 10 */	bne lbl_800FEC54
-/* 800FEC48 000FAA88  FC 60 10 90 */	fmr f3, f2
-/* 800FEC4C 000FAA8C  38 00 00 00 */	li r0, 0x0
-/* 800FEC50 000FAA90  48 00 00 BC */	b lbl_800FED0C
-.global lbl_800FEC54
-lbl_800FEC54:
-/* 800FEC54 000FAA94  FC 60 08 90 */	fmr f3, f1
-/* 800FEC58 000FAA98  C0 82 92 84 */	lfs f4, "@3003"@sda21(r2)
-/* 800FEC5C 000FAA9C  FC 20 10 90 */	fmr f1, f2
-/* 800FEC60 000FAAA0  38 00 00 01 */	li r0, 0x1
-/* 800FEC64 000FAAA4  48 00 00 A8 */	b lbl_800FED0C
-.global lbl_800FEC68
-lbl_800FEC68:
-/* 800FEC68 000FAAA8  FC 20 08 50 */	fneg f1, f1
-/* 800FEC6C 000FAAAC  FC 02 08 40 */	fcmpo cr0, f2, f1
-/* 800FEC70 000FAAB0  4C 41 13 82 */	cror eq, gt, eq
-/* 800FEC74 000FAAB4  40 82 00 10 */	bne lbl_800FEC84
-/* 800FEC78 000FAAB8  FC 60 10 90 */	fmr f3, f2
-/* 800FEC7C 000FAABC  38 00 00 01 */	li r0, 0x1
-/* 800FEC80 000FAAC0  48 00 00 8C */	b lbl_800FED0C
-.global lbl_800FEC84
-lbl_800FEC84:
-/* 800FEC84 000FAAC4  FC 60 08 90 */	fmr f3, f1
-/* 800FEC88 000FAAC8  C0 82 92 88 */	lfs f4, "@3005"@sda21(r2)
-/* 800FEC8C 000FAACC  FC 20 10 90 */	fmr f1, f2
-/* 800FEC90 000FAAD0  38 00 00 00 */	li r0, 0x0
-/* 800FEC94 000FAAD4  48 00 00 78 */	b lbl_800FED0C
-.global lbl_800FEC98
-lbl_800FEC98:
-/* 800FEC98 000FAAD8  FC 01 20 40 */	fcmpo cr0, f1, f4
-/* 800FEC9C 000FAADC  4C 41 13 82 */	cror eq, gt, eq
-/* 800FECA0 000FAAE0  40 82 00 38 */	bne lbl_800FECD8
-/* 800FECA4 000FAAE4  FC 00 10 50 */	fneg f0, f2
-/* 800FECA8 000FAAE8  FC 00 08 40 */	fcmpo cr0, f0, f1
-/* 800FECAC 000FAAEC  4C 41 13 82 */	cror eq, gt, eq
-/* 800FECB0 000FAAF0  40 82 00 14 */	bne lbl_800FECC4
-/* 800FECB4 000FAAF4  FC 60 00 90 */	fmr f3, f0
-/* 800FECB8 000FAAF8  C0 82 92 8C */	lfs f4, "@3032"@sda21(r2)
-/* 800FECBC 000FAAFC  38 00 00 01 */	li r0, 0x1
-/* 800FECC0 000FAB00  48 00 00 4C */	b lbl_800FED0C
-.global lbl_800FECC4
-lbl_800FECC4:
-/* 800FECC4 000FAB04  FC 60 08 90 */	fmr f3, f1
-/* 800FECC8 000FAB08  C0 82 92 84 */	lfs f4, "@3003"@sda21(r2)
-/* 800FECCC 000FAB0C  FC 20 00 90 */	fmr f1, f0
-/* 800FECD0 000FAB10  38 00 00 00 */	li r0, 0x0
-/* 800FECD4 000FAB14  48 00 00 38 */	b lbl_800FED0C
-.global lbl_800FECD8
-lbl_800FECD8:
-/* 800FECD8 000FAB18  FC 00 10 50 */	fneg f0, f2
-/* 800FECDC 000FAB1C  FC 20 08 50 */	fneg f1, f1
-/* 800FECE0 000FAB20  FC 00 08 40 */	fcmpo cr0, f0, f1
-/* 800FECE4 000FAB24  4C 41 13 82 */	cror eq, gt, eq
-/* 800FECE8 000FAB28  40 82 00 14 */	bne lbl_800FECFC
-/* 800FECEC 000FAB2C  FC 60 00 90 */	fmr f3, f0
-/* 800FECF0 000FAB30  C0 82 92 90 */	lfs f4, "@3033_8055F210"@sda21(r2)
-/* 800FECF4 000FAB34  38 00 00 00 */	li r0, 0x0
-/* 800FECF8 000FAB38  48 00 00 14 */	b lbl_800FED0C
-.global lbl_800FECFC
-lbl_800FECFC:
-/* 800FECFC 000FAB3C  FC 60 08 90 */	fmr f3, f1
-/* 800FED00 000FAB40  C0 82 92 88 */	lfs f4, "@3005"@sda21(r2)
-/* 800FED04 000FAB44  FC 20 00 90 */	fmr f1, f0
-/* 800FED08 000FAB48  38 00 00 01 */	li r0, 0x1
-.global lbl_800FED0C
-lbl_800FED0C:
-/* 800FED0C 000FAB4C  2C 00 00 00 */	cmpwi r0, 0x0
-/* 800FED10 000FAB50  41 82 00 58 */	beq lbl_800FED68
-/* 800FED14 000FAB54  EC 21 18 24 */	fdivs f1, f1, f3
-/* 800FED18 000FAB58  C0 02 92 80 */	lfs f0, "@3002"@sda21(r2)
-/* 800FED1C 000FAB5C  38 61 00 14 */	addi r3, r1, 0x14
-/* 800FED20 000FAB60  EC 21 00 32 */	fmuls f1, f1, f0
-/* 800FED24 000FAB64  F0 23 B0 00 */	psq_st f1, 0x0(r3), 1, qr3
-/* 800FED28 000FAB68  38 61 00 0E */	addi r3, r1, 0xe
-/* 800FED2C 000FAB6C  A0 01 00 14 */	lhz r0, 0x14(r1)
-/* 800FED30 000FAB70  B0 01 00 0E */	sth r0, 0xe(r1)
-/* 800FED34 000FAB74  B0 01 00 0C */	sth r0, 0xc(r1)
-/* 800FED38 000FAB78  E0 03 B0 00 */	psq_l f0, 0x0(r3), 1, qr3
-/* 800FED3C 000FAB7C  3C 80 80 44 */	lis r4, "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"@ha
-/* 800FED40 000FAB80  54 00 18 38 */	slwi r0, r0, 3
-/* 800FED44 000FAB84  38 84 1E D0 */	addi r4, r4, "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"@l
-/* 800FED48 000FAB88  EC 41 00 28 */	fsubs f2, f1, f0
-/* 800FED4C 000FAB8C  7C 64 02 14 */	add r3, r4, r0
-/* 800FED50 000FAB90  7C 04 04 2E */	lfsx f0, r4, r0
-/* 800FED54 000FAB94  C0 23 00 04 */	lfs f1, 0x4(r3)
-/* 800FED58 000FAB98  EC 22 00 72 */	fmuls f1, f2, f1
-/* 800FED5C 000FAB9C  EC 00 08 2A */	fadds f0, f0, f1
-/* 800FED60 000FABA0  EC 24 00 28 */	fsubs f1, f4, f0
-/* 800FED64 000FABA4  48 00 00 54 */	b lbl_800FEDB8
-.global lbl_800FED68
-lbl_800FED68:
-/* 800FED68 000FABA8  EC 21 18 24 */	fdivs f1, f1, f3
-/* 800FED6C 000FABAC  C0 02 92 80 */	lfs f0, "@3002"@sda21(r2)
-/* 800FED70 000FABB0  38 61 00 10 */	addi r3, r1, 0x10
-/* 800FED74 000FABB4  EC 21 00 32 */	fmuls f1, f1, f0
-/* 800FED78 000FABB8  F0 23 B0 00 */	psq_st f1, 0x0(r3), 1, qr3
-/* 800FED7C 000FABBC  38 61 00 0A */	addi r3, r1, 0xa
-/* 800FED80 000FABC0  A0 01 00 10 */	lhz r0, 0x10(r1)
-/* 800FED84 000FABC4  B0 01 00 0A */	sth r0, 0xa(r1)
-/* 800FED88 000FABC8  B0 01 00 08 */	sth r0, 0x8(r1)
-/* 800FED8C 000FABCC  E0 03 B0 00 */	psq_l f0, 0x0(r3), 1, qr3
-/* 800FED90 000FABD0  3C 80 80 44 */	lis r4, "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"@ha
-/* 800FED94 000FABD4  54 00 18 38 */	slwi r0, r0, 3
-/* 800FED98 000FABD8  38 84 1E D0 */	addi r4, r4, "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"@l
-/* 800FED9C 000FABDC  EC 41 00 28 */	fsubs f2, f1, f0
-/* 800FEDA0 000FABE0  7C 64 02 14 */	add r3, r4, r0
-/* 800FEDA4 000FABE4  7C 04 04 2E */	lfsx f0, r4, r0
-/* 800FEDA8 000FABE8  C0 23 00 04 */	lfs f1, 0x4(r3)
-/* 800FEDAC 000FABEC  EC 22 00 72 */	fmuls f1, f2, f1
-/* 800FEDB0 000FABF0  EC 00 08 2A */	fadds f0, f0, f1
-/* 800FEDB4 000FABF4  EC 24 00 2A */	fadds f1, f4, f0
-.global lbl_800FEDB8
-lbl_800FEDB8:
-/* 800FEDB8 000FABF8  38 21 00 20 */	addi r1, r1, 0x20
-/* 800FEDBC 000FABFC  4E 80 00 20 */	blr
diff --git a/asm/libnw4r_math/math_triangular_80441ed0.s b/asm/libnw4r_math/math_triangular_80441ed0.s
deleted file mode 100644
index ae82a191..00000000
--- a/asm/libnw4r_math/math_triangular_80441ed0.s
+++ /dev/null
@@ -1,72 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@"
-"sArcTanTbl__Q34nw4r4math29@unnamed@math_triangular_cpp@":
-
-	.4byte 0
-	.4byte 0x3FA2EBF1
-	.4byte 0x3FA2EBF1
-	.4byte 0x3FA29AB1
-	.4byte 0x4022C351
-	.4byte 0x3FA1F923
-	.4byte 0x4073BFE2
-	.4byte 0x3FA10925
-	.4byte 0x40A2223B
-	.4byte 0x3F9FCD71
-	.4byte 0x40CA1597
-	.4byte 0x3F9E498C
-	.4byte 0x40F1A7FA
-	.4byte 0x3F9C81AB
-	.4byte 0x410C6432
-	.4byte 0x3F9A7A9B
-	.4byte 0x411FB386
-	.4byte 0x3F98399D
-	.4byte 0x4132BAB9
-	.4byte 0x3F95C44B
-	.4byte 0x41457343
-	.4byte 0x3F932075
-	.4byte 0x4157D751
-	.4byte 0x3F905408
-	.4byte 0x4169E1D2
-	.4byte 0x3F8D64EB
-	.4byte 0x417B8E70
-	.4byte 0x3F8A58EC
-	.4byte 0x41866CC7
-	.4byte 0x3F8735A9
-	.4byte 0x418EE021
-	.4byte 0x3F84007D
-	.4byte 0x41972029
-	.4byte 0x3F80BE73
-	.4byte 0x419F2C10
-	.4byte 0x3F7AE877
-	.4byte 0x41A70354
-	.4byte 0x3F744C4A
-	.4byte 0x41AEA5B6
-	.4byte 0x3F6DB032
-	.4byte 0x41B61338
-	.4byte 0x3F671B36
-	.4byte 0x41BD4C11
-	.4byte 0x3F60938F
-	.4byte 0x41C450AE
-	.4byte 0x3F5A1EB2
-	.4byte 0x41CB21A3
-	.4byte 0x3F53C157
-	.4byte 0x41D1BFAE
-	.4byte 0x3F4D7F84
-	.4byte 0x41D82BAA
-	.4byte 0x3F475C97
-	.4byte 0x41DE668F
-	.4byte 0x3F415B59
-	.4byte 0x41E4716A
-	.4byte 0x3F3B7E02
-	.4byte 0x41EA4D5A
-	.4byte 0x3F35C652
-	.4byte 0x41EFFB8C
-	.4byte 0x3F303593
-	.4byte 0x41F57D39
-	.4byte 0x3F2ACCAE
-	.4byte 0x41FAD39E
-	.4byte 0x3F258C33
-	.4byte 0x42000000
-	.4byte 0x3F207467
diff --git a/asm/libnw4r_math/math_triangular_8055f1f8.s b/asm/libnw4r_math/math_triangular_8055f1f8.s
deleted file mode 100644
index 27b93015..00000000
--- a/asm/libnw4r_math/math_triangular_8055f1f8.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@2956"
-"@2956":
-
-	.4byte 0x47800000
-
-.global "@2957_8055F1FC"
-"@2957_8055F1FC":
-
-	.4byte 0
-
-.global "@3002"
-"@3002":
-
-	.4byte 0x42000000
-
-.global "@3003"
-"@3003":
-
-	.4byte 0x42800000
-
-.global "@3005"
-"@3005":
-
-	.4byte 0xC2800000
-
-.global "@3032"
-"@3032":
-
-	.4byte 0x43000000
-
-.global "@3033_8055F210"
-"@3033_8055F210":
-
-	.4byte 0xC3000000
-	.4byte 0
diff --git a/asm/libnw4r_math/math_types_800fedc0.s b/asm/libnw4r_math/math_types.s
similarity index 98%
rename from asm/libnw4r_math/math_types_800fedc0.s
rename to asm/libnw4r_math/math_types.s
index fabaa9a1..6d3e4275 100644
--- a/asm/libnw4r_math/math_types_800fedc0.s
+++ b/asm/libnw4r_math/math_types.s
@@ -307,3 +307,27 @@ MTX44Copy__Q24nw4r4mathFPQ34nw4r4math5MTX44PCQ34nw4r4math5MTX44:
 /* 800FF1E4 000FB024  00 00 00 00 */	.4byte 0x00000000
 /* 800FF1E8 000FB028  00 00 00 00 */	.4byte 0x00000000
 /* 800FF1EC 000FB02C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@4187"
+"@4187":
+
+	.4byte 0
+
+.global "@4190"
+"@4190":
+
+	.4byte 0x3F800000
+
+.global "@4265"
+"@4265":
+
+	.4byte 0x3CC90FDB
+	.4byte 0
+
+.global "@4279"
+"@4279":
+
+	.4byte 0x47800000
+	.4byte 0x47800000
diff --git a/asm/libnw4r_math/math_types_8055f218.s b/asm/libnw4r_math/math_types_8055f218.s
deleted file mode 100644
index a95158d0..00000000
--- a/asm/libnw4r_math/math_types_8055f218.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@4187"
-"@4187":
-
-	.4byte 0
-
-.global "@4190"
-"@4190":
-
-	.4byte 0x3F800000
-
-.global "@4265"
-"@4265":
-
-	.4byte 0x3CC90FDB
-	.4byte 0
-
-.global "@4279"
-"@4279":
-
-	.4byte 0x47800000
-	.4byte 0x47800000
diff --git a/obj_files.mk b/obj_files.mk
index fe3052a1..3ca388c8 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -443,12 +443,13 @@ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_arcResourceAccessor.o \
 $(BUILD_DIR)/asm/libnw4r_lyt/lyt_common.o \
 $(BUILD_DIR)/asm/libnw4r_lyt/lyt_util.o \
 \
+$(BUILD_DIR)/asm/libnw4r_math/math_arithmetic.o \
+$(BUILD_DIR)/asm/libnw4r_math/math_triangular.o \
+$(BUILD_DIR)/asm/libnw4r_math/math_types.o \
+$(BUILD_DIR)/asm/libnw4r_math/math_geometry.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_arithmetic_800fe910.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_triangular_800feaa0.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_types_800fedc0.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_geometry_800ff1f0.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_AnimSound_800ffde0.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_AxManager_800ffe40.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_AxVoice_80100fd0.o \
@@ -3010,7 +3011,6 @@ $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \
 $(BUILD_DIR)/asm/src/Alarm_80406528.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_triangular_80408f10.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_BiquadFilterPreset_80409f20.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_EnvGenerator_8040b358.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_Lfo_8040b658.o \
@@ -3196,8 +3196,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \
 $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \
 $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
 $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_arithmetic_804415c0.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_triangular_80441ed0.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_BasicPlayer_80441fd8.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_BasicSound_80442000.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_BiquadFilterPreset_80442038.o \
@@ -5522,10 +5520,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
 $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
 $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
 $(BUILD_DIR)/asm/src/Alarm_8055df68.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_arithmetic_8055f1d8.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_triangular_8055f1f8.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_types_8055f218.o \
-$(BUILD_DIR)/asm/libnw4r_math/math_geometry_8055f230.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_AxManager_8055f240.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_AxVoice_8055f258.o \
 $(BUILD_DIR)/asm/libnw4r_snd/snd_Bank_8055f280.o \