diff --git a/src/files/setup/mp_setupame.c b/src/files/setup/mp_setupame.c
index 01a4296ce..f334b4780 100644
--- a/src/files/setup/mp_setupame.c
+++ b/src/files/setup/mp_setupame.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuparch.c b/src/files/setup/mp_setuparch.c
index 3b9ff6110..3f4e1faaf 100644
--- a/src/files/setup/mp_setuparch.c
+++ b/src/files/setup/mp_setuparch.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuparec.c b/src/files/setup/mp_setuparec.c
index b8594e852..469803c5b 100644
--- a/src/files/setup/mp_setuparec.c
+++ b/src/files/setup/mp_setuparec.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	tag(0x00, 1)
 	lift(0x0100, MODEL_RAVINELIFT, 0x00bc, 0x035204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00bc, 0x00bb, 0x00baffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	weapon(0x0200, MODEL_ROOFGUN, 0x00bd, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
diff --git a/src/files/setup/mp_setupark.c b/src/files/setup/mp_setupark.c
index 77aee09ee..56401c7a2 100644
--- a/src/files/setup/mp_setupark.c
+++ b/src/files/setup/mp_setupark.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupash.c b/src/files/setup/mp_setupash.c
index 6265a6bc7..e70826dc5 100644
--- a/src/files/setup/mp_setupash.c
+++ b/src/files/setup/mp_setupash.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupate.c b/src/files/setup/mp_setupate.c
index 8ae9a248b..a670ead32 100644
--- a/src/files/setup/mp_setupate.c
+++ b/src/files/setup/mp_setupate.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupazt.c b/src/files/setup/mp_setupazt.c
index 6dc8f57b9..28a80be79 100644
--- a/src/files/setup/mp_setupazt.c
+++ b/src/files/setup/mp_setupazt.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupcat.c b/src/files/setup/mp_setupcat.c
index 1c4f4555d..e53ebfed4 100644
--- a/src/files/setup/mp_setupcat.c
+++ b/src/files/setup/mp_setupcat.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupcave.c b/src/files/setup/mp_setupcave.c
index 0c7542b0e..1a610b576 100644
--- a/src/files/setup/mp_setupcave.c
+++ b/src/files/setup/mp_setupcave.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupcrad.c b/src/files/setup/mp_setupcrad.c
index f6732f3a1..bc6de824a 100644
--- a/src/files/setup/mp_setupcrad.c
+++ b/src/files/setup/mp_setupcrad.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x00e2, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x00ec, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x00ed, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupcryp.c b/src/files/setup/mp_setupcryp.c
index c62ca550d..971464ffa 100644
--- a/src/files/setup/mp_setupcryp.c
+++ b/src/files/setup/mp_setupcryp.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x00b2, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x00cc, MODEL_MULTI_AMMO_CRATE, 0x00bc, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x00cc, MODEL_MULTI_AMMO_CRATE, 0x00bd, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupdam.c b/src/files/setup/mp_setupdam.c
index 88f93757f..de123df46 100644
--- a/src/files/setup/mp_setupdam.c
+++ b/src/files/setup/mp_setupdam.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -31,7 +31,7 @@ char *text_objective3 = "intercept data backup\n";
 char *text_objective4 = "bungee jump from platform\n";
 char *text_objective5 = "Byelomorye Dam, Archangel, USSR\n";
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupdepo.c b/src/files/setup/mp_setupdepo.c
index 35634cb47..67c1911dc 100644
--- a/src/files/setup/mp_setupdepo.c
+++ b/src/files/setup/mp_setupdepo.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupdest.c b/src/files/setup/mp_setupdest.c
index f2b552374..b178616eb 100644
--- a/src/files/setup/mp_setupdest.c
+++ b/src/files/setup/mp_setupdest.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupdish.c b/src/files/setup/mp_setupdish.c
index c03acf6db..55d612cd8 100644
--- a/src/files/setup/mp_setupdish.c
+++ b/src/files/setup/mp_setupdish.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupear.c b/src/files/setup/mp_setupear.c
index 12bca4bf4..58bb752e4 100644
--- a/src/files/setup/mp_setupear.c
+++ b/src/files/setup/mp_setupear.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupeld.c b/src/files/setup/mp_setupeld.c
index fc8299205..91e0c206f 100644
--- a/src/files/setup/mp_setupeld.c
+++ b/src/files/setup/mp_setupeld.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupimp.c b/src/files/setup/mp_setupimp.c
index 5d25a4e6f..5a5d10c89 100644
--- a/src/files/setup/mp_setupimp.c
+++ b/src/files/setup/mp_setupimp.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupjun.c b/src/files/setup/mp_setupjun.c
index d5d94ba1d..3c078f94a 100644
--- a/src/files/setup/mp_setupjun.c
+++ b/src/files/setup/mp_setupjun.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x0093, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x009d, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x009e, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setuplam.c b/src/files/setup/mp_setuplam.c
index bdad4ed49..142dd48a8 100644
--- a/src/files/setup/mp_setuplam.c
+++ b/src/files/setup/mp_setuplam.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuplee.c b/src/files/setup/mp_setuplee.c
index 43148f12f..364e9f79b 100644
--- a/src/files/setup/mp_setuplee.c
+++ b/src/files/setup/mp_setuplee.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuplen.c b/src/files/setup/mp_setuplen.c
index 4cc971849..9f183eaa7 100644
--- a/src/files/setup/mp_setuplen.c
+++ b/src/files/setup/mp_setuplen.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuplip.c b/src/files/setup/mp_setuplip.c
index d7fe5d211..ad0094ffb 100644
--- a/src/files/setup/mp_setuplip.c
+++ b/src/files/setup/mp_setuplip.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuplue.c b/src/files/setup/mp_setuplue.c
index b0b9359dc..8b96d7049 100644
--- a/src/files/setup/mp_setuplue.c
+++ b/src/files/setup/mp_setuplue.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp1.c b/src/files/setup/mp_setupmp1.c
index fe981935f..08793d0f5 100644
--- a/src/files/setup/mp_setupmp1.c
+++ b/src/files/setup/mp_setupmp1.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x002c, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x0036, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x0037, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp10.c b/src/files/setup/mp_setupmp10.c
index 4cceb760b..2bc290ca0 100644
--- a/src/files/setup/mp_setupmp10.c
+++ b/src/files/setup/mp_setupmp10.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x0099, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x00a3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x00a4, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp11.c b/src/files/setup/mp_setupmp11.c
index 6bd32062f..c051e8ba2 100644
--- a/src/files/setup/mp_setupmp11.c
+++ b/src/files/setup/mp_setupmp11.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x0028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x0032, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x0033, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp12.c b/src/files/setup/mp_setupmp12.c
index 045cfd9c3..1ec266898 100644
--- a/src/files/setup/mp_setupmp12.c
+++ b/src/files/setup/mp_setupmp12.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x01a7, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf4, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x00b3, MODEL_MULTI_AMMO_CRATE, 0x01c0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x00b3, MODEL_MULTI_AMMO_CRATE, 0x01c1, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp13.c b/src/files/setup/mp_setupmp13.c
index 0fd9c3676..c1390b763 100644
--- a/src/files/setup/mp_setupmp13.c
+++ b/src/files/setup/mp_setupmp13.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x00bd, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x00c7, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x00c8, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp14.c b/src/files/setup/mp_setupmp14.c
index 8e701f797..91e00c852 100644
--- a/src/files/setup/mp_setupmp14.c
+++ b/src/files/setup/mp_setupmp14.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp15.c b/src/files/setup/mp_setupmp15.c
index 14279fb96..e150661b0 100644
--- a/src/files/setup/mp_setupmp15.c
+++ b/src/files/setup/mp_setupmp15.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x00ac, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x00b7, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x00b8, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp16.c b/src/files/setup/mp_setupmp16.c
index cdc31fa14..c37632f6d 100644
--- a/src/files/setup/mp_setupmp16.c
+++ b/src/files/setup/mp_setupmp16.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp17.c b/src/files/setup/mp_setupmp17.c
index a76f6e475..aa19f6f71 100644
--- a/src/files/setup/mp_setupmp17.c
+++ b/src/files/setup/mp_setupmp17.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp18.c b/src/files/setup/mp_setupmp18.c
index 16eb6aa6f..49b857d94 100644
--- a/src/files/setup/mp_setupmp18.c
+++ b/src/files/setup/mp_setupmp18.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp19.c b/src/files/setup/mp_setupmp19.c
index c5004ef16..70f285cbd 100644
--- a/src/files/setup/mp_setupmp19.c
+++ b/src/files/setup/mp_setupmp19.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp2.c b/src/files/setup/mp_setupmp2.c
index a80d36bb2..93dd3392c 100644
--- a/src/files/setup/mp_setupmp2.c
+++ b/src/files/setup/mp_setupmp2.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp20.c b/src/files/setup/mp_setupmp20.c
index 7046ee7d5..8a1b8da8a 100644
--- a/src/files/setup/mp_setupmp20.c
+++ b/src/files/setup/mp_setupmp20.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp3.c b/src/files/setup/mp_setupmp3.c
index 118a0f80b..87a543391 100644
--- a/src/files/setup/mp_setupmp3.c
+++ b/src/files/setup/mp_setupmp3.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x0028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x0032, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x0033, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp4.c b/src/files/setup/mp_setupmp4.c
index 850bfbc43..e5db29e89 100644
--- a/src/files/setup/mp_setupmp4.c
+++ b/src/files/setup/mp_setupmp4.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x0167, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x00cc, MODEL_MULTI_AMMO_CRATE, 0x0171, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x00cc, MODEL_MULTI_AMMO_CRATE, 0x0172, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp5.c b/src/files/setup/mp_setupmp5.c
index f48ffd3d0..c311c2072 100644
--- a/src/files/setup/mp_setupmp5.c
+++ b/src/files/setup/mp_setupmp5.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x0116, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x00cc, MODEL_MULTI_AMMO_CRATE, 0x0120, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x00cc, MODEL_MULTI_AMMO_CRATE, 0x0121, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupmp6.c b/src/files/setup/mp_setupmp6.c
index e4f3b507f..126f5a234 100644
--- a/src/files/setup/mp_setupmp6.c
+++ b/src/files/setup/mp_setupmp6.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp7.c b/src/files/setup/mp_setupmp7.c
index ccf090edf..57745a900 100644
--- a/src/files/setup/mp_setupmp7.c
+++ b/src/files/setup/mp_setupmp7.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp8.c b/src/files/setup/mp_setupmp8.c
index 1248e6783..3454c5f11 100644
--- a/src/files/setup/mp_setupmp8.c
+++ b/src/files/setup/mp_setupmp8.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupmp9.c b/src/files/setup/mp_setupmp9.c
index 4cc044af9..0e0c1725e 100644
--- a/src/files/setup/mp_setupmp9.c
+++ b/src/files/setup/mp_setupmp9.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0100, 0x0000, 0x0000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x000c, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0100, MODEL_MULTI_AMMO_CRATE, 0x000d, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupoat.c b/src/files/setup/mp_setupoat.c
index 088cdf0bd..0a08f43cf 100644
--- a/src/files/setup/mp_setupoat.c
+++ b/src/files/setup/mp_setupoat.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0200, 0x0000, 0x00cd, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0099, MODEL_MULTI_AMMO_CRATE, 0x00dc, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0099, MODEL_MULTI_AMMO_CRATE, 0x00dd, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setupold.c b/src/files/setup/mp_setupold.c
index 7fe5f2ad8..2083b8a43 100644
--- a/src/files/setup/mp_setupold.c
+++ b/src/files/setup/mp_setupold.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuppam.c b/src/files/setup/mp_setuppam.c
index b9c912235..cf70b2188 100644
--- a/src/files/setup/mp_setuppam.c
+++ b/src/files/setup/mp_setuppam.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuppete.c b/src/files/setup/mp_setuppete.c
index 73f90438d..b223023ab 100644
--- a/src/files/setup/mp_setuppete.c
+++ b/src/files/setup/mp_setuppete.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -29,7 +29,7 @@ char *text_objective1 = "\n\n\n";
 char *text_objective2 = "\n\n\n";
 char *text_objective3 = "\n";
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x0020)
 	briefing(1, 0x0024)
 	briefing(2, 0x0028)
diff --git a/src/files/setup/mp_setupref.c b/src/files/setup/mp_setupref.c
index f811c2d29..b522646ed 100644
--- a/src/files/setup/mp_setupref.c
+++ b/src/files/setup/mp_setupref.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	weapon(0x0200, 0x0000, 0x002f, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xf0, 0x00ffffff, 0x00000000)
 	ammocratemulti(0x0099, MODEL_MULTI_AMMO_CRATE, 0x0039, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
 	ammocratemulti(0x0099, MODEL_MULTI_AMMO_CRATE, 0x003a, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000)
diff --git a/src/files/setup/mp_setuprit.c b/src/files/setup/mp_setuprit.c
index 7c868a0a2..7b569d0b4 100644
--- a/src/files/setup/mp_setuprit.c
+++ b/src/files/setup/mp_setuprit.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuprun.c b/src/files/setup/mp_setuprun.c
index 4574e0a71..63cce749f 100644
--- a/src/files/setup/mp_setuprun.c
+++ b/src/files/setup/mp_setuprun.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupsev.c b/src/files/setup/mp_setupsev.c
index 721415ec3..7a8d261ba 100644
--- a/src/files/setup/mp_setupsev.c
+++ b/src/files/setup/mp_setupsev.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupsevb.c b/src/files/setup/mp_setupsevb.c
index 57868d5da..70912c7cf 100644
--- a/src/files/setup/mp_setupsevb.c
+++ b/src/files/setup/mp_setupsevb.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupsevx.c b/src/files/setup/mp_setupsevx.c
index 5726ad960..e0b6743ff 100644
--- a/src/files/setup/mp_setupsevx.c
+++ b/src/files/setup/mp_setupsevx.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupsho.c b/src/files/setup/mp_setupsho.c
index 647ff77fd..84f279a59 100644
--- a/src/files/setup/mp_setupsho.c
+++ b/src/files/setup/mp_setupsho.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupsilo.c b/src/files/setup/mp_setupsilo.c
index 405a62988..6593c3664 100644
--- a/src/files/setup/mp_setupsilo.c
+++ b/src/files/setup/mp_setupsilo.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupstat.c b/src/files/setup/mp_setupstat.c
index 3f0f4fed7..5258b2ccf 100644
--- a/src/files/setup/mp_setupstat.c
+++ b/src/files/setup/mp_setupstat.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setuptra.c b/src/files/setup/mp_setuptra.c
index cb2365bb1..fe8041864 100644
--- a/src/files/setup/mp_setuptra.c
+++ b/src/files/setup/mp_setuptra.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupuff.c b/src/files/setup/mp_setupuff.c
index 19ce67b6d..f89fdc016 100644
--- a/src/files/setup/mp_setupuff.c
+++ b/src/files/setup/mp_setupuff.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/mp_setupwax.c b/src/files/setup/mp_setupwax.c
index b57ba1b8d..9dfd12a50 100644
--- a/src/files/setup/mp_setupwax.c
+++ b/src/files/setup/mp_setupwax.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c
index 316550483..fdb31cf3c 100644
--- a/src/files/setup/setupame.c
+++ b/src/files/setup/setupame.c
@@ -134,7 +134,7 @@
 #define AILIST_INIT_FALCON_GUARD  0x0430
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -149,7 +149,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x0201)
 	briefing(1, 0x0200)
 	briefing(2, 0x0202)
diff --git a/src/files/setup/setuparch.c b/src/files/setup/setuparch.c
index f091a512e..5003aa6cd 100644
--- a/src/files/setup/setuparch.c
+++ b/src/files/setup/setuparch.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setuparec.c b/src/files/setup/setuparec.c
index fc06b71d1..35fc737cb 100644
--- a/src/files/setup/setuparec.c
+++ b/src/files/setup/setuparec.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	lift(0x0100, MODEL_RAVINELIFT, 0x00bc, 0x035204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00bc, 0x00bb, 0x00baffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	endprops
 };
diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c
index 6c0c0c1ac..eccb0e3b9 100644
--- a/src/files/setup/setupark.c
+++ b/src/files/setup/setupark.c
@@ -78,7 +78,7 @@
 #define AILIST_INIT_SHOCK         0x0414
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -93,7 +93,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x0601)
 	briefing(1, 0x0600)
 	briefing(2, 0x0602)
diff --git a/src/files/setup/setupash.c b/src/files/setup/setupash.c
index 6265a6bc7..e70826dc5 100644
--- a/src/files/setup/setupash.c
+++ b/src/files/setup/setupash.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupate.c b/src/files/setup/setupate.c
index e379cecdf..2ace390dc 100644
--- a/src/files/setup/setupate.c
+++ b/src/files/setup/setupate.c
@@ -26,7 +26,7 @@
 #define AILIST_TRENT_INIT   0x0407
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -41,7 +41,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x5e01)
 	briefing(1, 0x5e00)
 	briefing(2, 0x5e02)
diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c
index 17ceb1b5b..73308fed9 100644
--- a/src/files/setup/setupazt.c
+++ b/src/files/setup/setupazt.c
@@ -58,7 +58,7 @@
 #define AILIST_HIDE                0x0422
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -73,7 +73,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x0a01)
 	briefing(1, 0x0a00)
 	briefing(2, 0x0a02)
diff --git a/src/files/setup/setupcat.c b/src/files/setup/setupcat.c
index 1c4f4555d..e53ebfed4 100644
--- a/src/files/setup/setupcat.c
+++ b/src/files/setup/setupcat.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c
index de37b5bca..77f426caa 100644
--- a/src/files/setup/setupcave.c
+++ b/src/files/setup/setupcave.c
@@ -79,7 +79,7 @@
 #define AILIST_FOYER_CLONE                0x042c
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -94,7 +94,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x0e01)
 	briefing(1, 0x0e00)
 	briefing(2, 0x0e02)
diff --git a/src/files/setup/setupcrad.c b/src/files/setup/setupcrad.c
index 5f0ec748f..4ae0bf14a 100644
--- a/src/files/setup/setupcrad.c
+++ b/src/files/setup/setupcrad.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupcryp.c b/src/files/setup/setupcryp.c
index 67b2a2ceb..0c07d72fd 100644
--- a/src/files/setup/setupcryp.c
+++ b/src/files/setup/setupcryp.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c
index edcbd9658..73aabc6a7 100644
--- a/src/files/setup/setupdam.c
+++ b/src/files/setup/setupdam.c
@@ -87,7 +87,7 @@
 #define AILIST_ELVIS_AT_MOONPOOL     0x0418
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -102,7 +102,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x1601)
 	briefing(1, 0x1600)
 	briefing(2, 0x1602)
diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c
index 669da2d2c..0e1a8c721 100644
--- a/src/files/setup/setupdepo.c
+++ b/src/files/setup/setupdepo.c
@@ -99,7 +99,7 @@
 #define AILIST_CLOAK2_GUARD      0x0414
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -114,7 +114,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x1801)
 	briefing(1, 0x1800)
 	briefing(2, 0x1802)
diff --git a/src/files/setup/setupdest.c b/src/files/setup/setupdest.c
index 1f2b59d64..53307ebd3 100644
--- a/src/files/setup/setupdest.c
+++ b/src/files/setup/setupdest.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c
index 4bf571848..ad33af896 100644
--- a/src/files/setup/setupdish.c
+++ b/src/files/setup/setupdish.c
@@ -95,7 +95,7 @@
 #define PAD_HOLOROOM          0x0273
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -110,7 +110,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	door(0x0100, MODEL_INSTFRONTDOOR, 0x018d, 0x10000600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000008, 0x00000384, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000300, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000)
 	door(0x0100, MODEL_INSTFRONTDOOR, 0x018e, 0x10000600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000008, 0x00000384, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000)
 	door(0x0100, MODEL_INSTFRONTDOOR, 0x018f, 0x10000600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000008, 0x00000384, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000300, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000)
diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c
index 4b1e4dfe3..2071c0d26 100644
--- a/src/files/setup/setupear.c
+++ b/src/files/setup/setupear.c
@@ -90,7 +90,7 @@
 #define AILIST_OUTRO                0x0417
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -105,7 +105,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x1e01)
 	briefing(1, 0x1e00)
 	briefing(2, 0x1e02)
diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c
index e62b9765a..da4e5751f 100644
--- a/src/files/setup/setupeld.c
+++ b/src/files/setup/setupeld.c
@@ -86,7 +86,7 @@
 #define AILIST_CISOLIDER           0x0411
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -101,7 +101,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x2001)
 	briefing(1, 0x2000)
 	briefing(2, 0x2002)
diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c
index 39eda9259..554bac1ac 100644
--- a/src/files/setup/setupimp.c
+++ b/src/files/setup/setupimp.c
@@ -142,7 +142,7 @@
 #define AILIST_CARRINGTON             0x043e
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -157,7 +157,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x2201)
 	briefing(1, 0x2200)
 	briefing(2, 0x2202)
diff --git a/src/files/setup/setupjun.c b/src/files/setup/setupjun.c
index 8e9594ab6..a698a0b7e 100644
--- a/src/files/setup/setupjun.c
+++ b/src/files/setup/setupjun.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setuplam.c b/src/files/setup/setuplam.c
index bdad4ed49..142dd48a8 100644
--- a/src/files/setup/setuplam.c
+++ b/src/files/setup/setuplam.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c
index ba12daa17..36e7c0f93 100644
--- a/src/files/setup/setuplee.c
+++ b/src/files/setup/setuplee.c
@@ -108,7 +108,7 @@
 #define AILIST_SET_UNCLOAKED                    0x0428
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -123,7 +123,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x2601)
 	briefing(1, 0x2600)
 	briefing(2, 0x2602)
diff --git a/src/files/setup/setuplen.c b/src/files/setup/setuplen.c
index d7cb23cd9..42467c0f8 100644
--- a/src/files/setup/setuplen.c
+++ b/src/files/setup/setuplen.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c
index f5835eec5..73906ec05 100644
--- a/src/files/setup/setuplip.c
+++ b/src/files/setup/setuplip.c
@@ -117,7 +117,7 @@
 #define AILIST_INIT_BIOTECH2          0x0433
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -132,7 +132,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x2a01)
 	briefing(1, 0x2a00)
 	briefing(2, 0x2a02)
diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c
index 5003ea875..331ffb5d5 100644
--- a/src/files/setup/setuplue.c
+++ b/src/files/setup/setuplue.c
@@ -77,7 +77,7 @@
 #define AILIST_ACTIVATE_LASERS            0x0424
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -92,7 +92,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x2c01)
 	briefing(1, 0x2c00)
 	briefing(2, 0x2c02)
diff --git a/src/files/setup/setupmp1.c b/src/files/setup/setupmp1.c
index 59a976cf1..99200f1d2 100644
--- a/src/files/setup/setupmp1.c
+++ b/src/files/setup/setupmp1.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp10.c b/src/files/setup/setupmp10.c
index 76bf8cad6..4479096a7 100644
--- a/src/files/setup/setupmp10.c
+++ b/src/files/setup/setupmp10.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	lift(0x0100, MODEL_A51_LIFT_THINWALL, 0x006a, 0x035204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x006a, 0x006b, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003555, 0x00085555, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	lift(0x0100, MODEL_A51_LIFT_THINWALL, 0x006c, 0x035204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x006c, 0x006d, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003555, 0x00085555, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	lift(0x0100, MODEL_A51_LIFT_THINWALL, 0x006e, 0x035204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x006e, 0x006f, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003555, 0x00085555, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
diff --git a/src/files/setup/setupmp11.c b/src/files/setup/setupmp11.c
index af5a3f201..64128cfe3 100644
--- a/src/files/setup/setupmp11.c
+++ b/src/files/setup/setupmp11.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp12.c b/src/files/setup/setupmp12.c
index e88776c2f..db64588f9 100644
--- a/src/files/setup/setupmp12.c
+++ b/src/files/setup/setupmp12.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp13.c b/src/files/setup/setupmp13.c
index 0246e4099..258780e5e 100644
--- a/src/files/setup/setupmp13.c
+++ b/src/files/setup/setupmp13.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp14.c b/src/files/setup/setupmp14.c
index ff89aa96f..bcffcfd12 100644
--- a/src/files/setup/setupmp14.c
+++ b/src/files/setup/setupmp14.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp15.c b/src/files/setup/setupmp15.c
index fd232a8a7..a51f15b5c 100644
--- a/src/files/setup/setupmp15.c
+++ b/src/files/setup/setupmp15.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp16.c b/src/files/setup/setupmp16.c
index 28e89b06b..fcee2f1e2 100644
--- a/src/files/setup/setupmp16.c
+++ b/src/files/setup/setupmp16.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp17.c b/src/files/setup/setupmp17.c
index 5b6e11415..983f56bf8 100644
--- a/src/files/setup/setupmp17.c
+++ b/src/files/setup/setupmp17.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp18.c b/src/files/setup/setupmp18.c
index 4133bc9db..4307deb00 100644
--- a/src/files/setup/setupmp18.c
+++ b/src/files/setup/setupmp18.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp19.c b/src/files/setup/setupmp19.c
index 776bd6d30..943b38f1e 100644
--- a/src/files/setup/setupmp19.c
+++ b/src/files/setup/setupmp19.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp2.c b/src/files/setup/setupmp2.c
index 50dcb4f58..116d356be 100644
--- a/src/files/setup/setupmp2.c
+++ b/src/files/setup/setupmp2.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp20.c b/src/files/setup/setupmp20.c
index 0548d8772..2ac9a8116 100644
--- a/src/files/setup/setupmp20.c
+++ b/src/files/setup/setupmp20.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp3.c b/src/files/setup/setupmp3.c
index 112d5e36d..2df189851 100644
--- a/src/files/setup/setupmp3.c
+++ b/src/files/setup/setupmp3.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp4.c b/src/files/setup/setupmp4.c
index de32bc5fc..b71ba3fb3 100644
--- a/src/files/setup/setupmp4.c
+++ b/src/files/setup/setupmp4.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp5.c b/src/files/setup/setupmp5.c
index cb8ba4cdc..83c241501 100644
--- a/src/files/setup/setupmp5.c
+++ b/src/files/setup/setupmp5.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp6.c b/src/files/setup/setupmp6.c
index ccbcd8830..c105e35a1 100644
--- a/src/files/setup/setupmp6.c
+++ b/src/files/setup/setupmp6.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp7.c b/src/files/setup/setupmp7.c
index 08350dcfe..f1adff3bc 100644
--- a/src/files/setup/setupmp7.c
+++ b/src/files/setup/setupmp7.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp8.c b/src/files/setup/setupmp8.c
index b3466c640..27cb8e98d 100644
--- a/src/files/setup/setupmp8.c
+++ b/src/files/setup/setupmp8.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupmp9.c b/src/files/setup/setupmp9.c
index 4b42aea58..fc964703f 100644
--- a/src/files/setup/setupmp9.c
+++ b/src/files/setup/setupmp9.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupoat.c b/src/files/setup/setupoat.c
index 6f7e61749..892464b89 100644
--- a/src/files/setup/setupoat.c
+++ b/src/files/setup/setupoat.c
@@ -9,7 +9,7 @@
 #define AILIST_INIT_MAIAN 0x0402
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -24,7 +24,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupold.c b/src/files/setup/setupold.c
index f0bc010b7..d9b4740e0 100644
--- a/src/files/setup/setupold.c
+++ b/src/files/setup/setupold.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	tag(0x00, 1)
 	stdobject(0x0100, MODEL_A51_CRATE1, 0xffff, 0x00021501, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
 	tag(0x01, 1)
diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c
index e5015a740..49e913c8e 100644
--- a/src/files/setup/setuppam.c
+++ b/src/files/setup/setuppam.c
@@ -96,7 +96,7 @@
 #define PAD_DRCAROLLROOM_ENTRY 0x01cb
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -111,7 +111,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x3001)
 	briefing(1, 0x3000)
 	briefing(2, 0x3002)
diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c
index bcd4c668d..7f4c41589 100644
--- a/src/files/setup/setuppete.c
+++ b/src/files/setup/setuppete.c
@@ -94,7 +94,7 @@
 #define GROUP_ALARM_RESPONDER 0x09
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -109,7 +109,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x3201)
 	briefing(1, 0x3200)
 	briefing(2, 0x3202)
diff --git a/src/files/setup/setupref.c b/src/files/setup/setupref.c
index 526e90ffa..85f5c85f8 100644
--- a/src/files/setup/setupref.c
+++ b/src/files/setup/setupref.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c
index 98fee5228..22a515c20 100644
--- a/src/files/setup/setuprit.c
+++ b/src/files/setup/setuprit.c
@@ -114,7 +114,7 @@
 #define AILIST_REMOVE_IF_OFFSCREEN 0x042c
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -129,7 +129,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x3601)
 	briefing(1, 0x3600)
 	briefing(2, 0x3602)
diff --git a/src/files/setup/setuprun.c b/src/files/setup/setuprun.c
index 5ebc5ad95..7f7443089 100644
--- a/src/files/setup/setuprun.c
+++ b/src/files/setup/setuprun.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c
index 527bd519e..4fdce1b15 100644
--- a/src/files/setup/setupsev.c
+++ b/src/files/setup/setupsev.c
@@ -41,7 +41,7 @@
 #define AILIST_INIT_LABTECH     0x041c
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -56,7 +56,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x3c01)
 	briefing(1, 0x3c00)
 	briefing(2, 0x3c02)
diff --git a/src/files/setup/setupsevb.c b/src/files/setup/setupsevb.c
index 57868d5da..70912c7cf 100644
--- a/src/files/setup/setupsevb.c
+++ b/src/files/setup/setupsevb.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupsevx.c b/src/files/setup/setupsevx.c
index 6a4d31f6c..f36f8cee3 100644
--- a/src/files/setup/setupsevx.c
+++ b/src/files/setup/setupsevx.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupsevxb.c b/src/files/setup/setupsevxb.c
index a873b9209..541d58d9d 100644
--- a/src/files/setup/setupsevxb.c
+++ b/src/files/setup/setupsevxb.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c
index fb8fe20d4..44ef3acb4 100644
--- a/src/files/setup/setupsho.c
+++ b/src/files/setup/setupsho.c
@@ -102,7 +102,7 @@
 #define AILIST_OUTRO                         0x0414
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -117,7 +117,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x4201)
 	briefing(1, 0x4200)
 	briefing(2, 0x4202)
diff --git a/src/files/setup/setupsilo.c b/src/files/setup/setupsilo.c
index 405a62988..6593c3664 100644
--- a/src/files/setup/setupsilo.c
+++ b/src/files/setup/setupsilo.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupstat.c b/src/files/setup/setupstat.c
index 1877cac2f..c4aa2ae6c 100644
--- a/src/files/setup/setupstat.c
+++ b/src/files/setup/setupstat.c
@@ -55,7 +55,7 @@
 #define GROUP_KING3_SKEDAR 4
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -70,7 +70,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x4601)
 	briefing(1, 0x4600)
 	briefing(2, 0x4602)
diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c
index 22fc4f4e3..b9f6ea588 100644
--- a/src/files/setup/setuptra.c
+++ b/src/files/setup/setuptra.c
@@ -93,7 +93,7 @@
 #define SPAWNGROUP4 0x0d
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -108,7 +108,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x4801)
 	briefing(1, 0x4800)
 	briefing(2, 0x4802)
diff --git a/src/files/setup/setupuff.c b/src/files/setup/setupuff.c
index bfcdec0cf..8afcadac1 100644
--- a/src/files/setup/setupuff.c
+++ b/src/files/setup/setupuff.c
@@ -5,7 +5,7 @@
 #include "stagesetup.h"
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -20,7 +20,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	endprops
 };
 
diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c
index eba143e85..7b02fa6b4 100644
--- a/src/files/setup/setupwax.c
+++ b/src/files/setup/setupwax.c
@@ -44,7 +44,7 @@
 #define AILIST_OUTRO                0x0417
 
 s32 intro[];
-u8 props[];
+u32 props[];
 struct path paths[];
 struct ailist ailists[];
 
@@ -59,7 +59,7 @@ struct stagesetup setup = {
 	NULL,
 };
 
-u8 props[] = {
+u32 props[] = {
 	briefing(0, 0x4a01)
 	briefing(1, 0x4a00)
 	briefing(2, 0x4a02)
diff --git a/src/include/props.h b/src/include/props.h
index a473dfaba..8c027dbbe 100644
--- a/src/include/props.h
+++ b/src/include/props.h
@@ -1,376 +1,299 @@
-#include "util.h"
+#define _mkshort(a, b) ((a << 8) | (b & 0xff))
+#define _mkword(a, b) ((a << 16) | (b & 0xffff))
 
-// Only used within this file
-// len 0x58
-#define generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19) \
-	mkshort(model), \
-	mkshort(pad), \
-	mkword(props1), \
-	mkword(props2), \
-	mkword(u1), mkword(u2), mkword(u3), mkword(u4), \
-	mkword(u5), mkword(u6), mkword(u7), mkword(u8), \
-	mkword(u9), mkword(u10), mkword(u11), mkword(u12), \
-	mkword(u13), mkword(u14), mkword(u15), mkword(u16), \
-	mkword(u17), mkword(u18), mkword(u19)
+#define _generic_object(id, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19) \
+	_mkword(scale, id), \
+	_mkword(model, pad), \
+	props1, \
+	props2, \
+	u1, u2, u3, u4, \
+	u5, u6, u7, u8, \
+	u9, u10, u11, u12, \
+	u13, u14, u15, u16, \
+	u17, u18, u19
 
 #define door(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45, u46, u47, u48, u49, u50, u51) \
-	mkshort(scale), \
-	mkshort(0x01), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35), \
-	mkword(u36), mkword(u37), mkword(u38), mkword(u39), \
-	mkword(u40), mkword(u41), mkword(u42), mkword(u43), \
-	mkword(u44), mkword(u45), mkword(u46), mkword(u47), \
-	mkword(u48), mkword(u49), mkword(u50), mkword(u51),
+	_generic_object(0x01, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35, \
+	u36, u37, u38, u39, \
+	u40, u41, u42, u43, \
+	u44, u45, u46, u47, \
+	u48, u49, u50, u51,
 
 #define door_scale(scale) \
-	mkshort(0), \
-	mkshort(0x02), \
-	mkword(scale),
+	0x02, \
+	scale,
 
 #define stdobject(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19) \
-	mkshort(scale), \
-	mkshort(0x03), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19),
+	_generic_object(0x03, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19),
 
 #define key(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, lockbits) \
-	mkshort(scale), \
-	mkshort(0x04), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(lockbits),
+	_generic_object(0x04, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	lockbits,
 
 #define camera(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45) \
-	mkshort(scale), \
-	mkshort(0x06), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35), \
-	mkword(u36), mkword(u37), mkword(u38), mkword(u39), \
-	mkword(u40), mkword(u41), mkword(u42), mkword(u43), \
-	mkword(u44), mkword(u45),
+	_generic_object(0x06, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35, \
+	u36, u37, u38, u39, \
+	u40, u41, u42, u43, \
+	u44, u45,
 
 #define ammocrate(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, ammotype) \
-	mkshort(scale), \
-	mkshort(0x07), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(ammotype),
+	_generic_object(0x07, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	ammotype,
 
 #define weapon(scale, model, chr, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, weapon, u20, u21) \
-	mkshort(scale), \
-	mkshort(0x08), \
-	generic_object(model, chr, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	weapon, 0x00, 0x00, 0x00, \
-	mkword(u20), mkword(u21),
+	_generic_object(0x08, scale, model, chr, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	_mkword(_mkshort(weapon, 0), 0), \
+	u20, u21,
 
 #define chr(unk1, id, pad, body, head, function, target_pad, target_chr, hear_dist, view_dist, props1, bank1flags, team, group, chair, group2, associated) \
-	mkshort(0), \
-	mkshort(0x09), \
-	mkword(unk1), \
-	mkshort(id), \
-	mkshort(pad), \
-	body, \
-	head, \
-	mkshort(function), \
-	mkshort(target_pad), \
-	mkshort(target_chr), \
-	mkshort(hear_dist), \
-	mkshort(view_dist), \
-	mkword(props1), \
-	mkword(bank1flags), \
-	team, \
-	group, \
-	mkshort(chair), \
-	mkword(group2), \
-	mkword(associated),
+	0x09, \
+	unk1, \
+	_mkword(id, pad), \
+	_mkword(_mkshort(body, head), function), \
+	_mkword(target_pad, target_chr), \
+	_mkword(hear_dist, view_dist), \
+	props1, \
+	bank1flags, \
+	_mkword(_mkshort(team, group), chair), \
+	group2, \
+	associated,
 
 #define singlemonitor(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45, u46, u47, u48, u49) \
-	mkshort(scale), \
-	mkshort(0x0a), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35), \
-	mkword(u36), mkword(u37), mkword(u38), mkword(u39), \
-	mkword(u40), mkword(u41), mkword(u42), mkword(u43), \
-	mkword(u44), mkword(u45), mkword(u46), mkword(u47), \
-	mkword(u48), mkword(u49),
+	_generic_object(0x0a, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35, \
+	u36, u37, u38, u39, \
+	u40, u41, u42, u43, \
+	u44, u45, u46, u47, \
+	u48, u49,
 
 #define multimonitor(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45, u46, u47, u48, u49, u50, u51, u52, u53, u54, u55, u56, u57, u58, u59, u60, u61, u62, u63, u64, u65, u66, u67, u68, u69, u70, u71, u72, u73, u74, u75, u76, u77, u78, u79, u80, u81, u82, u83, u84, u85, u86, u87, u88, u89, u90, u91, u92, u93, u94, u95, u96, u97, u98, u99, u100, u101, u102, u103, u104, u105, u106, u107, u108, u109, u110, u111, u112, u113, u114, u115, u116, u117, u118, u119, u120, u121, u122, u123, u124, u125, u126, u127, u128, u129, u130, u131, u132, u133, u134, u135, u136) \
-	mkshort(scale), \
-	mkshort(0x0b), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35), \
-	mkword(u36), mkword(u37), mkword(u38), mkword(u39), \
-	mkword(u40), mkword(u41), mkword(u42), mkword(u43), \
-	mkword(u44), mkword(u45), mkword(u46), mkword(u47), \
-	mkword(u48), mkword(u49), mkword(u50), mkword(u51), \
-	mkword(u52), mkword(u53), mkword(u54), mkword(u55), \
-	mkword(u56), mkword(u57), mkword(u58), mkword(u59), \
-	mkword(u60), mkword(u61), mkword(u62), mkword(u63), \
-	mkword(u64), mkword(u65), mkword(u66), mkword(u67), \
-	mkword(u68), mkword(u69), mkword(u70), mkword(u71), \
-	mkword(u72), mkword(u73), mkword(u74), mkword(u75), \
-	mkword(u76), mkword(u77), mkword(u78), mkword(u79), \
-	mkword(u80), mkword(u81), mkword(u82), mkword(u83), \
-	mkword(u84), mkword(u85), mkword(u86), mkword(u87), \
-	mkword(u88), mkword(u89), mkword(u90), mkword(u91), \
-	mkword(u92), mkword(u93), mkword(u94), mkword(u95), \
-	mkword(u96), mkword(u97), mkword(u98), mkword(u99), \
-	mkword(u100), mkword(u101), mkword(u102), mkword(u103), \
-	mkword(u104), mkword(u105), mkword(u106), mkword(u107), \
-	mkword(u108), mkword(u109), mkword(u110), mkword(u111), \
-	mkword(u112), mkword(u113), mkword(u114), mkword(u115), \
-	mkword(u116), mkword(u117), mkword(u118), mkword(u119), \
-	mkword(u120), mkword(u121), mkword(u122), mkword(u123), \
-	mkword(u124), mkword(u125), mkword(u126), mkword(u127), \
-	mkword(u128), mkword(u129), mkword(u130), mkword(u131), \
-	mkword(u132), mkword(u133), mkword(u134), mkword(u135), \
-	mkword(u136),
+	_generic_object(0x0b, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35, \
+	u36, u37, u38, u39, \
+	u40, u41, u42, u43, \
+	u44, u45, u46, u47, \
+	u48, u49, u50, u51, \
+	u52, u53, u54, u55, \
+	u56, u57, u58, u59, \
+	u60, u61, u62, u63, \
+	u64, u65, u66, u67, \
+	u68, u69, u70, u71, \
+	u72, u73, u74, u75, \
+	u76, u77, u78, u79, \
+	u80, u81, u82, u83, \
+	u84, u85, u86, u87, \
+	u88, u89, u90, u91, \
+	u92, u93, u94, u95, \
+	u96, u97, u98, u99, \
+	u100, u101, u102, u103, \
+	u104, u105, u106, u107, \
+	u108, u109, u110, u111, \
+	u112, u113, u114, u115, \
+	u116, u117, u118, u119, \
+	u120, u121, u122, u123, \
+	u124, u125, u126, u127, \
+	u128, u129, u130, u131, \
+	u132, u133, u134, u135, \
+	u136,
 
 #define autogun(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39) \
-	mkshort(scale), \
-	mkshort(0x0d), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35), \
-	mkword(u36), mkword(u37), mkword(u38), mkword(u39),
+	_generic_object(0x0d, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35, \
+	u36, u37, u38, u39,
 
 #define link_collectibles(a, b) \
-	mkshort(0), \
-	mkshort(0x0e), \
-	mkshort(a), \
-	mkshort(b),
+	0x0e, \
+	_mkword(a, b),
 
 #define debris(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19) \
-	mkshort(scale), \
-	mkshort(0x0f), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19),
+	_generic_object(0x0f, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19),
 
 #define link_objects(u1, u2, u3, u4) \
-	mkshort(0), \
-	mkshort(0x13), \
-	mkword(u1), mkword(u2), mkword(u3), mkword(u4),
+	0x13, \
+	u1, u2, u3, u4,
 
 #define ammocratemulti(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38) \
-	mkshort(scale), \
-	mkshort(0x14), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35), \
-	mkword(u36), mkword(u37), mkword(u38),
+	_generic_object(0x14, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35, \
+	u36, u37, u38,
 
 #define shield(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22) \
-	mkshort(scale), \
-	mkshort(0x15), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22),
+	_generic_object(0x15, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22,
 
 #define tag(id, value) \
-	mkshort(0), \
-	mkshort(0x16), \
-	mkshort(id), \
-	mkshort(value), \
-	mkword(0), \
-	mkword(0),
+	0x16, \
+	_mkword(id, value), \
+	0, \
+	0,
 
 #define beginobjective(value, text, diffbit) \
-	mkshort(0), \
-	mkshort(0x17), \
-	mkword(value), \
-	mkword(text), \
-	mkword(diffbit),
+	0x17, \
+	value, \
+	text, \
+	diffbit,
 
 #define endobjective \
-	mkshort(0), \
-	mkshort(0x18),
+	0x18,
 
 #define require_object_destroyed(object) \
-	mkshort(0), \
-	mkshort(0x19), \
-	mkword(object),
+	0x19, \
+	object,
 
 #define complete_flags(stageflag) \
-	mkshort(0), \
-	mkshort(0x1a), \
-	mkword(stageflag),
+	0x1a, \
+	stageflag,
 
 #define fail_flags(stageflag) \
-	mkshort(0), \
-	mkshort(0x1b), \
-	mkword(stageflag),
+	0x1b, \
+	stageflag,
 
 #define require_object_collected(object) \
-	mkshort(0), \
-	mkshort(0x1c), \
-	mkword(object),
+	0x1c, \
+	object,
 
 #define require_object_thrown(object) \
-	mkshort(0), \
-	mkshort(0x1d), \
-	mkword(object),
+	0x1d, \
+	object,
 
 #define require_object_holographed(object, u1, u2) \
-	mkshort(0), \
-	mkshort(0x1e), \
-	mkword(object), \
-	mkword(u1), \
-	mkword(u2),
+	0x1e, \
+	object, \
+	u1, \
+	u2,
 
 #define require_room_entered(room) \
-	mkshort(0), \
-	mkshort(0x20), \
-	mkword(room),
+	0x20, \
+	room,
 
 #define require_object_thrown_on_target(throw_object, target_object, u1) \
-	mkshort(0), \
-	mkshort(0x21), \
-	mkword(throw_object), \
-	mkword(target_object), \
-	mkword(u1),
+	0x21, \
+	throw_object, \
+	target_object, \
+	u1,
 
 #define briefing(value, text1) \
-	mkshort(0), \
-	mkshort(0x23), \
-	mkword(value), \
-	mkword(text1), \
-	mkword(0),
+	0x23, \
+	value, \
+	text1, \
+	0,
 
 #define rename_object(u1, id, text, text2, text3, text4, text5, u2, u3) \
-	mkshort(0), \
-	mkshort(0x25), \
-	mkword(u1), \
-	mkword(id), \
-	mkword(text), \
-	mkword(text2), \
-	mkword(text3), \
-	mkword(text4), \
-	mkword(text5), \
-	mkword(u2), mkword(u3),
+	0x25, \
+	u1, \
+	id, \
+	text, \
+	text2, \
+	text3, \
+	text4, \
+	text5, \
+	u2, u3,
 
 #define glass(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20) \
-	mkshort(scale), \
-	mkshort(0x2a), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20),
+	_generic_object(0x2a, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20,
 
 #define camera2(scale, u1, u2, u3, u4, u5, u6) \
-	mkshort(scale), \
-	mkshort(0x2e), \
-	mkword(u1), mkword(u2), mkword(u3), mkword(u4), \
-	mkword(u5), mkword(u6),
+	_mkword(scale, 0x2e), \
+	u1, u2, u3, u4, \
+	u5, u6,
 
 #define tinted_glass(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22) \
-	mkshort(scale), \
-	mkshort(0x2f), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22),
+	_generic_object(0x2f, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22,
 
 #define lift(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, pad1, pad2, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32) \
-	mkshort(scale), \
-	mkshort(0x30), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkshort(pad1), \
-	mkshort(pad2), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32),
+	_generic_object(0x30, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	_mkword(pad1, pad2), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32,
 
 #define link_scenery(unk1, unk2, unk3) \
-	mkshort(0), \
-	mkshort(0x31), \
-	mkword(unk1), mkword(unk2), mkword(unk3), \
-	mkword(0),
+	0x31, \
+	unk1, unk2, unk3, \
+	0,
 
 #define link_paths(u1, u2, u3) \
-	mkshort(0), \
-	mkshort(0x32), \
-	mkword(u1), mkword(u2), mkword(u3),
+	0x32, \
+	u1, u2, u3,
 
 #define hoverbike(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45, u46, u47, u48, u49, u50, u51, u52) \
-	mkshort(scale), \
-	mkshort(0x33), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35), \
-	mkword(u36), mkword(u37), mkword(u38), mkword(u39), \
-	mkword(u40), mkword(u41), mkword(u42), mkword(u43), \
-	mkword(u44), mkword(u45), mkword(u46), mkword(u47), \
-	mkword(u48), mkword(u49), mkword(u50), mkword(u51), \
-	mkword(u52),
+	_generic_object(0x33, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35, \
+	u36, u37, u38, u39, \
+	u40, u41, u42, u43, \
+	u44, u45, u46, u47, \
+	u48, u49, u50, u51, \
+	u52,
 
 #define endprops \
-	mkshort(0), \
-	mkshort(0x34),
+	0x34,
 
 #define hover_prop(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35) \
-	mkshort(scale), \
-	mkshort(0x35), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35),
+	_generic_object(0x35, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35,
 
 #define vent_fan(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25) \
-	mkshort(scale), \
-	mkshort(0x36), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25),
+	_generic_object(0x36, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25,
 
 #define hovercar(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34) \
-	mkshort(scale), \
-	mkshort(0x37), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34),
+	_generic_object(0x37, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34,
 
 #define pad_effect(effect, pad) \
-	mkshort(0), \
-	mkshort(0x38), \
-	mkword(effect), \
-	mkword(pad),
+	0x38, \
+	effect, \
+	pad,
 
 #define armed_vehicle(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45, u46, u47, u48, u49, u50, u51, u52, u53, u54) \
-	mkshort(scale), \
-	mkshort(0x39), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
-	mkword(u24), mkword(u25), mkword(u26), mkword(u27), \
-	mkword(u28), mkword(u29), mkword(u30), mkword(u31), \
-	mkword(u32), mkword(u33), mkword(u34), mkword(u35), \
-	mkword(u36), mkword(u37), mkword(u38), mkword(u39), \
-	mkword(u40), mkword(u41), mkword(u42), mkword(u43), \
-	mkword(u44), mkword(u45), mkword(u46), mkword(u47), \
-	mkword(u48), mkword(u49), mkword(u50), mkword(u51), \
-	mkword(u52), mkword(u53), mkword(u54),
+	_generic_object(0x39, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23, \
+	u24, u25, u26, u27, \
+	u28, u29, u30, u31, \
+	u32, u33, u34, u35, \
+	u36, u37, u38, u39, \
+	u40, u41, u42, u43, \
+	u44, u45, u46, u47, \
+	u48, u49, u50, u51, \
+	u52, u53, u54,
 
 #define remote_mine(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22) \
-	mkshort(scale), \
-	mkshort(0x3a), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22),
+	_generic_object(0x3a, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22,
 
 #define escalator(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23) \
-	mkshort(scale), \
-	mkshort(0x3b), \
-	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
-	mkword(u20), mkword(u21), mkword(u22), mkword(u23),
+	_generic_object(0x3b, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
+	u20, u21, u22, u23,