diff --git a/Makefile b/Makefile
index fe831e1e2..a3a49114d 100644
--- a/Makefile
+++ b/Makefile
@@ -124,14 +124,14 @@ $(B_DIR)/library.o: src/library.c
 	python tools/asmpreproc/asm-processor.py -O2 $< | $(QEMU_IRIX) -silent -L $(IRIX_ROOT) $(IRIX_ROOT)/usr/bin/cc -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ -O2
 	python tools/asmpreproc/asm-processor.py -O2 $< --post-process $@ --assembler "$(TOOLCHAIN)-as -march=vr4300 -mabi=32" --asm-prelude tools/asmpreproc/prelude.s
 
-$(B_DIR)/library.elf: $(B_DIR)/library.o
-	cp $< build/library.tmp.o
+$(B_DIR)/library.elf: $(B_DIR)/library.o $(B_DIR)/setup.o
 	$(TOOLCHAIN)-ld -e 0x00003050 -T ld/library.ld -o $@
-	rm -f build/library.tmp.o
 
 $(B_DIR)/ucode/library.bin: $(B_DIR)/library.elf
 	mkdir -p $(B_DIR)/ucode
 	$(TOOLCHAIN)-objcopy $< $@ -O binary
+	dd if="$@" of="$@.tmp" bs=356240 count=1
+	mv "$@.tmp" "$@"
 
 ################################################################################
 # Game setup file
@@ -143,9 +143,7 @@ $(B_DIR)/setup.o: src/setup.c $(SETUP_H_FILES)
 	$(QEMU_IRIX) -silent -L $(IRIX_ROOT) $(IRIX_ROOT)/usr/bin/cc -c $(CFLAGS) -o $@ -O2 $<
 
 $(B_DIR)/setup.elf: $(B_DIR)/setup.o
-	cp $< build/setup.tmp.o
 	$(TOOLCHAIN)-ld -e 0x80059fe0 -T ld/setup.ld -o $@
-	rm -f build/setup.tmp.o
 
 $(B_DIR)/ucode/setup.bin: $(B_DIR)/setup.elf
 	mkdir -p $(B_DIR)/ucode
diff --git a/ld/library.ld b/ld/library.ld
index 3c1b5ab2a..c522e0856 100644
--- a/ld/library.ld
+++ b/ld/library.ld
@@ -3,9 +3,13 @@ OUTPUT_ARCH (mips)
 
 SECTIONS
 {
-	.data 0x00003050 : AT(0x0000) {
-		build/library.tmp.o (.text);
-		build/library.tmp.o (.data);
+	.library 0x00003050 : AT(0) {
+		build/ntsc-final/library.o (.text);
+		build/ntsc-final/library.o (.data);
+	}
+
+	.setup 0x80059fe0 : AT(SIZEOF(.library)) {
+		build/ntsc-final/setup.o (.data);
 	}
 
 	/DISCARD/ : {
@@ -17,5 +21,6 @@ SECTIONS
 		* (.gptab.bss);
 		* (.gptab.data);
 		* (.reginfo);
+		* (.setup.data);
 	}
 }
diff --git a/ld/rom.ld b/ld/rom.ld
new file mode 100644
index 000000000..adc1c1c8a
--- /dev/null
+++ b/ld/rom.ld
@@ -0,0 +1,25 @@
+/*OUTPUT_FORMAT ("elf32-bigmips")*/
+OUTPUT_ARCH (mips)
+
+SECTIONS
+{
+	.data 0x00003050 : AT(0x3050) {
+		build/ntsc-final/library.o (.text);
+		build/ntsc-final/library.o (.data);
+	}
+
+	.data 0x80059fe0 : AT(0x0000) {
+		build/ntsc-final/setup.o (.data);
+	}
+
+	/DISCARD/ : {
+		* (.MIPS.abiflags);
+		* (.options);
+		* (.gnu.attributes);
+		* (.pdr);
+		* (.mdebug);
+		* (.gptab.bss);
+		* (.gptab.data);
+		* (.reginfo);
+	}
+}
diff --git a/ld/setup.ld b/ld/setup.ld
index fe1aea21e..ba3237428 100644
--- a/ld/setup.ld
+++ b/ld/setup.ld
@@ -4,7 +4,7 @@ OUTPUT_ARCH (mips)
 SECTIONS
 {
 	.data 0x80059fe0 : AT(0x0000) {
-		build/setup.tmp.o (.data);
+		build/ntsc-final/setup.o (.data);
 	}
 
 	/DISCARD/ : {
diff --git a/src/include/setup.h b/src/include/setup.h
index 28a55a505..fe4c40a1c 100644
--- a/src/include/setup.h
+++ b/src/include/setup.h
@@ -1,8 +1,8 @@
-#include "ultra64.h"
-#include "constants.h"
-#include "commands.h"
-#include "intro.h"
-#include "props.h"
-#include "types.h"
-#include "gunscript.h"
+#ifndef _IN_SETUP_H
+#define _IN_SETUP_H
+#include <ultra64.h>
 
+extern u32 levelnum;
+extern u64 rand_seed;
+
+#endif
diff --git a/src/include/stagesetup.h b/src/include/stagesetup.h
new file mode 100644
index 000000000..28a55a505
--- /dev/null
+++ b/src/include/stagesetup.h
@@ -0,0 +1,8 @@
+#include "ultra64.h"
+#include "constants.h"
+#include "commands.h"
+#include "intro.h"
+#include "props.h"
+#include "types.h"
+#include "gunscript.h"
+
diff --git a/src/library.c b/src/library.c
index 7700dcf70..eb873497b 100644
--- a/src/library.c
+++ b/src/library.c
@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "src/include/setup.h"
 
 u32 var0004f3e0 = 0x70002d68;
 u32 var0004f3e4 = 0x70002d14;
@@ -7919,7 +7920,7 @@ u32 var00056f8c = 0x00000000;
 
 GLOBAL_ASM(
 glabel func12368
-/* 3050:	27bdffd0 */ 	addiu	$sp,$sp,-48
+/*     3050:	27bdffd0 */ 	addiu	$sp,$sp,-48
 /*     3054:	afb00020 */ 	sw	$s0,0x20($sp)
 /*     3058:	3c108006 */ 	lui	$s0,0x8006
 /*     305c:	2610cee0 */ 	addiu	$s0,$s0,-12576
@@ -9020,7 +9021,7 @@ glabel func00003fb0
 /*     4014:	461ce282 */ 	mul.s	$f10,$f28,$f28
 /*     4018:	460a4100 */ 	add.s	$f4,$f8,$f10
 /*     401c:	461ef182 */ 	mul.s	$f6,$f30,$f30
-/*     4020:	0c012974 */ 	jal	func0004a5d0
+/*     4020:	0c012974 */ 	jal	sqrt
 /*     4024:	46062300 */ 	add.s	$f12,$f4,$f6
 /*     4028:	44804000 */ 	mtc1	$zero,$f8
 /*     402c:	46000486 */ 	mov.s	$f18,$f0
@@ -9059,7 +9060,7 @@ glabel func00003fb0
 /*     40ac:	4616b102 */ 	mul.s	$f4,$f22,$f22
 /*     40b0:	46045180 */ 	add.s	$f6,$f10,$f4
 /*     40b4:	4618c202 */ 	mul.s	$f8,$f24,$f24
-/*     40b8:	0c012974 */ 	jal	func0004a5d0
+/*     40b8:	0c012974 */ 	jal	sqrt
 /*     40bc:	46083300 */ 	add.s	$f12,$f6,$f8
 /*     40c0:	44805000 */ 	mtc1	$zero,$f10
 /*     40c4:	46000486 */ 	mov.s	$f18,$f0
@@ -9101,7 +9102,7 @@ glabel func00003fb0
 /*     4150:	46108202 */ 	mul.s	$f8,$f16,$f16
 /*     4154:	46045180 */ 	add.s	$f6,$f10,$f4
 /*     4158:	e7b00074 */ 	swc1	$f16,0x74($sp)
-/*     415c:	0c012974 */ 	jal	func0004a5d0
+/*     415c:	0c012974 */ 	jal	sqrt
 /*     4160:	46083300 */ 	add.s	$f12,$f6,$f8
 /*     4164:	44805000 */ 	mtc1	$zero,$f10
 /*     4168:	46000486 */ 	mov.s	$f18,$f0
@@ -9246,7 +9247,7 @@ glabel func00004320
 /*     4380:	4616b282 */ 	mul.s	$f10,$f22,$f22
 /*     4384:	460a4100 */ 	add.s	$f4,$f8,$f10
 /*     4388:	4618c182 */ 	mul.s	$f6,$f24,$f24
-/*     438c:	0c012974 */ 	jal	func0004a5d0
+/*     438c:	0c012974 */ 	jal	sqrt
 /*     4390:	46062300 */ 	add.s	$f12,$f4,$f6
 /*     4394:	3c01bf80 */ 	lui	$at,0xbf80
 /*     4398:	44814000 */ 	mtc1	$at,$f8
@@ -9276,7 +9277,7 @@ glabel func00004320
 /*     43f8:	461ce282 */ 	mul.s	$f10,$f28,$f28
 /*     43fc:	460a4100 */ 	add.s	$f4,$f8,$f10
 /*     4400:	461ef182 */ 	mul.s	$f6,$f30,$f30
-/*     4404:	0c012974 */ 	jal	func0004a5d0
+/*     4404:	0c012974 */ 	jal	sqrt
 /*     4408:	46062300 */ 	add.s	$f12,$f4,$f6
 /*     440c:	3c013f80 */ 	lui	$at,0x3f80
 /*     4410:	44814000 */ 	mtc1	$at,$f8
@@ -9309,7 +9310,7 @@ glabel func00004320
 /*     447c:	46129102 */ 	mul.s	$f4,$f18,$f18
 /*     4480:	46083280 */ 	add.s	$f10,$f6,$f8
 /*     4484:	e7b20070 */ 	swc1	$f18,0x70($sp)
-/*     4488:	0c012974 */ 	jal	func0004a5d0
+/*     4488:	0c012974 */ 	jal	sqrt
 /*     448c:	46045300 */ 	add.s	$f12,$f10,$f4
 /*     4490:	3c0142fe */ 	lui	$at,0x42fe
 /*     4494:	44816000 */ 	mtc1	$at,$f12
@@ -9527,7 +9528,7 @@ glabel func00004790
 /*     47b4:	afa40018 */ 	sw	$a0,0x18($sp)
 /*     47b8:	46000282 */ 	mul.s	$f10,$f0,$f0
 /*     47bc:	46062200 */ 	add.s	$f8,$f4,$f6
-/*     47c0:	0c012974 */ 	jal	func0004a5d0
+/*     47c0:	0c012974 */ 	jal	sqrt
 /*     47c4:	46085300 */ 	add.s	$f12,$f10,$f8
 /*     47c8:	44801000 */ 	mtc1	$zero,$f2
 /*     47cc:	8fa40018 */ 	lw	$a0,0x18($sp)
@@ -21003,9 +21004,16 @@ glabel func0000e684
 /*     e978:	27bd0018 */ 	addiu	$sp,$sp,0x18
 /*     e97c:	03e00008 */ 	jr	$ra
 /*     e980:	ac2edd54 */ 	sw	$t6,-0x22ac($at)
-/*     e984:	3c028006 */ 	lui	$v0,0x8006
-/*     e988:	03e00008 */ 	jr	$ra
-/*     e98c:	8c42d9b4 */ 	lw	$v0,-0x264c($v0)
+);
+
+// func0000e984
+u32 getCurrentStageId(void)
+{
+	return levelnum;
+}
+
+GLOBAL_ASM(
+glabel func0000e990
 /*     e990:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*     e994:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*     e998:	0fc25759 */ 	jal	0xf095d64
@@ -22710,7 +22718,7 @@ glabel func0000fd9c
 /*    10180:	5441001f */ 	bnel	$v0,$at,.L00010200
 /*    10184:	24010001 */ 	addiu	$at,$zero,0x1
 .L00010188:
-/*    10188:	0c004b70 */ 	jal	func00012dc0
+/*    10188:	0c004b70 */ 	jal	random
 /*    1018c:	00000000 */ 	sll	$zero,$zero,0x0
 /*    10190:	8e190010 */ 	lw	$t9,0x10($s0)
 /*    10194:	30430003 */ 	andi	$v1,$v0,0x3
@@ -22748,7 +22756,7 @@ glabel func0000fd9c
 /*    10200:	5441001f */ 	bnel	$v0,$at,.L00010280
 /*    10204:	24010003 */ 	addiu	$at,$zero,0x3
 .L00010208:
-/*    10208:	0c004b70 */ 	jal	func00012dc0
+/*    10208:	0c004b70 */ 	jal	random
 /*    1020c:	00000000 */ 	sll	$zero,$zero,0x0
 /*    10210:	8e0e0014 */ 	lw	$t6,0x14($s0)
 /*    10214:	30430003 */ 	andi	$v1,$v0,0x3
@@ -22786,7 +22794,7 @@ glabel func0000fd9c
 /*    10280:	5441001e */ 	bnel	$v0,$at,.L000102fc
 /*    10284:	3c01bf80 */ 	lui	$at,0xbf80
 .L00010288:
-/*    10288:	0c004b70 */ 	jal	func00012dc0
+/*    10288:	0c004b70 */ 	jal	random
 /*    1028c:	00000000 */ 	sll	$zero,$zero,0x0
 /*    10290:	8e0b0018 */ 	lw	$t3,0x18($s0)
 /*    10294:	30430003 */ 	andi	$v1,$v0,0x3
@@ -25929,8 +25937,19 @@ glabel func00012cb4
 /*    12dbc:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
+// func00012dc0
+// Commented because compiler won't bitshift a u64
+//u64 random(void)
+//{
+//	rand_seed = ((rand_seed << 63) >> 31 | (rand_seed << 31) >> 32) ^
+//		(rand_seed << 44) >> 32;
+//	rand_seed = rand_seed >> 20 & 0xfff ^ rand_seed;
+//
+//	return rand_seed;
+//}
+
 GLOBAL_ASM(
-glabel func00012dc0
+glabel random
 /*    12dc0:	3c048006 */ 	lui	$a0,0x8006
 /*    12dc4:	dc84ee00 */ 	ld	$a0,-0x1200($a0)
 /*    12dc8:	3c018006 */ 	lui	$at,0x8006
@@ -30016,7 +30035,7 @@ glabel func0001648c
 /*    165f4:	46000102 */ 	mul.s	$f4,$f0,$f0
 /*    165f8:	00a08825 */ 	or	$s1,$a1,$zero
 /*    165fc:	46021182 */ 	mul.s	$f6,$f2,$f2
-/*    16600:	0c012974 */ 	jal	func0004a5d0
+/*    16600:	0c012974 */ 	jal	sqrt
 /*    16604:	46062300 */ 	add.s	$f12,$f4,$f6
 /*    16608:	3c013600 */ 	lui	$at,0x3600
 /*    1660c:	44814000 */ 	mtc1	$at,$f8
@@ -30208,7 +30227,7 @@ glabel func00016874
 /*    168b4:	46062200 */ 	add.s	$f8,$f4,$f6
 /*    168b8:	afa70054 */ 	sw	$a3,0x54($sp)
 /*    168bc:	afa40048 */ 	sw	$a0,0x48($sp)
-/*    168c0:	0c012974 */ 	jal	func0004a5d0
+/*    168c0:	0c012974 */ 	jal	sqrt
 /*    168c4:	460a4300 */ 	add.s	$f12,$f8,$f10
 /*    168c8:	3c01bf80 */ 	lui	$at,0xbf80
 /*    168cc:	44812000 */ 	mtc1	$at,$f4
@@ -30238,7 +30257,7 @@ glabel func00016874
 /*    1692c:	461ce182 */ 	mul.s	$f6,$f28,$f28
 /*    16930:	46062200 */ 	add.s	$f8,$f4,$f6
 /*    16934:	461ef282 */ 	mul.s	$f10,$f30,$f30
-/*    16938:	0c012974 */ 	jal	func0004a5d0
+/*    16938:	0c012974 */ 	jal	sqrt
 /*    1693c:	460a4300 */ 	add.s	$f12,$f8,$f10
 /*    16940:	3c013f80 */ 	lui	$at,0x3f80
 /*    16944:	44812000 */ 	mtc1	$at,$f4
@@ -30271,7 +30290,7 @@ glabel func00016874
 /*    169b0:	46129202 */ 	mul.s	$f8,$f18,$f18
 /*    169b4:	46045180 */ 	add.s	$f6,$f10,$f4
 /*    169b8:	e7b2006c */ 	swc1	$f18,0x6c($sp)
-/*    169bc:	0c012974 */ 	jal	func0004a5d0
+/*    169bc:	0c012974 */ 	jal	sqrt
 /*    169c0:	46083300 */ 	add.s	$f12,$f6,$f8
 /*    169c4:	3c013f80 */ 	lui	$at,0x3f80
 /*    169c8:	44815000 */ 	mtc1	$at,$f10
@@ -30397,7 +30416,7 @@ glabel func00016b58
 /*    16b98:	46062200 */ 	add.s	$f8,$f4,$f6
 /*    16b9c:	afa70054 */ 	sw	$a3,0x54($sp)
 /*    16ba0:	afa40048 */ 	sw	$a0,0x48($sp)
-/*    16ba4:	0c012974 */ 	jal	func0004a5d0
+/*    16ba4:	0c012974 */ 	jal	sqrt
 /*    16ba8:	460a4300 */ 	add.s	$f12,$f8,$f10
 /*    16bac:	3c01bf80 */ 	lui	$at,0xbf80
 /*    16bb0:	44812000 */ 	mtc1	$at,$f4
@@ -30427,7 +30446,7 @@ glabel func00016b58
 /*    16c10:	461ce182 */ 	mul.s	$f6,$f28,$f28
 /*    16c14:	46062200 */ 	add.s	$f8,$f4,$f6
 /*    16c18:	461ef282 */ 	mul.s	$f10,$f30,$f30
-/*    16c1c:	0c012974 */ 	jal	func0004a5d0
+/*    16c1c:	0c012974 */ 	jal	sqrt
 /*    16c20:	460a4300 */ 	add.s	$f12,$f8,$f10
 /*    16c24:	3c013f80 */ 	lui	$at,0x3f80
 /*    16c28:	44812000 */ 	mtc1	$at,$f4
@@ -30460,7 +30479,7 @@ glabel func00016b58
 /*    16c94:	46129202 */ 	mul.s	$f8,$f18,$f18
 /*    16c98:	46045180 */ 	add.s	$f6,$f10,$f4
 /*    16c9c:	e7b2006c */ 	swc1	$f18,0x6c($sp)
-/*    16ca0:	0c012974 */ 	jal	func0004a5d0
+/*    16ca0:	0c012974 */ 	jal	sqrt
 /*    16ca4:	46083300 */ 	add.s	$f12,$f6,$f8
 /*    16ca8:	3c013f80 */ 	lui	$at,0x3f80
 /*    16cac:	44815000 */ 	mtc1	$at,$f10
@@ -30614,7 +30633,7 @@ glabel func00016b58
 /*    16ee8:	46021102 */ 	mul.s	$f4,$f2,$f2
 /*    16eec:	00000000 */ 	sll	$zero,$zero,0x0
 /*    16ef0:	460e7182 */ 	mul.s	$f6,$f14,$f14
-/*    16ef4:	0c012974 */ 	jal	func0004a5d0
+/*    16ef4:	0c012974 */ 	jal	sqrt
 /*    16ef8:	46062300 */ 	add.s	$f12,$f4,$f6
 /*    16efc:	4480a000 */ 	mtc1	$zero,$f20
 /*    16f00:	c7a80050 */ 	lwc1	$f8,0x50($sp)
@@ -42102,7 +42121,7 @@ glabel func0002124c
 /*    213a4:	592000be */ 	blezl	$t1,.L000216a0
 /*    213a8:	8fbf003c */ 	lw	$ra,0x3c($sp)
 .L000213ac:
-/*    213ac:	0c004b70 */ 	jal	func00012dc0
+/*    213ac:	0c004b70 */ 	jal	random
 /*    213b0:	00000000 */ 	sll	$zero,$zero,0x0
 /*    213b4:	00025280 */ 	sll	$t2,$v0,0xa
 /*    213b8:	3151ffff */ 	andi	$s1,$t2,0xffff
@@ -42119,9 +42138,9 @@ glabel func0002124c
 /*    213e4:	01d70019 */ 	multu	$t6,$s7
 /*    213e8:	00009812 */ 	mflo	$s3
 /*    213ec:	00137c83 */ 	sra	$t7,$s3,0x12
-/*    213f0:	0c004b70 */ 	jal	func00012dc0
+/*    213f0:	0c004b70 */ 	jal	random
 /*    213f4:	01e09825 */ 	or	$s3,$t7,$zero
-/*    213f8:	0c004b70 */ 	jal	func00012dc0
+/*    213f8:	0c004b70 */ 	jal	random
 /*    213fc:	00028fc2 */ 	srl	$s1,$v0,0x1f
 /*    21400:	8a410000 */ 	lwl	$at,0x0($s2)
 /*    21404:	9a410003 */ 	lwr	$at,0x3($s2)
@@ -42421,7 +42440,7 @@ glabel func0002170c
 /*    21868:	46084102 */ 	mul.s	$f4,$f8,$f8
 /*    2186c:	46043200 */ 	add.s	$f8,$f6,$f4
 /*    21870:	460a5282 */ 	mul.s	$f10,$f10,$f10
-/*    21874:	0c012974 */ 	jal	func0004a5d0
+/*    21874:	0c012974 */ 	jal	sqrt
 /*    21878:	46085300 */ 	add.s	$f12,$f10,$f8
 /*    2187c:	44807000 */ 	mtc1	$zero,$f14
 /*    21880:	00000000 */ 	sll	$zero,$zero,0x0
@@ -42516,7 +42535,7 @@ glabel func0002170c
 /*    219d8:	e7a000d4 */ 	swc1	$f0,0xd4($sp)
 /*    219dc:	0c0068f7 */ 	jal	func0001a3dc
 /*    219e0:	c7ac00ec */ 	lwc1	$f12,0xec($sp)
-/*    219e4:	0c004b70 */ 	jal	func00012dc0
+/*    219e4:	0c004b70 */ 	jal	random
 /*    219e8:	e7a000d0 */ 	swc1	$f0,0xd0($sp)
 /*    219ec:	304d007f */ 	andi	$t5,$v0,0x7f
 /*    219f0:	448d5000 */ 	mtc1	$t5,$f10
@@ -42737,7 +42756,7 @@ glabel func0002170c
 /*    21d48:	00002825 */ 	or	$a1,$zero,$zero
 /*    21d4c:	10600036 */ 	beqz	$v1,.L00021e28
 /*    21d50:	00000000 */ 	sll	$zero,$zero,0x0
-/*    21d54:	0c004b70 */ 	jal	func00012dc0
+/*    21d54:	0c004b70 */ 	jal	random
 /*    21d58:	00608825 */ 	or	$s1,$v1,$zero
 /*    21d5c:	00026a80 */ 	sll	$t5,$v0,0xa
 /*    21d60:	a7ad0062 */ 	sh	$t5,0x62($sp)
@@ -46768,7 +46787,7 @@ glabel func00025654
 /*    25688:	e7a20020 */ 	swc1	$f2,0x20($sp)
 /*    2568c:	46108102 */ 	mul.s	$f4,$f16,$f16
 /*    25690:	e7b0001c */ 	swc1	$f16,0x1c($sp)
-/*    25694:	0c012974 */ 	jal	func0004a5d0
+/*    25694:	0c012974 */ 	jal	sqrt
 /*    25698:	46049300 */ 	add.s	$f12,$f18,$f4
 /*    2569c:	44803000 */ 	mtc1	$zero,$f6
 /*    256a0:	c7a20020 */ 	lwc1	$f2,0x20($sp)
@@ -46787,7 +46806,7 @@ glabel func00025654
 /*    256d4:	46000182 */ 	mul.s	$f6,$f0,$f0
 /*    256d8:	00000000 */ 	sll	$zero,$zero,0x0
 /*    256dc:	46021202 */ 	mul.s	$f8,$f2,$f2
-/*    256e0:	0c012974 */ 	jal	func0004a5d0
+/*    256e0:	0c012974 */ 	jal	sqrt
 /*    256e4:	46083300 */ 	add.s	$f12,$f6,$f8
 /*    256e8:	1000000b */ 	beqz	$zero,.L00025718
 /*    256ec:	8fbf0014 */ 	lw	$ra,0x14($sp)
@@ -46824,7 +46843,7 @@ glabel func00025724
 /*    25750:	e7a80020 */ 	swc1	$f8,0x20($sp)
 /*    25754:	46108102 */ 	mul.s	$f4,$f16,$f16
 /*    25758:	e7b00024 */ 	swc1	$f16,0x24($sp)
-/*    2575c:	0c012974 */ 	jal	func0004a5d0
+/*    2575c:	0c012974 */ 	jal	sqrt
 /*    25760:	46049300 */ 	add.s	$f12,$f18,$f4
 /*    25764:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*    25768:	27bd0018 */ 	addiu	$sp,$sp,0x18
@@ -46919,7 +46938,7 @@ glabel func00025848
 /*    25894:	4614a182 */ 	mul.s	$f6,$f20,$f20
 /*    25898:	e7ae002c */ 	swc1	$f14,0x2c($sp)
 /*    2589c:	4616b202 */ 	mul.s	$f8,$f22,$f22
-/*    258a0:	0c012974 */ 	jal	func0004a5d0
+/*    258a0:	0c012974 */ 	jal	sqrt
 /*    258a4:	46083300 */ 	add.s	$f12,$f6,$f8
 /*    258a8:	44808000 */ 	mtc1	$zero,$f16
 /*    258ac:	c7ae002c */ 	lwc1	$f14,0x2c($sp)
@@ -51555,7 +51574,7 @@ glabel func000296a0
 /*    29af8:	46000102 */ 	mul.s	$f4,$f0,$f0
 /*    29afc:	e7a000b8 */ 	swc1	$f0,0xb8($sp)
 /*    29b00:	4614a182 */ 	mul.s	$f6,$f20,$f20
-/*    29b04:	0c012974 */ 	jal	func0004a5d0
+/*    29b04:	0c012974 */ 	jal	sqrt
 /*    29b08:	46062300 */ 	add.s	$f12,$f4,$f6
 /*    29b0c:	c7a800d4 */ 	lwc1	$f8,0xd4($sp)
 /*    29b10:	4600a407 */ 	neg.s	$f16,$f20
@@ -51766,7 +51785,7 @@ glabel func000296a0
 /*    29e0c:	46000182 */ 	mul.s	$f6,$f0,$f0
 /*    29e10:	e7a00078 */ 	swc1	$f0,0x78($sp)
 /*    29e14:	4614a102 */ 	mul.s	$f4,$f20,$f20
-/*    29e18:	0c012974 */ 	jal	func0004a5d0
+/*    29e18:	0c012974 */ 	jal	sqrt
 /*    29e1c:	46043300 */ 	add.s	$f12,$f6,$f4
 /*    29e20:	c7a80094 */ 	lwc1	$f8,0x94($sp)
 /*    29e24:	4600a287 */ 	neg.s	$f10,$f20
@@ -53753,7 +53772,7 @@ glabel func0002b954
 /*    2bb04:	46000182 */ 	mul.s	$f6,$f0,$f0
 /*    2bb08:	00000000 */ 	sll	$zero,$zero,0x0
 /*    2bb0c:	46021102 */ 	mul.s	$f4,$f2,$f2
-/*    2bb10:	0c012974 */ 	jal	func0004a5d0
+/*    2bb10:	0c012974 */ 	jal	sqrt
 /*    2bb14:	46043300 */ 	add.s	$f12,$f6,$f4
 /*    2bb18:	44805000 */ 	mtc1	$zero,$f10
 /*    2bb1c:	c7b20074 */ 	lwc1	$f18,0x74($sp)
@@ -53777,13 +53796,13 @@ glabel func0002b954
 /*    2bb64:	4500000d */ 	bc1f	.L0002bb9c
 /*    2bb68:	00000000 */ 	sll	$zero,$zero,0x0
 /*    2bb6c:	460e8301 */ 	sub.s	$f12,$f16,$f14
-/*    2bb70:	0c012974 */ 	jal	func0004a5d0
+/*    2bb70:	0c012974 */ 	jal	sqrt
 /*    2bb74:	e7ae003c */ 	swc1	$f14,0x3c($sp)
 /*    2bb78:	c7a40068 */ 	lwc1	$f4,0x68($sp)
 /*    2bb7c:	c7ae003c */ 	lwc1	$f14,0x3c($sp)
 /*    2bb80:	e7a00044 */ 	swc1	$f0,0x44($sp)
 /*    2bb84:	46042282 */ 	mul.s	$f10,$f4,$f4
-/*    2bb88:	0c012974 */ 	jal	func0004a5d0
+/*    2bb88:	0c012974 */ 	jal	sqrt
 /*    2bb8c:	460e5301 */ 	sub.s	$f12,$f10,$f14
 /*    2bb90:	c7a80044 */ 	lwc1	$f8,0x44($sp)
 /*    2bb94:	10000003 */ 	beqz	$zero,.L0002bba4
@@ -54349,7 +54368,7 @@ glabel func0002c328
 /*    2c3a0:	46063202 */ 	mul.s	$f8,$f6,$f6
 /*    2c3a4:	00000000 */ 	sll	$zero,$zero,0x0
 /*    2c3a8:	460a5102 */ 	mul.s	$f4,$f10,$f10
-/*    2c3ac:	0c012974 */ 	jal	func0004a5d0
+/*    2c3ac:	0c012974 */ 	jal	sqrt
 /*    2c3b0:	46044300 */ 	add.s	$f12,$f8,$f4
 /*    2c3b4:	4600a03c */ 	c.lt.s	$f20,$f0
 /*    2c3b8:	8fa5004c */ 	lw	$a1,0x4c($sp)
@@ -54489,7 +54508,7 @@ glabel func0002c528
 /*    2c5a0:	46063202 */ 	mul.s	$f8,$f6,$f6
 /*    2c5a4:	00000000 */ 	sll	$zero,$zero,0x0
 /*    2c5a8:	460a5102 */ 	mul.s	$f4,$f10,$f10
-/*    2c5ac:	0c012974 */ 	jal	func0004a5d0
+/*    2c5ac:	0c012974 */ 	jal	sqrt
 /*    2c5b0:	46044300 */ 	add.s	$f12,$f8,$f4
 /*    2c5b4:	4600a03c */ 	c.lt.s	$f20,$f0
 /*    2c5b8:	8fa5004c */ 	lw	$a1,0x4c($sp)
@@ -81377,7 +81396,7 @@ glabel func000446d0
 /*    448b4:	00000000 */ 	sll	$zero,$zero,0x0
 /*    448b8:	46066300 */ 	add.s	$f12,$f12,$f6
 .L000448bc:
-/*    448bc:	0c012974 */ 	jal	func0004a5d0
+/*    448bc:	0c012974 */ 	jal	sqrt
 /*    448c0:	00000000 */ 	sll	$zero,$zero,0x0
 /*    448c4:	3c017006 */ 	lui	$at,0x7006
 /*    448c8:	c4289c70 */ 	lwc1	$f8,-0x6390($at)
@@ -82661,7 +82680,7 @@ glabel func00045ab0
 .L00045b38:
 /*    45b38:	3c013f80 */ 	lui	$at,0x3f80
 /*    45b3c:	44815000 */ 	mtc1	$at,$f10
-/*    45b40:	0c012974 */ 	jal	func0004a5d0
+/*    45b40:	0c012974 */ 	jal	sqrt
 /*    45b44:	460a3300 */ 	add.s	$f12,$f6,$f10
 /*    45b48:	3c017006 */ 	lui	$at,0x7006
 /*    45b4c:	c4309c80 */ 	lwc1	$f16,-0x6380($at)
@@ -87859,8 +87878,9 @@ glabel func0004a460
 /*    4a5cc:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
+// func0004a5d0
 GLOBAL_ASM(
-glabel func0004a5d0
+glabel sqrt
 /*    4a5d0:	03e00008 */ 	jr	$ra
 /*    4a5d4:	46006004 */ 	sqrt.s	$f0,$f12
 /*    4a5d8:	00000000 */ 	sll	$zero,$zero,0x0
@@ -87900,8 +87920,9 @@ glabel func0004a60c
 /*    4a630:	00641023 */ 	subu	$v0,$v1,$a0
 );
 
+// func0004a634
 GLOBAL_ASM(
-glabel func0004a634
+glabel strchr
 /*    4a634:	90830000 */ 	lbu	$v1,0x0($a0)
 /*    4a638:	30ae00ff */ 	andi	$t6,$a1,0xff
 /*    4a63c:	30a200ff */ 	andi	$v0,$a1,0xff
@@ -93200,7 +93221,7 @@ glabel func0004ed00
 .L0004ede0:
 /*    4ede0:	afa000d0 */ 	sw	$zero,0xd0($sp)
 /*    4ede4:	92450000 */ 	lbu	$a1,0x0($s2)
-/*    4ede8:	0c01298d */ 	jal	func0004a634
+/*    4ede8:	0c01298d */ 	jal	strchr
 /*    4edec:	02c02025 */ 	or	$a0,$s6,$zero
 /*    4edf0:	1040000f */ 	beqz	$v0,.L0004ee30
 /*    4edf4:	00408025 */ 	or	$s0,$v0,$zero
@@ -93215,7 +93236,7 @@ glabel func0004ed00
 /*    4ee14:	02c02025 */ 	or	$a0,$s6,$zero
 /*    4ee18:	030fc825 */ 	or	$t9,$t8,$t7
 /*    4ee1c:	afb900d0 */ 	sw	$t9,0xd0($sp)
-/*    4ee20:	0c01298d */ 	jal	func0004a634
+/*    4ee20:	0c01298d */ 	jal	strchr
 /*    4ee24:	92450000 */ 	lbu	$a1,0x0($s2)
 /*    4ee28:	1440fff3 */ 	bnez	$v0,.L0004edf8
 /*    4ee2c:	00408025 */ 	or	$s0,$v0,$zero
@@ -93318,7 +93339,7 @@ glabel func0004ed00
 /*    4ef84:	5420fff2 */ 	bnezl	$at,.L0004ef50
 /*    4ef88:	8fb900c4 */ 	lw	$t9,0xc4($sp)
 .L0004ef8c:
-/*    4ef8c:	0c01298d */ 	jal	func0004a634
+/*    4ef8c:	0c01298d */ 	jal	strchr
 /*    4ef90:	24849ed0 */ 	addiu	$a0,$a0,-24880
 /*    4ef94:	10400005 */ 	beqz	$v0,.L0004efac
 /*    4ef98:	27b000a0 */ 	addiu	$s0,$sp,0xa0
@@ -94103,7 +94124,7 @@ glabel func0004f9b0
 /*    4fa1c:	460e7202 */ 	mul.s	$f8,$f14,$f14
 /*    4fa20:	00000000 */ 	sll	$zero,$zero,0x0
 /*    4fa24:	46129282 */ 	mul.s	$f10,$f18,$f18
-/*    4fa28:	0c012974 */ 	jal	func0004a5d0
+/*    4fa28:	0c012974 */ 	jal	sqrt
 /*    4fa2c:	460a4300 */ 	add.s	$f12,$f8,$f10
 /*    4fa30:	02002025 */ 	or	$a0,$s0,$zero
 /*    4fa34:	0c012918 */ 	jal	func0004a460
diff --git a/src/setup.c b/src/setup.c
index 5f71a128e..de2fc4a45 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "src/include/setup.h"
+#include "src/include/stagesetup.h"
 #include "src/include/types.h"
 
 // Assembly
@@ -3546,7 +3547,9 @@ u32 var000039c4 = 0x00000000;
 u32 var000039c8 = 0x00000000;
 u32 var000039cc = 0x00000000;
 u32 var000039d0 = 0x00000000;
-u32 var000039d4 = 0x0000005a;
+
+u32 levelnum = 0x5a;
+
 u32 var000039d8 = 0x0004b000;
 u32 var000039dc = 0x00000000;
 u32 var000039e0 = 0x00000000;
@@ -4312,8 +4315,10 @@ u32 var00004e10 = 0xffffffff;
 u32 var00004e14 = 0x00000000;
 u32 var00004e18 = 0x00000000;
 u32 var00004e1c = 0x00000000;
-u32 var00004e20 = 0xab8d9f77;
-u32 var00004e24 = 0x81280783;
+
+// 4e20
+u64 rand_seed = 0xab8d9f7781280783;
+
 u32 var00004e28 = 0x00000000;
 u32 var00004e2c = 0x00000000;
 u32 var00004e30 = 0x00000001;
diff --git a/src/setup/mp_setupame.c b/src/setup/mp_setupame.c
index a38ce7fd9..467e1605a 100644
--- a/src/setup/mp_setupame.c
+++ b/src/setup/mp_setupame.c
@@ -2,7 +2,7 @@
 // Defection
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuparch.c b/src/setup/mp_setuparch.c
index c8dce90da..53bf7fb7d 100644
--- a/src/setup/mp_setuparch.c
+++ b/src/setup/mp_setuparch.c
@@ -2,7 +2,7 @@
 // Stage ID 0x18
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuparec.c b/src/setup/mp_setuparec.c
index 799e41378..80c225170 100644
--- a/src/setup/mp_setuparec.c
+++ b/src/setup/mp_setuparec.c
@@ -2,7 +2,7 @@
 // Ravine (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupark.c b/src/setup/mp_setupark.c
index 78c7a9cc4..feefccf80 100644
--- a/src/setup/mp_setupark.c
+++ b/src/setup/mp_setupark.c
@@ -2,7 +2,7 @@
 // Extraction
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupash.c b/src/setup/mp_setupash.c
index a8b3fab36..b501bf11a 100644
--- a/src/setup/mp_setupash.c
+++ b/src/setup/mp_setupash.c
@@ -2,7 +2,7 @@
 // Stage ID 0x2e
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupate.c b/src/setup/mp_setupate.c
index a8fcca60c..1a7e1a089 100644
--- a/src/setup/mp_setupate.c
+++ b/src/setup/mp_setupate.c
@@ -2,7 +2,7 @@
 // Duel
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupazt.c b/src/setup/mp_setupazt.c
index 5e2b7965b..9cf6f4240 100644
--- a/src/setup/mp_setupazt.c
+++ b/src/setup/mp_setupazt.c
@@ -2,7 +2,7 @@
 // Crash Site
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupcat.c b/src/setup/mp_setupcat.c
index 00eb4cf7c..646273d82 100644
--- a/src/setup/mp_setupcat.c
+++ b/src/setup/mp_setupcat.c
@@ -2,7 +2,7 @@
 // Stage ID 0x28
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupcave.c b/src/setup/mp_setupcave.c
index df0988b19..7a66b292d 100644
--- a/src/setup/mp_setupcave.c
+++ b/src/setup/mp_setupcave.c
@@ -2,7 +2,7 @@
 // Air Base
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupcrad.c b/src/setup/mp_setupcrad.c
index dfef281ad..537ca0a70 100644
--- a/src/setup/mp_setupcrad.c
+++ b/src/setup/mp_setupcrad.c
@@ -2,7 +2,7 @@
 // Pipes (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupcryp.c b/src/setup/mp_setupcryp.c
index ce1c80d0c..77f0e8653 100644
--- a/src/setup/mp_setupcryp.c
+++ b/src/setup/mp_setupcryp.c
@@ -2,7 +2,7 @@
 // G5 Building (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupdam.c b/src/setup/mp_setupdam.c
index d4f8ec591..5928b84c4 100644
--- a/src/setup/mp_setupdam.c
+++ b/src/setup/mp_setupdam.c
@@ -2,7 +2,7 @@
 // Pelagic II
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupdepo.c b/src/setup/mp_setupdepo.c
index b6393abda..524183230 100644
--- a/src/setup/mp_setupdepo.c
+++ b/src/setup/mp_setupdepo.c
@@ -2,7 +2,7 @@
 // G5 Building
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupdest.c b/src/setup/mp_setupdest.c
index de39efeb1..50e7a3d01 100644
--- a/src/setup/mp_setupdest.c
+++ b/src/setup/mp_setupdest.c
@@ -2,7 +2,7 @@
 // Stage ID 0x1a
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupdish.c b/src/setup/mp_setupdish.c
index d4f41e40e..779cadc63 100644
--- a/src/setup/mp_setupdish.c
+++ b/src/setup/mp_setupdish.c
@@ -2,7 +2,7 @@
 // CI Training
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupear.c b/src/setup/mp_setupear.c
index 87c86c321..fbadd5352 100644
--- a/src/setup/mp_setupear.c
+++ b/src/setup/mp_setupear.c
@@ -2,7 +2,7 @@
 // Investigation
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupeld.c b/src/setup/mp_setupeld.c
index 546400524..940ba52da 100644
--- a/src/setup/mp_setupeld.c
+++ b/src/setup/mp_setupeld.c
@@ -2,7 +2,7 @@
 // Villa
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupimp.c b/src/setup/mp_setupimp.c
index bd89f0c4c..8d06eba91 100644
--- a/src/setup/mp_setupimp.c
+++ b/src/setup/mp_setupimp.c
@@ -2,7 +2,7 @@
 // Defense
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupjun.c b/src/setup/mp_setupjun.c
index e5ffcb238..3f4b5a18e 100644
--- a/src/setup/mp_setupjun.c
+++ b/src/setup/mp_setupjun.c
@@ -2,7 +2,7 @@
 // Temple (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuplam.c b/src/setup/mp_setuplam.c
index 66f84e499..f0f5be263 100644
--- a/src/setup/mp_setuplam.c
+++ b/src/setup/mp_setuplam.c
@@ -2,7 +2,7 @@
 // Stage ID 0x50
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuplee.c b/src/setup/mp_setuplee.c
index 893530926..32006396d 100644
--- a/src/setup/mp_setuplee.c
+++ b/src/setup/mp_setuplee.c
@@ -2,7 +2,7 @@
 // Attack Ship
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuplen.c b/src/setup/mp_setuplen.c
index e389e22cc..80e44c0d9 100644
--- a/src/setup/mp_setuplen.c
+++ b/src/setup/mp_setuplen.c
@@ -2,7 +2,7 @@
 // Stage ID 0x36
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuplip.c b/src/setup/mp_setuplip.c
index 4e38041f3..926575328 100644
--- a/src/setup/mp_setuplip.c
+++ b/src/setup/mp_setuplip.c
@@ -2,7 +2,7 @@
 // Rescue
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuplue.c b/src/setup/mp_setuplue.c
index bdd59850c..6ef4a0e4d 100644
--- a/src/setup/mp_setuplue.c
+++ b/src/setup/mp_setuplue.c
@@ -2,7 +2,7 @@
 // Infiltration
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp1.c b/src/setup/mp_setupmp1.c
index dcb13f96f..82c00df9b 100644
--- a/src/setup/mp_setupmp1.c
+++ b/src/setup/mp_setupmp1.c
@@ -2,7 +2,7 @@
 // Base (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp10.c b/src/setup/mp_setupmp10.c
index 6177bb7b5..a440f0a3e 100644
--- a/src/setup/mp_setupmp10.c
+++ b/src/setup/mp_setupmp10.c
@@ -2,7 +2,7 @@
 // Sewers (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp11.c b/src/setup/mp_setupmp11.c
index 0f5e8baf1..27df15331 100644
--- a/src/setup/mp_setupmp11.c
+++ b/src/setup/mp_setupmp11.c
@@ -2,7 +2,7 @@
 // Felicity (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp12.c b/src/setup/mp_setupmp12.c
index a7edeb919..b68b368ff 100644
--- a/src/setup/mp_setupmp12.c
+++ b/src/setup/mp_setupmp12.c
@@ -2,7 +2,7 @@
 // Fortress (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp13.c b/src/setup/mp_setupmp13.c
index 35aad246d..97ea31a62 100644
--- a/src/setup/mp_setupmp13.c
+++ b/src/setup/mp_setupmp13.c
@@ -2,7 +2,7 @@
 // Villa (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp14.c b/src/setup/mp_setupmp14.c
index 162efd090..d183d335b 100644
--- a/src/setup/mp_setupmp14.c
+++ b/src/setup/mp_setupmp14.c
@@ -2,7 +2,7 @@
 // Stage ID 0x46
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp15.c b/src/setup/mp_setupmp15.c
index 57bec7486..5b10c2729 100644
--- a/src/setup/mp_setupmp15.c
+++ b/src/setup/mp_setupmp15.c
@@ -2,7 +2,7 @@
 // Grid (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp16.c b/src/setup/mp_setupmp16.c
index 93263e0ae..67f46c30e 100644
--- a/src/setup/mp_setupmp16.c
+++ b/src/setup/mp_setupmp16.c
@@ -2,7 +2,7 @@
 // Stage ID 0x48
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp17.c b/src/setup/mp_setupmp17.c
index 5afca11df..02a5a5f77 100644
--- a/src/setup/mp_setupmp17.c
+++ b/src/setup/mp_setupmp17.c
@@ -2,7 +2,7 @@
 // Stage ID 0x49
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp18.c b/src/setup/mp_setupmp18.c
index ccb00623e..6c681bb82 100644
--- a/src/setup/mp_setupmp18.c
+++ b/src/setup/mp_setupmp18.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4a
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp19.c b/src/setup/mp_setupmp19.c
index 1a9f9b656..14252fdc2 100644
--- a/src/setup/mp_setupmp19.c
+++ b/src/setup/mp_setupmp19.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4b
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp2.c b/src/setup/mp_setupmp2.c
index cf2b95fa7..c6dfdd6fb 100644
--- a/src/setup/mp_setupmp2.c
+++ b/src/setup/mp_setupmp2.c
@@ -2,7 +2,7 @@
 // Stage ID 0x3a
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp20.c b/src/setup/mp_setupmp20.c
index d87f7e5be..f41c3b7a0 100644
--- a/src/setup/mp_setupmp20.c
+++ b/src/setup/mp_setupmp20.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4c
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp3.c b/src/setup/mp_setupmp3.c
index 120f1a5a3..2108205b0 100644
--- a/src/setup/mp_setupmp3.c
+++ b/src/setup/mp_setupmp3.c
@@ -2,7 +2,7 @@
 // Area 52 (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp4.c b/src/setup/mp_setupmp4.c
index ffbfffc54..a2cac2736 100644
--- a/src/setup/mp_setupmp4.c
+++ b/src/setup/mp_setupmp4.c
@@ -2,7 +2,7 @@
 // Warehouse (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp5.c b/src/setup/mp_setupmp5.c
index 8cbd9d482..62b96480b 100644
--- a/src/setup/mp_setupmp5.c
+++ b/src/setup/mp_setupmp5.c
@@ -2,7 +2,7 @@
 // Car Park (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp6.c b/src/setup/mp_setupmp6.c
index f0d5e9797..cd1e91966 100644
--- a/src/setup/mp_setupmp6.c
+++ b/src/setup/mp_setupmp6.c
@@ -2,7 +2,7 @@
 // Stage ID 0x3e
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp7.c b/src/setup/mp_setupmp7.c
index 17bce6bc7..09de99a2d 100644
--- a/src/setup/mp_setupmp7.c
+++ b/src/setup/mp_setupmp7.c
@@ -2,7 +2,7 @@
 // Stage ID 0x3f
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp8.c b/src/setup/mp_setupmp8.c
index 9a078e0dd..769b4bcaa 100644
--- a/src/setup/mp_setupmp8.c
+++ b/src/setup/mp_setupmp8.c
@@ -2,7 +2,7 @@
 // Stage ID 0x40
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupmp9.c b/src/setup/mp_setupmp9.c
index e6883b28c..510cd560f 100644
--- a/src/setup/mp_setupmp9.c
+++ b/src/setup/mp_setupmp9.c
@@ -2,7 +2,7 @@
 // Ruins (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupoat.c b/src/setup/mp_setupoat.c
index ef91f59c1..4cb646d28 100644
--- a/src/setup/mp_setupoat.c
+++ b/src/setup/mp_setupoat.c
@@ -2,7 +2,7 @@
 // Skedar (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupold.c b/src/setup/mp_setupold.c
index 9827345f3..0e5b9f699 100644
--- a/src/setup/mp_setupold.c
+++ b/src/setup/mp_setupold.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4e
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuppam.c b/src/setup/mp_setuppam.c
index 8d841f00b..f133e38d6 100644
--- a/src/setup/mp_setuppam.c
+++ b/src/setup/mp_setuppam.c
@@ -2,7 +2,7 @@
 // Deep Sea
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuppete.c b/src/setup/mp_setuppete.c
index 7b621a80f..4f25d3941 100644
--- a/src/setup/mp_setuppete.c
+++ b/src/setup/mp_setuppete.c
@@ -2,7 +2,7 @@
 // Chicago
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupref.c b/src/setup/mp_setupref.c
index 10be7f692..cb895be31 100644
--- a/src/setup/mp_setupref.c
+++ b/src/setup/mp_setupref.c
@@ -2,7 +2,7 @@
 // Complex (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuprit.c b/src/setup/mp_setuprit.c
index 11ae70f9f..6f4f8a3ad 100644
--- a/src/setup/mp_setuprit.c
+++ b/src/setup/mp_setuprit.c
@@ -2,7 +2,7 @@
 // Air Force One
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuprun.c b/src/setup/mp_setuprun.c
index 9122a7947..ab408f72e 100644
--- a/src/setup/mp_setuprun.c
+++ b/src/setup/mp_setuprun.c
@@ -2,7 +2,7 @@
 // Stage ID 0x23
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupsev.c b/src/setup/mp_setupsev.c
index 7d66f1999..03eba5e2e 100644
--- a/src/setup/mp_setupsev.c
+++ b/src/setup/mp_setupsev.c
@@ -2,7 +2,7 @@
 // Maian SOS
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupsevb.c b/src/setup/mp_setupsevb.c
index 77dd2ef0e..c732f9759 100644
--- a/src/setup/mp_setupsevb.c
+++ b/src/setup/mp_setupsevb.c
@@ -2,7 +2,7 @@
 // Retaking the Institute
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupsevx.c b/src/setup/mp_setupsevx.c
index 8beebeccf..8fd1da6c9 100644
--- a/src/setup/mp_setupsevx.c
+++ b/src/setup/mp_setupsevx.c
@@ -2,7 +2,7 @@
 // Stage IDs 0x24 and 0x2b
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupsho.c b/src/setup/mp_setupsho.c
index ac2f573f3..a37058b38 100644
--- a/src/setup/mp_setupsho.c
+++ b/src/setup/mp_setupsho.c
@@ -2,7 +2,7 @@
 // Skedar Ruins
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupsilo.c b/src/setup/mp_setupsilo.c
index 1f451f133..724e4e752 100644
--- a/src/setup/mp_setupsilo.c
+++ b/src/setup/mp_setupsilo.c
@@ -2,7 +2,7 @@
 // Stage ID 0x14
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupstat.c b/src/setup/mp_setupstat.c
index e3fc956f5..0062beaa0 100644
--- a/src/setup/mp_setupstat.c
+++ b/src/setup/mp_setupstat.c
@@ -2,7 +2,7 @@
 // WAR!
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setuptra.c b/src/setup/mp_setuptra.c
index fce91f1a3..5374af7d3 100644
--- a/src/setup/mp_setuptra.c
+++ b/src/setup/mp_setuptra.c
@@ -2,7 +2,7 @@
 // Escape
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupuff.c b/src/setup/mp_setupuff.c
index e649c7766..046329afd 100644
--- a/src/setup/mp_setupuff.c
+++ b/src/setup/mp_setupuff.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4d
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/mp_setupwax.c b/src/setup/mp_setupwax.c
index eb2c27553..ac3f56193 100644
--- a/src/setup/mp_setupwax.c
+++ b/src/setup/mp_setupwax.c
@@ -2,7 +2,7 @@
 // Mr. Blonde's Revenge
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupame.c b/src/setup/setupame.c
index 48ffb39be..5dc91edb1 100644
--- a/src/setup/setupame.c
+++ b/src/setup/setupame.c
@@ -2,7 +2,7 @@
 // Defection
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_CASS       0x24
diff --git a/src/setup/setuparch.c b/src/setup/setuparch.c
index 408011c8e..03b6916ab 100644
--- a/src/setup/setuparch.c
+++ b/src/setup/setuparch.c
@@ -2,7 +2,7 @@
 // Stage ID 0x18
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setuparec.c b/src/setup/setuparec.c
index e260f2b2c..2ec8d8449 100644
--- a/src/setup/setuparec.c
+++ b/src/setup/setuparec.c
@@ -2,7 +2,7 @@
 // Ravine (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupark.c b/src/setup/setupark.c
index 00ba02f33..438dece51 100644
--- a/src/setup/setupark.c
+++ b/src/setup/setupark.c
@@ -2,7 +2,7 @@
 // Extraction
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_DRCAROLL      0x00
diff --git a/src/setup/setupash.c b/src/setup/setupash.c
index a8b3fab36..b501bf11a 100644
--- a/src/setup/setupash.c
+++ b/src/setup/setupash.c
@@ -2,7 +2,7 @@
 // Stage ID 0x2e
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupate.c b/src/setup/setupate.c
index 7d54a5e49..688f72593 100644
--- a/src/setup/setupate.c
+++ b/src/setup/setupate.c
@@ -2,7 +2,7 @@
 // Duel
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_GUARD    0x00
diff --git a/src/setup/setupazt.c b/src/setup/setupazt.c
index 80b925c90..58eaef18a 100644
--- a/src/setup/setupazt.c
+++ b/src/setup/setupazt.c
@@ -2,7 +2,7 @@
 // Crash Site
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_ELVIS           0x00
diff --git a/src/setup/setupcat.c b/src/setup/setupcat.c
index 00eb4cf7c..646273d82 100644
--- a/src/setup/setupcat.c
+++ b/src/setup/setupcat.c
@@ -2,7 +2,7 @@
 // Stage ID 0x28
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupcave.c b/src/setup/setupcave.c
index 23fda47c0..2979646db 100644
--- a/src/setup/setupcave.c
+++ b/src/setup/setupcave.c
@@ -2,7 +2,7 @@
 // Air Base
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_STEWARDESS 0x38
diff --git a/src/setup/setupcrad.c b/src/setup/setupcrad.c
index 023a39b8c..e69724500 100644
--- a/src/setup/setupcrad.c
+++ b/src/setup/setupcrad.c
@@ -2,7 +2,7 @@
 // Pipes (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupcryp.c b/src/setup/setupcryp.c
index cd8d01efb..49d15f1fd 100644
--- a/src/setup/setupcryp.c
+++ b/src/setup/setupcryp.c
@@ -2,7 +2,7 @@
 // G5 Building (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupdam.c b/src/setup/setupdam.c
index e37f84c38..54d5e9f0a 100644
--- a/src/setup/setupdam.c
+++ b/src/setup/setupdam.c
@@ -2,7 +2,7 @@
 // Pelagic II
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_ELVIS       0x00
diff --git a/src/setup/setupdepo.c b/src/setup/setupdepo.c
index cb511f558..9495aea61 100644
--- a/src/setup/setupdepo.c
+++ b/src/setup/setupdepo.c
@@ -2,7 +2,7 @@
 // G5 Building
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_CLOAK_1A          0x00 // first room
diff --git a/src/setup/setupdest.c b/src/setup/setupdest.c
index 829eeaf8c..cb0f7a16e 100644
--- a/src/setup/setupdest.c
+++ b/src/setup/setupdest.c
@@ -2,7 +2,7 @@
 // Stage ID 0x1a
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupdish.c b/src/setup/setupdish.c
index c3dfa9bcc..b53b58bc9 100644
--- a/src/setup/setupdish.c
+++ b/src/setup/setupdish.c
@@ -2,7 +2,7 @@
 // CI Training
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_CARRINGTON 0x00
diff --git a/src/setup/setupear.c b/src/setup/setupear.c
index a274112c5..5bc96892e 100644
--- a/src/setup/setupear.c
+++ b/src/setup/setupear.c
@@ -2,7 +2,7 @@
 // Investigation
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_DRCAROLL    0x39
diff --git a/src/setup/setupeld.c b/src/setup/setupeld.c
index 9530e24b8..884e6577b 100644
--- a/src/setup/setupeld.c
+++ b/src/setup/setupeld.c
@@ -2,7 +2,7 @@
 // Villa
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_SNIPER1    0x00
diff --git a/src/setup/setupimp.c b/src/setup/setupimp.c
index 009df9cd5..198392b8c 100644
--- a/src/setup/setupimp.c
+++ b/src/setup/setupimp.c
@@ -2,7 +2,7 @@
 // Defense
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_CARRINGTON       0x00
diff --git a/src/setup/setupjun.c b/src/setup/setupjun.c
index dbb5b737f..9fea03586 100644
--- a/src/setup/setupjun.c
+++ b/src/setup/setupjun.c
@@ -2,7 +2,7 @@
 // Temple (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setuplam.c b/src/setup/setuplam.c
index 66f84e499..f0f5be263 100644
--- a/src/setup/setuplam.c
+++ b/src/setup/setuplam.c
@@ -2,7 +2,7 @@
 // Stage ID 0x50
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setuplee.c b/src/setup/setuplee.c
index 8cafd8792..c382f9033 100644
--- a/src/setup/setuplee.c
+++ b/src/setup/setuplee.c
@@ -2,7 +2,7 @@
 // Attack Ship
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_ELVIS            0x00
diff --git a/src/setup/setuplen.c b/src/setup/setuplen.c
index 83c8967ac..14b2d744f 100644
--- a/src/setup/setuplen.c
+++ b/src/setup/setuplen.c
@@ -2,7 +2,7 @@
 // Stage ID 0x36
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setuplip.c b/src/setup/setuplip.c
index 8f6a627b3..6a7463928 100644
--- a/src/setup/setuplip.c
+++ b/src/setup/setuplip.c
@@ -2,7 +2,7 @@
 // Rescue
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_ALIEN              0x38
diff --git a/src/setup/setuplue.c b/src/setup/setuplue.c
index b1a978951..5038b9af6 100644
--- a/src/setup/setuplue.c
+++ b/src/setup/setuplue.c
@@ -2,7 +2,7 @@
 // Infiltration
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_MECHANIC             0x30
diff --git a/src/setup/setupmp1.c b/src/setup/setupmp1.c
index 2c80668bb..e2a9a04fd 100644
--- a/src/setup/setupmp1.c
+++ b/src/setup/setupmp1.c
@@ -2,7 +2,7 @@
 // Base (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp10.c b/src/setup/setupmp10.c
index 7af8ade4e..e1e769c8a 100644
--- a/src/setup/setupmp10.c
+++ b/src/setup/setupmp10.c
@@ -2,7 +2,7 @@
 // Sewers (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp11.c b/src/setup/setupmp11.c
index d77bb9699..ea0cb01b1 100644
--- a/src/setup/setupmp11.c
+++ b/src/setup/setupmp11.c
@@ -2,7 +2,7 @@
 // Felicity (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp12.c b/src/setup/setupmp12.c
index 7faebb99d..0497c9acd 100644
--- a/src/setup/setupmp12.c
+++ b/src/setup/setupmp12.c
@@ -2,7 +2,7 @@
 // Fortress (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp13.c b/src/setup/setupmp13.c
index 25066175c..e68428327 100644
--- a/src/setup/setupmp13.c
+++ b/src/setup/setupmp13.c
@@ -2,7 +2,7 @@
 // Villa (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp14.c b/src/setup/setupmp14.c
index 6ac18d4a3..8d25465bf 100644
--- a/src/setup/setupmp14.c
+++ b/src/setup/setupmp14.c
@@ -2,7 +2,7 @@
 // Stage ID 0x46
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp15.c b/src/setup/setupmp15.c
index 6237677c3..a236077e4 100644
--- a/src/setup/setupmp15.c
+++ b/src/setup/setupmp15.c
@@ -2,7 +2,7 @@
 // Grid (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp16.c b/src/setup/setupmp16.c
index 989f2eb06..d8578f778 100644
--- a/src/setup/setupmp16.c
+++ b/src/setup/setupmp16.c
@@ -2,7 +2,7 @@
 // Stage ID 0x48
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp17.c b/src/setup/setupmp17.c
index 485547ba4..d72a9b05d 100644
--- a/src/setup/setupmp17.c
+++ b/src/setup/setupmp17.c
@@ -2,7 +2,7 @@
 // Stage ID 0x49
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp18.c b/src/setup/setupmp18.c
index dcf69d68e..75379048e 100644
--- a/src/setup/setupmp18.c
+++ b/src/setup/setupmp18.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4a
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp19.c b/src/setup/setupmp19.c
index 03d6fa23e..74914b5f5 100644
--- a/src/setup/setupmp19.c
+++ b/src/setup/setupmp19.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4b
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp2.c b/src/setup/setupmp2.c
index 8828bb106..638887be0 100644
--- a/src/setup/setupmp2.c
+++ b/src/setup/setupmp2.c
@@ -2,7 +2,7 @@
 // Stage ID 0x3a
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp20.c b/src/setup/setupmp20.c
index 627ac3d1a..30e2663a6 100644
--- a/src/setup/setupmp20.c
+++ b/src/setup/setupmp20.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4c
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp3.c b/src/setup/setupmp3.c
index 97e56887e..e0b5f3cdf 100644
--- a/src/setup/setupmp3.c
+++ b/src/setup/setupmp3.c
@@ -2,7 +2,7 @@
 // Area 52 (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp4.c b/src/setup/setupmp4.c
index 5221d0b85..2c191a15c 100644
--- a/src/setup/setupmp4.c
+++ b/src/setup/setupmp4.c
@@ -2,7 +2,7 @@
 // Warehouse (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp5.c b/src/setup/setupmp5.c
index bc36d4fdf..93b98b435 100644
--- a/src/setup/setupmp5.c
+++ b/src/setup/setupmp5.c
@@ -2,7 +2,7 @@
 // Car Park (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp6.c b/src/setup/setupmp6.c
index f7f649ac2..a424fcdc0 100644
--- a/src/setup/setupmp6.c
+++ b/src/setup/setupmp6.c
@@ -2,7 +2,7 @@
 // Stage ID 0x3e
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp7.c b/src/setup/setupmp7.c
index d98142ac5..a376c4842 100644
--- a/src/setup/setupmp7.c
+++ b/src/setup/setupmp7.c
@@ -2,7 +2,7 @@
 // Stage ID 0x3f
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp8.c b/src/setup/setupmp8.c
index 7a150d570..cf4275c14 100644
--- a/src/setup/setupmp8.c
+++ b/src/setup/setupmp8.c
@@ -2,7 +2,7 @@
 // Stage ID 0x40
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupmp9.c b/src/setup/setupmp9.c
index 29a637464..8076a0137 100644
--- a/src/setup/setupmp9.c
+++ b/src/setup/setupmp9.c
@@ -2,7 +2,7 @@
 // Ruins (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupoat.c b/src/setup/setupoat.c
index ca4b0b15b..89e1d74d1 100644
--- a/src/setup/setupoat.c
+++ b/src/setup/setupoat.c
@@ -2,7 +2,7 @@
 // Skedar (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Functions
 #define FUNC0401_INIT_ENEMY 0x0401
diff --git a/src/setup/setupold.c b/src/setup/setupold.c
index 72f7b1d2d..96466aef0 100644
--- a/src/setup/setupold.c
+++ b/src/setup/setupold.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4e
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setuppam.c b/src/setup/setuppam.c
index 510107923..4643e91ed 100644
--- a/src/setup/setuppam.c
+++ b/src/setup/setuppam.c
@@ -2,7 +2,7 @@
 // Deep Sea
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_ELVIS    0x00
diff --git a/src/setup/setuppete.c b/src/setup/setuppete.c
index b3e44dccc..197207db6 100644
--- a/src/setup/setuppete.c
+++ b/src/setup/setuppete.c
@@ -2,7 +2,7 @@
 // Chicago
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_TOPSTAIRS 0x07
diff --git a/src/setup/setupref.c b/src/setup/setupref.c
index a73518a08..f53091f97 100644
--- a/src/setup/setupref.c
+++ b/src/setup/setupref.c
@@ -2,7 +2,7 @@
 // Complex (MP)
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setuprit.c b/src/setup/setuprit.c
index b507623cf..002809960 100644
--- a/src/setup/setuprit.c
+++ b/src/setup/setuprit.c
@@ -2,7 +2,7 @@
 // Air Force One
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_ELVIS      0x00
diff --git a/src/setup/setuprun.c b/src/setup/setuprun.c
index 4684cc5fb..c8236d3a7 100644
--- a/src/setup/setuprun.c
+++ b/src/setup/setuprun.c
@@ -2,7 +2,7 @@
 // Stage ID 0x23
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupsev.c b/src/setup/setupsev.c
index dbbdf169c..53d3e7fe6 100644
--- a/src/setup/setupsev.c
+++ b/src/setup/setupsev.c
@@ -2,7 +2,7 @@
 // Maian SOS
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_LABTECH1    0x44
diff --git a/src/setup/setupsevb.c b/src/setup/setupsevb.c
index 77dd2ef0e..c732f9759 100644
--- a/src/setup/setupsevb.c
+++ b/src/setup/setupsevb.c
@@ -2,7 +2,7 @@
 // Retaking the Institute
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupsevx.c b/src/setup/setupsevx.c
index fae025141..742c94996 100644
--- a/src/setup/setupsevx.c
+++ b/src/setup/setupsevx.c
@@ -2,7 +2,7 @@
 // Stage IDs 0x24 and 0x2b
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupsevxb.c b/src/setup/setupsevxb.c
index 53c45097c..db0a06d17 100644
--- a/src/setup/setupsevxb.c
+++ b/src/setup/setupsevxb.c
@@ -2,7 +2,7 @@
 // Unused
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupsho.c b/src/setup/setupsho.c
index 938cbae0c..2e884f63c 100644
--- a/src/setup/setupsho.c
+++ b/src/setup/setupsho.c
@@ -2,7 +2,7 @@
 // Skedar Ruins
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_KING1 0x33
diff --git a/src/setup/setupsilo.c b/src/setup/setupsilo.c
index 1f451f133..724e4e752 100644
--- a/src/setup/setupsilo.c
+++ b/src/setup/setupsilo.c
@@ -2,7 +2,7 @@
 // Stage ID 0x14
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupstat.c b/src/setup/setupstat.c
index ca2045b47..a9abbfccf 100644
--- a/src/setup/setupstat.c
+++ b/src/setup/setupstat.c
@@ -2,7 +2,7 @@
 // WAR!
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_MAIAN_LEADER    0x3d
diff --git a/src/setup/setuptra.c b/src/setup/setuptra.c
index c12d3e3dd..2e60f76b1 100644
--- a/src/setup/setuptra.c
+++ b/src/setup/setuptra.c
@@ -2,7 +2,7 @@
 // Escape
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_JONATHAN 0x21
diff --git a/src/setup/setupuff.c b/src/setup/setupuff.c
index 158f9a9fd..206a7d59e 100644
--- a/src/setup/setupuff.c
+++ b/src/setup/setupuff.c
@@ -2,7 +2,7 @@
 // Stage ID 0x4d
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 u8 intro[];
 u8 props[];
diff --git a/src/setup/setupwax.c b/src/setup/setupwax.c
index 2fffaf4ae..4e416d5a1 100644
--- a/src/setup/setupwax.c
+++ b/src/setup/setupwax.c
@@ -2,7 +2,7 @@
 // Mr. Blonde's Revenge
 //
 
-#include "../include/setup.h"
+#include "../include/stagesetup.h"
 
 // Characters
 #define CHR_CHIEF 0x21