Combine data headers into a single one and remove unnecessary declarations

src/assets/animations/list.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "data.h"
 #include "types.h"
 
 extern u8 anim0000;

src/assets/mpconfigs.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 struct mpconfig g_MpConfigs[] = {

src/assets/mpstrings/jpn-final/mpstringsE.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/jpn-final/mpstringsF.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/jpn-final/mpstringsG.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/jpn-final/mpstringsI.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/jpn-final/mpstringsJ.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/jpn-final/mpstringsP.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/jpn-final/mpstringsS.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-1.0/mpstringsE.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-1.0/mpstringsF.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-1.0/mpstringsG.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-1.0/mpstringsI.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-1.0/mpstringsJ.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-1.0/mpstringsP.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-1.0/mpstringsS.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-beta/mpstringsE.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-beta/mpstringsF.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-beta/mpstringsG.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-beta/mpstringsI.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-beta/mpstringsJ.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-beta/mpstringsP.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-beta/mpstringsS.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-final/mpstringsE.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-final/mpstringsF.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-final/mpstringsG.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-final/mpstringsI.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-final/mpstringsJ.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-final/mpstringsP.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/ntsc-final/mpstringsS.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-beta/mpstringsE.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-beta/mpstringsF.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-beta/mpstringsG.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-beta/mpstringsI.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-beta/mpstringsJ.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-beta/mpstringsP.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-beta/mpstringsS.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-final/mpstringsE.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-final/mpstringsF.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-final/mpstringsG.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-final/mpstringsI.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-final/mpstringsJ.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-final/mpstringsP.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/mpstrings/pal-final/mpstringsS.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "data.h"
 #include "types.h"
 
 static struct mpstrings strings[] = {

src/assets/textures/config.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "data.h"
 #include "types.h"
 
 Gfx gdl000[] = {

src/boot/entry.c

@@ -1,13 +1,6 @@
 #include <ultra64.h>
 #include "boot/entry.h"
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_0e0770.h"
 #include "gvars/gvars.h"
 #include "lib/args.h"
@@ -20,6 +13,7 @@
 #include "lib/lib_13750.h"
 #include "lib/lib_2fa00.h"
 #include "lib/lib_48150.h"
+#include "data.h"
 #include "types.h"
 
 /**

src/boot/init.c

@@ -4,13 +4,6 @@
 #include "boot/reset.h"
 #include "boot/segments.h"
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_0e0770.h"
 #include "gvars/gvars.h"
 #include "lib/args.h"
@@ -23,6 +16,7 @@
 #include "lib/lib_13750.h"
 #include "lib/lib_2fa00.h"
 #include "lib/lib_48150.h"
+#include "data.h"
 #include "types.h"
 
 #if VERSION >= VERSION_NTSC_1_0

src/boot/reset.c

@@ -2,6 +2,7 @@
 #include "constants.h"
 #include "boot/reset.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
 GLOBAL_ASM(

src/boot/sched.c

@@ -2,13 +2,6 @@
 #include "boot/init.h"
 #include "boot/sched.h"
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_0e0770.h"
 #include "gvars/gvars.h"
 #include "lib/args.h"
@@ -22,6 +15,7 @@
 #include "lib/lib_13750.h"
 #include "lib/lib_2fa00.h"
 #include "lib/lib_48150.h"
+#include "data.h"
 #include "types.h"
 
 void func00001b10(u32 value)

src/game/activemenu/activemenu.c

@@ -1,15 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02a0e0.h"
-#include "game/data/data_02da90.h"
-#include "game/data/data_02e820.h"
 #include "game/game_005fd0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0fd0.h"
@@ -30,8 +21,11 @@
 #include "lib/lib_09660.h"
 #include "lib/main.h"
 #include "lib/lib_16110.h"
+#include "data.h"
 #include "types.h"
 
+struct menudialog g_AmPickTargetMenuDialog;
+
 /**
  * This is a map of weapon numbers (as per the weapon set) to active menu slots.
  * For the purpose of this array, the AM slots are:

src/game/activemenu/tick.c

@@ -1,13 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/activemenu/activemenu.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_01b0a0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0fd0.h"
@@ -16,6 +9,7 @@
 #include "game/options.h"
 #include "gvars/gvars.h"
 #include "lib/controller.h"
+#include "data.h"
 #include "types.h"
 
 void amTick(void)

src/game/atan2f.c

@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "game/game_0969d0.h"
+#include "data.h"
 #include "types.h"
 
 f32 atan2f(f32 x, f32 z)

src/game/bondbike.c

@@ -3,13 +3,6 @@
 #include "game/bondbike.h"
 #include "game/bondmove.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/prop.h"
 #include "game/game_091e10.h"
 #include "game/game_092610.h"
@@ -27,6 +20,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 void bbikeInit(void)

src/game/bondcutscene.c

@@ -1,14 +1,8 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "gvars/gvars.h"
 #include "lib/lib_317f0.h"
+#include "data.h"
 #include "types.h"
 
 void bcutsceneInit(void)

src/game/bondeyespy.c

@@ -2,13 +2,6 @@
 #include "constants.h"
 #include "game/bondeyespy.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/chr/chr.h"
 #include "game/prop.h"
 #include "game/game_092610.h"
@@ -26,6 +19,7 @@
 #include "lib/lib_0e9d0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 u8 var80070ec0 = 0;

src/game/bondgrab.c

@@ -4,13 +4,6 @@
 #include "game/bondmove.h"
 #include "game/cheats.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "game/prop.h"
 #include "game/game_095320.h"
@@ -22,6 +15,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1ad940[] = "bondgrab.c";

src/game/bondhead.c

@@ -1,13 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/bondmove.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_096b20.h"
 #include "game/bondhead.h"
 #include "gvars/gvars.h"
@@ -15,6 +8,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_233c0.h"
 #include "lib/model.h"
+#include "data.h"
 #include "types.h"
 
 struct var80075c00 var80075c00[] = {

src/game/bondmove.c

@@ -6,13 +6,6 @@
 #include "game/bondwalk.h"
 #include "game/cheats.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_005fd0.h"
 #include "game/chr/chr.h"
 #include "game/prop.h"
@@ -38,6 +31,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1ad860[] = "bondmove.c";

src/game/bondview.c

@@ -1,12 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/dlights.h"
 #include "game/game_005fd0.h"
 #include "game/atan2f.h"
@@ -22,6 +15,7 @@
 #include "lib/main.h"
 #include "lib/rng.h"
 #include "lib/lib_16110.h"
+#include "data.h"
 #include "types.h"
 #include "gbiex.h"
 

src/game/bondwalk.c

@@ -4,13 +4,6 @@
 #include "game/bondwalk.h"
 #include "game/cheats.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "game/game_005fd0.h"
 #include "game/chr/chr.h"
@@ -28,6 +21,7 @@
 #include "lib/rng.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 void bwalkInit(void)

src/game/camdraw.c

@@ -1,13 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/camdraw.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_0b3350.h"
 #include "game/game_0f09f0.h"
 #include "game/stubs/game_102230.h"
@@ -23,6 +16,7 @@
 #include "lib/rng.h"
 #include "lib/lib_16110.h"
 #include "lib/libc/ll.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1b6050[] = "Init";

src/game/casing/reset.c

@@ -1,6 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
 GLOBAL_ASM(

src/game/casing/tick.c

@@ -1,18 +1,12 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/casing.h"
 #include "gvars/gvars.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/rng.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_317f0.h"
+#include "data.h"
 #include "types.h"
 
 const u32 var7f1a8660[] = {0x3e8e38e4};

src/game/ceil.c

@@ -1,13 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
 f32 ceilf(f32 value)

src/game/cheats.c

@@ -2,13 +2,6 @@
 #include "constants.h"
 #include "game/camdraw.h"
 #include "game/cheats.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/inventory/inventory.h"
 #include "game/game_127910.h"
 #include "game/training/training.h"
@@ -16,8 +9,12 @@
 #include "game/lang.h"
 #include "game/pak/pak.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
+struct menuitem g_CheatsBuddiesMenuItems[];
+struct menudialog g_CheatsBuddiesMenuDialog;
+
 struct cheat g_Cheats[NUM_CHEATS] = {
 	{ L_MPWEAPONS(75),  123,               SOLOSTAGEINDEX_EXTRACTION,     DIFF_A,  CHEATFLAG_TIMED | CHEATFLAG_TRANSFERPAK      }, // Hurricane Fists
 	{ L_MPWEAPONS(76),  100,               SOLOSTAGEINDEX_G5BUILDING,     DIFF_A,  CHEATFLAG_TIMED | CHEATFLAG_TRANSFERPAK      }, // Cloaking Device

src/game/chr/chr.c

@@ -4,13 +4,6 @@
 #include "game/bondmove.h"
 #include "game/cheats.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "game/chr/chr.h"
 #include "game/prop.h"
@@ -49,6 +42,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1a8690[] = "chr/chr.c";

src/game/chr/chraction.c

@@ -2,13 +2,6 @@
 #include "constants.h"
 #include "game/chr/chraction.h"
 #include "game/chr/chrai.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "game/dlights.h"
 #include "game/game_005fd0.h"
@@ -52,6 +45,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1a8ac0[] = "chraction.c";

src/game/chr/chrai.c

@@ -3,17 +3,10 @@
 #include "game/chr/chraction.h"
 #include "game/chr/chrai.h"
 #include "game/chr/chraicommands.h"
-#include "game/data/ailists.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "gvars/gvars.h"
 #include "lib/rng.h"
 #include "lib/lib_16110.h"
+#include "data.h"
 #include "types.h"
 
 bool (*g_CommandPointers[])(void) = {

src/game/chr/chraicommands.c

@@ -6,14 +6,6 @@
 #include "game/chr/chraction.h"
 #include "game/chr/chrai.h"
 #include "game/chr/chraicommands.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02a0e0.h"
-#include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "game/dlights.h"
 #include "game/game_011110.h"
@@ -57,6 +49,7 @@
 #include "lib/lib_233c0.h"
 #include "lib/lib_317f0.h"
 #include "lib/libc/ll.h"
+#include "data.h"
 #include "types.h"
 
 /**

src/game/core.c

@@ -6,14 +6,6 @@
 #include "game/camdraw.h"
 #include "game/cheats.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02a0e0.h"
-#include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "game/dlights.h"
 #include "game/game_005fd0.h"
@@ -110,6 +102,7 @@
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
 #include "lib/lib_317f0.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1b7730[] = "fr: %d\n";

src/game/credits.c

@@ -1,12 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_005fd0.h"
 #include "game/title.h"
 #include "game/game_0b3350.h"
@@ -28,6 +21,7 @@
 #include "lib/rng.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1b57c0[] = "tload";

src/game/data/ailists.c

@@ -2,8 +2,8 @@
 #include "game/chr/chraicommands.h"
 #include "game/game_000000.h"
 #include "game/prop.h"
-#include "game/data/ailists.h"
 #include "stagesetup.h"
+#include "data.h"
 #include "types.h"
 
 u8 func0000_idle[] = {

src/game/data/data_000000.c

@@ -4,13 +4,12 @@
 #include "game/prop.h"
 #include "game/game_015470.h"
 #include "game/hudmsg.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_00e460.h"
 #include "lib/lib_0c000.h"
 #include "lib/main.h"
 #include "lib/lib_3e730.h"
 #include "gvars/gvars.h"
 #include "stagesetup.h"
+#include "data.h"
 #include "types.h"
 
 u32 var8005ce00 = 0x00000000;

src/game/data/data_003dc0.c

@@ -4,13 +4,12 @@
 #include "game/prop.h"
 #include "game/game_015470.h"
 #include "game/hudmsg.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_00e460.h"
 #include "lib/lib_0c000.h"
 #include "lib/main.h"
 #include "lib/lib_3e730.h"
 #include "gvars/gvars.h"
 #include "stagesetup.h"
+#include "data.h"
 #include "types.h"
 
 u32 var8005ef10 = 0x47800000;

src/game/data/data_020df0.c

@@ -13,10 +13,9 @@
 #include "game/mplayer/setup.h"
 #include "game/mplayer/scenarios.h"
 #include "game/training/training.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_020df0.h"
 #include "gvars/gvars.h"
 #include "stagesetup.h"
+#include "data.h"
 #include "types.h"
 
 // 20df0

src/game/debug.c

@@ -1,14 +1,8 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
 s32 var80075d60 = 0x00000002;

src/game/dlights.c

@@ -1,13 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/cheats.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/dlights.h"
 #include "game/game_092610.h"
 #include "game/game_0b3350.h"
@@ -29,6 +22,7 @@
 #include "lib/lib_16110.h"
 #include "lib/lib_2f490.h"
 #include "lib/lib_317f0.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1a78e0[] = "LIGHTS : Hit occured on light %d in room %d\n";

src/game/endscreen.c

@@ -1,13 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/cheats.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_005fd0.h"
 #include "game/title.h"
 #include "game/game_01b0a0.h"
@@ -32,6 +25,7 @@
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"
 #include "lib/main.h"
+#include "data.h"
 #include "types.h"
 
 s32 menuhandlerDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data)

src/game/explosions/explosions.c

@@ -1,13 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/dlights.h"
 #include "game/chr/chr.h"
 #include "game/prop.h"
@@ -30,6 +23,7 @@
 #include "lib/rng.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 const char var7f1b5230[] = "VTXSTORE : vtxfixrefs -> Start - p1=%x, p2=%x\n";

src/game/explosions/init.c

@@ -1,14 +1,8 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "gvars/gvars.h"
 #include "lib/memory.h"
+#include "data.h"
 #include "types.h"
 
 void explosionsInit(void)

src/game/explosions/reset.c

@@ -1,15 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/prop.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"
+#include "data.h"
 #include "types.h"
 
 void explosionsReset(void)

src/game/file.c

@@ -1,12 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/file.h"
 #include "game/stubs/game_175f50.h"
 #include "gvars/gvars.h"
@@ -14,6 +7,7 @@
 #include "lib/dma.h"
 #include "lib/memory.h"
 #include "lib/rng.h"
+#include "data.h"
 #include "types.h"
 
 extern void *_file_bg_sev_seg;

src/game/floor.c

@@ -1,13 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
 f32 floorf(f32 value)

src/game/game_000000.c

@@ -1,15 +1,8 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02a0e0.h"
-#include "game/data/data_02da90.h"
 #include "gvars/gvars.h"
 #include "lib/memory.h"
+#include "data.h"
 #include "types.h"
 
 void func0f000000(void)

src/game/game_000090.c

@@ -1,16 +1,10 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_000090.h"
 #include "game/game_000130.h"
 #include "game/chr/chr.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
 void func0f000090(void)

src/game/game_000130.c

@@ -1,16 +1,10 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_000130.h"
 #include "game/floor.h"
 #include "gvars/gvars.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 const u32 var7f1a78c0[] = {0x40c907a9};

src/game/game_000880.c

@@ -1,14 +1,8 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_000880.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
 void func0f000880(void)

src/game/game_005fd0.c

@@ -1,18 +1,12 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "game/game_005fd0.h"
 #include "game/game_092610.h"
 #include "gvars/gvars.h"
 #include "lib/rng.h"
 #include "lib/lib_16110.h"
+#include "data.h"
 #include "types.h"
 
 s32 g_FootstepSounds[] = {

src/game/game_006bd0.c

@@ -1,13 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/chr/chraction.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/dlights.h"
 #include "game/game_005fd0.h"
 #include "game/nbomb.h"
@@ -28,6 +21,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_317f0.h"
+#include "data.h"
 #include "types.h"
 
 f32 func0f006bd0(f32 arg0)

src/game/game_00b190.c

@@ -1,15 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "gvars/gvars.h"
 #include "lib/dma.h"
 #include "lib/memory.h"
+#include "data.h"
 #include "types.h"
 
 void loadTextureList(void)

src/game/game_00b210.c

@@ -1,15 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_19aa80.h"
 #include "game/mplayer/mplayer.h"
 #include "gvars/gvars.h"
+#include "data.h"
 #include "types.h"
 
 void mpInitPresetFeatures(void)

src/game/game_00b320.c

@@ -1,16 +1,10 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/file.h"
 #include "game/lang.h"
 #include "gvars/gvars.h"
 #include "lib/memory.h"
+#include "data.h"
 #include "types.h"
 
 void stageLoadCommonLang(s32 stagenum)

src/game/game_00b480.c

@@ -1,17 +1,11 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_00b320.h"
 #include "game/game_00b820.h"
 #include "game/title.h"
 #include "gvars/gvars.h"
 #include "lib/memory.h"
+#include "data.h"
 #include "types.h"
 
 void func0f00b480(void)

src/game/game_00b820.c

@@ -2,13 +2,6 @@
 #include "constants.h"
 #include "game/cheats.h"
 #include "game/chr/chrai.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_00b820.h"
 #include "game/game_011110.h"
 #include "game/game_02cde0.h"
@@ -16,6 +9,7 @@
 #include "gvars/gvars.h"
 #include "lib/memory.h"
 #include "lib/rng.h"
+#include "data.h"
 #include "types.h"
 
 struct stageheadlimit g_StageHeadLimits[3] = {

src/game/game_00c240.c

@@ -1,16 +1,10 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_00c240.h"
 #include "game/prop.h"
 #include "gvars/gvars.h"
 #include "lib/memory.h"
+#include "data.h"
 #include "types.h"
 
 void gvarsInitProps(void)

src/game/game_00c490.c

@@ -1,16 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/cheats.h"
-#include "game/data/ailists.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02a0e0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_00b480.h"
 #include "game/game_00b820.h"
 #include "game/game_00c490.h"
@@ -44,6 +34,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 struct monitorscreen var80061a80 = {

src/game/game_0108d0.c

@@ -1,14 +1,8 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "gvars/gvars.h"
 #include "lib/memory.h"
+#include "data.h"
 #include "types.h"
 
 void func0f0108d0(void)

src/game/game_010b20.c

@@ -1,17 +1,11 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/inventory/items.h"
 #include "game/game_097ba0.h"
 #include "game/game_1655c0.h"
 #include "gvars/gvars.h"
 #include "lib/memory.h"
+#include "data.h"
 #include "types.h"
 
 extern u32 var800700ac;

src/game/game_011110.c

@@ -3,13 +3,6 @@
 #include "constants.h"
 #include "game/bondmove.h"
 #include "game/cheats.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/inventory/items.h"
 #include "game/game_011110.h"
 #include "game/chr/chr.h"
@@ -27,6 +20,7 @@
 #include "lib/memory.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"
+#include "data.h"
 #include "types.h"
 
 void func0f011110(void)

src/game/game_0125a0.c

@@ -1,12 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/data/data_000000.h"
-#include "game/data/data_0083d0.h"
-#include "game/data/data_00e460.h"
-#include "game/data/data_0160b0.h"
-#include "game/data/data_01a3a0.h"
-#include "game/data/data_020df0.h"
-#include "game/data/data_02da90.h"
 #include "game/game_0125a0.h"
 #include "game/game_013ee0.h"
 #include "game/bondhead.h"
@@ -16,6 +9,7 @@
 #include "lib/lib_159b0.h"
 #include "lib/lib_233c0.h"
 #include "lib/model.h"
+#include "data.h"
 #include "types.h"
 
 GLOBAL_ASM(