Convert setup segment into game's .data segment

src/boot/boot.c

@@ -1,5 +1,5 @@
 #include <ultra64.h>
-#include "setup/setup_000000.h"
+#include "game/data/data_000000.h"
 #include "gvars/gvars.h"
 
 GLOBAL_ASM(
@@ -463,41 +463,41 @@ glabel func00001634
 /*     166c:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-extern void *setupSegmentStart;
+extern void *_gamedataSegmentStart;
 
 // func00001670
 void *getSetupRamAddr(void)
 {
-	return &setupSegmentStart;
+	return &_gamedataSegmentStart;
 }
 
-extern void *setupSegmentRomStart;
+extern void *_gamedataSegmentRomStart;
 
 // func0000167c
 void *getSetupRomAddr(void)
 {
-	return &setupSegmentRomStart;
+	return &_gamedataSegmentRomStart;
 }
 
-extern void *inflateSegmentRomStart;
+extern void *_inflateSegmentRomStart;
 
 // func0001688
 void *getInflateRomAddr(void)
 {
-	return &inflateSegmentRomStart;
+	return &_inflateSegmentRomStart;
 }
 
 // func0001694
 void *getInflateRomAddr2(void)
 {
-	return &inflateSegmentRomStart;
+	return &_inflateSegmentRomStart;
 }
 
-extern void *ziplistSegmentRomStart;
+extern void *_ziplistSegmentRomStart;
 
 void *getZiplistSegmentRomstart(void)
 {
-	return &ziplistSegmentRomStart;
+	return &_ziplistSegmentRomStart;
 }
 
 GLOBAL_ASM(

src/game/cheats.c

@@ -2,9 +2,9 @@
 #include "boot/boot.h"
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/cheats.h"
 #include "game/game_10ccd0.h"

src/game/chr/chr.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_005fd0.h"

src/game/chr/chrai.c

@@ -1,10 +1,10 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/ailists.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/ailists.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chrai.h"
 #include "library/library_12dc0.h"

src/game/chr/chraicommands.c

@@ -8,9 +8,9 @@
 #include "game/game_165670.h"
 #include "game/game_16cfa0.h"
 #include "game/game_19c990.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chraicommands.h"
 #include "library/library_0e9d0.h"

src/game/data/ailists.c

@@ -2,7 +2,7 @@
 #include "game/chr/chraicommands.h"
 #include "game/game_000000.h"
 #include "game/game_0601b0.h"
-#include "setup/ailists.h"
+#include "game/data/ailists.h"
 #include "stagesetup.h"
 #include "types.h"
 

src/game/data/cheats.c

@@ -8,7 +8,7 @@
 #include "game/game_176d70.h"
 #include "game/game_1a3340.h"
 #include "gvars/gvars.h"
-#include "setup/cheats.h"
+#include "game/data/cheats.h"
 #include "stagesetup.h"
 #include "types.h"
 

src/game/data/data_000000.c

@@ -4,7 +4,7 @@
 #include "game/game_0601b0.h"
 #include "game/game_015470.h"
 #include "game/game_0dcdb0.h"
-#include "setup/setup_000000.h"
+#include "game/data/data_000000.h"
 #include "stagesetup.h"
 #include "types.h"
 

src/game/data/data_0160b0.c

@@ -8,10 +8,10 @@
 #include "game/game_176d70.h"
 #include "game/game_1a3340.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/cheats.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/cheats.h"
+#include "game/data/data_020df0.h"
 #include "stagesetup.h"
 #include "types.h"
 

src/game/data/data_01a3a0.c

@@ -8,9 +8,9 @@
 #include "game/game_176d70.h"
 #include "game/game_1a3340.h"
 #include "gvars/gvars.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "stagesetup.h"
 #include "types.h"
 

src/game/data/data_020df0.c

@@ -7,8 +7,8 @@
 #include "game/game_10ccd0.h"
 #include "game/game_176d70.h"
 #include "game/game_1a3340.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "stagesetup.h"
 #include "types.h"
 

src/game/data/inventory.c

@@ -2,7 +2,7 @@
 #include "game/chr/chraicommands.h"
 #include "game/game_000000.h"
 #include "game/game_0601b0.h"
-#include "setup/inventory.h"
+#include "game/data/inventory.h"
 #include "stagesetup.h"
 #include "types.h"
 

src/game/game_000000.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 
 GLOBAL_ASM(

src/game/game_000090.c

@@ -3,7 +3,7 @@
 #include "game/chr/chr.h"
 #include "game/game_000130.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
+#include "game/data/data_000000.h"
 #include "types.h"
 
 void func0f000090(void)

src/game/game_000130.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000130.h"
 #include "game/game_097890.h"

src/game/game_000920.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_066310.h"

src/game/game_005fd0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_005fd0.h"

src/game/game_00b190.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 
 GLOBAL_ASM(

src/game/game_00b200.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_00b200.h"
 #include "game/game_00b820.h"

src/game/game_00b820.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_011110.h"
 #include "game/chr/chr.h"

src/game/game_00c240.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_00c240.h"
 

src/game/game_00c490.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_00b200.h"
 #include "game/game_00b820.h"

src/game/game_0109d0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_097a50.h"
 #include "game/game_157db0.h"

src/game/game_011110.c

@@ -2,10 +2,10 @@
 #include "constants.h"
 #include "gvars/gvars.h"
 #include "math.h"
-#include "setup/inventory.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/inventory.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_011110.h"
 #include "game/chr/chr.h"

src/game/game_012450.c

@@ -5,9 +5,9 @@
 #include "game/game_012450.h"
 #include "game/game_111600.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 
 void currentPlayerInitGunsHeld(void)

src/game/game_0125a0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0125a0.h"
 #include "game/game_013540.h"

src/game/game_013260.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_129900.h"
 

src/game/game_013540.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_013540.h"
 #include "game/chr/chr.h"

src/game/game_014f10.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chr.h"
 #include "game/game_0601b0.h"

src/game/game_015010.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_066310.h"
 

src/game/game_0150a0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 
 GLOBAL_ASM(

src/game/game_015280.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0601b0.h"
 

src/game/game_015420.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 
 /**

src/game/game_015470.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/game_015470.h"

src/game/game_01d860.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_1668e0.h"
 

src/game/game_01d9f0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_01d9f0.h"
 #include "library/library_12dc0.h"

src/game/game_0601b0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/chr/chr.h"

src/game/game_066310.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_005fd0.h"

src/game/game_096750.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_096750.h"
 

src/game/game_097890.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 
 GLOBAL_ASM(

src/game/game_097970.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 
 GLOBAL_ASM(

src/game/game_097a50.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/chr/chr.h"

src/game/game_0abe70.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_096750.h"
 #include "game/game_097a50.h"

src/game/game_0b0420.c

@@ -1,10 +1,10 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/inventory.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/inventory.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_097a50.h"
 #include "game/game_0b0420.h"

src/game/game_0b2150.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0b2150.h"
 

src/game/game_0b28d0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/game_015470.h"

src/game/game_0c3620.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 
 GLOBAL_ASM(

src/game/game_0c37d0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/chr/chr.h"

src/game/game_0c79f0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/chr/chr.h"

src/game/game_0cf150.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chr.h"
 #include "game/game_0601b0.h"

src/game/game_0d1fe0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chr.h"
 #include "game/game_0601b0.h"

src/game/game_0d4690.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chr.h"
 #include "game/game_066310.h"

src/game/game_0dcdb0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/game_066310.h"

src/game/game_0f09f0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/chr/chr.h"

src/game/game_102240.c

@@ -4,9 +4,9 @@
 #include "library/library_09660.h"
 #include "library/library_0d520.h"
 #include "library/library_0e9d0.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_00c490.h"
 #include "game/game_015470.h"

src/game/game_107fb0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0b28d0.h"
 #include "game/game_0d4690.h"

src/game/game_10ccd0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/game_015470.h"

src/game/game_111600.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_097a50.h"
 #include "game/game_0b0420.h"

src/game/game_113220.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_096750.h"
 #include "game/game_0c79f0.h"

src/game/game_114240.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0601b0.h"
 #include "game/game_114240.h"

src/game/game_1165d0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0f09f0.h"
 #include "game/game_10ccd0.h"

src/game/game_11ecf0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_066310.h"
 #include "game/game_096750.h"

src/game/game_128f30.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chr.h"
 #include "game/game_066310.h"

src/game/game_129900.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_005fd0.h"

src/game/game_150820.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_066310.h"

src/game/game_152fa0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_005fd0.h"
 #include "game/game_0d4690.h"

src/game/game_157db0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_013540.h"

src/game/game_165670.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0b28d0.h"
 #include "game/game_157db0.h"

src/game/game_1668e0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_005fd0.h"

src/game/game_16cfa0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0b28d0.h"
 #include "game/game_0f09f0.h"

src/game/game_16e810.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0b28d0.h"
 #include "game/game_0f09f0.h"

src/game/game_175f90.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_1668e0.h"
 #include "game/game_175f50.h"

src/game/game_176000.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_1668e0.h"
 #include "game/game_175f50.h"

src/game/game_176080.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0b28d0.h"
 #include "game/pdoptions.h"

src/game/game_176d70.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/game_005fd0.h"

src/game/game_187770.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_015470.h"
 #include "game/chr/chr.h"

src/game/game_197600.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chr.h"
 #include "game/game_066310.h"

src/game/game_1999b0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chr.h"
 #include "game/game_0601b0.h"

src/game/game_19c990.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_000920.h"
 #include "game/chr/chr.h"

src/game/game_1a3340.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chr.h"
 #include "game/game_097970.h"

src/game/pad.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_0f09f0.h"
 #include "game/game_10ccd0.h"

src/game/pdoptions.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/game_16cfa0.h"
 

src/include/game/data/ailists.h

@@ -1,5 +1,5 @@
-#ifndef IN_SETUP_AILISTS_H
-#define IN_SETUP_AILISTS_H
+#ifndef IN_GAME_DATA_AILISTS_H
+#define IN_GAME_DATA_AILISTS_H
 #include <ultra64.h>
 
 extern struct ailist g_GlobalAilists[];

src/include/game/data/cheats.h

@@ -1,5 +1,5 @@
-#ifndef IN_SETUP_CHEATS_H
-#define IN_SETUP_CHEATS_H
+#ifndef IN_GAME_DATA_CHEATS_H
+#define IN_GAME_DATA_CHEATS_H
 #include <ultra64.h>
 
 extern struct cheat g_Cheats[NUM_CHEATS];

src/include/game/data/data_000000.h

@@ -1,5 +1,5 @@
-#ifndef IN_SETUP_000000_H
-#define IN_SETUP_000000_H
+#ifndef IN_GAME_DATA_000000_H
+#define IN_GAME_DATA_000000_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/data/data_0160b0.h

@@ -1,5 +1,5 @@
-#ifndef IN_SETUP_0160B0_H
-#define IN_SETUP_0160B0_H
+#ifndef IN_GAME_DATA_0160B0_H
+#define IN_GAME_DATA_0160B0_H
 #include <ultra64.h>
 
 extern struct menu_dialog menudialog_18d78;

src/include/game/data/data_01a3a0.h

@@ -1,5 +1,5 @@
-#ifndef IN_SETUP_01A3A0_H
-#define IN_SETUP_01A3A0_H
+#ifndef IN_GAME_DATA_01A3A0_H
+#define IN_GAME_DATA_01A3A0_H
 #include <ultra64.h>
 
 extern u16 iomessages[];

src/include/game/data/data_020df0.h

@@ -1,5 +1,5 @@
-#ifndef IN_SETUP_020DF0_H
-#define IN_SETUP_020DF0_H
+#ifndef IN_GAME_DATA_020DF0_H
+#define IN_GAME_DATA_020DF0_H
 #include <ultra64.h>
 
 extern struct menu_dialog menudialog_2a800;

src/include/game/data/inventory.h

@@ -1,5 +1,5 @@
-#ifndef IN_SETUP_INVENTORY_H
-#define IN_SETUP_INVENTORY_H
+#ifndef IN_GAME_DATA_INVENTORY_H
+#define IN_GAME_DATA_INVENTORY_H
 #include <ultra64.h>
 extern struct inventory_menupos invmenupos_00010fd0;
 extern struct inventory_typee inve_000110c0;

src/library/library_0d520.c

@@ -56,7 +56,7 @@
 #include "library/library_48650.h"
 #include "library/library_48b20.h"
 #include "library/library_4b480.h"
-#include "setup/setup_000000.h"
+#include "game/data/data_000000.h"
 
 const char var70052ca0[] = "-ml0 -me0 -mgfx120 -mvtx98 -ma400";
 const char var70052cc4[] = "-ml0 -me0 -mgfx110 -mgfxtra80 -mvtx100 -ma700";

src/library/library_12dc0.c

@@ -5,7 +5,7 @@
 #include "library/library_2fa00.h"
 #include "library/library_4a5e0.h"
 #include "library/library_4e530.h"
-#include "setup/setup_000000.h"
+#include "game/data/data_000000.h"
 
 const u32 var70053ff0[] = {0x00000000};
 const char var70053ff4[] = "-d";

src/library/library_16110.c

@@ -8,8 +8,8 @@
 #include "library/library_16110.h"
 #include "library/library_4a360.h"
 #include "library/library_4f5e0.h"
-#include "setup/ailists.h"
-#include "setup/setup_000000.h"
+#include "game/data/ailists.h"
+#include "game/data/data_000000.h"
 
 const u32 var70054200[] = {0x42652ee0};
 const u32 var70054204[] = {0x00000000};