diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c
index ae9187326..b758b8520 100644
--- a/src/files/setup/setupame.c
+++ b/src/files/setup/setupame.c
@@ -133,7 +133,7 @@
 #define AILIST_SURRENDERING_GUARD 0x042f
 #define AILIST_INIT_FALCON_GUARD  0x0430
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -656,7 +656,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_FALCON2_SILENCER, -1)
 	ammo(AMMOTYPE_PISTOL, 80)
 	ammo(AMMOTYPE_ECM_MINE, 2)
diff --git a/src/files/setup/setuparch.c b/src/files/setup/setuparch.c
index bfc4f7e69..f091a512e 100644
--- a/src/files/setup/setuparch.c
+++ b/src/files/setup/setuparch.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setuparec.c b/src/files/setup/setuparec.c
index 3d974ecdb..fc06b71d1 100644
--- a/src/files/setup/setuparec.c
+++ b/src/files/setup/setuparec.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -35,7 +35,7 @@ u8 unregistered_func2[] = {
 	endlist
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	endintro
 };
 
diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c
index 787696383..f4129d2fb 100644
--- a/src/files/setup/setupark.c
+++ b/src/files/setup/setupark.c
@@ -77,7 +77,7 @@
 #define AILIST_DEFEND_PAD         0x0413
 #define AILIST_INIT_SHOCK         0x0414
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -470,7 +470,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_FALCON2_SCOPE, -1)
 	ammo(AMMOTYPE_PISTOL, 50)
 	ammo(AMMOTYPE_RIFLE, 160)
diff --git a/src/files/setup/setupash.c b/src/files/setup/setupash.c
index da91d2bd8..6265a6bc7 100644
--- a/src/files/setup/setupash.c
+++ b/src/files/setup/setupash.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	endintro
 };
 
diff --git a/src/files/setup/setupate.c b/src/files/setup/setupate.c
index 51c48261b..e379cecdf 100644
--- a/src/files/setup/setupate.c
+++ b/src/files/setup/setupate.c
@@ -25,7 +25,7 @@
 #define AILIST_JON_INIT     0x0406
 #define AILIST_TRENT_INIT   0x0407
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -70,7 +70,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	spawn(0x027a)
 	intro_weapon(WEAPON_FALCON2_SCOPE, -1)
diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c
index 1b60f8899..d331eb64a 100644
--- a/src/files/setup/setupazt.c
+++ b/src/files/setup/setupazt.c
@@ -57,7 +57,7 @@
 #define AILIST_STARTING_AREA_GUARD 0x0421
 #define AILIST_HIDE                0x0422
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -211,7 +211,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_SNOW)
 	intro_weapon(WEAPON_FALCON2_SCOPE, -1)
 	ammo(AMMOTYPE_PISTOL, 50)
diff --git a/src/files/setup/setupcat.c b/src/files/setup/setupcat.c
index a54337640..1c4f4555d 100644
--- a/src/files/setup/setupcat.c
+++ b/src/files/setup/setupcat.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	endintro
 };
 
diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c
index a5c1e78eb..d814b0ca2 100644
--- a/src/files/setup/setupcave.c
+++ b/src/files/setup/setupcave.c
@@ -78,7 +78,7 @@
 #define AILIST_INIT_FOYER_CLONE           0x042b
 #define AILIST_FOYER_CLONE                0x042c
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -521,7 +521,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	spawn(0x011e)
 	intro_weapon(WEAPON_CROSSBOW, -1)
 	intro_weapon(WEAPON_HORIZONSCANNER, -1)
diff --git a/src/files/setup/setupcrad.c b/src/files/setup/setupcrad.c
index 1957a9777..5f0ec748f 100644
--- a/src/files/setup/setupcrad.c
+++ b/src/files/setup/setupcrad.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_FALCON2, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
 	endintro
diff --git a/src/files/setup/setupcryp.c b/src/files/setup/setupcryp.c
index df00e006b..67b2a2ceb 100644
--- a/src/files/setup/setupcryp.c
+++ b/src/files/setup/setupcryp.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_FALCON2, -1)
 	endintro
 };
diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c
index 06f1c02d9..4e295d52e 100644
--- a/src/files/setup/setupdam.c
+++ b/src/files/setup/setupdam.c
@@ -86,7 +86,7 @@
 #define AILIST_ELVIS_PREPARE_LEADING 0x0417
 #define AILIST_ELVIS_AT_MOONPOOL     0x0418
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -560,7 +560,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_WETSUIT)
 	intro_weapon(WEAPON_FALCON2_SILENCER, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c
index ec79a0f86..669da2d2c 100644
--- a/src/files/setup/setupdepo.c
+++ b/src/files/setup/setupdepo.c
@@ -98,7 +98,7 @@
 #define AILIST_CLOAK_GUARD       0x0412
 #define AILIST_CLOAK2_GUARD      0x0414
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -408,7 +408,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_FALCON2_SILENCER, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
 	ammo(AMMOTYPE_NBOMB, 6)
diff --git a/src/files/setup/setupdest.c b/src/files/setup/setupdest.c
index d15a095ed..1f2b59d64 100644
--- a/src/files/setup/setupdest.c
+++ b/src/files/setup/setupdest.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c
index 7cad96d39..2ef0adeff 100644
--- a/src/files/setup/setupdish.c
+++ b/src/files/setup/setupdish.c
@@ -94,7 +94,7 @@
 #define PAD_DEVICEROOM        0x0121
 #define PAD_HOLOROOM          0x0273
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -5843,7 +5843,7 @@ u8 func1040_lift_door_sounds[] = {
 	endlist
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	spawn(0x00f5)
 	outfit(OUTFIT_DEFAULT)
 	endintro
diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c
index c1018e2ef..4b1e4dfe3 100644
--- a/src/files/setup/setupear.c
+++ b/src/files/setup/setupear.c
@@ -89,7 +89,7 @@
 #define AILIST_RADIOACTIVITY        0x0415
 #define AILIST_OUTRO                0x0417
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -628,7 +628,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_FALCON2, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
 	ammo(AMMOTYPE_RIFLE, 50)
diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c
index 1d024c3fc..3e21d67b1 100644
--- a/src/files/setup/setupeld.c
+++ b/src/files/setup/setupeld.c
@@ -85,7 +85,7 @@
 #define AILIST_CARRINGTON          0x0410
 #define AILIST_CISOLIDER           0x0411
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -715,7 +715,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	spawn(0x00be)
 	ammo(AMMOTYPE_RIFLE, 100)
 	ammo(AMMOTYPE_SMG, 100)
diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c
index 32f67db65..4bdb5cd49 100644
--- a/src/files/setup/setupimp.c
+++ b/src/files/setup/setupimp.c
@@ -141,7 +141,7 @@
 #define AILIST_INIT_CISOLDIER         0x043c
 #define AILIST_CARRINGTON             0x043e
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -527,7 +527,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_FROCK)
 	intro_weapon(WEAPON_AR34, -1)
 	ammo(AMMOTYPE_RIFLE, 200)
diff --git a/src/files/setup/setupjun.c b/src/files/setup/setupjun.c
index 1e005fdd8..8e9594ab6 100644
--- a/src/files/setup/setupjun.c
+++ b/src/files/setup/setupjun.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	intro_weapon(WEAPON_NONE, -1)
 	endintro
diff --git a/src/files/setup/setuplam.c b/src/files/setup/setuplam.c
index 9eb5548a8..bdad4ed49 100644
--- a/src/files/setup/setuplam.c
+++ b/src/files/setup/setuplam.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c
index db417fd54..8f08b73c9 100644
--- a/src/files/setup/setuplee.c
+++ b/src/files/setup/setuplee.c
@@ -107,7 +107,7 @@
 #define AILIST_SET_CLOAKED                      0x0427
 #define AILIST_SET_UNCLOAKED                    0x0428
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -485,7 +485,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_COMBATKNIFE, -1)
 	ammo(AMMOTYPE_KNIFE, 1)
 	ammo(AMMOTYPE_ROCKET, 2)
diff --git a/src/files/setup/setuplen.c b/src/files/setup/setuplen.c
index a04501d47..d7cb23cd9 100644
--- a/src/files/setup/setuplen.c
+++ b/src/files/setup/setuplen.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	intro_weapon(WEAPON_NONE, -1)
 	endintro
diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c
index dea80f2b4..2d624e1ec 100644
--- a/src/files/setup/setuplip.c
+++ b/src/files/setup/setuplip.c
@@ -116,7 +116,7 @@
 #define AILIST_INIT_BIOTECH1          0x0432
 #define AILIST_INIT_BIOTECH2          0x0433
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -673,7 +673,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	spawn(0x03a1)
 	intro_weapon(WEAPON_FALCON2_SILENCER, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c
index fc9d3f3b0..48e58674c 100644
--- a/src/files/setup/setuplue.c
+++ b/src/files/setup/setuplue.c
@@ -76,7 +76,7 @@
 #define AILIST_ACTIVATE_AUTOGUN           0x0421
 #define AILIST_ACTIVATE_LASERS            0x0424
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -470,7 +470,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	spawn(0x000f)
 	intro_weapon(WEAPON_FALCON2, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
diff --git a/src/files/setup/setupmp1.c b/src/files/setup/setupmp1.c
index c6a9f3f78..59a976cf1 100644
--- a/src/files/setup/setupmp1.c
+++ b/src/files/setup/setupmp1.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp10.c b/src/files/setup/setupmp10.c
index bed25d4ce..76bf8cad6 100644
--- a/src/files/setup/setupmp10.c
+++ b/src/files/setup/setupmp10.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -27,7 +27,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp11.c b/src/files/setup/setupmp11.c
index 12c4ba208..af5a3f201 100644
--- a/src/files/setup/setupmp11.c
+++ b/src/files/setup/setupmp11.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp12.c b/src/files/setup/setupmp12.c
index 7277e04dc..e88776c2f 100644
--- a/src/files/setup/setupmp12.c
+++ b/src/files/setup/setupmp12.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp13.c b/src/files/setup/setupmp13.c
index 1ec5918f9..0246e4099 100644
--- a/src/files/setup/setupmp13.c
+++ b/src/files/setup/setupmp13.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp14.c b/src/files/setup/setupmp14.c
index 0c44a3bb1..ff89aa96f 100644
--- a/src/files/setup/setupmp14.c
+++ b/src/files/setup/setupmp14.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp15.c b/src/files/setup/setupmp15.c
index e45608f66..fd232a8a7 100644
--- a/src/files/setup/setupmp15.c
+++ b/src/files/setup/setupmp15.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp16.c b/src/files/setup/setupmp16.c
index 36a61053b..28e89b06b 100644
--- a/src/files/setup/setupmp16.c
+++ b/src/files/setup/setupmp16.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp17.c b/src/files/setup/setupmp17.c
index aa9b9cc46..5b6e11415 100644
--- a/src/files/setup/setupmp17.c
+++ b/src/files/setup/setupmp17.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp18.c b/src/files/setup/setupmp18.c
index af32416b4..4133bc9db 100644
--- a/src/files/setup/setupmp18.c
+++ b/src/files/setup/setupmp18.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp19.c b/src/files/setup/setupmp19.c
index 21d742f65..776bd6d30 100644
--- a/src/files/setup/setupmp19.c
+++ b/src/files/setup/setupmp19.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp2.c b/src/files/setup/setupmp2.c
index 8f6f71644..50dcb4f58 100644
--- a/src/files/setup/setupmp2.c
+++ b/src/files/setup/setupmp2.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp20.c b/src/files/setup/setupmp20.c
index 0f8a6d46a..0548d8772 100644
--- a/src/files/setup/setupmp20.c
+++ b/src/files/setup/setupmp20.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp3.c b/src/files/setup/setupmp3.c
index a1104a8e9..112d5e36d 100644
--- a/src/files/setup/setupmp3.c
+++ b/src/files/setup/setupmp3.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp4.c b/src/files/setup/setupmp4.c
index 674f5b7c8..de32bc5fc 100644
--- a/src/files/setup/setupmp4.c
+++ b/src/files/setup/setupmp4.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	endintro
 };
 
diff --git a/src/files/setup/setupmp5.c b/src/files/setup/setupmp5.c
index 0212a18d5..cb8ba4cdc 100644
--- a/src/files/setup/setupmp5.c
+++ b/src/files/setup/setupmp5.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp6.c b/src/files/setup/setupmp6.c
index 9454e4b3e..ccbcd8830 100644
--- a/src/files/setup/setupmp6.c
+++ b/src/files/setup/setupmp6.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupmp7.c b/src/files/setup/setupmp7.c
index 2ebdaab9e..08350dcfe 100644
--- a/src/files/setup/setupmp7.c
+++ b/src/files/setup/setupmp7.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	endintro
 };
 
diff --git a/src/files/setup/setupmp8.c b/src/files/setup/setupmp8.c
index 4dbd66d72..b3466c640 100644
--- a/src/files/setup/setupmp8.c
+++ b/src/files/setup/setupmp8.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	endintro
 };
 
diff --git a/src/files/setup/setupmp9.c b/src/files/setup/setupmp9.c
index b4705aa7c..4b42aea58 100644
--- a/src/files/setup/setupmp9.c
+++ b/src/files/setup/setupmp9.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupoat.c b/src/files/setup/setupoat.c
index 52b8b38a9..6f7e61749 100644
--- a/src/files/setup/setupoat.c
+++ b/src/files/setup/setupoat.c
@@ -8,7 +8,7 @@
 #define AILIST_INIT_ENEMY 0x0401
 #define AILIST_INIT_MAIAN 0x0402
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -28,7 +28,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	spawn(0x0063)
 	outfit(OUTFIT_DEFAULT)
 	intro_weapon(WEAPON_FALCON2, -1)
diff --git a/src/files/setup/setupold.c b/src/files/setup/setupold.c
index ce841f8f6..c9f256dd4 100644
--- a/src/files/setup/setupold.c
+++ b/src/files/setup/setupold.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -30,7 +30,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c
index 90346211e..59ac10176 100644
--- a/src/files/setup/setuppam.c
+++ b/src/files/setup/setuppam.c
@@ -95,7 +95,7 @@
 #define PAD_PAAREA_TELEPORT    0x0200
 #define PAD_DRCAROLLROOM_ENTRY 0x01cb
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -635,7 +635,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_FALCON2_SCOPE, -1)
 	ammo(AMMOTYPE_PISTOL, 50)
 	ammo(AMMOTYPE_PROXY_MINE, 2)
diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c
index 94ef5618f..38d185cc7 100644
--- a/src/files/setup/setuppete.c
+++ b/src/files/setup/setuppete.c
@@ -93,7 +93,7 @@
 // Other
 #define GROUP_ALARM_RESPONDER 0x09
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -320,7 +320,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	ammo(AMMOTYPE_PISTOL, 50)
 	outfit(OUTFIT_TRENCH)
 	spawn(0x0063)
diff --git a/src/files/setup/setupref.c b/src/files/setup/setupref.c
index 665a2f655..526e90ffa 100644
--- a/src/files/setup/setupref.c
+++ b/src/files/setup/setupref.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_PP9I, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
 	outfit(OUTFIT_DEFAULT)
diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c
index 70a5d3370..0a9ef63c3 100644
--- a/src/files/setup/setuprit.c
+++ b/src/files/setup/setuprit.c
@@ -113,7 +113,7 @@
 #define AILIST_REINIT_STRIPES      0x042b
 #define AILIST_REMOVE_IF_OFFSCREEN 0x042c
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -469,7 +469,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_STEWARDESS)
 	ammo(AMMOTYPE_CROSSBOW, 10)
 	ammo(AMMOTYPE_SMG, 100)
diff --git a/src/files/setup/setuprun.c b/src/files/setup/setuprun.c
index d6e9b8048..5ebc5ad95 100644
--- a/src/files/setup/setuprun.c
+++ b/src/files/setup/setuprun.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c
index 7f4d70652..ea7959e7a 100644
--- a/src/files/setup/setupsev.c
+++ b/src/files/setup/setupsev.c
@@ -40,7 +40,7 @@
 #define AILIST_OUTRO            0x041b
 #define AILIST_INIT_LABTECH     0x041c
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -672,7 +672,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	spawn(0x03dd)
 	ammo(AMMOTYPE_MAGNUM, 1)
 	outfit(OUTFIT_ELVIS)
diff --git a/src/files/setup/setupsevb.c b/src/files/setup/setupsevb.c
index 37b66ff96..57868d5da 100644
--- a/src/files/setup/setupsevb.c
+++ b/src/files/setup/setupsevb.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupsevx.c b/src/files/setup/setupsevx.c
index 65b82a56f..6a4d31f6c 100644
--- a/src/files/setup/setupsevx.c
+++ b/src/files/setup/setupsevx.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupsevxb.c b/src/files/setup/setupsevxb.c
index c7428c394..a873b9209 100644
--- a/src/files/setup/setupsevxb.c
+++ b/src/files/setup/setupsevxb.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c
index dd2245766..331d24820 100644
--- a/src/files/setup/setupsho.c
+++ b/src/files/setup/setupsho.c
@@ -101,7 +101,7 @@
 #define AILIST_HIDE                          0x0413
 #define AILIST_OUTRO                         0x0414
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -471,7 +471,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	intro_weapon(WEAPON_FALCON2_SCOPE, -1)
 	ammo(AMMOTYPE_PISTOL, 200)
diff --git a/src/files/setup/setupsilo.c b/src/files/setup/setupsilo.c
index 71157999f..405a62988 100644
--- a/src/files/setup/setupsilo.c
+++ b/src/files/setup/setupsilo.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupstat.c b/src/files/setup/setupstat.c
index 11d893c73..1877cac2f 100644
--- a/src/files/setup/setupstat.c
+++ b/src/files/setup/setupstat.c
@@ -54,7 +54,7 @@
 #define GROUP_KING2_SKEDAR 3
 #define GROUP_KING3_SKEDAR 4
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -273,7 +273,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_MAIAN)
 	intro_weapon(WEAPON_PHOENIX, -1)
 	ammo(AMMOTYPE_PISTOL, 300)
diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c
index b228070dc..a07482fbd 100644
--- a/src/files/setup/setuptra.c
+++ b/src/files/setup/setuptra.c
@@ -92,7 +92,7 @@
 #define SPAWNGROUP3 0x0b
 #define SPAWNGROUP4 0x0d
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -586,7 +586,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	spawn(0x012f)
 	intro_weapon(WEAPON_FALCON2_SCOPE, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
diff --git a/src/files/setup/setupuff.c b/src/files/setup/setupuff.c
index 29a9d361a..bfcdec0cf 100644
--- a/src/files/setup/setupuff.c
+++ b/src/files/setup/setupuff.c
@@ -4,7 +4,7 @@
 
 #include "stagesetup.h"
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -24,7 +24,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	outfit(OUTFIT_DEFAULT)
 	endintro
 };
diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c
index ed7414106..93890bdfe 100644
--- a/src/files/setup/setupwax.c
+++ b/src/files/setup/setupwax.c
@@ -43,7 +43,7 @@
 #define AILIST_CHIEF                0x0415
 #define AILIST_OUTRO                0x0417
 
-u8 intro[];
+s32 intro[];
 u8 props[];
 struct path paths[];
 struct ailist ailists[];
@@ -558,7 +558,7 @@ u8 props[] = {
 	endprops
 };
 
-u8 intro[] = {
+s32 intro[] = {
 	intro_weapon(WEAPON_MAULER, -1)
 	ammo(AMMOTYPE_PISTOL, 100)
 	intro_weapon(WEAPON_CAMSPY, -1)
diff --git a/src/include/intro.h b/src/include/intro.h
index 10b7462d2..f83a7374d 100644
--- a/src/include/intro.h
+++ b/src/include/intro.h
@@ -1,39 +1,37 @@
-#include "util.h"
-
 #define spawn(pad) \
-	mkword(0x00), \
-	mkword(pad), \
-	mkword(0),
+	0x00, \
+	pad, \
+	0,
 
 #define intro_weapon(weapon, u1) \
-	mkword(0x01), \
-	mkword(weapon), \
-	mkword(u1), \
-	mkword(0),
+	0x01, \
+	weapon, \
+	u1, \
+	0,
 
 #define ammo(ammotype, value) \
-	mkword(0x02), \
-	mkword(ammotype), \
-	mkword(value), \
-	mkword(0),
+	0x02, \
+	ammotype, \
+	value, \
+	0,
 
 #define outfit(outfit) \
-	mkword(0x05), \
-	mkword(outfit),
+	0x05, \
+	outfit,
 
 #define case(id, pad) \
-	mkword(0x09), \
-	mkword(id), \
-	mkword(pad),
+	0x09, \
+	id, \
+	pad,
 
 #define case_respawn(id, pad) \
-	mkword(0x0a), \
-	mkword(id), \
-	mkword(pad),
+	0x0a, \
+	id, \
+	pad,
 
 #define hill(pad) \
-	mkword(0x0b), \
-	mkword(pad),
+	0x0b, \
+	pad,
 
 #define endintro \
-	mkword(0x0c),
+	0x0c,