diff --git a/src/files/setup/mp_setupame.c b/src/files/setup/mp_setupame.c
index a8791c33d..2e1290806 100644
--- a/src/files/setup/mp_setupame.c
+++ b/src/files/setup/mp_setupame.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuparch.c b/src/files/setup/mp_setuparch.c
index 74ff148ac..e9850c9a2 100644
--- a/src/files/setup/mp_setuparch.c
+++ b/src/files/setup/mp_setuparch.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuparec.c b/src/files/setup/mp_setuparec.c
index b41114a23..e1a9eb66a 100644
--- a/src/files/setup/mp_setuparec.c
+++ b/src/files/setup/mp_setuparec.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -123,7 +123,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupark.c b/src/files/setup/mp_setupark.c
index 4e5a805b6..4c4dfd0b9 100644
--- a/src/files/setup/mp_setupark.c
+++ b/src/files/setup/mp_setupark.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupash.c b/src/files/setup/mp_setupash.c
index 257674d66..b7e57c4ff 100644
--- a/src/files/setup/mp_setupash.c
+++ b/src/files/setup/mp_setupash.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupate.c b/src/files/setup/mp_setupate.c
index cf22d532c..4d87265cf 100644
--- a/src/files/setup/mp_setupate.c
+++ b/src/files/setup/mp_setupate.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupazt.c b/src/files/setup/mp_setupazt.c
index 3e63a608a..db1c1c95a 100644
--- a/src/files/setup/mp_setupazt.c
+++ b/src/files/setup/mp_setupazt.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupcat.c b/src/files/setup/mp_setupcat.c
index b7b025b50..a54337640 100644
--- a/src/files/setup/mp_setupcat.c
+++ b/src/files/setup/mp_setupcat.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupcave.c b/src/files/setup/mp_setupcave.c
index ef61b8856..ac39a26a6 100644
--- a/src/files/setup/mp_setupcave.c
+++ b/src/files/setup/mp_setupcave.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupcrad.c b/src/files/setup/mp_setupcrad.c
index f5f0d92a1..b5c465c53 100644
--- a/src/files/setup/mp_setupcrad.c
+++ b/src/files/setup/mp_setupcrad.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -115,7 +115,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupcryp.c b/src/files/setup/mp_setupcryp.c
index f5efc898b..a0e42665a 100644
--- a/src/files/setup/mp_setupcryp.c
+++ b/src/files/setup/mp_setupcryp.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -112,7 +112,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupdam.c b/src/files/setup/mp_setupdam.c
index 457774e48..3a696ac16 100644
--- a/src/files/setup/mp_setupdam.c
+++ b/src/files/setup/mp_setupdam.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -39,7 +39,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupdepo.c b/src/files/setup/mp_setupdepo.c
index ce022cb4d..3db73a629 100644
--- a/src/files/setup/mp_setupdepo.c
+++ b/src/files/setup/mp_setupdepo.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupdest.c b/src/files/setup/mp_setupdest.c
index fa9f92515..560feaf83 100644
--- a/src/files/setup/mp_setupdest.c
+++ b/src/files/setup/mp_setupdest.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupdish.c b/src/files/setup/mp_setupdish.c
index 012b7994d..4f14c8668 100644
--- a/src/files/setup/mp_setupdish.c
+++ b/src/files/setup/mp_setupdish.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupear.c b/src/files/setup/mp_setupear.c
index 7ad058f66..0f8201431 100644
--- a/src/files/setup/mp_setupear.c
+++ b/src/files/setup/mp_setupear.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -34,7 +34,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupeld.c b/src/files/setup/mp_setupeld.c
index bff5c7b51..f9c1bcb74 100644
--- a/src/files/setup/mp_setupeld.c
+++ b/src/files/setup/mp_setupeld.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -34,7 +34,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupimp.c b/src/files/setup/mp_setupimp.c
index f931c2777..ee97497cf 100644
--- a/src/files/setup/mp_setupimp.c
+++ b/src/files/setup/mp_setupimp.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupjun.c b/src/files/setup/mp_setupjun.c
index 6f052eebe..8518efaaf 100644
--- a/src/files/setup/mp_setupjun.c
+++ b/src/files/setup/mp_setupjun.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -113,7 +113,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuplam.c b/src/files/setup/mp_setuplam.c
index 3d1273d22..9eb5548a8 100644
--- a/src/files/setup/mp_setuplam.c
+++ b/src/files/setup/mp_setuplam.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuplee.c b/src/files/setup/mp_setuplee.c
index 7a879799a..28cab89df 100644
--- a/src/files/setup/mp_setuplee.c
+++ b/src/files/setup/mp_setuplee.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -34,7 +34,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuplen.c b/src/files/setup/mp_setuplen.c
index b8f61cb6b..9df33a0f4 100644
--- a/src/files/setup/mp_setuplen.c
+++ b/src/files/setup/mp_setuplen.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -33,7 +33,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuplip.c b/src/files/setup/mp_setuplip.c
index 91b082c4a..559150a41 100644
--- a/src/files/setup/mp_setuplip.c
+++ b/src/files/setup/mp_setuplip.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuplue.c b/src/files/setup/mp_setuplue.c
index 4e87569f0..4c7001360 100644
--- a/src/files/setup/mp_setuplue.c
+++ b/src/files/setup/mp_setuplue.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp1.c b/src/files/setup/mp_setupmp1.c
index 7deb2c072..ded61e8f7 100644
--- a/src/files/setup/mp_setupmp1.c
+++ b/src/files/setup/mp_setupmp1.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -139,7 +139,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp10.c b/src/files/setup/mp_setupmp10.c
index 60b6afe6c..f5bff144a 100644
--- a/src/files/setup/mp_setupmp10.c
+++ b/src/files/setup/mp_setupmp10.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -112,7 +112,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp11.c b/src/files/setup/mp_setupmp11.c
index fab7851fe..6ca98d061 100644
--- a/src/files/setup/mp_setupmp11.c
+++ b/src/files/setup/mp_setupmp11.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -130,7 +130,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp12.c b/src/files/setup/mp_setupmp12.c
index 8116fe891..72a6410e6 100644
--- a/src/files/setup/mp_setupmp12.c
+++ b/src/files/setup/mp_setupmp12.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -176,7 +176,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp13.c b/src/files/setup/mp_setupmp13.c
index 8a3b4d134..ba4098075 100644
--- a/src/files/setup/mp_setupmp13.c
+++ b/src/files/setup/mp_setupmp13.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -103,7 +103,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp14.c b/src/files/setup/mp_setupmp14.c
index 9422052e7..e21063b56 100644
--- a/src/files/setup/mp_setupmp14.c
+++ b/src/files/setup/mp_setupmp14.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp15.c b/src/files/setup/mp_setupmp15.c
index 5a87a9527..ccbd4cf09 100644
--- a/src/files/setup/mp_setupmp15.c
+++ b/src/files/setup/mp_setupmp15.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -135,7 +135,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp16.c b/src/files/setup/mp_setupmp16.c
index cf68ae397..a8fa206c5 100644
--- a/src/files/setup/mp_setupmp16.c
+++ b/src/files/setup/mp_setupmp16.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp17.c b/src/files/setup/mp_setupmp17.c
index 66d01de5d..489121961 100644
--- a/src/files/setup/mp_setupmp17.c
+++ b/src/files/setup/mp_setupmp17.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp18.c b/src/files/setup/mp_setupmp18.c
index 3548a00e1..e624092bf 100644
--- a/src/files/setup/mp_setupmp18.c
+++ b/src/files/setup/mp_setupmp18.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp19.c b/src/files/setup/mp_setupmp19.c
index b40caffbc..691c606db 100644
--- a/src/files/setup/mp_setupmp19.c
+++ b/src/files/setup/mp_setupmp19.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp2.c b/src/files/setup/mp_setupmp2.c
index 23e889845..6f2242f87 100644
--- a/src/files/setup/mp_setupmp2.c
+++ b/src/files/setup/mp_setupmp2.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp20.c b/src/files/setup/mp_setupmp20.c
index fa56772b7..8fcd56972 100644
--- a/src/files/setup/mp_setupmp20.c
+++ b/src/files/setup/mp_setupmp20.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp3.c b/src/files/setup/mp_setupmp3.c
index dbf1dcf2a..41e74d0bc 100644
--- a/src/files/setup/mp_setupmp3.c
+++ b/src/files/setup/mp_setupmp3.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -132,7 +132,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp4.c b/src/files/setup/mp_setupmp4.c
index d924d92a2..56677bce9 100644
--- a/src/files/setup/mp_setupmp4.c
+++ b/src/files/setup/mp_setupmp4.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -106,7 +106,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp5.c b/src/files/setup/mp_setupmp5.c
index 1bfb0775d..c28775585 100644
--- a/src/files/setup/mp_setupmp5.c
+++ b/src/files/setup/mp_setupmp5.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -116,7 +116,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp6.c b/src/files/setup/mp_setupmp6.c
index 5c472846b..cb7624926 100644
--- a/src/files/setup/mp_setupmp6.c
+++ b/src/files/setup/mp_setupmp6.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp7.c b/src/files/setup/mp_setupmp7.c
index 6be7359d7..e49243b1d 100644
--- a/src/files/setup/mp_setupmp7.c
+++ b/src/files/setup/mp_setupmp7.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp8.c b/src/files/setup/mp_setupmp8.c
index 0ed3087ec..ebbd9e120 100644
--- a/src/files/setup/mp_setupmp8.c
+++ b/src/files/setup/mp_setupmp8.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupmp9.c b/src/files/setup/mp_setupmp9.c
index 59dc61107..62e7a224e 100644
--- a/src/files/setup/mp_setupmp9.c
+++ b/src/files/setup/mp_setupmp9.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -117,7 +117,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupoat.c b/src/files/setup/mp_setupoat.c
index a33d83f0d..d832522e0 100644
--- a/src/files/setup/mp_setupoat.c
+++ b/src/files/setup/mp_setupoat.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -122,7 +122,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupold.c b/src/files/setup/mp_setupold.c
index 8dcef0c76..0b1423eaa 100644
--- a/src/files/setup/mp_setupold.c
+++ b/src/files/setup/mp_setupold.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuppam.c b/src/files/setup/mp_setuppam.c
index 1bcc4610e..015a3ec44 100644
--- a/src/files/setup/mp_setuppam.c
+++ b/src/files/setup/mp_setuppam.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -34,7 +34,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuppete.c b/src/files/setup/mp_setuppete.c
index f90a06d32..25782e0dd 100644
--- a/src/files/setup/mp_setuppete.c
+++ b/src/files/setup/mp_setuppete.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -54,7 +54,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupref.c b/src/files/setup/mp_setupref.c
index c5837c211..e57778d9f 100644
--- a/src/files/setup/mp_setupref.c
+++ b/src/files/setup/mp_setupref.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -120,7 +120,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuprit.c b/src/files/setup/mp_setuprit.c
index 2aa7aefd4..04d041608 100644
--- a/src/files/setup/mp_setuprit.c
+++ b/src/files/setup/mp_setuprit.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -34,7 +34,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuprun.c b/src/files/setup/mp_setuprun.c
index d00b20048..9dec23ae2 100644
--- a/src/files/setup/mp_setuprun.c
+++ b/src/files/setup/mp_setuprun.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupsev.c b/src/files/setup/mp_setupsev.c
index ba8d4dcc3..b7e3d2ad0 100644
--- a/src/files/setup/mp_setupsev.c
+++ b/src/files/setup/mp_setupsev.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupsevb.c b/src/files/setup/mp_setupsevb.c
index 1fdb823fd..37b66ff96 100644
--- a/src/files/setup/mp_setupsevb.c
+++ b/src/files/setup/mp_setupsevb.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupsevx.c b/src/files/setup/mp_setupsevx.c
index f9396d6c0..a6a9ee6f7 100644
--- a/src/files/setup/mp_setupsevx.c
+++ b/src/files/setup/mp_setupsevx.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupsho.c b/src/files/setup/mp_setupsho.c
index 7aa718f83..24deffd4f 100644
--- a/src/files/setup/mp_setupsho.c
+++ b/src/files/setup/mp_setupsho.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupsilo.c b/src/files/setup/mp_setupsilo.c
index b8c550ecf..71157999f 100644
--- a/src/files/setup/mp_setupsilo.c
+++ b/src/files/setup/mp_setupsilo.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupstat.c b/src/files/setup/mp_setupstat.c
index 5ebeec02c..7fec82883 100644
--- a/src/files/setup/mp_setupstat.c
+++ b/src/files/setup/mp_setupstat.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setuptra.c b/src/files/setup/mp_setuptra.c
index da4b557a3..bac9eb512 100644
--- a/src/files/setup/mp_setuptra.c
+++ b/src/files/setup/mp_setuptra.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupuff.c b/src/files/setup/mp_setupuff.c
index f6fcd6f31..2baa55686 100644
--- a/src/files/setup/mp_setupuff.c
+++ b/src/files/setup/mp_setupuff.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/mp_setupwax.c b/src/files/setup/mp_setupwax.c
index a64e1279f..1b2efe0f2 100644
--- a/src/files/setup/mp_setupwax.c
+++ b/src/files/setup/mp_setupwax.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c
index ef0a884cc..6e14a09d0 100644
--- a/src/files/setup/setupame.c
+++ b/src/files/setup/setupame.c
@@ -135,7 +135,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -4056,7 +4056,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_FLYING },
 	{ path02, 2, PATHTYPE_FLYING },
diff --git a/src/files/setup/setuparch.c b/src/files/setup/setuparch.c
index c6c9f37b3..bfc4f7e69 100644
--- a/src/files/setup/setuparch.c
+++ b/src/files/setup/setuparch.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setuparec.c b/src/files/setup/setuparec.c
index 3b73f1683..2727f81f9 100644
--- a/src/files/setup/setuparec.c
+++ b/src/files/setup/setuparec.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -39,7 +39,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c
index 2737f3c5a..721c574af 100644
--- a/src/files/setup/setupark.c
+++ b/src/files/setup/setupark.c
@@ -79,7 +79,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -505,7 +505,7 @@ s32 path02[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setupash.c b/src/files/setup/setupash.c
index 257674d66..b7e57c4ff 100644
--- a/src/files/setup/setupash.c
+++ b/src/files/setup/setupash.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupate.c b/src/files/setup/setupate.c
index 3f9588fd1..56f663d41 100644
--- a/src/files/setup/setupate.c
+++ b/src/files/setup/setupate.c
@@ -27,7 +27,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -78,7 +78,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c
index d10478382..8df76daab 100644
--- a/src/files/setup/setupazt.c
+++ b/src/files/setup/setupazt.c
@@ -59,7 +59,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -361,7 +361,7 @@ s32 path12[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setupcat.c b/src/files/setup/setupcat.c
index b7b025b50..a54337640 100644
--- a/src/files/setup/setupcat.c
+++ b/src/files/setup/setupcat.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c
index 0c46efbb5..6ac7a90f1 100644
--- a/src/files/setup/setupcave.c
+++ b/src/files/setup/setupcave.c
@@ -80,7 +80,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -704,7 +704,7 @@ s32 unregistered_path1[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path06, 6, PATHTYPE_BACKANDFORTH },
 	{ path07, 7, PATHTYPE_BACKANDFORTH },
 	{ path08, 8, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setupcrad.c b/src/files/setup/setupcrad.c
index cf3a740ee..1957a9777 100644
--- a/src/files/setup/setupcrad.c
+++ b/src/files/setup/setupcrad.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -30,7 +30,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupcryp.c b/src/files/setup/setupcryp.c
index 16e638cd2..df00e006b 100644
--- a/src/files/setup/setupcryp.c
+++ b/src/files/setup/setupcryp.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c
index d100485bb..9e6136176 100644
--- a/src/files/setup/setupdam.c
+++ b/src/files/setup/setupdam.c
@@ -88,7 +88,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -630,7 +630,7 @@ s32 path04[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_CIRCULAR },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_CIRCULAR },
diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c
index 1b4a44353..172c97110 100644
--- a/src/files/setup/setupdepo.c
+++ b/src/files/setup/setupdepo.c
@@ -100,7 +100,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -3160,7 +3160,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_CIRCULAR },
 	{ path01, 1, PATHTYPE_CIRCULAR },
 	{ path02, 2, PATHTYPE_CIRCULAR },
diff --git a/src/files/setup/setupdest.c b/src/files/setup/setupdest.c
index 0f6aaee24..d15a095ed 100644
--- a/src/files/setup/setupdest.c
+++ b/src/files/setup/setupdest.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c
index c4e90deda..5bcad66f5 100644
--- a/src/files/setup/setupdish.c
+++ b/src/files/setup/setupdish.c
@@ -96,7 +96,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -6122,7 +6122,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_CIRCULAR },
 	{ NULL, 0, 0 },
 };
diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c
index 4916fddb8..6db5c6947 100644
--- a/src/files/setup/setupear.c
+++ b/src/files/setup/setupear.c
@@ -91,7 +91,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -3380,7 +3380,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c
index 5bc37b500..395e0a879 100644
--- a/src/files/setup/setupeld.c
+++ b/src/files/setup/setupeld.c
@@ -87,7 +87,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -3274,7 +3274,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ NULL, 0, 0 },
diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c
index 10dcd594d..47496ec2e 100644
--- a/src/files/setup/setupimp.c
+++ b/src/files/setup/setupimp.c
@@ -143,7 +143,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -4097,7 +4097,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_FLYING },
 	{ NULL, 0, 0 },
 };
diff --git a/src/files/setup/setupjun.c b/src/files/setup/setupjun.c
index f0190bf7b..1e005fdd8 100644
--- a/src/files/setup/setupjun.c
+++ b/src/files/setup/setupjun.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -30,7 +30,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setuplam.c b/src/files/setup/setuplam.c
index 3d1273d22..9eb5548a8 100644
--- a/src/files/setup/setuplam.c
+++ b/src/files/setup/setuplam.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c
index 0a8e8115a..5ed5cbe7f 100644
--- a/src/files/setup/setuplee.c
+++ b/src/files/setup/setuplee.c
@@ -109,7 +109,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -3865,7 +3865,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setuplen.c b/src/files/setup/setuplen.c
index bcddc780d..a04501d47 100644
--- a/src/files/setup/setuplen.c
+++ b/src/files/setup/setuplen.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -30,7 +30,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c
index 7120dd430..5d7244901 100644
--- a/src/files/setup/setuplip.c
+++ b/src/files/setup/setuplip.c
@@ -118,7 +118,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -4812,7 +4812,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c
index 2013ab16e..a60874b0c 100644
--- a/src/files/setup/setuplue.c
+++ b/src/files/setup/setuplue.c
@@ -78,7 +78,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -803,7 +803,7 @@ s32 path33[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_CIRCULAR },
diff --git a/src/files/setup/setupmp1.c b/src/files/setup/setupmp1.c
index 39930a205..c6a9f3f78 100644
--- a/src/files/setup/setupmp1.c
+++ b/src/files/setup/setupmp1.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp10.c b/src/files/setup/setupmp10.c
index 145d9d56e..bed25d4ce 100644
--- a/src/files/setup/setupmp10.c
+++ b/src/files/setup/setupmp10.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp11.c b/src/files/setup/setupmp11.c
index e20832c5e..12c4ba208 100644
--- a/src/files/setup/setupmp11.c
+++ b/src/files/setup/setupmp11.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp12.c b/src/files/setup/setupmp12.c
index 255c0e6ca..7277e04dc 100644
--- a/src/files/setup/setupmp12.c
+++ b/src/files/setup/setupmp12.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp13.c b/src/files/setup/setupmp13.c
index fb5ead8ea..1ec5918f9 100644
--- a/src/files/setup/setupmp13.c
+++ b/src/files/setup/setupmp13.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp14.c b/src/files/setup/setupmp14.c
index 35094ff66..0c44a3bb1 100644
--- a/src/files/setup/setupmp14.c
+++ b/src/files/setup/setupmp14.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp15.c b/src/files/setup/setupmp15.c
index 7fa512d5e..e45608f66 100644
--- a/src/files/setup/setupmp15.c
+++ b/src/files/setup/setupmp15.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp16.c b/src/files/setup/setupmp16.c
index a7a79cc54..36a61053b 100644
--- a/src/files/setup/setupmp16.c
+++ b/src/files/setup/setupmp16.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp17.c b/src/files/setup/setupmp17.c
index ee2aabc2a..aa9b9cc46 100644
--- a/src/files/setup/setupmp17.c
+++ b/src/files/setup/setupmp17.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp18.c b/src/files/setup/setupmp18.c
index 8eb14c194..af32416b4 100644
--- a/src/files/setup/setupmp18.c
+++ b/src/files/setup/setupmp18.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp19.c b/src/files/setup/setupmp19.c
index f0c1c3803..21d742f65 100644
--- a/src/files/setup/setupmp19.c
+++ b/src/files/setup/setupmp19.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp2.c b/src/files/setup/setupmp2.c
index 6938c2375..8f6f71644 100644
--- a/src/files/setup/setupmp2.c
+++ b/src/files/setup/setupmp2.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp20.c b/src/files/setup/setupmp20.c
index 6ca2b3fc2..0f8a6d46a 100644
--- a/src/files/setup/setupmp20.c
+++ b/src/files/setup/setupmp20.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp3.c b/src/files/setup/setupmp3.c
index d8a16f893..fbe6b13ec 100644
--- a/src/files/setup/setupmp3.c
+++ b/src/files/setup/setupmp3.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp4.c b/src/files/setup/setupmp4.c
index 973a177e9..8187da249 100644
--- a/src/files/setup/setupmp4.c
+++ b/src/files/setup/setupmp4.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp5.c b/src/files/setup/setupmp5.c
index 4e98fdec0..0212a18d5 100644
--- a/src/files/setup/setupmp5.c
+++ b/src/files/setup/setupmp5.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp6.c b/src/files/setup/setupmp6.c
index f5bdf9a4b..9454e4b3e 100644
--- a/src/files/setup/setupmp6.c
+++ b/src/files/setup/setupmp6.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp7.c b/src/files/setup/setupmp7.c
index e48c771d9..2ebdaab9e 100644
--- a/src/files/setup/setupmp7.c
+++ b/src/files/setup/setupmp7.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -28,7 +28,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp8.c b/src/files/setup/setupmp8.c
index 1e7d339c6..4dbd66d72 100644
--- a/src/files/setup/setupmp8.c
+++ b/src/files/setup/setupmp8.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -32,7 +32,7 @@ s32 path00[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupmp9.c b/src/files/setup/setupmp9.c
index 0e399674a..b4705aa7c 100644
--- a/src/files/setup/setupmp9.c
+++ b/src/files/setup/setupmp9.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupoat.c b/src/files/setup/setupoat.c
index 6139f83c7..7ab2cb27f 100644
--- a/src/files/setup/setupoat.c
+++ b/src/files/setup/setupoat.c
@@ -10,7 +10,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -257,7 +257,7 @@ s32 path04[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setupold.c b/src/files/setup/setupold.c
index 99598039a..49cd7c251 100644
--- a/src/files/setup/setupold.c
+++ b/src/files/setup/setupold.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -35,7 +35,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c
index 4ccc65c15..4eb40dbf4 100644
--- a/src/files/setup/setuppam.c
+++ b/src/files/setup/setuppam.c
@@ -97,7 +97,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -4854,7 +4854,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
 	{ path03, 3, PATHTYPE_BACKANDFORTH },
 	{ path04, 4, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c
index 8220a5dc1..c7bbda00d 100644
--- a/src/files/setup/setuppete.c
+++ b/src/files/setup/setuppete.c
@@ -95,7 +95,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -3321,7 +3321,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setupref.c b/src/files/setup/setupref.c
index 8a4fbd5c0..665a2f655 100644
--- a/src/files/setup/setupref.c
+++ b/src/files/setup/setupref.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -31,7 +31,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c
index 9dc5de636..a62a8df8a 100644
--- a/src/files/setup/setuprit.c
+++ b/src/files/setup/setuprit.c
@@ -115,7 +115,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -4080,7 +4080,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setuprun.c b/src/files/setup/setuprun.c
index ea1c115bc..d6e9b8048 100644
--- a/src/files/setup/setuprun.c
+++ b/src/files/setup/setuprun.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c
index 899c0810e..26bd51199 100644
--- a/src/files/setup/setupsev.c
+++ b/src/files/setup/setupsev.c
@@ -42,7 +42,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -844,7 +844,7 @@ s32 path14[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_BACKANDFORTH },
 	{ path02, 2, PATHTYPE_BACKANDFORTH },
diff --git a/src/files/setup/setupsevb.c b/src/files/setup/setupsevb.c
index 1fdb823fd..37b66ff96 100644
--- a/src/files/setup/setupsevb.c
+++ b/src/files/setup/setupsevb.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupsevx.c b/src/files/setup/setupsevx.c
index 6a9f75e2e..65b82a56f 100644
--- a/src/files/setup/setupsevx.c
+++ b/src/files/setup/setupsevx.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupsevxb.c b/src/files/setup/setupsevxb.c
index 9773a3a28..c7428c394 100644
--- a/src/files/setup/setupsevxb.c
+++ b/src/files/setup/setupsevxb.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c
index 3607381f3..c09df3b5c 100644
--- a/src/files/setup/setupsho.c
+++ b/src/files/setup/setupsho.c
@@ -103,7 +103,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -3992,7 +3992,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupsilo.c b/src/files/setup/setupsilo.c
index b8c550ecf..71157999f 100644
--- a/src/files/setup/setupsilo.c
+++ b/src/files/setup/setupsilo.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupstat.c b/src/files/setup/setupstat.c
index 65acfd3a4..65cfda276 100644
--- a/src/files/setup/setupstat.c
+++ b/src/files/setup/setupstat.c
@@ -56,7 +56,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -283,7 +283,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c
index a830747c7..0b939bf24 100644
--- a/src/files/setup/setuptra.c
+++ b/src/files/setup/setuptra.c
@@ -94,7 +94,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -3876,7 +3876,7 @@ struct ailist ailists[] = {
 	{ NULL, 0 },
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupuff.c b/src/files/setup/setupuff.c
index 2551ec99e..29a9d361a 100644
--- a/src/files/setup/setupuff.c
+++ b/src/files/setup/setupuff.c
@@ -6,7 +6,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -29,7 +29,7 @@ u8 intro[] = {
 	endintro
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ NULL, 0, 0 },
 };
 
diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c
index 9d1e8ea5d..7b07408eb 100644
--- a/src/files/setup/setupwax.c
+++ b/src/files/setup/setupwax.c
@@ -45,7 +45,7 @@
 
 u8 intro[];
 u8 props[];
-struct aipaths paths[];
+struct path paths[];
 struct ailist ailists[];
 
 struct stagesetup setup = {
@@ -951,7 +951,7 @@ s32 path29[] = {
 	-1,
 };
 
-struct aipaths paths[] = {
+struct path paths[] = {
 	{ path00, 0, PATHTYPE_BACKANDFORTH },
 	{ path01, 1, PATHTYPE_FLYING },
 	{ path02, 2, PATHTYPE_FLYING },
diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 450170bba..5a721e5b7 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -29630,7 +29630,7 @@ glabel func0f0375e8
 /*  f037868:	316c0008 */ 	andi	$t4,$t3,0x8
 /*  f03786c:	11800005 */ 	beqz	$t4,.L0f037884
 /*  f037870:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f037874:	0fc0ea5a */ 	jal	func0f03a968
+/*  f037874:	0fc0ea5a */ 	jal	chrStartPath
 /*  f037878:	02002025 */ 	or	$a0,$s0,$zero
 /*  f03787c:	10000045 */ 	beqz	$zero,.L0f037994
 /*  f037880:	02002025 */ 	or	$a0,$s0,$zero
@@ -30757,7 +30757,7 @@ glabel func0f03843c
 );
 
 GLOBAL_ASM(
-glabel func0f038818
+glabel pathFindById
 /*  f038818:	3c05800a */ 	lui	$a1,0x800a
 /*  f03881c:	8ca5d044 */ 	lw	$a1,-0x2fbc($a1)
 /*  f038820:	00001825 */ 	or	$v1,$zero,$zero
@@ -33190,31 +33190,17 @@ bool chrSetPath(struct chrdata *chr, u32 path_id)
 	return true;
 }
 
-GLOBAL_ASM(
-glabel func0f03a968
-/*  f03a968:	27bdffe0 */ 	addiu	$sp,$sp,-32
-/*  f03a96c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f03a970:	afa40020 */ 	sw	$a0,0x20($sp)
-/*  f03a974:	0fc0e206 */ 	jal	func0f038818
-/*  f03a978:	80840013 */ 	lb	$a0,0x13($a0)
-/*  f03a97c:	10400009 */ 	beqz	$v0,.L0f03a9a4
-/*  f03a980:	8fa40020 */ 	lw	$a0,0x20($sp)
-/*  f03a984:	0fc0e686 */ 	jal	func0f039a18
-/*  f03a988:	afa2001c */ 	sw	$v0,0x1c($sp)
-/*  f03a98c:	10400005 */ 	beqz	$v0,.L0f03a9a4
-/*  f03a990:	8fa5001c */ 	lw	$a1,0x1c($sp)
-/*  f03a994:	0fc0e2e7 */ 	jal	func0f038b9c
-/*  f03a998:	8fa40020 */ 	lw	$a0,0x20($sp)
-/*  f03a99c:	10000002 */ 	beqz	$zero,.L0f03a9a8
-/*  f03a9a0:	24020001 */ 	addiu	$v0,$zero,0x1
-.L0f03a9a4:
-/*  f03a9a4:	00001025 */ 	or	$v0,$zero,$zero
-.L0f03a9a8:
-/*  f03a9a8:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f03a9ac:	27bd0020 */ 	addiu	$sp,$sp,0x20
-/*  f03a9b0:	03e00008 */ 	jr	$ra
-/*  f03a9b4:	00000000 */ 	sll	$zero,$zero,0x0
-);
+bool chrStartPath(struct chrdata *chr)
+{
+	struct path *path = pathFindById(chr->path);
+
+	if (path && func0f039a18(chr)) {
+		func0f038b9c(chr, path);
+		return true;
+	}
+
+	return false;
+}
 
 bool func0f03a9b8(struct chrdata *chr)
 {
@@ -46882,7 +46868,7 @@ glabel func0f046a8c
 /*  f046ec4:	31ed0008 */ 	andi	$t5,$t7,0x8
 /*  f046ec8:	11a00005 */ 	beqz	$t5,.L0f046ee0
 /*  f046ecc:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f046ed0:	0fc0ea5a */ 	jal	func0f03a968
+/*  f046ed0:	0fc0ea5a */ 	jal	chrStartPath
 /*  f046ed4:	02002025 */ 	or	$a0,$s0,$zero
 /*  f046ed8:	10000138 */ 	beqz	$zero,.L0f0473bc
 /*  f046edc:	8fbf002c */ 	lw	$ra,0x2c($sp)
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 8696dbdfe..3ca8331a8 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -1538,7 +1538,7 @@ bool aiSetPath(void)
  */
 bool aiStartPath(void)
 {
-	func0f03a968(g_Vars.chrdata);
+	chrStartPath(g_Vars.chrdata);
 	g_Vars.aioffset += 2;
 
 	return false;
@@ -6716,7 +6716,7 @@ glabel ai00d5
 /*  f05692c:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*  f056930:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f056934:	01cf1021 */ 	addu	$v0,$t6,$t7
-/*  f056938:	0fc0e206 */ 	jal	func0f038818
+/*  f056938:	0fc0e206 */ 	jal	pathFindById
 /*  f05693c:	90440002 */ 	lbu	$a0,0x2($v0)
 /*  f056940:	3c05800a */ 	lui	$a1,%hi(g_Vars)
 /*  f056944:	24a59fc0 */ 	addiu	$a1,$a1,%lo(g_Vars)
diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h
index 60e729c0c..e76cb393b 100644
--- a/src/include/game/chr/chr.h
+++ b/src/include/game/chr/chr.h
@@ -218,9 +218,9 @@ u32 func0f0375e8(void);
 u32 func0f0379b0(void);
 u32 func0f037b70(void);
 u32 func0f03843c(struct chrdata *chr, struct coord *coord, s16 *room_id, u32 speed);
-u32 func0f038818(void);
+struct path *pathFindById(s32 path_id);
 u32 func0f038868(void);
-u32 func0f038b9c(void);
+void func0f038b9c(struct chrdata *chr, struct path *path);
 u32 func0f038f30(void);
 u32 func0f038f40(void);
 u32 func0f0391ec(struct chrdata *chr, struct coord *coord, s16 *room, u32 arg3);
@@ -248,7 +248,7 @@ u32 func0f03a6d8(struct chrdata *chr, u32 thingtype, u32 thingid);
 u32 func0f03a76c(struct chrdata *chr, u32 thingtype, u32 thingid);
 u32 func0f03a7e8(struct chrdata *chr, u32 thingtype, u32 thingid);
 u32 func0f03a894(struct chrdata *chr, s32 pad, s32 arg2);
-u32 func0f03a968(struct chrdata *chr);
+u32 chrStartPath(struct chrdata *chr);
 u32 func0f03a9b8(struct chrdata *chr);
 bool chrFadeOut(struct chrdata *chr);
 bool chrGoToTarget(struct chrdata *chr, u32 speed);
diff --git a/src/include/types.h b/src/include/types.h
index 8ab67effa..efb19f810 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -95,7 +95,7 @@ struct chrdata {
 	/*0x00f*/ u8 grenadeprob;
 	/*0x010*/ u16 bodynum;
 	/*0x012*/ u8 flinchcnt;
-	/*0x013*/ u8 path;
+	/*0x013*/ s8 path;
 	/*0x014*/ u32 hidden;
 	/*0x018*/ u32 chrflags;
 	/*0x01c*/ struct position *pos;
@@ -2285,7 +2285,7 @@ struct ailist {
 	u32 id;
 };
 
-struct aipaths {
+struct path {
 	s32 *pads;
 	u8 id;
 	u8 type;
@@ -2297,7 +2297,7 @@ struct stagesetup {
 	/*0x08*/ void *unk08;
 	/*0x0c*/ u8 *intro;
 	/*0x10*/ u8 *props;
-	/*0x14*/ struct aipaths *paths;
+	/*0x14*/ struct path *paths;
 	/*0x18*/ struct ailist *ailists;
 	/*0x1c*/ void *unk1c;
 };